Fixed build error for users and shops.
Added shop and user association