Added class decorator for items with substores
Change User model to use new class decorator