Improve tasks functionality