Added supprot class group implementation