Integrated MessageHandlerBuilder into OptionDatatype.