Adding namespace and TaskFragment changes