Updating thunk handling