Updated Task class

Updated TaskCollection class