Improved tasks setup