Major changes to entity relationsip