Added Edit Job Support