Moved CodeType to Message.Type