Refactored the Message type added a simpler solution for defining an action, removed MessageType