Add the first work on the rewrite of the SQL handler.