Refactored many of the Doctrine-generated methods