Controlling discovery & extra work