Refactored CClassCommand class.