Add more job execution support