Work on Pop\Db\Sql refactor