Refactored to add Item methods