Added shop and entities