CommunicationModule refactoring