ChargeDefaults moved back to Class