[General] finished improving data models (issue #44)