Improvements to job completion mapping