Made cms class dynamic again