WIP DoctrineBundle improvements