Moved ShopUser class, changes