Added shop navigation support