Refactored Items