diff --git a/apps/console/src/pages/organizations/measures/MeasureView.tsx b/apps/console/src/pages/organizations/measures/MeasureView.tsx
index db50ab7ee..5bddd5023 100644
--- a/apps/console/src/pages/organizations/measures/MeasureView.tsx
+++ b/apps/console/src/pages/organizations/measures/MeasureView.tsx
@@ -101,7 +101,6 @@ import {
   MeasureViewLinkedControlsQuery,
   MeasureViewLinkedControlsQuery$data,
 } from "./__generated__/MeasureViewLinkedControlsQuery.graphql";
-import { MeasureViewCreateEvidenceMutation as MeasureViewCreateEvidenceMutationType } from "./__generated__/MeasureViewCreateEvidenceMutation.graphql";
 import { MeasureViewFulfillEvidenceMutation as MeasureViewFulfillEvidenceMutationType } from "./__generated__/MeasureViewFulfillEvidenceMutation.graphql";
 import { MeasureViewCreateControlMappingMutation } from "./__generated__/MeasureViewCreateControlMappingMutation.graphql";
 import { MeasureViewDeleteControlMappingMutation } from "./__generated__/MeasureViewDeleteControlMappingMutation.graphql";
@@ -156,6 +155,22 @@ const measureViewQuery = graphql`
         description
         state
         category
+        evidences(first: 100) @connection(key: "MeasureView_evidences") {
+          __id
+          edges {
+            node {
+              id
+              mimeType
+              filename
+              size
+              state
+              type
+              url
+              createdAt
+              description
+            }
+          }
+        }
         tasks(first: 100) @connection(key: "MeasureView_tasks") {
           __id
           edges {
@@ -170,7 +185,7 @@ const measureViewQuery = graphql`
                 fullName
                 primaryEmailAddress
               }
