[General] more work on data model improvements (issue #44)