Added support for MoneyDataType, NumericDataType