Update for NextCaller