Refactored items to be less reliant on the base class