Make compatible with DataModel 1.0