Improve tasks, add separate task categories data structure