Data model aligned