Add explicit group name as class name does not suite all the cases