Merges DataModel 21 and 22