Some amendments for classes