Classes were refactored