Refactored Items Package