Moved addTasks to policy