updated message type classes