Refactoring + adding retired jobs