Added message types
Initial version