Fix Doctrine implementation