Further updating CLS and preparing a major change in class structure definitions