Changes for generating tasksets