Some adjustments to existing classes