[General] more work on data model improvements