More Data model fixes