Add subtasks
Improve file upload