Added scaffolding for tasks