Upgrade for new DoctrineBundle