Update CWK language to include all classes