Refactored SPAShop