Updates and improvements to task