Message struct refactored
Mediator class refactored