* dependency injection improvements for generators and controllers.