Changing to the SQL API