aligning existing classes with new datamodel, tweeking datamodel a bit