Added more job ids support