factory-refactory :)
CommunicatorFactory
Injection fixes