Improve task object