Modified the tasks
Updated tasks and class files