update message type to class so it makes more sense.