Merged Anusha's changes
TaskClass and Document