More DataModel 2.0 updates

Lots of deprecation warnings fixed.