New API and job fix