Continue working on new refactor of the Pop\Db\Sql component