Improved task runner