-              evidences(first: 50) @connection(key: "MeasureView_evidences") {
+              evidences(first: 50) @connection(key: "MeasureView_task_evidences") {
                 __id
                 edges {
                   node {
@@ -241,12 +256,12 @@ const deleteTaskMutation = graphql`
   }
 `;
 
-const createEvidenceMutation = graphql`
-  mutation MeasureViewCreateEvidenceMutation(
-    $input: CreateEvidenceInput!
+const requestEvidenceMutation = graphql`
+  mutation MeasureViewRequestEvidenceMutation(
+    $input: RequestEvidenceInput!
     $connections: [ID!]!
   ) {
-    createEvidence(input: $input) {
+    requestEvidence(input: $input) {
       evidenceEdge @appendEdge(connections: $connections) {
         node {
           id
@@ -482,6 +497,56 @@ const measureRisksQuery = graphql`
   }
 `;
 
+// Add a mutation for uploadMeasureEvidence
+const uploadMeasureEvidenceMutation = graphql`
+  mutation MeasureViewUploadMeasureEvidenceMutation(
+    $input: UploadMeasureEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    uploadMeasureEvidence(input: $input) {
+      evidenceEdge @appendEdge(connections: $connections) {
+        node {
+          id
+          filename
+          fileUrl
+          mimeType
+          type
+          url
+          size
+          state
+          createdAt
+          description
+        }
+      }
+    }
+  }
+`;
+
+// Add the uploadTaskEvidence mutation
+const uploadTaskEvidenceMutation = graphql`
+  mutation MeasureViewUploadTaskEvidenceMutation(
+    $input: UploadTaskEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    uploadTaskEvidence(input: $input) {
+      evidenceEdge @appendEdge(connections: $connections) {
+        node {
+          id
+          filename
+          fileUrl
+          mimeType
+          type
+          url
+          size
+          state
+          createdAt
+          description
+        }
+      }
+    }
+  }
+`;
+
 function MeasureViewContent({
   queryRef,
 }: {
@@ -491,6 +556,30 @@ function MeasureViewContent({
     measureViewQuery,
     queryRef
   );
+  
+  // Define a type for the measure with evidences field
+  type MeasureWithEvidences = typeof data.measure & {
+    evidences?: {
+      __id: string;
+      edges: Array<{
+        node: {
+          id: string;
+          mimeType: string;
+          filename: string;
+          size: number;
+          state: string;
+          type: string;
+          url?: string;
+          createdAt: string;
+          description: string;
+        };
+      } | null> | null;
+    };
+  };
+  
+  // Cast data.measure to include evidences field
+  const measureWithEvidences = data.measure as MeasureWithEvidences;
+  
   const navigate = useNavigate();
   const { toast } = useToast();
   const { organizationId, measureId } = useParams<{
@@ -499,11 +588,11 @@ function MeasureViewContent({
   }>();
   const environment = useRelayEnvironment();
 
-  const [commitDeleteMeasure, isDeletingMeasure] = useMutation<MeasureViewDeleteMeasureMutation>(deleteMeasureMutation);
+  const [commitDeleteMeasure, isDeletingMeasure] = useMutation<any>(deleteMeasureMutation);
   const [isDeleteMeasureOpen, setIsDeleteMeasureOpen] = useState(false);
 
   // Add state for main content tabs
-  const [mainContentTab, setMainContentTab] = useState<string>("tasks");
+  const [mainContentTab, setMainContentTab] = useState<string>("evidence");
 
   // Add URLSearchParams handling for task persistence
   const [searchParams, setSearchParams] = useSearchParams();
@@ -626,9 +715,7 @@ function MeasureViewContent({
     useMutation<MeasureViewCreateTaskMutationType>(createTaskMutation);
   const [deleteTask] =
     useMutation<MeasureViewDeleteTaskMutationType>(deleteTaskMutation);
-  const [createEvidence] = useMutation<MeasureViewCreateEvidenceMutationType>(
-    createEvidenceMutation
-  );
+  const [requestEvidence] = useMutation<any>(requestEvidenceMutation);
   const [deleteEvidence] = useMutation<MeasureViewDeleteEvidenceMutationType>(
     deleteEvidenceMutation
   );
@@ -725,6 +812,9 @@ function MeasureViewContent({
   // Track if task panel is open
   const [isTaskPanelOpen, setIsTaskPanelOpen] = useState(false);
 
+  // Add state for tracking when files are dragged over the evidence zone
+  const [isDraggingOverEvidenceZone, setIsDraggingOverEvidenceZone] = useState(false);
+
   const tasks = data.measure.tasks?.edges.map((edge) => edge.node) || [];
 
   // Add useEffect to handle URL parameters for task selection
@@ -754,6 +844,11 @@ function MeasureViewContent({
     [tasks]
   );
 
+  // Add a function to get the measure evidence connection ID
+  const getMeasureEvidenceConnectionId = useCallback(() => {
+    return measureWithEvidences.evidences?.__id || null;
+  }, [measureWithEvidences.evidences]);
+
   // Function to convert days, hours, and minutes to ISO 8601 duration format
   const convertToISODuration = useCallback(() => {
     let duration = "P";
@@ -972,16 +1067,13 @@ function MeasureViewContent({
     // Get the evidence connection ID for this task
     const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
 
-    createEvidence({
+    uploadMeasureEvidence({
       variables: {
         input: {
-          taskId: taskForEvidence.id,
-          name: file.name,
-          type: "FILE",
+          measureId: measureId,
           file: null,
-          description: "Document evidence",
         },
-        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+        connections: getMeasureEvidenceConnectionId() ? [getMeasureEvidenceConnectionId()!] : [],
       },
       uploadables: {
         "input.file": file,
@@ -1025,9 +1117,6 @@ function MeasureViewContent({
       return;
     }
 
-    // Description is now optional for link evidence
-    // Remove the validation check for empty description
-
     // Get the evidence connection ID for this task
     const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
 
@@ -1035,15 +1124,14 @@ function MeasureViewContent({
     const description =
       linkEvidenceDescription.trim() || `Link to ${linkEvidenceUrl}`;
 
-    createEvidence({
+    // Use requestEvidence instead of createEvidence
+    requestEvidence({
       variables: {
         input: {
           taskId: taskForEvidence.id,
           name: linkEvidenceName,
           type: "LINK",
-          url: linkEvidenceUrl,
           description: description,
-          file: null,
         },
         connections: evidenceConnectionId ? [evidenceConnectionId] : [],
       },
@@ -1098,19 +1186,14 @@ function MeasureViewContent({
       variant: "default",
     });
 
-    // Get the evidence connection ID for this task
-    const evidenceConnectionId = getEvidenceConnectionId(taskId);
-
-    createEvidence({
+    // Instead of using task-specific upload, use measure-level evidence
+    uploadMeasureEvidence({
       variables: {
         input: {
-          taskId: taskId,
-          name: file.name,
-          type: "FILE",
+          measureId: measureId,
           file: null,
-          description: "Document evidence",
         },
-        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+        connections: getMeasureEvidenceConnectionId() ? [getMeasureEvidenceConnectionId()!] : [],
       },
       uploadables: {
         "input.file": file,
@@ -1351,9 +1434,15 @@ function MeasureViewContent({
   const confirmDeleteEvidence = () => {
     if (!evidenceToDelete) return;
 
-    const evidenceConnectionId = getEvidenceConnectionId(
-      evidenceToDelete.taskId
-    );
+    let evidenceConnectionId;
+    
+    // If taskId is empty, it's a measure-level evidence
+    if (!evidenceToDelete.taskId) {
+      evidenceConnectionId = getMeasureEvidenceConnectionId();
+    } else {
+      // Otherwise it's a task-level evidence
+      evidenceConnectionId = getEvidenceConnectionId(evidenceToDelete.taskId);
+    }
 
     deleteEvidence({
       variables: {
@@ -1365,6 +1454,10 @@ function MeasureViewContent({
       onCompleted: () => {
         setIsDeleteEvidenceOpen(false);
         setEvidenceToDelete(null);
+        toast({
+          title: "Evidence deleted",
+          description: "Evidence has been deleted successfully.",
+        });
       },
       onError: (error) => {
         toast({
@@ -1869,10 +1962,64 @@ function MeasureViewContent({
     });
   };
 
+  // Add the mutation hook for uploadMeasureEvidence
+  const [uploadMeasureEvidence] = useMutation<any>(uploadMeasureEvidenceMutation);
+
+  // Add a function to handle uploading evidence directly to the measure
+  const handleUploadMeasureEvidence = (file: File) => {
+    // Show toast for add started
+    toast({
+      title: "Adding document",
+      description: `Adding ${file.name}...`,
+      variant: "default",
+    });
+
+    const evidenceConnectionId = getMeasureEvidenceConnectionId();
+
+    uploadMeasureEvidence({
+      variables: {
+        input: {
+          measureId: data.measure.id,
+          file: null,
+        },
+        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+      },
+      uploadables: {
+        "input.file": file,
+      },
+      onCompleted: () => {
+        toast({
+          title: "Document added",
+          description: "Document evidence has been added successfully.",
+          variant: "default",
+        });
+      },
+      onError: (error) => {
+        toast({
+          title: "Error adding document",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Add a function to create evidence at the measure level
+  const handleCreateMeasureEvidence = () => {
+    setEvidenceDialogOpen(true);
+    setActiveTab("file");
+    // Reset form fields
+    setLinkEvidenceName("");
+    setLinkEvidenceUrl("");
+    setLinkEvidenceDescription("");
+  };
+
+  // Add uploadTaskEvidence mutation hook
+  const [uploadTaskEvidence] = useMutation<any>(uploadTaskEvidenceMutation);
+
   return (
     <PageTemplate
       title={data.measure?.name || "Measure"}
-      description={data.measure?.description}
       actions={
         <div className="flex gap-2">
           <Button
@@ -1914,12 +2061,21 @@ function MeasureViewContent({
 
       {/* Main Content Tabs */}
       <Tabs
-        defaultValue="tasks"
+        defaultValue="evidence"
         value={mainContentTab}
         onValueChange={setMainContentTab}
         className="mb-4"
       >
         <TabsList className="border-b w-full p-0 h-auto">
+          <TabsTrigger value="evidence" className="flex items-center gap-2">
+            <FileText className="w-4 h-4" />
+            Evidence
+            {tasks.some(task => task.evidences?.edges && task.evidences.edges.length > 0) && (
+              <span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
+                {tasks.reduce((count, task) => count + (task.evidences?.edges?.length || 0), 0)}
+              </span>
+            )}
+          </TabsTrigger>
           <TabsTrigger value="tasks" className="flex items-center gap-2">
             <Check className="w-4 h-4" />
             Tasks
@@ -1951,915 +2107,216 @@ function MeasureViewContent({
           </TabsTrigger>
         </TabsList>
 
-        {/* Controls Tab Content */}
-        <TabsContent value="controls">
-          <div className="mb-8">
-            <div className="flex items-center justify-between mb-4">
-              <h2 className="text-xl font-semibold">Controls</h2>
-              <Button
-                variant="outline"
-                size="sm"
-                className="flex items-center gap-1"
-                onClick={handleOpenControlMappingDialog}
-              >
-                <Link2 className="w-4 h-4" />
-                <span>Map to Controls</span>
-              </Button>
-            </div>
-
-            {/* Control Mapping Dialog */}
-            <Dialog
-              open={isControlMappingDialogOpen}
-              onOpenChange={setIsControlMappingDialogOpen}
-            >
-              <DialogContent className="max-w-3xl max-h-[80vh] overflow-hidden flex flex-col">
-                <DialogHeader>
-                  <DialogTitle>Map Measure to Controls</DialogTitle>
-                  <DialogDescription>
-                    Search and select controls to link to this measure. This
-                    helps track which controls are addressed by this measure.
-                  </DialogDescription>
-                </DialogHeader>
-
-                <div className="flex items-center space-x-4 mb-4">
-                  <div className="flex-1">
-                    <div className="relative">
-                      <Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-tertiary" />
-                      <Input
-                        placeholder="Search controls by ID, name, or description..."
-                        value={controlSearchQuery}
-                        onChange={(e) => setControlSearchQuery(e.target.value)}
-                        className="w-full pl-10"
-                      />
-                    </div>
-                  </div>
-
-                  <div className="w-64">
-                    <Select
-                      value={selectedFrameworkId || "all"}
-                      onValueChange={(value) =>
-                        setSelectedFrameworkId(value === "all" ? null : value)
-                      }
-                    >
-                      <SelectTrigger>
-                        <SelectValue placeholder="Select framework" />
-                      </SelectTrigger>
-                      <SelectContent>
-                        <SelectItem value="all">All Frameworks</SelectItem>
-                        {frameworksData?.organization?.frameworks?.edges?.map(
-                          (edge) => (
-                            <SelectItem key={edge.node.id} value={edge.node.id}>
-                              {edge.node.name}
-                            </SelectItem>
-                          )
-                        )}
-                      </SelectContent>
-                    </Select>
-                  </div>
-                </div>
-
-                <div className="flex-1 overflow-hidden">
-                  {isLoadingControls ? (
-                    <div className="flex items-center justify-center h-full">
-                      <Loader2 className="w-8 h-8 animate-spin text-blue-500" />
-                      <span className="ml-2">Loading controls...</span>
-                    </div>
-                  ) : (
-                    <div className="grid grid-cols-1 gap-2 max-h-[50vh] overflow-y-auto pr-2">
-                      {filteredControls().length === 0 ? (
-                        <div className="text-center py-8 text-secondary">
-                          No controls found. Try adjusting your search or select
-                          a different framework.
-                        </div>
-                      ) : (
-                        filteredControls().map((control) => {
-                          const isLinked = isControlLinked(control.id);
-                          return (
-                            <Card
-                              key={control.id}
-                              className="border overflow-hidden"
-                            >
-                              <div
-                                className={`p-4 ${
-                                  isLinked ? "bg-blue-50" : ""
-                                }`}
-                              >
-                                <div className="flex items-start justify-between">
-                                  <div className="flex-1">
-                                    <div className="flex items-center gap-2 mb-1">
-                                      <div className="font-mono text-sm px-1 py-0.5 rounded-sm bg-lime-100 border border-lime-200 text-lime-800 font-bold">
-                                        {control.referenceId}
-                                      </div>
-                                      {isLinked && (
-                                        <Badge
-                                          variant="outline"
-                                          className="bg-blue-100 text-blue-800 border-blue-200"
-                                        >
-                                          Linked
-                                        </Badge>
-                                      )}
-                                    </div>
-                                    <h3 className="font-medium">
-                                      {control.name}
-                                    </h3>
-                                    {control.description && (
-                                      <p className="text-sm text-secondary mt-1 line-clamp-2">
-                                        {control.description}
-                                      </p>
-                                    )}
-                                  </div>
-                                  <div className="ml-4">
-                                    {isLinked ? (
-                                      <Button
-                                        variant="outline"
-                                        size="sm"
-                                        onClick={() =>
-                                          handleUnlinkControl(control.id)
-                                        }
-                                        disabled={isUnlinkingControl}
-                                        className="text-red-500 border-red-200 hover:bg-red-50"
-                                      >
-                                        {isUnlinkingControl ? (
-                                          <Loader2 className="w-4 h-4 animate-spin" />
-                                        ) : (
-                                          <X className="w-4 h-4" />
-                                        )}
-                                        <span className="ml-1">Unlink</span>
-                                      </Button>
-                                    ) : (
-                                      <Button
-                                        variant="outline"
-                                        size="sm"
-                                        onClick={() =>
-                                          handleLinkControl(control.id)
-                                        }
-                                        disabled={isLinkingControl}
-                                        className="text-blue-500 border-blue-200 hover:bg-blue-50"
-                                      >
-                                        {isLinkingControl ? (
-                                          <Loader2 className="w-4 h-4 animate-spin" />
-                                        ) : (
-                                          <Link2 className="w-4 h-4" />
-                                        )}
-                                        <span className="ml-1">Link</span>
-                                      </Button>
-                                    )}
-                                  </div>
-                                </div>
-                              </div>
-                            </Card>
-                          );
-                        })
-                      )}
-                    </div>
-                  )}
-                </div>
-
-                <DialogFooter className="mt-4">
-                  <Button onClick={() => setIsControlMappingDialogOpen(false)}>
-                    Close
-                  </Button>
-                </DialogFooter>
-              </DialogContent>
-            </Dialog>
-
-            {/* Linked Controls List */}
-            <Card>
-              <CardContent className="p-4">
-                {linkedControlsData?.measure?.controls?.edges &&
-                linkedControlsData.measure.controls.edges.length > 0 ? (
-                  <div className="overflow-x-auto">
-                    <table className="w-full">
-                      <thead>
-                        <tr className="border-b">
-                          <th className="text-left font-medium text-sm py-2 px-4">
-                            ID
-                          </th>
-                          <th className="text-left font-medium text-sm py-2 px-4">
-                            Control Name
-                          </th>
-                          <th className="text-right font-medium text-sm py-2 px-4">
-                            Actions
-                          </th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {getLinkedControls().map((control) => (
-                          <tr
-                            key={control.id}
-                            className="border-b hover:bg-invert-bg"
-                          >
-                            <td className="py-3 px-4">
-                              <div className="font-mono text-sm px-1.5 py-0.5 rounded-sm bg-lime-100 border border-lime-200 text-lime-800 font-bold inline-block">
-                                {control.referenceId}
-                              </div>
-                            </td>
-                            <td className="py-3 px-4 font-medium text-sm">
-                              {control.name}
-                            </td>
-                            <td className="py-3 px-4 text-right">
-                              <Button
-                                variant="outline"
-                                size="sm"
-                                onClick={() => handleUnlinkControl(control.id)}
-                                disabled={isUnlinkingControl}
-                                className="text-sm h-7 text-red-500 border-red-200 hover:bg-red-50"
-                              >
-                                Unlink
-                              </Button>
-                            </td>
-                          </tr>
-                        ))}
-                      </tbody>
-                    </table>
-                  </div>
-                ) : (
-                  <div className="text-center py-8 text-secondary">
-                    No controls linked to this measure yet. Click &quot;Map to
-                    Controls&quot; to link controls.
-                  </div>
-                )}
-              </CardContent>
-            </Card>
-          </div>
-        </TabsContent>
-
-        {/* Tasks Tab Content */}
-        <TabsContent value="tasks">
+        {/* Evidence Tab Content */}
+        <TabsContent value="evidence">
           <div>
             <div className="flex items-center justify-between mb-6">
-              <h2 className="text-xl font-semibold">Tasks</h2>
+              <h2 className="text-xl font-semibold">Evidence</h2>
               <div className="flex items-center gap-3">
                 <div className="text-sm text-secondary flex items-center bg-invert-bg px-3 py-1.5 rounded-md border border-mid-b">
                   <FileIcon className="w-4 h-4 mr-2 text-blue-500" />
-                  <span>Drag & drop files onto tasks to add evidence</span>
+                  <span>Drag & drop files here to add evidence</span>
                 </div>
-                <Dialog
-                  open={isCreateTaskOpen}
-                  onOpenChange={setIsCreateTaskOpen}
+                <Button 
+                  size="sm" 
+                  className="flex items-center gap-1"
+                  onClick={handleCreateMeasureEvidence}
                 >
-                  <DialogTrigger asChild>
-                    <Button size="sm" className="flex items-center gap-1">
-                      <Plus className="w-4 h-4" />
-                      <span>Add Task</span>
-                    </Button>
-                  </DialogTrigger>
-                  <DialogContent>
-                    <DialogHeader>
-                      <DialogTitle>Create New Task</DialogTitle>
-                      <DialogDescription>
-                        Add a new task to this measure. Click save when
-                        you&apos;re done.
-                      </DialogDescription>
-                    </DialogHeader>
-                    <div className="space-y-4 py-4">
-                      <div className="space-y-2">
-                        <Label htmlFor="task-name">Task Name</Label>
-                        <Input
-                          id="task-name"
-                          value={newTaskName}
-                          onChange={(e) => setNewTaskName(e.target.value)}
-                          placeholder="What needs to be done?"
-                        />
-                      </div>
-                      <div className="space-y-2">
-                        <Label htmlFor="task-description">
-                          Description (optional)
-                        </Label>
-                        <Textarea
-                          id="task-description"
-                          value={newTaskDescription}
-                          onChange={(e) =>
-                            setNewTaskDescription(e.target.value)
-                          }
-                          placeholder="Add more details about the task"
-                        />
-                      </div>
-                      <div className="space-y-2">
-                        <Label>Time Estimate (optional)</Label>
-                        <div className="flex items-center gap-2">
-                          <div className="w-full">
-                            <Input
-                              type="number"
-                              min="0"
-                              value={timeEstimateDays}
-                              onChange={(e) =>
-                                setTimeEstimateDays(e.target.value)
-                              }
-                              placeholder="Days"
-                            />
-                            <p className="text-xs text-secondary mt-1">Days</p>
-                          </div>
-                          <div className="w-full">
-                            <Input
-                              type="number"
-                              min="0"
-                              max="23"
-                              value={timeEstimateHours}
-                              onChange={(e) =>
-                                setTimeEstimateHours(e.target.value)
-                              }
-                              placeholder="Hours"
-                            />
-                            <p className="text-xs text-secondary mt-1">Hours</p>
-                          </div>
-                          <div className="w-full">
-                            <Input
-                              type="number"
-                              min="0"
-                              max="59"
-                              value={timeEstimateMinutes}
-                              onChange={(e) =>
-                                setTimeEstimateMinutes(e.target.value)
-                              }
-                              placeholder="Minutes"
-                            />
-                            <p className="text-xs text-secondary mt-1">
-                              Minutes
-                            </p>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <DialogFooter>
-                      <Button
-                        variant="outline"
-                        onClick={() => setIsCreateTaskOpen(false)}
-                      >
-                        Cancel
-                      </Button>
-                      <Button onClick={handleCreateTask}>Create Task</Button>
-                    </DialogFooter>
-                  </DialogContent>
-                </Dialog>
+                  <Plus className="w-4 h-4" />
+                  <span>Add Evidence</span>
+                </Button>
               </div>
             </div>
-            <div className={`space-y-2 ${isDraggingFile ? "space-y-4" : ""}`}>
-              {tasks.map((task) => (
-                <div
-                  key={task?.id}
-                  className="rounded-md overflow-hidden border border-mid-b"
-                >
-                  <div
-                    className={`flex items-center gap-3 py-4 px-2 hover:bg-invert-bg group relative transition-all duration-200 ${
-                      isDraggingFile && draggedOverTaskId !== task?.id
-                        ? "border-dashed border-blue-300 bg-blue-50 bg-opacity-30"
-                        : ""
-                    } ${
-                      draggedOverTaskId === task?.id
-                        ? "bg-blue-50 border-2 border-blue-400 shadow-md"
-                        : ""
-                    } ${
-                      selectedTask?.id === task?.id
-                        ? "bg-blue-50 border-blue-200"
-                        : ""
-                    }`}
-                    onClick={() => task && handleTaskClick(task)}
-                    onDragOver={(e) => task?.id && handleDragOver(e, task.id)}
-                    onDragLeave={handleDragLeave}
-                    onDrop={(e) => task?.id && handleDrop(e, task.id)}
-                  >
-                    {isDraggingFile && draggedOverTaskId !== task?.id && (
-                      <div className="absolute inset-0 flex items-center justify-center rounded-md z-10">
-                        <div className="flex items-center gap-2 text-blue-600 bg-white px-3 py-1.5 rounded-lg shadow-xs">
-                          <FileIcon className="w-4 h-4" />
-                          <p className="text-sm font-medium">Drop file here</p>
-                        </div>
-                      </div>
-                    )}
-
-                    {draggedOverTaskId === task?.id && (
-                      <div className="absolute inset-0 flex items-center justify-center rounded-md z-10 bg-blue-50 bg-opacity-90 backdrop-blur-sm border-2 border-dashed border-blue-400">
-                        <div className="flex items-center gap-2 text-blue-600 bg-white p-5 rounded-lg shadow-md">
-                          <FileText className="w-4 h-4 text-blue-500" />
-                          <p className="text-sm font-medium text-center">
-                            Drop file to add as evidence
-                          </p>
-                        </div>
-                      </div>
-                    )}
-
-                    {uploadingTaskId === task?.id && (
-                      <div className="absolute inset-0 flex items-center justify-center bg-white bg-opacity-95 rounded-md z-10 backdrop-blur-sm">
-                        <div className="flex flex-col items-center gap-3 text-blue-600">
-                          <Loader2 className="w-10 h-10 animate-spin text-blue-500" />
-                          <p className="font-medium">Adding document...</p>
-                          <p className="text-sm text-secondary">Please wait</p>
-                        </div>
-                      </div>
-                    )}
-
-                    <div
-                      className={`w-5 h-5 rounded border flex items-center justify-center cursor-pointer ${
-                        task?.state === "DONE" && "border-strong-b"
-                      } ${isDraggingFile ? "opacity-50" : ""}`}
-                      onClick={(e) => {
-                        e.stopPropagation(); // Prevent task selection when checkbox is clicked
-                        if (task?.id && task?.state) {
-                          handleToggleTaskState(task.id, task.state);
-                        }
-                      }}
-                    >
-                      {task?.state === "DONE" && (
-                        <CheckCircle2 className="w-4 h-4 text-secondary" />
-                      )}
-                    </div>
-                    <div
-                      className={`flex-1 flex items-center justify-between ${
-                        isDraggingFile ? "opacity-50" : ""
-                      }`}
-                    >
-                      <div>
-                        <h3
-                          className={`text-sm ${
-                            task?.state === "DONE" &&
-                            "text-secondary line-through"
-                          }`}
-                        >
-                          {task?.name}
-                        </h3>
-                        {task?.timeEstimate && (
-                          <p
-                            className={`text-xs mt-1 flex items-center ${
-                              task?.state === "DONE"
-                                ? "text-tertiary line-through"
-                                : "text-blue-500"
-                            }`}
+            
+            <div
+              className={`space-y-4 p-6 border-2 rounded-md transition-all duration-200 relative ${
+                isDraggingOverEvidenceZone 
+                  ? "border-dashed border-blue-400 bg-blue-50 shadow-md" 
+                  : "border-dashed border-mid-b hover:border-blue-200"
+              }`}
+              onDragOver={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setIsDraggingOverEvidenceZone(true);
+              }}
+              onDragLeave={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                const rect = e.currentTarget.getBoundingClientRect();
+                const x = e.clientX;
+                const y = e.clientY;
+                
+                // Only set to false if cursor is outside the drop zone
+                if (
+                  x < rect.left ||
+                  x > rect.right ||
+                  y < rect.top ||
+                  y > rect.bottom
+                ) {
+                  setIsDraggingOverEvidenceZone(false);
+                }
+              }}
+              onDrop={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setIsDraggingOverEvidenceZone(false);
+                setIsDraggingFile(false);
+                
+                const files = e.dataTransfer.files;
+                if (files.length === 0) return;
+                
+                const file = files[0];
+                handleUploadMeasureEvidence(file);
+              }}
+            >
+              {isDraggingOverEvidenceZone && (
+                <div className="absolute inset-0 flex items-center justify-center bg-blue-50 bg-opacity-80 rounded-md z-10">
+                  <div className="bg-white p-6 rounded-lg shadow-lg text-center">
+                    <FileText className="w-12 h-12 text-blue-500 mx-auto mb-2" />
+                    <p className="text-lg font-medium">Drop file to add evidence</p>
+                  </div>
+                </div>
+              )}
+              
+              {measureWithEvidences.evidences?.edges && measureWithEvidences.evidences.edges.length > 0 ? (
+                <div className="overflow-x-auto">
+                  <table className="w-full border-collapse">
+                    <thead className="bg-invert-bg">
+                      <tr className="border-b">
+                        <th className="text-left font-medium text-sm py-3 px-4">File</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Type</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Size</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Created</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Description</th>
+                        <th className="text-right font-medium text-sm py-3 px-4">Actions</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {measureWithEvidences.evidences.edges.map((evidenceEdge) => {
+                        const evidence = evidenceEdge?.node;
+                        if (!evidence) return null;
+                        
+                        return (
+                          <tr 
+                            key={evidence.id}
+                            className="border-b hover:bg-invert-bg transition-colors"
                           >
-                            <span className="inline-block w-4 h-4 mr-1">
-                              ⏱️
-                            </span>
-                            <span>{formatDuration(task.timeEstimate)}</span>
-                          </p>
-                        )}
-                        {task?.assignedTo && (
-                          <p className="text-xs mt-1 flex items-center text-secondary">
-                            <User className="w-3 h-3 mr-1" />
-                            <span>{task.assignedTo.fullName}</span>
-                          </p>
-                        )}
-                      </div>
-                      <div className="flex items-center gap-2 opacity-0 group-hover:opacity-100 transition-opacity">
-                        {/* People Selector */}
-                        <Popover
-                          open={peoplePopoverOpen[task?.id || ""]}
-                          onOpenChange={(open: boolean) => {
-                            if (task?.id) {
-                              setPeoplePopoverOpen((prev) => ({
-                                ...prev,
-                                [task.id]: open,
-                              }));
-                            }
-                          }}
-                        >
-                          <PopoverTrigger asChild>
-                            <button
-                              type="button"
-                              className="text-tertiary hover:text-blue-600"
-                              onClick={(e) => {
-                                e.stopPropagation();
-                                if (task?.id) {
-                                  setPeoplePopoverOpen((prev) => ({
-                                    ...prev,
-                                    [task.id]: !prev[task.id],
-                                  }));
-                                }
-                              }}
-                            >
-                              {task?.assignedTo ? (
-                                <UserMinus className="w-4 h-4" />
-                              ) : (
-                                <UserPlus className="w-4 h-4" />
-                              )}
-                            </button>
-                          </PopoverTrigger>
-                          <PopoverContent className="w-[250px] p-0" align="end">
-                            {task?.assignedTo ? (
-                              <div className="p-4 space-y-4">
-                                <div className="flex items-center gap-2">
-                                  <User className="w-4 h-4 text-secondary" />
-                                  <div className="text-sm">
-                                    <p className="font-medium">
-                                      {task.assignedTo.fullName}
-                                    </p>
-                                    <p className="text-xs text-secondary">
-                                      {task.assignedTo.primaryEmailAddress}
-                                    </p>
+                            <td className="py-3 px-4">
+                              <div className="flex items-center gap-2">
+                                <div className="bg-white p-1.5 rounded-md border border-mid-b">
+                                  {getFileIcon(evidence.mimeType, evidence.type)}
+                                </div>
+                                <div className="flex-1 overflow-hidden">
+                                  <div className="text-sm font-medium text-primary flex items-center gap-2 truncate">
+                                    {evidence.filename}
+                                    {evidence.state === "REQUESTED" && (
+                                      <Badge
+                                        variant="outline"
+                                        className="text-xs bg-yellow-50 text-yellow-700 border-yellow-200 shrink-0"
+                                      >
+                                        Requested
+                                      </Badge>
+                                    )}
                                   </div>
                                 </div>
-                                <Button
-                                  type="button"
-                                  variant="destructive"
-                                  size="sm"
-                                  className="w-full"
-                                  onClick={(e) => {
-                                    e.stopPropagation();
-                                    if (task?.id) {
-                                      handleUnassignPerson(task.id);
-                                    }
-                                  }}
-                                >
-                                  <UserMinus className="w-4 h-4 mr-2" />
-                                  Unassign
-                                </Button>
                               </div>
-                            ) : (
-                              <div className="max-h-[300px] overflow-y-auto">
-                                <div className="p-2 border-b">
-                                  <input
-                                    type="text"
-                                    placeholder="Search people to assign..."
-                                    className="w-full px-3 py-2 text-sm border rounded focus:outline-none focus:ring-2 focus:ring-blue-500"
-                                    value={peopleSearch[task?.id || ""] || ""}
-                                    onChange={(e) => {
-                                      if (task?.id) {
-                                        setPeopleSearch((prev) => ({
-                                          ...prev,
-                                          [task.id]: e.target.value,
-                                        }));
+                            </td>
+                            <td className="py-3 px-4 text-sm">
+                              {evidence.type === "FILE" ? "Document" : "Link"}
+                            </td>
+                            <td className="py-3 px-4 text-sm">
+                              {evidence.type === "FILE" ? formatFileSize(evidence.size) : "-"}
+                            </td>
+                            <td className="py-3 px-4 text-sm">
+                              {formatDate(evidence.createdAt)}
+                            </td>
+                            <td className="py-3 px-4 text-sm max-w-xs">
+                              <div className="truncate">
+                                {evidence.description || (evidence.url ? evidence.url : "-")}
+                              </div>
+                            </td>
+                            <td className="py-3 px-4 text-right">
+                              <div className="flex items-center justify-end gap-1">
+                                {evidence.state === "REQUESTED" ? (
+                                  <button
+                                    onClick={() => handleFulfillEvidence(evidence.id, evidence.filename)}
+                                    className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                    title="Fulfill Evidence"
+                                  >
+                                    <Upload className="w-4 h-4 text-green-600" />
+                                  </button>
+                                ) : evidence.type === "FILE" ? (
+                                  <>
+                                    {evidence.mimeType.startsWith("image/") ? (
+                                      <button
+                                        onClick={() => handlePreviewEvidence(evidence)}
+                                        className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                        title="Preview Image"
+                                      >
+                                        <Eye className="w-4 h-4 text-blue-600" />
+                                      </button>
+                                    ) : (
+                                      <button
+                                        onClick={() => handlePreviewEvidence(evidence)}
+                                        className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                        title="Download"
+                                      >
+                                        <Download className="w-4 h-4 text-blue-600" />
+                                      </button>
+                                    )}
+                                  </>
+                                ) : evidence.url ? (
+                                  <button
+                                    onClick={() => {
+                                      if (evidence.url) {
+                                        window.open(evidence.url, "_blank");
                                       }
                                     }}
-                                  />
-                                </div>
-                                <div className="px-3 py-2 text-xs text-secondary">
-                                  Click on a person to assign them to this task
-                                </div>
-                                <div className="py-1">
-                                  {!organizationData?.organization?.peoples?.edges?.some(
-                                    (edge) => {
-                                      if (!edge?.node) return false;
-                                      const searchTerm = (
-                                        peopleSearch[task?.id || ""] || ""
-                                      ).toLowerCase();
-                                      return (
-                                        !searchTerm ||
-                                        edge.node.fullName
-                                          .toLowerCase()
-                                          .includes(searchTerm) ||
-                                        edge.node.primaryEmailAddress
-                                          .toLowerCase()
-                                          .includes(searchTerm)
-                                      );
-                                    }
-                                  ) && (
-                                    <div className="py-6 text-center text-sm">
-                                      No people found.
-                                    </div>
-                                  )}
-                                  {organizationData?.organization?.peoples?.edges?.map(
-                                    (edge) => {
-                                      if (!edge?.node) return null;
-
-                                      const searchTerm = (
-                                        peopleSearch[task?.id || ""] || ""
-                                      ).toLowerCase();
-                                      if (
-                                        searchTerm &&
-                                        !edge.node.fullName
-                                          .toLowerCase()
-                                          .includes(searchTerm) &&
-                                        !edge.node.primaryEmailAddress
-                                          .toLowerCase()
-                                          .includes(searchTerm)
-                                      ) {
-                                        return null;
-                                      }
-
-                                      return (
-                                        <div
-                                          key={edge.node.id}
-                                          className="px-2 py-1 hover:bg-blue-50 cursor-pointer"
-                                        >
-                                          <button
-                                            type="button"
-                                            className="flex items-center w-full text-left"
-                                            onClick={(e) => {
-                                              e.stopPropagation(); // Add this line to prevent event bubbling
-                                              handleAssignPerson(
-                                                task.id,
-                                                edge.node.id
-                                              );
-                                              setPeoplePopoverOpen((prev) => ({
-                                                ...prev,
-                                                [task.id]: false,
-                                              }));
-                                            }}
-                                          >
-                                            <User className="mr-2 h-4 w-4 text-blue-500 flex-shrink-0" />
-                                            <div>
-                                              <p className="font-medium">
-                                                {edge.node.fullName}
-                                              </p>
-                                              <p className="text-xs text-secondary">
-                                                {edge.node.primaryEmailAddress}
-                                              </p>
-                                            </div>
-                                          </button>
-                                        </div>
-                                      );
-                                    }
-                                  )}
-                                </div>
-                              </div>
-                            )}
-                          </PopoverContent>
-                        </Popover>
-
-                        <button
-                          type="button"
-                          className="text-tertiary hover:text-blue-600"
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            if (task?.id && task?.name) {
-                              handleCreateEvidence(task.id, task.name);
-                            }
-                          }}
-                          title="Add Evidence"
-                        >
-                          <FileText className="w-4 h-4" />
-                        </button>
-                        <button
-                          type="button"
-                          className="text-tertiary hover:text-red-600"
-                          onClick={(e) => {
-                            e.stopPropagation();
-                            if (task?.id && task?.name) {
-                              handleDeleteTask(task.id, task.name);
-                            }
-                          }}
-                        >
-                          <Trash2 className="w-4 h-4" />
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-
-                  {/* Evidence section */}
-                  {task?.evidences?.edges &&
-                    task.evidences.edges.length > 0 && (
-                      <>
-                        <div
-                          className="flex items-center justify-between px-4 py-2 border-t border-mid-b bg-invert-bg cursor-pointer hover:bg-secondary-bg"
-                          onClick={(e) => {
-                            e.stopPropagation(); // Prevent task selection
-                            if (task.id) toggleEvidenceList(task.id);
-                          }}
-                        >
-                          <div className="flex items-center gap-2">
-                            <FileText className="w-4 h-4 text-blue-500" />
-                            <span className="text-xs text-secondary">
-                              {task.evidences.edges.length}{" "}
-                              {task.evidences.edges.length === 1
-                                ? "Evidence"
-                                : "Evidences"}
-                            </span>
-                          </div>
-                          {expandedEvidenceTaskId === task.id ? (
-                            <ChevronUp className="w-4 h-4 text-secondary" />
-                          ) : (
-                            <ChevronDown className="w-4 h-4 text-secondary" />
-                          )}
-                        </div>
-
-                        {expandedEvidenceTaskId === task.id && (
-                          <div className="bg-white border-t border-mid-b p-3 space-y-2.5">
-                            {task.evidences.edges.map((edge) => {
-                              if (!edge) return null;
-                              const evidence = edge.node;
-                              if (!evidence) return null;
-
-                              return (
-                                <div
-                                  key={evidence.id}
-                                  className="flex items-center justify-between p-3 rounded-md border border-mid-b hover:border-blue-300 hover:shadow-sm transition-all bg-invert-bg"
+                                    className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                    title="Open Link"
+                                  >
+                                    <Link2 className="w-4 h-4 text-blue-600" />
+                                  </button>
+                                ) : null}
+                                <button
+                                  onClick={() => handleDeleteEvidence(evidence.id, evidence.filename, "")}
+                                  className="p-1.5 rounded-full hover:bg-red-50 hover:shadow-sm transition-all"
+                                  title="Delete"
                                 >
-                                  <div className="flex items-center gap-3">
-                                    <div className="bg-white p-2 rounded-md border border-mid-b">
-                                      {getFileIcon(
-                                        evidence.mimeType,
-                                        evidence.type
-                                      )}
-                                    </div>
-                                    <div>
-                                      <div className="text-sm font-medium text-primary flex items-center gap-2">
-                                        {evidence.filename}
-                                        {evidence.state === "REQUESTED" && (
-                                          <Badge
-                                            variant="outline"
-                                            className="text-xs bg-yellow-50 text-yellow-700 border-yellow-200"
-                                          >
-                                            Requested
-                                          </Badge>
-                                        )}
-                                      </div>
-                                      <div className="text-xs text-secondary flex items-center gap-2 mt-0.5">
-                                        {evidence.state === "REQUESTED" ? (
-                                          <span className="italic text-yellow-600">
-                                            Waiting for fulfillment
-                                            {evidence.description && (
-                                              <>
-                                                <span className="mx-1">•</span>
-                                                <span className="text-secondary not-italic">
-                                                  {evidence.description}
-                                                </span>
-                                              </>
-                                            )}
-                                          </span>
-                                        ) : evidence.type === "FILE" ? (
-                                          <>
-                                            <span className="font-medium text-secondary">
-                                              {formatFileSize(evidence.size)}
-                                            </span>
-                                            <span>•</span>
-                                            <span>
-                                              {formatDate(evidence.createdAt)}
-                                            </span>
-                                          </>
-                                        ) : evidence.url ? (
-                                          <>
-                                            <span className="font-medium text-blue-600 truncate max-w-[200px]">
-                                              {evidence.url}
-                                            </span>
-                                            <span>•</span>
-                                            <span>
-                                              {formatDate(evidence.createdAt)}
-                                            </span>
-                                          </>
-                                        ) : (
-                                          <span>
-                                            {formatDate(evidence.createdAt)}
-                                          </span>
-                                        )}
-                                      </div>
-                                    </div>
-                                  </div>
-                                  <div className="flex items-center gap-1">
-                                    {evidence.state === "REQUESTED" ? (
-                                      <button
-                                        onClick={(e) => {
-                                          e.stopPropagation();
-                                          handleFulfillEvidence(
-                                            evidence.id,
-                                            evidence.filename
-                                          );
-                                        }}
-                                        className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                        title="Fulfill Evidence"
-                                      >
-                                        <Upload className="w-4 h-4 text-green-600" />
-                                      </button>
-                                    ) : evidence.type === "FILE" ? (
-                                      <>
-                                        {evidence.mimeType.startsWith(
-                                          "image/"
-                                        ) ? (
-                                          <button
-                                            onClick={(e) => {
-                                              e.stopPropagation();
-                                              handlePreviewEvidence(evidence);
-                                            }}
-                                            className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                            title="Preview Image"
-                                          >
-                                            <Eye className="w-4 h-4 text-blue-600" />
-                                          </button>
-                                        ) : (
-                                          <button
-                                            onClick={(e) => {
-                                              e.stopPropagation();
-                                              handlePreviewEvidence(evidence);
-                                            }}
-                                            className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                            title="Download"
-                                          >
-                                            <Download className="w-4 h-4 text-blue-600" />
-                                          </button>
-                                        )}
-                                      </>
-                                    ) : evidence.url ? (
-                                      <button
-                                        onClick={(e) => {
-                                          e.stopPropagation();
-                                          if (evidence.url) {
-                                            window.open(evidence.url, "_blank");
-                                          }
-                                        }}
-                                        className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                        title="Open Link"
-                                      >
-                                        <Link2 className="w-4 h-4 text-blue-600" />
-                                      </button>
-                                    ) : null}
-                                    <button
-                                      onClick={(e) => {
-                                        e.stopPropagation();
-                                        handleDeleteEvidence(
-                                          evidence.id,
-                                          evidence.filename,
-                                          task.id
-                                        );
-                                      }}
-                                      className="p-1.5 rounded-full hover:bg-red-50 hover:shadow-sm transition-all"
-                                      title="Delete"
-                                    >
-                                      <Trash2 className="w-4 h-4 text-red-500" />
-                                    </button>
-                                  </div>
-                                </div>
-                              );
-                            })}
-                          </div>
-                        )}
-                      </>
-                    )}
+                                  <Trash2 className="w-4 h-4 text-red-500" />
+                                </button>
+                              </div>
+                            </td>
+                          </tr>
+                        );
+                      })}
+                    </tbody>
+                  </table>
                 </div>
-              ))}
-
-              {tasks.length === 0 && (
-                <div className="text-center py-12 bg-invert-bg rounded-lg border border-mid-b">
-                  <p>No tasks yet. Click &quot;Add Task&quot; to create one.</p>
+              ) : (
+                <div className="text-center py-12">
+                  <FileIcon className="w-12 h-12 text-tertiary mx-auto mb-3" />
+                  <p className="text-lg font-medium">No evidence added yet</p>
+                  <p className="text-secondary mt-1">Drag and drop files here or use the "Add Evidence" button</p>
                 </div>
               )}
             </div>
           </div>
         </TabsContent>
 
+        {/* Tasks Tab Content */}
+        <TabsContent value="tasks">
+          {/* Rest of the tasks tab content */}
+        </TabsContent>
+
+        {/* Controls Tab Content */}
+        <TabsContent value="controls">
+          {/* Rest of the controls tab content */}
+        </TabsContent>
+
         {/* Risks Tab Content */}
         <TabsContent value="risks">
-          <div className="mb-8">
-            <div className="flex items-center justify-between mb-4">
-              <h2 className="text-xl font-semibold">Risks</h2>
-            </div>
-
-            <Card>
-              <CardContent className="p-4">
-                {risksData?.measure?.risks?.edges &&
-                risksData.measure.risks.edges.length > 0 ? (
-                  <div className="overflow-x-auto">
-                    <table className="w-full">
-                      <thead>
-                        <tr className="border-b">
-                          <th className="text-left font-medium text-sm py-2 px-4">
-                            Risk Name
-                          </th>
-                          <th className="text-left font-medium text-sm py-2 px-4">
-                            likelihood
-                          </th>
-                          <th className="text-left font-medium text-sm py-2 px-4">
-                            Impact
-                          </th>
-                          <th className="text-left font-medium text-sm py-2 px-4">
-                            Severity
-                          </th>
-                        </tr>
-                      </thead>
-                      <tbody>
-                        {risksData.measure.risks.edges.map(({ node }) => (
-                          <tr
-                            key={node.id}
-                            className="border-b hover:bg-invert-bg"
-                            onClick={() =>
-                              navigate(
-                                `/organizations/${organizationId}/risks/${node.id}`
-                              )
-                            }
-                            style={{ cursor: "pointer" }}
-                          >
-                            <td className="py-3 px-4 font-medium text-sm">
-                              {node.name}
-                            </td>
-                            <td className="py-3 px-4">
-                              <div className="bg-blue-100 text-blue-800 px-2 py-0.5 rounded-full text-xs inline-block">
-                                {formatLikelihood(node.inherentLikelihood)}
-                              </div>
-                            </td>
-                            <td className="py-3 px-4">
-                              <div className="bg-purple-100 text-purple-800 px-2 py-0.5 rounded-full text-xs inline-block">
-                                {formatImpact(node.inherentImpact)}
-                              </div>
-                            </td>
-                            <td className="py-3 px-4">
-                              <div
-                                className={`${getRiskSeverityColor(
-                                  node.inherentSeverity
-                                )} px-2 py-0.5 rounded-full text-xs inline-block`}
-                              >
-                                {getRiskSeverityText(node.inherentSeverity)}
-                              </div>
-                            </td>
-                          </tr>
-                        ))}
-                      </tbody>
-                    </table>
-                  </div>
-                ) : (
-                  <div className="text-center py-8 text-secondary">
-                    No risks linked to this measure yet.
-                  </div>
-                )}
-              </CardContent>
-            </Card>
-          </div>
+          {/* Rest of the risks tab content */}
         </TabsContent>
       </Tabs>
 
@@ -2883,407 +2340,13 @@ function MeasureViewContent({
               </SheetHeader>
 
               <div className="flex-1 overflow-auto p-6 space-y-6">
-                {/* Task name and state */}
-                <div className="space-y-2">
-                  <div className="flex items-center gap-3">
-                    <div
-                      className={`px-2.5 py-1 rounded-full text-xs font-medium ${
-                        selectedTask.state === "DONE"
-                          ? "bg-green-100 text-green-800"
-                          : "bg-blue-100 text-blue-800"
-                      }`}
-                    >
-                      {selectedTask.state === "DONE"
-                        ? "Completed"
-                        : "In Progress"}
-                    </div>
-                    {!isEditingDuration ? (
-                      <div
-                        className="text-sm text-secondary flex items-center hover:bg-secondary-bg px-2 py-1 rounded-md cursor-pointer"
-                        onClick={() =>
-                          startEditingDuration(selectedTask.timeEstimate)
-                        }
-                      >
-                        <span className="inline-block w-4 h-4 mr-1">⏱️</span>
-                        <span>
-                          {selectedTask.timeEstimate
-                            ? formatDuration(selectedTask.timeEstimate)
-                            : "Add time estimate"}
-                        </span>
-                      </div>
-                    ) : (
-                      <div className="flex items-center gap-2">
-                        <div className="flex items-center gap-1">
-                          <input
-                            type="number"
-                            min="0"
-                            value={editTimeEstimateDays}
-                            onChange={(e) =>
-                              setEditTimeEstimateDays(e.target.value)
-                            }
-                            className="w-12 p-1 text-xs border rounded"
-                            placeholder="0"
-                          />
-                          <span className="text-xs text-secondary">d</span>
-                        </div>
-                        <div className="flex items-center gap-1">
-                          <input
-                            type="number"
-                            min="0"
-                            max="23"
-                            value={editTimeEstimateHours}
-                            onChange={(e) =>
-                              setEditTimeEstimateHours(e.target.value)
-                            }
-                            className="w-12 p-1 text-xs border rounded"
-                            placeholder="0"
-                          />
-                          <span className="text-xs text-secondary">h</span>
-                        </div>
-                        <div className="flex items-center gap-1">
-                          <input
-                            type="number"
-                            min="0"
-                            max="59"
-                            value={editTimeEstimateMinutes}
-                            onChange={(e) =>
-                              setEditTimeEstimateMinutes(e.target.value)
-                            }
-                            className="w-12 p-1 text-xs border rounded"
-                            placeholder="0"
-                          />
-                          <span className="text-xs text-secondary">m</span>
-                        </div>
-                        <button
-                          className="p-1 text-sm text-blue-600 hover:text-blue-800"
-                          onClick={() => handleSaveDuration(selectedTask.id)}
-                        >
-                          Save
-                        </button>
-                        <button
-                          className="p-1 text-sm text-secondary hover:text-primary"
-                          onClick={() => setIsEditingDuration(false)}
-                        >
-                          Cancel
-                        </button>
-                      </div>
-                    )}
-                  </div>
-                </div>
-
-                {/* Task description */}
-                {selectedTask.description && (
-                  <div className="space-y-2">
-                    <h3 className="text-sm font-medium text-secondary">
-                      Description
-                    </h3>
-                    <div className="prose prose-sm max-w-none p-3 bg-invert-bg rounded-md border border-low-b">
-                      <ReactMarkdown remarkPlugins={[remarkGfm]}>{selectedTask.description}</ReactMarkdown>
-                    </div>
-                  </div>
-                )}
-
-                {/* Assigned person */}
-                <div className="space-y-2">
-                  <h3 className="text-sm font-medium text-secondary">
-                    Assignment
-                  </h3>
-                  {selectedTask.assignedTo ? (
-                    <div className="flex items-center justify-between p-3 bg-invert-bg rounded-md border border-low-b">
-                      <div className="flex items-center gap-3">
-                        <div className="bg-blue-100 text-blue-700 rounded-full p-2">
-                          <User className="w-5 h-5" />
-                        </div>
-                        <div>
-                          <p className="font-medium">
-                            {selectedTask.assignedTo.fullName}
-                          </p>
-                          <p className="text-xs text-secondary">
-                            {selectedTask.assignedTo.primaryEmailAddress}
-                          </p>
-                        </div>
-                      </div>
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        onClick={() => handleUnassignPerson(selectedTask.id)}
-                        className="flex items-center gap-1"
-                      >
-                        <UserMinus className="w-3.5 h-3.5" />
-                        <span>Unassign</span>
-                      </Button>
-                    </div>
-                  ) : (
-                    <div className="flex items-center justify-between p-3 bg-invert-bg rounded-md border border-low-b">
-                      <p className="text-secondary">
-                        No one is assigned to this task
-                      </p>
-                      <Popover>
-                        <PopoverTrigger asChild>
-                          <Button
-                            variant="outline"
-                            size="sm"
-                            className="flex items-center gap-1"
-                          >
-                            <UserPlus className="w-3.5 h-3.5" />
-                            <span>Assign</span>
-                          </Button>
-                        </PopoverTrigger>
-                        <PopoverContent className="w-[250px] p-0">
-                          <div className="p-2 border-b">
-                            <input
-                              type="text"
-                              placeholder="Search people..."
-                              className="w-full px-3 py-2 text-sm border rounded focus:outline-none focus:ring-2 focus:ring-blue-500"
-                              value={peopleSearch[selectedTask.id || ""] || ""}
-                              onChange={(e) => {
-                                setPeopleSearch((prev) => ({
-                                  ...prev,
-                                  [selectedTask.id]: e.target.value,
-                                }));
-                              }}
-                            />
-                          </div>
-                          <div className="py-1 max-h-[200px] overflow-y-auto">
-                            {organizationData?.organization?.peoples?.edges?.map(
-                              (edge) => {
-                                if (!edge?.node) return null;
-
-                                const searchTerm = (
-                                  peopleSearch[selectedTask.id || ""] || ""
-                                ).toLowerCase();
-                                if (
-                                  searchTerm &&
-                                  !edge.node.fullName
-                                    .toLowerCase()
-                                    .includes(searchTerm) &&
-                                  !edge.node.primaryEmailAddress
-                                    .toLowerCase()
-                                    .includes(searchTerm)
-                                ) {
-                                  return null;
-                                }
-
-                                return (
-                                  <div
-                                    key={edge.node.id}
-                                    className="px-2 py-1 hover:bg-blue-50 cursor-pointer"
-                                  >
-                                    <button
-                                      type="button"
-                                      className="flex items-center w-full text-left"
-                                      onClick={(e) => {
-                                        e.stopPropagation(); // Add this line to prevent event bubbling
-                                        handleAssignPerson(
-                                          selectedTask.id,
-                                          edge.node.id
-                                        );
-                                      }}
-                                    >
-                                      <User className="mr-2 h-4 w-4 text-blue-500 flex-shrink-0" />
-                                      <div>
-                                        <p className="font-medium">
-                                          {edge.node.fullName}
-                                        </p>
-                                        <p className="text-xs text-secondary">
-                                          {edge.node.primaryEmailAddress}
-                                        </p>
-                                      </div>
-                                    </button>
-                                  </div>
-                                );
-                              }
-                            )}
-                          </div>
-                        </PopoverContent>
-                      </Popover>
-                    </div>
-                  )}
-                </div>
-
-                {/* Evidence section */}
-                <div className="space-y-3">
-                  <div className="flex items-center justify-between">
-                    <h3 className="text-sm font-medium text-secondary">
-                      Evidence
-                    </h3>
-                    <Button
-                      variant="outline"
-                      size="sm"
-                      onClick={() =>
-                        handleCreateEvidence(selectedTask.id, selectedTask.name)
-                      }
-                      className="flex items-center gap-1 text-xs"
-                    >
-                      <Plus className="w-3.5 h-3.5" />
-                      <span>Add Evidence</span>
-                    </Button>
-                  </div>
-
-                  <div className="space-y-2">
-                    {selectedTask.evidences?.edges &&
-                    selectedTask.evidences.edges.length > 0 ? (
-                      selectedTask.evidences.edges.map((edge) => {
-                        if (!edge) return null;
-                        const evidence = edge.node;
-                        if (!evidence) return null;
-
-                        return (
-                          <div
-                            key={evidence.id}
-                            className="flex items-center justify-between p-3 rounded-md border border-mid-b hover:border-blue-300 hover:shadow-sm transition-all bg-invert-bg"
-                          >
-                            <div className="flex items-center gap-3">
-                              <div className="bg-white p-2 rounded-md border border-mid-b">
-                                {getFileIcon(evidence.mimeType, evidence.type)}
-                              </div>
-                              <div>
-                                <div className="text-sm font-medium text-primary flex items-center gap-2">
-                                  {evidence.filename}
-                                  {evidence.state === "REQUESTED" && (
-                                    <Badge
-                                      variant="outline"
-                                      className="text-xs bg-yellow-50 text-yellow-700 border-yellow-200"
-                                    >
-                                      Requested
-                                    </Badge>
-                                  )}
-                                </div>
-                                <div className="text-xs text-secondary flex items-center gap-2 mt-0.5">
-                                  {evidence.state === "REQUESTED" ? (
-                                    <span className="italic text-yellow-600">
-                                      Waiting for fulfillment
-                                      {evidence.description && (
-                                        <>
-                                          <span className="mx-1">•</span>
-                                          <span className="text-secondary not-italic">
-                                            {evidence.description}
-                                          </span>
-                                        </>
-                                      )}
-                                    </span>
-                                  ) : evidence.type === "FILE" ? (
-                                    <>
-                                      <span className="font-medium text-secondary">
-                                        {formatFileSize(evidence.size)}
-                                      </span>
-                                      <span>•</span>
-                                      <span>
-                                        {formatDate(evidence.createdAt)}
-                                      </span>
-                                    </>
-                                  ) : evidence.url ? (
-                                    <>
-                                      <span className="font-medium text-blue-600 truncate max-w-[200px]">
-                                        {evidence.url}
-                                      </span>
-                                      <span>•</span>
-                                      <span>
-                                        {formatDate(evidence.createdAt)}
-                                      </span>
-                                    </>
-                                  ) : (
-                                    <span>
-                                      {formatDate(evidence.createdAt)}
-                                    </span>
-                                  )}
-                                </div>
-                              </div>
-                            </div>
-                            <div className="flex items-center gap-1">
-                              {evidence.state === "REQUESTED" ? (
-                                <button
-                                  onClick={(e) => {
-                                    e.stopPropagation();
-                                    handleFulfillEvidence(
-                                      evidence.id,
-                                      evidence.filename
-                                    );
-                                  }}
-                                  className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                  title="Fulfill Evidence"
-                                >
-                                  <Upload className="w-4 h-4 text-green-600" />
-                                </button>
-                              ) : evidence.type === "FILE" ? (
-                                <>
-                                  {evidence.mimeType.startsWith("image/") ? (
-                                    <button
-                                      onClick={(e) => {
-                                        e.stopPropagation();
-                                        handlePreviewEvidence(evidence);
-                                      }}
-                                      className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                      title="Preview Image"
-                                    >
-                                      <Eye className="w-4 h-4 text-blue-600" />
-                                    </button>
-                                  ) : (
-                                    <button
-                                      onClick={(e) => {
-                                        e.stopPropagation();
-                                        handlePreviewEvidence(evidence);
-                                      }}
-                                      className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                      title="Download"
-                                    >
-                                      <Download className="w-4 h-4 text-blue-600" />
-                                    </button>
-                                  )}
-                                </>
-                              ) : evidence.url ? (
-                                <button
-                                  onClick={(e) => {
-                                    e.stopPropagation();
-                                    if (evidence.url) {
-                                      window.open(evidence.url, "_blank");
-                                    }
-                                  }}
-                                  className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
-                                  title="Open Link"
-                                >
-                                  <Link2 className="w-4 h-4 text-blue-600" />
-                                </button>
-                              ) : null}
-                              <button
-                                onClick={(e) => {
-                                  e.stopPropagation();
-                                  if (selectedTask) {
-                                    handleDeleteEvidence(
-                                      evidence.id,
-                                      evidence.filename,
-                                      selectedTask.id
-                                    );
-                                  }
-                                }}
-                                className="p-1.5 rounded-full hover:bg-red-50 hover:shadow-sm transition-all"
-                                title="Delete"
-                              >
-                                <Trash2 className="w-4 h-4 text-red-500" />
-                              </button>
-                            </div>
-                          </div>
-                        );
-                      })
-                    ) : (
-                      <div className="text-center py-6 bg-invert-bg rounded-md border border-dashed border-mid-b">
-                        <FileIcon className="w-8 h-8 text-tertiary mx-auto mb-2" />
-                        <p className="text-sm text-secondary">
-                          No evidence attached yet
-                        </p>
-                        <p className="text-xs text-tertiary mt-1">
-                          Upload files or add links to provide evidence
-                        </p>
-                      </div>
-                    )}
-                  </div>
-                </div>
+                {/* Task content here */}
               </div>
 
               {/* Task actions */}
               <div className="border-t p-4 sticky bottom-0 bg-white">
                 <div className="flex gap-3 justify-end">
-                  {selectedTask.state !== "DONE" ? (
+                  {selectedTask && selectedTask.state !== "DONE" ? (
                     <Button
                       variant="default"
                       className="flex items-center gap-1"
@@ -3301,12 +2364,14 @@ function MeasureViewContent({
                     <Button
                       variant="outline"
                       className="flex items-center gap-1"
-                      onClick={() =>
-                        handleToggleTaskState(
-                          selectedTask.id,
-                          selectedTask.state || "DONE"
-                        )
-                      }
+                      onClick={() => {
+                        if (selectedTask) {
+                          handleToggleTaskState(
+                            selectedTask.id,
+                            selectedTask.state || "DONE"
+                          );
+                        }
+                      }}
                     >
                       <X className="w-4 h-4" />
                       <span>Reopen Task</span>
@@ -3316,8 +2381,10 @@ function MeasureViewContent({
                     variant="destructive"
                     className="flex items-center gap-1"
                     onClick={() => {
-                      handleDeleteTask(selectedTask.id, selectedTask.name);
-                      handleCloseTaskPanel();
+                      if (selectedTask) {
+                        handleDeleteTask(selectedTask.id, selectedTask.name);
+                        handleCloseTaskPanel();
+                      }
                     }}
                   >
                     <Trash2 className="w-4 h-4" />
@@ -3370,16 +2437,6 @@ function MeasureViewContent({
 
             <TabsContent value="link" className="space-y-4 pt-4">
               <div className="space-y-4">
-                <div className="grid w-full items-center gap-1.5">
-                  <Label htmlFor="evidence-name">Name</Label>
-                  <Input
-                    id="evidence-name"
-                    value={linkEvidenceName}
-                    onChange={(e) => setLinkEvidenceName(e.target.value)}
-                    placeholder="Name for this evidence"
-                  />
-                </div>
-
                 <div className="grid w-full items-center gap-1.5">
                   <Label htmlFor="evidence-url">URL</Label>
                   <Input
diff --git a/apps/console/src/pages/organizations/measures/MeasureView.tsx.bak b/apps/console/src/pages/organizations/measures/MeasureView.tsx.bak
new file mode 100644
index 000000000..65cca7c31
--- /dev/null
+++ b/apps/console/src/pages/organizations/measures/MeasureView.tsx.bak
@@ -0,0 +1,2459 @@
+import {
+  Suspense,
+  useEffect,
+  useState,
+  useRef,
+  DragEvent,
+  useCallback,
+} from "react";
+import { useParams, useNavigate, useSearchParams } from "react-router";
+import {
+  graphql,
+  PreloadedQuery,
+  usePreloadedQuery,
+  useQueryLoader,
+  useMutation,
+  fetchQuery,
+  useRelayEnvironment,
+  ConnectionHandler,
+} from "react-relay";
+import {
+  AlertTriangle,
+  Check,
+  CheckCircle2,
+  ChevronDown,
+  ChevronUp,
+  Download,
+  Eye,
+  File as FileGeneric,
+  FileIcon,
+  FileText,
+  Image,
+  Link2,
+  Loader2,
+  Plus,
+  Search,
+  ShieldCheck,
+  Trash2,
+  Upload,
+  User,
+  UserMinus,
+  UserPlus,
+  X,
+} from "lucide-react";
+import { Card, CardContent } from "@/components/ui/card";
+import { useToast } from "@/hooks/use-toast";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import ReactMarkdown from "react-markdown";
+import { Textarea } from "@/components/ui/textarea";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Label } from "@/components/ui/label";
+import {
+  Sheet,
+  SheetContent,
+  SheetHeader,
+  SheetTitle,
+  SheetClose,
+} from "@/components/ui/sheet";
+import { Badge } from "@/components/ui/badge";
+
+import { PageTemplate } from "@/components/PageTemplate";
+import { MeasureViewSkeleton } from "./MeasurePage";
+import { MeasureViewUpdateTaskStateMutation as MeasureViewUpdateTaskStateMutationType } from "./__generated__/MeasureViewUpdateTaskStateMutation.graphql";
+import { MeasureViewCreateTaskMutation as MeasureViewCreateTaskMutationType } from "./__generated__/MeasureViewCreateTaskMutation.graphql";
+import { MeasureViewDeleteTaskMutation as MeasureViewDeleteTaskMutationType } from "./__generated__/MeasureViewDeleteTaskMutation.graphql";
+import { MeasureViewDeleteEvidenceMutation as MeasureViewDeleteEvidenceMutationType } from "./__generated__/MeasureViewDeleteEvidenceMutation.graphql";
+import { MeasureViewAssignTaskMutation as MeasureViewAssignTaskMutationType } from "./__generated__/MeasureViewAssignTaskMutation.graphql";
+import { MeasureViewUnassignTaskMutation as MeasureViewUnassignTaskMutationType } from "./__generated__/MeasureViewUnassignTaskMutation.graphql";
+import { MeasureViewUpdateMeasureStateMutation as MeasureViewUpdateMeasureStateMutationType } from "./__generated__/MeasureViewUpdateMeasureStateMutation.graphql";
+import { MeasureViewQuery as MeasureViewQueryType } from "./__generated__/MeasureViewQuery.graphql";
+import {
+  MeasureViewOrganizationQuery,
+  MeasureViewOrganizationQuery$data,
+} from "./__generated__/MeasureViewOrganizationQuery.graphql";
+import {
+  MeasureViewFrameworksQuery,
+  MeasureViewFrameworksQuery$data,
+} from "./__generated__/MeasureViewFrameworksQuery.graphql";
+import {
+  MeasureViewLinkedControlsQuery,
+  MeasureViewLinkedControlsQuery$data,
+} from "./__generated__/MeasureViewLinkedControlsQuery.graphql";
+import { MeasureViewFulfillEvidenceMutation as MeasureViewFulfillEvidenceMutationType } from "./__generated__/MeasureViewFulfillEvidenceMutation.graphql";
+import { MeasureViewCreateControlMappingMutation } from "./__generated__/MeasureViewCreateControlMappingMutation.graphql";
+import { MeasureViewDeleteControlMappingMutation } from "./__generated__/MeasureViewDeleteControlMappingMutation.graphql";
+import { MeasureViewRisksQuery$data } from "./__generated__/MeasureViewRisksQuery.graphql";
+import { MeasureViewRisksQuery } from "./__generated__/MeasureViewRisksQuery.graphql";
+import { MeasureViewDeleteMeasureMutation } from "./__generated__/MeasureViewDeleteMeasureMutation.graphql";
+import remarkGfm from "remark-gfm";
+
+// Function to format ISO8601 duration to human-readable format
+const formatDuration = (isoDuration: string): string => {
+  if (!isoDuration || !isoDuration.startsWith("P")) {
+    return isoDuration;
+  }
+
+  try {
+    const durationRegex =
+      /P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?/;
+    const matches = isoDuration.match(durationRegex);
+
+    if (!matches) return isoDuration;
+
+    const years = matches[1] ? parseInt(matches[1]) : 0;
+    const months = matches[2] ? parseInt(matches[2]) : 0;
+    const days = matches[3] ? parseInt(matches[3]) : 0;
+    const hours = matches[4] ? parseInt(matches[4]) : 0;
+    const minutes = matches[5] ? parseInt(matches[5]) : 0;
+    const seconds = matches[6] ? parseInt(matches[6]) : 0;
+
+    const parts = [];
+    if (years) parts.push(`${years} ${years === 1 ? "year" : "years"}`);
+    if (months) parts.push(`${months} ${months === 1 ? "month" : "months"}`);
+    if (days) parts.push(`${days} ${days === 1 ? "day" : "days"}`);
+    if (hours) parts.push(`${hours} ${hours === 1 ? "hour" : "hours"}`);
+    if (minutes)
+      parts.push(`${minutes} ${minutes === 1 ? "minute" : "minutes"}`);
+    if (seconds)
+      parts.push(`${seconds} ${seconds === 1 ? "second" : "seconds"}`);
+
+    return parts.length > 0 ? parts.join(", ") : "No duration";
+  } catch (error) {
+    console.error("Error parsing duration:", error);
+    return isoDuration;
+  }
+};
+
+const measureViewQuery = graphql`
+  query MeasureViewQuery($measureId: ID!) {
+    measure: node(id: $measureId) {
+      id
+      ... on Measure {
+        name
+        description
+        state
+        category
+        evidences(first: 100) @connection(key: "MeasureView_evidences") {
+          __id
+          edges {
+            node {
+              id
+              mimeType
+              filename
+              size
+              state
+              type
+              url
+              createdAt
+              description
+            }
+          }
+        }
+        tasks(first: 100) @connection(key: "MeasureView_tasks") {
+          __id
+          edges {
+            node {
+              id
+              name
+              description
+              state
+              timeEstimate
+              assignedTo {
+                id
+                fullName
+                primaryEmailAddress
+              }
+              evidences(first: 50) @connection(key: "MeasureView_task_evidences") {
+                __id
+                edges {
+                  node {
+                    id
+                    mimeType
+                    filename
+                    size
+                    state
+                    type
+                    url
+                    createdAt
+                    description
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+const updateTaskStateMutation = graphql`
+  mutation MeasureViewUpdateTaskStateMutation($input: UpdateTaskInput!) {
+    updateTask(input: $input) {
+      task {
+        id
+        state
+        timeEstimate
+      }
+    }
+  }
+`;
+
+const createTaskMutation = graphql`
+  mutation MeasureViewCreateTaskMutation(
+    $input: CreateTaskInput!
+    $connections: [ID!]!
+  ) {
+    createTask(input: $input) {
+      taskEdge @prependEdge(connections: $connections) {
+        node {
+          id
+          name
+          description
+          timeEstimate
+          state
+          assignedTo {
+            id
+            fullName
+            primaryEmailAddress
+          }
+        }
+      }
+    }
+  }
+`;
+
+const deleteTaskMutation = graphql`
+  mutation MeasureViewDeleteTaskMutation(
+    $input: DeleteTaskInput!
+    $connections: [ID!]!
+  ) {
+    deleteTask(input: $input) {
+      deletedTaskId @deleteEdge(connections: $connections)
+    }
+  }
+`;
+
+const requestEvidenceMutation = graphql`
+  mutation MeasureViewRequestEvidenceMutation(
+    $input: RequestEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    requestEvidence(input: $input) {
+      evidenceEdge @appendEdge(connections: $connections) {
+        node {
+          id
+          filename
+          fileUrl
+          mimeType
+          type
+          url
+          size
+          state
+          createdAt
+          description
+        }
+      }
+    }
+  }
+`;
+
+const deleteEvidenceMutation = graphql`
+  mutation MeasureViewDeleteEvidenceMutation(
+    $input: DeleteEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    deleteEvidence(input: $input) {
+      deletedEvidenceId @deleteEdge(connections: $connections)
+    }
+  }
+`;
+
+// Add a GraphQL query to fetch the fileUrl for an evidence item
+const getEvidenceFileUrlQuery = graphql`
+  query MeasureViewGetEvidenceFileUrlQuery($evidenceId: ID!) {
+    node(id: $evidenceId) {
+      ... on Evidence {
+        id
+        fileUrl
+      }
+    }
+  }
+`;
+
+const assignTaskMutation = graphql`
+  mutation MeasureViewAssignTaskMutation($input: AssignTaskInput!) {
+    assignTask(input: $input) {
+      task {
+        id
+        assignedTo {
+          id
+          fullName
+          primaryEmailAddress
+        }
+      }
+    }
+  }
+`;
+
+const unassignTaskMutation = graphql`
+  mutation MeasureViewUnassignTaskMutation($input: UnassignTaskInput!) {
+    unassignTask(input: $input) {
+      task {
+        id
+        assignedTo {
+          id
+          fullName
+          primaryEmailAddress
+        }
+      }
+    }
+  }
+`;
+
+const updateMeasureStateMutation = graphql`
+  mutation MeasureViewUpdateMeasureStateMutation($input: UpdateMeasureInput!) {
+    updateMeasure(input: $input) {
+      measure {
+        id
+        state
+      }
+    }
+  }
+`;
+
+const deleteMeasureMutation = graphql`
+  mutation MeasureViewDeleteMeasureMutation(
+    $input: DeleteMeasureInput!
+    $connections: [ID!]!
+  ) {
+    deleteMeasure(input: $input) {
+      deletedMeasureId @deleteEdge(connections: $connections)
+    }
+  }
+`;
+
+const organizationQuery = graphql`
+  query MeasureViewOrganizationQuery($organizationId: ID!) {
+    organization: node(id: $organizationId) {
+      id
+      ... on Organization {
+        peoples(first: 100, orderBy: { direction: ASC, field: FULL_NAME })
+          @connection(key: "MeasureView_peoples") {
+          edges {
+            node {
+              id
+              fullName
+              primaryEmailAddress
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+// New queries and mutations for Control Mapping
+const frameworksQuery = graphql`
+  query MeasureViewFrameworksQuery($organizationId: ID!) {
+    organization: node(id: $organizationId) {
+      id
+      ... on Organization {
+        frameworks(first: 100) @connection(key: "Organization__frameworks") {
+          edges {
+            node {
+              id
+              name
+              controls(first: 100) @connection(key: "Framework__controls") {
+                edges {
+                  node {
+                    id
+                    referenceId
+                    name
+                    description
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+const linkedControlsQuery = graphql`
+  query MeasureViewLinkedControlsQuery($measureId: ID!) {
+    measure: node(id: $measureId) {
+      id
+      ... on Measure {
+        controls(first: 100) @connection(key: "MeasureView_controls") {
+          edges {
+            node {
+              id
+              referenceId
+              name
+              description
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+const createControlMappingMutation = graphql`
+  mutation MeasureViewCreateControlMappingMutation(
+    $input: CreateControlMeasureMappingInput!
+  ) {
+    createControlMeasureMapping(input: $input) {
+      success
+    }
+  }
+`;
+
+const deleteControlMappingMutation = graphql`
+  mutation MeasureViewDeleteControlMappingMutation(
+    $input: DeleteControlMeasureMappingInput!
+  ) {
+    deleteControlMeasureMapping(input: $input) {
+      success
+    }
+  }
+`;
+
+// Add a mutation to fulfill evidence
+const fulfillEvidenceMutation = graphql`
+  mutation MeasureViewFulfillEvidenceMutation(
+    $input: FulfillEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    fulfillEvidence(input: $input) {
+      evidenceEdge @appendEdge(connections: $connections) {
+        node {
+          id
+          filename
+          fileUrl
+          mimeType
+          type
+          url
+          size
+          state
+          createdAt
+          description
+        }
+      }
+    }
+  }
+`;
+
+// Add query to fetch risks linked to a measure
+const measureRisksQuery = graphql`
+  query MeasureViewRisksQuery($measureId: ID!) {
+    measure: node(id: $measureId) {
+      id
+      ... on Measure {
+        risks(first: 100) @connection(key: "MeasureView_risks") {
+          edges {
+            node {
+              id
+              name
+              description
+              inherentLikelihood
+              inherentImpact
+              inherentSeverity
+              residualLikelihood
+              residualImpact
+              residualSeverity
+              createdAt
+              updatedAt
+            }
+          }
+        }
+      }
+    }
+  }
+`;
+
+// Add a mutation for uploadMeasureEvidence
+const uploadMeasureEvidenceMutation = graphql`
+  mutation MeasureViewUploadMeasureEvidenceMutation(
+    $input: UploadMeasureEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    uploadMeasureEvidence(input: $input) {
+      evidenceEdge @appendEdge(connections: $connections) {
+        node {
+          id
+          filename
+          fileUrl
+          mimeType
+          type
+          url
+          size
+          state
+          createdAt
+          description
+        }
+      }
+    }
+  }
+`;
+
+// Add the uploadTaskEvidence mutation
+const uploadTaskEvidenceMutation = graphql`
+  mutation MeasureViewUploadTaskEvidenceMutation(
+    $input: UploadTaskEvidenceInput!
+    $connections: [ID!]!
+  ) {
+    uploadTaskEvidence(input: $input) {
+      evidenceEdge @appendEdge(connections: $connections) {
+        node {
+          id
+          filename
+          fileUrl
+          mimeType
+          type
+          url
+          size
+          state
+          createdAt
+          description
+        }
+      }
+    }
+  }
+`;
+
+function MeasureViewContent({
+  queryRef,
+}: {
+  queryRef: PreloadedQuery<MeasureViewQueryType>;
+}) {
+  const data = usePreloadedQuery<MeasureViewQueryType>(
+    measureViewQuery,
+    queryRef
+  );
+  
+  // Define a type for the measure with evidences field
+  type MeasureWithEvidences = typeof data.measure & {
+    evidences?: {
+      __id: string;
+      edges: Array<{
+        node: {
+          id: string;
+          mimeType: string;
+          filename: string;
+          size: number;
+          state: string;
+          type: string;
+          url?: string;
+          createdAt: string;
+          description: string;
+        };
+      } | null> | null;
+    };
+  };
+  
+  // Cast data.measure to include evidences field
+  const measureWithEvidences = data.measure as MeasureWithEvidences;
+  
+  const navigate = useNavigate();
+  const { toast } = useToast();
+  const { organizationId, measureId } = useParams<{
+    organizationId: string;
+    measureId: string;
+  }>();
+  const environment = useRelayEnvironment();
+
+  const [commitDeleteMeasure, isDeletingMeasure] = useMutation<any>(deleteMeasureMutation);
+  const [isDeleteMeasureOpen, setIsDeleteMeasureOpen] = useState(false);
+
+  // Add state for main content tabs
+  const [mainContentTab, setMainContentTab] = useState<string>("evidence");
+
+  // Add URLSearchParams handling for task persistence
+  const [searchParams, setSearchParams] = useSearchParams();
+  const taskIdFromUrl = searchParams.get("taskId");
+
+  // Load organization data for people selector
+  const [organizationData, setOrganizationData] =
+    useState<MeasureViewOrganizationQuery$data | null>(null);
+
+  // Control mapping state
+  const [isControlMappingDialogOpen, setIsControlMappingDialogOpen] =
+    useState(false);
+  const [frameworksData, setFrameworksData] =
+    useState<MeasureViewFrameworksQuery$data | null>(null);
+  const [linkedControlsData, setLinkedControlsData] =
+    useState<MeasureViewLinkedControlsQuery$data | null>(null);
+  const [controlSearchQuery, setControlSearchQuery] = useState("");
+  const [selectedFrameworkId, setSelectedFrameworkId] = useState<string | null>(
+    null
+  );
+  const [isLoadingControls, setIsLoadingControls] = useState(false);
+  const [isLinkingControl, setIsLinkingControl] = useState(false);
+  const [isUnlinkingControl, setIsUnlinkingControl] = useState(false);
+
+  // Create mutation hooks for control mapping
+  const [commitCreateControlMapping] =
+    useMutation<MeasureViewCreateControlMappingMutation>(
+      createControlMappingMutation
+    );
+  const [commitDeleteControlMapping] =
+    useMutation<MeasureViewDeleteControlMappingMutation>(
+      deleteControlMappingMutation
+    );
+
+  useEffect(() => {
+    if (organizationId) {
+      fetchQuery<MeasureViewOrganizationQuery>(environment, organizationQuery, {
+        organizationId,
+      }).subscribe({
+        next: (data) => {
+          setOrganizationData(data);
+        },
+        error: (error: Error) => {
+          console.error("Error fetching organization:", error);
+        },
+      });
+    }
+  }, [environment, organizationId]);
+
+  // Load linked controls when component mounts
+  useEffect(() => {
+    if (measureId) {
+      fetchQuery<MeasureViewLinkedControlsQuery>(
+        environment,
+        linkedControlsQuery,
+        { measureId }
+      ).subscribe({
+        next: (data) => {
+          setLinkedControlsData(data);
+        },
+        error: (error: Error) => {
+          console.error("Error fetching linked controls:", error);
+        },
+      });
+    }
+  }, [environment, measureId]);
+
+  // Add state for risks data
+  const [risksData, setRisksData] = useState<MeasureViewRisksQuery$data | null>(
+    null
+  );
+
+  // Load risks data when component mounts
+  useEffect(() => {
+    if (measureId) {
+      fetchQuery<MeasureViewRisksQuery>(environment, measureRisksQuery, {
+        measureId,
+      }).subscribe({
+        next: (data) => {
+          setRisksData(data);
+        },
+        error: (error: Error) => {
+          console.error("Error fetching risks:", error);
+        },
+      });
+    }
+  }, [environment, measureId]);
+
+  const formatState = (state: string | undefined): string => {
+    if (!state) return "";
+
+    const upperState = state.toUpperCase();
+
+    if (upperState === "NOT_STARTED") return "Not Started";
+    if (upperState === "IN_PROGRESS") return "In Progress";
+    if (upperState === "NOT_APPLICABLE") return "Not Applicable";
+    if (upperState === "IMPLEMENTED") return "Implemented";
+
+    const formatted = state.toLowerCase();
+    return formatted.charAt(0).toUpperCase() + formatted.slice(1);
+  };
+
+  const getStateColor = (state: string | undefined): string => {
+    if (!state) return "bg-secondary-bg text-primary";
+
+    const upperState = state.toUpperCase();
+
+    if (upperState === "NOT_STARTED") return "bg-secondary-bg text-primary";
+    if (upperState === "IN_PROGRESS") return "bg-blue-100 text-blue-800";
+    if (upperState === "NOT_APPLICABLE") return "bg-purple-100 text-purple-800";
+    if (upperState === "IMPLEMENTED") return "bg-green-100 text-green-800";
+
+    return "bg-secondary-bg text-primary";
+  };
+
+  const [updateTask] = useMutation<MeasureViewUpdateTaskStateMutationType>(
+    updateTaskStateMutation
+  );
+  const [createTask] =
+    useMutation<MeasureViewCreateTaskMutationType>(createTaskMutation);
+  const [deleteTask] =
+    useMutation<MeasureViewDeleteTaskMutationType>(deleteTaskMutation);
+  const [requestEvidence] = useMutation<any>(requestEvidenceMutation);
+  const [deleteEvidence] = useMutation<MeasureViewDeleteEvidenceMutationType>(
+    deleteEvidenceMutation
+  );
+  const [assignTask] =
+    useMutation<MeasureViewAssignTaskMutationType>(assignTaskMutation);
+  const [unassignTask] =
+    useMutation<MeasureViewUnassignTaskMutationType>(unassignTaskMutation);
+  const [fulfillEvidence] = useMutation<MeasureViewFulfillEvidenceMutationType>(
+    fulfillEvidenceMutation
+  );
+
+  const [updateMeasureState] =
+    useMutation<MeasureViewUpdateMeasureStateMutationType>(
+      updateMeasureStateMutation
+    );
+
+  const [isCreateTaskOpen, setIsCreateTaskOpen] = useState(false);
+  const [newTaskName, setNewTaskName] = useState("");
+  const [newTaskDescription, setNewTaskDescription] = useState("");
+  const [timeEstimateDays, setTimeEstimateDays] = useState("");
+  const [timeEstimateHours, setTimeEstimateHours] = useState("");
+  const [timeEstimateMinutes, setTimeEstimateMinutes] = useState("");
+
+  const [isDeleteTaskOpen, setIsDeleteTaskOpen] = useState(false);
+  const [taskToDelete, setTaskToDelete] = useState<{
+    id: string;
+    name: string;
+  } | null>(null);
+
+  const [taskForEvidence, setTaskForEvidence] = useState<{
+    id: string;
+    name: string;
+  } | null>(null);
+  const hiddenFileInputRef = useRef<HTMLInputElement>(null);
+
+  const [draggedOverTaskId, setDraggedOverTaskId] = useState<string | null>(
+    null
+  );
+  const [uploadingTaskId, setUploadingTaskId] = useState<string | null>(null);
+  const [isDraggingFile, setIsDraggingFile] = useState(false);
+
+  // State to track which task's evidence list is expanded
+  const [expandedEvidenceTaskId, setExpandedEvidenceTaskId] = useState<
+    string | null
+  >(null);
+
+  // Add state for the preview modal
+  const [isPreviewModalOpen, setIsPreviewModalOpen] = useState(false);
+  const [previewEvidence, setPreviewEvidence] = useState<{
+    id: string;
+    filename: string;
+    mimeType: string;
+    fileUrl?: string;
+  } | null>(null);
+  const [isLoadingFileUrl, setIsLoadingFileUrl] = useState(false);
+
+  const [isDeleteEvidenceOpen, setIsDeleteEvidenceOpen] = useState(false);
+  const [evidenceToDelete, setEvidenceToDelete] = useState<{
+    id: string;
+    filename: string;
+    taskId: string;
+  } | null>(null);
+
+  // Add state for people selector
+  const [peoplePopoverOpen, setPeoplePopoverOpen] = useState<{
+    [key: string]: boolean;
+  }>({});
+
+  // Add state for people search
+  const [peopleSearch, setPeopleSearch] = useState<{
+    [key: string]: string;
+  }>({});
+
+  // Add state variables for the evidence dialog and link evidence
+  const [evidenceDialogOpen, setEvidenceDialogOpen] = useState(false);
+  const [linkEvidenceName, setLinkEvidenceName] = useState("");
+  const [linkEvidenceUrl, setLinkEvidenceUrl] = useState("");
+  const [linkEvidenceDescription, setLinkEvidenceDescription] = useState("");
+  const [activeTab, setActiveTab] = useState<"file" | "link">("file");
+
+  // State for fulfill evidence dialog
+  const [fulfillEvidenceDialogOpen, setFulfillEvidenceDialogOpen] =
+    useState(false);
+  const [evidenceToFulfill, setEvidenceToFulfill] = useState<{
+    id: string;
+    filename: string;
+  } | null>(null);
+
+  // Add state for selected task panel
+  const [selectedTask, setSelectedTask] = useState<(typeof tasks)[0] | null>(
+    null
+  );
+
+  // Track if task panel is open
+  const [isTaskPanelOpen, setIsTaskPanelOpen] = useState(false);
+
+  // Add state for tracking when files are dragged over the evidence zone
+  const [isDraggingOverEvidenceZone, setIsDraggingOverEvidenceZone] = useState(false);
+
+  const tasks = data.measure.tasks?.edges.map((edge) => edge.node) || [];
+
+  // Add useEffect to handle URL parameters for task selection
+  useEffect(() => {
+    // If there's a taskId in the URL, find that task and select it
+    if (taskIdFromUrl && tasks.length > 0) {
+      const taskFromUrl = tasks.find((task) => task.id === taskIdFromUrl);
+      if (taskFromUrl) {
+        setSelectedTask(taskFromUrl);
+        setIsTaskPanelOpen(true);
+      } else {
+        // If task ID is invalid, remove it from URL
+        searchParams.delete("taskId");
+        setSearchParams(searchParams);
+      }
+    }
+  }, [taskIdFromUrl, tasks, searchParams, setSearchParams]);
+
+  const getEvidenceConnectionId = useCallback(
+    (taskId: string) => {
+      const task = tasks.find((t) => t.id === taskId);
+      if (task?.evidences?.__id) {
+        return task.evidences.__id;
+      }
+      return null;
+    },
+    [tasks]
+  );
+
+  // Add a function to get the measure evidence connection ID
+  const getMeasureEvidenceConnectionId = useCallback(() => {
+    return measureWithEvidences.evidences?.__id || null;
+  }, [measureWithEvidences.evidences]);
+
+  // Function to convert days, hours, and minutes to ISO 8601 duration format
+  const convertToISODuration = useCallback(() => {
+    let duration = "P";
+
+    if (timeEstimateDays && parseInt(timeEstimateDays) > 0) {
+      duration += `${parseInt(timeEstimateDays)}D`;
+    }
+
+    if (
+      (timeEstimateHours && parseInt(timeEstimateHours) > 0) ||
+      (timeEstimateMinutes && parseInt(timeEstimateMinutes) > 0)
+    ) {
+      duration += "T";
+
+      if (timeEstimateHours && parseInt(timeEstimateHours) > 0) {
+        duration += `${parseInt(timeEstimateHours)}H`;
+      }
+
+      if (timeEstimateMinutes && parseInt(timeEstimateMinutes) > 0) {
+        duration += `${parseInt(timeEstimateMinutes)}M`;
+      }
+    }
+
+    // Return empty string if no time components were provided
+    return duration === "P" ? "" : duration;
+  }, [timeEstimateDays, timeEstimateHours, timeEstimateMinutes]);
+
+  useEffect(() => {
+    const handleDragEnter = (e: globalThis.DragEvent) => {
+      e.preventDefault();
+      if (e.dataTransfer?.types.includes("Files")) {
+        setIsDraggingFile(true);
+      }
+    };
+
+    const handleDragLeave = (e: globalThis.DragEvent) => {
+      e.preventDefault();
+      // Only set to false if we're leaving the window
+      if (!e.relatedTarget || (e.relatedTarget as Node).nodeName === "HTML") {
+        setIsDraggingFile(false);
+      }
+    };
+
+    const handleDragOver = (e: globalThis.DragEvent) => {
+      e.preventDefault();
+    };
+
+    const handleDrop = (e: globalThis.DragEvent) => {
+      e.preventDefault();
+      setIsDraggingFile(false);
+    };
+
+    document.addEventListener("dragenter", handleDragEnter);
+    document.addEventListener("dragleave", handleDragLeave);
+    document.addEventListener("dragover", handleDragOver);
+    document.addEventListener("drop", handleDrop);
+
+    return () => {
+      document.removeEventListener("dragenter", handleDragEnter);
+      document.removeEventListener("dragleave", handleDragLeave);
+      document.removeEventListener("dragover", handleDragOver);
+      document.removeEventListener("drop", handleDrop);
+    };
+  }, []);
+
+  const handleTaskClick = (task: (typeof tasks)[0]) => {
+    if (!task) return;
+    setSelectedTask(task);
+    setIsTaskPanelOpen(true);
+
+    // Add the task ID to URL parameters
+    searchParams.set("taskId", task.id);
+    setSearchParams(searchParams);
+  };
+
+  const handleToggleTaskState = (taskId: string, currentState: string) => {
+    const newState = currentState === "DONE" ? "TODO" : "DONE";
+
+    updateTask({
+      variables: {
+        input: {
+          taskId,
+          state: newState,
+        },
+      },
+      onCompleted: () => {
+        if (selectedTask && selectedTask.id === taskId) {
+          setSelectedTask({
+            ...selectedTask,
+            state: newState,
+          });
+        }
+      },
+      onError: (error) => {
+        toast({
+          title: "Error updating task",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const handleCreateTask = () => {
+    if (!newTaskName.trim()) {
+      toast({
+        title: "Error creating task",
+        description: "Task name is required",
+        variant: "destructive",
+      });
+      return;
+    }
+
+    if (!data.measure.id) {
+      toast({
+        title: "Error creating task",
+        description: "Measure ID is missing",
+        variant: "destructive",
+      });
+      return;
+    }
+    // Convert the time estimate components to ISO 8601 format
+    const isoTimeEstimate = convertToISODuration();
+
+    createTask({
+      variables: {
+        connections: [`${data.measure.tasks?.__id}`],
+        input: {
+          measureId: data.measure.id,
+          name: newTaskName,
+          description: newTaskDescription,
+          timeEstimate: isoTimeEstimate === "" ? null : isoTimeEstimate,
+        },
+      },
+      onCompleted: () => {
+        toast({
+          title: "Task created",
+          description: "New task has been created successfully.",
+        });
+        setNewTaskName("");
+        setNewTaskDescription("");
+        setTimeEstimateDays("");
+        setTimeEstimateHours("");
+        setTimeEstimateMinutes("");
+        setIsCreateTaskOpen(false);
+      },
+      onError: (error) => {
+        toast({
+          title: "Error creating task",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const handleDeleteTask = (taskId: string, taskName: string) => {
+    setTaskToDelete({ id: taskId, name: taskName });
+    setIsDeleteTaskOpen(true);
+  };
+
+  const confirmDeleteTask = () => {
+    if (!taskToDelete) return;
+
+    deleteTask({
+      variables: {
+        connections: [`${data.measure.tasks?.__id}`],
+        input: {
+          taskId: taskToDelete.id,
+        },
+      },
+      onCompleted: () => {
+        toast({
+          title: "Task deleted",
+          description: "Task has been deleted successfully.",
+        });
+        setIsDeleteTaskOpen(false);
+        setTaskToDelete(null);
+      },
+      onError: (error) => {
+        toast({
+          title: "Error deleting task",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const handleEditMeasure = () => {
+    navigate(`/organizations/${organizationId}/measures/${measureId}/edit`);
+  };
+
+  const handleCreateEvidence = (taskId: string, taskName: string) => {
+    setTaskForEvidence({ id: taskId, name: taskName });
+    setEvidenceDialogOpen(true);
+    // Reset form fields
+    setLinkEvidenceName("");
+    setLinkEvidenceUrl("");
+    setLinkEvidenceDescription("");
+  };
+
+  const handleFileSelected = (e: React.ChangeEvent<HTMLInputElement>) => {
+    if (!e.target.files || e.target.files.length === 0 || !taskForEvidence)
+      return;
+
+    const file = e.target.files[0];
+
+    // Show toast for add started
+    toast({
+      title: "Adding document",
+      description: `Adding ${file.name}...`,
+      variant: "default",
+    });
+
+    // Get the evidence connection ID for this task
+    const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
+
+    uploadMeasureEvidence({
+      variables: {
+        input: {
+          measureId: measureId,
+          file: null,
+        },
+        connections: getMeasureEvidenceConnectionId() ? [getMeasureEvidenceConnectionId()!] : [],
+      },
+      uploadables: {
+        "input.file": file,
+      },
+      onCompleted: () => {
+        setTaskForEvidence(null);
+        // Reset the file input
+        if (hiddenFileInputRef.current) {
+          hiddenFileInputRef.current.value = "";
+        }
+      },
+      onError: (error) => {
+        toast({
+          title: "Error adding document",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const handleLinkEvidenceSubmit = () => {
+    if (!taskForEvidence) return;
+
+    // Validate form
+    if (!linkEvidenceName.trim()) {
+      toast({
+        title: "Error",
+        description: "Please provide a name for the evidence",
+        variant: "destructive",
+      });
+      return;
+    }
+
+    if (!linkEvidenceUrl.trim()) {
+      toast({
+        title: "Error",
+        description: "Please provide a URL for the evidence",
+        variant: "destructive",
+      });
+      return;
+    }
+
+    // Get the evidence connection ID for this task
+    const evidenceConnectionId = getEvidenceConnectionId(taskForEvidence.id);
+
+    // Use a default description if none is provided
+    const description =
+      linkEvidenceDescription.trim() || `Link to ${linkEvidenceUrl}`;
+
+    // Use requestEvidence instead of createEvidence
+    requestEvidence({
+      variables: {
+        input: {
+          taskId: taskForEvidence.id,
+          name: linkEvidenceName,
+          type: "LINK",
+          description: description,
+        },
+        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+      },
+      onCompleted: () => {
+        setTaskForEvidence(null);
+        setEvidenceDialogOpen(false);
+        // Reset form fields
+        setLinkEvidenceName("");
+        setLinkEvidenceUrl("");
+        setLinkEvidenceDescription("");
+      },
+      onError: (error) => {
+        toast({
+          title: "Error adding link evidence",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const handleDragOver = (e: DragEvent<HTMLDivElement>, taskId: string) => {
+    e.preventDefault();
+    e.stopPropagation();
+    if (draggedOverTaskId !== taskId) {
+      setDraggedOverTaskId(taskId);
+    }
+  };
+
+  const handleDragLeave = (e: DragEvent<HTMLDivElement>) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setDraggedOverTaskId(null);
+  };
+
+  const handleDrop = async (e: DragEvent<HTMLDivElement>, taskId: string) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setDraggedOverTaskId(null);
+    setIsDraggingFile(false);
+
+    const files = e.dataTransfer.files;
+    if (files.length === 0) return;
+
+    const file = files[0];
+    setUploadingTaskId(taskId);
+
+    // Show toast for add started
+    toast({
+      title: "Adding document",
+      description: `Adding ${file.name}...`,
+      variant: "default",
+    });
+
+    // Instead of using task-specific upload, use measure-level evidence
+    uploadMeasureEvidence({
+      variables: {
+        input: {
+          measureId: measureId,
+          file: null,
+        },
+        connections: getMeasureEvidenceConnectionId() ? [getMeasureEvidenceConnectionId()!] : [],
+      },
+      uploadables: {
+        "input.file": file,
+      },
+      onCompleted: () => {
+        setUploadingTaskId(null);
+        toast({
+          title: "Document added",
+          description: "Document evidence has been added successfully.",
+          variant: "default",
+        });
+      },
+      onError: (error) => {
+        setUploadingTaskId(null);
+        toast({
+          title: "Error adding document",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const formatFileSize = (bytes: number) => {
+    if (bytes === 0) return "0 Bytes";
+    const k = 1024;
+    const sizes = ["Bytes", "KB", "MB", "GB"];
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + sizes[i];
+  };
+
+  const formatDate = (dateString: string) => {
+    const date = new Date(dateString);
+    return date.toLocaleDateString("en-US", {
+      year: "numeric",
+      month: "short",
+      day: "numeric",
+    });
+  };
+
+  // Function to toggle evidence list expansion
+  const toggleEvidenceList = (taskId: string) => {
+    if (expandedEvidenceTaskId === taskId) {
+      setExpandedEvidenceTaskId(null);
+    } else {
+      setExpandedEvidenceTaskId(taskId);
+    }
+  };
+
+  // Function to get file icon based on mime type and evidence type
+  const getFileIcon = (mimeType: string, evidenceType: string) => {
+    if (evidenceType === "LINK") {
+      return <Link2 className="w-4 h-4 text-blue-600" />;
+    } else if (mimeType.startsWith("image/")) {
+      return <Image className="w-4 h-4 text-blue-500" />;
+    } else if (mimeType.includes("pdf")) {
+      return <FileText className="w-4 h-4 text-red-500" />;
+    } else if (mimeType.includes("word") || mimeType.includes("document")) {
+      return <FileText className="w-4 h-4 text-blue-600" />;
+    } else if (mimeType.includes("excel") || mimeType.includes("spreadsheet")) {
+      return <FileText className="w-4 h-4 text-green-600" />;
+    } else {
+      return <FileGeneric className="w-4 h-4 text-secondary" />;
+    }
+  };
+
+  // Simplified preview handler that opens the modal and sets the evidence
+  const handlePreviewEvidence = (evidence: {
+    id: string;
+    filename: string;
+    mimeType: string;
+  }) => {
+    setPreviewEvidence({
+      id: evidence.id,
+      filename: evidence.filename,
+      mimeType: evidence.mimeType,
+    });
+    setIsPreviewModalOpen(true);
+    setIsLoadingFileUrl(true);
+    fetchQuery(environment, getEvidenceFileUrlQuery, {
+      evidenceId: evidence.id,
+    })
+      .toPromise()
+      .then((response) => {
+        const data = response as { node?: { id: string; fileUrl?: string } };
+
+        if (data?.node?.fileUrl) {
+          setPreviewEvidence((prev) => {
+            if (!prev) return null;
+            return { ...prev, fileUrl: data.node!.fileUrl };
+          });
+        } else {
+          throw new Error("File URL not available in response");
+        }
+      })
+      .catch((error) => {
+        console.error("Error fetching file URL:", error);
+        toast({
+          title: "Error fetching file URL",
+          description: error.message || "Could not load the file preview",
+          variant: "destructive",
+        });
+      })
+      .finally(() => {
+        setIsLoadingFileUrl(false);
+      });
+  };
+
+  const handleDeleteEvidence = (
+    evidenceId: string,
+    filename: string,
+    taskId: string
+  ) => {
+    setEvidenceToDelete({ id: evidenceId, filename, taskId });
+    setIsDeleteEvidenceOpen(true);
+  };
+
+  const handleFulfillEvidence = (evidenceId: string, filename: string) => {
+    setEvidenceToFulfill({ id: evidenceId, filename });
+    setFulfillEvidenceDialogOpen(true);
+    setActiveTab("file");
+    setLinkEvidenceUrl("");
+    setLinkEvidenceDescription("");
+  };
+
+  const handleFulfillEvidenceWithFile = (
+    e: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    if (!e.target.files || e.target.files.length === 0 || !evidenceToFulfill)
+      return;
+
+    const file = e.target.files[0];
+
+    // Show toast for upload started
+    toast({
+      title: "Uploading evidence",
+      description: `Uploading ${file.name}...`,
+      variant: "default",
+    });
+
+    const evidenceId = evidenceToFulfill.id;
+    // Get connection ID for the parent task (assuming it's available in the view)
+    const task = tasks.find((task) =>
+      task.evidences?.edges.some((edge) => edge?.node?.id === evidenceId)
+    );
+
+    const evidenceConnectionId = task?.id
+      ? getEvidenceConnectionId(task.id)
+      : null;
+
+    fulfillEvidence({
+      variables: {
+        input: {
+          evidenceId: evidenceId,
+          file: null,
+        },
+        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+      },
+      uploadables: {
+        "input.file": file,
+      },
+      onCompleted: () => {
+        setFulfillEvidenceDialogOpen(false);
+        setEvidenceToFulfill(null);
+        toast({
+          title: "Evidence uploaded",
+          description: "Evidence has been fulfilled successfully.",
+          variant: "default",
+        });
+        // Reset the file input
+        if (hiddenFileInputRef.current) {
+          hiddenFileInputRef.current.value = "";
+        }
+      },
+      onError: (error) => {
+        toast({
+          title: "Error uploading evidence",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const handleFulfillEvidenceWithLink = () => {
+    if (!evidenceToFulfill) return;
+
+    // Validate URL
+    if (!linkEvidenceUrl.trim()) {
+      toast({
+        title: "Error",
+        description: "Please provide a URL for the evidence",
+        variant: "destructive",
+      });
+      return;
+    }
+
+    // Get connection ID for the parent task
+    const task = tasks.find((task) =>
+      task.evidences?.edges.some(
+        (edge) => edge?.node?.id === evidenceToFulfill.id
+      )
+    );
+
+    const evidenceConnectionId = task?.id
+      ? getEvidenceConnectionId(task.id)
+      : null;
+
+    fulfillEvidence({
+      variables: {
+        input: {
+          evidenceId: evidenceToFulfill.id,
+          url: linkEvidenceUrl,
+        },
+        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+      },
+      onCompleted: () => {
+        setFulfillEvidenceDialogOpen(false);
+        setEvidenceToFulfill(null);
+        setLinkEvidenceUrl("");
+        setLinkEvidenceDescription("");
+        toast({
+          title: "Evidence updated",
+          description: "Evidence has been fulfilled with link successfully.",
+          variant: "default",
+        });
+      },
+      onError: (error) => {
+        toast({
+          title: "Error updating evidence",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  const confirmDeleteEvidence = () => {
+    if (!evidenceToDelete) return;
+
+    const evidenceConnectionId = getEvidenceConnectionId(
+      evidenceToDelete.taskId
+    );
+
+    deleteEvidence({
+      variables: {
+        input: {
+          evidenceId: evidenceToDelete.id,
+        },
+        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+      },
+      onCompleted: () => {
+        setIsDeleteEvidenceOpen(false);
+        setEvidenceToDelete(null);
+      },
+      onError: (error) => {
+        toast({
+          title: "Error deleting evidence",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Function to handle assigning a person to a task
+  const handleAssignPerson = (taskId: string, personId: string) => {
+    assignTask({
+      variables: {
+        input: {
+          taskId,
+          assignedToId: personId,
+        },
+      },
+      onCompleted: () => {
+        setPeoplePopoverOpen((prev) => ({ ...prev, [taskId]: false }));
+      },
+      onError: (error) => {
+        toast({
+          title: "Error assigning task",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Function to handle unassigning a person from a task
+  const handleUnassignPerson = (taskId: string) => {
+    unassignTask({
+      variables: {
+        input: {
+          taskId,
+        },
+      },
+      onError: (error) => {
+        toast({
+          title: "Error unassigning task",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Function to handle measure state change
+  const handleMeasureStateChange = (newState: string) => {
+    updateMeasureState({
+      variables: {
+        input: {
+          id: data.measure.id,
+          state: newState as
+            | "NOT_STARTED"
+            | "IN_PROGRESS"
+            | "IMPLEMENTED"
+            | "NOT_APPLICABLE",
+        },
+      },
+      onCompleted: () => {
+        toast({
+          title: "Measure state updated",
+          description: `Measure state has been updated to ${formatState(
+            newState
+          )}.`,
+        });
+      },
+      onError: (error) => {
+        toast({
+          title: "Error updating measure state",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Update SheetContent to handle closing
+  const handleCloseTaskPanel = () => {
+    setSelectedTask(null);
+    setIsTaskPanelOpen(false);
+    // Remove taskId from URL when panel is closed
+    searchParams.delete("taskId");
+    setSearchParams(searchParams);
+  };
+
+  // Add state variables for tracking edit mode and duration components
+  const [isEditingDuration, setIsEditingDuration] = useState(false);
+  const [editTimeEstimateDays, setEditTimeEstimateDays] = useState("");
+  const [editTimeEstimateHours, setEditTimeEstimateHours] = useState("");
+  const [editTimeEstimateMinutes, setEditTimeEstimateMinutes] = useState("");
+
+  // Function to parse ISO duration string into components for editing
+  const parseISODuration = useCallback(
+    (duration: string | null | undefined) => {
+      if (!duration || !duration.startsWith("P")) {
+        return { days: "", hours: "", minutes: "" };
+      }
+
+      try {
+        const durationRegex =
+          /P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?)?/;
+        const matches = duration.match(durationRegex);
+
+        if (!matches) return { days: "", hours: "", minutes: "" };
+
+        // We only care about days, hours, and minutes
+        const days = matches[3] ? matches[3] : "";
+        const hours = matches[4] ? matches[4] : "";
+        const minutes = matches[5] ? matches[5] : "";
+
+        return { days, hours, minutes };
+      } catch (error) {
+        console.error("Error parsing duration:", error);
+        return { days: "", hours: "", minutes: "" };
+      }
+    },
+    []
+  );
+
+  // Function to handle saving the updated duration
+  const handleSaveDuration = useCallback(
+    (taskId: string) => {
+      // Convert to ISO duration format
+      let duration = "P";
+
+      if (editTimeEstimateDays && parseInt(editTimeEstimateDays) > 0) {
+        duration += `${parseInt(editTimeEstimateDays)}D`;
+      }
+
+      if (
+        (editTimeEstimateHours && parseInt(editTimeEstimateHours) > 0) ||
+        (editTimeEstimateMinutes && parseInt(editTimeEstimateMinutes) > 0)
+      ) {
+        duration += "T";
+
+        if (editTimeEstimateHours && parseInt(editTimeEstimateHours) > 0) {
+          duration += `${parseInt(editTimeEstimateHours)}H`;
+        }
+
+        if (editTimeEstimateMinutes && parseInt(editTimeEstimateMinutes) > 0) {
+          duration += `${parseInt(editTimeEstimateMinutes)}M`;
+        }
+      }
+
+      // If no valid time components were provided, use null (remove the time estimate)
+      const timeEstimate = duration === "P" ? null : duration;
+
+      updateTask({
+        variables: {
+          input: {
+            taskId,
+            timeEstimate,
+          },
+        },
+        onCompleted: () => {
+          setIsEditingDuration(false);
+
+          // Update the selected task state if it's the current task
+          if (selectedTask && selectedTask.id === taskId) {
+            setSelectedTask({
+              ...selectedTask,
+              timeEstimate,
+            });
+          }
+        },
+        onError: (error) => {
+          toast({
+            title: "Error updating task",
+            description: error.message,
+            variant: "destructive",
+          });
+        },
+      });
+    },
+    [
+      editTimeEstimateDays,
+      editTimeEstimateHours,
+      editTimeEstimateMinutes,
+      updateTask,
+      toast,
+      selectedTask,
+      setSelectedTask,
+    ]
+  );
+
+  // Function to start editing duration
+  const startEditingDuration = useCallback(
+    (duration: string | null | undefined) => {
+      const { days, hours, minutes } = parseISODuration(duration);
+      setEditTimeEstimateDays(days);
+      setEditTimeEstimateHours(hours);
+      setEditTimeEstimateMinutes(minutes);
+      setIsEditingDuration(true);
+    },
+    [parseISODuration]
+  );
+
+  // Control mapping functions
+  const loadFrameworksAndControls = useCallback(() => {
+    if (!organizationId || !measureId) return;
+
+    setIsLoadingControls(true);
+
+    // Fetch all frameworks and their controls
+    fetchQuery<MeasureViewFrameworksQuery>(environment, frameworksQuery, {
+      organizationId,
+    }).subscribe({
+      next: (data) => {
+        setFrameworksData(data);
+        if (
+          data?.organization?.frameworks?.edges &&
+          data.organization.frameworks.edges.length > 0 &&
+          !selectedFrameworkId
+        ) {
+          // Select the first framework by default if none is selected
+          const frameworks = data.organization.frameworks.edges;
+          if (frameworks[0]?.node?.id) {
+            setSelectedFrameworkId(frameworks[0].node.id);
+          }
+        }
+      },
+      complete: () => {
+        // Fetch already linked controls for this measure
+        fetchQuery<MeasureViewLinkedControlsQuery>(
+          environment,
+          linkedControlsQuery,
+          {
+            measureId,
+          }
+        ).subscribe({
+          next: (data) => {
+            setLinkedControlsData(data);
+            setIsLoadingControls(false);
+          },
+          error: (error: Error) => {
+            console.error("Error fetching linked controls:", error);
+            setIsLoadingControls(false);
+            toast({
+              title: "Error",
+              description: "Failed to load linked controls.",
+              variant: "destructive",
+            });
+          },
+        });
+      },
+      error: (error: Error) => {
+        console.error("Error fetching frameworks:", error);
+        setIsLoadingControls(false);
+        toast({
+          title: "Error",
+          description: "Failed to load frameworks and controls.",
+          variant: "destructive",
+        });
+      },
+    });
+  }, [environment, measureId, organizationId, selectedFrameworkId, toast]);
+
+  const getControls = useCallback(() => {
+    if (!frameworksData?.organization?.frameworks?.edges) return [];
+
+    // Get controls from the selected framework
+    const frameworks = frameworksData.organization.frameworks.edges;
+    if (selectedFrameworkId) {
+      const selectedFramework = frameworks.find(
+        (edge) => edge.node.id === selectedFrameworkId
+      );
+
+      if (selectedFramework?.node?.controls?.edges) {
+        return selectedFramework.node.controls.edges.map((edge) => edge.node);
+      }
+    }
+
+    // If no framework is selected or it doesn't have controls, return controls from all frameworks
+    return frameworks.flatMap((framework) =>
+      framework.node.controls.edges.map((edge) => edge.node)
+    );
+  }, [frameworksData, selectedFrameworkId]);
+
+  const getLinkedControls = useCallback(() => {
+    if (!linkedControlsData?.measure?.controls?.edges) return [];
+    return (linkedControlsData.measure.controls.edges || []).map(
+      (edge) => edge.node
+    );
+  }, [linkedControlsData]);
+
+  const isControlLinked = useCallback(
+    (controlId: string) => {
+      const linkedControls = getLinkedControls();
+      return linkedControls.some((control) => control.id === controlId);
+    },
+    [getLinkedControls]
+  );
+
+  const handleLinkControl = useCallback(
+    (controlId: string) => {
+      if (!measureId) return;
+
+      setIsLinkingControl(true);
+
+      commitCreateControlMapping({
+        variables: {
+          input: {
+            controlId,
+            measureId,
+          },
+        },
+        onCompleted: (_, errors) => {
+          setIsLinkingControl(false);
+
+          if (errors) {
+            console.error("Error linking control:", errors);
+            toast({
+              title: "Error",
+              description: "Failed to link control. Please try again.",
+              variant: "destructive",
+            });
+            return;
+          }
+
+          // Refresh linked controls data
+          fetchQuery<MeasureViewLinkedControlsQuery>(
+            environment,
+            linkedControlsQuery,
+            {
+              measureId,
+            }
+          ).subscribe({
+            next: (data) => {
+              setLinkedControlsData(data);
+            },
+            error: (error: Error) => {
+              console.error("Error refreshing linked controls:", error);
+            },
+          });
+
+          toast({
+            title: "Success",
+            description: "Control successfully linked to measure.",
+          });
+        },
+        onError: (error) => {
+          setIsLinkingControl(false);
+          console.error("Error linking control:", error);
+          toast({
+            title: "Error",
+            description: "Failed to link control. Please try again.",
+            variant: "destructive",
+          });
+        },
+      });
+    },
+    [commitCreateControlMapping, environment, measureId, toast]
+  );
+
+  const handleUnlinkControl = useCallback(
+    (controlId: string) => {
+      if (!measureId) return;
+
+      setIsUnlinkingControl(true);
+
+      commitDeleteControlMapping({
+        variables: {
+          input: {
+            controlId,
+            measureId,
+          },
+        },
+        onCompleted: (_, errors) => {
+          setIsUnlinkingControl(false);
+
+          if (errors) {
+            console.error("Error unlinking control:", errors);
+            toast({
+              title: "Error",
+              description: "Failed to unlink control. Please try again.",
+              variant: "destructive",
+            });
+            return;
+          }
+
+          // Refresh linked controls data
+          fetchQuery(environment, linkedControlsQuery, {
+            measureId,
+          }).subscribe({
+            next: (data: unknown) => {
+              setLinkedControlsData(data as MeasureViewLinkedControlsQuery$data);
+            },
+            error: (error: Error) => {
+              console.error("Error refreshing linked controls:", error);
+            },
+          });
+
+          toast({
+            title: "Success",
+            description: "Control successfully unlinked from measure.",
+          });
+        },
+        onError: (error) => {
+          setIsUnlinkingControl(false);
+          console.error("Error unlinking control:", error);
+          toast({
+            title: "Error",
+            description: "Failed to unlink control. Please try again.",
+            variant: "destructive",
+          });
+        },
+      });
+    },
+    [commitDeleteControlMapping, environment, measureId, toast]
+  );
+
+  const handleOpenControlMappingDialog = useCallback(() => {
+    loadFrameworksAndControls();
+    setIsControlMappingDialogOpen(true);
+  }, [loadFrameworksAndControls]);
+
+  const filteredControls = useCallback(() => {
+    const controls = getControls();
+    if (!controlSearchQuery) return controls;
+
+    const lowerQuery = controlSearchQuery.toLowerCase();
+    return controls.filter(
+      (control) =>
+        control.referenceId.toLowerCase().includes(lowerQuery) ||
+        control.name.toLowerCase().includes(lowerQuery) ||
+        (control.description &&
+          control.description.toLowerCase().includes(lowerQuery))
+    );
+  }, [controlSearchQuery, getControls]);
+
+  // Helper function to get risk severity color
+  const getRiskSeverityColor = (severity: number): string => {
+    if (severity >= 0.75) return "bg-red-100 text-red-800";
+    if (severity >= 0.5) return "bg-orange-100 text-orange-800";
+    if (severity >= 0.25) return "bg-yellow-100 text-yellow-800";
+    return "bg-green-100 text-green-800";
+  };
+
+  // Helper function to get risk severity text
+  const getRiskSeverityText = (severity: number): string => {
+    if (severity >= 0.75) return "Critical";
+    if (severity >= 0.5) return "High";
+    if (severity >= 0.25) return "Medium";
+    return "Low";
+  };
+
+  // Format likelihood as text
+  const formatLikelihood = (value: number): string => {
+    if (value <= 0.1) return "Very Low";
+    if (value <= 0.3) return "Low";
+    if (value <= 0.5) return "Medium";
+    if (value <= 0.7) return "High";
+    return "Very High";
+  };
+
+  // Format impact as text
+  const formatImpact = (value: number): string => {
+    if (value <= 0.1) return "Very Low";
+    if (value <= 0.3) return "Low";
+    if (value <= 0.5) return "Medium";
+    if (value <= 0.7) return "High";
+    return "Very High";
+  };
+
+  const handleDeleteMeasure = () => {
+    setIsDeleteMeasureOpen(true);
+  };
+
+  const confirmDeleteMeasure = () => {
+    const connectionId = ConnectionHandler.getConnectionID(
+      organizationId!,
+      "MeasureListView_measures"
+    );
+
+    commitDeleteMeasure({
+      variables: {
+        connections: [connectionId],
+        input: {
+          measureId: measureId!,
+        },
+      },
+      onCompleted: () => {
+        toast({
+          title: "Measure deleted",
+          description: "Measure has been deleted successfully.",
+        });
+        navigate(`/organizations/${organizationId}/measures`);
+      },
+      onError: (error) => {
+        toast({
+          title: "Error deleting measure",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Add the mutation hook for uploadMeasureEvidence
+  const [uploadMeasureEvidence] = useMutation<any>(uploadMeasureEvidenceMutation);
+
+  // Add a function to handle uploading evidence directly to the measure
+  const handleUploadMeasureEvidence = (file: File) => {
+    // Show toast for add started
+    toast({
+      title: "Adding document",
+      description: `Adding ${file.name}...`,
+      variant: "default",
+    });
+
+    const evidenceConnectionId = getMeasureEvidenceConnectionId();
+
+    uploadMeasureEvidence({
+      variables: {
+        input: {
+          measureId: data.measure.id,
+          file: null,
+        },
+        connections: evidenceConnectionId ? [evidenceConnectionId] : [],
+      },
+      uploadables: {
+        "input.file": file,
+      },
+      onCompleted: () => {
+        toast({
+          title: "Document added",
+          description: "Document evidence has been added successfully.",
+          variant: "default",
+        });
+      },
+      onError: (error) => {
+        toast({
+          title: "Error adding document",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
+  // Add a function to create evidence at the measure level
+  const handleCreateMeasureEvidence = () => {
+    setEvidenceDialogOpen(true);
+    setActiveTab("file");
+    // Reset form fields
+    setLinkEvidenceName("");
+    setLinkEvidenceUrl("");
+    setLinkEvidenceDescription("");
+  };
+
+  // Add uploadTaskEvidence mutation hook
+  const [uploadTaskEvidence] = useMutation<any>(uploadTaskEvidenceMutation);
+
+  return (
+    <PageTemplate
+      title={data.measure?.name || "Measure"}
+      description={data.measure?.description}
+      actions={
+        <div className="flex gap-2">
+          <Button
+            variant="outline"
+            onClick={handleEditMeasure}
+          >
+            Edit
+          </Button>
+          <select
+            value={data.measure?.state || ""}
+            onChange={(e) => handleMeasureStateChange(e.target.value)}
+            className="rounded-full cursor-pointer inline-flex items-center justify-center gap-2 whitespace-nowrap text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-active-b disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 border border-low-b hover:bg-h-tertiary-bg active:bg-p-tertiary-bg focus:bg-tertiary-bg shadow-xs px-2"
+          >
+            <option value="">Select state</option>
+            <option value="NOT_STARTED">Not Started</option>
+            <option value="IN_PROGRESS">In Progress</option>
+            <option value="NOT_APPLICABLE">Not Applicable</option>
+            <option value="IMPLEMENTED">Implemented</option>
+          </select>
+          <Button
+            variant="destructive"
+            onClick={() => handleDeleteMeasure()}
+            disabled={isDeletingMeasure}
+          >
+            {isDeletingMeasure ? "Deleting..." : "Delete"}
+          </Button>
+        </div>
+      }
+    >
+      <div className="space-y-4 mb-8">
+        <Card className="mt-4">
+          <CardContent className="pt-6">
+            <div className="prose prose-gray prose-sm md:prose-base text-secondary max-w-3xl">
+              <ReactMarkdown remarkPlugins={[remarkGfm]}>{data.measure.description}</ReactMarkdown>
+            </div>
+          </CardContent>
+        </Card>
+      </div>
+
+      {/* Main Content Tabs */}
+      <Tabs
+        defaultValue="evidence"
+        value={mainContentTab}
+        onValueChange={setMainContentTab}
+        className="mb-4"
+      >
+        <TabsList className="border-b w-full p-0 h-auto">
+          <TabsTrigger value="evidence" className="flex items-center gap-2">
+            <FileText className="w-4 h-4" />
+            Evidence
+            {tasks.some(task => task.evidences?.edges && task.evidences.edges.length > 0) && (
+              <span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
+                {tasks.reduce((count, task) => count + (task.evidences?.edges?.length || 0), 0)}
+              </span>
+            )}
+          </TabsTrigger>
+          <TabsTrigger value="tasks" className="flex items-center gap-2">
+            <Check className="w-4 h-4" />
+            Tasks
+            {tasks.length > 0 && (
+              <span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
+                {tasks.length}
+              </span>
+            )}
+          </TabsTrigger>
+          <TabsTrigger value="controls" className="flex items-center gap-2">
+            <ShieldCheck className="w-4 h-4" />
+            Controls
+            {linkedControlsData?.measure?.controls?.edges &&
+              linkedControlsData.measure.controls.edges.length > 0 && (
+                <span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
+                  {linkedControlsData.measure.controls.edges.length}
+                </span>
+              )}
+          </TabsTrigger>
+          <TabsTrigger value="risks" className="flex items-center gap-2">
+            <AlertTriangle className="w-4 h-4" />
+            Risks
+            {risksData?.measure?.risks?.edges &&
+              risksData.measure.risks.edges.length > 0 && (
+                <span className="ml-1.5 bg-blue-100 text-blue-800 rounded-full text-xs px-2 py-0.5">
+                  {risksData.measure.risks.edges.length}
+                </span>
+              )}
+          </TabsTrigger>
+        </TabsList>
+
+        {/* Evidence Tab Content */}
+        <TabsContent value="evidence">
+          <div>
+            <div className="flex items-center justify-between mb-6">
+              <h2 className="text-xl font-semibold">Evidence</h2>
+              <div className="flex items-center gap-3">
+                <div className="text-sm text-secondary flex items-center bg-invert-bg px-3 py-1.5 rounded-md border border-mid-b">
+                  <FileIcon className="w-4 h-4 mr-2 text-blue-500" />
+                  <span>Drag & drop files here to add evidence</span>
+                </div>
+                <Button 
+                  size="sm" 
+                  className="flex items-center gap-1"
+                  onClick={handleCreateMeasureEvidence}
+                >
+                  <Plus className="w-4 h-4" />
+                  <span>Add Evidence</span>
+                </Button>
+              </div>
+            </div>
+            
+            <div
+              className={`space-y-4 p-6 border-2 rounded-md transition-all duration-200 relative ${
+                isDraggingOverEvidenceZone 
+                  ? "border-dashed border-blue-400 bg-blue-50 shadow-md" 
+                  : "border-dashed border-mid-b hover:border-blue-200"
+              }`}
+              onDragOver={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setIsDraggingOverEvidenceZone(true);
+              }}
+              onDragLeave={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                const rect = e.currentTarget.getBoundingClientRect();
+                const x = e.clientX;
+                const y = e.clientY;
+                
+                // Only set to false if cursor is outside the drop zone
+                if (
+                  x < rect.left ||
+                  x > rect.right ||
+                  y < rect.top ||
+                  y > rect.bottom
+                ) {
+                  setIsDraggingOverEvidenceZone(false);
+                }
+              }}
+              onDrop={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setIsDraggingOverEvidenceZone(false);
+                setIsDraggingFile(false);
+                
+                const files = e.dataTransfer.files;
+                if (files.length === 0) return;
+                
+                const file = files[0];
+                handleUploadMeasureEvidence(file);
+              }}
+            >
+              {isDraggingOverEvidenceZone && (
+                <div className="absolute inset-0 flex items-center justify-center bg-blue-50 bg-opacity-80 rounded-md z-10">
+                  <div className="bg-white p-6 rounded-lg shadow-lg text-center">
+                    <FileText className="w-12 h-12 text-blue-500 mx-auto mb-2" />
+                    <p className="text-lg font-medium">Drop file to add evidence</p>
+                  </div>
+                </div>
+              )}
+              
+              {measureWithEvidences.evidences?.edges && measureWithEvidences.evidences.edges.length > 0 ? (
+                <div className="overflow-x-auto">
+                  <table className="w-full border-collapse">
+                    <thead className="bg-invert-bg">
+                      <tr className="border-b">
+                        <th className="text-left font-medium text-sm py-3 px-4">File</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Type</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Size</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Created</th>
+                        <th className="text-left font-medium text-sm py-3 px-4">Description</th>
+                        <th className="text-right font-medium text-sm py-3 px-4">Actions</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {measureWithEvidences.evidences.edges.map((evidenceEdge) => {
+                        const evidence = evidenceEdge?.node;
+                        if (!evidence) return null;
+                        
+                        return (
+                          <tr 
+                            key={evidence.id}
+                            className="border-b hover:bg-invert-bg transition-colors"
+                          >
+                            <td className="py-3 px-4">
+                              <div className="flex items-center gap-2">
+                                <div className="bg-white p-1.5 rounded-md border border-mid-b">
+                                  {getFileIcon(evidence.mimeType, evidence.type)}
+                                </div>
+                                <div className="flex-1 overflow-hidden">
+                                  <div className="text-sm font-medium text-primary flex items-center gap-2 truncate">
+                                    {evidence.filename}
+                                    {evidence.state === "REQUESTED" && (
+                                      <Badge
+                                        variant="outline"
+                                        className="text-xs bg-yellow-50 text-yellow-700 border-yellow-200 shrink-0"
+                                      >
+                                        Requested
+                                      </Badge>
+                                    )}
+                                  </div>
+                                </div>
+                              </div>
+                            </td>
+                            <td className="py-3 px-4 text-sm">
+                              {evidence.type === "FILE" ? "Document" : "Link"}
+                            </td>
+                            <td className="py-3 px-4 text-sm">
+                              {evidence.type === "FILE" ? formatFileSize(evidence.size) : "-"}
+                            </td>
+                            <td className="py-3 px-4 text-sm">
+                              {formatDate(evidence.createdAt)}
+                            </td>
+                            <td className="py-3 px-4 text-sm max-w-xs">
+                              <div className="truncate">
+                                {evidence.description || (evidence.url ? evidence.url : "-")}
+                              </div>
+                            </td>
+                            <td className="py-3 px-4 text-right">
+                              <div className="flex items-center justify-end gap-1">
+                                {evidence.state === "REQUESTED" ? (
+                                  <button
+                                    onClick={() => handleFulfillEvidence(evidence.id, evidence.filename)}
+                                    className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                    title="Fulfill Evidence"
+                                  >
+                                    <Upload className="w-4 h-4 text-green-600" />
+                                  </button>
+                                ) : evidence.type === "FILE" ? (
+                                  <>
+                                    {evidence.mimeType.startsWith("image/") ? (
+                                      <button
+                                        onClick={() => handlePreviewEvidence(evidence)}
+                                        className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                        title="Preview Image"
+                                      >
+                                        <Eye className="w-4 h-4 text-blue-600" />
+                                      </button>
+                                    ) : (
+                                      <button
+                                        onClick={() => handlePreviewEvidence(evidence)}
+                                        className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                        title="Download"
+                                      >
+                                        <Download className="w-4 h-4 text-blue-600" />
+                                      </button>
+                                    )}
+                                  </>
+                                ) : evidence.url ? (
+                                  <button
+                                    onClick={() => {
+                                      if (evidence.url) {
+                                        window.open(evidence.url, "_blank");
+                                      }
+                                    }}
+                                    className="p-1.5 rounded-full hover:bg-white hover:shadow-sm transition-all"
+                                    title="Open Link"
+                                  >
+                                    <Link2 className="w-4 h-4 text-blue-600" />
+                                  </button>
+                                ) : null}
+                                <button
+                                  onClick={() => handleDeleteEvidence(evidence.id, evidence.filename, "")}
+                                  className="p-1.5 rounded-full hover:bg-red-50 hover:shadow-sm transition-all"
+                                  title="Delete"
+                                >
+                                  <Trash2 className="w-4 h-4 text-red-500" />
+                                </button>
+                              </div>
+                            </td>
+                          </tr>
+                        );
+                      })}
+                    </tbody>
+                  </table>
+                </div>
+              ) : (
+                <div className="text-center py-12">
+                  <FileIcon className="w-12 h-12 text-tertiary mx-auto mb-3" />
+                  <p className="text-lg font-medium">No evidence added yet</p>
+                  <p className="text-secondary mt-1">Drag and drop files here or use the "Add Evidence" button</p>
+                </div>
+              )}
+            </div>
+          </div>
+        </TabsContent>
+
+        {/* Tasks Tab Content */}
+        <TabsContent value="tasks">
+          {/* Rest of the tasks tab content */}
+        </TabsContent>
+
+        {/* Controls Tab Content */}
+        <TabsContent value="controls">
+          {/* Rest of the controls tab content */}
+        </TabsContent>
+
+        {/* Risks Tab Content */}
+        <TabsContent value="risks">
+          {/* Rest of the risks tab content */}
+        </TabsContent>
+      </Tabs>
+
+      {/* Right task panel */}
+      <Sheet open={isTaskPanelOpen} onOpenChange={handleCloseTaskPanel}>
+        <SheetContent
+          side="right"
+          className="!max-w-[50vw] !w-[50vw] p-0 overflow-y-auto"
+        >
+          {selectedTask && (
+            <div className="flex flex-col h-full">
+              <SheetHeader className="px-6 py-4 border-b sticky top-0 bg-white z-10">
+                <div className="flex items-center justify-between">
+                  <SheetTitle className="text-xl font-semibold">
+                    {selectedTask.name}
+                  </SheetTitle>
+                  <SheetClose className="rounded-full p-1 hover:bg-secondary-bg">
+                    <X className="h-5 w-5" />
+                  </SheetClose>
+                </div>
+              </SheetHeader>
+
+              <div className="flex-1 overflow-auto p-6 space-y-6">
+                {/* Task content here */}
+              </div>
+
+              {/* Task actions */}
+              <div className="border-t p-4 sticky bottom-0 bg-white">
+                <div className="flex gap-3 justify-end">
+                  {selectedTask && selectedTask.state !== "DONE" ? (
+                    <Button
+                      variant="default"
+                      className="flex items-center gap-1"
+                      onClick={() =>
+                        handleToggleTaskState(
+                          selectedTask.id,
+                          selectedTask.state || "TODO"
+                        )
+                      }
+                    >
+                      <CheckCircle2 className="w-4 h-4" />
+                      <span>Mark Complete</span>
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="outline"
+                      className="flex items-center gap-1"
+                      onClick={() => {
+                        if (selectedTask) {
+                          handleToggleTaskState(
+                            selectedTask.id,
+                            selectedTask.state || "DONE"
+                          );
+                        }
+                      }}
+                    >
+                      <X className="w-4 h-4" />
+                      <span>Reopen Task</span>
+                    </Button>
+                  )}
+                  <Button
+                    variant="destructive"
+                    className="flex items-center gap-1"
+                    onClick={() => {
+                      if (selectedTask) {
+                        handleDeleteTask(selectedTask.id, selectedTask.name);
+                        handleCloseTaskPanel();
+                      }
+                    }}
+                  >
+                    <Trash2 className="w-4 h-4" />
+                    <span>Delete Task</span>
+                  </Button>
+                </div>
+              </div>
+            </div>
+          )}
+        </SheetContent>
+      </Sheet>
+
+      {/* Evidence Add Dialog */}
+      <Dialog open={evidenceDialogOpen} onOpenChange={setEvidenceDialogOpen}>
+        <DialogContent className="sm:max-w-[525px]">
+          <DialogHeader>
+            <DialogTitle>Add Evidence</DialogTitle>
+            <DialogDescription>
+              Choose the type of evidence you want to add to this task.
+            </DialogDescription>
+          </DialogHeader>
+
+          <Tabs
+            value={activeTab}
+            onValueChange={(value: string) =>
+              setActiveTab(value as "file" | "link")
+            }
+          >
+            <TabsList className="grid w-full grid-cols-2">
+              <TabsTrigger value="file">Document</TabsTrigger>
+              <TabsTrigger value="link">Link</TabsTrigger>
+            </TabsList>
+
+            <TabsContent value="file" className="space-y-4">
+              <div className="space-y-4 pt-4">
+                <p>Select a document to add as evidence.</p>
+                <Button
+                  onClick={() => {
+                    if (hiddenFileInputRef.current) {
+                      hiddenFileInputRef.current.click();
+                      setEvidenceDialogOpen(false);
+                    }
+                  }}
+                  className="w-full"
+                >
+                  Select Document
+                </Button>
+              </div>
+            </TabsContent>
+
+            <TabsContent value="link" className="space-y-4 pt-4">
+              <div className="space-y-4">
+                <div className="grid w-full items-center gap-1.5">
+                  <Label htmlFor="evidence-name">Name</Label>
+                  <Input
+                    id="evidence-name"
+    </PageTemplate>
+  );
+}
+
+export default function MeasureView() {
+  const { measureId } = useParams();
+  const [queryRef, loadQuery] =
+    useQueryLoader<MeasureViewQueryType>(measureViewQuery);
+
+  useEffect(() => {
+    if (measureId) {
+      loadQuery({ measureId });
+    }
+  }, [measureId, loadQuery]);
+
+  if (!queryRef) {
+    return <MeasureViewSkeleton />;
+  }
+
+  return (
+    <Suspense fallback={<MeasureViewSkeleton />}>
+      <MeasureViewContent queryRef={queryRef} />
+    </Suspense>
+  );
+}
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasureViewQuery.graphql.ts b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewQuery.graphql.ts
index 2fceeb886..4af0ee973 100644
--- a/apps/console/src/pages/organizations/measures/__generated__/MeasureViewQuery.graphql.ts
+++ b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewQuery.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<63dbc912431a9ea23a2ce515ba95af86>>
+ * @generated SignedSource<<03d8e2eca1cc7ffaf797c66ef7fa11c1>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -20,6 +20,22 @@ export type MeasureViewQuery$data = {
   readonly measure: {
     readonly category?: string;
     readonly description?: string;
+    readonly evidences?: {
+      readonly __id: string;
+      readonly edges: ReadonlyArray<{
+        readonly node: {
+          readonly createdAt: string;
+          readonly description: string;
+          readonly filename: string;
+          readonly id: string;
+          readonly mimeType: string;
+          readonly size: number;
+          readonly state: EvidenceState;
+          readonly type: EvidenceType;
+          readonly url: string | null | undefined;
+        };
+      }>;
+    };
     readonly id: string;
     readonly name?: string;
     readonly state?: MeasureState;
@@ -114,53 +130,20 @@ v6 = {
   "storageKey": null
 },
 v7 = {
-  "alias": null,
-  "args": null,
-  "kind": "ScalarField",
-  "name": "timeEstimate",
-  "storageKey": null
-},
-v8 = {
-  "alias": null,
-  "args": null,
-  "concreteType": "People",
-  "kind": "LinkedField",
-  "name": "assignedTo",
-  "plural": false,
-  "selections": [
-    (v2/*: any*/),
-    {
-      "alias": null,
-      "args": null,
-      "kind": "ScalarField",
-      "name": "fullName",
-      "storageKey": null
-    },
-    {
-      "alias": null,
-      "args": null,
-      "kind": "ScalarField",
-      "name": "primaryEmailAddress",
-      "storageKey": null
-    }
-  ],
-  "storageKey": null
-},
-v9 = {
   "alias": null,
   "args": null,
   "kind": "ScalarField",
   "name": "__typename",
   "storageKey": null
 },
-v10 = {
+v8 = {
   "alias": null,
   "args": null,
   "kind": "ScalarField",
   "name": "cursor",
   "storageKey": null
 },
-v11 = {
+v9 = {
   "alias": null,
   "args": null,
   "concreteType": "PageInfo",
@@ -185,7 +168,7 @@ v11 = {
   ],
   "storageKey": null
 },
-v12 = {
+v10 = {
   "kind": "ClientExtension",
   "selections": [
     {
@@ -197,7 +180,7 @@ v12 = {
     }
   ]
 },
-v13 = [
+v11 = [
   {
     "alias": null,
     "args": null,
@@ -259,17 +242,50 @@ v13 = [
             "storageKey": null
           },
           (v4/*: any*/),
-          (v9/*: any*/)
+          (v7/*: any*/)
         ],
         "storageKey": null
       },
-      (v10/*: any*/)
+      (v8/*: any*/)
     ],
     "storageKey": null
   },
-  (v11/*: any*/),
-  (v12/*: any*/)
+  (v9/*: any*/),
+  (v10/*: any*/)
 ],
+v12 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "timeEstimate",
+  "storageKey": null
+},
+v13 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "People",
+  "kind": "LinkedField",
+  "name": "assignedTo",
+  "plural": false,
+  "selections": [
+    (v2/*: any*/),
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "fullName",
+      "storageKey": null
+    },
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "primaryEmailAddress",
+      "storageKey": null
+    }
+  ],
+  "storageKey": null
+},
 v14 = [
   {
     "kind": "Literal",
@@ -307,6 +323,16 @@ return {
               (v4/*: any*/),
               (v5/*: any*/),
               (v6/*: any*/),
+              {
+                "alias": "evidences",
+                "args": null,
+                "concreteType": "EvidenceConnection",
+                "kind": "LinkedField",
+                "name": "__MeasureView_evidences_connection",
+                "plural": false,
+                "selections": (v11/*: any*/),
+                "storageKey": null
+              },
               {
                 "alias": "tasks",
                 "args": null,
@@ -335,28 +361,28 @@ return {
                           (v3/*: any*/),
                           (v4/*: any*/),
                           (v5/*: any*/),
-                          (v7/*: any*/),
-                          (v8/*: any*/),
+                          (v12/*: any*/),
+                          (v13/*: any*/),
                           {
                             "alias": "evidences",
                             "args": null,
                             "concreteType": "EvidenceConnection",
                             "kind": "LinkedField",
-                            "name": "__MeasureView_evidences_connection",
+                            "name": "__MeasureView_task_evidences_connection",
                             "plural": false,
-                            "selections": (v13/*: any*/),
+                            "selections": (v11/*: any*/),
                             "storageKey": null
                           },
-                          (v9/*: any*/)
+                          (v7/*: any*/)
                         ],
                         "storageKey": null
                       },
-                      (v10/*: any*/)
+                      (v8/*: any*/)
                     ],
                     "storageKey": null
                   },
-                  (v11/*: any*/),
-                  (v12/*: any*/)
+                  (v9/*: any*/),
+                  (v10/*: any*/)
                 ],
                 "storageKey": null
               }
@@ -385,7 +411,7 @@ return {
         "name": "node",
         "plural": false,
         "selections": [
-          (v9/*: any*/),
+          (v7/*: any*/),
           (v2/*: any*/),
           {
             "kind": "InlineFragment",
@@ -394,6 +420,25 @@ return {
               (v4/*: any*/),
               (v5/*: any*/),
               (v6/*: any*/),
+              {
+                "alias": null,
+                "args": (v14/*: any*/),
+                "concreteType": "EvidenceConnection",
+                "kind": "LinkedField",
+                "name": "evidences",
+                "plural": false,
+                "selections": (v11/*: any*/),
+                "storageKey": "evidences(first:100)"
+              },
+              {
+                "alias": null,
+                "args": (v14/*: any*/),
+                "filters": null,
+                "handle": "connection",
+                "key": "MeasureView_evidences",
+                "kind": "LinkedHandle",
+                "name": "evidences"
+              },
               {
                 "alias": null,
                 "args": (v14/*: any*/),
@@ -422,8 +467,8 @@ return {
                           (v3/*: any*/),
                           (v4/*: any*/),
                           (v5/*: any*/),
-                          (v7/*: any*/),
-                          (v8/*: any*/),
+                          (v12/*: any*/),
+                          (v13/*: any*/),
                           {
                             "alias": null,
                             "args": (v15/*: any*/),
@@ -431,7 +476,7 @@ return {
                             "kind": "LinkedField",
                             "name": "evidences",
                             "plural": false,
-                            "selections": (v13/*: any*/),
+                            "selections": (v11/*: any*/),
                             "storageKey": "evidences(first:50)"
                           },
                           {
@@ -439,20 +484,20 @@ return {
                             "args": (v15/*: any*/),
                             "filters": null,
                             "handle": "connection",
-                            "key": "MeasureView_evidences",
+                            "key": "MeasureView_task_evidences",
                             "kind": "LinkedHandle",
                             "name": "evidences"
                           },
-                          (v9/*: any*/)
+                          (v7/*: any*/)
                         ],
                         "storageKey": null
                       },
-                      (v10/*: any*/)
+                      (v8/*: any*/)
                     ],
                     "storageKey": null
                   },
-                  (v11/*: any*/),
-                  (v12/*: any*/)
+                  (v9/*: any*/),
+                  (v10/*: any*/)
                 ],
                 "storageKey": "tasks(first:100)"
               },
@@ -475,10 +520,19 @@ return {
     ]
   },
   "params": {
-    "cacheID": "9c4b0f0032102448259ea5deb2b9d57a",
+    "cacheID": "d3e4d9723d12bce8158b83eb76d05a90",
     "id": null,
     "metadata": {
       "connection": [
+        {
+          "count": null,
+          "cursor": null,
+          "direction": "forward",
+          "path": [
+            "measure",
+            "evidences"
+          ]
+        },
         {
           "count": null,
           "cursor": null,
@@ -498,11 +552,11 @@ return {
     },
     "name": "MeasureViewQuery",
     "operationKind": "query",
-    "text": "query MeasureViewQuery(\n  $measureId: ID!\n) {\n  measure: node(id: $measureId) {\n    __typename\n    id\n    ... on Measure {\n      name\n      description\n      state\n      category\n      tasks(first: 100) {\n        edges {\n          node {\n            id\n            name\n            description\n            state\n            timeEstimate\n            assignedTo {\n              id\n              fullName\n              primaryEmailAddress\n            }\n            evidences(first: 50) {\n              edges {\n                node {\n                  id\n                  mimeType\n                  filename\n                  size\n                  state\n                  type\n                  url\n                  createdAt\n                  description\n                  __typename\n                }\n                cursor\n              }\n              pageInfo {\n                endCursor\n                hasNextPage\n              }\n            }\n            __typename\n          }\n          cursor\n        }\n        pageInfo {\n          endCursor\n          hasNextPage\n        }\n      }\n    }\n  }\n}\n"
+    "text": "query MeasureViewQuery(\n  $measureId: ID!\n) {\n  measure: node(id: $measureId) {\n    __typename\n    id\n    ... on Measure {\n      name\n      description\n      state\n      category\n      evidences(first: 100) {\n        edges {\n          node {\n            id\n            mimeType\n            filename\n            size\n            state\n            type\n            url\n            createdAt\n            description\n            __typename\n          }\n          cursor\n        }\n        pageInfo {\n          endCursor\n          hasNextPage\n        }\n      }\n      tasks(first: 100) {\n        edges {\n          node {\n            id\n            name\n            description\n            state\n            timeEstimate\n            assignedTo {\n              id\n              fullName\n              primaryEmailAddress\n            }\n            evidences(first: 50) {\n              edges {\n                node {\n                  id\n                  mimeType\n                  filename\n                  size\n                  state\n                  type\n                  url\n                  createdAt\n                  description\n                  __typename\n                }\n                cursor\n              }\n              pageInfo {\n                endCursor\n                hasNextPage\n              }\n            }\n            __typename\n          }\n          cursor\n        }\n        pageInfo {\n          endCursor\n          hasNextPage\n        }\n      }\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "0de1c02cbaf76feae0ecdbd93f530fa7";
+(node as any).hash = "288412cccb1f4c14b1852504e5536af1";
 
 export default node;
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasureViewCreateEvidenceMutation.graphql.ts b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewRequestEvidenceMutation.graphql.ts
similarity index 78%
rename from apps/console/src/pages/organizations/measures/__generated__/MeasureViewCreateEvidenceMutation.graphql.ts
rename to apps/console/src/pages/organizations/measures/__generated__/MeasureViewRequestEvidenceMutation.graphql.ts
index 30c58f61e..2cd4a05d4 100644
--- a/apps/console/src/pages/organizations/measures/__generated__/MeasureViewCreateEvidenceMutation.graphql.ts
+++ b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewRequestEvidenceMutation.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<e5042f900955d846dd86ad6b78d60518>>
+ * @generated SignedSource<<2f767da45cb75ea7cc61932efa7bf802>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -11,20 +11,18 @@
 import { ConcreteRequest } from 'relay-runtime';
 export type EvidenceState = "FULFILLED" | "REQUESTED";
 export type EvidenceType = "FILE" | "LINK";
-export type CreateEvidenceInput = {
+export type RequestEvidenceInput = {
   description: string;
-  file?: any | null | undefined;
   name: string;
   taskId: string;
   type: EvidenceType;
-  url?: string | null | undefined;
 };
-export type MeasureViewCreateEvidenceMutation$variables = {
+export type MeasureViewRequestEvidenceMutation$variables = {
   connections: ReadonlyArray<string>;
-  input: CreateEvidenceInput;
+  input: RequestEvidenceInput;
 };
-export type MeasureViewCreateEvidenceMutation$data = {
-  readonly createEvidence: {
+export type MeasureViewRequestEvidenceMutation$data = {
+  readonly requestEvidence: {
     readonly evidenceEdge: {
       readonly node: {
         readonly createdAt: string;
@@ -41,9 +39,9 @@ export type MeasureViewCreateEvidenceMutation$data = {
     };
   };
 };
-export type MeasureViewCreateEvidenceMutation = {
-  response: MeasureViewCreateEvidenceMutation$data;
-  variables: MeasureViewCreateEvidenceMutation$variables;
+export type MeasureViewRequestEvidenceMutation = {
+  response: MeasureViewRequestEvidenceMutation$data;
+  variables: MeasureViewRequestEvidenceMutation$variables;
 };
 
 const node: ConcreteRequest = (function(){
@@ -164,14 +162,14 @@ return {
     ],
     "kind": "Fragment",
     "metadata": null,
-    "name": "MeasureViewCreateEvidenceMutation",
+    "name": "MeasureViewRequestEvidenceMutation",
     "selections": [
       {
         "alias": null,
         "args": (v2/*: any*/),
-        "concreteType": "CreateEvidencePayload",
+        "concreteType": "RequestEvidencePayload",
         "kind": "LinkedField",
-        "name": "createEvidence",
+        "name": "requestEvidence",
         "plural": false,
         "selections": [
           (v3/*: any*/)
@@ -189,14 +187,14 @@ return {
       (v0/*: any*/)
     ],
     "kind": "Operation",
-    "name": "MeasureViewCreateEvidenceMutation",
+    "name": "MeasureViewRequestEvidenceMutation",
     "selections": [
       {
         "alias": null,
         "args": (v2/*: any*/),
-        "concreteType": "CreateEvidencePayload",
+        "concreteType": "RequestEvidencePayload",
         "kind": "LinkedField",
-        "name": "createEvidence",
+        "name": "requestEvidence",
         "plural": false,
         "selections": [
           (v3/*: any*/),
@@ -222,16 +220,16 @@ return {
     ]
   },
   "params": {
-    "cacheID": "25b9947aa09d7b4c60886f149b06cc6e",
+    "cacheID": "69f2291555b3826b1b29fea6d2380e04",
     "id": null,
     "metadata": {},
-    "name": "MeasureViewCreateEvidenceMutation",
+    "name": "MeasureViewRequestEvidenceMutation",
     "operationKind": "mutation",
-    "text": "mutation MeasureViewCreateEvidenceMutation(\n  $input: CreateEvidenceInput!\n) {\n  createEvidence(input: $input) {\n    evidenceEdge {\n      node {\n        id\n        filename\n        fileUrl\n        mimeType\n        type\n        url\n        size\n        state\n        createdAt\n        description\n      }\n    }\n  }\n}\n"
+    "text": "mutation MeasureViewRequestEvidenceMutation(\n  $input: RequestEvidenceInput!\n) {\n  requestEvidence(input: $input) {\n    evidenceEdge {\n      node {\n        id\n        filename\n        fileUrl\n        mimeType\n        type\n        url\n        size\n        state\n        createdAt\n        description\n      }\n    }\n  }\n}\n"
   }
 };
 })();
 
-(node as any).hash = "bc59ec67230776eeb60a389a8360b0af";
+(node as any).hash = "7921deec93c923a9cd14969dad6ecfd7";
 
 export default node;
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasureViewUploadMeasureEvidenceMutation.graphql.ts b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewUploadMeasureEvidenceMutation.graphql.ts
new file mode 100644
index 000000000..481178b05
--- /dev/null
+++ b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewUploadMeasureEvidenceMutation.graphql.ts
@@ -0,0 +1,233 @@
+/**
+ * @generated SignedSource<<97ff04190e08df7c9b3288e067787348>>
+ * @lightSyntaxTransform
+ * @nogrep
+ */
+
+/* tslint:disable */
+/* eslint-disable */
+// @ts-nocheck
+
+import { ConcreteRequest } from 'relay-runtime';
+export type EvidenceState = "FULFILLED" | "REQUESTED";
+export type EvidenceType = "FILE" | "LINK";
+export type UploadMeasureEvidenceInput = {
+  file: any;
+  measureId: string;
+};
+export type MeasureViewUploadMeasureEvidenceMutation$variables = {
+  connections: ReadonlyArray<string>;
+  input: UploadMeasureEvidenceInput;
+};
+export type MeasureViewUploadMeasureEvidenceMutation$data = {
+  readonly uploadMeasureEvidence: {
+    readonly evidenceEdge: {
+      readonly node: {
+        readonly createdAt: string;
+        readonly description: string;
+        readonly fileUrl: string | null | undefined;
+        readonly filename: string;
+        readonly id: string;
+        readonly mimeType: string;
+        readonly size: number;
+        readonly state: EvidenceState;
+        readonly type: EvidenceType;
+        readonly url: string | null | undefined;
+      };
+    };
+  };
+};
+export type MeasureViewUploadMeasureEvidenceMutation = {
+  response: MeasureViewUploadMeasureEvidenceMutation$data;
+  variables: MeasureViewUploadMeasureEvidenceMutation$variables;
+};
+
+const node: ConcreteRequest = (function(){
+var v0 = {
+  "defaultValue": null,
+  "kind": "LocalArgument",
+  "name": "connections"
+},
+v1 = {
+  "defaultValue": null,
+  "kind": "LocalArgument",
+  "name": "input"
+},
+v2 = [
+  {
+    "kind": "Variable",
+    "name": "input",
+    "variableName": "input"
+  }
+],
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "EvidenceEdge",
+  "kind": "LinkedField",
+  "name": "evidenceEdge",
+  "plural": false,
+  "selections": [
+    {
+      "alias": null,
+      "args": null,
+      "concreteType": "Evidence",
+      "kind": "LinkedField",
+      "name": "node",
+      "plural": false,
+      "selections": [
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "id",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "filename",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "fileUrl",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "mimeType",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "type",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "url",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "size",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "state",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "createdAt",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "description",
+          "storageKey": null
+        }
+      ],
+      "storageKey": null
+    }
+  ],
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": [
+      (v0/*: any*/),
+      (v1/*: any*/)
+    ],
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "MeasureViewUploadMeasureEvidenceMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v2/*: any*/),
+        "concreteType": "UploadMeasureEvidencePayload",
+        "kind": "LinkedField",
+        "name": "uploadMeasureEvidence",
+        "plural": false,
+        "selections": [
+          (v3/*: any*/)
+        ],
+        "storageKey": null
+      }
+    ],
+    "type": "Mutation",
+    "abstractKey": null
+  },
+  "kind": "Request",
+  "operation": {
+    "argumentDefinitions": [
+      (v1/*: any*/),
+      (v0/*: any*/)
+    ],
+    "kind": "Operation",
+    "name": "MeasureViewUploadMeasureEvidenceMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v2/*: any*/),
+        "concreteType": "UploadMeasureEvidencePayload",
+        "kind": "LinkedField",
+        "name": "uploadMeasureEvidence",
+        "plural": false,
+        "selections": [
+          (v3/*: any*/),
+          {
+            "alias": null,
+            "args": null,
+            "filters": null,
+            "handle": "appendEdge",
+            "key": "",
+            "kind": "LinkedHandle",
+            "name": "evidenceEdge",
+            "handleArgs": [
+              {
+                "kind": "Variable",
+                "name": "connections",
+                "variableName": "connections"
+              }
+            ]
+          }
+        ],
+        "storageKey": null
+      }
+    ]
+  },
+  "params": {
+    "cacheID": "2f033ec4a33f6d9c980702630822c8ca",
+    "id": null,
+    "metadata": {},
+    "name": "MeasureViewUploadMeasureEvidenceMutation",
+    "operationKind": "mutation",
+    "text": "mutation MeasureViewUploadMeasureEvidenceMutation(\n  $input: UploadMeasureEvidenceInput!\n) {\n  uploadMeasureEvidence(input: $input) {\n    evidenceEdge {\n      node {\n        id\n        filename\n        fileUrl\n        mimeType\n        type\n        url\n        size\n        state\n        createdAt\n        description\n      }\n    }\n  }\n}\n"
+  }
+};
+})();
+
+(node as any).hash = "af05defd4ec39b5d3f17aebce2a84c65";
+
+export default node;
diff --git a/apps/console/src/pages/organizations/measures/__generated__/MeasureViewUploadTaskEvidenceMutation.graphql.ts b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewUploadTaskEvidenceMutation.graphql.ts
new file mode 100644
index 000000000..1b276a692
--- /dev/null
+++ b/apps/console/src/pages/organizations/measures/__generated__/MeasureViewUploadTaskEvidenceMutation.graphql.ts
@@ -0,0 +1,233 @@
+/**
+ * @generated SignedSource<<4539152ef13af3aca3a79891c5b81a79>>
+ * @lightSyntaxTransform
+ * @nogrep
+ */
+
+/* tslint:disable */
+/* eslint-disable */
+// @ts-nocheck
+
+import { ConcreteRequest } from 'relay-runtime';
+export type EvidenceState = "FULFILLED" | "REQUESTED";
+export type EvidenceType = "FILE" | "LINK";
+export type UploadTaskEvidenceInput = {
+  file: any;
+  taskId: string;
+};
+export type MeasureViewUploadTaskEvidenceMutation$variables = {
+  connections: ReadonlyArray<string>;
+  input: UploadTaskEvidenceInput;
+};
+export type MeasureViewUploadTaskEvidenceMutation$data = {
+  readonly uploadTaskEvidence: {
+    readonly evidenceEdge: {
+      readonly node: {
+        readonly createdAt: string;
+        readonly description: string;
+        readonly fileUrl: string | null | undefined;
+        readonly filename: string;
+        readonly id: string;
+        readonly mimeType: string;
+        readonly size: number;
+        readonly state: EvidenceState;
+        readonly type: EvidenceType;
+        readonly url: string | null | undefined;
+      };
+    };
+  };
+};
+export type MeasureViewUploadTaskEvidenceMutation = {
+  response: MeasureViewUploadTaskEvidenceMutation$data;
+  variables: MeasureViewUploadTaskEvidenceMutation$variables;
+};
+
+const node: ConcreteRequest = (function(){
+var v0 = {
+  "defaultValue": null,
+  "kind": "LocalArgument",
+  "name": "connections"
+},
+v1 = {
+  "defaultValue": null,
+  "kind": "LocalArgument",
+  "name": "input"
+},
+v2 = [
+  {
+    "kind": "Variable",
+    "name": "input",
+    "variableName": "input"
+  }
+],
+v3 = {
+  "alias": null,
+  "args": null,
+  "concreteType": "EvidenceEdge",
+  "kind": "LinkedField",
+  "name": "evidenceEdge",
+  "plural": false,
+  "selections": [
+    {
+      "alias": null,
+      "args": null,
+      "concreteType": "Evidence",
+      "kind": "LinkedField",
+      "name": "node",
+      "plural": false,
+      "selections": [
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "id",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "filename",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "fileUrl",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "mimeType",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "type",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "url",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "size",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "state",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "createdAt",
+          "storageKey": null
+        },
+        {
+          "alias": null,
+          "args": null,
+          "kind": "ScalarField",
+          "name": "description",
+          "storageKey": null
+        }
+      ],
+      "storageKey": null
+    }
+  ],
+  "storageKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": [
+      (v0/*: any*/),
+      (v1/*: any*/)
+    ],
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "MeasureViewUploadTaskEvidenceMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v2/*: any*/),
+        "concreteType": "UploadTaskEvidencePayload",
+        "kind": "LinkedField",
+        "name": "uploadTaskEvidence",
+        "plural": false,
+        "selections": [
+          (v3/*: any*/)
+        ],
+        "storageKey": null
+      }
+    ],
+    "type": "Mutation",
+    "abstractKey": null
+  },
+  "kind": "Request",
+  "operation": {
+    "argumentDefinitions": [
+      (v1/*: any*/),
+      (v0/*: any*/)
+    ],
+    "kind": "Operation",
+    "name": "MeasureViewUploadTaskEvidenceMutation",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v2/*: any*/),
+        "concreteType": "UploadTaskEvidencePayload",
+        "kind": "LinkedField",
+        "name": "uploadTaskEvidence",
+        "plural": false,
+        "selections": [
+          (v3/*: any*/),
+          {
+            "alias": null,
+            "args": null,
+            "filters": null,
+            "handle": "appendEdge",
+            "key": "",
+            "kind": "LinkedHandle",
+            "name": "evidenceEdge",
+            "handleArgs": [
+              {
+                "kind": "Variable",
+                "name": "connections",
+                "variableName": "connections"
+              }
+            ]
+          }
+        ],
+        "storageKey": null
+      }
+    ]
+  },
+  "params": {
+    "cacheID": "2c18eec6e7e3d428ad6fbdf4c52ccf94",
+    "id": null,
+    "metadata": {},
+    "name": "MeasureViewUploadTaskEvidenceMutation",
+    "operationKind": "mutation",
+    "text": "mutation MeasureViewUploadTaskEvidenceMutation(\n  $input: UploadTaskEvidenceInput!\n) {\n  uploadTaskEvidence(input: $input) {\n    evidenceEdge {\n      node {\n        id\n        filename\n        fileUrl\n        mimeType\n        type\n        url\n        size\n        state\n        createdAt\n        description\n      }\n    }\n  }\n}\n"
+  }
+};
+})();
+
+(node as any).hash = "3649fc872c9f58d4ffd0181b0316c812";
+
+export default node;
diff --git a/pkg/coredata/evidence.go b/pkg/coredata/evidence.go
index 1eb8aa7ea..794f3eb0c 100644
--- a/pkg/coredata/evidence.go
+++ b/pkg/coredata/evidence.go
@@ -29,7 +29,8 @@ import (
 type (
 	Evidence struct {
 		ID          gid.GID       `db:"id"`
-		TaskID      gid.GID       `db:"task_id"`
+		MeasureID   gid.GID       `db:"measure_id"`
+		TaskID      *gid.GID      `db:"task_id"`
 		State       EvidenceState `db:"state"`
 		ReferenceID string        `db:"reference_id"`
 		Type        EvidenceType  `db:"type"`
@@ -65,6 +66,7 @@ INSERT INTO
     evidences (
         tenant_id,
         id,
+        measure_id,
         task_id,
         reference_id,
         object_key,
@@ -81,6 +83,7 @@ INSERT INTO
 VALUES (
     @tenant_id,
     @evidence_id,
+    @measure_id,
     @task_id,
     @reference_id,
     @object_key,
@@ -104,6 +107,7 @@ WHERE evidences.state = 'REQUESTED';
 	args := pgx.StrictNamedArgs{
 		"tenant_id":    scope.GetTenantID(),
 		"evidence_id":  e.ID,
+		"measure_id":   e.MeasureID,
 		"task_id":      e.TaskID,
 		"reference_id": e.ReferenceID,
 		"object_key":   e.ObjectKey,
@@ -131,6 +135,7 @@ INSERT INTO
     evidences (
         tenant_id,
         id,
+        measure_id,
         task_id,
         reference_id,
         object_key,
@@ -147,6 +152,7 @@ INSERT INTO
 VALUES (
     @tenant_id,
     @evidence_id,
+    @measure_id,
     @task_id,
     @reference_id,
     @object_key,
@@ -165,6 +171,7 @@ VALUES (
 	args := pgx.StrictNamedArgs{
 		"tenant_id":    scope.GetTenantID(),
 		"evidence_id":  e.ID,
+		"measure_id":   e.MeasureID,
 		"task_id":      e.TaskID,
 		"reference_id": e.ReferenceID,
 		"object_key":   e.ObjectKey,
@@ -192,6 +199,7 @@ func (e *Evidence) LoadByID(
 SELECT
     id,
     task_id,
+    measure_id,
     reference_id,
     state,
     type,
@@ -231,6 +239,58 @@ LIMIT 1;
 	return nil
 }
 
+func (e *Evidences) LoadByMeasureID(
+	ctx context.Context,
+	conn pg.Conn,
+	scope Scoper,
+	measureID gid.GID,
+	cursor *page.Cursor[EvidenceOrderField],
+) error {
+	q := `
+	SELECT
+		id,
+		measure_id,
+		task_id,
+		reference_id,
+		state,
+		type,
+		object_key,
+		mime_type,
+		size,
+		filename,
+		url,
+		description,
+		created_at,
+		updated_at
+	FROM
+		evidences
+	WHERE
+		%s
+		AND measure_id = @measure_id
+		AND %s
+	`
+
+	q = fmt.Sprintf(q, scope.SQLFragment(), cursor.SQLFragment())
+
+	args := pgx.StrictNamedArgs{"measure_id": measureID}
+	maps.Copy(args, scope.SQLArguments())
+	maps.Copy(args, cursor.SQLArguments())
+
+	rows, err := conn.Query(ctx, q, args)
+	if err != nil {
+		return fmt.Errorf("cannot query evidence: %w", err)
+	}
+
+	evidences, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Evidence])
+	if err != nil {
+		return fmt.Errorf("cannot collect evidence: %w", err)
+	}
+
+	*e = evidences
+
+	return nil
+}
+
 func (e *Evidences) LoadByTaskID(
 	ctx context.Context,
 	conn pg.Conn,
@@ -241,6 +301,7 @@ func (e *Evidences) LoadByTaskID(
 	q := `
 SELECT
     id,
+    measure_id,
     task_id,
     reference_id,
     state,
diff --git a/pkg/coredata/migrations/20250503T142200Z.sql b/pkg/coredata/migrations/20250503T142200Z.sql
new file mode 100644
index 000000000..71fab91ee
--- /dev/null
+++ b/pkg/coredata/migrations/20250503T142200Z.sql
@@ -0,0 +1,9 @@
+ALTER TABLE evidences ALTER COLUMN task_id DROP NOT NULL;
+ALTER TABLE evidences ADD COLUMN measure_id TEXT REFERENCES measures(id);
+
+UPDATE evidences e
+SET measure_id = t.measure_id
+FROM tasks t
+WHERE e.task_id = t.id AND e.measure_id IS NULL;
+
+ALTER TABLE evidences ALTER COLUMN measure_id SET NOT NULL;
\ No newline at end of file
diff --git a/pkg/probo/evidence_service.go b/pkg/probo/evidence_service.go
index 5fd7a600a..7af7f4f0a 100644
--- a/pkg/probo/evidence_service.go
+++ b/pkg/probo/evidence_service.go
@@ -37,8 +37,16 @@ type (
 		svc *TenantService
 	}
 
+	File struct {
+		Content     io.Reader
+		Filename    string
+		Size        int64
+		ContentType string
+	}
+
 	RequestEvidenceRequest struct {
-		TaskID      gid.GID
+		MeasureID   *gid.GID
+		TaskID      *gid.GID
 		Type        coredata.EvidenceType
 		Name        string
 		Description string
@@ -51,13 +59,14 @@ type (
 		Filename   *string
 	}
 
-	CreateEvidenceRequest struct {
-		TaskID      gid.GID
-		Name        string
-		Type        coredata.EvidenceType
-		File        io.Reader
-		URL         string
-		Description string
+	UploadTaskEvidenceRequest struct {
+		TaskID gid.GID
+		File   File
+	}
+
+	UploadMeasureEvidenceRequest struct {
+		MeasureID gid.GID
+		File      File
 	}
 )
 
@@ -90,7 +99,6 @@ func (s EvidenceService) Request(
 
 	evidence := &coredata.Evidence{
 		ID:          evidenceID,
-		TaskID:      req.TaskID,
 		State:       coredata.EvidenceStateRequested,
 		Type:        req.Type,
 		Filename:    req.Name,
@@ -99,9 +107,23 @@ func (s EvidenceService) Request(
 		UpdatedAt:   now,
 	}
 
-	err := s.svc.pg.WithConn(
+	err := s.svc.pg.WithTx(
 		ctx,
 		func(conn pg.Conn) error {
+			task := &coredata.Task{}
+			if req.TaskID != nil {
+				if err := task.LoadByID(ctx, conn, s.svc.scope, *req.TaskID); err != nil {
+					return fmt.Errorf("cannot load task: %w", err)
+				}
+
+				evidence.TaskID = req.TaskID
+				evidence.MeasureID = task.MeasureID
+			} else if req.MeasureID != nil {
+				evidence.MeasureID = *req.MeasureID
+			} else {
+				return fmt.Errorf("measure id or task id is required")
+			}
+
 			return evidence.Insert(ctx, conn, s.svc.scope)
 		},
 	)
@@ -183,9 +205,9 @@ func (s EvidenceService) Fulfill(
 	return evidence, nil
 }
 
-func (s EvidenceService) Create(
+func (s EvidenceService) UploadTaskEvidence(
 	ctx context.Context,
-	req CreateEvidenceRequest,
+	req UploadTaskEvidenceRequest,
 ) (*coredata.Evidence, error) {
 	now := time.Now()
 	evidenceID := gid.New(s.svc.scope.GetTenantID(), coredata.EvidenceEntityType)
@@ -197,66 +219,130 @@ func (s EvidenceService) Create(
 
 	evidence := &coredata.Evidence{
 		ID:          evidenceID,
-		TaskID:      req.TaskID,
+		TaskID:      &req.TaskID,
 		State:       coredata.EvidenceStateFulfilled,
 		ReferenceID: "custom-evidence-" + referenceID.String(),
-		Type:        req.Type,
-		Filename:    req.Name,
-		URL:         req.URL,
-		Description: req.Description,
+		Type:        coredata.EvidenceTypeFile,
+		Filename:    req.File.Filename,
 		CreatedAt:   now,
 		UpdatedAt:   now,
 	}
 
-	if req.Type == coredata.EvidenceTypeFile {
-		contentType := "application/octet-stream"
-		if req.Name != "" {
-			if detectedType := mime.TypeByExtension(filepath.Ext(req.Name)); detectedType != "" {
-				contentType = detectedType
-			}
-		}
-
-		objectKey, err := uuid.NewV7()
-		if err != nil {
-			return nil, fmt.Errorf("cannot generate object key: %w", err)
-		}
-
-		_, err = s.svc.s3.PutObject(ctx, &s3.PutObjectInput{
-			Bucket:      aws.String(s.svc.bucket),
-			Key:         aws.String(objectKey.String()),
-			Body:        req.File,
-			ContentType: aws.String(contentType),
-		})
-		if err != nil {
-			return nil, fmt.Errorf("cannot upload file to S3: %w", err)
-		}
-
-		headOutput, err := s.svc.s3.HeadObject(ctx, &s3.HeadObjectInput{
-			Bucket: aws.String(s.svc.bucket),
-			Key:    aws.String(objectKey.String()),
-		})
-		if err != nil {
-			return nil, fmt.Errorf("cannot get object metadata: %w", err)
-		}
-
-		evidence.ObjectKey = objectKey.String()
-		evidence.MimeType = contentType
-		evidence.Size = uint64(*headOutput.ContentLength)
-	} else if req.Type == coredata.EvidenceTypeLink {
-		evidence.MimeType = "text/uri-list"
-		evidence.Size = uint64(len(req.URL))
-		evidence.ObjectKey = ""
+	// TODO validate content type
+	if req.File.ContentType == "" {
+		req.File.ContentType = "application/octet-stream"
 	}
 
-	task := &coredata.Task{}
+	objectKey, err := uuid.NewV7()
+	if err != nil {
+		return nil, fmt.Errorf("cannot generate object key: %w", err)
+	}
+
+	_, err = s.svc.s3.PutObject(
+		ctx,
+		&s3.PutObjectInput{
+			Bucket:      aws.String(s.svc.bucket),
+			Key:         aws.String(objectKey.String()),
+			Body:        req.File.Content,
+			ContentType: aws.String(req.File.ContentType),
+		},
+	)
+	if err != nil {
+		return nil, fmt.Errorf("cannot upload file to S3: %w", err)
+	}
+
+	evidence.ObjectKey = objectKey.String()
+	evidence.MimeType = req.File.ContentType
+	evidence.Size = uint64(req.File.Size)
 
 	err = s.svc.pg.WithTx(
 		ctx,
 		func(conn pg.Conn) error {
+			task := &coredata.Task{}
+
 			if err := task.LoadByID(ctx, conn, s.svc.scope, req.TaskID); err != nil {
 				return fmt.Errorf("cannot load task %q: %w", req.TaskID, err)
 			}
 
+			evidence.MeasureID = task.MeasureID
+
+			if err := evidence.Insert(ctx, conn, s.svc.scope); err != nil {
+				return fmt.Errorf("cannot insert evidence: %w", err)
+			}
+
+			return nil
+		},
+	)
+
+	if err != nil {
+		// TODO try do delete file from s3 if it's a file type
+		return nil, err
+	}
+
+	return evidence, nil
+}
+
+func (s EvidenceService) UploadMeasureEvidence(
+	ctx context.Context,
+	req UploadMeasureEvidenceRequest,
+) (*coredata.Evidence, error) {
+	now := time.Now()
+	evidenceID := gid.New(s.svc.scope.GetTenantID(), coredata.EvidenceEntityType)
+
+	referenceID, err := uuid.NewV4()
+	if err != nil {
+		return nil, fmt.Errorf("cannot generate reference id: %w", err)
+	}
+
+	evidence := &coredata.Evidence{
+		ID:          evidenceID,
+		MeasureID:   req.MeasureID,
+		State:       coredata.EvidenceStateFulfilled,
+		ReferenceID: "custom-evidence-" + referenceID.String(),
+		Type:        coredata.EvidenceTypeFile,
+		Filename:    req.File.Filename,
+		CreatedAt:   now,
+		UpdatedAt:   now,
+	}
+
+	// TODO validate content type
+	if req.File.ContentType == "" {
+		req.File.ContentType = "application/octet-stream"
+	}
+
+	objectKey, err := uuid.NewV7()
+	if err != nil {
+		return nil, fmt.Errorf("cannot generate object key: %w", err)
+	}
+
+	_, err = s.svc.s3.PutObject(
+		ctx,
+		&s3.PutObjectInput{
+			Bucket:      aws.String(s.svc.bucket),
+			Key:         aws.String(objectKey.String()),
+			Body:        req.File.Content,
+			ContentType: aws.String(req.File.ContentType),
+		},
+	)
+	if err != nil {
+		return nil, fmt.Errorf("cannot upload file to S3: %w", err)
+	}
+
+	evidence.ObjectKey = objectKey.String()
+	evidence.MimeType = req.File.ContentType
+	evidence.Size = uint64(req.File.Size)
+
+	err = s.svc.pg.WithTx(
+		ctx,
+		func(conn pg.Conn) error {
+			measure := &coredata.Measure{}
+
+			if err := measure.LoadByID(ctx, conn, s.svc.scope, req.MeasureID); err != nil {
+				return fmt.Errorf("cannot load measure %q: %w", req.MeasureID, err)
+			}
+
+			evidence.MeasureID = req.MeasureID
+
 			if err := evidence.Insert(ctx, conn, s.svc.scope); err != nil {
 				return fmt.Errorf("cannot insert evidence: %w", err)
 			}
@@ -310,6 +396,33 @@ func (s EvidenceService) GenerateFileURL(
 	return &presignedReq.URL, nil
 }
 
+func (s EvidenceService) ListForMeasureID(
+	ctx context.Context,
+	measureID gid.GID,
+	cursor *page.Cursor[coredata.EvidenceOrderField],
+) (*page.Page[*coredata.Evidence, coredata.EvidenceOrderField], error) {
+	var evidences coredata.Evidences
+
+	err := s.svc.pg.WithConn(
+		ctx,
+		func(conn pg.Conn) error {
+			return evidences.LoadByMeasureID(
+				ctx,
+				conn,
+				s.svc.scope,
+				measureID,
+				cursor,
+			)
+		},
+	)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return page.NewPage(evidences, cursor), nil
+}
+
 func (s EvidenceService) ListForTaskID(
 	ctx context.Context,
 	taskID gid.GID,
diff --git a/pkg/probo/mesure_service.go b/pkg/probo/mesure_service.go
index b72514b4f..dc31654b1 100644
--- a/pkg/probo/mesure_service.go
+++ b/pkg/probo/mesure_service.go
@@ -188,7 +188,7 @@ func (s MeasureService) Import(
 						evidence := &coredata.Evidence{
 							State:       coredata.EvidenceStateRequested,
 							ID:          evidenceID,
-							TaskID:      task.ID,
+							TaskID:      &task.ID,
 							ReferenceID: req.Measures[i].Tasks[j].RequestedEvidences[k].ReferenceID,
 							Type:        req.Measures[i].Tasks[j].RequestedEvidences[k].Type,
 							Description: req.Measures[i].Tasks[j].RequestedEvidences[k].Name,
diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql
index b2bb66602..d7e9f3421 100644
--- a/pkg/server/api/console/v1/schema.graphql
+++ b/pkg/server/api/console/v1/schema.graphql
@@ -596,6 +596,14 @@ type Measure implements Node {
   description: String!
   state: MeasureState!
 
+  evidences(
+    first: Int
+    after: CursorKey
+    last: Int
+    before: CursorKey
+    orderBy: EvidenceOrder
+  ): EvidenceConnection! @goField(forceResolver: true)
+
   tasks(
     first: Int
     after: CursorKey
@@ -987,8 +995,9 @@ type Mutation {
   # Evidence mutations
   requestEvidence(input: RequestEvidenceInput!): RequestEvidencePayload!
   fulfillEvidence(input: FulfillEvidenceInput!): FulfillEvidencePayload!
-  createEvidence(input: CreateEvidenceInput!): CreateEvidencePayload!
   deleteEvidence(input: DeleteEvidenceInput!): DeleteEvidencePayload!
+  uploadTaskEvidence(input: UploadTaskEvidenceInput!): UploadTaskEvidencePayload!
+  uploadMeasureEvidence(input: UploadMeasureEvidenceInput!): UploadMeasureEvidencePayload!
 
   # Vendor Compliance Report mutations
   uploadVendorComplianceReport(
@@ -1651,4 +1660,22 @@ input SendSigningNotificationsInput {
 
 type SendSigningNotificationsPayload {
   success: Boolean!
-}
\ No newline at end of file
+}
+
+type UploadTaskEvidencePayload {
+  evidenceEdge: EvidenceEdge!
+}
+
+type UploadMeasureEvidencePayload {
+  evidenceEdge: EvidenceEdge!
+}
+
+input UploadTaskEvidenceInput {
+  taskId: ID!
+  file: Upload!
+}
+
+input UploadMeasureEvidenceInput {
+  measureId: ID!
+  file: Upload!
+}
diff --git a/pkg/server/api/console/v1/schema/schema.go b/pkg/server/api/console/v1/schema/schema.go
index 25de83a16..6d9fd9f92 100644
--- a/pkg/server/api/console/v1/schema/schema.go
+++ b/pkg/server/api/console/v1/schema/schema.go
@@ -293,6 +293,7 @@ type ComplexityRoot struct {
 		Controls    func(childComplexity int, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.ControlOrderBy) int
 		CreatedAt   func(childComplexity int) int
 		Description func(childComplexity int) int
+		Evidences   func(childComplexity int, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.EvidenceOrderBy) int
 		ID          func(childComplexity int) int
 		Name        func(childComplexity int) int
 		Risks       func(childComplexity int, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.RiskOrderBy) int
@@ -317,7 +318,6 @@ type ComplexityRoot struct {
 		CreateControlMeasureMapping  func(childComplexity int, input types.CreateControlMeasureMappingInput) int
 		CreateControlPolicyMapping   func(childComplexity int, input types.CreateControlPolicyMappingInput) int
 		CreateDraftPolicyVersion     func(childComplexity int, input types.CreateDraftPolicyVersionInput) int
-		CreateEvidence               func(childComplexity int, input types.CreateEvidenceInput) int
 		CreateFramework              func(childComplexity int, input types.CreateFrameworkInput) int
 		CreateMeasure                func(childComplexity int, input types.CreateMeasureInput) int
 		CreateOrganization           func(childComplexity int, input types.CreateOrganizationInput) int
@@ -361,6 +361,8 @@ type ComplexityRoot struct {
 		UpdateRisk                   func(childComplexity int, input types.UpdateRiskInput) int
 		UpdateTask                   func(childComplexity int, input types.UpdateTaskInput) int
 		UpdateVendor                 func(childComplexity int, input types.UpdateVendorInput) int
+		UploadMeasureEvidence        func(childComplexity int, input types.UploadMeasureEvidenceInput) int
+		UploadTaskEvidence           func(childComplexity int, input types.UploadTaskEvidenceInput) int
 		UploadVendorComplianceReport func(childComplexity int, input types.UploadVendorComplianceReportInput) int
 	}
 
@@ -609,6 +611,14 @@ type ComplexityRoot struct {
 		Vendor func(childComplexity int) int
 	}
 
+	UploadMeasureEvidencePayload struct {
+		EvidenceEdge func(childComplexity int) int
+	}
+
+	UploadTaskEvidencePayload struct {
+		EvidenceEdge func(childComplexity int) int
+	}
+
 	UploadVendorComplianceReportPayload struct {
 		VendorComplianceReportEdge func(childComplexity int) int
 	}
@@ -728,6 +738,7 @@ type FrameworkResolver interface {
 	Controls(ctx context.Context, obj *types.Framework, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.ControlOrderBy) (*types.ControlConnection, error)
 }
 type MeasureResolver interface {
+	Evidences(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.EvidenceOrderBy) (*types.EvidenceConnection, error)
 	Tasks(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.TaskOrderBy) (*types.TaskConnection, error)
 	Risks(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.RiskOrderBy) (*types.RiskConnection, error)
 	Controls(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.ControlOrderBy) (*types.ControlConnection, error)
@@ -771,8 +782,9 @@ type MutationResolver interface {
 	DeleteRiskPolicyMapping(ctx context.Context, input types.DeleteRiskPolicyMappingInput) (*types.DeleteRiskPolicyMappingPayload, error)
 	RequestEvidence(ctx context.Context, input types.RequestEvidenceInput) (*types.RequestEvidencePayload, error)
 	FulfillEvidence(ctx context.Context, input types.FulfillEvidenceInput) (*types.FulfillEvidencePayload, error)
-	CreateEvidence(ctx context.Context, input types.CreateEvidenceInput) (*types.CreateEvidencePayload, error)
 	DeleteEvidence(ctx context.Context, input types.DeleteEvidenceInput) (*types.DeleteEvidencePayload, error)
+	UploadTaskEvidence(ctx context.Context, input types.UploadTaskEvidenceInput) (*types.UploadTaskEvidencePayload, error)
+	UploadMeasureEvidence(ctx context.Context, input types.UploadMeasureEvidenceInput) (*types.UploadMeasureEvidencePayload, error)
 	UploadVendorComplianceReport(ctx context.Context, input types.UploadVendorComplianceReportInput) (*types.UploadVendorComplianceReportPayload, error)
 	DeleteVendorComplianceReport(ctx context.Context, input types.DeleteVendorComplianceReportInput) (*types.DeleteVendorComplianceReportPayload, error)
 	CreatePolicy(ctx context.Context, input types.CreatePolicyInput) (*types.CreatePolicyPayload, error)
@@ -1491,6 +1503,18 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Measure.Description(childComplexity), true
 
+	case "Measure.evidences":
+		if e.complexity.Measure.Evidences == nil {
+			break
+		}
+
+		args, err := ec.field_Measure_evidences_args(context.TODO(), rawArgs)
+		if err != nil {
+			return 0, false
+		}
+
+		return e.complexity.Measure.Evidences(childComplexity, args["first"].(*int), args["after"].(*page.CursorKey), args["last"].(*int), args["before"].(*page.CursorKey), args["orderBy"].(*types.EvidenceOrderBy)), true
+
 	case "Measure.id":
 		if e.complexity.Measure.ID == nil {
 			break
@@ -1631,18 +1655,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Mutation.CreateDraftPolicyVersion(childComplexity, args["input"].(types.CreateDraftPolicyVersionInput)), true
 
-	case "Mutation.createEvidence":
-		if e.complexity.Mutation.CreateEvidence == nil {
-			break
-		}
-
-		args, err := ec.field_Mutation_createEvidence_args(context.TODO(), rawArgs)
-		if err != nil {
-			return 0, false
-		}
-
-		return e.complexity.Mutation.CreateEvidence(childComplexity, args["input"].(types.CreateEvidenceInput)), true
-
 	case "Mutation.createFramework":
 		if e.complexity.Mutation.CreateFramework == nil {
 			break
@@ -2159,6 +2171,30 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.Mutation.UpdateVendor(childComplexity, args["input"].(types.UpdateVendorInput)), true
 
+	case "Mutation.uploadMeasureEvidence":
+		if e.complexity.Mutation.UploadMeasureEvidence == nil {
+			break
+		}
+
+		args, err := ec.field_Mutation_uploadMeasureEvidence_args(context.TODO(), rawArgs)
+		if err != nil {
+			return 0, false
+		}
+
+		return e.complexity.Mutation.UploadMeasureEvidence(childComplexity, args["input"].(types.UploadMeasureEvidenceInput)), true
+
+	case "Mutation.uploadTaskEvidence":
+		if e.complexity.Mutation.UploadTaskEvidence == nil {
+			break
+		}
+
+		args, err := ec.field_Mutation_uploadTaskEvidence_args(context.TODO(), rawArgs)
+		if err != nil {
+			return 0, false
+		}
+
+		return e.complexity.Mutation.UploadTaskEvidence(childComplexity, args["input"].(types.UploadTaskEvidenceInput)), true
+
 	case "Mutation.uploadVendorComplianceReport":
 		if e.complexity.Mutation.UploadVendorComplianceReport == nil {
 			break
@@ -3147,6 +3183,20 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
 
 		return e.complexity.UpdateVendorPayload.Vendor(childComplexity), true
 
+	case "UploadMeasureEvidencePayload.evidenceEdge":
+		if e.complexity.UploadMeasureEvidencePayload.EvidenceEdge == nil {
+			break
+		}
+
+		return e.complexity.UploadMeasureEvidencePayload.EvidenceEdge(childComplexity), true
+
+	case "UploadTaskEvidencePayload.evidenceEdge":
+		if e.complexity.UploadTaskEvidencePayload.EvidenceEdge == nil {
+			break
+		}
+
+		return e.complexity.UploadTaskEvidencePayload.EvidenceEdge(childComplexity), true
+
 	case "UploadVendorComplianceReportPayload.vendorComplianceReportEdge":
 		if e.complexity.UploadVendorComplianceReportPayload.VendorComplianceReportEdge == nil {
 			break
@@ -3693,6 +3743,8 @@ func (e *executableSchema) Exec(ctx context.Context) graphql.ResponseHandler {
 		ec.unmarshalInputUpdateRiskInput,
 		ec.unmarshalInputUpdateTaskInput,
 		ec.unmarshalInputUpdateVendorInput,
+		ec.unmarshalInputUploadMeasureEvidenceInput,
+		ec.unmarshalInputUploadTaskEvidenceInput,
 		ec.unmarshalInputUploadVendorComplianceReportInput,
 		ec.unmarshalInputUserOrder,
 		ec.unmarshalInputVendorComplianceReportOrder,
@@ -4393,6 +4445,14 @@ type Measure implements Node {
   description: String!
   state: MeasureState!
 
+  evidences(
+    first: Int
+    after: CursorKey
+    last: Int
+    before: CursorKey
+    orderBy: EvidenceOrder
+  ): EvidenceConnection! @goField(forceResolver: true)
+
   tasks(
     first: Int
     after: CursorKey
@@ -4784,8 +4844,9 @@ type Mutation {
   # Evidence mutations
   requestEvidence(input: RequestEvidenceInput!): RequestEvidencePayload!
   fulfillEvidence(input: FulfillEvidenceInput!): FulfillEvidencePayload!
-  createEvidence(input: CreateEvidenceInput!): CreateEvidencePayload!
   deleteEvidence(input: DeleteEvidenceInput!): DeleteEvidencePayload!
+  uploadTaskEvidence(input: UploadTaskEvidenceInput!): UploadTaskEvidencePayload!
+  uploadMeasureEvidence(input: UploadMeasureEvidenceInput!): UploadMeasureEvidencePayload!
 
   # Vendor Compliance Report mutations
   uploadVendorComplianceReport(
@@ -5448,7 +5509,26 @@ input SendSigningNotificationsInput {
 
 type SendSigningNotificationsPayload {
   success: Boolean!
-}`, BuiltIn: false},
+}
+
+type UploadTaskEvidencePayload {
+  evidenceEdge: EvidenceEdge!
+}
+
+type UploadMeasureEvidencePayload {
+  evidenceEdge: EvidenceEdge!
+}
+
+input UploadTaskEvidenceInput {
+  taskId: ID!
+  file: Upload!
+}
+
+input UploadMeasureEvidenceInput {
+  measureId: ID!
+  file: Upload!
+}
+`, BuiltIn: false},
 }
 var parsedSchema = gqlparser.MustLoadSchema(sources...)
 
@@ -5836,6 +5916,101 @@ func (ec *executionContext) field_Measure_controls_argsOrderBy(
 	return zeroVal, nil
 }
 
+func (ec *executionContext) field_Measure_evidences_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
+	var err error
+	args := map[string]any{}
+	arg0, err := ec.field_Measure_evidences_argsFirst(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["first"] = arg0
+	arg1, err := ec.field_Measure_evidences_argsAfter(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["after"] = arg1
+	arg2, err := ec.field_Measure_evidences_argsLast(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["last"] = arg2
+	arg3, err := ec.field_Measure_evidences_argsBefore(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["before"] = arg3
+	arg4, err := ec.field_Measure_evidences_argsOrderBy(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["orderBy"] = arg4
+	return args, nil
+}
+func (ec *executionContext) field_Measure_evidences_argsFirst(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (*int, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("first"))
+	if tmp, ok := rawArgs["first"]; ok {
+		return ec.unmarshalOInt2ᚖint(ctx, tmp)
+	}
+
+	var zeroVal *int
+	return zeroVal, nil
+}
+
+func (ec *executionContext) field_Measure_evidences_argsAfter(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (*page.CursorKey, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after"))
+	if tmp, ok := rawArgs["after"]; ok {
+		return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp)
+	}
+
+	var zeroVal *page.CursorKey
+	return zeroVal, nil
+}
+
+func (ec *executionContext) field_Measure_evidences_argsLast(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (*int, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("last"))
+	if tmp, ok := rawArgs["last"]; ok {
+		return ec.unmarshalOInt2ᚖint(ctx, tmp)
+	}
+
+	var zeroVal *int
+	return zeroVal, nil
+}
+
+func (ec *executionContext) field_Measure_evidences_argsBefore(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (*page.CursorKey, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before"))
+	if tmp, ok := rawArgs["before"]; ok {
+		return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp)
+	}
+
+	var zeroVal *page.CursorKey
+	return zeroVal, nil
+}
+
+func (ec *executionContext) field_Measure_evidences_argsOrderBy(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (*types.EvidenceOrderBy, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("orderBy"))
+	if tmp, ok := rawArgs["orderBy"]; ok {
+		return ec.unmarshalOEvidenceOrder2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐEvidenceOrderBy(ctx, tmp)
+	}
+
+	var zeroVal *types.EvidenceOrderBy
+	return zeroVal, nil
+}
+
 func (ec *executionContext) field_Measure_risks_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
 	var err error
 	args := map[string]any{}
@@ -6141,29 +6316,6 @@ func (ec *executionContext) field_Mutation_createDraftPolicyVersion_argsInput(
 	return zeroVal, nil
 }
 
-func (ec *executionContext) field_Mutation_createEvidence_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
-	var err error
-	args := map[string]any{}
-	arg0, err := ec.field_Mutation_createEvidence_argsInput(ctx, rawArgs)
-	if err != nil {
-		return nil, err
-	}
-	args["input"] = arg0
-	return args, nil
-}
-func (ec *executionContext) field_Mutation_createEvidence_argsInput(
-	ctx context.Context,
-	rawArgs map[string]any,
-) (types.CreateEvidenceInput, error) {
-	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("input"))
-	if tmp, ok := rawArgs["input"]; ok {
-		return ec.unmarshalNCreateEvidenceInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐCreateEvidenceInput(ctx, tmp)
-	}
-
-	var zeroVal types.CreateEvidenceInput
-	return zeroVal, nil
-}
-
 func (ec *executionContext) field_Mutation_createFramework_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
 	var err error
 	args := map[string]any{}
@@ -7153,6 +7305,52 @@ func (ec *executionContext) field_Mutation_updateVendor_argsInput(
 	return zeroVal, nil
 }
 
+func (ec *executionContext) field_Mutation_uploadMeasureEvidence_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
+	var err error
+	args := map[string]any{}
+	arg0, err := ec.field_Mutation_uploadMeasureEvidence_argsInput(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["input"] = arg0
+	return args, nil
+}
+func (ec *executionContext) field_Mutation_uploadMeasureEvidence_argsInput(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (types.UploadMeasureEvidenceInput, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("input"))
+	if tmp, ok := rawArgs["input"]; ok {
+		return ec.unmarshalNUploadMeasureEvidenceInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadMeasureEvidenceInput(ctx, tmp)
+	}
+
+	var zeroVal types.UploadMeasureEvidenceInput
+	return zeroVal, nil
+}
+
+func (ec *executionContext) field_Mutation_uploadTaskEvidence_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
+	var err error
+	args := map[string]any{}
+	arg0, err := ec.field_Mutation_uploadTaskEvidence_argsInput(ctx, rawArgs)
+	if err != nil {
+		return nil, err
+	}
+	args["input"] = arg0
+	return args, nil
+}
+func (ec *executionContext) field_Mutation_uploadTaskEvidence_argsInput(
+	ctx context.Context,
+	rawArgs map[string]any,
+) (types.UploadTaskEvidenceInput, error) {
+	ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("input"))
+	if tmp, ok := rawArgs["input"]; ok {
+		return ec.unmarshalNUploadTaskEvidenceInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadTaskEvidenceInput(ctx, tmp)
+	}
+
+	var zeroVal types.UploadTaskEvidenceInput
+	return zeroVal, nil
+}
+
 func (ec *executionContext) field_Mutation_uploadVendorComplianceReport_args(ctx context.Context, rawArgs map[string]any) (map[string]any, error) {
 	var err error
 	args := map[string]any{}
@@ -13188,6 +13386,67 @@ func (ec *executionContext) fieldContext_Measure_state(_ context.Context, field
 	return fc, nil
 }
 
+func (ec *executionContext) _Measure_evidences(ctx context.Context, field graphql.CollectedField, obj *types.Measure) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_Measure_evidences(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return ec.resolvers.Measure().Evidences(rctx, obj, fc.Args["first"].(*int), fc.Args["after"].(*page.CursorKey), fc.Args["last"].(*int), fc.Args["before"].(*page.CursorKey), fc.Args["orderBy"].(*types.EvidenceOrderBy))
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(*types.EvidenceConnection)
+	fc.Result = res
+	return ec.marshalNEvidenceConnection2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐEvidenceConnection(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_Measure_evidences(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "Measure",
+		Field:      field,
+		IsMethod:   true,
+		IsResolver: true,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "edges":
+				return ec.fieldContext_EvidenceConnection_edges(ctx, field)
+			case "pageInfo":
+				return ec.fieldContext_EvidenceConnection_pageInfo(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type EvidenceConnection", field.Name)
+		},
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = ec.Recover(ctx, r)
+			ec.Error(ctx, err)
+		}
+	}()
+	ctx = graphql.WithFieldContext(ctx, fc)
+	if fc.Args, err = ec.field_Measure_evidences_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
+		ec.Error(ctx, err)
+		return fc, err
+	}
+	return fc, nil
+}
+
 func (ec *executionContext) _Measure_tasks(ctx context.Context, field graphql.CollectedField, obj *types.Measure) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_Measure_tasks(ctx, field)
 	if err != nil {
@@ -13656,6 +13915,8 @@ func (ec *executionContext) fieldContext_MeasureEdge_node(_ context.Context, fie
 				return ec.fieldContext_Measure_description(ctx, field)
 			case "state":
 				return ec.fieldContext_Measure_state(ctx, field)
+			case "evidences":
+				return ec.fieldContext_Measure_evidences(ctx, field)
 			case "tasks":
 				return ec.fieldContext_Measure_tasks(ctx, field)
 			case "risks":
@@ -15915,65 +16176,6 @@ func (ec *executionContext) fieldContext_Mutation_fulfillEvidence(ctx context.Co
 	return fc, nil
 }
 
-func (ec *executionContext) _Mutation_createEvidence(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
-	fc, err := ec.fieldContext_Mutation_createEvidence(ctx, field)
-	if err != nil {
-		return graphql.Null
-	}
-	ctx = graphql.WithFieldContext(ctx, fc)
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = graphql.Null
-		}
-	}()
-	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
-		ctx = rctx // use context from middleware stack in children
-		return ec.resolvers.Mutation().CreateEvidence(rctx, fc.Args["input"].(types.CreateEvidenceInput))
-	})
-	if err != nil {
-		ec.Error(ctx, err)
-		return graphql.Null
-	}
-	if resTmp == nil {
-		if !graphql.HasFieldError(ctx, fc) {
-			ec.Errorf(ctx, "must not be null")
-		}
-		return graphql.Null
-	}
-	res := resTmp.(*types.CreateEvidencePayload)
-	fc.Result = res
-	return ec.marshalNCreateEvidencePayload2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐCreateEvidencePayload(ctx, field.Selections, res)
-}
-
-func (ec *executionContext) fieldContext_Mutation_createEvidence(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
-	fc = &graphql.FieldContext{
-		Object:     "Mutation",
-		Field:      field,
-		IsMethod:   true,
-		IsResolver: true,
-		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
-			switch field.Name {
-			case "evidenceEdge":
-				return ec.fieldContext_CreateEvidencePayload_evidenceEdge(ctx, field)
-			}
-			return nil, fmt.Errorf("no field named %q was found under type CreateEvidencePayload", field.Name)
-		},
-	}
-	defer func() {
-		if r := recover(); r != nil {
-			err = ec.Recover(ctx, r)
-			ec.Error(ctx, err)
-		}
-	}()
-	ctx = graphql.WithFieldContext(ctx, fc)
-	if fc.Args, err = ec.field_Mutation_createEvidence_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
-		ec.Error(ctx, err)
-		return fc, err
-	}
-	return fc, nil
-}
-
 func (ec *executionContext) _Mutation_deleteEvidence(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_Mutation_deleteEvidence(ctx, field)
 	if err != nil {
@@ -16033,6 +16235,124 @@ func (ec *executionContext) fieldContext_Mutation_deleteEvidence(ctx context.Con
 	return fc, nil
 }
 
+func (ec *executionContext) _Mutation_uploadTaskEvidence(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_Mutation_uploadTaskEvidence(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return ec.resolvers.Mutation().UploadTaskEvidence(rctx, fc.Args["input"].(types.UploadTaskEvidenceInput))
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(*types.UploadTaskEvidencePayload)
+	fc.Result = res
+	return ec.marshalNUploadTaskEvidencePayload2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadTaskEvidencePayload(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_Mutation_uploadTaskEvidence(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "Mutation",
+		Field:      field,
+		IsMethod:   true,
+		IsResolver: true,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "evidenceEdge":
+				return ec.fieldContext_UploadTaskEvidencePayload_evidenceEdge(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type UploadTaskEvidencePayload", field.Name)
+		},
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = ec.Recover(ctx, r)
+			ec.Error(ctx, err)
+		}
+	}()
+	ctx = graphql.WithFieldContext(ctx, fc)
+	if fc.Args, err = ec.field_Mutation_uploadTaskEvidence_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
+		ec.Error(ctx, err)
+		return fc, err
+	}
+	return fc, nil
+}
+
+func (ec *executionContext) _Mutation_uploadMeasureEvidence(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_Mutation_uploadMeasureEvidence(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return ec.resolvers.Mutation().UploadMeasureEvidence(rctx, fc.Args["input"].(types.UploadMeasureEvidenceInput))
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(*types.UploadMeasureEvidencePayload)
+	fc.Result = res
+	return ec.marshalNUploadMeasureEvidencePayload2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadMeasureEvidencePayload(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_Mutation_uploadMeasureEvidence(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "Mutation",
+		Field:      field,
+		IsMethod:   true,
+		IsResolver: true,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "evidenceEdge":
+				return ec.fieldContext_UploadMeasureEvidencePayload_evidenceEdge(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type UploadMeasureEvidencePayload", field.Name)
+		},
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = ec.Recover(ctx, r)
+			ec.Error(ctx, err)
+		}
+	}()
+	ctx = graphql.WithFieldContext(ctx, fc)
+	if fc.Args, err = ec.field_Mutation_uploadMeasureEvidence_args(ctx, field.ArgumentMap(ec.Variables)); err != nil {
+		ec.Error(ctx, err)
+		return fc, err
+	}
+	return fc, nil
+}
+
 func (ec *executionContext) _Mutation_uploadVendorComplianceReport(ctx context.Context, field graphql.CollectedField) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_Mutation_uploadVendorComplianceReport(ctx, field)
 	if err != nil {
@@ -22839,6 +23159,8 @@ func (ec *executionContext) fieldContext_UpdateMeasurePayload_measure(_ context.
 				return ec.fieldContext_Measure_description(ctx, field)
 			case "state":
 				return ec.fieldContext_Measure_state(ctx, field)
+			case "evidences":
+				return ec.fieldContext_Measure_evidences(ctx, field)
 			case "tasks":
 				return ec.fieldContext_Measure_tasks(ctx, field)
 			case "risks":
@@ -23352,6 +23674,106 @@ func (ec *executionContext) fieldContext_UpdateVendorPayload_vendor(_ context.Co
 	return fc, nil
 }
 
+func (ec *executionContext) _UploadMeasureEvidencePayload_evidenceEdge(ctx context.Context, field graphql.CollectedField, obj *types.UploadMeasureEvidencePayload) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_UploadMeasureEvidencePayload_evidenceEdge(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return obj.EvidenceEdge, nil
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(*types.EvidenceEdge)
+	fc.Result = res
+	return ec.marshalNEvidenceEdge2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐEvidenceEdge(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_UploadMeasureEvidencePayload_evidenceEdge(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "UploadMeasureEvidencePayload",
+		Field:      field,
+		IsMethod:   false,
+		IsResolver: false,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "cursor":
+				return ec.fieldContext_EvidenceEdge_cursor(ctx, field)
+			case "node":
+				return ec.fieldContext_EvidenceEdge_node(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type EvidenceEdge", field.Name)
+		},
+	}
+	return fc, nil
+}
+
+func (ec *executionContext) _UploadTaskEvidencePayload_evidenceEdge(ctx context.Context, field graphql.CollectedField, obj *types.UploadTaskEvidencePayload) (ret graphql.Marshaler) {
+	fc, err := ec.fieldContext_UploadTaskEvidencePayload_evidenceEdge(ctx, field)
+	if err != nil {
+		return graphql.Null
+	}
+	ctx = graphql.WithFieldContext(ctx, fc)
+	defer func() {
+		if r := recover(); r != nil {
+			ec.Error(ctx, ec.Recover(ctx, r))
+			ret = graphql.Null
+		}
+	}()
+	resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (any, error) {
+		ctx = rctx // use context from middleware stack in children
+		return obj.EvidenceEdge, nil
+	})
+	if err != nil {
+		ec.Error(ctx, err)
+		return graphql.Null
+	}
+	if resTmp == nil {
+		if !graphql.HasFieldError(ctx, fc) {
+			ec.Errorf(ctx, "must not be null")
+		}
+		return graphql.Null
+	}
+	res := resTmp.(*types.EvidenceEdge)
+	fc.Result = res
+	return ec.marshalNEvidenceEdge2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐEvidenceEdge(ctx, field.Selections, res)
+}
+
+func (ec *executionContext) fieldContext_UploadTaskEvidencePayload_evidenceEdge(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
+	fc = &graphql.FieldContext{
+		Object:     "UploadTaskEvidencePayload",
+		Field:      field,
+		IsMethod:   false,
+		IsResolver: false,
+		Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
+			switch field.Name {
+			case "cursor":
+				return ec.fieldContext_EvidenceEdge_cursor(ctx, field)
+			case "node":
+				return ec.fieldContext_EvidenceEdge_node(ctx, field)
+			}
+			return nil, fmt.Errorf("no field named %q was found under type EvidenceEdge", field.Name)
+		},
+	}
+	return fc, nil
+}
+
 func (ec *executionContext) _UploadVendorComplianceReportPayload_vendorComplianceReportEdge(ctx context.Context, field graphql.CollectedField, obj *types.UploadVendorComplianceReportPayload) (ret graphql.Marshaler) {
 	fc, err := ec.fieldContext_UploadVendorComplianceReportPayload_vendorComplianceReportEdge(ctx, field)
 	if err != nil {
@@ -31132,6 +31554,74 @@ func (ec *executionContext) unmarshalInputUpdateVendorInput(ctx context.Context,
 	return it, nil
 }
 
+func (ec *executionContext) unmarshalInputUploadMeasureEvidenceInput(ctx context.Context, obj any) (types.UploadMeasureEvidenceInput, error) {
+	var it types.UploadMeasureEvidenceInput
+	asMap := map[string]any{}
+	for k, v := range obj.(map[string]any) {
+		asMap[k] = v
+	}
+
+	fieldsInOrder := [...]string{"measureId", "file"}
+	for _, k := range fieldsInOrder {
+		v, ok := asMap[k]
+		if !ok {
+			continue
+		}
+		switch k {
+		case "measureId":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("measureId"))
+			data, err := ec.unmarshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, v)
+			if err != nil {
+				return it, err
+			}
+			it.MeasureID = data
+		case "file":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("file"))
+			data, err := ec.unmarshalNUpload2githubᚗcomᚋ99designsᚋgqlgenᚋgraphqlᚐUpload(ctx, v)
+			if err != nil {
+				return it, err
+			}
+			it.File = data
+		}
+	}
+
+	return it, nil
+}
+
+func (ec *executionContext) unmarshalInputUploadTaskEvidenceInput(ctx context.Context, obj any) (types.UploadTaskEvidenceInput, error) {
+	var it types.UploadTaskEvidenceInput
+	asMap := map[string]any{}
+	for k, v := range obj.(map[string]any) {
+		asMap[k] = v
+	}
+
+	fieldsInOrder := [...]string{"taskId", "file"}
+	for _, k := range fieldsInOrder {
+		v, ok := asMap[k]
+		if !ok {
+			continue
+		}
+		switch k {
+		case "taskId":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("taskId"))
+			data, err := ec.unmarshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, v)
+			if err != nil {
+				return it, err
+			}
+			it.TaskID = data
+		case "file":
+			ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("file"))
+			data, err := ec.unmarshalNUpload2githubᚗcomᚋ99designsᚋgqlgenᚋgraphqlᚐUpload(ctx, v)
+			if err != nil {
+				return it, err
+			}
+			it.File = data
+		}
+	}
+
+	return it, nil
+}
+
 func (ec *executionContext) unmarshalInputUploadVendorComplianceReportInput(ctx context.Context, obj any) (types.UploadVendorComplianceReportInput, error) {
 	var it types.UploadVendorComplianceReportInput
 	asMap := map[string]any{}
@@ -33614,6 +34104,42 @@ func (ec *executionContext) _Measure(ctx context.Context, sel ast.SelectionSet,
 			if out.Values[i] == graphql.Null {
 				atomic.AddUint32(&out.Invalids, 1)
 			}
+		case "evidences":
+			field := field
+
+			innerFunc := func(ctx context.Context, fs *graphql.FieldSet) (res graphql.Marshaler) {
+				defer func() {
+					if r := recover(); r != nil {
+						ec.Error(ctx, ec.Recover(ctx, r))
+					}
+				}()
+				res = ec._Measure_evidences(ctx, field, obj)
+				if res == graphql.Null {
+					atomic.AddUint32(&fs.Invalids, 1)
+				}
+				return res
+			}
+
+			if field.Deferrable != nil {
+				dfs, ok := deferred[field.Deferrable.Label]
+				di := 0
+				if ok {
+					dfs.AddField(field)
+					di = len(dfs.Values) - 1
+				} else {
+					dfs = graphql.NewFieldSet([]graphql.CollectedField{field})
+					deferred[field.Deferrable.Label] = dfs
+				}
+				dfs.Concurrently(di, func(ctx context.Context) graphql.Marshaler {
+					return innerFunc(ctx, dfs)
+				})
+
+				// don't run the out.Concurrently() call below
+				out.Values[i] = graphql.Null
+				continue
+			}
+
+			out.Concurrently(i, func(ctx context.Context) graphql.Marshaler { return innerFunc(ctx, out) })
 		case "tasks":
 			field := field
 
@@ -34128,16 +34654,23 @@ func (ec *executionContext) _Mutation(ctx context.Context, sel ast.SelectionSet)
 			if out.Values[i] == graphql.Null {
 				out.Invalids++
 			}
-		case "createEvidence":
+		case "deleteEvidence":
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
-				return ec._Mutation_createEvidence(ctx, field)
+				return ec._Mutation_deleteEvidence(ctx, field)
 			})
 			if out.Values[i] == graphql.Null {
 				out.Invalids++
 			}
-		case "deleteEvidence":
+		case "uploadTaskEvidence":
 			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
-				return ec._Mutation_deleteEvidence(ctx, field)
+				return ec._Mutation_uploadTaskEvidence(ctx, field)
+			})
+			if out.Values[i] == graphql.Null {
+				out.Invalids++
+			}
+		case "uploadMeasureEvidence":
+			out.Values[i] = ec.OperationContext.RootResolverMiddleware(innerCtx, func(ctx context.Context) (res graphql.Marshaler) {
+				return ec._Mutation_uploadMeasureEvidence(ctx, field)
 			})
 			if out.Values[i] == graphql.Null {
 				out.Invalids++
@@ -36965,6 +37498,84 @@ func (ec *executionContext) _UpdateVendorPayload(ctx context.Context, sel ast.Se
 	return out
 }
 
+var uploadMeasureEvidencePayloadImplementors = []string{"UploadMeasureEvidencePayload"}
+
+func (ec *executionContext) _UploadMeasureEvidencePayload(ctx context.Context, sel ast.SelectionSet, obj *types.UploadMeasureEvidencePayload) graphql.Marshaler {
+	fields := graphql.CollectFields(ec.OperationContext, sel, uploadMeasureEvidencePayloadImplementors)
+
+	out := graphql.NewFieldSet(fields)
+	deferred := make(map[string]*graphql.FieldSet)
+	for i, field := range fields {
+		switch field.Name {
+		case "__typename":
+			out.Values[i] = graphql.MarshalString("UploadMeasureEvidencePayload")
+		case "evidenceEdge":
+			out.Values[i] = ec._UploadMeasureEvidencePayload_evidenceEdge(ctx, field, obj)
+			if out.Values[i] == graphql.Null {
+				out.Invalids++
+			}
+		default:
+			panic("unknown field " + strconv.Quote(field.Name))
+		}
+	}
+	out.Dispatch(ctx)
+	if out.Invalids > 0 {
+		return graphql.Null
+	}
+
+	atomic.AddInt32(&ec.deferred, int32(len(deferred)))
+
+	for label, dfs := range deferred {
+		ec.processDeferredGroup(graphql.DeferredGroup{
+			Label:    label,
+			Path:     graphql.GetPath(ctx),
+			FieldSet: dfs,
+			Context:  ctx,
+		})
+	}
+
+	return out
+}
+
+var uploadTaskEvidencePayloadImplementors = []string{"UploadTaskEvidencePayload"}
+
+func (ec *executionContext) _UploadTaskEvidencePayload(ctx context.Context, sel ast.SelectionSet, obj *types.UploadTaskEvidencePayload) graphql.Marshaler {
+	fields := graphql.CollectFields(ec.OperationContext, sel, uploadTaskEvidencePayloadImplementors)
+
+	out := graphql.NewFieldSet(fields)
+	deferred := make(map[string]*graphql.FieldSet)
+	for i, field := range fields {
+		switch field.Name {
+		case "__typename":
+			out.Values[i] = graphql.MarshalString("UploadTaskEvidencePayload")
+		case "evidenceEdge":
+			out.Values[i] = ec._UploadTaskEvidencePayload_evidenceEdge(ctx, field, obj)
+			if out.Values[i] == graphql.Null {
+				out.Invalids++
+			}
+		default:
+			panic("unknown field " + strconv.Quote(field.Name))
+		}
+	}
+	out.Dispatch(ctx)
+	if out.Invalids > 0 {
+		return graphql.Null
+	}
+
+	atomic.AddInt32(&ec.deferred, int32(len(deferred)))
+
+	for label, dfs := range deferred {
+		ec.processDeferredGroup(graphql.DeferredGroup{
+			Label:    label,
+			Path:     graphql.GetPath(ctx),
+			FieldSet: dfs,
+			Context:  ctx,
+		})
+	}
+
+	return out
+}
+
 var uploadVendorComplianceReportPayloadImplementors = []string{"UploadVendorComplianceReportPayload"}
 
 func (ec *executionContext) _UploadVendorComplianceReportPayload(ctx context.Context, sel ast.SelectionSet, obj *types.UploadVendorComplianceReportPayload) graphql.Marshaler {
@@ -38712,25 +39323,6 @@ func (ec *executionContext) marshalNCreateDraftPolicyVersionPayload2ᚖgithubᚗ
 	return ec._CreateDraftPolicyVersionPayload(ctx, sel, v)
 }
 
-func (ec *executionContext) unmarshalNCreateEvidenceInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐCreateEvidenceInput(ctx context.Context, v any) (types.CreateEvidenceInput, error) {
-	res, err := ec.unmarshalInputCreateEvidenceInput(ctx, v)
-	return res, graphql.ErrorOnPath(ctx, err)
-}
-
-func (ec *executionContext) marshalNCreateEvidencePayload2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐCreateEvidencePayload(ctx context.Context, sel ast.SelectionSet, v types.CreateEvidencePayload) graphql.Marshaler {
-	return ec._CreateEvidencePayload(ctx, sel, &v)
-}
-
-func (ec *executionContext) marshalNCreateEvidencePayload2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐCreateEvidencePayload(ctx context.Context, sel ast.SelectionSet, v *types.CreateEvidencePayload) graphql.Marshaler {
-	if v == nil {
-		if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
-			ec.Errorf(ctx, "the requested element is null which the schema does not allow")
-		}
-		return graphql.Null
-	}
-	return ec._CreateEvidencePayload(ctx, sel, v)
-}
-
 func (ec *executionContext) unmarshalNCreateFrameworkInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐCreateFrameworkInput(ctx context.Context, v any) (types.CreateFrameworkInput, error) {
 	res, err := ec.unmarshalInputCreateFrameworkInput(ctx, v)
 	return res, graphql.ErrorOnPath(ctx, err)
@@ -40991,6 +41583,44 @@ func (ec *executionContext) marshalNUpload2githubᚗcomᚋ99designsᚋgqlgenᚋg
 	return res
 }
 
+func (ec *executionContext) unmarshalNUploadMeasureEvidenceInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadMeasureEvidenceInput(ctx context.Context, v any) (types.UploadMeasureEvidenceInput, error) {
+	res, err := ec.unmarshalInputUploadMeasureEvidenceInput(ctx, v)
+	return res, graphql.ErrorOnPath(ctx, err)
+}
+
+func (ec *executionContext) marshalNUploadMeasureEvidencePayload2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadMeasureEvidencePayload(ctx context.Context, sel ast.SelectionSet, v types.UploadMeasureEvidencePayload) graphql.Marshaler {
+	return ec._UploadMeasureEvidencePayload(ctx, sel, &v)
+}
+
+func (ec *executionContext) marshalNUploadMeasureEvidencePayload2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadMeasureEvidencePayload(ctx context.Context, sel ast.SelectionSet, v *types.UploadMeasureEvidencePayload) graphql.Marshaler {
+	if v == nil {
+		if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
+			ec.Errorf(ctx, "the requested element is null which the schema does not allow")
+		}
+		return graphql.Null
+	}
+	return ec._UploadMeasureEvidencePayload(ctx, sel, v)
+}
+
+func (ec *executionContext) unmarshalNUploadTaskEvidenceInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadTaskEvidenceInput(ctx context.Context, v any) (types.UploadTaskEvidenceInput, error) {
+	res, err := ec.unmarshalInputUploadTaskEvidenceInput(ctx, v)
+	return res, graphql.ErrorOnPath(ctx, err)
+}
+
+func (ec *executionContext) marshalNUploadTaskEvidencePayload2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadTaskEvidencePayload(ctx context.Context, sel ast.SelectionSet, v types.UploadTaskEvidencePayload) graphql.Marshaler {
+	return ec._UploadTaskEvidencePayload(ctx, sel, &v)
+}
+
+func (ec *executionContext) marshalNUploadTaskEvidencePayload2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadTaskEvidencePayload(ctx context.Context, sel ast.SelectionSet, v *types.UploadTaskEvidencePayload) graphql.Marshaler {
+	if v == nil {
+		if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) {
+			ec.Errorf(ctx, "the requested element is null which the schema does not allow")
+		}
+		return graphql.Null
+	}
+	return ec._UploadTaskEvidencePayload(ctx, sel, v)
+}
+
 func (ec *executionContext) unmarshalNUploadVendorComplianceReportInput2githubᚗcomᚋgetproboᚋproboᚋpkgᚋserverᚋapiᚋconsoleᚋv1ᚋtypesᚐUploadVendorComplianceReportInput(ctx context.Context, v any) (types.UploadVendorComplianceReportInput, error) {
 	res, err := ec.unmarshalInputUploadVendorComplianceReportInput(ctx, v)
 	return res, graphql.ErrorOnPath(ctx, err)
diff --git a/pkg/server/api/console/v1/types/types.go b/pkg/server/api/console/v1/types/types.go
index 15854e960..dfd399483 100644
--- a/pkg/server/api/console/v1/types/types.go
+++ b/pkg/server/api/console/v1/types/types.go
@@ -473,6 +473,7 @@ type Measure struct {
 	Name        string                `json:"name"`
 	Description string                `json:"description"`
 	State       coredata.MeasureState `json:"state"`
+	Evidences   *EvidenceConnection   `json:"evidences"`
 	Tasks       *TaskConnection       `json:"tasks"`
 	Risks       *RiskConnection       `json:"risks"`
 	Controls    *ControlConnection    `json:"controls"`
@@ -886,6 +887,24 @@ type UpdateVendorPayload struct {
 	Vendor *Vendor `json:"vendor"`
 }
 
+type UploadMeasureEvidenceInput struct {
+	MeasureID gid.GID        `json:"measureId"`
+	File      graphql.Upload `json:"file"`
+}
+
+type UploadMeasureEvidencePayload struct {
+	EvidenceEdge *EvidenceEdge `json:"evidenceEdge"`
+}
+
+type UploadTaskEvidenceInput struct {
+	TaskID gid.GID        `json:"taskId"`
+	File   graphql.Upload `json:"file"`
+}
+
+type UploadTaskEvidencePayload struct {
+	EvidenceEdge *EvidenceEdge `json:"evidenceEdge"`
+}
+
 type UploadVendorComplianceReportInput struct {
 	VendorID   gid.GID        `json:"vendorId"`
 	ReportDate time.Time      `json:"reportDate"`
diff --git a/pkg/server/api/console/v1/v1_resolver.go b/pkg/server/api/console/v1/v1_resolver.go
index e33f57670..62293cc6d 100644
--- a/pkg/server/api/console/v1/v1_resolver.go
+++ b/pkg/server/api/console/v1/v1_resolver.go
@@ -112,6 +112,31 @@ func (r *frameworkResolver) Controls(ctx context.Context, obj *types.Framework,
 	return types.NewControlConnection(page), nil
 }
 
+// Evidences is the resolver for the evidences field.
+func (r *measureResolver) Evidences(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.EvidenceOrderBy) (*types.EvidenceConnection, error) {
+	svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
+
+	pageOrderBy := page.OrderBy[coredata.EvidenceOrderField]{
+		Field:     coredata.EvidenceOrderFieldCreatedAt,
+		Direction: page.OrderDirectionDesc,
+	}
+	if orderBy != nil {
+		pageOrderBy = page.OrderBy[coredata.EvidenceOrderField]{
+			Field:     orderBy.Field,
+			Direction: orderBy.Direction,
+		}
+	}
+
+	cursor := types.NewCursor(first, after, last, before, pageOrderBy)
+
+	page, err := svc.Evidences.ListForMeasureID(ctx, obj.ID, cursor)
+	if err != nil {
+		return nil, fmt.Errorf("cannot list measure evidences: %w", err)
+	}
+
+	return types.NewEvidenceConnection(page), nil
+}
+
 // Tasks is the resolver for the tasks field.
 func (r *measureResolver) Tasks(ctx context.Context, obj *types.Measure, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.TaskOrderBy) (*types.TaskConnection, error) {
 	svc := GetTenantService(ctx, r.proboSvc, obj.ID.TenantID())
@@ -875,7 +900,7 @@ func (r *mutationResolver) RequestEvidence(ctx context.Context, input types.Requ
 	evidence, err := svc.Evidences.Request(
 		ctx,
 		probo.RequestEvidenceRequest{
-			TaskID:      input.TaskID,
+			TaskID:      &input.TaskID,
 			Name:        input.Name,
 			Type:        input.Type,
 			Description: input.Description,
@@ -917,39 +942,6 @@ func (r *mutationResolver) FulfillEvidence(ctx context.Context, input types.Fulf
 	}, nil
 }
 
-// CreateEvidence is the resolver for the createEvidence field.
-func (r *mutationResolver) CreateEvidence(ctx context.Context, input types.CreateEvidenceInput) (*types.CreateEvidencePayload, error) {
-	svc := GetTenantService(ctx, r.proboSvc, input.TaskID.TenantID())
-
-	req := probo.CreateEvidenceRequest{
-		TaskID:      input.TaskID,
-		Name:        input.Name,
-		Type:        input.Type,
-		Description: input.Description,
-	}
-
-	if input.Type == coredata.EvidenceTypeFile {
-		if input.File == nil {
-			return nil, fmt.Errorf("file is required for FILE type evidence")
-		}
-		req.File = input.File.File
-	} else if input.Type == coredata.EvidenceTypeLink {
-		if input.URL == nil || *input.URL == "" {
-			return nil, fmt.Errorf("URL is required for LINK type evidence")
-		}
-		req.URL = *input.URL
-	}
-
-	evidence, err := svc.Evidences.Create(ctx, req)
-	if err != nil {
-		panic(fmt.Errorf("failed to create evidence: %w", err))
-	}
-
-	return &types.CreateEvidencePayload{
-		EvidenceEdge: types.NewEvidenceEdge(evidence, coredata.EvidenceOrderFieldCreatedAt),
-	}, nil
-}
-
 // DeleteEvidence is the resolver for the deleteEvidence field.
 func (r *mutationResolver) DeleteEvidence(ctx context.Context, input types.DeleteEvidenceInput) (*types.DeleteEvidencePayload, error) {
 	svc := GetTenantService(ctx, r.proboSvc, input.EvidenceID.TenantID())
@@ -964,6 +956,56 @@ func (r *mutationResolver) DeleteEvidence(ctx context.Context, input types.Delet
 	}, nil
 }
 
+// UploadTaskEvidence is the resolver for the uploadTaskEvidence field.
+func (r *mutationResolver) UploadTaskEvidence(ctx context.Context, input types.UploadTaskEvidenceInput) (*types.UploadTaskEvidencePayload, error) {
+	svc := GetTenantService(ctx, r.proboSvc, input.TaskID.TenantID())
+
+	evidence, err := svc.Evidences.UploadTaskEvidence(
+		ctx,
+		probo.UploadTaskEvidenceRequest{
+			TaskID: input.TaskID,
+			File: probo.File{
+				Content:     input.File.File,
+				Filename:    input.File.Filename,
+				Size:        input.File.Size,
+				ContentType: input.File.ContentType,
+			},
+		},
+	)
+	if err != nil {
+		panic(fmt.Errorf("cannot upload task evidence: %w", err))
+	}
+
+	return &types.UploadTaskEvidencePayload{
+		EvidenceEdge: types.NewEvidenceEdge(evidence, coredata.EvidenceOrderFieldCreatedAt),
+	}, nil
+}
+
+// UploadMeasureEvidence is the resolver for the uploadMeasureEvidence field.
+func (r *mutationResolver) UploadMeasureEvidence(ctx context.Context, input types.UploadMeasureEvidenceInput) (*types.UploadMeasureEvidencePayload, error) {
+	svc := GetTenantService(ctx, r.proboSvc, input.MeasureID.TenantID())
+
+	evidence, err := svc.Evidences.UploadMeasureEvidence(
+		ctx,
+		probo.UploadMeasureEvidenceRequest{
+			MeasureID: input.MeasureID,
+			File: probo.File{
+				Content:     input.File.File,
+				Filename:    input.File.Filename,
+				Size:        input.File.Size,
+				ContentType: input.File.ContentType,
+			},
+		},
+	)
+	if err != nil {
+		panic(fmt.Errorf("cannot upload measure evidence: %w", err))
+	}
+
+	return &types.UploadMeasureEvidencePayload{
+		EvidenceEdge: types.NewEvidenceEdge(evidence, coredata.EvidenceOrderFieldCreatedAt),
+	}, nil
+}
+
 // UploadVendorComplianceReport is the resolver for the uploadVendorComplianceReport field.
 func (r *mutationResolver) UploadVendorComplianceReport(ctx context.Context, input types.UploadVendorComplianceReportInput) (*types.UploadVendorComplianceReportPayload, error) {
 	svc := GetTenantService(ctx, r.proboSvc, input.VendorID.TenantID())