Update ItemManager to match Phase 2 UML