Updated relationships betweent Entities