Work on Db\Sql refactor