Move message type field to base class