Hightly optimized class added