Added more fields to classes as well as the run method in tasks