Data model fixes