diff --git a/workspaces/ballerina/ballerina-core/src/interfaces/data-mapper.ts b/workspaces/ballerina/ballerina-core/src/interfaces/data-mapper.ts
index d003b56b632..e289dac5f01 100644
--- a/workspaces/ballerina/ballerina-core/src/interfaces/data-mapper.ts
+++ b/workspaces/ballerina/ballerina-core/src/interfaces/data-mapper.ts
@@ -37,6 +37,7 @@ export enum TypeKind {
     Boolean = "boolean",
     Enum = "enum",
     Union = "union",
+    Tuple = "tuple",
     Unknown = "$CompilationError$",
     Anydata = "anydata",
     Byte = "byte",
diff --git a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
index 649e782c2df..5bdad4d7745 100644
--- a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
+++ b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
@@ -537,6 +537,14 @@ function processTypeKind(
             }
             break;
 
+        case TypeKind.Tuple:
+            if (type.members) {
+                return {
+                    members: processTuple(type.members, parentId, model, visitedRefs)
+                };
+            }
+            break;
+
         case TypeKind.Record:
             if (type.ref) {
                 return processTypeReference(type.ref, parentId, model, visitedRefs);
@@ -788,3 +796,35 @@ function processEnum(
     }));
 }
 
+/**
+ * Processes tuple type members and returns an array of IOType objects
+ * Each tuple member is processed with its index-based identifier
+ */
+function processTuple(
+    tupleMembers: IOTypeField[],
+    parentId: string,
+    model: DMModel,
+    visitedRefs: Set<string>
+): IOType[] {
+    return tupleMembers.map((tupleMember, index) => {
+        const memberFieldId = `${parentId}[${index}]`;
+
+        const tupleMemberType: IOType = {
+            id: memberFieldId,
+            name: tupleMember.name,
+            displayName: tupleMember.displayName,
+            typeName: tupleMember.typeName,
+            kind: tupleMember.kind,
+            ...(tupleMember.optional && { optional: tupleMember.optional }),
+            ...(tupleMember.typeInfo && { typeInfo: tupleMember.typeInfo })
+        };
+
+        const typeSpecificProps = processTypeKind(tupleMember, memberFieldId, model, new Set(visitedRefs));
+
+        return {
+            ...tupleMemberType,
+            ...typeSpecificProps
+        };
+    });
+}
+
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ArrayOutput/ArrayOuptutFieldWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ArrayOutput/ArrayOuptutFieldWidget.tsx
index d16c04be9ba..9961761bab8 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ArrayOutput/ArrayOuptutFieldWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ArrayOutput/ArrayOuptutFieldWidget.tsx
@@ -204,6 +204,7 @@ export function ArrayOutputFieldWidget(props: ArrayOutputFieldWidgetProps) {
                                     fieldIndex={index}
                                     treeDepth={0}
                                     hasHoveredParent={isHovered || hasHoveredParent}
+                                    parentFieldKind={field?.kind}
                                 />
                             </TreeBody>
                             <br />
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNode.ts b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNode.ts
index a6c6df45c90..0b5338a35b2 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNode.ts
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNode.ts
@@ -84,6 +84,22 @@ export class InputNode extends DataMapperNodeModel {
                         focusedFieldFQNs
                     });
                 }
