Finished Doctrine implementation