Further data model tweaks