Improved task system