Reworking around GL classes in CellarWorkbench