Refactored item and model helper classes