Make installable with DataModel 2.x