Added tagging for tasks