Added Hashmap to parse the message, could not extend enums.