Models cleanup, added doctrine/dbal