cms class structure changed