Move common functionality to DoctrineModule, only commands and helpers left