Feature: Updated basic shop feature