Data model extensions & tweaks