Refactored item struct