CommunicatorFactory
Injection fixes