Refactored - Added item-related objects