+            } else if (this.filteredInputType.kind === TypeKind.Tuple) {
+                const members = this.filteredInputType.members?.filter(m => !!m);
+                for (const member of members) {
+                    this.numberOfFields += await this.addPortsForInputField({
+                        field: member,
+                        portType: "OUT",
+                        parentId: this.identifier,
+                        unsafeParentId: this.identifier,
+                        parent: parentPort,
+                        collapsedFields,
+                        expandedFields,
+                        hidden: parentPort.attributes.collapsed,
+                        isOptional: member.optional,
+                        focusedFieldFQNs
+                    });
+                }
             } else if (this.filteredInputType.kind === TypeKind.Enum) {
                 for (const member of this.filteredInputType.members ?? []) {
                     this.numberOfFields += await this.addPortsForInputField({
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeFactory.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeFactory.tsx
index 743c8129ab8..fbfe56dad25 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeFactory.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeFactory.tsx
@@ -40,6 +40,7 @@ export class InputNodeFactory extends AbstractReactFactory<InputNode, DiagramEng
             );
         } else if (event.model.filteredInputType &&
                 (event.model.filteredInputType.kind === TypeKind.Record ||
+                    event.model.filteredInputType.kind === TypeKind.Tuple ||
                     event.model.filteredInputType.kind === TypeKind.Array ||
                     event.model.filteredInputType.kind === TypeKind.Enum
                 )
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeTreeItemWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeTreeItemWidget.tsx
index 495b830ce6b..6d3fadc8375 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeTreeItemWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeTreeItemWidget.tsx
@@ -38,10 +38,11 @@ export interface InputNodeTreeItemWidgetProps {
     treeDepth?: number;
     hasHoveredParent?: boolean;
     focusedInputs?: string[];
+    parentFieldKind?: TypeKind;
 }
 
 export function InputNodeTreeItemWidget(props: InputNodeTreeItemWidgetProps) {
-    const { parentId, dmType, getPort, engine, treeDepth = 0, hasHoveredParent, focusedInputs } = props;
+    const { parentId, dmType, getPort, engine, treeDepth = 0, hasHoveredParent, focusedInputs, parentFieldKind } = props;
 
     const [ portState, setPortState ] = useState<PortState>(PortState.Unselected);
     const [isHovered, setIsHovered] = useState(false);
@@ -51,7 +52,16 @@ export function InputNodeTreeItemWidget(props: InputNodeTreeItemWidgetProps) {
     const fieldName = dmType.name;
     const displayName = dmType.displayName || fieldName;
     const typeName = getTypeName(dmType);
-    const fieldId = dmType.isFocused ? fieldName : `${parentId}.${fieldName}`;
+
+    let fieldId: string;
+    if (parentFieldKind === TypeKind.Tuple) {
+        fieldId = parentId + fieldName;
+    } else if (dmType.isFocused) {
+        fieldId = fieldName;
+    } else {
+        fieldId = `${parentId}.${fieldName}`;
+    }
+
     const portOut = getPort(`${fieldId}.OUT`);
     const isUnknownType = dmType.kind === TypeKind.Unknown;
 
@@ -61,6 +71,8 @@ export function InputNodeTreeItemWidget(props: InputNodeTreeItemWidgetProps) {
 
     if (dmType.kind === TypeKind.Record) {
         fields = dmType.fields;
+    } else if (dmType.kind === TypeKind.Tuple) {
+        fields = dmType.members;
     } else if (dmType.kind === TypeKind.Array) {
         fields = [ dmType.member ];
     }
@@ -168,6 +180,7 @@ export function InputNodeTreeItemWidget(props: InputNodeTreeItemWidgetProps) {
                             treeDepth={treeDepth + 1}
                             hasHoveredParent={isHovered || hasHoveredParent}
                             focusedInputs={focusedInputs}
+                            parentFieldKind={dmType.kind}
                         />
                     );
                 })
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeWidget.tsx
index f994148a33e..b6ab15f6731 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/Input/InputNodeWidget.tsx
@@ -68,6 +68,8 @@ export function InputNodeWidget(props: InputNodeWidgetProps) {
 
     if (dmType.kind === TypeKind.Record) {
         fields = dmType.fields;
+    } else if (dmType.kind === TypeKind.Tuple) {
+        fields = dmType.members;
     } else if (dmType.kind === TypeKind.Array) {
         fields = [ dmType.member ];
     } else if (dmType.kind === TypeKind.Enum) {
@@ -172,6 +174,7 @@ export function InputNodeWidget(props: InputNodeWidgetProps) {
                                     treeDepth={0}
                                     hasHoveredParent={isHovered}
                                     focusedInputs={focusedInputs}
+                                    parentFieldKind={dmType.kind}
                                 />
                             );
                         })
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputFieldWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputFieldWidget.tsx
index d861b17829c..66371704c9c 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputFieldWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputFieldWidget.tsx
@@ -47,6 +47,7 @@ export interface ObjectOutputFieldWidgetProps {
     treeDepth?: number;
     hasHoveredParent?: boolean;
     isPortParent?: boolean;
+    parentFieldKind?: TypeKind;
 }
 
 export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
@@ -59,7 +60,8 @@ export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
         fieldIndex,
         treeDepth = 0,
         hasHoveredParent,
-        isPortParent
+        isPortParent,
+        parentFieldKind
     } = props;
     const classes = useIONodesStyles();
     const [isLoading, setLoading] = useState(false);
@@ -80,10 +82,11 @@ export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
 
     const isArray = typeKind === TypeKind.Array;
     const isRecord = typeKind === TypeKind.Record;
+    const isTuple = typeKind === TypeKind.Tuple;
     const isEnum = typeKind === TypeKind.Enum;
 
     let updatedParentId = parentId;
-    
+
     if (fieldIndex !== undefined) {
         updatedParentId = `${updatedParentId}.${fieldIndex}`
     }
@@ -91,13 +94,19 @@ export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
     let fieldName = field?.name || '';
     let displayName = field?.displayName || fieldName;
 
-    let portName = isPortParent
-        ? parentId
-        : updatedParentId !== ''
-            ? fieldName !== '' && fieldIndex === undefined
-                ? `${updatedParentId}.${fieldName}`
-                : updatedParentId
-            : fieldName;
+    // Handle tuple members by combining port prefix with field.name (bracket notation)
+    let portName: string;
+    if (parentFieldKind === TypeKind.Tuple) {
+        portName = `${parentId}${field.name}`;
+    } else if (isPortParent) {
+        portName = parentId;
+    } else if (updatedParentId !== '') {
+        portName = fieldName !== '' && fieldIndex === undefined
+            ? `${updatedParentId}.${fieldName}`
+            : updatedParentId;
+    } else {
+        portName = fieldName;
+    }
 
     const portIn = getPort(portName + ".IN");
     const isUnknownType = field?.kind === TypeKind.Unknown;
@@ -109,7 +118,8 @@ export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
         getDefaultValue(field?.kind) === expression.trim() &&
         !isEnum;
 
-    const fields = isRecord && field?.fields?.filter(f => f !== null);
+    const fields = (isRecord && field?.fields?.filter(f => f !== null))
+        || (isTuple && field?.members?.filter(m => m !== null));
     const isWithinArray = fieldIndex !== undefined;
 
     const handleExpand = () => {
@@ -303,7 +313,7 @@ export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
                     <span className={classes.label}>
                         {fields && (
                             <Button
-                                id={"expand-or-collapse-" + portName} 
+                                id={"expand-or-collapse-" + portName}
                                 appearance="icon"
                                 tooltip="Expand/Collapse"
                                 sx={{ marginLeft: indentation }}
@@ -352,6 +362,7 @@ export function ObjectOutputFieldWidget(props: ObjectOutputFieldWidgetProps) {
                             context={context}
                             treeDepth={treeDepth + 1}
                             hasHoveredParent={isHovered || hasHoveredParent}
+                            parentFieldKind={field?.kind}
                         />
                     );
                 })
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputNode.ts b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputNode.ts
index 18ae0426dd1..f3b2ac337d3 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputNode.ts
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputNode.ts
@@ -95,6 +95,25 @@ export class ObjectOutputNode extends DataMapperNodeModel {
                     }
                 }
             }
+
+            if (this.filteredOutputType.kind === TypeKind.Tuple) {
+                if (this.filteredOutputType.members && this.filteredOutputType.members.length > 0) {
+                    for (const member of this.filteredOutputType.members) {
+                        if (!member) continue;
+                        await this.addPortsForOutputField({
+                            field: member,
+                            type: "IN",
+                            parentId: this.rootName,
+                            mappings: this.context.model.mappings,
+                            portPrefix: OBJECT_OUTPUT_TARGET_PORT_PREFIX,
+                            parent: parentPort,
+                            collapsedFields,
+                            expandedFields,
+                            hidden: parentPort.attributes.collapsed
+                        });
+                    }
+                }
+            }
         }
     }
 
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputWidget.tsx
index fc9ac1473f0..6781b019d3a 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/ObjectOutput/ObjectOutputWidget.tsx
@@ -70,7 +70,11 @@ export function ObjectOutputWidget(props: ObjectOutputWidgetProps) {
 		}))
 	);
 
