Rewrite of ClientGroup plugin