Refactored the Item object