Changes in ClientGroup plugin