Again changed ResultData so that unmarshaling JSON does not crash.
Renamed GeneralDataType to BaseData