Updates & Work on Job Manager