Restored branch for doctrine-orm