data model improvements