Added fields to Task