Match changes in DataModel
Merge pull request #27 from wmde/dm073

Match changes in DataModel