Optimized class handling
Classes optimized