Added shopkeeper and general store location