Make component work with DataModel 1.0