Data model change to introduce relationship as an entity