[General] more work on improving data models (issue #44)