Added group throttle support