NetCommunicator refactoring