Refactoring: MessageContext, MessageContext everywhere :D