Fix compatibility with DataModel 1.0