Refactor according to last DBAL changes