Refactored to use proper class name