Updated DataConversion