Changes to Merchant and Merchant Subclasses