Add more time limits to tasks