Update with handle exit and handle job