Upgrade to data-model 2.0