Added more params to Task and UserStory