Improve API calls for subtasks