Data model improvements.