Sync with standardized datamodel, generally modernize...