Confirm support improved (srv&cli)