Changed Doctrine implementation