-	const fields = outputType.fields.filter(t => t !== null);
+	// Handle both records (fields) and tuples (members)
+	const isTuple = outputType.kind === TypeKind.Tuple;
+	const fields = isTuple
+		? (outputType.members?.filter(t => t !== null) || [])
+		: (outputType.fields?.filter(t => t !== null) || []);
 	const hasFields = fields.length > 0;
 
 	const portIn = getPort(`${id}.IN`);
@@ -171,6 +175,7 @@ export function ObjectOutputWidget(props: ObjectOutputWidgetProps) {
 									context={context}
 									treeDepth={0}
 									hasHoveredParent={isHovered}
+									parentFieldKind={outputType.kind}
 								/>
 							);
 						})}
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputNode.ts b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputNode.ts
index 9260b81d0f5..eafb6b9a513 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputNode.ts
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputNode.ts
@@ -118,8 +118,8 @@ export class QueryOutputNode extends DataMapperNodeModel {
 
         mappings.forEach((mapping) => {
             
-            const { isComplex, isQueryExpression, isFunctionCall, inputs, output, expression, diagnostics } = mapping;
-            if (isComplex || isQueryExpression || isFunctionCall || inputs.length !== 1) {
+            const { isComplex, isQueryExpression, isFunctionCall, elementAccessIndex, inputs, output, expression, diagnostics } = mapping;
+            if (isComplex || isQueryExpression || isFunctionCall || inputs.length !== 1 || elementAccessIndex) {
                 // Complex mappings are handled in the LinkConnectorNode
                 return;
             }
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputWidget.tsx
index de6d0ed7000..ca7632f43cd 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/QueryOutput/QueryOutputWidget.tsx
@@ -146,6 +146,7 @@ export function QueryOutputWidget(props: QueryOutputWidgetProps) {
 								treeDepth={0}
 								hasHoveredParent={isHovered}
 								isPortParent={true}
+								parentFieldKind={outputType.kind}
 							/>
 						) : (
 							<PrimitiveOutputElementWidget
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/SubMapping/SubMappingItemWidget.tsx b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/SubMapping/SubMappingItemWidget.tsx
index 76ddf9e682e..0b78a2b5426 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/SubMapping/SubMappingItemWidget.tsx
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/SubMapping/SubMappingItemWidget.tsx
@@ -234,6 +234,7 @@ export function SubMappingItemWidget(props: SubMappingItemProps) {
                                     parentId={id}
                                     treeDepth={0}
                                     hasHoveredParent={isHovered}
+                                    parentFieldKind={type.kind}
                                 />
                             );
                         })}
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/commons/DataMapperNode.ts b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/commons/DataMapperNode.ts
index cd32e27a636..14392c9601c 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/Node/commons/DataMapperNode.ts
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/Node/commons/DataMapperNode.ts
@@ -113,8 +113,9 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 
 		const fieldName = field?.name;
 		const isArray = this.isArrayTypedField(field);
-		const fieldFQN = this.getInputFieldFQN(field?.isFocused ? "" : parentId, fieldName, isOptional);
-		const unsafeFieldFQN = this.getUnsafeFieldFQN(field?.isFocused ? "" : unsafeParentId, fieldName);
+		const parentFieldKind = parent?.attributes.field?.kind;
+		const fieldFQN = this.getInputFieldFQN(field?.isFocused ? "" : parentId, fieldName, isOptional, parentFieldKind);
+		const unsafeFieldFQN = this.getUnsafeFieldFQN(field?.isFocused ? "" : unsafeParentId, fieldName, parentFieldKind);
 		const portName = this.getPortName(portPrefix, unsafeFieldFQN);
 		const isFocused = this.isFocusedField(focusedFieldFQNs, portName);
 		const isPreview = parent.attributes.isPreview || this.isPreviewPort(focusedFieldFQNs, parent.attributes.field);
@@ -174,7 +175,8 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 
 		const isArray = this.isArrayTypedField(field);
 		const newParentId = this.getNewParentId(parentId, elementIndex);
-		let fieldFQN = this.getOutputFieldFQN(newParentId, field, elementIndex);
+		const parentFieldKind = parent?.attributes.field?.kind;
+		let fieldFQN = this.getOutputFieldFQN(newParentId, field, parentFieldKind, elementIndex);
 		const portName = this.getPortName(portPrefix, fieldFQN);
 		
 		const mapping = findMappingByOutput(mappings, fieldFQN);
@@ -211,6 +213,8 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 	protected async processOutputFieldKind(attributes: OutputPortAttributes) {
 		if (attributes.field?.kind === TypeKind.Record) {
 			await this.processRecordField(attributes);
+		} else if (attributes.field?.kind === TypeKind.Tuple) {
+			await this.processTupleField(attributes);
 		} else if (attributes.field?.kind === TypeKind.Array) {
 			await this.processArrayField(attributes);
 		}
@@ -266,13 +270,21 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 			focusedFieldFQNs.some(fqn => fqn.startsWith(fieldFQN + ".") || fqn === fieldFQN);
 	}
 
-	private getInputFieldFQN(parentId: string, fieldName: string, isOptional: boolean): string {
+	private getInputFieldFQN(parentId: string, fieldName: string, isOptional: boolean, parentFieldKind: TypeKind | undefined): string {
+		if (parentFieldKind === TypeKind.Tuple) {
+			return `${parentId}${fieldName}`;
+		}
+
 		return parentId
 			? `${parentId}${fieldName && isOptional ? `?.${fieldName}` : `.${fieldName}`}`
 			: fieldName || '';
 	}
 
-	private getUnsafeFieldFQN(unsafeParentId: string, fieldName: string): string {
+	private getUnsafeFieldFQN(unsafeParentId: string, fieldName: string, parentFieldKind: TypeKind | undefined): string {
+		if (parentFieldKind === TypeKind.Tuple) {
+			return `${unsafeParentId}${fieldName}`;
+		}	
+
 		return unsafeParentId ? `${unsafeParentId}.${fieldName}` : fieldName || '';
 	}
 
@@ -280,10 +292,15 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 		return elementIndex !== undefined ? `${parentId}.${elementIndex}` : parentId;
 	}
 
-	private getOutputFieldFQN(newParentId: string, field: IOType, elementIndex?: number): string {
+	private getOutputFieldFQN(newParentId: string, field: IOType, parentFieldKind: TypeKind | undefined, elementIndex?: number): string {
 		if (elementIndex !== undefined) {
 			return newParentId;
 		}
+
+		if (parentFieldKind === TypeKind.Tuple) {
+			return `${newParentId}${field?.name}`;
+		}
+
 		const fieldName = field?.name || '';
 		return newParentId !== '' ? fieldName !== '' ? `${newParentId}.${fieldName}` : newParentId : fieldName;
 	}
@@ -300,7 +317,7 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 		isFocused: boolean
 	): boolean {
 		// In Inline Data Mapper, the inputs are always collapsed by default except focused view.
-		// Hence we explicitly check expandedFields for input header ports. 
+		// Hence we explicitly check expandedFields for input header ports.
 		if (portType === "IN" || isFocused) {
 			return collapsedFields?.includes(portName);
 		} else {
@@ -353,6 +370,9 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 			case TypeKind.Record:
 				numberOfFields += await this.createInputPortsForRecordField(attributes, isHidden);
 				break;
+			case TypeKind.Tuple:
+				numberOfFields += await this.createInputPortsForTupleField(attributes, isHidden);
+				break;
 			case TypeKind.Array:
 				numberOfFields += await this.createInputPortsForArrayField(attributes, isHidden);
 				break;
@@ -380,6 +400,23 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 		return total;
 	}
 
+	private async createInputPortsForTupleField(attributes: InputPortAttributes, isHidden: boolean): Promise<number> {
+		const members = attributes.field?.members?.filter(m => !!m) || [];
+		if (members.length === 0) {
+			return 0;
+		}
+		let total = 0;
+		for (const member of members) {
+			total += await this.addPortsForInputField({
+				...attributes,
+				hidden: isHidden,
+				field: member,
+				isOptional: member.optional || attributes.isOptional
+			});
+		}
+		return total;
+	}
+
 	private async createInputPortsForArrayField(attributes: InputPortAttributes, isHidden: boolean): Promise<number> {
 		const memberField = attributes.field?.member;
 		return await this.addPortsForInputField({
@@ -403,6 +440,19 @@ export abstract class DataMapperNodeModel extends NodeModel<NodeModelGenerics &
 		}
 	}
 
+	private async processTupleField(attributes: OutputPortAttributes) {
+		const members = attributes.field?.members?.filter(m => !!m);
+		if (members && members.length) {
+			for (const member of members) {
+				await this.addPortsForOutputField({
+					...attributes,
+					field: member,
+					elementIndex: undefined
+				});
+			}
+		}
+	}
+
 	private async processArrayField(attributes: OutputPortAttributes) {
 		const elements: MappingElement[] = findMappingByOutput(attributes.mappings, attributes.parentId)?.elements || [];
 		if (elements.length > 0) {
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/utils/node-utils.ts b/workspaces/ballerina/data-mapper/src/components/Diagram/utils/node-utils.ts
index ec0b3dd8f7c..632353d6ffc 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/utils/node-utils.ts
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/utils/node-utils.ts
@@ -34,8 +34,12 @@ export function findInputNode(field: string, outputNode: DataMapperNodeModel, vi
         }) as InputNode | SubMappingNode | undefined;
     };
 
-    // try finding input node using 'field' (map from other input ports)
-    const fieldStartsWith = field.split('.')[0];
+    // Extract base variable name, stripping bracket notation for tuple access
+    let fieldStartsWith = field.split('.')[0];
+    const bracketIndex = fieldStartsWith.indexOf('[');
+    if (bracketIndex >= 0) {
+        fieldStartsWith = fieldStartsWith.substring(0, bracketIndex);
+    }
     let inputNode = findNodeByField(fieldStartsWith);
     
     // if not found, try with parentSourceField
diff --git a/workspaces/ballerina/data-mapper/src/components/Diagram/utils/search-utils.ts b/workspaces/ballerina/data-mapper/src/components/Diagram/utils/search-utils.ts
index bbd746b2a95..9bf68b9f0d1 100644
--- a/workspaces/ballerina/data-mapper/src/components/Diagram/utils/search-utils.ts
+++ b/workspaces/ballerina/data-mapper/src/components/Diagram/utils/search-utils.ts
@@ -26,7 +26,7 @@ export const getSearchFilteredInput = (dmType: IOType, varName?: string) => {
 
 	if (varName?.toLowerCase()?.includes(searchValue.toLowerCase())) {
 		return dmType
-	} else if (dmType.kind === TypeKind.Record || dmType.kind === TypeKind.Array) {
+	} else if (dmType.kind === TypeKind.Record || dmType.kind === TypeKind.Array || dmType.kind === TypeKind.Tuple) {
 		const filteredType = getFilteredSubFields(dmType, searchValue);
 		if (filteredType) {
 			return filteredType
@@ -66,8 +66,17 @@ export const getSearchFilteredOutput = (outputType: IOType) => {
 			...searchType,
 			fields: subFields || []
 		}
+	} else if (searchType.kind === TypeKind.Tuple) {
+		const subMembers = searchType.members
+			?.map(item => getFilteredSubFields(item, searchValue))
+			.filter(item => item);
+
+		return {
+			...searchType,
+			members: subMembers || []
+		}
 	}
-	return  null;
+	return null;
 }
 
 export const getFilteredSubFields = (field: IOType, searchValue: string) => {
@@ -91,6 +100,18 @@ export const getFilteredSubFields = (field: IOType, searchValue: string) => {
 				fields: matchingName ? field?.fields : matchedSubFields
 			}
 		}
+	} else if (field?.kind === TypeKind.Tuple) {
+		const matchedSubMembers: IOType[] = field?.members
+			?.map((member) => getFilteredSubFields(member, searchValue))
+			.filter((member): member is IOType => member !== null);
+
+		const matchingName = field?.name?.toLowerCase().includes(searchValue.toLowerCase());
+		if (matchingName || matchedSubMembers?.length > 0) {
+			return {
+				...field,
+				members: matchingName ? field?.members : matchedSubMembers
+			}
+		}
 	} else if (field?.kind === TypeKind.Array) {
 		const matchedSubFields: IOType[] = field?.member?.fields
 			?.map((fieldItem) => getFilteredSubFields(fieldItem, searchValue))
@@ -120,6 +141,8 @@ export function hasNoOutputMatchFound(outputType: IOType, filteredOutputType: IO
 		return false;
 	} else if (outputType.kind === TypeKind.Record && filteredOutputType.kind === TypeKind.Record) {
 		return filteredOutputType?.fields.length === 0;
+	} else if (outputType.kind === TypeKind.Tuple && filteredOutputType.kind === TypeKind.Tuple) {
+		return filteredOutputType?.members.length === 0;
 	} else if (outputType.kind === TypeKind.Array && filteredOutputType.kind === TypeKind.Array) {
 		// Handle array output
 	}
diff --git a/workspaces/ballerina/data-mapper/src/visitors/IONodeInitVisitor.ts b/workspaces/ballerina/data-mapper/src/visitors/IONodeInitVisitor.ts
index 239e25f7e8d..ea35c495849 100644
--- a/workspaces/ballerina/data-mapper/src/visitors/IONodeInitVisitor.ts
+++ b/workspaces/ballerina/data-mapper/src/visitors/IONodeInitVisitor.ts
@@ -41,7 +41,7 @@ export class IONodeInitVisitor implements BaseVisitor {
         // Create output node
         if (parent?.query) {
             this.outputNode = new QueryOutputNode(this.context, node);
-        } else if (node.kind === TypeKind.Record) {
+        } else if (node.kind === TypeKind.Record || node.kind === TypeKind.Tuple) {
             this.outputNode = new ObjectOutputNode(this.context, node);
         } else if (node.kind === TypeKind.Array) {
             this.outputNode = new ArrayOutputNode(this.context, node);