Refactoring; New message class