Refactored job type methods and added follow on logic