Bit of a change to the way controllers are injected so they can use emitted events