Added support for DataOneOf construct