Improved TasksHandler