Rearranging job management to be outside of handler functionality