Finished remodeling for shop-entity relationship