Refactored Items module