+ Models and DBAL refactoring