Class utility refactored