Updates for more standard-compliant data models
This will create a new commit in order to revert the existing changes.
