Improve task options