Data model tweaks