Reworked API scheduling (again)