Refactored to own message type