diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
index 49430796dc..baf0142b0c 100644
Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ
diff --git a/common/activityLog/activityLog.js b/common/activityLog/activityLog.js
index dca0d8d4e1..514326d4fe 100644
--- a/common/activityLog/activityLog.js
+++ b/common/activityLog/activityLog.js
@@ -113,6 +113,7 @@ export const keysContent = {
   // Node
   nodeDefUuid: 'nodeDefUuid',
   recordUuid: 'recordUuid',
+  nodeIId: 'nodeIId',
   // User
   groupUuid: 'groupUuid',
   // Analysis
diff --git a/common/model/db/tables/dataNodeDef/columnNodeDef.js b/common/model/db/tables/dataNodeDef/columnNodeDef.js
index 66e19ed6af..16c5daff07 100644
--- a/common/model/db/tables/dataNodeDef/columnNodeDef.js
+++ b/common/model/db/tables/dataNodeDef/columnNodeDef.js
@@ -8,6 +8,7 @@ import * as SQL from '../../sql'
 
 const { nodeDefType } = NodeDef
 
+const columnSuffixEntityIId = '_i_id'
 const columnSuffixCodeLabel = '_label'
 const columnSuffixFileUuid = '_file_uuid'
 const columnSuffixFileName = '_file_name'
@@ -54,7 +55,7 @@ const getColumnNames = (nodeDef) => {
     return colsSuffix.map((colSuffix) => `${nodeDefName}${colSuffix}`)
   }
   if (NodeDef.isEntity(nodeDef)) {
-    return [`${nodeDefName}_uuid`]
+    return [`${nodeDefName}${columnSuffixEntityIId}`]
   }
   return [nodeDefName]
 }
@@ -71,8 +72,8 @@ const extractColumnName = ({ nodeDef, columnName }) => {
 
 /**
  * A nodeDef data table column.
- *
  * @typedef {object} module:arena.ColumnNodeDef
+ * @property
  */
 export default class ColumnNodeDef {
   constructor(table, nodeDef) {
diff --git a/common/model/db/tables/dataNodeDef/dataColProps.js b/common/model/db/tables/dataNodeDef/dataColProps.js
index c6f3304abd..e2133aa284 100644
--- a/common/model/db/tables/dataNodeDef/dataColProps.js
+++ b/common/model/db/tables/dataNodeDef/dataColProps.js
@@ -113,7 +113,7 @@ const props = {
     },
   },
   [nodeDefType.entity]: {
-    [colValueProcessor]: () => () => Node.getUuid,
+    [colValueProcessor]: () => (node) => Node.getIId(node),
   },
   [nodeDefType.file]: {
     [colValueProcessor]: ({ nodeDefCol }) => {
diff --git a/common/model/db/tables/dataNodeDef/table.js b/common/model/db/tables/dataNodeDef/table.js
index 872e86d157..2775a8ae22 100644
--- a/common/model/db/tables/dataNodeDef/table.js
+++ b/common/model/db/tables/dataNodeDef/table.js
@@ -15,9 +15,9 @@ const columnSet = {
   id: Table.columnSetCommon.id,
   dateCreated: Table.columnSetCommon.dateCreated,
   dateModified: Table.columnSetCommon.dateModified,
-  uuid: Table.columnSetCommon.uuid,
-  parentUuid: 'parent_uuid',
-  ancestorUuid: 'ancestor_uuid',
+  iId: Table.columnSetCommon.iId,
+  parentInternalId: 'p_i_id',
+  ancestorIId: 'a_i_id',
   recordUuid: 'record_uuid',
   recordCycle: 'record_cycle',
   recordStep: 'record_step',
@@ -32,15 +32,15 @@ const rootDefColumnNames = [
 ]
 
 const commonColumnNamesAndTypes = [
-  `${columnSet.id}            bigint      NOT NULL GENERATED ALWAYS AS IDENTITY`,
-  `${columnSet.dateCreated}   TIMESTAMP   NOT NULL DEFAULT (now() AT TIME ZONE 'UTC')`,
-  `${columnSet.dateModified}  TIMESTAMP   NOT NULL DEFAULT (now() AT TIME ZONE 'UTC')`,
-  `${columnSet.uuid}          uuid        NOT NULL`,
-  `${columnSet.parentUuid}    uuid            NULL`,
+  `${columnSet.id}                bigint      NOT NULL GENERATED ALWAYS AS IDENTITY`,
+  `${columnSet.recordUuid}        uuid        NOT NULL`,
+  `${columnSet.iId}               int         NOT NULL`,
+  `${columnSet.parentInternalId}  int         NULL`,
+  `${columnSet.dateCreated}       TIMESTAMP   NOT NULL DEFAULT (now() AT TIME ZONE 'UTC')`,
+  `${columnSet.dateModified}      TIMESTAMP   NOT NULL DEFAULT (now() AT TIME ZONE 'UTC')`,
 ]
 
 const rootDefColumnNamesAndTypes = [
-  `${columnSet.recordUuid}      uuid        NOT NULL`,
   `${columnSet.recordCycle}     varchar(2)  NOT NULL`,
   `${columnSet.recordStep}      varchar(63) NOT NULL`,
   `${columnSet.recordOwnerUuid} uuid        NOT NULL`,
@@ -71,12 +71,20 @@ export default class TableDataNodeDef extends TableSurveyRdb {
     return this.getColumn(columnSet.id)
   }
 
-  get columnUuid() {
-    return this.getColumn(columnSet.uuid)
+  get columnIId() {
+    return this.getColumn(columnSet.iId)
   }
 
-  get columnParentUuid() {
-    return this.getColumn(columnSet.parentUuid)
+  get columnIIdName() {
+    return columnSet.iId
+  }
+
+  get columnParentInternalId() {
+    return this.getColumn(columnSet.parentInternalId)
+  }
+
+  get columnParentInternalIdName() {
+    return columnSet.parentInternalId
   }
 
   get columnRecordUuid() {
@@ -121,7 +129,13 @@ export default class TableDataNodeDef extends TableSurveyRdb {
   getColumnNames = ({ includeAnalysis = true } = {}) => {
     const { nodeDef } = this
     const nodeDefsForColumns = this.getNodeDefsForColumns({ includeAnalysis })
-    const names = [columnSet.uuid, columnSet.parentUuid, columnSet.dateCreated, columnSet.dateModified]
+    const names = [
+      columnSet.recordUuid,
+      columnSet.iId,
+      columnSet.parentInternalId,
+      columnSet.dateCreated,
+      columnSet.dateModified,
+    ]
     if (NodeDef.isRoot(nodeDef)) {
       names.push(...rootDefColumnNames)
     }
@@ -135,24 +149,30 @@ export default class TableDataNodeDef extends TableSurveyRdb {
     if (NodeDef.isRoot(this.nodeDef)) {
       columnsAndType.push(...rootDefColumnNamesAndTypes)
     }
-    this.columnNodeDefs.forEach((nodeDefColumn) => {
-      columnsAndType.push(...nodeDefColumn.names.map((name, i) => `${name} ${nodeDefColumn.types[i]}`))
-    })
+    for (const nodeDefColumn of this.columnNodeDefs) {
+      for (let i = 0; i < nodeDefColumn.names.length; i++) {
+        const name = nodeDefColumn.names[i]
+        const type = nodeDefColumn.types[i]
+        columnsAndType.push(`${name} ${type}`)
+      }
+    }
     return columnsAndType
   }
 
-  _getConstraintFk(tableReferenced, column) {
-    return `CONSTRAINT ${this.name}_${tableReferenced.name}_fk 
-    FOREIGN KEY (${column}) 
-    REFERENCES ${tableReferenced.nameQualified} (${columnSet.uuid}) 
+  _getConstraintFk({ referencedTable, referencingColumnNames, referencedColumnNames }) {
+    return `CONSTRAINT ${this.name}_${referencedTable.name}_fk 
+    FOREIGN KEY (${referencingColumnNames.join(', ')}) 
+    REFERENCES ${referencedTable.nameQualified} (${referencedColumnNames.join(', ')}) 
     ON DELETE CASCADE`
   }
 
   getConstraintFkRecord() {
-    if (!NodeDef.isRoot(this.nodeDef)) {
-      return null
-    }
-    return this._getConstraintFk(new TableRecord(this.surveyId), columnSet.recordUuid)
+    const tableRecord = new TableRecord(this.surveyId)
+    return this._getConstraintFk({
+      referencedTable: tableRecord,
+      referencingColumnNames: [columnSet.recordUuid],
+      referencedColumnNames: [TableRecord.columnSet.uuid],
+    })
   }
 
   getConstraintFkParent() {
@@ -160,19 +180,25 @@ export default class TableDataNodeDef extends TableSurveyRdb {
       return null
     }
     const ancestorMultipleEntity = Survey.getNodeDefAncestorMultipleEntity(this.nodeDef)(this.survey)
-    return this._getConstraintFk(new TableDataNodeDef(this.survey, ancestorMultipleEntity), columnSet.parentUuid)
+    const ancestorEntityTable = new TableDataNodeDef(this.survey, ancestorMultipleEntity)
+    return this._getConstraintFk({
+      referencedTable: ancestorEntityTable,
+      referencingColumnNames: [columnSet.recordUuid, columnSet.parentInternalId],
+      referencedColumnNames: [TableDataNodeDef.columnSet.recordUuid, TableDataNodeDef.columnSet.iId],
+    })
   }
 
-  getConstraintUuidUnique() {
-    return `CONSTRAINT ${NodeDef.getName(this.nodeDef)}_uuid_unique_ix1 UNIQUE (${columnSet.uuid})`
+  getConstraintIIdUnique() {
+    return `CONSTRAINT ${NodeDef.getName(this.nodeDef)}_i_id_unique_ix1 UNIQUE (${columnSet.recordUuid}, ${columnSet.iId})`
   }
 
   getRowValuesByColumnName = ({ nodeRow, nodeDefColumns }) => {
     const { survey, nodeDef } = this
     const valuesByColumnName = TableDataNodeDefRowUtils.getValuesByColumnName({ survey, nodeRow, nodeDefColumns })
     const result = {
-      [columnSet.uuid]: nodeRow[columnSet.uuid],
-      [columnSet.parentUuid]: nodeRow[columnSet.ancestorUuid],
+      [columnSet.iId]: nodeRow[columnSet.iId],
+      [columnSet.recordUuid]: nodeRow[columnSet.recordUuid],
+      [columnSet.parentInternalId]: nodeRow[columnSet.ancestorIId],
       [columnSet.dateCreated]: nodeRow[columnSet.dateCreated],
       [columnSet.dateModified]: nodeRow[columnSet.dateModified],
     }
diff --git a/common/model/db/tables/node/select.js b/common/model/db/tables/node/select.js
index 57cbe950ed..f72b9416c8 100644
--- a/common/model/db/tables/node/select.js
+++ b/common/model/db/tables/node/select.js
@@ -16,17 +16,16 @@ const _isInsideSingleEntity = ({ survey, nodeDefUuid }) => {
 
 /**
  * Generates the select query for the node table by the given parameters.
- *
  * @param {!object} params - The query parameters.
- * @param {string} [params.uuid=null] - The node uuid to filter by.
- * @param {string} [params.recordUuid=null] - The record uuid to filter by.
- * @param {string} [params.parentUuid=null] - The parent node uuid to filter by.
- * @param {string} [params.nodeDefUuid=null] - The node definition uuid to filter by.
- * @param {boolean} [params.draft=false] - Whether to fetch draft props or only published ones.
+ * @param {string} [params.uuid] - The node uuid to filter by.
+ * @param {string} [params.recordUuid] - The record uuid to filter by.
+ * @param {string} [params.parentIId] - The parent node internal id to filter by.
+ * @param {string} [params.nodeDefUuid] - The node definition uuid to filter by.
+ * @param {boolean} [params.draft] - Whether to fetch draft props or only published ones.
  * @returns {string} - The select query.
  */
 export function getSelect(params) {
-  const { uuid = null, recordUuid = null, parentUuid = null, nodeDefUuid = null, draft = false } = params
+  const { uuid = null, recordUuid = null, parentIId = null, nodeDefUuid = null, draft = false } = params
 
   const _getPropsCombined = (table) =>
     draft ? `${table.columnProps} || ${table.columnPropsDraft}` : `${table.columnProps}`
@@ -47,20 +46,26 @@ export function getSelect(params) {
     }
   }
 
+  const _addIdEqualCondition = (column, value) => {
+    if (value) {
+      whereConditions.push(`${column} = ${value}`)
+    }
+  }
+
   const _addParentNodeCondition = () => {
     if (nodeDefUuid && _isInsideSingleEntity({ survey: this.survey, nodeDefUuid })) {
       // node def is inside a single entity
-      // parentUuid is the uuid of the first ancestor multiple entity
+      // parentIId is the internal id of the first ancestor multiple entity
       // use node hierarchy in the where condition
       whereConditions.push(
-        `${parentUuid}::text IN (SELECT jsonb_array_elements_text(${this.columnMeta} -> '${Node.metaKeys.hierarchy}'))`
+        `${parentIId}::integer IN (SELECT jsonb_array_elements(${this.columnMeta} -> '${Node.metaKeys.hierarchy}'))`
       )
     } else {
-      _addUuidEqualCondition(this.columnParentUuid, parentUuid)
+      _addIdEqualCondition(this.columnParentIId, parentIId)
     }
   }
 
-  _addUuidEqualCondition(this.columnUuid, uuid)
+  _addIdEqualCondition(this.columnIId, uuid)
   _addUuidEqualCondition(this.columnRecordUuid, recordUuid)
   _addUuidEqualCondition(this.columnNodeDefUuid, nodeDefUuid)
   _addParentNodeCondition()
diff --git a/common/model/db/tables/node/table.js b/common/model/db/tables/node/table.js
index 937f33c689..2103c3bf41 100644
--- a/common/model/db/tables/node/table.js
+++ b/common/model/db/tables/node/table.js
@@ -9,10 +9,10 @@ import TableSurvey from '../tableSurvey'
 import { getSelect } from './select'
 
 const columnSet = {
-  uuid: Table.columnSetCommon.uuid,
   id: Table.columnSetCommon.id,
   recordUuid: 'record_uuid',
-  parentUuid: 'parent_uuid',
+  iId: 'i_id',
+  parentIId: 'p_i_id',
   nodeDefUuid: 'node_def_uuid',
   value: 'value',
   meta: 'meta',
@@ -38,8 +38,12 @@ export default class TableNode extends TableSurvey {
     return super.getColumn(columnSet.recordUuid)
   }
 
-  get columnParentUuid() {
-    return super.getColumn(columnSet.parentUuid)
+  get columnIId() {
+    return super.getColumn(columnSet.iId)
+  }
+
+  get columnParentIId() {
+    return super.getColumn(columnSet.parentIId)
   }
 
   get columnNodeDefUuid() {
diff --git a/common/model/db/tables/table.js b/common/model/db/tables/table.js
index a1b4a3afbf..4b544f6c0f 100644
--- a/common/model/db/tables/table.js
+++ b/common/model/db/tables/table.js
@@ -5,6 +5,7 @@ const columnSetCommon = {
   dateCreated: 'date_created',
   dateModified: 'date_modified',
   id: 'id',
+  iId: 'i_id',
   props: 'props',
   propsDraft: 'props_draft',
   uuid: 'uuid',
@@ -12,7 +13,6 @@ const columnSetCommon = {
 
 /**
  * A database table object.
- *
  * @typedef {object} module:arena.Table
  * @property {string} schema - The schema it belongs to.
  * @property {string} name - The table name.
@@ -22,10 +22,9 @@ const columnSetCommon = {
 export default class Table {
   /**
    * Create an instance of a Table.
-   *
    * @param {!string} schema - The schema.
    * @param {!string} name - The table name.
-   * @param {{[key: string]: string}} [columnSet={}] - The table column set.
+   * @param {{[key: string]: string}} [columnSet] - The table column set.
    */
   constructor(schema, name, columnSet = {}) {
     if (new.target === Table) {
diff --git a/common/model/db/views/dataNodeDef/view.js b/common/model/db/views/dataNodeDef/view.js
index 0143e9b444..97d618a0fd 100644
--- a/common/model/db/views/dataNodeDef/view.js
+++ b/common/model/db/views/dataNodeDef/view.js
@@ -39,18 +39,18 @@ export default class ViewDataNodeDef extends TableDataNodeDef {
     }
   }
 
-  get columnNodeDefUuid() {
+  get columnNodeDefIId() {
     // node def can be the entity itself or it's source entity (if virtual)
     const { nodeDef } = this.tableData
     return new ColumnNodeDef(this, nodeDef)
   }
 
-  get columnUuid() {
-    return this.columnNodeDefUuid.nameFull
+  get columnNodeDefIIdNameFull() {
+    return this.columnNodeDefIId.nameFull
   }
 
-  get columnUuidName() {
-    return this.columnNodeDefUuid.name
+  get columnNodeDefIIdName() {
+    return this.columnNodeDefIId.name
   }
 
   get columnIdName() {
@@ -58,17 +58,17 @@ export default class ViewDataNodeDef extends TableDataNodeDef {
     return `_${NodeDef.getName(nodeDef)}_${TableDataNodeDef.columnSet.id}`
   }
 
-  get columnNodeDefUuids() {
+  get columnNodeDefIIds() {
     return [
-      this.columnNodeDefUuid,
+      this.columnNodeDefIId,
       ...(this.viewDataParent
-        ? this.viewDataParent.columnNodeDefUuids.map((columnNodeDef) => new ColumnNodeDef(this, columnNodeDef.nodeDef))
+        ? this.viewDataParent.columnNodeDefIIds.map((columnNodeDef) => new ColumnNodeDef(this, columnNodeDef.nodeDef))
         : []),
     ]
   }
 
-  get columnUuids() {
-    return this.columnNodeDefUuids.flatMap((columnNodeDef) => columnNodeDef.namesFull)
+  get columnNodeDefIIdsNamesFull() {
+    return this.columnNodeDefIIds.flatMap((columnNodeDef) => columnNodeDef.namesFull)
   }
 
   get _multipleAttributeColumns() {
@@ -123,8 +123,12 @@ export default class ViewDataNodeDef extends TableDataNodeDef {
     return this.columnNodeDefs.flatMap((columnNodeDef) => new ColumnNodeDef(this, columnNodeDef.nodeDef).namesFull)
   }
 
-  get columnParentUuidName() {
-    return this.viewDataParent?.columnUuidName
+  get columnParentInternalId() {
+    return this.viewDataParent?.columnIId
+  }
+
+  get columnParentInternalIdName() {
+    return this.viewDataParent?.columnIIdName
   }
 
   get tableData() {
diff --git a/core/objectUtils.js b/core/objectUtils.js
index 878bfa8e2e..a0ec4c1d36 100644
--- a/core/objectUtils.js
+++ b/core/objectUtils.js
@@ -11,9 +11,11 @@ export const keys = {
   draft: 'draft',
   extra: 'extra',
   id: 'id',
+  iId: 'iId',
   index: 'index',
   name: 'name',
   nodeDefUuid: 'nodeDefUuid',
+  pIId: 'pIId',
   parentUuid: 'parentUuid',
   props: 'props',
   propsDraft: 'propsDraft',
@@ -31,6 +33,7 @@ export const keysProps = {
 
 // ====== READ
 export const getId = R.prop(keys.id)
+export const getIId = R.prop(keys.iId)
 export const getUuid = R.propOr(null, keys.uuid)
 
 export const getProps = R.propOr({}, keys.props)
@@ -40,6 +43,7 @@ export const isKeyTrue = (key) => (obj) => !!R.propOr(false, key)(obj)
 export const isPropTrue = (prop) => (obj) => !!getProp(prop)(obj)
 
 export const getParentUuid = R.propOr(null, keys.parentUuid)
+export const getParentInternalId = R.propOr(null, keys.pIId)
 
 export const getLabels = getProp(keysProps.labels, {})
 export const getLabel = (lang, defaultTo = null) => R.pipe(getLabels, R.propOr(defaultTo, lang))
@@ -132,6 +136,8 @@ export const toIndexedObj = (array, propNameOrExtractor) =>
 
 export const toUuidIndexedObj = R.partialRight(toIndexedObj, [keys.uuid])
 
+export const toIIdIndexedObj = R.partialRight(toIndexedObj, [keys.iId])
+
 export const groupByProps =
   (...propNamesOrExtractors) =>
   (items) =>
diff --git a/core/record/_record/recordKeys.js b/core/record/_record/recordKeys.js
index 86765531c8..e5a70fbcde 100644
--- a/core/record/_record/recordKeys.js
+++ b/core/record/_record/recordKeys.js
@@ -5,6 +5,7 @@ export const keys = {
   dateCreated: ObjectUtils.keys.dateCreated,
   dateModified: ObjectUtils.keys.dateModified,
   info: 'info',
+  lastNodeInternalId: 'lastNodeInternalId',
   mergedIntoRecordUuid: 'mergedIntoRecordUuid',
   nodes: 'nodes',
   ownerEmail: 'ownerEmail',
diff --git a/core/record/_record/recordNodesUpdater.js b/core/record/_record/recordNodesUpdater.js
index 1da5b97dc0..d55be317b7 100644
--- a/core/record/_record/recordNodesUpdater.js
+++ b/core/record/_record/recordNodesUpdater.js
@@ -162,7 +162,7 @@ const _addOrUpdateAttribute =
     if (!attribute || NodeDef.isMultipleAttribute(attributeDef)) {
       // create new attribute
       const updateResult = new RecordUpdateResult({ record })
-      const attributeCreated = Node.newNode(attributeDefUuid, record.uuid, entity, value)
+      const attributeCreated = Node.newNode({ record, nodeDefUuid: attributeDefUuid, parentNode: entity, value })
       updateResult.addNode(attributeCreated, { sideEffect })
       return updateResult
     }
@@ -453,17 +453,17 @@ const deleteNodesInEntityByNodeDefUuid =
   async (record) => {
     const updateResult = new RecordUpdateResult({ record })
 
-    const nodeUuidsToDelete = []
+    const nodeIIdsToDelete = []
     for (const nodeDefUuid of nodeDefUuids) {
       const children = RecordReader.getNodeChildrenByDefUuid(entity, nodeDefUuid)(record)
-      nodeUuidsToDelete.push(...children.map(Node.getUuid))
+      nodeIIdsToDelete.push(...children.map(Node.getIId))
     }
 
     const nodesDeleteUpdateResult = await deleteNodes({
       user,
       survey,
       record,
-      nodeUuids: nodeUuidsToDelete,
+      nodeInternalIds: nodeIIdsToDelete,
       categoryItemProvider,
       taxonProvider,
       sideEffect,
diff --git a/core/record/_record/recordReader.js b/core/record/_record/recordReader.js
index 696e7bd22f..4580d07a9a 100644
--- a/core/record/_record/recordReader.js
+++ b/core/record/_record/recordReader.js
@@ -15,7 +15,7 @@ import { keys } from './recordKeys'
 
 const {
   getChildren: getNodeChildren,
-  getNodeByUuid,
+  getNodeByInternalId,
   getNodesByDefUuid,
   getParent: getParentNode,
   getRoot: getRootNode,
@@ -24,10 +24,12 @@ const {
 /**
  * === simple getters.
  */
+export const getLastNodeInternalId = R.propOr(0, keys.lastNodeInternalId)
+
 export const getNodes = R.propOr({}, keys.nodes)
 export const getNodesArray = (record) => Object.values(getNodes(record))
 
-export { getNodeChildren, getNodeByUuid, getNodesByDefUuid, getRootNode, getParentNode }
+export { getNodeChildren, getNodeByInternalId, getNodesByDefUuid, getRootNode, getParentNode }
 
 export const findNodeChildren = (parentNode, childDefUuid) => (record) => {
   try {
@@ -201,10 +203,10 @@ export const getParentCodeAttribute = (_survey, parentNode, nodeDef) => (record)
 export const visitAncestorCodeAttributes =
   ({ survey, parentNode, nodeDef, visitor }) =>
   (record) => {
-    const visitedNodeUuids = new Set() // avoid cycles
+    const visitedNodeIIds = new Set() // avoid cycles
     let currentParentCodeAttribute = Records.getParentCodeAttribute({ parentNode, nodeDef })(record)
-    while (currentParentCodeAttribute && !visitedNodeUuids.has(Node.getUuid(currentParentCodeAttribute))) {
-      visitedNodeUuids.add(Node.getUuid(currentParentCodeAttribute))
+    while (currentParentCodeAttribute && !visitedNodeIIds.has(Node.getIId(currentParentCodeAttribute))) {
+      visitedNodeIIds.add(Node.getIId(currentParentCodeAttribute))
       visitor(currentParentCodeAttribute)
       const parentCodeAttributeNodeDef = SurveyNodeDefs.getNodeDefByUuid(
         Node.getNodeDefUuid(currentParentCodeAttribute)
@@ -337,7 +339,7 @@ export const getAttributesUniqueDependent = ({ survey, record, node }) => {
   } else if (_isNodeDefUnique(nodeDef)) {
     siblingUniqueAttributes = getAttributesUniqueSibling({ record, attribute: node, attributeDef: nodeDef })
   }
-  return ObjectUtils.toUuidIndexedObj(siblingUniqueAttributes)
+  return ObjectUtils.toIIdIndexedObj(siblingUniqueAttributes)
 }
 
 export const isNodeFilledByUser = (node) => (record) => Records.isNodeFilledByUser(node)(record)
diff --git a/core/record/_record/recordUpdater.js b/core/record/_record/recordUpdater.js
index 8745685a6f..757235ed48 100644
--- a/core/record/_record/recordUpdater.js
+++ b/core/record/_record/recordUpdater.js
@@ -14,9 +14,8 @@ import * as RecordReader from './recordReader'
  * Updates the record nodes with the ones passed as parameter.
  * Existing nodes will be replaced by the ones in the specified parameter.
  * Nodes marked as "deleted" will be removed from the record.
- *
  * @param {object} nodes - The nodes to be added or updated.
- * @param {boolean} [removeFlags = false] - True if flags like "deleted" or "created" must be removed from the nodes, false otherwise.
+ * @param {boolean} [removeFlags] - True if flags like "deleted" or "created" must be removed from the nodes, false otherwise.
  * @returns {object} - The updated record.
  */
 export const mergeNodes =
@@ -27,12 +26,12 @@ export const mergeNodes =
       recordUpdated[keys.nodes] = {}
     }
 
-    Object.entries(nodes).forEach(([nodeUuid, n]) => {
+    Object.entries(nodes).forEach(([nodeIId, n]) => {
       // Remove deleted node
       if (Node.isDeleted(n)) {
         recordUpdated = deleteNode(n, { sideEffect })(recordUpdated)
       } else {
-        const nodeExisting = RecordReader.getNodeByUuid(nodeUuid)(recordUpdated)
+        const nodeExisting = RecordReader.getNodeByInternalId(nodeIId)(recordUpdated)
         // Exclude dirty nodes currently being edited by the user
         const toBeAdded =
           !nodeExisting || // NodeExisting does not exist, n is new node
@@ -64,11 +63,10 @@ export const assocNode =
 /**
  * Adds new nodes to the record.
  * Nodes shouldn't have been added previously to the record, so in this casa there is no need to check for duplicates.
- *
  * @param {!object} params - The parameters.
  * @param {!object} [params.nodes] - The nodes to be added.
- * @param {boolean} [params.updateNodesIndex = true] - True if the nodes must be added to the index (slower), false otherwise (faster).
- * @param {boolean} [params.sideEffect = true] - True if the passed record object can be modified by calling this function (faster), false otherwise.
+ * @param {boolean} [params.updateNodesIndex] - True if the nodes must be added to the index (slower), false otherwise (faster).
+ * @param {boolean} [params.sideEffect] - True if the passed record object can be modified by calling this function (faster), false otherwise.
  * @returns {object} - The updated record.
  */
 export const assocNodes =
@@ -93,7 +91,7 @@ export const assocDateModified = (dateModified) => (record) => {
 export const deleteNode =
   (node, { sideEffect = false } = {}) =>
   (record) => {
-    const nodeUuid = Node.getUuid(node)
-    const { record: recordUpdated } = Records.deleteNode(nodeUuid, { sideEffect })(record)
+    const nodeIId = Node.getIId(node)
+    const { record: recordUpdated } = Records.deleteNode(nodeIId, { sideEffect })(record)
     return recordUpdated
   }
diff --git a/core/record/_record/recordsCombiner.js b/core/record/_record/recordsCombiner.js
index e2fc512f28..e2ad8ca9d3 100644
--- a/core/record/_record/recordsCombiner.js
+++ b/core/record/_record/recordsCombiner.js
@@ -1,4 +1,4 @@
-import { Dates, Objects, Records, RecordUpdateResult, Surveys, UUIDs } from '@openforis/arena-core'
+import { Dates, Objects, Records, RecordUpdateResult, Surveys } from '@openforis/arena-core'
 
 import * as A from '@core/arena'
 import * as Survey from '@core/survey/survey'
@@ -12,30 +12,30 @@ import * as RecordReader from './recordReader'
 import { updateAttributeValue } from './recordNodeValueUpdater'
 import { afterNodesUpdate } from './recordNodesUpdaterCommon'
 
-const findEntityByUuidOrKeys = ({
+const findEntityByIIdOrKeys = ({
   survey,
   record,
   entityDefUuid,
   parentEntity,
-  uuid = null,
+  iId = null,
   keyValuesByDefUuid = null,
 }) => {
-  const entityWithSameUuid = uuid ? Records.getNodeByUuid(uuid)(record) : null
-  if (entityWithSameUuid) {
-    return entityWithSameUuid
+  const entityWithSameIId = iId ? Records.getNodeByIId(iId)(record) : null
+  if (entityWithSameIId) {
+    return entityWithSameIId
   }
   return keyValuesByDefUuid
     ? Records.findEntityByKeyValues({ survey, record, parentEntity, entityDefUuid, keyValuesByDefUuid })
     : null
 }
 
-const _findNodeWithSameUuid = (nodeSearch, nodesArray) =>
-  nodesArray.find((node) => Node.getUuid(node) === Node.getUuid(nodeSearch))
+const _findNodeWithSameIId = (nodeSearch, nodesArray) =>
+  nodesArray.find((node) => Node.getIId(node) === Node.getIId(nodeSearch))
 
-const _getNodesArrayDifference = (nodes, otherNodes) => nodes.filter((node) => !_findNodeWithSameUuid(node, otherNodes))
+const _getNodesArrayDifference = (nodes, otherNodes) => nodes.filter((node) => !_findNodeWithSameIId(node, otherNodes))
 
 const _getNodesArrayIntersection = (nodes, otherNodes) =>
-  nodes.filter((node) => !!_findNodeWithSameUuid(node, otherNodes))
+  nodes.filter((node) => !!_findNodeWithSameIId(node, otherNodes))
 
 const _replaceAttributeValueIfEmptyOrModified = ({
   survey,
@@ -99,8 +99,8 @@ const _replaceUpdatedNodesInEntities = ({
     // delete nodes that are not in source record
     const childrenTargetToDelete = _getNodesArrayDifference(childrenTarget, childrenSource).map(Node.assocDeleted(true))
     if (childrenTargetToDelete.length > 0) {
-      const childrenTargetToDeleteUuids = childrenTargetToDelete.map(Node.getUuid)
-      const nodesDeleteUpdateResult = Records.deleteNodes(childrenTargetToDeleteUuids, { sideEffect })(
+      const childrenTargetToDeleteIIds = childrenTargetToDelete.map(Node.getIId)
+      const nodesDeleteUpdateResult = Records.deleteNodes(childrenTargetToDeleteIIds, { sideEffect })(
         updateResult.record
       )
       updateResult.merge(nodesDeleteUpdateResult)
@@ -118,7 +118,7 @@ const _replaceUpdatedNodesInEntities = ({
     // update existing nodes (nodes in both source and target records)
 
     _getNodesArrayIntersection(childrenSource, childrenTarget).forEach((childSource) => {
-      const childTargetToUpdate = _findNodeWithSameUuid(childSource, childrenTarget)
+      const childTargetToUpdate = _findNodeWithSameIId(childSource, childrenTarget)
       if (NodeDef.isAttribute(childDef)) {
         const attrUpdateResult = _replaceAttributeValueIfEmptyOrModified({
           survey,
@@ -152,9 +152,9 @@ export const replaceUpdatedNodes =
   async (recordTarget) => {
     const rootSource = RecordReader.getRootNode(recordSource)
     const rootTarget = RecordReader.getRootNode(recordTarget)
-    if (Node.getUuid(rootTarget) !== Node.getUuid(rootSource)) {
+    if (Node.getIId(rootTarget) !== Node.getIId(rootSource)) {
       // it should never happen...
-      throw new Error('error merging records: root entities have different uuids')
+      throw new Error('error merging records: root entities have different iIds')
     }
     const updateResult = _replaceUpdatedNodesInEntities({
       survey,
@@ -177,9 +177,9 @@ export const replaceUpdatedNodes =
   }
 
 const _recalculateNodeHierarchy = ({ parentEntity, node }) => {
-  const parentEntityUuid = Node.getUuid(parentEntity)
-  node[Node.keys.parentUuid] = parentEntityUuid
-  const hierarchyUpdated = [...Node.getHierarchy(parentEntity), parentEntityUuid]
+  const parentEntityIId = Node.getIId(parentEntity)
+  node[Node.keys.parentIId] = parentEntityIId
+  const hierarchyUpdated = [...Node.getHierarchy(parentEntity), parentEntityIId]
   Objects.setInPath({ obj: node, path: [Node.keys.meta, Node.metaKeys.hierarchy], value: hierarchyUpdated })
 }
 
@@ -187,17 +187,24 @@ const _addNodeToUpdateResult = ({
   updateResult,
   node,
   parentEntity: parentEntityParam = undefined,
-  assignNewUuid = false,
+  assignNewIds = false,
   sideEffect = false,
 }) => {
+  const { record } = updateResult
   const newNodeToAdd = sideEffect ? Node.setCreated(node) : Node.assocCreated(true)(node)
-  if (assignNewUuid) {
-    newNodeToAdd[Node.keys.uuid] = UUIDs.v4()
+  if (assignNewIds) {
+    const lastNodeInternalId = RecordReader.getLastNodeInternalId(record)
+    const newInternalId = lastNodeInternalId + 1
+    newNodeToAdd[Node.keys.iId] = newInternalId
+    const recordUpdated = { ...record, lastNodeInternalId: newInternalId }
+    updateResult.merge(new RecordUpdateResult({ record: recordUpdated }))
   }
-  delete newNodeToAdd[Node.keys.id] // clear internal id
-  newNodeToAdd[Node.keys.recordUuid] = updateResult.record.uuid
+  // clear id, used for storage in DB, but not needed for the updateResult
+  delete newNodeToAdd[Node.keys.id]
 
-  const parentEntity = parentEntityParam ?? RecordReader.getNodeByUuid(Node.getParentUuid(node))(updateResult.record)
+  newNodeToAdd[Node.keys.recordUuid] = record.uuid
+
+  const parentEntity = parentEntityParam ?? RecordReader.getNodeByInternalId(Node.getParentInternalId(node))(record)
   _recalculateNodeHierarchy({ node: newNodeToAdd, parentEntity })
   updateResult.addNode(newNodeToAdd, { sideEffect })
 }
@@ -252,12 +259,12 @@ const _areNotSameValues = ({ survey, childDef, updateResult, entityTarget, sourc
   })
 
 const replaceNodes = ({ childrenSource, childrenTarget, entityTarget, sideEffect, updateResult }) => {
-  const childrenTargetToDeleteUuids = childrenTarget.map(Node.getUuid)
-  const nodesDeleteUpdateResult = Records.deleteNodes(childrenTargetToDeleteUuids, { sideEffect })(updateResult.record)
+  const childrenTargetToDeleteIIds = childrenTarget.map(Node.getIId)
+  const nodesDeleteUpdateResult = Records.deleteNodes(childrenTargetToDeleteIIds, { sideEffect })(updateResult.record)
   updateResult.merge(nodesDeleteUpdateResult)
-  childrenSource.forEach((childSource) => {
+  for (const childSource of childrenSource) {
     _addNodeToUpdateResult({ updateResult, node: childSource, parentEntity: entityTarget })
-  })
+  }
 }
 
 const _mergeMultipleAttributes = ({
@@ -281,7 +288,7 @@ const _mergeMultipleAttributes = ({
       }
     } else {
       // keep nodes from both records, unless they have the same value
-      childrenSource.forEach((childSource) => {
+      for (const childSource of childrenSource) {
         const sourceValue = Node.getValue(childSource)
         if (
           !targetValues.find((targetValue) =>
@@ -296,9 +303,9 @@ const _mergeMultipleAttributes = ({
           )
         ) {
           // value not in target values => add it to the record
-          _addNodeToUpdateResult({ updateResult, node: childSource, parentEntity: entityTarget, assignNewUuid: true })
+          _addNodeToUpdateResult({ updateResult, node: childSource, parentEntity: entityTarget, assignNewIds: true })
         }
-      })
+      }
     }
   }
 }
@@ -310,21 +317,22 @@ const _cloneEntityAndDescendants = async ({
   parentEntity,
   sideEffect = false,
 }) => {
-  const newNodeUuidByOldUuid = {}
+  const newNodeIIdByOldIId = {}
+  let lastNodeInternalId = RecordReader.getLastNodeInternalId(recordSource)
   RecordReader.visitDescendantsAndSelf(entitySource, (visitedChildSource) => {
-    const oldUuid = Node.getUuid(visitedChildSource)
-    const oldParentUuid = Node.getParentUuid(visitedChildSource)
-    const newUuid = UUIDs.v4()
-    newNodeUuidByOldUuid[oldUuid] = newUuid
-    const newParentEntityUuid =
+    const oldIId = Node.getIId(visitedChildSource)
+    const oldParentIId = Node.getParentInternalId(visitedChildSource)
+    const newIId = ++lastNodeInternalId
+    newNodeIIdByOldIId[oldIId] = newIId
+    const newParentEntityIId =
       visitedChildSource === entitySource
-        ? Node.getUuid(parentEntity)
-        : (newNodeUuidByOldUuid[oldParentUuid] ?? oldParentUuid)
+        ? Node.getIId(parentEntity)
+        : (newNodeIIdByOldIId[oldParentIId] ?? oldParentIId) // if parent node is not in the visited path, keep the same parentIId (it will be updated in hierarchy recalculation)
     const nodeTarget = ObjectUtils.clone(visitedChildSource)
     Node.removeFlags({ sideEffect: true })(nodeTarget)
     nodeTarget[Node.keys.created] = true // consider it as new node, to allow RDB updates
-    nodeTarget[Node.keys.uuid] = newUuid
-    nodeTarget[Node.keys.parentUuid] = newParentEntityUuid
+    nodeTarget[Node.keys.iId] = newIId
+    nodeTarget[Node.keys.pIId] = newParentEntityIId
     // node hierarchy will be recalculated in _addNodeToUpdateResult
     _addNodeToUpdateResult({ updateResult, node: nodeTarget, sideEffect })
   })(recordSource)
@@ -347,12 +355,12 @@ const _mergeMultipleEntities = ({
       record: recordSource,
       entity: childSource,
     })
-    const childTarget = findEntityByUuidOrKeys({
+    const childTarget = findEntityByIIdOrKeys({
       survey,
       record: updateResult.record,
       entityDefUuid: childDefUuid,
       parentEntity: entityTarget,
-      uuid: Node.getUuid(childSource),
+      iId: Node.getIId(childSource),
       keyValuesByDefUuid,
     })
     if (childTarget) {
diff --git a/core/record/node.js b/core/record/node.js
index f30ca30741..9b646ccc0d 100644
--- a/core/record/node.js
+++ b/core/record/node.js
@@ -4,7 +4,6 @@ import { Objects } from '@openforis/arena-core'
 
 import * as ObjectUtils from '@core/objectUtils'
 import * as StringUtils from '@core/stringUtils'
-import { uuidv4 } from '@core/uuid'
 
 import * as Validation from '@core/validation/validation'
 import * as NodeDef from '@core/survey/nodeDef'
@@ -43,8 +42,9 @@ const flagKeysIncludingDirty = [...flagKeysArray, dirtyFlag]
 
 export const keys = {
   id: ObjectUtils.keys.id,
+  iId: ObjectUtils.keys.iId,
   uuid: ObjectUtils.keys.uuid,
-  parentUuid: ObjectUtils.keys.parentUuid,
+  pIId: ObjectUtils.keys.pIId,
   dateCreated: ObjectUtils.keys.dateCreated,
   dateModified: ObjectUtils.keys.dateModified,
   recordUuid: 'recordUuid',
@@ -70,9 +70,9 @@ export const isValueProp = ({ nodeDef, prop }) => Boolean(R.path([NodeDef.getTyp
 // ======
 //
 
-export const { getId, getUuid } = ObjectUtils
+export const { getId, getIId, getUuid } = ObjectUtils
 
-export const { getParentUuid } = ObjectUtils
+export const { getParentInternalId } = ObjectUtils
 
 export const getRecordUuid = R.prop(keys.recordUuid)
 
@@ -107,7 +107,7 @@ export const isCreated = R.propEq(keys.created, true)
 export const isUpdated = R.propEq(keys.updated, true)
 export const isDeleted = R.propEq(keys.deleted, true)
 export const isDirty = R.propEq(dirtyFlag, true)
-export const isRoot = R.pipe(getParentUuid, R.isNil)
+export const isRoot = R.pipe(getParentInternalId, R.isNil)
 export const { isEqual } = ObjectUtils
 
 export const { getValidation } = Validation
@@ -126,13 +126,13 @@ export const isDescendantOf = (ancestor) => (node) => R.includes(getUuid(ancesto
 // ======
 //
 
-export const newNode = (nodeDefUuid, recordUuid, parentNode = null, value = null) => {
+export const newNode = ({ record, nodeDefUuid, parentNode = null, value = null }) => {
   const now = new Date()
   return {
-    [keys.uuid]: uuidv4(),
     [keys.nodeDefUuid]: nodeDefUuid,
-    [keys.recordUuid]: recordUuid,
-    [keys.parentUuid]: getUuid(parentNode),
+    [keys.recordUuid]: ObjectUtils.getUuid(record),
+    [keys.iId]: record.lastInternalId + 1,
+    [keys.pIId]: getIId(parentNode),
     [keys.value]: value,
     [keys.meta]: {
       [metaKeys.hierarchy]: parentNode ? R.append(getUuid(parentNode), getHierarchy(parentNode)) : [],
@@ -144,7 +144,7 @@ export const newNode = (nodeDefUuid, recordUuid, parentNode = null, value = null
 }
 
 export const newNodePlaceholder = (nodeDef, parentNode, value = null) => ({
-  ...newNode(NodeDef.getUuid(nodeDef), getRecordUuid(parentNode), parentNode, value),
+  ...newNode({ record, nodeDefUuid: NodeDef.getUuid(nodeDef), parentNode, value }),
   [keys.placeholder]: true,
 })
 
@@ -153,6 +153,7 @@ export const newNodePlaceholder = (nodeDef, parentNode, value = null) => ({
 // UPDATE
 // ======
 //
+export const assocIId = R.assoc(keys.iId)
 export const assocValue = R.assoc(keys.value)
 export const { assocValidation } = Validation
 
@@ -163,6 +164,14 @@ export const setCreated = (node) => {
   node[keys.created] = true
   return node
 }
+export const setUpdated = (node) => {
+  node[keys.updated] = true
+  return node
+}
+export const setDeleted = (node) => {
+  node[keys.deleted] = true
+  return node
+}
 export const assocDeleted = R.assoc(keys.deleted)
 export const assocUpdated = R.assoc(keys.updated)
 export const assocDirty = R.assoc(dirtyFlag)
diff --git a/core/record/nodeKeys.js b/core/record/nodeKeys.js
index 18feddea19..68010b3b52 100644
--- a/core/record/nodeKeys.js
+++ b/core/record/nodeKeys.js
@@ -5,7 +5,7 @@ import * as NodeDef from '@core/survey/nodeDef'
 
 export const keys = {
   nodeId: 'nodeId',
-  nodeUuid: 'nodeUuid',
+  nodeIId: 'nodeIId',
   nodeDefUuid: 'nodeDefUuid',
   recordUuid: 'recordUuid',
   keys: 'keys',
diff --git a/core/record/record.js b/core/record/record.js
index 5c075f3207..e58eda6509 100644
--- a/core/record/record.js
+++ b/core/record/record.js
@@ -56,8 +56,8 @@ export const getCreatedWithAppId = (record) => {
   const createdWith = info[infoKeys.createdWith]
   return AppInfo.getAppId(createdWith)
 }
-
-export const { getNodes, getNodesArray, getNodeByUuid, getRootNode, getNodesByDefUuid } = RecordReader
+export const { getLastNodeInternalId, getNodes, getNodesArray, getNodeByInternalId, getRootNode, getNodesByDefUuid } =
+  RecordReader
 
 // ==== hierarchy
 export const {
diff --git a/core/record/recordFile.js b/core/record/recordFile.js
index ae632e93e4..2460818486 100644
--- a/core/record/recordFile.js
+++ b/core/record/recordFile.js
@@ -18,7 +18,7 @@ export const propKeys = {
   name: 'name',
   size: 'size',
   recordUuid: 'recordUuid',
-  nodeUuid: 'nodeUuid',
+  nodeIId: 'nodeIId',
 }
 
 export const invalidPropKeys = {
@@ -26,13 +26,13 @@ export const invalidPropKeys = {
   fileSize: 'fileSize',
 }
 
-export const createFile = ({ name, uuid = null, size = null, content = null, recordUuid = null, nodeUuid = null }) => ({
+export const createFile = ({ name, uuid = null, size = null, content = null, recordUuid = null, nodeIId = null }) => ({
   [keys.uuid]: uuid ?? uuidv4(),
   [keys.props]: {
     [propKeys.name]: name,
     [propKeys.size]: size,
     [propKeys.recordUuid]: recordUuid,
-    [propKeys.nodeUuid]: nodeUuid,
+    [propKeys.nodeIId]: nodeIId,
   },
   [keys.content]: content,
 })
@@ -42,7 +42,7 @@ export const createFileFromNode = ({ node, size = null, content = null }) =>
     uuid: Node.getFileUuid(node),
     name: Node.getFileName(node),
     recordUuid: Node.getRecordUuid(node),
-    nodeUuid: Node.getUuid(node),
+    nodeIId: Node.getIId(node),
     size,
     content,
   })
@@ -62,7 +62,7 @@ export const { getUuid, getProps } = ObjectUtils
 export const isDeleted = (file) => Boolean(ObjectUtils.getProp(propKeys.deleted, false)(file))
 export const getName = ObjectUtils.getProp(propKeys.name)
 export const getSize = ObjectUtils.getProp(propKeys.size)
-export const getNodeUuid = ObjectUtils.getProp(propKeys.nodeUuid)
+export const getNodeIId = ObjectUtils.getProp(propKeys.nodeIId)
 export const getRecordUuid = ObjectUtils.getProp(propKeys.recordUuid)
 export const getContent = R.prop(keys.content)
 export const getExtension = R.pipe(getName, FileNames.getExtension)
@@ -85,7 +85,7 @@ export const cleanupInvalidProps = (file) => {
     [propKeys.name]: props[invalidPropKeys.fileName],
     [propKeys.size]: props[invalidPropKeys.fileSize],
     [propKeys.recordUuid]: props[propKeys.recordUuid],
-    [propKeys.nodeUuid]: props[propKeys.nodeUuid],
+    [propKeys.nodeIId]: props[propKeys.nodeIId],
   }
   if (props.deleted) {
     propsUpdated[propKeys.deleted] = true
diff --git a/core/record/recordValidation.js b/core/record/recordValidation.js
index db3d2207b9..6f3015d91c 100644
--- a/core/record/recordValidation.js
+++ b/core/record/recordValidation.js
@@ -1,5 +1,6 @@
 import * as R from 'ramda'
 
+import * as Node from '@core/record/node'
 import * as Validation from '@core/validation/validation'
 import * as ValidationResult from '@core/validation/validationResult'
 import { RecordValidations } from '@openforis/arena-core'
@@ -12,8 +13,8 @@ export const keys = {
 export const prefixValidationFieldChildrenCount = 'childrenCount_'
 
 // ===== UTILS
-export const getValidationChildrenCountKey = (nodeParentUuid, nodeDefChildUuid) =>
-  RecordValidations.getValidationChildrenCountKey({ nodeParentUuid, nodeDefChildUuid })
+export const getValidationChildrenCountKey = (nodeParentIId, nodeDefChildUuid) =>
+  RecordValidations.getValidationChildrenCountKey({ nodeParentInternalId: nodeParentIId, nodeDefChildUuid })
 export const isValidationFieldKeyChildrenCount = R.startsWith(prefixValidationFieldChildrenCount)
 export const isValidationResultErrorCount = (validationResult) =>
   ValidationResult.getKey(validationResult).startsWith('record.nodes.count.')
@@ -30,11 +31,11 @@ export const newValidationRecordDuplicate = ({
 
 // ===== READ
 
-export const getValidationChildrenCount = (nodeParentUuid, nodeDefChildUuid) =>
-  RecordValidations.getValidationChildrenCount({ nodeParentUuid, nodeDefChildUuid })
+export const getValidationChildrenCount = (nodeParentIId, nodeDefChildUuid) =>
+  RecordValidations.getValidationChildrenCount({ nodeParentInternalId: nodeParentIId, nodeDefChildUuid })
 
-export const getNodeValidation = (node) => RecordValidations.getValidationNode({ nodeUuid: node?.uuid })
+export const getNodeValidation = (node) => RecordValidations.getValidationNode({ nodeInternalId: Node.getIId(node) })
 
 // ===== UPDATE
-export const setValidationCount = (nodeParentUuid, nodeDefChildUuid, validationCount) =>
-  Validation.setField(getValidationChildrenCountKey(nodeParentUuid, nodeDefChildUuid), validationCount)
+export const setValidationCount = (nodeParentIId, nodeDefChildUuid, validationCount) =>
+  Validation.setField(getValidationChildrenCountKey(nodeParentIId, nodeDefChildUuid), validationCount)
diff --git a/core/record/recordValidationReportItem.js b/core/record/recordValidationReportItem.js
index 9afc744f04..dd34b8d39b 100644
--- a/core/record/recordValidationReportItem.js
+++ b/core/record/recordValidationReportItem.js
@@ -13,7 +13,7 @@ const keys = {
   recordOwnerUuid: 'recordOwnerUuid',
   recordStep: 'recordStep',
   recordUuid: 'recordUuid',
-  nodeUuid: 'nodeUuid',
+  nodeIId: 'nodeIId',
   nodeDefUuid: 'nodeDefUuid',
   keysHierarchy: 'keysHierarchy',
   keysSelf: 'keysSelf',
@@ -28,7 +28,7 @@ export const getRecordDateModified = R.prop(keys.recordDateModified)
 export const getRecordOwnerName = R.prop(keys.recordOwnerName)
 export const getRecordOwnerUuid = R.prop(keys.recordOwnerUuid)
 export const getRecordUuid = R.prop(keys.recordUuid)
-const getNodeUuid = R.prop(keys.nodeUuid)
+const getNodeIId = R.prop(keys.nodeIId)
 const getNodeDefUuid = R.prop(keys.nodeDefUuid)
 const getValidationCountChildDefUuid = R.prop(keys.validationCountChildDefUuid)
 const getKeysSelf = R.propOr({}, keys.keysSelf)
@@ -64,14 +64,14 @@ export const getPath =
     return NodeKeys.getKeysHierarchyPath({ survey, lang, includeRootKeys: true, labelType })(keys)
   }
 
-export const getNodeContextUuid = R.ifElse(
+export const getNodeContextIId = R.ifElse(
   isValidationCount,
-  getNodeUuid, // Node has a validation count, the context will be the node itself (an entity)
+  getNodeIId, // Node has a validation count, the context will be the node itself (an entity)
   R.pipe(
     // Node is an attribute, the context node will be its parent entity (it's the last item of the hierarchy)
     R.prop(keys.keysHierarchy),
     R.last,
-    R.prop(NodeKeys.keys.nodeUuid)
+    R.prop(NodeKeys.keys.nodeIId)
   )
 )
 
diff --git a/package.json b/package.json
index ce10a9a7a4..915f5dafe8 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,8 @@
     "@mui/x-data-grid": "^8.26.0",
     "@mui/x-date-pickers": "^8.26.0",
     "@mui/x-tree-view": "^8.26.0",
-    "@openforis/arena-server": "^1.2.19",
+    "@openforis/arena-core": "../arena-core",
+    "@openforis/arena-server": "../arena-server",
     "@reduxjs/toolkit": "^2.11.2",
     "@sendgrid/mail": "^8.1.6",
     "@shopify/draggable": "^1.2.1",
diff --git a/server/modules/activityLog/repository/activityLogRepository.js b/server/modules/activityLog/repository/activityLogRepository.js
index 264a0f14ce..3eebdd3fc7 100644
--- a/server/modules/activityLog/repository/activityLogRepository.js
+++ b/server/modules/activityLog/repository/activityLogRepository.js
@@ -216,7 +216,7 @@ export const fetch = async ({
     LEFT OUTER JOIN
       ${NodeKeysHierarchyView.getNameWithSchema(surveyId)} n_h
     ON
-      l.content_uuid = n_h.${NodeKeysHierarchyView.columns.nodeUuid}
+      l.content_uuid = n_h.${NodeKeysHierarchyView.columns.nodeIId}
     `
         : ''
     }
diff --git a/server/modules/analysis/service/rChain/PersistResultsJob.js b/server/modules/analysis/service/rChain/PersistResultsJob.js
index 60a258adc8..992849d98f 100644
--- a/server/modules/analysis/service/rChain/PersistResultsJob.js
+++ b/server/modules/analysis/service/rChain/PersistResultsJob.js
@@ -76,9 +76,9 @@ export default class PersistResultsJob extends FlatDataImportJob {
       await this.setStatusFailed()
       return
     }
-    const { record_uuid: recordUuid, parent_uuid: entityUuid } = row
+    const { record_uuid: recordUuid, p_i_id: entityIId } = row
     const record = await this.recordsProvider.getOrFetch(recordUuid)
-    const entity = Record.getNodeByUuid(entityUuid)(record)
+    const entity = Record.getNodeByInternalId(entityIId)(record)
     const { nodes: nodesUpdated, record: recordUpdated } = await Record.updateAttributesInEntityWithValues({
       survey,
       entity,
diff --git a/server/modules/analysis/service/rChain/rFile/system/dfResults.js b/server/modules/analysis/service/rChain/rFile/system/dfResults.js
index 386ef282e5..2a10b94890 100644
--- a/server/modules/analysis/service/rChain/rFile/system/dfResults.js
+++ b/server/modules/analysis/service/rChain/rFile/system/dfResults.js
@@ -73,19 +73,19 @@ export default class DfResults {
     const columnNodeDef = NodeDef.isVirtual(this.entity)
       ? Survey.getNodeDefParent(this.entity)(this.survey)
       : this.entity
-    const setUuids = [
+    const setIdentifiers = [
       { name: NodeDef.keysPropsAdvanced.chainUuid, value: quote(this.rChain.chainUuid) },
       {
         name: TableNode.columnSet.recordUuid,
         value: dfVar(this.dfSourceName, ViewDataNodeDef.columnSet.recordUuid),
       },
       {
-        name: TableNode.columnSet.parentUuid,
+        name: TableNode.columnSet.parentIId,
         value: dfVar(this.dfSourceName, ColumnNodeDef.getColumnName(columnNodeDef)),
       },
     ].map((uuidMapping) => setVar(dfVar(this.name, uuidMapping.name), uuidMapping.value))
 
-    this.scripts.push(...setUuids)
+    this.scripts.push(...setIdentifiers)
   }
 
   initCodeAttributes() {
diff --git a/server/modules/collectImport/service/collectImport/dataImportJobs/collectAttributeValueExtractor.js b/server/modules/collectImport/service/collectImport/dataImportJobs/collectAttributeValueExtractor.js
index 8b5bd78068..40c67f5c25 100644
--- a/server/modules/collectImport/service/collectImport/dataImportJobs/collectAttributeValueExtractor.js
+++ b/server/modules/collectImport/service/collectImport/dataImportJobs/collectAttributeValueExtractor.js
@@ -126,7 +126,7 @@ const extractFileValueAndMeta = (survey, node, collectSurveyFileZip, collectNode
       size: fileSize,
       content,
       recordUuid: Node.getRecordUuid(node),
-      nodeUuid: Node.getUuid(node),
+      nodeIId: Node.getIId(node),
     })
     await FileManager.insertFile(Survey.getId(survey), file, tx)
 
diff --git a/server/modules/collectImport/service/collectImport/dataImportJobs/recordsImportJob.js b/server/modules/collectImport/service/collectImport/dataImportJobs/recordsImportJob.js
index 68c6ff6607..126e93b665 100644
--- a/server/modules/collectImport/service/collectImport/dataImportJobs/recordsImportJob.js
+++ b/server/modules/collectImport/service/collectImport/dataImportJobs/recordsImportJob.js
@@ -169,7 +169,6 @@ export default class RecordsImportJob extends Job {
   async traverseCollectRecordAndInsertNodes({ survey, record, collectRecordJson, nodeDefNamesByPath }) {
     const { collectSurveyFileZip, collectSurvey } = this.context
 
-    const recordUuid = Record.getUuid(record)
     let recordUpdated = { ...record }
 
     const collectRootEntityName = CollectRecord.getRootEntityName(collectRecordJson)
@@ -202,7 +201,7 @@ export default class RecordsImportJob extends Job {
             continue
           }
 
-          let nodeToInsert = Node.newNode(nodeDefUuid, recordUuid, nodeParent)
+          let nodeToInsert = Node.newNode({ record: recordUpdated, nodeDefUuid, parentNode: nodeParent })
 
           const valueAndMeta = NodeDef.isAttribute(nodeDef)
             ? await CollectAttributeValueExtractor.extractAttributeValueAndMeta({
diff --git a/server/modules/dataImport/service/DataImportJob/DataImportBaseJob.js b/server/modules/dataImport/service/DataImportJob/DataImportBaseJob.js
index 79e61919d8..f28b99836d 100644
--- a/server/modules/dataImport/service/DataImportJob/DataImportBaseJob.js
+++ b/server/modules/dataImport/service/DataImportJob/DataImportBaseJob.js
@@ -73,7 +73,7 @@ export default class DataImportBaseJob extends Job {
       }
     }
     await RecordManager.assocRefDataToNodes({ survey, nodes: nodesArray }, tx)
-    const { record: recordUpdated, rdbUpdates } = RecordManager.generateRdbUpates({ survey, record, nodesArray }, tx)
+    const { record: recordUpdated, rdbUpdates } = RecordManager.generateRdbUpdates({ survey, record, nodesArray }, tx)
     await this.rdbUpdatesBatchPersister.addItem(rdbUpdates)
 
     this.currentRecord = recordUpdated
@@ -117,7 +117,6 @@ export default class DataImportBaseJob extends Job {
 
   /**
    * Updates the record modified date using the max modified date of the nodes.
-   *
    * @param {!object} record - The record object.
    * @returns {object} - The modified record.
    */
diff --git a/server/modules/dataImport/service/DataImportJob/EntitiesDeleteJob.js b/server/modules/dataImport/service/DataImportJob/EntitiesDeleteJob.js
index ed4c85fa00..ed50e0d7b5 100644
--- a/server/modules/dataImport/service/DataImportJob/EntitiesDeleteJob.js
+++ b/server/modules/dataImport/service/DataImportJob/EntitiesDeleteJob.js
@@ -34,23 +34,23 @@ export default class EntitiesDeleteJob extends DataImportBaseJob {
     const recordUuid = Record.getUuid(currentRecord)
     const sideEffect = !includeFiles
     const nodes = Record.getNodesByDefUuid(nodeDefUuid)(currentRecord)
-    const nodeUuidsToDelete = nodes.reduce((acc, node) => {
-      const nodeUuid = Node.getUuid(node)
-      if (!entityUuidTouchedByRecordUuid[recordUuid]?.[nodeUuid]) {
-        acc.push(nodeUuid)
+    const nodeIIdsToDelete = nodes.reduce((acc, node) => {
+      const nodeIId = Node.getIId(node)
+      if (!entityUuidTouchedByRecordUuid[recordUuid]?.[nodeIId]) {
+        acc.push(nodeIId)
       }
       return acc
     }, [])
-    if (nodeUuidsToDelete.length === 0) return null
+    if (nodeIIdsToDelete.length === 0) return null
 
     const updateResult = await Record.deleteNodes({
       user,
       survey,
       record: currentRecord,
-      nodeUuids: nodeUuidsToDelete,
+      nodeInternalIds: nodeIIdsToDelete,
       sideEffect,
     })
-    this.entitiesDeleted += nodeUuidsToDelete.length
+    this.entitiesDeleted += nodeIIdsToDelete.length
 
     const { nodes: nodesUpdated } = updateResult
 
diff --git a/server/modules/dataImport/service/DataImportJob/FlatDataImportJob.js b/server/modules/dataImport/service/DataImportJob/FlatDataImportJob.js
index 4a769a1085..f566b25278 100644
--- a/server/modules/dataImport/service/DataImportJob/FlatDataImportJob.js
+++ b/server/modules/dataImport/service/DataImportJob/FlatDataImportJob.js
@@ -38,11 +38,11 @@ export default class FlatDataImportJob extends DataImportBaseJob {
 
     this.dataImportFileReader = null
     this.flatDataReader = null
-    this.entitiesWithMultipleAttributesClearedByUuid = {} // used to clear multiple attribute values only once
+    this.entitiesWithMultipleAttributesClearedByIId = {} // used to clear multiple attribute values only once
     this.updatedFilesByUuid = {}
     this.updatedFilesByName = {}
     this.filesToDeleteByUuid = {}
-    this.entityUuidTouchedByRecordUuid = {}
+    this.entityIIdTouchedByRecordUuid = {}
     this.entitiesCreated = 0
   }
 
@@ -100,7 +100,7 @@ export default class FlatDataImportJob extends DataImportBaseJob {
         dataImportFileReader: this.dataImportFileReader,
         updatedFilesByUuid: this.updatedFilesByUuid,
         filesToDeleteByUuid: this.filesToDeleteByUuid,
-        entityUuidTouchedByRecordUuid: this.entityUuidTouchedByRecordUuid,
+        entityIIdTouchedByRecordUuid: this.entityIIdTouchedByRecordUuid,
       })
     }
   }
@@ -241,9 +241,9 @@ export default class FlatDataImportJob extends DataImportBaseJob {
         sideEffect,
       })(this.currentRecord)
 
-      const entityUuid = Node.getUuid(entity)
+      const entityIId = Node.getIId(entity)
 
-      Objects.setInPath({ obj: this.entityUuidTouchedByRecordUuid, path: [recordUuid, entityUuid], value: true })
+      Objects.setInPath({ obj: this.entityIIdTouchedByRecordUuid, path: [recordUuid, entityIId], value: true })
 
       if (Node.isCreated(entity)) {
         this.entitiesCreated += 1
@@ -294,8 +294,8 @@ export default class FlatDataImportJob extends DataImportBaseJob {
     const multipleAttributeDefsBeingUpdated = Object.keys(valuesByDefUuid)
       .map((nodeDefUuid) => Survey.getNodeDefByUuid(nodeDefUuid)(survey))
       .filter(NodeDef.isMultipleAttribute)
-    const entityUuid = Node.getUuid(entity)
-    if (multipleAttributeDefsBeingUpdated.length > 0 && !this.entitiesWithMultipleAttributesClearedByUuid[entityUuid]) {
+    const entityIId = Node.getIId(entity)
+    if (multipleAttributeDefsBeingUpdated.length > 0 && !this.entitiesWithMultipleAttributesClearedByIId[entityIId]) {
       const nodeDefUuidsToClear = multipleAttributeDefsBeingUpdated.map(NodeDef.getUuid)
       const entityClearUpdateResult = await Record.deleteNodesInEntityByNodeDefUuid({
         survey,
@@ -305,7 +305,7 @@ export default class FlatDataImportJob extends DataImportBaseJob {
       })(this.currentRecord)
 
       this.currentRecord = entityClearUpdateResult.record
-      this.entitiesWithMultipleAttributesClearedByUuid[entityUuid] = true
+      this.entitiesWithMultipleAttributesClearedByIId[entityIId] = true
 
       await this.persistUpdatedNodes({ nodesUpdated: entityClearUpdateResult.nodes })
     }
@@ -318,7 +318,7 @@ export default class FlatDataImportJob extends DataImportBaseJob {
       const nodeDefUuid = Node.getNodeDefUuid(node)
       const nodeDef = Survey.getNodeDefByUuid(nodeDefUuid)(survey)
       if (NodeDef.isFile(nodeDef)) {
-        const oldNode = Record.getNodeByUuid(Node.getUuid(node))(originalRecord)
+        const oldNode = Record.getNodeByInternalId(Node.getIId(node))(originalRecord)
         if (!Node.isValueBlank(oldNode)) {
           const fileToDeleteUuid = Node.getFileUuid(oldNode)
           filesToDeleteByUuid[fileToDeleteUuid] = RecordFile.createFileFromNode({ node: oldNode })
diff --git a/server/modules/mobile/service/arenaMobileDataImport/jobs/recordsImportJob.js b/server/modules/mobile/service/arenaMobileDataImport/jobs/recordsImportJob.js
index 803b4a18f3..a82d82810f 100644
--- a/server/modules/mobile/service/arenaMobileDataImport/jobs/recordsImportJob.js
+++ b/server/modules/mobile/service/arenaMobileDataImport/jobs/recordsImportJob.js
@@ -29,9 +29,9 @@ const checkNodeIsValid = ({ nodes, node, nodeDef }) => {
   if (!nodeDef) {
     return { valid: false, error: 'refers a missing node definition' }
   }
-  const parentUuid = Node.getParentUuid(node)
-  if ((!parentUuid && !NodeDef.isRoot(nodeDef)) || (parentUuid && !nodes[parentUuid])) {
-    return { valid: false, error: `has missing or invalid parent_uuid` }
+  const parentIId = Node.getParentInternalId(node)
+  if ((!parentIId && !NodeDef.isRoot(nodeDef)) || (parentIId && !nodes[parentIId])) {
+    return { valid: false, error: `has missing or invalid parent internal id` }
   }
   if (NodeDef.isMultipleAttribute(nodeDef) && Node.isValueBlank(node)) {
     return { valid: false, error: `is multiple and has an empty value` }
@@ -39,7 +39,7 @@ const checkNodeIsValid = ({ nodes, node, nodeDef }) => {
   const nodeHierarchy = Node.getHierarchy(node)
   if (
     nodeHierarchy.length !== NodeDef.getMetaHierarchy(nodeDef)?.length ||
-    nodeHierarchy.some((ancestorUuid) => !nodes[ancestorUuid])
+    nodeHierarchy.some((ancestorIId) => !nodes[ancestorIId])
   ) {
     return { valid: false, error: `has an invalid meta hierarchy` }
   }
@@ -139,7 +139,7 @@ export default class RecordsImportJob extends DataImportBaseJob {
     delete record['_nodesIndex']
     const nodes = Record.getNodes(record)
 
-    for (const [nodeUuid, node] of Object.entries(nodes)) {
+    for (const [nodeIId, node] of Object.entries(nodes)) {
       const nodeDefUuid = Node.getNodeDefUuid(node)
       const nodeDef = Survey.getNodeDefByUuid(nodeDefUuid)(survey)
       const { valid, error } = checkNodeIsValid({ nodes, node, nodeDef })
@@ -148,10 +148,10 @@ export default class RecordsImportJob extends DataImportBaseJob {
         node[Node.keys.recordUuid] = recordUuid
         Node.removeFlags({ sideEffect: true })(node)
       } else {
-        const messagePrefix = `record ${Record.getUuid(record)}: node with uuid ${Node.getUuid(node)} and node def ${NodeDef.getName(nodeDef)} (uuid ${nodeDefUuid})`
+        const messagePrefix = `record ${Record.getUuid(record)}: node with internal id ${nodeIId} and node def ${NodeDef.getName(nodeDef)} (uuid ${nodeDefUuid})`
         const messageSuffix = `: skipping it`
         this.logWarn(`${messagePrefix} ${error} ${messageSuffix}`)
-        delete nodes[nodeUuid]
+        delete nodes[nodeIId]
       }
     }
     // assoc nodes and build index from scratch
@@ -275,19 +275,19 @@ export default class RecordsImportJob extends DataImportBaseJob {
     const nodesIndexedByUuid = Record.getNodesArray(record)
       .sort((nodeA, nodeB) => Node.getHierarchy(nodeA).length - Node.getHierarchy(nodeB).length)
       .reduce((acc, node) => {
-        const nodeUuid = Node.getUuid(node)
+        const nodeIId = Node.getIId(node)
         const nodeDefUuid = Node.getNodeDefUuid(node)
         // check that the node definition associated to the node has not been deleted from the survey
         const nodeDef = Survey.getNodeDefByUuid(nodeDefUuid)(survey)
         if (nodeDef) {
           node[Node.keys.created] = true // do side effect to avoid creating new objects
-          acc[nodeUuid] = node
+          acc[nodeIId] = node
           if (NodeDef.isFile(nodeDef)) {
             this.trackFileUuid({ node })
           }
         } else {
           this.logDebug(
-            `Record ${recordUuid}: missing node def with uuid ${nodeDefUuid} in node ${nodeUuid}; skipping it`
+            `Record ${recordUuid}: missing node def with uuid ${nodeDefUuid} in node ${nodeIId}; skipping it`
           )
         }
         return acc
diff --git a/server/modules/record/api/recordApi.js b/server/modules/record/api/recordApi.js
index a5dbec10e2..664eeb1c79 100644
--- a/server/modules/record/api/recordApi.js
+++ b/server/modules/record/api/recordApi.js
@@ -37,11 +37,11 @@ import {
   requireRecordsExportPermission,
 } from '../../auth/authApiMiddleware'
 
-const fetchRecordNodeFileAsStream = async ({ surveyId, nodeUuid }) => {
-  const node = await RecordService.fetchNodeByUuid(surveyId, nodeUuid)
+const fetchRecordNodeFileAsStream = async ({ surveyId, recordUuid, nodeIId }) => {
+  const node = await RecordService.fetchNodeByIId(surveyId, recordUuid, nodeIId)
   const fileUuid = Node.getFileUuid(node)
   const file = await FileService.fetchFileSummaryByUuid(surveyId, fileUuid)
-  const fileName = await RecordService.generateNodeFileNameForDownload({ surveyId, nodeUuid, file })
+  const fileName = await RecordService.generateNodeFileNameForDownload({ surveyId, nodeIId, file })
   const contentStream = await FileService.fetchFileContentAsStream({ surveyId, fileUuid })
   return { fileName, file, contentStream }
 }
@@ -280,13 +280,13 @@ export const init = (app) => {
   })
 
   app.get(
-    '/survey/:surveyId/record/:recordUuid/nodes/:nodeUuid/file',
+    '/survey/:surveyId/record/:recordUuid/nodes/:nodeIId/file',
     requireRecordViewPermission,
     async (req, res, next) => {
       try {
-        const { surveyId, nodeUuid } = Request.getParams(req)
+        const { surveyId, recordUuid, nodeIId } = Request.getParams(req)
 
-        const { fileName, file, contentStream } = await fetchRecordNodeFileAsStream({ surveyId, nodeUuid })
+        const { fileName, file, contentStream } = await fetchRecordNodeFileAsStream({ surveyId, recordUuid, nodeIId })
         setContentTypeFile({ res, fileName, fileSize: RecordFile.getSize(file) })
         contentStream.pipe(res)
       } catch (error) {
@@ -296,13 +296,13 @@ export const init = (app) => {
   )
 
   app.get(
-    '/survey/:surveyId/record/:recordUuid/nodes/:nodeUuid/file-exif',
+    '/survey/:surveyId/record/:recordUuid/nodes/:nodeIId/file-exif',
     requireRecordViewPermission,
     async (req, res, next) => {
       let tempFilePath
       try {
-        const { surveyId, nodeUuid } = Request.getParams(req)
-        const { contentStream } = await fetchRecordNodeFileAsStream({ surveyId, nodeUuid })
+        const { surveyId, recordUuid, nodeIId } = Request.getParams(req)
+        const { contentStream } = await fetchRecordNodeFileAsStream({ surveyId, recordUuid, nodeIId })
         ;({ tempFilePath } = await FileUtils.writeStreamToTempFile(contentStream))
         const info = await exifr.parse(tempFilePath)
         res.json(info)
@@ -498,12 +498,12 @@ export const init = (app) => {
     }
   })
 
-  app.delete('/survey/:surveyId/record/:recordUuid/node/:nodeUuid', requireRecordEditPermission, (req, res) => {
-    const { surveyId, cycle, draft, recordUuid, nodeUuid, timezoneOffset } = Request.getParams(req)
+  app.delete('/survey/:surveyId/record/:recordUuid/node/:nodeIId', requireRecordEditPermission, (req, res) => {
+    const { surveyId, cycle, draft, recordUuid, nodeIId, timezoneOffset } = Request.getParams(req)
     const user = Request.getUser(req)
     const socketId = Request.getSocketId(req)
 
-    RecordService.deleteNode({ socketId, user, surveyId, cycle, draft, recordUuid, nodeUuid, timezoneOffset })
+    RecordService.deleteNode({ socketId, user, surveyId, cycle, draft, recordUuid, nodeIId, timezoneOffset })
     sendOk(res)
   })
 }
diff --git a/server/modules/record/manager/NodesDeleteBatchPersister.js b/server/modules/record/manager/NodesDeleteBatchPersister.js
index 18ca453ae4..b01ecfa8b6 100644
--- a/server/modules/record/manager/NodesDeleteBatchPersister.js
+++ b/server/modules/record/manager/NodesDeleteBatchPersister.js
@@ -9,11 +9,12 @@ export class NodesDeleteBatchPersister extends BatchPersister {
   constructor({ user, surveyId, tx }) {
     super(
       async (nodes) =>
-        RecordManager.deleteNodesByUuids(
+        RecordManager.deleteNodesByInternalIds(
           {
             user: this.user,
             surveyId: this.surveyId,
-            nodeUuids: nodes.map(Node.getUuid),
+            recordUuid: Node.getRecordUuid(nodes[0]), // all nodes belong to the same record
+            nodeInternalIds: nodes.map(Node.getIId),
             systemActivity: true,
           },
           this.tx
diff --git a/server/modules/record/manager/_recordManager/nodeCreationManager.js b/server/modules/record/manager/_recordManager/nodeCreationManager.js
index 4811f808e9..138b117bf5 100644
--- a/server/modules/record/manager/_recordManager/nodeCreationManager.js
+++ b/server/modules/record/manager/_recordManager/nodeCreationManager.js
@@ -22,9 +22,9 @@ const _createUpdateResult = ({ record, node = null, nodes = {}, sideEffect = fal
   return {
     record: recordUpdated,
     nodes: {
-      [Node.getUuid(node)]: node,
+      [Node.getIId(node)]: node,
       // Always assoc parentNode, used in surveyRdbManager.updateTableNodes
-      ...(parentNode ? { [Node.getUuid(parentNode)]: parentNode } : {}),
+      ...(parentNode ? { [Node.getIId(parentNode)]: parentNode } : {}),
       ...nodes,
     },
   }
@@ -32,16 +32,15 @@ const _createUpdateResult = ({ record, node = null, nodes = {}, sideEffect = fal
 
 export const insertNodesInBulk = async ({ user, surveyId, nodesArray, systemActivity = false }, tx) => {
   const nodeValues = nodesArray.map((node) => [
-    Node.getUuid(node),
     Node.getDateCreated(node),
     Node.getDateModified(node),
     Node.getRecordUuid(node),
-    Node.getParentUuid(node),
+    Node.getIId(node),
+    Node.getParentInternalId(node),
     Node.getNodeDefUuid(node),
     JSON.stringify(Node.getValue(node, null)),
     Node.getMeta(node),
   ])
-
   await NodeRepository.insertNodesFromValues(surveyId, nodeValues, tx)
 
   const activities = nodesArray.map((node) =>
@@ -86,30 +85,36 @@ export const insertNode = async (
     }
   }
 
-  const nodesCreated = {
-    [Node.getUuid(node)]: node,
+  const nodeIId = Node.getIId(node)
+  const nodesCreatedByIId = {
+    [nodeIId]: node,
   }
   let recordUpdated = record
+  recordUpdated = Record.assocNode(node)(recordUpdated)
+
+  recordUpdated.lastInternalId = recordUpdated.lastInternalId
+    ? Math.max(recordUpdated.lastInternalId, nodeIId)
+    : nodeIId
 
   if (NodeDef.isEntity(nodeDef)) {
     const descendantsCreateResult = await RecordNodesUpdater.createDescendants({
       user,
       survey,
-      record,
+      record: recordUpdated,
       parentNode: node,
       nodeDef,
       timezoneOffset,
       createMultipleEntities,
     })
-    Object.assign(nodesCreated, descendantsCreateResult.nodes)
+    Object.assign(nodesCreatedByIId, descendantsCreateResult.nodes)
     recordUpdated = descendantsCreateResult.record
   }
 
   const nodesInserted = persistNodes
-    ? ObjectUtils.toUuidIndexedObj(
-        await insertNodesInBatch({ user, surveyId, nodes: Object.values(nodesCreated), systemActivity: system }, t)
+    ? ObjectUtils.toIIdIndexedObj(
+        await insertNodesInBatch({ user, surveyId, nodes: Object.values(nodesCreatedByIId), systemActivity: system }, t)
       )
-    : nodesCreated
+    : nodesCreatedByIId
 
   return _createUpdateResult({ record: recordUpdated, node, nodes: nodesInserted, sideEffect })
 }
diff --git a/server/modules/record/manager/_recordManager/nodeRDBManager.js b/server/modules/record/manager/_recordManager/nodeRDBManager.js
index 205656bafc..98a0691258 100644
--- a/server/modules/record/manager/_recordManager/nodeRDBManager.js
+++ b/server/modules/record/manager/_recordManager/nodeRDBManager.js
@@ -5,7 +5,7 @@ import * as DataTableUpdateRepository from '@server/modules/surveyRdb/repository
 
 const { updateTablesFromUpdates } = DataTableUpdateRepository
 
-const generateRdbUpates = ({ survey, record, nodesArray }) => {
+const generateRdbUpdates = ({ survey, record, nodesArray }) => {
   // include ancestor nodes (used to find the correct rdb table to update)
   const nodesAndDependentsAndAncestors = nodesArray.reduce((nodesAcc, node) => {
     Record.visitAncestorsAndSelf({ node, visitor: (n) => (nodesAcc[n.uuid] = n) })(record)
@@ -17,7 +17,7 @@ const generateRdbUpates = ({ survey, record, nodesArray }) => {
     nodes: nodesAndDependentsAndAncestors,
   })
   // Merge updated nodes with existing ones (remove created/updated flags nodes)
-  const nodes = ObjectUtils.toUuidIndexedObj(nodesArray)
+  const nodes = ObjectUtils.toIIdIndexedObj(nodesArray)
   const recordUpdated = Record.mergeNodes(nodes, { removeFlags: true, sideEffect: true })(record)
   return {
     record: recordUpdated,
@@ -26,7 +26,7 @@ const generateRdbUpates = ({ survey, record, nodesArray }) => {
 }
 
 const persistNodesToRDB = async ({ survey, record, nodesArray }, t) => {
-  const { rdbUpdates, record: recordUpdated } = generateRdbUpates({ survey, record, nodesArray })
+  const { rdbUpdates, record: recordUpdated } = generateRdbUpdates({ survey, record, nodesArray })
 
   await updateTablesFromUpdates({ rdbUpdates }, t)
 
@@ -34,7 +34,7 @@ const persistNodesToRDB = async ({ survey, record, nodesArray }, t) => {
 }
 
 export const NodeRdbManager = {
-  generateRdbUpates,
+  generateRdbUpdates,
   persistNodesToRDB,
   updateTablesFromUpdates,
 }
diff --git a/server/modules/record/manager/_recordManager/nodeUpdateManager.js b/server/modules/record/manager/_recordManager/nodeUpdateManager.js
index af87a423b9..bef90b075e 100644
--- a/server/modules/record/manager/_recordManager/nodeUpdateManager.js
+++ b/server/modules/record/manager/_recordManager/nodeUpdateManager.js
@@ -33,9 +33,9 @@ const _createUpdateResult = (record, node = null, nodes = {}) => {
   return {
     record: recordUpdated,
     nodes: {
-      [Node.getUuid(node)]: node,
+      [Node.getIId(node)]: node,
       // Always assoc parentNode, used in surveyRdbManager.updateTableNodes
-      ...(parentNode ? { [Node.getUuid(parentNode)]: parentNode } : {}),
+      ...(parentNode ? { [Node.getIId(parentNode)]: parentNode } : {}),
       ...nodes,
     },
   }
@@ -44,6 +44,7 @@ const _createUpdateResult = (record, node = null, nodes = {}) => {
 const _onNodeUpdate = async (survey, record, node, nodeDependents, t) => {
   // TODO check if it should be removed
   const surveyId = Survey.getId(survey)
+  const recordUuid = Record.getUuid(record)
 
   let updatedNodes = nodeDependents || {}
 
@@ -58,11 +59,12 @@ const _onNodeUpdate = async (survey, record, node, nodeDependents, t) => {
           const nodeDefDependent = Survey.getNodeDefByUuid(Node.getNodeDefUuid(nodeDependent))(survey)
 
           return NodeDef.isMultiple(nodeDefDependent)
-            ? NodeRepository.deleteNode(surveyId, Node.getUuid(nodeDependent), t)
+            ? NodeRepository.deleteNode({ surveyId, recordUuid, nodeIId: Node.getIId(nodeDependent) }, t)
             : NodeRepository.updateNode(
                 {
                   surveyId,
-                  nodeUuid: Node.getUuid(nodeDependent),
+                  recordUuid,
+                  nodeIId: Node.getIId(nodeDependent),
                   meta: Node.getMeta(nodeDependent),
                   draft: Record.isPreview(record),
                 },
@@ -72,7 +74,7 @@ const _onNodeUpdate = async (survey, record, node, nodeDependents, t) => {
       )
       updatedNodes = {
         ...updatedNodes,
-        ...ObjectUtils.toUuidIndexedObj(nodesClearedArray),
+        ...ObjectUtils.toIIdIndexedObj(nodesClearedArray),
       }
     }
   }
@@ -92,9 +94,8 @@ export const updateNode = async ({ user, survey, record, node, system = false, u
     meta[Node.metaKeys.defaultValue] = false
   }
   if (!Record.isPreview(record)) {
-    // Keep only node uuid, recordUuid, meta and value
     const logContent = R.pipe(
-      R.pick([Node.keys.uuid, Node.keys.recordUuid, Node.keys.nodeDefUuid, Node.keys.value]),
+      R.pick([Node.keys.iId, Node.keys.recordUuid, Node.keys.nodeDefUuid, Node.keys.value]),
       R.assoc(Node.keys.meta, meta)
     )(node)
     await ActivityLogRepository.insert(user, surveyId, ActivityLog.type.nodeValueUpdate, logContent, system, t)
@@ -103,7 +104,7 @@ export const updateNode = async ({ user, survey, record, node, system = false, u
   const value = Node.getValue(node)
   if (NodeDef.isFile(nodeDef)) {
     // mark old file as deleted if changed
-    const nodePrev = await NodeRepository.fetchNodeByUuid(surveyId, Node.getUuid(node), t)
+    const nodePrev = await NodeRepository.fetchNodeByIId(surveyId, Node.getRecordUuid(node), Node.getIId(node), t)
     const fileUuidPrev = Node.getFileUuid(nodePrev)
     if (fileUuidPrev !== null && fileUuidPrev !== Node.getFileUuid(node)) {
       await FileRepository.markFileAsDeleted(surveyId, fileUuidPrev, t)
@@ -113,7 +114,8 @@ export const updateNode = async ({ user, survey, record, node, system = false, u
   const nodeUpdated = await NodeRepository.updateNode(
     {
       surveyId,
-      nodeUuid: Node.getUuid(node),
+      recordUuid: Node.getRecordUuid(node),
+      nodeIId: Node.getIId(node),
       value,
       meta,
       draft: Record.isPreview(record),
@@ -131,21 +133,23 @@ export const updateNode = async ({ user, survey, record, node, system = false, u
 }
 
 const _reloadNodes = async ({ surveyId, record, nodes }, tx) => {
+  const recordUuid = Record.getUuid(record)
   const nodesReloadedArray = (
-    await NodeRepository.fetchNodesWithRefDataByUuids(
-      { surveyId, nodeUuids: Object.keys(nodes), draft: Record.isPreview(record) },
+    await NodeRepository.fetchNodesWithRefDataByIIds(
+      { surveyId, recordUuid, nodeIIds: Object.keys(nodes), draft: Record.isPreview(record) },
       tx
     )
   ).map((nodeReloaded) => {
     // preserve status flags (used in rdb updates)
-    const oldNode = nodes[Node.getUuid(nodeReloaded)]
+    // side effect on nodes is possible: update node in place because nodes have been fetched from DB
+    const oldNode = nodes[Node.getIId(nodeReloaded)]
     return R.pipe(
-      Node.assocCreated(Node.isCreated(oldNode)),
-      Node.assocDeleted(Node.isDeleted(oldNode)),
-      Node.assocUpdated(Node.isUpdated(oldNode))
+      Node.setCreated(Node.isCreated(oldNode)),
+      Node.setDeleted(Node.isDeleted(oldNode)),
+      Node.setUpdated(Node.isUpdated(oldNode))
     )(nodeReloaded)
   })
-  return ObjectUtils.toUuidIndexedObj(nodesReloadedArray)
+  return ObjectUtils.toIIdIndexedObj(nodesReloadedArray)
 }
 
 const _groupNodesByFlags = (nodesArray) =>
@@ -163,7 +167,7 @@ const _groupNodesByFlags = (nodesArray) =>
     { nodesInserted: [], nodesUpdated: [], nodesDeleted: [] }
   )
 
-const _persistNodes = async ({ surveyId, nodesArray }, tx) => {
+const _persistNodes = async ({ surveyId, recordUuid, nodesArray }, tx) => {
   const { nodesInserted, nodesUpdated, nodesDeleted } = _groupNodesByFlags(nodesArray)
 
   if (nodesInserted.length) {
@@ -173,7 +177,10 @@ const _persistNodes = async ({ surveyId, nodesArray }, tx) => {
     await NodeRepository.updateNodes({ surveyId, nodes: nodesUpdated }, tx)
   }
   if (nodesDeleted.length) {
-    await NodeRepository.deleteNodesByUuids(surveyId, nodesDeleted.map(Node.getUuid), tx)
+    await NodeRepository.deleteNodesByInternalIds(
+      { surveyId, recordUuid, nodeInternalIds: nodesDeleted.map(Node.getIId) },
+      tx
+    )
   }
 }
 
@@ -199,8 +206,9 @@ export const updateNodesDependents = async (
   if (persistNodes && !R.isEmpty(allNodesUpdated)) {
     const nodesArray = Object.values(allNodesUpdated)
     const surveyId = Survey.getId(survey)
+    const recordUuid = Record.getUuid(record)
 
-    await _persistNodes({ surveyId, nodesArray }, tx)
+    await _persistNodes({ surveyId, recordUuid, nodesArray }, tx)
 
     // reload nodes to get nodes ref data
     const nodesReloaded = await _reloadNodes({ surveyId, record: recordUpdated, nodes: allNodesUpdated }, tx)
@@ -218,7 +226,7 @@ export const updateNodesDependents = async (
 // ==== DELETE
 
 const _getNodeDependentKeyAttributes = (survey, record, node) => {
-  const nodeDependentKeyAttributes = {}
+  const nodeDependentKeyAttributesByIId = {}
   const nodeDef = Survey.getNodeDefByUuid(Node.getNodeDefUuid(node))(survey)
   if (NodeDef.isMultipleEntity(nodeDef)) {
     // Find sibling entities with same key values
@@ -238,25 +246,26 @@ const _getNodeDependentKeyAttributes = (survey, record, node) => {
 
         if (R.equals(nodeKeyValues, nodeDeletedKeyValues)) {
           nodeKeys.forEach((nodeKey) => {
-            nodeDependentKeyAttributes[Node.getUuid(nodeKey)] = nodeKey
+            nodeDependentKeyAttributesByIId[Node.getIId(nodeKey)] = nodeKey
           })
         }
       })
     }
   }
 
-  return nodeDependentKeyAttributes
+  return nodeDependentKeyAttributesByIId
 }
 
-export const deleteNode = async (user, survey, record, nodeUuid, t) => {
+export const deleteNode = async (user, survey, record, nodeIId, t) => {
   const surveyId = Survey.getId(survey)
+  const recordUuid = Record.getUuid(record)
 
-  const node = await NodeRepository.deleteNode(surveyId, nodeUuid, t)
+  const node = await NodeRepository.deleteNode({ surveyId, recordUuid, nodeIId }, t)
 
   if (!Record.isPreview(record)) {
     const logContent = {
-      [ActivityLog.keysContent.uuid]: nodeUuid,
       [ActivityLog.keysContent.recordUuid]: Node.getRecordUuid(node),
+      [ActivityLog.keysContent.nodeIId]: nodeIId,
       [ActivityLog.keysContent.nodeDefUuid]: Node.getNodeDefUuid(node),
       [Node.keys.meta]: {
         [Node.metaKeys.hierarchy]: Node.getHierarchy(node),
@@ -275,11 +284,11 @@ export const deleteNode = async (user, survey, record, nodeUuid, t) => {
 
   // mark deleted dependent attributes
   nodeDependentUniqueAttributes = Object.values(nodeDependentUniqueAttributes).reduce((nodesAcc, nodeDependent) => {
-    const nodeDependentUuid = Node.getUuid(nodeDependent)
-    const deleted = !Record.getNodeByUuid(nodeDependentUuid)(recordUpdated)
+    const nodeDependentIId = Node.getIId(nodeDependent)
+    const deleted = !Record.getNodeByInternalId(nodeDependentIId)(recordUpdated)
     const nodeDependentUpdated =
       Node.isDeleted(nodeDependent) !== deleted ? Node.assocDeleted(deleted)(nodeDependent) : nodeDependent
-    return { ...nodesAcc, [nodeDependentUuid]: nodeDependentUpdated }
+    return { ...nodesAcc, [nodeDependentIId]: nodeDependentUpdated }
   }, {})
 
   return _onNodeUpdate(
@@ -295,18 +304,21 @@ export const deleteNodesByNodeDefUuids = async (user, surveyId, nodeDefUuids, re
   client.tx(async (t) => {
     const nodesDeleted = await NodeRepository.deleteNodesByNodeDefUuids(surveyId, nodeDefUuids, t)
     const activities = nodesDeleted.map((node) =>
-      ActivityLog.newActivity(ActivityLog.type.nodeDelete, { uuid: Node.getUuid(node) }, true)
+      ActivityLog.newActivity(ActivityLog.type.nodeDelete, { iId: Node.getIId(node) }, true)
     )
     await ActivityLogRepository.insertMany(user, surveyId, activities, t)
-    const nodesDeletedByUuid = ObjectUtils.toUuidIndexedObj(nodesDeleted)
-    const recordUpdated = Record.mergeNodes(nodesDeletedByUuid, { sideEffect: true })(record)
+    const nodesDeletedByIId = ObjectUtils.toIIdIndexedObj(nodesDeleted)
+    const recordUpdated = Record.mergeNodes(nodesDeletedByIId, { sideEffect: true })(record)
     return { record: recordUpdated, nodesDeleted }
   })
 
-export const deleteNodesByUuids = async ({ user, surveyId, nodeUuids, systemActivity = false }, tx) => {
-  const nodesDeleted = await NodeRepository.deleteNodesByUuids(surveyId, nodeUuids, tx)
-  const activities = nodeUuids.map((uuid) =>
-    ActivityLog.newActivity(ActivityLog.type.nodeDelete, { uuid }, systemActivity)
+export const deleteNodesByInternalIds = async (
+  { user, surveyId, recordUuid, nodeInternalIds, systemActivity = false },
+  tx
+) => {
+  const nodesDeleted = await NodeRepository.deleteNodesByInternalIds({ surveyId, recordUuid, nodeInternalIds }, tx)
+  const activities = nodeInternalIds.map((iId) =>
+    ActivityLog.newActivity(ActivityLog.type.nodeDelete, { iId }, systemActivity)
   )
   await ActivityLogRepository.insertMany(user, surveyId, activities, tx)
   return nodesDeleted
diff --git a/server/modules/record/manager/_recordManager/recordUniquenessValidator.js b/server/modules/record/manager/_recordManager/recordUniquenessValidator.js
index 5dbeb01c95..ed5660a370 100644
--- a/server/modules/record/manager/_recordManager/recordUniquenessValidator.js
+++ b/server/modules/record/manager/_recordManager/recordUniquenessValidator.js
@@ -12,7 +12,7 @@ import * as DataViewRepository from '@server/modules/surveyRdb/repository/dataVi
 const createNodesRecordUniqueValidation = ({ nodes, unique, errorKey }) => {
   const validationAcc = {}
   for (const node of nodes) {
-    validationAcc[Node.getUuid(node)] = RecordValidation.newValidationRecordDuplicate({ unique, errorKey })
+    validationAcc[Node.getIId(node)] = RecordValidation.newValidationRecordDuplicate({ unique, errorKey })
   }
   return validationAcc
 }
diff --git a/server/modules/record/manager/_recordManager/recordUpdateManager.js b/server/modules/record/manager/_recordManager/recordUpdateManager.js
index e6fedce362..acc09c941b 100644
--- a/server/modules/record/manager/_recordManager/recordUpdateManager.js
+++ b/server/modules/record/manager/_recordManager/recordUpdateManager.js
@@ -48,7 +48,7 @@ export const initNewRecord = async (
 ) => {
   const rootNodeDef = Survey.getNodeDefRoot(survey)
 
-  const rootNode = Node.newNode(NodeDef.getUuid(rootNodeDef), Record.getUuid(record))
+  const rootNode = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(rootNodeDef) })
 
   return persistNode(
     {
@@ -189,9 +189,9 @@ export const persistNode = async (
       node,
       timezoneOffset,
       nodesUpdateFn: async (user, survey, record, node, t) => {
-        const nodeUuid = Node.getUuid(node)
+        const nodeIId = Node.getIId(node)
 
-        const existingNode = Record.getNodeByUuid(nodeUuid)(record)
+        const existingNode = Record.getNodeByInternalId(nodeIId)(record)
 
         if (existingNode) {
           return NodeUpdateManager.updateNode({ user, survey, record, node, system }, t)
@@ -213,7 +213,7 @@ export const deleteNode = async (
   user,
   survey,
   record,
-  nodeUuid,
+  nodeIId,
   timezoneOffset,
   nodesUpdateListener = null,
   nodesValidationListener = null,
@@ -224,17 +224,17 @@ export const deleteNode = async (
       user,
       survey,
       record,
-      node: Record.getNodeByUuid(nodeUuid)(record),
+      node: Record.getNodeByInternalId(nodeIId)(record),
       timezoneOffset,
       nodesUpdateFn: (user, survey, record, node, t) =>
-        NodeUpdateManager.deleteNode(user, survey, record, Node.getUuid(node), t),
+        NodeUpdateManager.deleteNode(user, survey, record, Node.getIId(node), t),
       nodesUpdateListener,
       nodesValidationListener,
     },
     t
   )
 
-export const { deleteNodesByUuids } = NodeUpdateManager
+export const { deleteNodesByInternalIds } = NodeUpdateManager
 
 export const deleteNodesByNodeDefUuids = async ({ user, surveyId, nodeDefUuids, record }, client = db) => {
   const { record: recordUpdated } = await NodeUpdateManager.deleteNodesByNodeDefUuids(
@@ -344,7 +344,7 @@ const _getDependentNodesToValidate = ({ survey, record, nodes }) => {
     record,
     nodePointers: dependentNodePointersToValidate,
   })
-  return { ...nodes, ...ObjectUtils.toUuidIndexedObj(dependentNodesToValidate) }
+  return { ...nodes, ...ObjectUtils.toIIdIndexedObj(dependentNodesToValidate) }
 }
 
 const _onNodesUpdate = async (
@@ -428,7 +428,7 @@ const _afterNodesUpdate = async ({ survey, record, nodes, nodesValidationListene
 const validateNodesAndPersistToRDB = async ({ user, survey, record, nodes, nodesValidationListener = null }, t) => {
   const nodesArray = Object.values(nodes)
   const nodesToValidate = nodesArray.reduce(
-    (nodesAcc, node) => (Node.isDeleted(node) ? nodesAcc : { ...nodesAcc, [Node.getUuid(node)]: node }),
+    (nodesAcc, node) => (Node.isDeleted(node) ? nodesAcc : { ...nodesAcc, [Node.getIId(node)]: node }),
     {}
   )
   const { nodesValidation: validations } = await RecordValidationManager.validateNodesAndPersistValidation(
diff --git a/server/modules/record/manager/_recordManager/recordValidationManager.js b/server/modules/record/manager/_recordManager/recordValidationManager.js
index b8d80235ec..dfef3315ee 100644
--- a/server/modules/record/manager/_recordManager/recordValidationManager.js
+++ b/server/modules/record/manager/_recordManager/recordValidationManager.js
@@ -66,42 +66,42 @@ export const validateSortedNodesAndPersistValidation = async (
     record,
     nodesArray,
   })
-  const nodesValueValidationsByUuid = Validation.getFieldValidations(nodesValueValidation)
+  const nodesValueValidationsByIId = Validation.getFieldValidations(nodesValueValidation)
   // 1.a. workaround: always define value field validation even when validation is valid to allow cleaning up errors later
-  for (const [nodeUuid, nodeValueValidation] of Object.entries(nodesValueValidationsByUuid)) {
+  for (const [nodeIId, nodeValueValidation] of Object.entries(nodesValueValidationsByIId)) {
     if (Validation.isValid(nodeValueValidation)) {
       const nodeValueValidationUpdated = Validation.setField('value', Validation.newInstance())(nodeValueValidation)
-      nodesValueValidationsByUuid[nodeUuid] = nodeValueValidationUpdated
+      nodesValueValidationsByIId[nodeIId] = nodeValueValidationUpdated
     }
   }
 
   // 2. validate record unique nodes
-  const uniqueNodesValidationByNodeUuid =
+  const uniqueNodesValidationByNodeIId =
     validateRecordUniqueness && !Record.isPreview(record) && isRootUniqueNodesUpdated({ survey, nodesArray })
       ? await RecordUniquenessValidator.validateRecordUniqueNodes({ survey, record }, tx)
       : {}
 
   // 3. get previous validation of unique nodes
-  const uniqueNodesUuids = Object.keys(uniqueNodesValidationByNodeUuid)
-  const oldUniqueNodesValidationByNodeUuid = Validation.getFieldValidationsByFields(uniqueNodesUuids)(
+  const uniqueNodesIIds = Object.keys(uniqueNodesValidationByNodeIId)
+  const oldUniqueNodesValidationByNodeIIds = Validation.getFieldValidationsByFields(uniqueNodesIIds)(
     Record.getValidation(record)
   )
 
   // 4. merge unique nodes previous validation with new one
   const uniqueNodesValidationMergedByUuid = Validation.mergeFieldValidations(
-    uniqueNodesValidationByNodeUuid,
-    oldUniqueNodesValidationByNodeUuid
+    uniqueNodesValidationByNodeIId,
+    oldUniqueNodesValidationByNodeIIds
   )
 
   // 5. merge unique nodes validation with nodes values validation
   const uniqueNodesValidationWithValueValidationByUuid = Validation.mergeFieldValidations(
-    nodesValueValidationsByUuid,
+    nodesValueValidationsByIId,
     uniqueNodesValidationMergedByUuid
   )
 
   // 6. generate full validation object
   const fullNodesValidationByUuid = {
-    ...nodesValueValidationsByUuid,
+    ...nodesValueValidationsByIId,
     ...uniqueNodesValidationWithValueValidationByUuid,
   }
   const nodesValidation = Validation.recalculateValidity(Validation.newInstance(true, fullNodesValidationByUuid))
diff --git a/server/modules/record/manager/recordManager.js b/server/modules/record/manager/recordManager.js
index 53eaa29408..0644e94333 100644
--- a/server/modules/record/manager/recordManager.js
+++ b/server/modules/record/manager/recordManager.js
@@ -36,7 +36,7 @@ export { insertRecord, createRecordFromSamplingPointDataItem } from './_recordMa
 export { insertNodesInBatch, insertNodesInBulk } from './_recordManager/nodeCreationManager'
 
 export const { insertNode } = RecordUpdateManager
-export const { generateRdbUpates, persistNodesToRDB } = NodeRdbManager
+export const { generateRdbUpdates, persistNodesToRDB } = NodeRdbManager
 
 // ==== READ
 
@@ -210,11 +210,11 @@ export const fetchRecordAndNodesByUuid = async (
     },
     client
   )
-  const indexedNodes = ObjectUtils.toUuidIndexedObj(nodes)
+  const indexedNodes = ObjectUtils.toIIdIndexedObj(nodes)
   return Record.assocNodes({ nodes: indexedNodes, updateNodesIndex: fetchForUpdate, sideEffect: true })(record)
 }
 
-export { fetchNodeByUuid, fetchChildNodesByNodeDefUuids } from '../repository/nodeRepository'
+export { fetchNodeByIId, fetchChildNodesByNodeDefUuids } from '../repository/nodeRepository'
 
 const fetchNodeRefData = async ({ survey, node, isCode }, client) => {
   const surveyId = Survey.getId(survey)
@@ -302,9 +302,9 @@ export const updateNodes = async ({ user, surveyId, nodes }, client = db) =>
   client.tx(async (t) => {
     const activities = nodes.map((node) => {
       const logContent = R.pick([
-        Node.keys.uuid,
         Node.keys.recordUuid,
-        Node.keys.parentUuid,
+        Node.keys.iId,
+        Node.keys.pIId,
         Node.keys.nodeDefUuid,
         Node.keys.meta,
         Node.keys.value,
@@ -333,7 +333,7 @@ export {
   deleteRecordsByCycles,
   deleteNode,
   deleteNodesByNodeDefUuids,
-  deleteNodesByUuids,
+  deleteNodesByInternalIds,
 } from './_recordManager/recordUpdateManager'
 
 // ==== VALIDATION
diff --git a/server/modules/record/repository/node/index.js b/server/modules/record/repository/node/index.js
deleted file mode 100644
index fb16cb84d9..0000000000
--- a/server/modules/record/repository/node/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { fetchNodes } from './read'
diff --git a/server/modules/record/repository/node/read.js b/server/modules/record/repository/node/read.js
deleted file mode 100644
index 10adbb2c09..0000000000
--- a/server/modules/record/repository/node/read.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import * as pgPromise from 'pg-promise'
-import { TableNode } from '../../../../../common/model/db'
-
-import { db } from '../../../../db/db'
-
-/**
- * Fetches nodes by the given survey id and the optional parameters.
- *
- * @param {!object} params - The query parameters.
- * @param {!object} params.survey - The survey object.
- * @param {string} [params.uuid=null] - The node uuid to filter by.
- * @param {string} [params.recordUuid=null] - The record uuid to filter by.
- * @param {string} [params.parentUuid=null] - The parent node uuid to filter by.
- * @param {string} [params.nodeDefUuid=null] - The node definition uuid to filter by.
- * @param {boolean} [params.draft=false] - Whether to fetch draft props or only published ones.
- * @param {pgPromise.IDatabase} [client=db] - The database client.
- *
- * @returns {Promise<Node[]>} - The result promise.
- */
-export const fetchNodes = async (params, client = db) => {
-  const { survey, uuid, recordUuid, parentUuid, nodeDefUuid, draft } = params
-  const table = new TableNode(survey)
-  return client.map(
-    table.getSelect({ uuid, recordUuid, parentUuid, nodeDefUuid, draft }),
-    [],
-    TableNode.dbTransformCallback
-  )
-}
diff --git a/server/modules/record/repository/nodeKeysRepository.js b/server/modules/record/repository/nodeKeysRepository.js
index bb9203626f..4e9fdca984 100644
--- a/server/modules/record/repository/nodeKeysRepository.js
+++ b/server/modules/record/repository/nodeKeysRepository.js
@@ -4,15 +4,15 @@ import * as SchemaRdb from '@common/surveyRdb/schemaRdb'
 
 import { db } from '@server/db/db'
 
-export const fetchNodesHierarchyKeys = async ({ surveyId, nodeUuids }, client = db) =>
+export const fetchNodesHierarchyKeys = async ({ surveyId, nodeIIds }, client = db) =>
   client.map(
     `
     SELECT *
     FROM 
       ${SchemaRdb.getName(surveyId)}._node_keys_hierarchy h
     WHERE 
-      h.node_uuid IN ($1:csv)
+      h.node_i_id IN ($1:csv)
     `,
-    [nodeUuids],
+    [nodeIIds],
     A.camelizePartial({ limitToLevel: 1 })
   )
diff --git a/server/modules/record/repository/nodeRepository.js b/server/modules/record/repository/nodeRepository.js
index 9eafaf05d6..4e5bc8855d 100644
--- a/server/modules/record/repository/nodeRepository.js
+++ b/server/modules/record/repository/nodeRepository.js
@@ -21,11 +21,11 @@ const { keys: categoryItemKeys } = CategoryItem
 const { keys: taxonKeys } = Taxon
 
 export const tableColumnsInsert = [
-  'uuid',
   'date_created',
   'date_modified',
   'record_uuid',
-  'parent_uuid',
+  'i_id',
+  'p_i_id',
   'node_def_uuid',
   'value',
   'meta',
@@ -55,11 +55,11 @@ const dbTransformCallback = (node) => {
 
 const _toValueQueryParam = (value) => (value === null || A.isEmpty(value) ? null : JSON.stringify(value))
 
-const _getAncestorUuidSelectField = (ancestorDef) => {
+const _getAncestorIIdSelectField = (ancestorDef) => {
   const nodeAncestorEntityHierarchyIndex = ancestorDef ? NodeDef.getMetaHierarchy(ancestorDef).length : null
   return nodeAncestorEntityHierarchyIndex === null
     ? 'null'
-    : `(n.meta -> '${Node.metaKeys.hierarchy}' ->> ${nodeAncestorEntityHierarchyIndex})::uuid`
+    : `(n.meta -> '${Node.metaKeys.hierarchy}' -> ${nodeAncestorEntityHierarchyIndex})::integer`
 }
 
 /**
@@ -100,7 +100,7 @@ export const getNodeSelectQuery = ({
       'r.cycle AS record_cycle',
       'r.step AS record_step',
       'r.owner_uuid AS record_owner_uuid',
-      `${_getAncestorUuidSelectField(ancestorDef)} AS ancestor_uuid`
+      `${_getAncestorIIdSelectField(ancestorDef)} AS ancestor_i_id`
     )
     fromParts.push(`JOIN ${schema}.record r 
       ON r.uuid = n.record_uuid
@@ -176,16 +176,19 @@ export const insertNode = async (surveyId, node, draft, client = db) => {
     [Node.metaKeys.childApplicability]: {},
   }
 
+  const nodeIId = Node.getIId(node)
+  const recordUuid = Node.getRecordUuid(node)
+
   await client.query(
     `
     INSERT INTO ${getSurveyDBSchema(surveyId)}.node
-        (uuid, record_uuid, parent_uuid, node_def_uuid, value, meta)
+        (i_id, record_uuid, p_i_id, node_def_uuid, value, meta)
     VALUES ($1, $2, $3, $4, $5::jsonb, $6::jsonb)
     `,
     [
-      Node.getUuid(node),
-      Node.getRecordUuid(node),
-      Node.getParentUuid(node),
+      nodeIId,
+      recordUuid,
+      Node.getParentInternalId(node),
       Node.getNodeDefUuid(node),
       _toValueQueryParam(Node.getValue(node, null)),
       meta,
@@ -193,7 +196,7 @@ export const insertNode = async (surveyId, node, draft, client = db) => {
   )
 
   // reload node to get node ref data
-  const nodeAdded = await fetchNodeWithRefDataByUuid({ surveyId, nodeUuid: Node.getUuid(node), draft }, client)
+  const nodeAdded = await fetchNodeWithRefDataByIId({ surveyId, recordUuid, nodeIId, draft }, client)
 
   return { ...nodeAdded, [Node.keys.created]: true }
 }
@@ -213,7 +216,8 @@ export const insertNodesInBatch = async ({ surveyId, nodes = [] }, client = db)
       date_created: Dates.formatForStorage(Node.getDateCreated(node)),
       date_modified: Dates.formatForStorage(Node.getDateModified(node)),
       record_uuid: Node.getRecordUuid(node),
-      parent_uuid: Node.getParentUuid(node),
+      i_id: Node.getIId(node),
+      p_i_id: Node.getParentInternalId(node),
       node_def_uuid: Node.getNodeDefUuid(node),
       value: _toValueQueryParam(Node.getValue(node)),
       meta: Node.getMeta(node),
@@ -238,58 +242,58 @@ export const fetchNodesByRecordUuid = async (
     dbTransformCallback
   )
 
-export const fetchNodeByUuid = async (surveyId, uuid, client = db) =>
+export const fetchNodeByIId = async (surveyId, recordUuid, iId, client = db) =>
   client.one(
     `
     SELECT * FROM ${getSurveyDBSchema(surveyId)}.node
-    WHERE uuid = $1`,
-    [uuid],
+    WHERE record_uuid = $/recordUuid/ AND i_id = $/iId/`,
+    { recordUuid, iId },
     dbTransformCallback
   )
 
-export const fetchNodesWithRefDataByUuids = async ({ surveyId, nodeUuids, draft }, client = db) =>
+export const fetchNodesWithRefDataByIIds = async ({ surveyId, recordUuid, nodeIIds, draft }, client = db) =>
   client.map(
     `
     ${getNodeSelectQuery({ surveyId, draft })}
-    WHERE n.uuid IN ($/nodeUuids:list/)
+    WHERE n.record_uuid = $/recordUuid/ AND n.i_id IN ($/nodeIIds:list/)
   `,
-    { surveyId, nodeUuids },
+    { surveyId, recordUuid, nodeIIds },
     dbTransformCallback
   )
 
-export const fetchNodeWithRefDataByUuid = async ({ surveyId, nodeUuid, draft }, client = db) =>
-  (await fetchNodesWithRefDataByUuids({ surveyId, nodeUuids: [nodeUuid], draft }, client))[0]
+export const fetchNodeWithRefDataByIId = async ({ surveyId, recordUuid, nodeIId, draft }, client = db) =>
+  (await fetchNodesWithRefDataByIIds({ surveyId, recordUuid, nodeIIds: [nodeIId], draft }, client))[0]
 
-export const fetchChildNodesByNodeDefUuids = async (surveyId, recordUuid, nodeUuid, childDefUuids, client = db) =>
+export const fetchChildNodesByNodeDefUuids = async (surveyId, recordUuid, nodeIId, childDefUuids, client = db) =>
   client.map(
     `
     ${getNodeSelectQuery({ surveyId, draft: false })}
     WHERE n.record_uuid = $/recordUuid/
-      AND n.parent_uuid ${nodeUuid ? '= $/nodeUuid/' : 'is null'}
+      AND n.p_i_id ${nodeIId ? '= $/nodeIId/' : 'is null'}
       AND n.node_def_uuid IN ($/childDefUuids:csv/)`,
-    { surveyId, recordUuid, nodeUuid, childDefUuids },
+    { surveyId, recordUuid, nodeIId, childDefUuids },
     dbTransformCallback
   )
 
 // ============== UPDATE
 export const updateNode = async (
-  { surveyId, nodeUuid, value = null, meta = {}, draft, reloadNode = true },
+  { surveyId, recordUuid, nodeIId, value = null, meta = {}, draft, reloadNode = true },
   client = db
 ) => {
   await client.query(
     `
     UPDATE ${getSurveyDBSchema(surveyId)}.node
-    SET value = $1::jsonb,
-    meta = meta || $2::jsonb, 
+    SET value = $/value/::jsonb,
+    meta = meta || $/meta/::jsonb, 
     date_modified = ${DbUtils.now}
-    WHERE uuid = $3
+    WHERE record_uuid = $/recordUuid/ AND i_id = $/nodeIId/
     `,
-    [_toValueQueryParam(value), meta || {}, nodeUuid]
+    { value: _toValueQueryParam(value), meta: meta || {}, recordUuid, nodeIId }
   )
   if (!reloadNode) return null
 
   // fetch node with ref data
-  const node = await fetchNodeWithRefDataByUuid({ surveyId, nodeUuid, draft }, client)
+  const node = await fetchNodeWithRefDataByIId({ surveyId, recordUuid, nodeIId, draft }, client)
   node[Node.keys.updated] = true
   return node
 }
@@ -317,14 +321,14 @@ export const updateNodes = async ({ surveyId, nodes }, client = db) => {
 }
 
 // ============== DELETE
-export const deleteNode = async (surveyId, nodeUuid, client = db) =>
+export const deleteNode = async ({ surveyId, recordUuid, nodeIId }, client = db) =>
   client.one(
     `
     DELETE FROM ${getSurveyDBSchema(surveyId)}.node
-    WHERE uuid = $1
+    WHERE record_uuid = $/recordUuid/ AND i_id = $/nodeIId/
     RETURNING *, true as ${Node.keys.deleted}
     `,
-    [nodeUuid],
+    { recordUuid, nodeIId },
     dbTransformCallback
   )
 
@@ -339,11 +343,11 @@ export const deleteNodesByNodeDefUuids = async (surveyId, nodeDefUuids, client =
     dbTransformCallback
   )
 
-export const deleteNodesByUuids = async (surveyId, nodeUuids, client = db) =>
+export const deleteNodesByInternalIds = async ({ surveyId, recordUuid, nodeInternalIds }, client = db) =>
   client.manyOrNone(
     `DELETE FROM ${getSurveyDBSchema(surveyId)}.node
-    WHERE uuid IN ($1:csv)
+    WHERE record_uuid = $/recordUuid/ AND i_id IN ($/nodeInternalIds:csv/)
     RETURNING *, true as ${Node.keys.deleted}`,
-    [nodeUuids],
+    { recordUuid, nodeInternalIds },
     dbTransformCallback
   )
diff --git a/server/modules/record/service/recordService.js b/server/modules/record/service/recordService.js
index c60a3e9903..70e9032d2b 100644
--- a/server/modules/record/service/recordService.js
+++ b/server/modules/record/service/recordService.js
@@ -276,7 +276,7 @@ const _sendNodeUpdateMessage = ({ socketId, user, recordUuid, msg }) => {
   thread.postMessage(msg, user)
 }
 
-export const { fetchNodeByUuid } = RecordManager
+export const { fetchNodeByIId } = RecordManager
 
 export const persistNode = async ({
   socketId,
@@ -302,7 +302,7 @@ export const persistNode = async ({
       size: file.size,
       content: fs.readFileSync(file.tempFilePath),
       recordUuid,
-      nodeUuid: Node.getUuid(node),
+      nodeIId: Node.getIId(node),
     })
     await FileService.insertFile(surveyId, fileObj)
   }
@@ -315,7 +315,7 @@ export const persistNode = async ({
   })
 }
 
-export const deleteNode = ({ socketId, user, surveyId, cycle, draft, recordUuid, nodeUuid, timezoneOffset }) =>
+export const deleteNode = ({ socketId, user, surveyId, cycle, draft, recordUuid, nodeIId, timezoneOffset }) =>
   _sendNodeUpdateMessage({
     socketId,
     user,
@@ -326,15 +326,15 @@ export const deleteNode = ({ socketId, user, surveyId, cycle, draft, recordUuid,
       cycle,
       draft,
       recordUuid,
-      nodeUuid,
+      nodeIId,
       user,
       timezoneOffset,
     },
   })
 
 // generates the record file name in this format: file_SURVEYNAME_KEYVALUES_ATTRIBUTENAME_POSITION.EXTENSION
-export const generateNodeFileNameForDownload = async ({ surveyId, nodeUuid, file }) => {
-  const node = await fetchNodeByUuid(surveyId, nodeUuid)
+export const generateNodeFileNameForDownload = async ({ surveyId, nodeIId, file }) => {
+  const node = await fetchNodeByIId(surveyId, nodeIId)
   const record = await fetchRecordAndNodesByUuid({
     surveyId,
     recordUuid: Node.getRecordUuid(node),
diff --git a/server/modules/record/service/recordsCloneJob.js b/server/modules/record/service/recordsCloneJob.js
index 053958ca40..9c0cb92334 100644
--- a/server/modules/record/service/recordsCloneJob.js
+++ b/server/modules/record/service/recordsCloneJob.js
@@ -85,11 +85,7 @@ export default class RecordsCloneJob extends Job {
     const record = await RecordManager.fetchRecordAndNodesByUuid({ surveyId, recordUuid })
 
     // assign new UUIDs with side effect on record and nodes, faster when record is big
-    const {
-      record: recordCloned,
-      newNodeUuidsByOldUuid,
-      newFileUuidsByOldUuid,
-    } = RecordCloner.cloneRecord({ survey, record, cycleTo })
+    const { record: recordCloned, newFileUuidsByOldUuid } = RecordCloner.cloneRecord({ survey, record, cycleTo })
 
     const newRecordUuid = Record.getUuid(recordCloned)
     const nodes = Record.getNodes(recordCloned)
@@ -110,12 +106,12 @@ export default class RecordsCloneJob extends Job {
     // update RDB
     await DataTableUpdateRepository.updateTables({ survey, record: recordCloned, nodes }, tx)
 
-    await this.cloneFiles({ newFileUuidsByOldUuid, newNodeUuidsByOldUuid, newRecordUuid })
+    await this.cloneFiles({ newFileUuidsByOldUuid, newRecordUuid })
 
     this.incrementProcessedItems()
   }
 
-  async cloneFiles({ newFileUuidsByOldUuid, newNodeUuidsByOldUuid, newRecordUuid }) {
+  async cloneFiles({ newFileUuidsByOldUuid, newRecordUuid }) {
     const { context, tx } = this
     const { surveyId } = context
 
@@ -123,12 +119,10 @@ export default class RecordsCloneJob extends Job {
       const fileSummary = await FileService.fetchFileSummaryByUuid(surveyId, fileUuid, tx)
       if (fileSummary) {
         const content = await FileService.fetchFileContentAsBuffer({ surveyId, fileUuid }, tx)
-        const oldNodeUuid = RecordFile.getNodeUuid(fileSummary)
-        const newNodeUuid = oldNodeUuid ? newNodeUuidsByOldUuid[oldNodeUuid] : null
         const newFile = RecordFile.createFile({
           content,
           name: RecordFile.getName(fileSummary),
-          nodeUuid: newNodeUuid,
+          nodeIId: RecordFile.getNodeIId(fileSummary),
           recordUuid: newRecordUuid,
           size: RecordFile.getSize(fileSummary),
           uuid: newFileUuid,
diff --git a/server/modules/record/service/update/thread/recordsUpdateThread.js b/server/modules/record/service/update/thread/recordsUpdateThread.js
index 534878fff5..70e7e13ac2 100644
--- a/server/modules/record/service/update/thread/recordsUpdateThread.js
+++ b/server/modules/record/service/update/thread/recordsUpdateThread.js
@@ -18,6 +18,12 @@ import { RecordsUpdateThreadMessageTypes } from './recordsThreadMessageTypes'
 
 const Logger = Log.getLogger('RecordsUpdateThread')
 
+const prepareNodeForStorage = ({ record, node }) => {
+  const lastIId = Record.getLastNodeInternalId(record)
+  const nodeIId = Node.getIId(node) ?? lastIId + 1
+  return Node.assocIId(nodeIId)(node)
+}
+
 class RecordsUpdateThread extends Thread {
   constructor(paramsObj) {
     super(paramsObj)
@@ -199,11 +205,13 @@ class RecordsUpdateThread extends Thread {
     const recordUuid = Node.getRecordUuid(node)
     let record = await this.getOrFetchRecord({ msg, recordUuid })
 
+    const nodePreparedForStorage = prepareNodeForStorage({ record, node })
+
     record = await RecordManager.persistNode({
       user,
       survey,
       record,
-      node,
+      node: nodePreparedForStorage,
       timezoneOffset,
       nodesUpdateListener: (updatedNodes) => this.handleNodesUpdated({ record, updatedNodes }),
       nodesValidationListener: (validations) => this.handleNodesValidationUpdated({ record, validations }),
@@ -212,7 +220,7 @@ class RecordsUpdateThread extends Thread {
   }
 
   async processRecordNodeDeleteMsg(msg) {
-    const { nodeUuid, recordUuid, user, timezoneOffset } = msg
+    const { nodeIId, recordUuid, user, timezoneOffset } = msg
 
     const { survey, recordsCache } = await this.getOrFetchSurveyData(msg)
 
@@ -221,7 +229,7 @@ class RecordsUpdateThread extends Thread {
       user,
       survey,
       record,
-      nodeUuid,
+      nodeIId,
       timezoneOffset,
       (updatedNodes) => this.handleNodesUpdated({ record, updatedNodes }),
       (validations) => this.handleNodesValidationUpdated({ record, validations })
@@ -243,7 +251,7 @@ class RecordsUpdateThread extends Thread {
   async processSurveyClearMsg(msg) {
     const { surveyId, cycle } = msg
 
-    let keysToDelete = []
+    const keysToDelete = []
 
     if (!Objects.isNil(cycle)) {
       const key = this.getSurveyDataKey(msg)
diff --git a/server/modules/survey/service/recordCheckJob.js b/server/modules/survey/service/recordCheckJob.js
index 8b3c606b74..6f03a15cb5 100644
--- a/server/modules/survey/service/recordCheckJob.js
+++ b/server/modules/survey/service/recordCheckJob.js
@@ -193,9 +193,9 @@ export default class RecordCheckJob extends Job {
     record = _clearRecordKeysValidation(record)
 
     // 6. validate nodes
-    const newNodes = nodeDefAddedUuids.reduce((nodesByUuid, nodeDefUuid) => {
+    const newNodes = nodeDefAddedUuids.reduce((nodesByIId, nodeDefUuid) => {
       const nodes = Record.getNodesByDefUuid(nodeDefUuid)(record)
-      return Object.assign(nodesByUuid, ObjectUtils.toUuidIndexedObj(nodes))
+      return Object.assign(nodesByIId, ObjectUtils.toIIdIndexedObj(nodes))
     }, {})
 
     Object.assign(allUpdatedNodesByUuid, newNodes)
@@ -271,7 +271,7 @@ const _insertMissingSingleNode = async ({ survey, childDef, record, parentNode,
     return {}
   }
   // insert missing single node
-  const childNode = Node.newNode(NodeDef.getUuid(childDef), Record.getUuid(record), parentNode)
+  const childNode = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(childDef), parentNode })
   return RecordManager.insertNode(
     { user, survey, record, node: childNode, system: true, persistNodes: false, sideEffect },
     tx
@@ -285,7 +285,7 @@ const _applyDefaultValuesAndApplicability = async (survey, nodeDefUpdatedUuids,
   for (const nodeDefUpdatedUuid of nodeDefUpdatedUuids) {
     const nodesToUpdatePartial = Record.getNodesByDefUuid(nodeDefUpdatedUuid)(record)
     for (const nodeUpdated of nodesToUpdatePartial) {
-      nodesToUpdate[Node.getUuid(nodeUpdated)] = nodeUpdated
+      nodesToUpdate[Node.getIId(nodeUpdated)] = nodeUpdated
     }
   }
 
@@ -317,7 +317,7 @@ const _validateNodes = async ({ user, survey, nodeDefUuids, record, nodes }, tx)
     const def = Survey.getNodeDefByUuid(nodeDefUuid)(survey)
     const parentNodes = Record.getNodesByDefUuid(NodeDef.getParentUuid(def))(record)
     for (const parentNode of parentNodes) {
-      nodesToValidate[Node.getUuid(parentNode)] = parentNode
+      nodesToValidate[Node.getIId(parentNode)] = parentNode
     }
   }
   // Record keys uniqueness must be validated after RDB generation
diff --git a/server/modules/surveyRdb/manager/surveyRdbCsvExport.js b/server/modules/surveyRdb/manager/surveyRdbCsvExport.js
index e997f2f123..5b6ae86723 100644
--- a/server/modules/surveyRdb/manager/surveyRdbCsvExport.js
+++ b/server/modules/surveyRdb/manager/surveyRdbCsvExport.js
@@ -71,7 +71,7 @@ const getCsvExportFields = ({
 
   const fields = []
   if (includeInternalUuids) {
-    ArrayUtils.addIfNotEmpty(viewDataNodeDef.columnParentUuidName)(fields)
+    ArrayUtils.addIfNotEmpty(viewDataNodeDef.columnParentInternalId)(fields)
     fields.push(viewDataNodeDef.columnUuidName)
   }
   if (addCycle) {
diff --git a/server/modules/surveyRdb/repository/RdbUpdates.js b/server/modules/surveyRdb/repository/RdbUpdates.js
index c5c81e891a..8e8a26b2c4 100644
--- a/server/modules/surveyRdb/repository/RdbUpdates.js
+++ b/server/modules/surveyRdb/repository/RdbUpdates.js
@@ -39,21 +39,18 @@ export class RdbUpdates {
   }
 
   getAll() {
-    return (
-      Object.entries(this.updatesBySchemaTableAndType)
-        .sort(([keyA, tableUpdatesA], [keyB, tableUpdatesB]) => {
-          // execute updates in order, according to the type (1. delete, 2. insert, 3. update) and hierarchy level
-          const { type: typeA } = RdbUpdates.expandKey(keyA)
-          const { nodeDefHierarchyLevel: nodeDefHierarchyLevelA } = tableUpdatesA
-          const { type: typeB } = RdbUpdates.expandKey(keyB)
-          const { nodeDefHierarchyLevel: nodeDefHierarchyLevelB } = tableUpdatesB
-          return (
-            executionOrderByType[typeA] - executionOrderByType[typeB] || nodeDefHierarchyLevelA - nodeDefHierarchyLevelB
-          )
-        })
-        // eslint-disable-next-line no-unused-vars
-        .flatMap(([_key, updates]) => updates.getAll())
-    )
+    return Object.entries(this.updatesBySchemaTableAndType)
+      .sort(([keyA, tableUpdatesA], [keyB, tableUpdatesB]) => {
+        // execute updates in order, according to the type (1. delete, 2. insert, 3. update) and hierarchy level
+        const { type: typeA } = RdbUpdates.expandKey(keyA)
+        const { nodeDefHierarchyLevel: nodeDefHierarchyLevelA } = tableUpdatesA
+        const { type: typeB } = RdbUpdates.expandKey(keyB)
+        const { nodeDefHierarchyLevel: nodeDefHierarchyLevelB } = tableUpdatesB
+        return (
+          executionOrderByType[typeA] - executionOrderByType[typeB] || nodeDefHierarchyLevelA - nodeDefHierarchyLevelB
+        )
+      })
+      .flatMap(([_key, updates]) => updates.getAll())
   }
 
   merge(updates) {
diff --git a/server/modules/surveyRdb/repository/dataTable/create.js b/server/modules/surveyRdb/repository/dataTable/create.js
index c352e09c3c..a17ab315e2 100644
--- a/server/modules/surveyRdb/repository/dataTable/create.js
+++ b/server/modules/surveyRdb/repository/dataTable/create.js
@@ -5,12 +5,10 @@ import { TableDataNodeDef } from '../../../../../common/model/db'
 
 /**
  * Create a nodeDef data table.
- *
  * @param {object} params - The query parameters.
  * @param {Survey} params.survey - The survey.
  * @param {NodeDef} params.nodeDef - The nodeDef to create the data table for.
  * @param {pgPromise.IDatabase} client - The data base client.
- *
  * @returns {Promise<null|*>} - The result promise.
  */
 export const createDataTable = async ({ survey, nodeDef }, client) => {
@@ -27,7 +25,7 @@ export const createDataTable = async ({ survey, nodeDef }, client) => {
         ${tableDataNodeDef.nameQualified}
       (
         ${tableDataNodeDef.getColumnsWithType().join(', ')},
-        ${tableDataNodeDef.getConstraintUuidUnique()},
+        ${tableDataNodeDef.getConstraintIIdUnique()},
         ${constraintFkParent ? `${constraintFkParent}, ` : ''}
         ${constraintFkRecord ? `${constraintFkRecord}, ` : ''}
         PRIMARY KEY (${TableDataNodeDef.columnSet.id})
diff --git a/server/modules/surveyRdb/repository/dataTableInsertRepository.js b/server/modules/surveyRdb/repository/dataTableInsertRepository.js
index c55dda4d53..5bc2a4540e 100644
--- a/server/modules/surveyRdb/repository/dataTableInsertRepository.js
+++ b/server/modules/surveyRdb/repository/dataTableInsertRepository.js
@@ -10,7 +10,13 @@ import * as NodeRepository from '@server/modules/record/repository/nodeRepositor
 
 const getSelectQuery = ({ surveyId, nodeDef, nodeDefContext, nodeDefAncestorMultipleEntity, nodeDefColumnsUuids }) => {
   const getNodeSelectQuery = (ancestorDef) =>
-    NodeRepository.getNodeSelectQuery({ surveyId, includeRefData: true, includeRecordInfo: true, ancestorDef })
+    NodeRepository.getNodeSelectQuery({
+      surveyId,
+      includeRefData: true,
+      includeRecordUuid: true,
+      includeRecordInfo: true,
+      ancestorDef,
+    })
 
   const nodesSelect = `${getNodeSelectQuery(nodeDefAncestorMultipleEntity)}
     WHERE n.node_def_uuid = $/nodeDefUuid/
@@ -35,9 +41,10 @@ const getSelectQuery = ({ surveyId, nodeDef, nodeDefContext, nodeDefAncestorMult
       LEFT OUTER JOIN
         (
           SELECT
-            c.ancestor_uuid,
+            c.record_uuid,
+            c.ancestor_i_id,
             json_object_agg(c.node_def_uuid::text, json_build_object(
-                '${Node.keys.uuid}', c.uuid,
+                '${Node.keys.iId}', c.i_id,
                 '${Node.keys.nodeDefUuid}', c.node_def_uuid,
                 '${Node.keys.value}', c.value,
                 '${NodeRefData.keys.refData}', c.ref_data
@@ -47,10 +54,11 @@ const getSelectQuery = ({ surveyId, nodeDef, nodeDefContext, nodeDefAncestorMult
             c.value IS NOT NULL
             ${nodeDefColumnsUuids.length > 0 ? 'AND c.node_def_uuid IN ($/nodeDefColumnsUuids:csv/)' : ''} 
           GROUP BY
-            c.ancestor_uuid
+            c.record_uuid, c.ancestor_i_id
         ) c
       ON
-        c.ancestor_uuid = n.uuid`
+        c.record_uuid = n.record_uuid 
+        AND c.ancestor_i_id = n.i_id`
 }
 
 export const populateTable = async ({ survey, nodeDef, stopIfFunction = null }, client) => {
diff --git a/server/modules/surveyRdb/repository/dataTableReadRepository.js b/server/modules/surveyRdb/repository/dataTableReadRepository.js
index ae44848997..3716e80616 100644
--- a/server/modules/surveyRdb/repository/dataTableReadRepository.js
+++ b/server/modules/surveyRdb/repository/dataTableReadRepository.js
@@ -15,7 +15,7 @@ import { db } from '@server/db/db'
  * {
  *   uuid, //record uuid,
  *   validation: {}, //record validation object,
-     node_duplicate_uuids: [nodeUuid1, nodeUuid2, ...] //array of duplicate entity uuids
+     node_duplicate_i_ids: [nodeIId1, nodeIId2, ...] //array of duplicate entity iids
  * }
  * ```.
  * @param {!object} survey - The survey object.
@@ -45,13 +45,16 @@ export const fetchRecordsWithDuplicateEntities = async (survey, cycle, nodeDefEn
   )(nodeDefKeys)
 
   const recordAndParentEqualCondition = NodeDef.isRoot(nodeDefEntity)
-    ? ''
+    ? `AND ${getColEqualCondition(TableDataNodeDef.columnSet.recordUuid)}`
     : `AND ${getColEqualCondition(TableDataNodeDef.columnSet.recordUuid)}
-         AND ${getColEqualCondition(TableDataNodeDef.columnSet.parentUuid)}`
+         AND ${getColEqualCondition(TableDataNodeDef.columnSet.parentInternalId)}`
 
   return await client.any(
     `
-    SELECT r.uuid, r.validation, json_agg(${aliasA}.uuid) as node_duplicate_uuids
+    SELECT 
+      r.uuid, 
+      r.validation, 
+      json_agg(${aliasA}.i_id) as node_duplicate_i_ids
     FROM ${Schemata.getSchemaSurvey(surveyId)}.record r
       JOIN ${tableName} ${aliasA}
         ON r.uuid = ${aliasA}.${TableDataNodeDef.columnSet.recordUuid} 
@@ -59,20 +62,20 @@ export const fetchRecordsWithDuplicateEntities = async (survey, cycle, nodeDefEn
       r.cycle = $1 
       AND EXISTS (
       --exists a node entity with the same key node values in the same record (if not root entity) and in the same parent node entity
-      SELECT ${aliasB}.${TableDataNodeDef.columnSet.uuid}
+      SELECT ${aliasB}.${TableDataNodeDef.columnSet.iId}
       FROM ${tableName} ${aliasB}
       WHERE
         --same cycle
-        ${aliasB}.${TableDataNodeDef.columnSet.recordCycle} = $1
-        --different node uuid 
-        AND ${aliasA}.${TableDataNodeDef.columnSet.uuid} != ${aliasB}.${TableDataNodeDef.columnSet.uuid}
+        ${aliasB}.${TableDataNodeDef.columnSet.recordCycle} = $/cycle/
+        --different node internal ID 
+        AND ${aliasA}.${TableDataNodeDef.columnSet.iId} != ${aliasB}.${TableDataNodeDef.columnSet.iId}
         ${recordAndParentEqualCondition}
         --same key node(s) values
         AND (${equalKeysCondition})
       )
     GROUP BY r.uuid, r.validation
     `,
-    [cycle]
+    { cycle }
   )
 }
 
@@ -80,14 +83,14 @@ export const fetchEntityKeysByRecordAndNodeDefUuid = async (
   survey,
   entityDefUuid,
   recordUuid,
-  nodeUuid = null,
+  nodeIId = null,
   client = db
 ) => {
   const entityDef = Survey.getNodeDefByUuid(entityDefUuid)(survey)
   const tableDef = new TableDataNodeDef(survey, entityDef)
   const entityDefKeys = Survey.getNodeDefKeys(entityDef)(survey)
   const keyColumns = R.pipe(R.map(NodeDefTable.getColumnName), R.join(', '))(entityDefKeys)
-  const nodeUuidWhereCondition = NodeDef.isRoot(entityDef) ? '' : `AND ${tableDef.columnUuid} = $2`
+  const nodeIIdWhereCondition = NodeDef.isRoot(entityDef) ? '' : `AND ${tableDef.columnIId} = $/nodeIId/`
 
   return await client.oneOrNone(
     `
@@ -96,9 +99,9 @@ export const fetchEntityKeysByRecordAndNodeDefUuid = async (
     FROM
       ${tableDef.nameAliased}
     WHERE
-      ${tableDef.columnRecordUuid} = $1
-      ${nodeUuidWhereCondition}`,
-    [recordUuid, nodeUuid],
+      ${tableDef.columnRecordUuid} = $/recordUuid/
+      ${nodeIIdWhereCondition}`,
+    { recordUuid, nodeIId },
     (row) => (row ? Object.values(row) : [])
   )
 }
diff --git a/server/modules/surveyRdb/repository/dataTableUpdateRepository.js b/server/modules/surveyRdb/repository/dataTableUpdateRepository.js
index 580aacae21..9b0cfb565e 100644
--- a/server/modules/surveyRdb/repository/dataTableUpdateRepository.js
+++ b/server/modules/surveyRdb/repository/dataTableUpdateRepository.js
@@ -45,14 +45,14 @@ const _getValuesByColumnName = ({ survey, record, nodeDef, node, ancestorMultipl
   } else {
     const { columnSet } = TableDataNodeDef
     const result = {
-      [columnSet.uuid]: Node.getUuid(node),
-      [columnSet.parentUuid]: Node.getUuid(ancestorMultipleEntity),
+      [columnSet.recordUuid]: Node.getRecordUuid(node),
+      [columnSet.iId]: Node.getIId(node),
+      [columnSet.parentInternalId]: Node.getIId(ancestorMultipleEntity),
       [columnSet.dateCreated]: Node.getDateCreated(node),
       [columnSet.dateModified]: Node.getDateModified(node),
     }
     if (NodeDef.isRoot(nodeDef)) {
       Object.assign(result, {
-        [columnSet.recordUuid]: Node.getRecordUuid(node),
         [columnSet.recordCycle]: Record.getCycle(record),
         [columnSet.recordStep]: Record.getStep(record),
         [columnSet.recordOwnerUuid]: Record.getOwnerUuid(record),
@@ -66,59 +66,62 @@ const _getValuesByColumnName = ({ survey, record, nodeDef, node, ancestorMultipl
 }
 
 const _findAncestor = ({ ancestorDefUuid, node, nodes }) => {
-  let currentParent = nodes[Node.getParentUuid(node)]
+  let currentParent = nodes[Node.getParentInternalId(node)]
   while (currentParent && !Node.isRoot(currentParent) && Node.getNodeDefUuid(currentParent) !== ancestorDefUuid) {
-    currentParent = nodes[Node.getParentUuid(currentParent)]
+    currentParent = nodes[Node.getParentInternalId(currentParent)]
   }
   return currentParent
 }
 
-const _getRowUuid = ({ nodeDef, ancestorMultipleEntity, node }) =>
-  _hasTable(nodeDef) ? Node.getUuid(node) : Node.getUuid(ancestorMultipleEntity)
+const _getUpdateKey = ({ nodeDef, ancestorMultipleEntity, node }) =>
+  _hasTable(nodeDef) ? Node.getIId(node) : Node.getIId(ancestorMultipleEntity)
 
 export const generateRdbUpdates = ({ survey, record, nodes }) => {
   // visit nodes with BFS algorithm to avoid FK constraints violations (sort nodes by hierarchy depth)
   const nodesArray = Object.values(nodes).sort(
     (nodeA, nodeB) => Node.getHierarchy(nodeA).length - Node.getHierarchy(nodeB).length
   )
-  return nodesArray.reduce((updatesAcc, node) => {
+  const updatesAcc = new RdbUpdates()
+  for (const node of nodesArray) {
     const nodeDef = Survey.getNodeDefByUuid(Node.getNodeDefUuid(node))(survey)
     // skip single entities
     if (!NodeDef.isRoot(nodeDef) && NodeDef.isSingleEntity(nodeDef)) {
-      return updatesAcc
+      continue
     }
     const type = _getType(nodeDef, node)
-    if (type) {
-      const ancestorDef = Survey.getNodeDefAncestorMultipleEntity(nodeDef)(survey)
-      const ancestorDefUuid = NodeDef.getUuid(ancestorDef)
-      const ancestorMultipleEntity = _findAncestor({ ancestorDefUuid, node, nodes })
-      const update = {
-        type,
-        schema: Schemata.getSchemaSurveyRdb(Survey.getId(survey)),
-        table: NodeDefTable.getTableName(nodeDef, ancestorDef),
-        nodeDefUuid: NodeDef.getUuid(nodeDef),
-        nodeDefHierarchyLevel: NodeDef.getMetaHierarchy(nodeDef).length,
-        valuesByColumnName: _getValuesByColumnName({ survey, record, nodeDef, node, ancestorMultipleEntity, type }),
-        rowUuid: _getRowUuid({ nodeDef, ancestorMultipleEntity, node }),
-      }
-      updatesAcc.addUpdate(update)
+    if (!type) {
+      continue
     }
-    return updatesAcc
-  }, new RdbUpdates())
+    const ancestorDef = Survey.getNodeDefAncestorMultipleEntity(nodeDef)(survey)
+    const ancestorDefUuid = NodeDef.getUuid(ancestorDef)
+    const ancestorMultipleEntity = _findAncestor({ ancestorDefUuid, node, nodes })
+    const update = {
+      type,
+      schema: Schemata.getSchemaSurveyRdb(Survey.getId(survey)),
+      table: NodeDefTable.getTableName(nodeDef, ancestorDef),
+      recordUuid: Record.getUuid(record),
+      nodeIId: _getUpdateKey({ nodeDef, ancestorMultipleEntity, node }),
+      nodeDefUuid: NodeDef.getUuid(nodeDef),
+      nodeDefHierarchyLevel: NodeDef.getMetaHierarchy(nodeDef).length,
+      valuesByColumnName: _getValuesByColumnName({ survey, record, nodeDef, node, ancestorMultipleEntity, type }),
+    }
+    updatesAcc.addUpdate(update)
+  }
+  return updatesAcc
 }
 
 // ==== execution
 
 const _update = (update, client) => {
-  const { schema, table, valuesByColumnName, rowUuid } = update
+  const { schema, table, valuesByColumnName, recordUuid, nodeIId } = update
   const columnNames = Object.keys(valuesByColumnName)
   const values = Object.values(valuesByColumnName)
   return client.one(
     `UPDATE ${schema}.${table}
-      SET ${columnNames.map((col, i) => `${col} = $${i + 2}`).join(',')}
-      WHERE uuid = $1
-      RETURNING uuid`,
-    [rowUuid, ...values]
+      SET ${columnNames.map((col, i) => `${col} = $${i + 3}`).join(',')}
+      WHERE record_uuid = $1 AND i_id = $2
+      RETURNING record_uuid, i_id`,
+    [recordUuid, nodeIId, ...values]
   )
 }
 
@@ -131,18 +134,18 @@ const _insert = (update, client) => {
       (${columnNames.join(',')})
       VALUES 
       (${columnNames.map((_col, i) => `$${i + 1}`).join(',')})
-      RETURNING uuid`,
+      RETURNING record_uuid, i_id`,
     values
   )
 }
 
 const _delete = (update, client) => {
-  const { schema, table, rowUuid } = update
+  const { schema, table, recordUuid, nodeIId } = update
   return client.oneOrNone(
     `DELETE FROM ${schema}.${table} 
-    WHERE uuid = $1
-    RETURNING uuid`,
-    rowUuid
+    WHERE record_uuid = $1 AND i_id = $2
+    RETURNING record_uuid, i_id`,
+    [recordUuid, nodeIId]
   )
 }
 
diff --git a/server/modules/surveyRdb/repository/dataView/create.js b/server/modules/surveyRdb/repository/dataView/create.js
index ac91672b2b..4fb91e6451 100644
--- a/server/modules/surveyRdb/repository/dataView/create.js
+++ b/server/modules/surveyRdb/repository/dataView/create.js
@@ -19,7 +19,7 @@ const _getSelectFieldNodeDefs = (viewDataNodeDef) =>
     const isMultipleAttribute = NodeDef.isMultipleAttribute(nodeDef)
     if (NodeDef.isEqual(nodeDef)(viewNodeDef)) {
       if (!isMultipleAttribute) {
-        return [`${tableData.columnUuid} AS ${colName}`]
+        return [`${tableData.columnIId} AS ${colName}`]
       }
     } else if (isMultipleAttribute && NodeDef.isDescendantOf(viewNodeDef)(nodeDef)) {
       if (canJoinWithMultipleAttributeTable({ nodeDef, viewNodeDef })) {
@@ -50,12 +50,13 @@ const _getJoinWithMultipleAttributeTable = ({ viewDataNodeDef, multAttrColumnNod
   return `LEFT JOIN 
   (
     SELECT 
-      ${multAttrDataTable.columnParentUuid}, 
+      ${multAttrDataTable.columnParentInternalId}, 
       ${columnNames.map((colName) => `json_agg(${multAttrDataTable.alias}.${colName}) AS ${colName}`).join(', ')}
     FROM ${multAttrDataTable.nameAliased}
-    GROUP BY ${multAttrDataTable.columnParentUuid}
+    GROUP BY ${multAttrDataTable.columnParentInternalId}
   ) AS ${multAttrDataTable.alias}
-  ON ${multAttrDataTable.columnParentUuid} = ${tableData.columnUuid}`
+  ON ${multAttrDataTable.columnRecordUuid} = ${tableData.columnRecordUuid} 
+    AND ${multAttrDataTable.columnParentInternalId} = ${tableData.columnIId}`
 }
 
 const _getJoinsWithMultipleAttributeDataTables = (viewDataNodeDef) => {
@@ -72,12 +73,10 @@ const _getJoinsWithMultipleAttributeDataTables = (viewDataNodeDef) => {
 
 /**
  * Create a nodeDef data view.
- *
  * @param {object} params - The query parameters.
  * @param {Survey} params.survey - The survey.
  * @param {NodeDef} params.nodeDef - The nodeDef to create the data view for.
  * @param {pgPromise.IDatabase} client - The data base client.
- *
  * @returns {Promise<null|*>} - The result promise.
  */
 export const createDataView = async ({ survey, nodeDef }, client) => {
@@ -110,7 +109,8 @@ export const createDataView = async ({ survey, nodeDef }, client) => {
 
   const joinWithParentView = viewDataParent
     ? `LEFT JOIN ${viewDataParent.nameAliased}  
-            ON ${viewDataParent.columnUuid} = ${tableData.columnParentUuid}`
+        ON ${viewDataParent.columnRecordUuid} = ${tableData.columnRecordUuid} 
+          AND ${viewDataParent.columnIId} = ${tableData.columnParentIId}`
     : ''
 
   const query = `
diff --git a/server/modules/surveyRdb/repository/dataView/read.js b/server/modules/surveyRdb/repository/dataView/read.js
index 62bd0099c5..7c8ef787be 100644
--- a/server/modules/surveyRdb/repository/dataView/read.js
+++ b/server/modules/surveyRdb/repository/dataView/read.js
@@ -103,8 +103,8 @@ const _prepareSelectFields = ({
       viewDataNodeDef.columnUuid,
       // selected node def columns
       ...nodeDefCols.flatMap(_selectFieldsByNodeDefType({ viewDataNodeDef, streamMode })),
-      // Add ancestor uuid columns
-      ...viewDataNodeDef.columnUuids
+      // Add ancestor internal IDs columns
+      ...viewDataNodeDef.columnIIdsNamesFull
     )
     if (includeDateCreated) {
       queryBuilder.select(viewDataNodeDef.columnDateCreated)
diff --git a/server/modules/surveyRdb/repository/nodeHierarchyDisaggregatedViewRepository.js b/server/modules/surveyRdb/repository/nodeHierarchyDisaggregatedViewRepository.js
index 337fe684cf..3e6fac8b12 100644
--- a/server/modules/surveyRdb/repository/nodeHierarchyDisaggregatedViewRepository.js
+++ b/server/modules/surveyRdb/repository/nodeHierarchyDisaggregatedViewRepository.js
@@ -27,28 +27,28 @@ export const createNodeHierarchyDisaggregatedView = async (survey, client = db)
           (
             SELECT
               n.id                                         AS ${columns.nodeId},
-              n.uuid                                       AS ${columns.nodeUuid},
+              n.i_id                                       AS ${columns.nodeIId},
               n.node_def_uuid                              AS ${columns.nodeDefUuid},
-              jsonb_array_elements_text(n.meta->'h')::uuid AS ${columns.nodeAncestorUuid}
+              jsonb_array_elements_text(n.meta->'h')::integer AS ${columns.nodeAncestorIId}
             FROM
               ${surveySchema}.node n
            ) h
         ON
-          n.uuid = h.${columns.nodeAncestorUuid}
+          n.i_id = h.${columns.nodeAncestorIId}
         -- Union with root nodes  
         UNION ALL
         SELECT
           n.record_uuid     AS ${columns.recordUuid},
           n.id              AS ${columns.nodeId},
-          n.uuid            AS ${columns.nodeUuid},
+          n.i_id            AS ${columns.nodeIId},
           n.node_def_uuid   AS ${columns.nodeDefUuid},
-          NULL              AS ${columns.nodeAncestorUuid},
+          NULL              AS ${columns.nodeAncestorIId},
           NULL              AS ${columns.nodeAncestorId},
           NULL              AS ${columns.nodeDefAncestorUuid}
         FROM
           ${surveySchema}.node n
         WHERE
-          n.parent_uuid IS NULL
+          n.p_i_id IS NULL
         ORDER BY
           ${columns.nodeAncestorId},
           ${columns.nodeId}
diff --git a/server/modules/surveyRdb/repository/nodeKeysHierarchyViewRepository.js b/server/modules/surveyRdb/repository/nodeKeysHierarchyViewRepository.js
index 41b4daef28..b9300d54d7 100644
--- a/server/modules/surveyRdb/repository/nodeKeysHierarchyViewRepository.js
+++ b/server/modules/surveyRdb/repository/nodeKeysHierarchyViewRepository.js
@@ -16,14 +16,14 @@ export const createNodeKeysHierarchyView = async (survey, client = db) => {
     CREATE VIEW ${NodeKeysHierarchyView.getNameWithSchema(surveyId)} AS (
       SELECT
         h.${NodeHierarchyDisaggregatedView.columns.nodeId} AS ${NodeKeysHierarchyView.columns.nodeId},
-        h.${NodeHierarchyDisaggregatedView.columns.nodeUuid} AS ${NodeKeysHierarchyView.columns.nodeUuid},
+        h.${NodeHierarchyDisaggregatedView.columns.nodeIId} AS ${NodeKeysHierarchyView.columns.nodeIId},
         h.${NodeHierarchyDisaggregatedView.columns.nodeDefUuid} AS ${NodeKeysHierarchyView.columns.nodeDefUuid},
         h.${NodeHierarchyDisaggregatedView.columns.recordUuid} AS ${NodeKeysHierarchyView.columns.recordUuid},
         k_s.${NodeKeysView.columns.keys} AS ${NodeKeysHierarchyView.columns.keysSelf},
         jsonb_agg(
           jsonb_build_object(
             '${NodeKeys.keys.nodeDefUuid}', h.${NodeHierarchyDisaggregatedView.columns.nodeDefAncestorUuid}, 
-            '${NodeKeys.keys.nodeUuid}', h.${NodeHierarchyDisaggregatedView.columns.nodeAncestorUuid}, 
+            '${NodeKeys.keys.nodeIId}', h.${NodeHierarchyDisaggregatedView.columns.nodeAncestorIId}, 
             '${NodeKeys.keys.nodeId}', h.${NodeHierarchyDisaggregatedView.columns.nodeAncestorId}, 
             '${NodeKeys.keys.recordUuid}', h.${NodeHierarchyDisaggregatedView.columns.recordUuid}, 
             '${NodeKeys.keys.keys}', k_h.${NodeKeysView.columns.keys} 
@@ -36,12 +36,12 @@ export const createNodeKeysHierarchyView = async (survey, client = db) => {
       LEFT OUTER JOIN
         ${NodeKeysView.getNameWithSchema(surveyId)} k_h
       ON
-        k_h.${NodeKeysView.columns.nodeUuid} = h.${NodeHierarchyDisaggregatedView.columns.nodeAncestorUuid}
+        k_h.${NodeKeysView.columns.nodeIId} = h.${NodeHierarchyDisaggregatedView.columns.nodeAncestorIId}
         -- Join to get keys for itself if it's an entity
       LEFT OUTER JOIN
         ${NodeKeysView.getNameWithSchema(surveyId)} k_s
       ON
-        k_s.${NodeKeysView.columns.nodeUuid} = h.${NodeHierarchyDisaggregatedView.columns.nodeUuid}
+        k_s.${NodeKeysView.columns.nodeIId} = h.${NodeHierarchyDisaggregatedView.columns.nodeIId}
       GROUP BY
         1,2,3,4,5
     )`)
diff --git a/server/modules/surveyRdb/repository/nodeKeysViewRepository.js b/server/modules/surveyRdb/repository/nodeKeysViewRepository.js
index 35e946c4a9..92bb70bf69 100644
--- a/server/modules/surveyRdb/repository/nodeKeysViewRepository.js
+++ b/server/modules/surveyRdb/repository/nodeKeysViewRepository.js
@@ -21,9 +21,8 @@ export const createNodeKeysView = async (survey, client = db) => {
     selectViews.push(`
         SELECT 
             ${viewDataNodeDef.columnIdName} AS ${NodeKeysView.columns.nodeId},
-            ${viewDataNodeDef.columnNodeDefUuid.name} AS ${NodeKeysView.columns.nodeUuid},
-            '${NodeDef.getUuid(nodeDef)}' AS ${NodeKeysView.columns.nodeDefUuid},
             ${ViewDataNodeDef.columnSet.recordUuid} AS ${NodeKeysView.columns.recordUuid},
+            ${viewDataNodeDef.columnNodeDefIIdName} AS ${NodeKeysView.columns.nodeIId},
             ${RDBDataView.columns.keys} AS ${NodeKeysView.columns.keys}
         FROM
             ${RDBDataView.getNameWithSchema(surveyId)(nodeDef)}  
diff --git a/server/modules/surveyRdb/repository/resultNode/massiveUpdateData.js b/server/modules/surveyRdb/repository/resultNode/massiveUpdateData.js
index 00e72c64a0..6b1aa78a33 100644
--- a/server/modules/surveyRdb/repository/resultNode/massiveUpdateData.js
+++ b/server/modules/surveyRdb/repository/resultNode/massiveUpdateData.js
@@ -70,8 +70,8 @@ export default class MassiveUpdateData extends MassiveUpdate {
       },
       {
         [TableDataNodeDef.columnSet.recordUuid]: rowResult[TableDataNodeDef.columnSet.recordUuid],
-        // in this table the coloumn uuid is the parent_uuid of the result
-        [TableDataNodeDef.columnSet.uuid]: rowResult[TableDataNodeDef.columnSet.parentUuid],
+        // in this table the coloumn iId is the parentInternalId of the result
+        [TableDataNodeDef.columnSet.iId]: rowResult[TableDataNodeDef.columnSet.parentInternalId],
       }
     )
 
diff --git a/server/modules/surveyRdb/repository/resultNode/massiveUpdateNodes.js b/server/modules/surveyRdb/repository/resultNode/massiveUpdateNodes.js
index 097ce4b93f..14880ccde8 100644
--- a/server/modules/surveyRdb/repository/resultNode/massiveUpdateNodes.js
+++ b/server/modules/surveyRdb/repository/resultNode/massiveUpdateNodes.js
@@ -34,13 +34,14 @@ export default class MassiveUpdateNodes extends MassiveUpdate {
       includeExtendedCols: true,
     })
 
+    const colSet = TableNode.columnSet
+
     // Adding '?' in front of a column name means it is only for a WHERE condition in this case the record_uuid
     const cols = [
-      `?${TableNode.columnSet.recordUuid}`,
-      `?${TableNode.columnSet.nodeDefUuid}`,
-      `?${TableNode.columnSet.parentUuid}`,
-
-      new Column({ name: TableNode.columnSet.value, cast: 'jsonb' }),
+      `?${colSet.recordUuid}`,
+      `?${colSet.nodeDefUuid}`,
+      `?${colSet.parentIId}`,
+      new Column({ name: colSet.value, cast: 'jsonb' }),
     ]
 
     const tableNode = new TableNode(survey)
@@ -51,9 +52,9 @@ export default class MassiveUpdateNodes extends MassiveUpdate {
         table: tableNode.name,
         cols,
         where: ` WHERE 
-        t.${TableNode.columnSet.recordUuid}::uuid = v.${TableNode.columnSet.recordUuid}::uuid 
-        AND t.${TableNode.columnSet.nodeDefUuid}::uuid = v.${TableNode.columnSet.nodeDefUuid}::uuid
-        AND t.${TableNode.columnSet.parentUuid}::uuid = v.${TableNode.columnSet.parentUuid}::uuid `,
+        t.${colSet.recordUuid}::uuid = v.${colSet.recordUuid}::uuid 
+        AND t.${colSet.nodeDefUuid}::uuid = v.${colSet.nodeDefUuid}::uuid
+        AND t.${colSet.parentIId} = v.${colSet.parentIId} `,
       },
       tx
     )
@@ -68,10 +69,10 @@ export default class MassiveUpdateNodes extends MassiveUpdate {
       const value = extractValueFromRowResult({ rowResult, nodeDef, columnName })
 
       const values = {
-        [TableNode.columnSet.parentUuid]: rowResult[TableNode.columnSet.parentUuid],
-        [TableNode.columnSet.recordUuid]: rowResult[TableNode.columnSet.recordUuid],
-        [TableNode.columnSet.nodeDefUuid]: NodeDef.getUuid(nodeDef),
-        [TableNode.columnSet.value]: value,
+        [colSet.parentIId]: rowResult[colSet.parentIId],
+        [colSet.recordUuid]: rowResult[colSet.recordUuid],
+        [colSet.nodeDefUuid]: NodeDef.getUuid(nodeDef),
+        [colSet.value]: value,
       }
 
       super.push(values)
diff --git a/server/modules/surveyRdb/schemaRdb/nodeHierarchyDisaggregatedView.js b/server/modules/surveyRdb/schemaRdb/nodeHierarchyDisaggregatedView.js
index 465daa2269..952fb861b9 100644
--- a/server/modules/surveyRdb/schemaRdb/nodeHierarchyDisaggregatedView.js
+++ b/server/modules/surveyRdb/schemaRdb/nodeHierarchyDisaggregatedView.js
@@ -2,10 +2,10 @@ import * as SchemaRdb from '@common/surveyRdb/schemaRdb'
 
 export const columns = {
   nodeId: 'node_id',
-  nodeUuid: 'node_uuid',
+  nodeIId: 'node_i_id',
   nodeDefUuid: 'node_def_uuid',
   nodeAncestorId: 'node_ancestor_id',
-  nodeAncestorUuid: 'node_ancestor_uuid',
+  nodeAncestorIId: 'node_ancestor_i_id',
   nodeDefAncestorUuid: 'node_def_ancestor_uuid',
   recordUuid: 'record_uuid',
 }
diff --git a/server/modules/surveyRdb/schemaRdb/nodeKeysHierarchyView.js b/server/modules/surveyRdb/schemaRdb/nodeKeysHierarchyView.js
index 809afc5ec0..3c27c80519 100644
--- a/server/modules/surveyRdb/schemaRdb/nodeKeysHierarchyView.js
+++ b/server/modules/surveyRdb/schemaRdb/nodeKeysHierarchyView.js
@@ -1,8 +1,8 @@
 import * as SchemaRdb from '@common/surveyRdb/schemaRdb'
 
 export const columns = {
-  nodeUuid: 'node_uuid',
   nodeId: 'node_id',
+  nodeIId: 'node_i_id',
   nodeDefUuid: 'node_def_uuid',
   keysHierarchy: 'keys_hierarchy',
   keysSelf: 'keys_self',
diff --git a/server/modules/surveyRdb/schemaRdb/nodeKeysView.js b/server/modules/surveyRdb/schemaRdb/nodeKeysView.js
index 6001b56efa..3866181e0e 100644
--- a/server/modules/surveyRdb/schemaRdb/nodeKeysView.js
+++ b/server/modules/surveyRdb/schemaRdb/nodeKeysView.js
@@ -2,7 +2,7 @@ import * as SchemaRdb from '@common/surveyRdb/schemaRdb'
 
 export const columns = {
   nodeId: 'node_id',
-  nodeUuid: 'node_uuid',
+  nodeIId: 'node_i_id',
   nodeDefUuid: 'node_def_uuid',
   recordUuid: 'record_uuid',
   keys: 'keys',
diff --git a/server/modules/surveyRdb/service/surveyRdbCreationJob/recordsUniquenessValidationJob.js b/server/modules/surveyRdb/service/surveyRdbCreationJob/recordsUniquenessValidationJob.js
index 92ef221bb1..5edeb5872e 100644
--- a/server/modules/surveyRdb/service/surveyRdbCreationJob/recordsUniquenessValidationJob.js
+++ b/server/modules/surveyRdb/service/surveyRdbCreationJob/recordsUniquenessValidationJob.js
@@ -14,14 +14,14 @@ import * as SurveyRdbManager from '@server/modules/surveyRdb/manager/surveyRdbMa
 
 const recordValidationUpdateBatchSize = 1000
 
-const _updateNodeValidation = (validationRecord, nodeUuid, validationNode) => {
-  const validationNodeOld = Validation.getFieldValidation(nodeUuid)(validationRecord)
+const _updateNodeValidation = (validationRecord, nodeIId, validationNode) => {
+  const validationNodeOld = Validation.getFieldValidation(nodeIId)(validationRecord)
 
   // Merge new validation with node validation
   const nodeValidationUpdated = R.mergeDeepRight(validationNodeOld, validationNode)
 
   // Replace node validation in record validation
-  return R.pipe(Validation.setValid(false), Validation.setField(nodeUuid, nodeValidationUpdated))(validationRecord)
+  return R.pipe(Validation.setValid(false), Validation.setField(nodeIId, nodeValidationUpdated))(validationRecord)
 }
 
 export default class RecordsUniquenessValidationJob extends Job {
@@ -74,12 +74,12 @@ export default class RecordsUniquenessValidationJob extends Job {
         }
 
         // 2. for each duplicate node entity, update record validation
-        const { uuid: recordUuid, validation, node_duplicate_uuids: nodeDuplicateUuids } = rowRecordDuplicate
-        const nodeRootUuid = nodeDuplicateUuids[0]
+        const { uuid: recordUuid, validation, node_duplicate_iids: nodeDuplicateIIds } = rowRecordDuplicate
+        const nodeRootIId = nodeDuplicateIIds[0]
         const nodesKeyDuplicate = await RecordManager.fetchChildNodesByNodeDefUuids(
           this.surveyId,
           recordUuid,
-          nodeRootUuid,
+          nodeRootIId,
           nodeDefKeys.map(NodeDef.getUuid),
           this.tx
         )
@@ -88,7 +88,7 @@ export default class RecordsUniquenessValidationJob extends Job {
         const validationRecordUpdated = R.pipe(
           R.reduce(
             (validationRecordAccumulator, nodeKeyDuplicate) =>
-              _updateNodeValidation(validationRecordAccumulator, Node.getUuid(nodeKeyDuplicate), validationDuplicate),
+              _updateNodeValidation(validationRecordAccumulator, Node.getIId(nodeKeyDuplicate), validationDuplicate),
             validationRecord
           ),
           Validation.updateCounts
diff --git a/test/e2e/tests/_surveyExport/records.js b/test/e2e/tests/_surveyExport/records.js
index 2d544d51e3..1f95b8b818 100644
--- a/test/e2e/tests/_surveyExport/records.js
+++ b/test/e2e/tests/_surveyExport/records.js
@@ -1,4 +1,4 @@
-import * as PromiseUtils from '../../../../core/promiseUtils'
+import * as Node from '../../../../core/record/node'
 import { ExportFile } from '../../../../server/modules/survey/service/surveyExport/exportFile'
 import { getSurveyEntry } from '../../paths'
 import { records } from '../../mock/records'
@@ -6,7 +6,6 @@ import { cluster, tree } from '../../mock/nodeDefs'
 import { formatTime } from '../_record'
 import { getNodeDefByName } from './_surveyUtils'
 
-// eslint-disable-next-line camelcase
 const { tree_id } = tree.children
 
 const getNodesByDefUuid = (nodeDefUuid) => (record) =>
@@ -72,31 +71,30 @@ const verifyRecord = async (survey, surveyExport, recordsMock, recordUuid) => {
   await expect(recordExport.step).toBe('1')
   await expect(recordExport.cycle).toBe('0')
 
-  await PromiseUtils.each(Object.entries(record), async ([name, value]) => {
+  for (const [name, value] of Object.entries(record)) {
     if (name === 'trees') {
       // const treeDefExport = getNodeDefByName(tree.name)(surveyExport)
       const treeIdDefExport = getNodeDefByName(tree_id.name)(surveyExport)
       const treeIdsExport = getNodesByDefUuid(treeIdDefExport.uuid)(recordExport)
-      await PromiseUtils.each(value, async (treeNode) => {
+      for (const treeNode of value) {
         const treeId = treeNode[tree_id.name]
         const treeIdExport = treeIdsExport.find((_nodeExport) => _nodeExport.value === treeId)
         await verifyNode(treeIdDefExport, treeIdExport, treeId)
-        // const treeExport = recordExport.nodes[treeIdExport.parentUuid]
 
-        await PromiseUtils.each(Object.entries(treeNode), async ([treeChildName, treeChildValue]) => {
+        for (const [treeChildName, treeChildValue] of Object.entries(treeNode)) {
           const nodeDefExport = getNodeDefByName(treeChildName)(surveyExport)
           const nodeExport = getNodesByDefUuid(nodeDefExport.uuid)(recordExport).find(
-            (_node) => _node.parentUuid === treeIdExport.parentUuid
+            (_node) => Node.getParentInternalId(_node) === Node.getParentInternalId(treeIdExport)
           )
           await verifyNode(nodeDefExport, nodeExport, treeChildValue)
-        })
-      })
+        }
+      }
     } else {
       const nodeDefExport = getNodeDefByName(name)(surveyExport)
       const nodeExport = getNodeByDefUuid(nodeDefExport.uuid)(recordExport)
       await verifyNode(nodeDefExport, nodeExport, value)
     }
-  })
+  }
 }
 
 export const verifyRecords = (survey, recordsMock = records) =>
@@ -106,7 +104,7 @@ export const verifyRecords = (survey, recordsMock = records) =>
 
     await expect(recordsExport.length).toBe(recordsMock.length)
 
-    await PromiseUtils.each(recordsExport, async (recordExport) =>
+    for (const recordExport of recordsExport) {
       verifyRecord(survey, surveyExport, recordsMock, recordExport.uuid)
-    )
+    }
   })
diff --git a/test/integration/tests/004applicableUpdatetest.js b/test/integration/tests/004applicableUpdatetest.js
index 278e901299..210f6ee64a 100644
--- a/test/integration/tests/004applicableUpdatetest.js
+++ b/test/integration/tests/004applicableUpdatetest.js
@@ -56,7 +56,7 @@ describe('Applicable Test', () => {
     const nodeSource = RecordUtils.findNodeByPath('cluster/num')(survey, record)
     const nodeDependent = RecordUtils.findNodeByPath('cluster/dependent_node')(survey, record)
     const nodeDependentParent = Record.getParentNode(nodeDependent)(record)
-    const nodeDependentParentUuid = Node.getUuid(nodeDependentParent)
+    const nodeDependentParentIId = Node.getIId(nodeDependentParent)
     const nodeDependentDefUuid = Node.getNodeDefUuid(nodeDependent)
 
     // Test values, couples of expected values by input
@@ -73,7 +73,7 @@ describe('Applicable Test', () => {
 
       // Update source node value
       const nodesUpdated = {
-        [Node.getUuid(nodeSource)]: Node.assocValue(sourceValue)(nodeSource),
+        [Node.getIId(nodeSource)]: Node.assocValue(sourceValue)(nodeSource),
       }
 
       global.applicableRecord = Record.mergeNodes(nodesUpdated)(record)
@@ -86,7 +86,7 @@ describe('Applicable Test', () => {
       })
       global.applicableRecord = recordUpdate
 
-      const nodeDependentParentUpdated = Record.getNodeByUuid(nodeDependentParentUuid)(record)
+      const nodeDependentParentUpdated = Record.getNodeByInternalId(nodeDependentParentIId)(record)
 
       const applicable = Node.isChildApplicable(nodeDependentDefUuid)(nodeDependentParentUpdated)
 
diff --git a/test/integration/tests/005calculatedValueUpdatetest.js b/test/integration/tests/005calculatedValueUpdatetest.js
index bf5203db40..a7c9480b45 100644
--- a/test/integration/tests/005calculatedValueUpdatetest.js
+++ b/test/integration/tests/005calculatedValueUpdatetest.js
@@ -26,7 +26,7 @@ const updateNodeAndExpectDependentNodeValueToBe = async (
   const nodeSource = RecordUtils.findNodeByPath(sourcePath)(survey, record)
 
   const nodesUpdated = {
-    [Node.getUuid(nodeSource)]: Node.assocValue(sourceValue)(nodeSource),
+    [Node.getIId(nodeSource)]: Node.assocValue(sourceValue)(nodeSource),
   }
   global.applicableRecord = Record.mergeNodes(nodesUpdated)(record)
 
@@ -34,10 +34,10 @@ const updateNodeAndExpectDependentNodeValueToBe = async (
   const { record: recordUpdate } = await RecordManager.updateNodesDependents({ survey, record, nodes: nodesUpdated })
   global.applicableRecord = recordUpdate
 
-  const nodeDependent = RecordUtils.findNodeByPath(dependentPath)(survey, record)
+  const nodeDependent = RecordUtils.findNodeByPath(dependentPath)(survey, recordUpdate)
 
   expect(Node.getValue(nodeDependent)).toBe(dependentExpectedValue)
-  return record
+  return recordUpdate
 }
 
 describe('Calculated value test', () => {
diff --git a/test/integration/tests/008recordValidationtest.js b/test/integration/tests/008recordValidationtest.js
index ed1540a8a2..95ccb5bbfa 100644
--- a/test/integration/tests/008recordValidationtest.js
+++ b/test/integration/tests/008recordValidationtest.js
@@ -31,7 +31,7 @@ const _deleteNode = async (parentNode, childNodeName, childNodePosition) => {
   const childDef = Survey.getNodeDefByName(childNodeName)(survey)
   const children = Record.getNodeChildrenByDefUuid(parentNode, NodeDef.getUuid(childDef))(record)
   const node = children[childNodePosition - 1]
-  global.applicableRecord = await RecordManager.deleteNode(getContextUser(), survey, record, Node.getUuid(node))
+  global.applicableRecord = await RecordManager.deleteNode(getContextUser(), survey, record, Node.getIId(node))
 }
 
 const _updateNodeAndExpectValidationToBe = async (nodePath, value, validationExpected) => {
@@ -40,7 +40,7 @@ const _updateNodeAndExpectValidationToBe = async (nodePath, value, validationExp
 
   await _persistNode(Node.assocValue(value)(node))
 
-  const nodeValidation = Validation.getFieldValidation(Node.getUuid(node))(Record.getValidation(record))
+  const nodeValidation = Validation.getFieldValidation(Node.getIId(node))(Record.getValidation(record))
 
   expect(Validation.isValid(nodeValidation)).toBe(validationExpected)
 }
@@ -62,7 +62,7 @@ const _addNodeAndExpectCountToBe = async (parentNodePath, childNodeName, expecte
   const parentNode = RecordUtils.findNodeByPath(parentNodePath)(survey, record)
   const childDef = Survey.getNodeDefByName(childNodeName)(survey)
 
-  const node = Node.newNode(NodeDef.getUuid(childDef), Record.getUuid(record), parentNode)
+  const node = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(childDef), parentNode })
 
   await _persistNode(node)
 
@@ -76,7 +76,7 @@ const _addNodeWithDuplicateKeyAndExpect2ValidationErrors = async () => {
   // Add a new plot
   const nodeRoot = Record.getRootNode(record)
   const nodeDefPlot = Survey.getNodeDefByName('plot')(survey)
-  const nodePlot = Node.newNode(NodeDef.getUuid(nodeDefPlot), Record.getUuid(record), nodeRoot)
+  const nodePlot = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(nodeDefPlot), parentNode: nodeRoot })
   await _persistNode(nodePlot)
 
   // Update new plot num with a duplicate value
@@ -84,15 +84,15 @@ const _addNodeWithDuplicateKeyAndExpect2ValidationErrors = async () => {
   const value = 2 // Duplicate value
   await _persistNode(Node.assocValue(value)(nodePlotNum))
 
+  const recordValidation = Record.getValidation(record)
   // Expect validation to be invalid
-  const nodePlotNumValidation = Validation.getFieldValidation(Node.getUuid(nodePlotNum))(Record.getValidation(record))
+  const nodePlotNumValidation = Validation.getFieldValidation(Node.getIId(nodePlotNum))(recordValidation)
   expect(Validation.isValid(nodePlotNumValidation)).toBe(false)
 
   // Expect duplicate node validation to be invalid
   const nodePlotNumDuplicate = RecordUtils.findNodeByPath('cluster/plot[2]/plot_num')(survey, record)
-  const nodePlotNumDuplicateValidation = Validation.getFieldValidation(Node.getUuid(nodePlotNumDuplicate))(
-    Record.getValidation(record)
-  )
+  const nodePlotNumDuplicateIId = Node.getIId(nodePlotNumDuplicate)
+  const nodePlotNumDuplicateValidation = Validation.getFieldValidation(nodePlotNumDuplicateIId)(recordValidation)
   expect(Validation.isValid(nodePlotNumDuplicateValidation)).toBe(false)
 }
 
@@ -102,10 +102,10 @@ const _removeNodeWithDuplicateKeyAndExpectDuplicateNodeKeyToBeValid = async () =
 
   await _deleteNode(Record.getRootNode(record), 'plot', 4)
 
+  const recordValidation = Record.getValidation(record)
   const nodePlotNumDuplicate = RecordUtils.findNodeByPath('cluster/plot[2]/plot_num')(survey, record)
-  const nodePlotNumDuplicateValidation = Validation.getFieldValidation(Node.getUuid(nodePlotNumDuplicate))(
-    Record.getValidation(record)
-  )
+  const nodePlotNumDuplicateIId = Node.getIId(nodePlotNumDuplicate)
+  const nodePlotNumDuplicateValidation = Validation.getFieldValidation(nodePlotNumDuplicateIId)(recordValidation)
   expect(Validation.isValid(nodePlotNumDuplicateValidation)).toBe(true)
 }
 
@@ -255,7 +255,7 @@ describe('Record Validation Test', () => {
     const nodeDefChild = Survey.getNodeDefByName('tree')(survey)
     const validationCount = R.pipe(
       Record.getValidation,
-      RecordValidation.getValidationChildrenCount(Node.getUuid(nodeParent), NodeDef.getUuid(nodeDefChild))
+      RecordValidation.getValidationChildrenCount(Node.getIId(nodeParent), NodeDef.getUuid(nodeDefChild))
     )(record)
     expect(Validation.isValid(validationCount)).toBe(false) // Min count = 1
 
@@ -265,12 +265,12 @@ describe('Record Validation Test', () => {
       [
         Validation.keys.validation,
         Validation.keys.fields,
-        RecordValidation.getValidationChildrenCountKey(Node.getUuid(nodeParent), NodeDef.getUuid(nodeDefChild)),
+        RecordValidation.getValidationChildrenCountKey(Node.getIId(nodeParent), NodeDef.getUuid(nodeDefChild)),
       ],
       record
     )
     // Children count validation should be deleted
-    /* eslint-disable no-unused-expressions */
+
     expect(validationCountUpdated).toBeUndefined()
   })
 
diff --git a/test/utils/recordBuilder.js b/test/utils/recordBuilder.js
index 8a4be0e7f8..506028930c 100644
--- a/test/utils/recordBuilder.js
+++ b/test/utils/recordBuilder.js
@@ -23,17 +23,18 @@ class EntityBuilder extends NodeBuilder {
     this.childBuilders = childBuilders
   }
 
-  build(survey, parentNodeDef, recordUuid, parentNode) {
+  build(survey, parentNodeDef, record, parentNode) {
     const nodeDef = parentNodeDef
       ? Survey.getNodeDefChildByName(parentNodeDef, this.nodeDefName)(survey)
       : Survey.getNodeDefRoot(survey)
 
-    const entity = Node.newNode(NodeDef.getUuid(nodeDef), recordUuid, parentNode)
+    const entity = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(nodeDef), parentNode })
+    record.lastNodeInternalId = Node.getIId(entity)
 
     return R.pipe(
-      R.map((childBuilder) => childBuilder.build(survey, nodeDef, recordUuid, entity)),
+      R.map((childBuilder) => childBuilder.build(survey, nodeDef, record, entity)),
       R.mergeAll,
-      R.assoc(Node.getUuid(entity), entity)
+      R.assoc(Node.getIId(entity), entity)
     )(this.childBuilders)
   }
 
@@ -46,7 +47,8 @@ class EntityBuilder extends NodeBuilder {
     } else if (NodeDef.isSingle(nodeDef)) {
       node = R.head(Record.getNodeChildrenByDefUuid(parentNode, NodeDef.getUuid(nodeDef))(record))
     } else {
-      node = Node.newNode(NodeDef.getUuid(nodeDef), Record.getUuid(record), parentNode)
+      node = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(nodeDef), parentNode })
+      record.lastNodeInternalId = Node.getIId(node)
       record = await RecordManager.persistNode({ user, survey, record, node, system: true }, t)
     }
 
@@ -64,12 +66,12 @@ class AttributeBuilder extends NodeBuilder {
     this.value = value
   }
 
-  build(survey, parentNodeDef, recordUuid, parentNode) {
+  build(survey, _parentNodeDef, record, parentNode) {
     const nodeDef = Survey.getNodeDefByName(this.nodeDefName)(survey)
-    const attribute = Node.newNode(NodeDef.getUuid(nodeDef), recordUuid, parentNode, this.value)
-
+    const attribute = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(nodeDef), parentNode, value: this.value })
+    record.lastNodeInternalId = Node.getIId(attribute)
     return {
-      [Node.getUuid(attribute)]: attribute,
+      [Node.getIId(attribute)]: attribute,
     }
   }
 
@@ -84,10 +86,13 @@ class AttributeBuilder extends NodeBuilder {
       ? R.head(Record.getNodeChildrenByDefUuid(parentNode, NodeDef.getUuid(nodeDef))(record))
       : null
 
-    const nodeToPersist = nodeInRecord
-      ? Node.assocValue(this.value)(nodeInRecord)
-      : Node.newNode(NodeDef.getUuid(nodeDef), Record.getUuid(record), parentNode, this.value)
-
+    let nodeToPersist
+    if (nodeInRecord) {
+      nodeToPersist = Node.assocValue(this.value)(nodeInRecord)
+    } else {
+      nodeToPersist = Node.newNode({ record, nodeDefUuid: NodeDef.getUuid(nodeDef), parentNode, value: this.value })
+      record.lastNodeInternalId = Node.getIId(nodeToPersist)
+    }
     return await RecordManager.persistNode({ user, survey, record, node: nodeToPersist, system: true }, t)
   }
 }
@@ -101,7 +106,7 @@ class RecordBuilder {
 
   build() {
     const record = RecordUtils.newRecord(this.user)
-    const nodes = this.rootEntityBuilder.build(this.survey, null, Record.getUuid(record), null)
+    const nodes = this.rootEntityBuilder.build(this.survey, null, record, null)
     return Record.assocNodes({ nodes })(record)
   }
 
diff --git a/test/utils/recordUtils.js b/test/utils/recordUtils.js
index 1f6003f4cd..ff3e38d3c8 100644
--- a/test/utils/recordUtils.js
+++ b/test/utils/recordUtils.js
@@ -29,7 +29,7 @@ export const getNodePath = (node) => (survey, record) => {
 
     if (NodeDef.isMultiple(nodeDef)) {
       const siblings = Record.getNodeChildrenByDefUuid(parentNode, nodeDefUuid)(record)
-      const index = R.findIndex((n) => Node.getUuid(n) === Node.getUuid(node), siblings)
+      const index = R.findIndex((n) => Node.getIId(n) === Node.getIId(node), siblings)
       return `${parentNodePath}/${NodeDef.getName(nodeDef)}[${index}]`
     }
 
@@ -86,5 +86,5 @@ export const findNodeValueByPath = (path) => (survey, record) => Node.getValue(f
 export const getValidationChildrenCount = (parentNode, childDef) =>
   R.pipe(
     Validation.getValidation,
-    RecordValidation.getValidationChildrenCount(Node.getUuid(parentNode), NodeDef.getUuid(childDef))
+    RecordValidation.getValidationChildrenCount(Node.getIId(parentNode), NodeDef.getUuid(childDef))
   )
diff --git a/webapp/components/DataQuery/DataQuery.js b/webapp/components/DataQuery/DataQuery.js
index e35860f69e..fcfce52529 100644
--- a/webapp/components/DataQuery/DataQuery.js
+++ b/webapp/components/DataQuery/DataQuery.js
@@ -97,7 +97,7 @@ const DataQuery = () => {
         <RecordEditModal
           onRequestClose={() => dispatch(DataExplorerActions.closeRecordEditModal())}
           recordUuid={recordEditModalProps.recordUuid}
-          parentNodeUuid={recordEditModalProps.parentNodeUuid}
+          parentNodeIId={recordEditModalProps.parentNodeIId}
         />
       )}
     </div>
diff --git a/webapp/components/DataQuery/Visualizer/DataQueryChart/DataQueryScatterChart/DataQueryScatterChart.js b/webapp/components/DataQuery/Visualizer/DataQueryChart/DataQueryScatterChart/DataQueryScatterChart.js
index 65a9df83c5..158c3a142d 100644
--- a/webapp/components/DataQuery/Visualizer/DataQueryChart/DataQueryScatterChart/DataQueryScatterChart.js
+++ b/webapp/components/DataQuery/Visualizer/DataQueryChart/DataQueryScatterChart/DataQueryScatterChart.js
@@ -67,9 +67,9 @@ export const DataQueryScatterChart = (props) => {
       const { payload } = e
       const { record_uuid: recordUuid } = payload
       const queryParentEntityField = `${queryEntityDefName}_uuid`
-      const parentNodeUuid = payload[queryParentEntityField]
-      if (recordUuid && parentNodeUuid) {
-        dispatch(DataExplorerActions.openRecordEditModal({ recordUuid, parentNodeUuid }))
+      const parentNodeIId = payload[queryParentEntityField]
+      if (recordUuid && parentNodeIId) {
+        dispatch(DataExplorerActions.openRecordEditModal({ recordUuid, parentNodeIId }))
       }
     },
     [dispatch, queryEntityDefName]
diff --git a/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/Column/ColumnDataEdit.js b/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/Column/ColumnDataEdit.js
index bc3b33a3ae..c5c63a30b2 100644
--- a/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/Column/ColumnDataEdit.js
+++ b/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/Column/ColumnDataEdit.js
@@ -30,7 +30,7 @@ const ColumnDataEdit = (props) => {
   const { widthOuter } = useColumn({ nodeDef, query, colWidth })
 
   const cellNode = cell?.node
-  const nodeUpdated = useRecordNode({ nodeUuid: cellNode?.uuid })
+  const nodeUpdated = useRecordNode({ nodeIId: Node.getIId(cellNode) })
   const node = nodeUpdated || cellNode
   const recordValidation = Record.getValidation(record)
   const validation = RecordValidation.getNodeValidation(node)(recordValidation)
@@ -48,7 +48,7 @@ const ColumnDataEdit = (props) => {
             nodeDef={nodeDef}
             parentNode={{
               [Node.keys.recordUuid]: Record.getUuid(record),
-              [Node.keys.parentUuid]: cell.parentUuid,
+              [Node.keys.pIId]: Node.getParentInternalId(cellNode),
             }}
             nodes={[node]}
             entry
diff --git a/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/LinkRecord/LinkRecord.js b/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/LinkRecord/LinkRecord.js
index 07fb188899..11be3d997e 100644
--- a/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/LinkRecord/LinkRecord.js
+++ b/webapp/components/DataQuery/Visualizer/DataQueryTable/Row/LinkRecord/LinkRecord.js
@@ -11,10 +11,10 @@ const LinkRecord = (props) => {
 
   const i18n = useI18n()
 
-  const { parentUuid, record } = row
+  const { parentIId, record } = row
 
   const recordUuid = Record.getUuid(record)
-  const recordEditUrl = `${appModuleUri(dataModules.record)}${recordUuid}?pageNodeUuid=${parentUuid}`
+  const recordEditUrl = `${appModuleUri(dataModules.record)}${recordUuid}?pageNodeIId=${parentIId}`
 
   return (
     <Link type="button" className="btn-transparent" title={i18n.t('dataExplorerView.editRecord')} to={recordEditUrl}>
diff --git a/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js
index 6c77f92ca3..305907ef6c 100644
--- a/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js
+++ b/webapp/components/survey/NodeDefsSelector/NodeDefTreeSelect/useBuildEntityTreeData.js
@@ -11,8 +11,8 @@ import { useNodeDefLabelType, usePagesUuidMap } from '@webapp/store/ui/surveyFor
 import { TestId } from '@webapp/utils/testId'
 
 const getPageNode = ({ record, pagesUuidMap, nodeDefUuid }) => {
-  const nodeUuid = pagesUuidMap[nodeDefUuid]
-  return record && nodeUuid ? Record.getNodeByUuid(nodeUuid)(record) : null
+  const nodeIId = pagesUuidMap[nodeDefUuid]
+  return record && nodeIId ? Record.getNodeByInternalId(nodeIId)(record) : null
 }
 
 const isPageVisible = ({ cycle, record, pageNodeDef, parentNode }) =>
diff --git a/webapp/components/survey/Record/Record.js b/webapp/components/survey/Record/Record.js
index 463e6dc442..96e295912b 100644
--- a/webapp/components/survey/Record/Record.js
+++ b/webapp/components/survey/Record/Record.js
@@ -13,7 +13,7 @@ const Record = (props) => {
     editable: editableProp = true,
     locked = false,
     noHeader = false,
-    pageNodeUuid,
+    pageNodeIId,
     record: recordProp = null,
     recordUuid,
   } = props
@@ -21,7 +21,7 @@ const Record = (props) => {
     editableProp,
     locked,
     noHeader,
-    pageNodeUuid,
+    pageNodeIId,
     recordProp,
     recordUuid,
   })
@@ -55,7 +55,7 @@ Record.propTypes = {
   editable: PropTypes.bool,
   locked: PropTypes.bool,
   noHeader: PropTypes.bool,
-  pageNodeUuid: PropTypes.string,
+  pageNodeIId: PropTypes.number,
   record: PropTypes.object,
   recordUuid: PropTypes.string,
 }
diff --git a/webapp/components/survey/Record/RecordNoHeader.js b/webapp/components/survey/Record/RecordNoHeader.js
index 5f79585fff..4c8e48f8d6 100644
--- a/webapp/components/survey/Record/RecordNoHeader.js
+++ b/webapp/components/survey/Record/RecordNoHeader.js
@@ -1,14 +1,20 @@
 import React from 'react'
+import PropTypes from 'prop-types'
 
 import Record from './Record'
 import SurveyDefsLoader from '../SurveyDefsLoader/SurveyDefsLoader'
 
 export const RecordNoHeader = (props) => {
-  const { recordUuid, pageNodeUuid } = props
+  const { recordUuid, pageNodeIId } = props
 
   return (
     <SurveyDefsLoader draft={false} requirePublish>
-      <Record recordUuid={recordUuid} pageNodeUuid={pageNodeUuid} noHeader />
+      <Record recordUuid={recordUuid} pageNodeIId={pageNodeIId} noHeader />
     </SurveyDefsLoader>
   )
 }
+
+RecordNoHeader.propTypes = {
+  recordUuid: PropTypes.string.isRequired,
+  pageNodeIId: PropTypes.number.isRequired,
+}
diff --git a/webapp/components/survey/Record/store/useLocalState.js b/webapp/components/survey/Record/store/useLocalState.js
index 03dc70c566..a6bb221fc0 100644
--- a/webapp/components/survey/Record/store/useLocalState.js
+++ b/webapp/components/survey/Record/store/useLocalState.js
@@ -18,7 +18,7 @@ export const useLocalState = (props) => {
     editableProp,
     recordProp,
     recordUuid: recordUuidProp,
-    pageNodeUuid: pageNodeUuidProp,
+    pageNodeIId: pageNodeIIdProp,
     pageNodeDefUuid: pageNodeDefUuidProp,
     noHeader: noHeaderProp = false,
     locked: lockedProp = false,
@@ -30,7 +30,7 @@ export const useLocalState = (props) => {
   const { recordUuid: recordUuidUrlParam } = useParams()
 
   const {
-    pageNodeUuid: pageNodeUuidUrlParam,
+    pageNodeIId: pageNodeIIdUrlParam,
     pageNodeDefUuid: pageNodeDefUuidUrlParam,
     noHeader: noHeaderUrlParam,
     locked: lockedUrlParam,
@@ -40,7 +40,7 @@ export const useLocalState = (props) => {
   const preview = Boolean(recordUuidPreview)
 
   const recordUuid = recordUuidProp || recordUuidUrlParam || recordUuidPreview
-  const pageNodeUuid = pageNodeUuidProp || pageNodeUuidUrlParam
+  const pageNodeIId = pageNodeIIdProp || pageNodeIIdUrlParam
   const pageNodeDefUuid = pageNodeDefUuidProp || pageNodeDefUuidUrlParam
   const noHeader = noHeaderProp || noHeaderUrlParam
 
@@ -55,23 +55,23 @@ export const useLocalState = (props) => {
   // Add websocket event listeners
   useOnWebSocketEvent({
     eventName: WebSocketEvents.nodesUpdate,
-    eventHandler: useCallback((content) => dispatch(RecordActions.recordNodesUpdate(content.updatedNodes)), []),
+    eventHandler: useCallback((content) => dispatch(RecordActions.recordNodesUpdate(content.updatedNodes)), [dispatch]),
   })
   useOnWebSocketEvent({
     eventName: WebSocketEvents.nodeValidationsUpdate,
-    eventHandler: useCallback((content) => dispatch(RecordActions.nodeValidationsUpdate(content)), []),
+    eventHandler: useCallback((content) => dispatch(RecordActions.nodeValidationsUpdate(content)), [dispatch]),
   })
   useOnWebSocketEvent({
     eventName: WebSocketEvents.nodesUpdateCompleted,
-    eventHandler: useCallback((content) => dispatch(RecordActions.nodesUpdateCompleted(content)), []),
+    eventHandler: useCallback((content) => dispatch(RecordActions.nodesUpdateCompleted(content)), [dispatch]),
   })
   useOnWebSocketEvent({
     eventName: WebSocketEvents.recordDelete,
-    eventHandler: useCallback(() => dispatch(RecordActions.recordDeleted(navigate)), []),
+    eventHandler: useCallback(() => dispatch(RecordActions.recordDeleted(navigate)), [dispatch, navigate]),
   })
   useOnWebSocketEvent({
     eventName: WebSocketEvents.recordSessionExpired,
-    eventHandler: useCallback(() => dispatch(RecordActions.sessionExpired(navigate)), []),
+    eventHandler: useCallback(() => dispatch(RecordActions.sessionExpired(navigate)), [dispatch, navigate]),
   })
   useOnWebSocketEvent({
     eventName: WebSocketEvents.applicationError,
@@ -100,7 +100,7 @@ export const useLocalState = (props) => {
         RecordActions.checkInRecord({
           recordUuid,
           draft,
-          pageNodeUuid,
+          pageNodeIId,
           pageNodeDefUuid,
           noHeader,
           locked: lockedUrlParam || lockedProp,
diff --git a/webapp/components/survey/SurveyForm/FormHeader/usePath.js b/webapp/components/survey/SurveyForm/FormHeader/usePath.js
index f714266c97..f12741d092 100644
--- a/webapp/components/survey/SurveyForm/FormHeader/usePath.js
+++ b/webapp/components/survey/SurveyForm/FormHeader/usePath.js
@@ -37,12 +37,12 @@ export const usePath = (entry) => {
     if (entry && record && (NodeDef.isRoot(nodeDefCurrent) || NodeDef.isMultipleEntity(nodeDefCurrent))) {
       // get page node
       const nodeDefUuidCurrent = NodeDef.getUuid(nodeDefCurrent)
-      const nodeUuidCurrent = pagesUuidMap[nodeDefUuidCurrent]
+      const nodeIIdCurrent = pagesUuidMap[nodeDefUuidCurrent]
 
       // if entry mode add node key values
       const nodeCurrent = NodeDef.isSingle(nodeDefCurrent)
         ? Record.getNodesByDefUuid(nodeDefUuidCurrent)(record)[0]
-        : Record.getNodeByUuid(nodeUuidCurrent)(record)
+        : Record.getNodeByInternalId(nodeIIdCurrent)(record)
 
       if (nodeCurrent) {
         const nodeDefKeys = Survey.getNodeDefKeysSorted({ nodeDef: nodeDefCurrent, cycle })(survey)
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/NodeDefCode/NodeDefCode.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/NodeDefCode/NodeDefCode.js
index 9c7c3c682f..cdf23d5988 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/NodeDefCode/NodeDefCode.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/NodeDefCode/NodeDefCode.js
@@ -68,7 +68,13 @@ const NodeDefCode = (props) => {
   const onItemAdd = useCallback(
     (item) => {
       const existingNode = singleNode ? nodes[0] : null
-      const node = existingNode ?? Node.newNode(NodeDef.getUuid(nodeDef), Node.getRecordUuid(parentNode), parentNode)
+      const node =
+        existingNode ??
+        Node.newNode({
+          record: { uuid: Node.getRecordUuid(parentNode) },
+          nodeDefUuid: NodeDef.getUuid(nodeDef),
+          parentNode,
+        })
 
       const value = Node.newNodeValueCode({ itemUuid: CategoryItem.getUuid(item) })
       const meta = { [Node.metaKeys.hierarchyCode]: codeAttributesUuidsHierarchy }
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityForm.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityForm.js
index 6391b75af7..10f6596ce1 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityForm.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityForm.js
@@ -33,12 +33,12 @@ const NodeDefEntityForm = (props) => {
   // when there is no entity selected, select the first one
   useEffect(() => {
     if (entry && !selectedNode && !R.isEmpty(nodes)) {
-      const nodeUuid = R.pipe(R.head, Node.getUuid)(nodes)
-      if (nodeUuid) {
-        dispatch(SurveyFormActions.setFormPageNode(nodeDef, nodeUuid))
+      const nodeIId = R.pipe(R.head, Node.getIId)(nodes)
+      if (nodeIId) {
+        dispatch(SurveyFormActions.setFormPageNode(nodeDef, nodeIId))
       }
     }
-  }, [entry, selectedNode, nodes, NodeDef.getUuid(nodeDef)])
+  }, [entry, selectedNode, nodes, dispatch, nodeDef])
 
   return (
     <>
@@ -48,7 +48,7 @@ const NodeDefEntityForm = (props) => {
         <NodeDefEntityFormNodeSelect
           {...props}
           selectedNode={selectedNode}
-          onChange={(selectedNodeUuid) => dispatch(SurveyFormActions.setFormPageNode(nodeDef, selectedNodeUuid))}
+          onChange={(selectedNodeIId) => dispatch(SurveyFormActions.setFormPageNode(nodeDef, selectedNodeIId))}
         />
       )}
 
@@ -65,9 +65,9 @@ const mapStateToProps = (state, props) => {
   const getEntryProps = () => {
     const entryMultiple = NodeDef.isMultiple(nodeDef)
 
-    const selectedNodeUuid = SurveyFormState.getFormPageNodeUuid(nodeDef)(state)
+    const selectedNodeIId = SurveyFormState.getFormPageNodeIId(nodeDef)(state)
 
-    const selectedNode = selectedNodeUuid ? Record.getNodeByUuid(selectedNodeUuid)(record) : null
+    const selectedNode = selectedNodeIId ? Record.getNodeByInternalId(selectedNodeIId)(record) : null
 
     return {
       entryMultiple,
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormGrid.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormGrid.js
index b1189c655f..993f35e5e0 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormGrid.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormGrid.js
@@ -45,7 +45,7 @@ const NodeDefEntityFormGrid = (props) => {
   const mountedRef = useIsMountedRef({ delay: 200 })
 
   const surveyInfo = Survey.getSurveyInfo(survey)
-  const nodeUuid = Node.getUuid(node)
+  const nodeIId = Node.getIId(node)
   const nodeDefUuid = NodeDef.getUuid(nodeDef)
 
   // on node def or node change, scroll inner container to top
@@ -54,7 +54,7 @@ const NodeDefEntityFormGrid = (props) => {
     if (innerContainer) {
       innerContainer.scrollTop = 0
     }
-  }, [nodeDefUuid, nodeUuid])
+  }, [nodeDefUuid, nodeIId])
 
   const onChangeLayout = useCallback(
     (layout) => {
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormNodeSelect.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormNodeSelect.js
index bd8b8f792f..5711d338b2 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormNodeSelect.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityFormNodeSelect.js
@@ -34,9 +34,13 @@ const NodeDefEntityFormNodeSelect = (props) => {
           testId={TestId.entities.form.addNewNode}
           size="small"
           onClick={() => {
-            const entity = Node.newNode(NodeDef.getUuid(nodeDef), Node.getRecordUuid(parentNode), parentNode)
+            const entity = Node.newNode({
+              record: { uuid: Node.getRecordUuid(parentNode) },
+              nodeDefUuid: NodeDef.getUuid(nodeDef),
+              parentNode,
+            })
             updateNode(nodeDef, entity)
-            onChange(Node.getUuid(entity))
+            onChange(Node.getIId(entity))
           }}
           disabled={!canAddNode}
           iconClassName="icon-plus icon-10px icon-left"
@@ -54,7 +58,7 @@ const NodeDefEntityFormNodeSelect = (props) => {
             <select
               className="node-select"
               data-testid={TestId.entities.form.nodeSelect}
-              value={selectedNode ? Node.getUuid(selectedNode) : 'placeholder'}
+              value={selectedNode ? Node.getIId(selectedNode) : 'placeholder'}
               onChange={(e) => onChange(e.target.value)}
               aria-disabled={R.isEmpty(nodes)}
             >
@@ -63,8 +67,8 @@ const NodeDefEntityFormNodeSelect = (props) => {
               </option>
               {nodes.map((n, index) => (
                 <option
-                  key={Node.getUuid(n)}
-                  value={Node.getUuid(n)}
+                  key={Node.getIId(n)}
+                  value={Node.getIId(n)}
                   data-testid={TestId.entities.form.nodeSelectOption(index)}
                 >
                   {nodeKeysLabelValues[index]}
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityTableRows.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityTableRows.js
index d90e1e264e..1e76cb9948 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityTableRows.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefEntityTableRows.js
@@ -35,7 +35,7 @@ const NodeDefEntityTableRows = (props) => {
   const survey = useSelector(SurveyState.getSurvey)
   const nodeDefColumnUuids = NodeDefLayout.getLayoutChildren(surveyCycleKey)(nodeDef)
   const nodeDefUuid = nodeDef?.uuid
-  const minCount = useNodesMinCount({ parentNodeUuid: parentNode?.uuid, nodeDefUuid })
+  const minCount = useNodesMinCount({ parentNodeIId: parentNode?.iId, nodeDefUuid })
   const canDeleteRows = !NodeDef.isEnumerate(nodeDef) && (!minCount || nodes.length > minCount)
 
   const nodeDefColumns = R.reduce(
@@ -166,7 +166,7 @@ const NodeDefEntityTableRows = (props) => {
                 createRow({
                   renderType: NodeDefLayout.renderType.tableBody,
                   node,
-                  key: `entity-table-row-${Node.getUuid(node)}`,
+                  key: `entity-table-row-${Node.getIId(node)}`,
                   canDelete: canDeleteRows,
                   index,
                 })
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefText.js b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefText.js
index 899329127e..88151c2246 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefText.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/types/nodeDefText.js
@@ -64,7 +64,7 @@ const MultipleTextInput = (props) => {
         (n) =>
           (!Node.isPlaceholder(n) || canEditRecord) && (
             <div
-              key={Node.getUuid(n)}
+              key={Node.getIId(n)}
               className={`survey-form__node-def-text-multiple-container survey-form__node-def-${nodeDefType}`}
             >
               <NodeDefErrorBadge nodeDef={nodeDef} edit={false} parentNode={parentNode} node={n} />
diff --git a/webapp/components/survey/SurveyForm/nodeDefs/components/useValidation.js b/webapp/components/survey/SurveyForm/nodeDefs/components/useValidation.js
index 27eecf525a..a5eba82c1c 100644
--- a/webapp/components/survey/SurveyForm/nodeDefs/components/useValidation.js
+++ b/webapp/components/survey/SurveyForm/nodeDefs/components/useValidation.js
@@ -30,7 +30,7 @@ export default (props) => {
       }
       if (NodeDefs.hasMinOrMaxCount(nodeDef)) {
         return RecordValidation.getValidationChildrenCount(
-          Node.getUuid(parentNode),
+          Node.getIId(parentNode),
           NodeDef.getUuid(nodeDef)
         )(recordValidation)
       }
diff --git a/webapp/service/api/data/index.js b/webapp/service/api/data/index.js
index 0057f7acb4..b4ba8154eb 100644
--- a/webapp/service/api/data/index.js
+++ b/webapp/service/api/data/index.js
@@ -34,7 +34,7 @@ export const fetchRecordSummary = async ({ surveyId, cycle, recordUuid }) => {
 
 // ==== RECORD FILE
 export const getRecordNodeFileUrl = ({ surveyId, node }) =>
-  `/api/survey/${surveyId}/record/${Node.getRecordUuid(node)}/nodes/${Node.getUuid(node)}/file`
+  `/api/survey/${surveyId}/record/${Node.getRecordUuid(node)}/nodes/${Node.getIId(node)}/file`
 
 export const fetchRecordsNodeFileExifInfo = async ({ surveyId, node }) => {
   const { data: info } = await axios.get(`${getRecordNodeFileUrl({ surveyId, node })}-exif`)
diff --git a/webapp/store/ui/record/actions/checkIn.js b/webapp/store/ui/record/actions/checkIn.js
index 6f5b0170f8..877c6935b8 100644
--- a/webapp/store/ui/record/actions/checkIn.js
+++ b/webapp/store/ui/record/actions/checkIn.js
@@ -14,7 +14,7 @@ import { LoaderActions } from '@webapp/store/ui'
 import * as ActionTypes from './actionTypes'
 
 export const checkInRecord =
-  ({ recordUuid, draft, pageNodeUuid, pageNodeDefUuid, noHeader, locked = false }) =>
+  ({ recordUuid, draft, pageNodeIId, pageNodeDefUuid, noHeader, locked = false }) =>
   async (dispatch, getState) => {
     dispatch(LoaderActions.showLoader())
 
@@ -33,13 +33,13 @@ export const checkInRecord =
     }
 
     // This is used by dataQuery when user is editing a specific entity
-    if (pageNodeUuid) {
+    if (pageNodeIId) {
       const state = getState()
       const survey = SurveyState.getSurvey(state)
       const cycle = Record.getCycle(record)
 
       // Ancestors are needed to find the entity with a pageUuid specified
-      const entity = Record.getNodeByUuid(pageNodeUuid)(record)
+      const entity = Record.getNodeByInternalId(pageNodeIId)(record)
       const ancestors = Record.getAncestorsAndSelf(entity)(record)
       const pageNodeDef = Survey.getNodeDefByUuid(pageNodeDefUuid)(survey)
 
@@ -56,8 +56,8 @@ export const checkInRecord =
             )(ancestors)
 
       // Getting the nodes associated to the nodeDef page
-      const formPageNodeUuidByNodeDefUuid = R.reduce(
-        (acc, ancestor) => R.assoc(Node.getNodeDefUuid(ancestor), Node.getUuid(ancestor), acc),
+      const formPageNodeIIdByNodeDefUuid = R.reduce(
+        (acc, ancestor) => R.assoc(Node.getNodeDefUuid(ancestor), Node.getIId(ancestor), acc),
         [],
         ancestors
       )
@@ -66,7 +66,7 @@ export const checkInRecord =
         type: ActionTypes.recordLoad,
         record,
         nodeDefActivePage,
-        formPageNodeUuidByNodeDefUuid,
+        formPageNodeIIdByNodeDefUuid,
         noHeader,
         locked,
       })
diff --git a/webapp/store/ui/record/actions/create.js b/webapp/store/ui/record/actions/create.js
index 09c4593ae6..82976c94b3 100644
--- a/webapp/store/ui/record/actions/create.js
+++ b/webapp/store/ui/record/actions/create.js
@@ -39,5 +39,5 @@ export const createRecord =
 
 export const createNodePlaceholder = (nodeDef, parentNode, defaultValue) => (dispatch) => {
   const node = Node.newNodePlaceholder(nodeDef, parentNode, defaultValue)
-  dispatch(recordNodesUpdate({ [Node.getUuid(node)]: node }))
+  dispatch(recordNodesUpdate({ [Node.getIId(node)]: node }))
 }
diff --git a/webapp/store/ui/record/actions/delete.js b/webapp/store/ui/record/actions/delete.js
index d6d641d3ca..86400b7ba6 100644
--- a/webapp/store/ui/record/actions/delete.js
+++ b/webapp/store/ui/record/actions/delete.js
@@ -24,9 +24,9 @@ export const removeNode = (nodeDef, node) => async (dispatch, getState) => {
     const recordUuid = Record.getUuid(record)
     const cycle = Record.getCycle(record)
     const draft = Record.isPreview(record)
-    const nodeUuid = Node.getUuid(node)
+    const nodeIId = Node.getIId(node)
 
-    await axios.delete(`/api/survey/${surveyId}/record/${recordUuid}/node/${nodeUuid}`, {
+    await axios.delete(`/api/survey/${surveyId}/record/${recordUuid}/node/${nodeIId}`, {
       data: { cycle, draft, timezoneOffset: Dates.getTimezoneOffset() },
     })
   }
diff --git a/webapp/store/ui/record/actions/update.js b/webapp/store/ui/record/actions/update.js
index b184f38de3..9ad48103cd 100644
--- a/webapp/store/ui/record/actions/update.js
+++ b/webapp/store/ui/record/actions/update.js
@@ -37,14 +37,14 @@ const _updateNodeDebounced = (node, file, delay) => {
       timezoneOffset: Dates.getTimezoneOffset(),
       ...(file ? { file } : {}),
     })
-
     const recordUuid = Node.getRecordUuid(node)
-
     const surveyId = SurveyState.getSurveyId(state)
     await axios.post(`/api/survey/${surveyId}/record/${recordUuid}/node`, formData)
   }
 
-  return debounceAction(action, `node_update_${Node.getUuid(node)}`, delay)
+  const recordUuid = Node.getRecordUuid(node)
+  const nodeIId = Node.getIId(node)
+  return debounceAction(action, `node_update_${recordUuid}_${nodeIId}`, delay)
 }
 
 export const updateNode =
@@ -59,7 +59,7 @@ export const updateNode =
         Node.assocDirty(true)
       )(node)
       const removeDirtyFlag = false
-      await dispatch(recordNodesUpdate({ [Node.getUuid(node)]: nodeToUpdate }, removeDirtyFlag))
+      await dispatch(recordNodesUpdate({ [Node.getIId(node)]: nodeToUpdate }, removeDirtyFlag))
       dispatch(_updateNodeDebounced(nodeToUpdate, file, Node.isPlaceholder(node) ? 0 : 500))
     }
     checkAndConfirmUpdateNode({ dispatch, getState, node, nodeDef, onOk })
diff --git a/webapp/store/ui/record/hooks/index.js b/webapp/store/ui/record/hooks/index.js
index ecb2969f41..b421370bc0 100644
--- a/webapp/store/ui/record/hooks/index.js
+++ b/webapp/store/ui/record/hooks/index.js
@@ -11,9 +11,9 @@ import * as RecordState from '../state'
 
 export const useRecord = () => useSelector(RecordState.getRecord)
 
-export const useRecordNode = ({ nodeUuid }) => {
+export const useRecordNode = ({ nodeIId }) => {
   const record = useSelector(RecordState.getRecord)
-  return nodeUuid && record ? Record.getNodeByUuid(nodeUuid)(record) : null
+  return nodeIId && record ? Record.getNodeByInternalId(nodeIId)(record) : null
 }
 
 export const useRecordParentCategoryItemUuid = ({ nodeDef, parentNode }) =>
@@ -29,12 +29,12 @@ export const useRecordCodeAttributesUuidsHierarchy = ({ nodeDef, parentNode }) =
     const survey = SurveyState.getSurvey(state)
     const record = RecordState.getRecord(state)
     const parentCodeAttribute = Record.getParentCodeAttribute(survey, parentNode, nodeDef)(record)
-    return parentCodeAttribute ? [...Node.getHierarchyCode(parentCodeAttribute), Node.getUuid(parentCodeAttribute)] : []
+    return parentCodeAttribute ? [...Node.getHierarchyCode(parentCodeAttribute), Node.getIId(parentCodeAttribute)] : []
   }, Objects.isEqual)
 
 export const useIsRecordViewWithoutHeader = () => useSelector(RecordState.hasNoHeader)
 
-const useNodesCount = ({ parentNodeUuid, nodeDefUuid, countType }) =>
+const useNodesCount = ({ parentNodeIId, nodeDefUuid, countType }) =>
   useSelector((state) => {
     const survey = SurveyState.getSurvey(state)
     const nodeDef = Surveys.getNodeDefByUuid({ survey, uuid: nodeDefUuid })
@@ -44,15 +44,15 @@ const useNodesCount = ({ parentNodeUuid, nodeDefUuid, countType }) =>
       // count is an array of expressions
       const record = RecordState.getRecord(state)
       if (!record) return undefined
-      const parentNode = Records.getNodeByUuid(parentNodeUuid)(record)
+      const parentNode = Records.getNodeByInternalId(parentNodeIId)(record)
       return Nodes.getChildrenMinOrMaxCount({ parentNode, nodeDef, countType })
     }
     // count is constant value (backward compatibility)
     return Number(count)
   })
 
-export const useNodesMaxCount = ({ parentNodeUuid, nodeDefUuid }) =>
-  useNodesCount({ parentNodeUuid, nodeDefUuid, countType: NodeDefValidations.keys.max })
+export const useNodesMaxCount = ({ parentNodeIId, nodeDefUuid }) =>
+  useNodesCount({ parentNodeIId, nodeDefUuid, countType: NodeDefValidations.keys.max })
 
-export const useNodesMinCount = ({ parentNodeUuid, nodeDefUuid }) =>
-  useNodesCount({ parentNodeUuid, nodeDefUuid, countType: NodeDefValidations.keys.min })
+export const useNodesMinCount = ({ parentNodeIId, nodeDefUuid }) =>
+  useNodesCount({ parentNodeIId, nodeDefUuid, countType: NodeDefValidations.keys.min })
diff --git a/webapp/store/ui/surveyForm/actions.js b/webapp/store/ui/surveyForm/actions.js
index 9dac4bbf1c..f735cba0fa 100644
--- a/webapp/store/ui/surveyForm/actions.js
+++ b/webapp/store/ui/surveyForm/actions.js
@@ -42,23 +42,23 @@ export const formPageNodesUpdate = 'survey/form/pageNodes/update'
 
 // Sets the node (entity) for a page (identified by the entity def)
 // and reset the node set for the descendant entity defs.
-export const setFormPageNode = (nodeDef, nodeUuid) => (dispatch, getState) => {
+export const setFormPageNode = (nodeDef, nodeIId) => (dispatch, getState) => {
   const state = getState()
   const cycle = SurveyState.getSurveyCycleKey(state)
   const survey = SurveyState.getSurvey(state)
-  const formPageNodeUuidByNodeDefUuid = {}
+  const formPageNodeIIdByNodeDefUuid = {}
 
   Survey.visitDescendantsAndSelf({
     nodeDef,
     visitorFn: (descendantNodeDef) => {
       if (NodeDef.isEntity(descendantNodeDef) && NodeDefLayout.hasPage(cycle)(descendantNodeDef)) {
-        const formPageNodeUuid = NodeDef.isEqual(descendantNodeDef)(nodeDef) ? nodeUuid : null
-        formPageNodeUuidByNodeDefUuid[NodeDef.getUuid(descendantNodeDef)] = formPageNodeUuid
+        const formPageNodeIId = NodeDef.isEqual(descendantNodeDef)(nodeDef) ? nodeIId : null
+        formPageNodeIIdByNodeDefUuid[NodeDef.getUuid(descendantNodeDef)] = formPageNodeIId
       }
     },
   })(survey)
 
-  dispatch({ type: formPageNodesUpdate, formPageNodeUuidByNodeDefUuid })
+  dispatch({ type: formPageNodesUpdate, formPageNodeIIdByNodeDefUuid })
 }
 
 // Toggle form page navigation
diff --git a/webapp/store/ui/surveyForm/hooks.js b/webapp/store/ui/surveyForm/hooks.js
index 1e00d71fcd..277a0d97c9 100644
--- a/webapp/store/ui/surveyForm/hooks.js
+++ b/webapp/store/ui/surveyForm/hooks.js
@@ -28,7 +28,7 @@ export const useNodeDefPage = () => useSelector(SurveyFormState.getFormActivePag
 
 export const useShowPageNavigation = () => useSelector(SurveyFormState.showPageNavigation)
 
-export const usePagesUuidMap = () => useSelector(SurveyFormState.getPagesUuidMap)
+export const usePagesUuidMap = () => useSelector(SurveyFormState.getPagesIIdMap)
 
 const visitSurveyEntityDefsInOwnPage = ({ survey, cycle, visitor }) => {
   const nodeDefRoot = Survey.getNodeDefRoot(survey)
diff --git a/webapp/store/ui/surveyForm/reducer.js b/webapp/store/ui/surveyForm/reducer.js
index b35140246e..75888df115 100644
--- a/webapp/store/ui/surveyForm/reducer.js
+++ b/webapp/store/ui/surveyForm/reducer.js
@@ -39,8 +39,8 @@ const actionHandlers = {
       SurveyFormState.assocNodeDefAddChildTo(showAddChildTo ? nodeDef : null)
     )(state),
 
-  [SurveyFormActions.formPageNodesUpdate]: (state, { formPageNodeUuidByNodeDefUuid }) =>
-    SurveyFormState.assocFormPageNodes(formPageNodeUuidByNodeDefUuid)(state),
+  [SurveyFormActions.formPageNodesUpdate]: (state, { formPageNodeIIdByNodeDefUuid }) =>
+    SurveyFormState.assocFormPageNodes(formPageNodeIIdByNodeDefUuid)(state),
 
   [SurveyFormActions.formShowPageNavigationUpdate]: (state, { showPageNavigation }) =>
     SurveyFormState.setShowPageNavigation(showPageNavigation)(state),
@@ -72,10 +72,10 @@ const actionHandlers = {
   },
 
   // Record
-  [RecordActions.recordLoad]: (state, { nodeDefActivePage, formPageNodeUuidByNodeDefUuid }) =>
+  [RecordActions.recordLoad]: (state, { nodeDefActivePage, formPageNodeIIdByNodeDefUuid }) =>
     R.pipe(
       SurveyFormState.assocNodeDefAddChildTo(null),
-      SurveyFormState.assocFormPageNodes(formPageNodeUuidByNodeDefUuid),
+      SurveyFormState.assocFormPageNodes(formPageNodeIIdByNodeDefUuid),
       SurveyFormState.assocFormActivePage(nodeDefActivePage)
     )(state),
 }
diff --git a/webapp/store/ui/surveyForm/state.js b/webapp/store/ui/surveyForm/state.js
index 7467700363..00ab8559db 100644
--- a/webapp/store/ui/surveyForm/state.js
+++ b/webapp/store/ui/surveyForm/state.js
@@ -21,7 +21,7 @@ const keys = {
   nodeDefUuid: 'nodeDefUuid', // Current node def (if view mode is "allNodeDefs")
   nodeDefUuidPage: 'nodeDefUuidPage', // Current page nodeDef
   nodeDefUuidAddChildTo: 'nodeDefUuidAddChildTo', // NodeDef (entity) selected to add children to
-  nodeDefUuidPageNodeUuid: 'nodeDefUuidPageNodeUuid', // Map of nodeDefUuid -> nodeUuid representing the node loaded in page nodeDefUuid
+  nodeDefUuidPageNodeIId: 'nodeDefUuidPageNodeIId', // Map of nodeDefUuid -> nodeIId representing the node loaded in page nodeDefUuid
   showPageNavigation: 'showPageNavigation',
   expandedPageNavigation: 'expandedPageNavigation',
   nodeDefLabelType: 'nodeDefLabelType', // NodeDef label function
@@ -68,25 +68,25 @@ export const getNodeDefAddChildTo = (state) => {
   return Survey.getNodeDefByUuid(nodeDefUuidAddChildTo)(survey)
 }
 
-// ====== nodeDefUuidPageNodeUuid
+// ====== nodeDefUuidPageNodeIId
 
-export const assocFormPageNode = (nodeDefUuid, nodeUuid) => {
-  const path = [keys.nodeDefUuidPageNodeUuid, nodeDefUuid]
-  return nodeUuid ? R.assocPath(path, nodeUuid) : R.dissocPath(path)
+export const assocFormPageNode = (nodeDefUuid, nodeIId) => {
+  const path = [keys.nodeDefUuidPageNodeIId, nodeDefUuid]
+  return nodeIId ? R.assocPath(path, nodeIId) : R.dissocPath(path)
 }
 
-export const assocFormPageNodes = (formPageNodeUuidByNodeDefUuid) => (state) =>
+export const assocFormPageNodes = (formPageNodeIIdByNodeDefUuid) => (state) =>
   R.pipe(
     R.keys,
     R.reduce((stateAcc, nodeDefUuid) => {
-      const nodeUuid = R.prop(nodeDefUuid, formPageNodeUuidByNodeDefUuid)
-      return assocFormPageNode(nodeDefUuid, nodeUuid)(stateAcc)
+      const nodeIId = R.prop(nodeDefUuid, formPageNodeIIdByNodeDefUuid)
+      return assocFormPageNode(nodeDefUuid, nodeIId)(stateAcc)
     }, state)
-  )(formPageNodeUuidByNodeDefUuid)
+  )(formPageNodeIIdByNodeDefUuid)
 
-export const getPagesUuidMap = getStateProp(keys.nodeDefUuidPageNodeUuid, {})
+export const getPagesIIdMap = getStateProp(keys.nodeDefUuidPageNodeIId, {})
 
-export const getFormPageNodeUuid = (nodeDef) => R.pipe(getPagesUuidMap, R.prop(NodeDef.getUuid(nodeDef)))
+export const getFormPageNodeIId = (nodeDef) => R.pipe(getPagesIIdMap, R.prop(NodeDef.getUuid(nodeDef)))
 
 export const getFormPageParentNode = (nodeDef) => (state) => {
   const survey = SurveyState.getSurvey(state)
@@ -99,9 +99,8 @@ export const getFormPageParentNode = (nodeDef) => (state) => {
     if (NodeDef.isRoot(nodeDefParent)) {
       return Record.getRootNode(record)
     }
-
-    const parentNodeUuid = getFormPageNodeUuid(nodeDefParent)(state)
-    return Record.getNodeByUuid(parentNodeUuid)(record)
+    const parentNodeIId = getFormPageNodeIId(nodeDefParent)(state)
+    return Record.getNodeByInternalId(parentNodeIId)(record)
   }
 
   return null
diff --git a/webapp/views/App/views/Analysis/Entities/Row/Row.js b/webapp/views/App/views/Analysis/Entities/Row/Row.js
index 226da24ed5..03838a673f 100644
--- a/webapp/views/App/views/Analysis/Entities/Row/Row.js
+++ b/webapp/views/App/views/Analysis/Entities/Row/Row.js
@@ -1,19 +1,21 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
+import * as NodeDef from '@core/survey/nodeDef'
+
 import { useNodeDefByUuid, useSurveyPreferredLang } from '@webapp/store/survey'
 
 const Row = (props) => {
-  const { row: entity } = props
-  const parentDef = useNodeDefByUuid(entity?.parentUuid)
+  const { row: entityDef } = props
+  const parentDef = useNodeDefByUuid(NodeDef.getParentUuid(entityDef))
   const lang = useSurveyPreferredLang()
 
   return (
     <>
       <div />
-      <div>{entity?.props?.name}</div>
-      <div>{entity?.props?.labels?.[lang]}</div>
-      <div>{parentDef?.props?.name}</div>
+      <div>{NodeDef.getName(entityDef)}</div>
+      <div>{NodeDef.getLabel(entityDef, lang)}</div>
+      <div>{NodeDef.getName(parentDef)}</div>
     </>
   )
 }
diff --git a/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js
index b44c8f3654..0c28d0cf13 100644
--- a/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/CoordinateAttributePopUp.js
@@ -61,7 +61,7 @@ ${locationSummary}
 export const CoordinateAttributePopUp = (props) => {
   const { attributeDef, flyToNextPoint, flyToPreviousPoint, onRecordEditClick, pointFeature } = props
 
-  const { recordUuid, recordOwnerUuid, parentUuid, point, ancestorsKeys } = pointFeature.properties
+  const { recordUuid, recordOwnerUuid, parentIId, point, ancestorsKeys } = pointFeature.properties
   const [longitude, latitude] = pointFeature.geometry.coordinates
 
   const popupRef = useRef(null)
@@ -148,7 +148,7 @@ export const CoordinateAttributePopUp = (props) => {
             <ButtonIconEdit
               label="mapView.editRecord"
               showLabel
-              onClick={() => onRecordEditClick({ recordUuid, parentUuid })}
+              onClick={() => onRecordEditClick({ recordUuid, parentIId })}
               variant="contained"
             />
 
diff --git a/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js
index b46273bfe5..c4684ae477 100644
--- a/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js
+++ b/webapp/views/App/views/Data/MapView/GeoAttributeDataLayer/convertDataToGeoJsonPoints.js
@@ -13,8 +13,8 @@ import { GeoJsonUtils } from '@core/geo/geoJsonUtils'
 const extractCommonProperties = ({ dataItem, parentEntityColumn, ancestorsKeysColumns, i18n }) => {
   const recordUuid = dataItem[TableDataNodeDef.columnSet.recordUuid]
   const recordOwnerUuid = dataItem[TableDataNodeDef.columnSet.recordOwnerUuid]
-  const parentUuid = dataItem[parentEntityColumn.name]
-  const key = `${recordUuid}-${parentUuid}`
+  const parentIId = dataItem[parentEntityColumn.name]
+  const key = `${recordUuid}-${parentIId}`
   const ancestorsKeys = ancestorsKeysColumns.map((column) =>
     DataQueryValueFormatter.formatDataItemKey({ i18n, nodeDef: column.nodeDef, dataItem })
   )
@@ -22,8 +22,8 @@ const extractCommonProperties = ({ dataItem, parentEntityColumn, ancestorsKeysCo
   return {
     key,
     ancestorsKeys,
-    parentUuid,
     recordUuid,
+    parentIId,
     recordOwnerUuid,
     center: true,
   }
diff --git a/webapp/views/App/views/Data/MapView/MapView.js b/webapp/views/App/views/Data/MapView/MapView.js
index c75d66408d..27a58af626 100644
--- a/webapp/views/App/views/Data/MapView/MapView.js
+++ b/webapp/views/App/views/Data/MapView/MapView.js
@@ -31,10 +31,10 @@ const MapWrapper = () => {
 
   const [state, setState] = useState({
     editingRecordUuid: null,
-    editingParentNodeUuid: null,
+    editingParentNodeIId: null,
     lastRecordEditModalState: null,
   })
-  const { editingRecordUuid, editingParentNodeUuid, lastRecordEditModalState } = state
+  const { editingRecordUuid, editingParentNodeIId, lastRecordEditModalState } = state
 
   const geoAttributeDefs = useMemo(
     () => Survey.getNodeDefsArray(survey).filter((nodeDef) => NodeDef.isGeo(nodeDef) || NodeDef.isCoordinate(nodeDef)),
@@ -45,12 +45,12 @@ const MapWrapper = () => {
   const layerColors = useRandomColors(samplingPointDataLevels.length + geoAttributeDefs.length)
 
   const onRecordEditClick = useCallback((params) => {
-    const { recordUuid, parentUuid } = params || {}
-    setState((statePrev) => ({ ...statePrev, editingRecordUuid: recordUuid, editingParentNodeUuid: parentUuid }))
+    const { recordUuid, parentIId } = params || {}
+    setState((statePrev) => ({ ...statePrev, editingRecordUuid: recordUuid, editingParentNodeIId: parentIId }))
   }, [])
 
   const closeRecordEditor = useCallback(() => {
-    setState((statePrev) => ({ ...statePrev, editingRecordUuid: null, editingParentNodeUuid: null }))
+    setState((statePrev) => ({ ...statePrev, editingRecordUuid: null, editingParentNodeIId: null }))
   }, [])
 
   const onRecordEditorClose = useCallback(({ modalState: lastRecordEditModalState }) => {
@@ -111,7 +111,7 @@ const MapWrapper = () => {
           onClose={onRecordEditorClose}
           onRequestClose={closeRecordEditor}
           recordUuid={editingRecordUuid}
-          parentNodeUuid={editingParentNodeUuid}
+          parentNodeIId={editingParentNodeIId}
         />
       )}
     </>
diff --git a/webapp/views/App/views/Data/ValidationReport/ValidationReport.js b/webapp/views/App/views/Data/ValidationReport/ValidationReport.js
index 7bb9b80a4f..ffcfecc84f 100644
--- a/webapp/views/App/views/Data/ValidationReport/ValidationReport.js
+++ b/webapp/views/App/views/Data/ValidationReport/ValidationReport.js
@@ -22,12 +22,12 @@ const ValidationReport = () => {
   const { recordUuid } = useParams()
 
   const onRowClick = (row) => {
-    const pageNodeUuid = RecordValidationReportItem.getNodeContextUuid(row)
+    const pageNodeIId = RecordValidationReportItem.getNodeContextIId(row)
     const pageNodeDefUuid = RecordValidationReportItem.getNodeDefContextUuid(row)
     const recordUuid = RecordValidationReportItem.getRecordUuid(row)
     const recordEditUrl = `${appModuleUri(
       dataModules.record
-    )}${recordUuid}?pageNodeUuid=${pageNodeUuid}&pageNodeDefUuid=${pageNodeDefUuid}`
+    )}${recordUuid}?pageNodeIId=${pageNodeIId}&pageNodeDefUuid=${pageNodeDefUuid}`
 
     navigate(recordEditUrl)
   }
diff --git a/webapp/views/App/views/Data/common/RecordEditModal/RecordEditModal.js b/webapp/views/App/views/Data/common/RecordEditModal/RecordEditModal.js
index 1397195cd8..ce6fb1e62d 100644
--- a/webapp/views/App/views/Data/common/RecordEditModal/RecordEditModal.js
+++ b/webapp/views/App/views/Data/common/RecordEditModal/RecordEditModal.js
@@ -58,7 +58,7 @@ export const RecordEditModal = (props) => {
     initialState: initialStateProp,
     onClose,
     onRequestClose,
-    parentNodeUuid,
+    parentNodeIId,
     recordUuid,
   } = props
 
@@ -89,7 +89,7 @@ export const RecordEditModal = (props) => {
       onRequestClose={onRequestClose}
       top={initialTop}
     >
-      <RecordEditor recordUuid={recordUuid} pageNodeUuid={parentNodeUuid} noHeader locked />
+      <RecordEditor recordUuid={recordUuid} pageNodeIId={parentNodeIId} noHeader locked />
     </ResizableModal>
   )
 }
@@ -99,6 +99,6 @@ RecordEditModal.propTypes = {
   initialState: PropTypes.object,
   onClose: PropTypes.func,
   onRequestClose: PropTypes.func,
-  parentNodeUuid: PropTypes.string,
+  parentNodeIId: PropTypes.number,
   recordUuid: PropTypes.string.isRequired,
 }
diff --git a/yarn.lock b/yarn.lock
index c4d039b9f5..96bfa5d9c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,7 +5,7 @@ __metadata:
   version: 8
   cacheKey: 10c0
 
-"@acemir/cssom@npm:^0.9.31":
+"@acemir/cssom@npm:^0.9.28":
   version: 0.9.31
   resolution: "@acemir/cssom@npm:0.9.31"
   checksum: 10c0/cbfff98812642104ec3b37de1ad3a53f216ddc437e7b9276a23f46f2453844ea3c3f46c200bc4656a2f747fb26567560b3cc5183d549d119a758926551b5f566
@@ -54,29 +54,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asamuzakjp/css-color@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "@asamuzakjp/css-color@npm:5.0.1"
+"@asamuzakjp/css-color@npm:^4.1.1":
+  version: 4.1.2
+  resolution: "@asamuzakjp/css-color@npm:4.1.2"
   dependencies:
-    "@csstools/css-calc": "npm:^3.1.1"
-    "@csstools/css-color-parser": "npm:^4.0.2"
+    "@csstools/css-calc": "npm:^3.0.0"
+    "@csstools/css-color-parser": "npm:^4.0.1"
     "@csstools/css-parser-algorithms": "npm:^4.0.0"
     "@csstools/css-tokenizer": "npm:^4.0.0"
-    lru-cache: "npm:^11.2.6"
-  checksum: 10c0/3e8d74a3b7f3005a325cb8e7f3da1aa32aeac4cd9ce387826dc25b16eaab4dc0e4a6faded8ccc1895959141f4a4a70e8bc38723347b89667b7b224990d16683c
+    lru-cache: "npm:^11.2.5"
+  checksum: 10c0/e432fdef978b37654a2ca31169a149b9173e708f70c82612acb123a36dbc7dd99913c48cbf2edd6fe3652cc627d4bc94bf87571463da0b788f15b973d4ce5b0f
   languageName: node
   linkType: hard
 
-"@asamuzakjp/dom-selector@npm:^6.8.1":
-  version: 6.8.1
-  resolution: "@asamuzakjp/dom-selector@npm:6.8.1"
+"@asamuzakjp/dom-selector@npm:^6.7.6":
+  version: 6.7.8
+  resolution: "@asamuzakjp/dom-selector@npm:6.7.8"
   dependencies:
     "@asamuzakjp/nwsapi": "npm:^2.3.9"
     bidi-js: "npm:^1.0.3"
     css-tree: "npm:^3.1.0"
     is-potential-custom-element-name: "npm:^1.0.1"
-    lru-cache: "npm:^11.2.6"
-  checksum: 10c0/635de2c3b11971c07e2d491fd2833d2499bafbab05b616f5d38041031718879c404456644f60c45e9ba4ca2423e5bb48bf3c46179b0c58a0ea68eaae8c61e85f
+    lru-cache: "npm:^11.2.5"
+  checksum: 10c0/4274e5025e6e399654cb066f33a165f4dc65596a33612b0a345dce80666ad1f234b68b8b6db6f005fc76be365ea36e09bd7b08990442461f390c77b19cfea885
   languageName: node
   linkType: hard
 
@@ -170,466 +170,512 @@ __metadata:
   linkType: hard
 
 "@aws-sdk/client-s3@npm:^3.975.0":
-  version: 3.999.0
-  resolution: "@aws-sdk/client-s3@npm:3.999.0"
+  version: 3.984.0
+  resolution: "@aws-sdk/client-s3@npm:3.984.0"
   dependencies:
     "@aws-crypto/sha1-browser": "npm:5.2.0"
     "@aws-crypto/sha256-browser": "npm:5.2.0"
     "@aws-crypto/sha256-js": "npm:5.2.0"
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/credential-provider-node": "npm:^3.972.14"
-    "@aws-sdk/middleware-bucket-endpoint": "npm:^3.972.6"
-    "@aws-sdk/middleware-expect-continue": "npm:^3.972.6"
-    "@aws-sdk/middleware-flexible-checksums": "npm:^3.973.1"
-    "@aws-sdk/middleware-host-header": "npm:^3.972.6"
-    "@aws-sdk/middleware-location-constraint": "npm:^3.972.6"
-    "@aws-sdk/middleware-logger": "npm:^3.972.6"
-    "@aws-sdk/middleware-recursion-detection": "npm:^3.972.6"
-    "@aws-sdk/middleware-sdk-s3": "npm:^3.972.15"
-    "@aws-sdk/middleware-ssec": "npm:^3.972.6"
-    "@aws-sdk/middleware-user-agent": "npm:^3.972.15"
-    "@aws-sdk/region-config-resolver": "npm:^3.972.6"
-    "@aws-sdk/signature-v4-multi-region": "npm:^3.996.3"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@aws-sdk/util-endpoints": "npm:^3.996.3"
-    "@aws-sdk/util-user-agent-browser": "npm:^3.972.6"
-    "@aws-sdk/util-user-agent-node": "npm:^3.973.0"
-    "@smithy/config-resolver": "npm:^4.4.9"
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/eventstream-serde-browser": "npm:^4.2.10"
-    "@smithy/eventstream-serde-config-resolver": "npm:^4.3.10"
-    "@smithy/eventstream-serde-node": "npm:^4.2.10"
-    "@smithy/fetch-http-handler": "npm:^5.3.11"
-    "@smithy/hash-blob-browser": "npm:^4.2.11"
-    "@smithy/hash-node": "npm:^4.2.10"
-    "@smithy/hash-stream-node": "npm:^4.2.10"
-    "@smithy/invalid-dependency": "npm:^4.2.10"
-    "@smithy/md5-js": "npm:^4.2.10"
-    "@smithy/middleware-content-length": "npm:^4.2.10"
-    "@smithy/middleware-endpoint": "npm:^4.4.20"
-    "@smithy/middleware-retry": "npm:^4.4.37"
-    "@smithy/middleware-serde": "npm:^4.2.11"
-    "@smithy/middleware-stack": "npm:^4.2.10"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/node-http-handler": "npm:^4.4.12"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/url-parser": "npm:^4.2.10"
-    "@smithy/util-base64": "npm:^4.3.1"
-    "@smithy/util-body-length-browser": "npm:^4.2.1"
-    "@smithy/util-body-length-node": "npm:^4.2.2"
-    "@smithy/util-defaults-mode-browser": "npm:^4.3.36"
-    "@smithy/util-defaults-mode-node": "npm:^4.2.39"
-    "@smithy/util-endpoints": "npm:^3.3.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-retry": "npm:^4.2.10"
-    "@smithy/util-stream": "npm:^4.5.15"
-    "@smithy/util-utf8": "npm:^4.2.1"
-    "@smithy/util-waiter": "npm:^4.2.10"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/credential-provider-node": "npm:^3.972.5"
+    "@aws-sdk/middleware-bucket-endpoint": "npm:^3.972.3"
+    "@aws-sdk/middleware-expect-continue": "npm:^3.972.3"
+    "@aws-sdk/middleware-flexible-checksums": "npm:^3.972.4"
+    "@aws-sdk/middleware-host-header": "npm:^3.972.3"
+    "@aws-sdk/middleware-location-constraint": "npm:^3.972.3"
+    "@aws-sdk/middleware-logger": "npm:^3.972.3"
+    "@aws-sdk/middleware-recursion-detection": "npm:^3.972.3"
+    "@aws-sdk/middleware-sdk-s3": "npm:^3.972.6"
+    "@aws-sdk/middleware-ssec": "npm:^3.972.3"
+    "@aws-sdk/middleware-user-agent": "npm:^3.972.6"
+    "@aws-sdk/region-config-resolver": "npm:^3.972.3"
+    "@aws-sdk/signature-v4-multi-region": "npm:3.984.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@aws-sdk/util-endpoints": "npm:3.984.0"
+    "@aws-sdk/util-user-agent-browser": "npm:^3.972.3"
+    "@aws-sdk/util-user-agent-node": "npm:^3.972.4"
+    "@smithy/config-resolver": "npm:^4.4.6"
+    "@smithy/core": "npm:^3.22.0"
+    "@smithy/eventstream-serde-browser": "npm:^4.2.8"
+    "@smithy/eventstream-serde-config-resolver": "npm:^4.3.8"
+    "@smithy/eventstream-serde-node": "npm:^4.2.8"
+    "@smithy/fetch-http-handler": "npm:^5.3.9"
+    "@smithy/hash-blob-browser": "npm:^4.2.9"
+    "@smithy/hash-node": "npm:^4.2.8"
+    "@smithy/hash-stream-node": "npm:^4.2.8"
+    "@smithy/invalid-dependency": "npm:^4.2.8"
+    "@smithy/md5-js": "npm:^4.2.8"
+    "@smithy/middleware-content-length": "npm:^4.2.8"
+    "@smithy/middleware-endpoint": "npm:^4.4.12"
+    "@smithy/middleware-retry": "npm:^4.4.29"
+    "@smithy/middleware-serde": "npm:^4.2.9"
+    "@smithy/middleware-stack": "npm:^4.2.8"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/node-http-handler": "npm:^4.4.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/smithy-client": "npm:^4.11.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
+    "@smithy/util-base64": "npm:^4.3.0"
+    "@smithy/util-body-length-browser": "npm:^4.2.0"
+    "@smithy/util-body-length-node": "npm:^4.2.1"
+    "@smithy/util-defaults-mode-browser": "npm:^4.3.28"
+    "@smithy/util-defaults-mode-node": "npm:^4.2.31"
+    "@smithy/util-endpoints": "npm:^3.2.8"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-retry": "npm:^4.2.8"
+    "@smithy/util-stream": "npm:^4.5.10"
+    "@smithy/util-utf8": "npm:^4.2.0"
+    "@smithy/util-waiter": "npm:^4.2.8"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/0fef9a458bc596556b1f5ecb49425cbb637c8f575bb21b0fd790c486d1b6e219870d80b8ffe4e675559480fe7c3adc51e785c45329507f5042293811a4e3db3d
+  checksum: 10c0/285b912e985fad794fb11b6d22c5f2505929b783c9b13c344a6b4a3dc0838f7b201ef8c88256fcbce921cb0173eab8ec6b599689951bf89279fcda987d16ad63
   languageName: node
   linkType: hard
 
-"@aws-sdk/core@npm:^3.973.15":
-  version: 3.973.15
-  resolution: "@aws-sdk/core@npm:3.973.15"
+"@aws-sdk/client-sso@npm:3.982.0":
+  version: 3.982.0
+  resolution: "@aws-sdk/client-sso@npm:3.982.0"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@aws-sdk/xml-builder": "npm:^3.972.8"
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/signature-v4": "npm:^5.3.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-base64": "npm:^4.3.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@aws-crypto/sha256-browser": "npm:5.2.0"
+    "@aws-crypto/sha256-js": "npm:5.2.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/middleware-host-header": "npm:^3.972.3"
+    "@aws-sdk/middleware-logger": "npm:^3.972.3"
+    "@aws-sdk/middleware-recursion-detection": "npm:^3.972.3"
+    "@aws-sdk/middleware-user-agent": "npm:^3.972.6"
+    "@aws-sdk/region-config-resolver": "npm:^3.972.3"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@aws-sdk/util-endpoints": "npm:3.982.0"
+    "@aws-sdk/util-user-agent-browser": "npm:^3.972.3"
+    "@aws-sdk/util-user-agent-node": "npm:^3.972.4"
+    "@smithy/config-resolver": "npm:^4.4.6"
+    "@smithy/core": "npm:^3.22.0"
+    "@smithy/fetch-http-handler": "npm:^5.3.9"
+    "@smithy/hash-node": "npm:^4.2.8"
+    "@smithy/invalid-dependency": "npm:^4.2.8"
+    "@smithy/middleware-content-length": "npm:^4.2.8"
+    "@smithy/middleware-endpoint": "npm:^4.4.12"
+    "@smithy/middleware-retry": "npm:^4.4.29"
+    "@smithy/middleware-serde": "npm:^4.2.9"
+    "@smithy/middleware-stack": "npm:^4.2.8"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/node-http-handler": "npm:^4.4.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/smithy-client": "npm:^4.11.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
+    "@smithy/util-base64": "npm:^4.3.0"
+    "@smithy/util-body-length-browser": "npm:^4.2.0"
+    "@smithy/util-body-length-node": "npm:^4.2.1"
+    "@smithy/util-defaults-mode-browser": "npm:^4.3.28"
+    "@smithy/util-defaults-mode-node": "npm:^4.2.31"
+    "@smithy/util-endpoints": "npm:^3.2.8"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-retry": "npm:^4.2.8"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/214af21b8bca436d3b55aa2f4802d8b187716f6169269587f4976d4c42baac7ad1f97e7decf081089bf9168fbbea361ac782785ff0d8956826d40b59118910f2
+  checksum: 10c0/ee6e546cd90e49c75c086cbbfaa05f1e6699f94a7b3a53d73f7c507a5f59ac8ac7655db03eb7c345a4cf3f3908446863436690f143e2090cf369ce410e0c740b
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/core@npm:^3.973.6":
+  version: 3.973.6
+  resolution: "@aws-sdk/core@npm:3.973.6"
+  dependencies:
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@aws-sdk/xml-builder": "npm:^3.972.4"
+    "@smithy/core": "npm:^3.22.0"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/signature-v4": "npm:^5.3.8"
+    "@smithy/smithy-client": "npm:^4.11.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-base64": "npm:^4.3.0"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-utf8": "npm:^4.2.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/baa575be0fd2c1148452a115e4d2ff50155f5d4ca1b38b48e0ad8cb5446d76ade3e94f83e9441f435f7ad31d76d92e3cf23fb4a053003c5b2c4a04b7039124d2
   languageName: node
   linkType: hard
 
-"@aws-sdk/crc64-nvme@npm:^3.972.3":
-  version: 3.972.3
-  resolution: "@aws-sdk/crc64-nvme@npm:3.972.3"
+"@aws-sdk/crc64-nvme@npm:3.972.0":
+  version: 3.972.0
+  resolution: "@aws-sdk/crc64-nvme@npm:3.972.0"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/9390ce9e5b9e444022e5acadeee2c8bf2a9ef726527d5cd37dd4dde76fc4b51abee66558f8cb5d6c50cc58645a9006898d83688120dbaf2e90465437459cf813
+  checksum: 10c0/c756b934baa51a7582f5efc8a935b3ce3403f0574451ffa8769e2cecac4cd5f08e0c6f0d5cb85c3e3bcf34cbc475c10e9d8302265a5b1fbb37424b5ac2580a6f
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-env@npm:^3.972.13":
-  version: 3.972.13
-  resolution: "@aws-sdk/credential-provider-env@npm:3.972.13"
+"@aws-sdk/credential-provider-env@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/credential-provider-env@npm:3.972.4"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/5e5f6e7680ec5f3b0160ef648228e5270f570d8478b318d7fb3a4363fa0a246c535e1382d77eadceb2c10aafd9013ba8d6b70d91b0fc90a118865e408ddd9b4c
+  checksum: 10c0/f25d2dfa77222a515c6f388ee7050ee8caf99147dba52799bf7f0ec1884e7fb5ab722aa271651ca417afbc81d91c1ded0d16d2cf0327aa706ca91cbebbffb7d9
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-http@npm:^3.972.15":
-  version: 3.972.15
-  resolution: "@aws-sdk/credential-provider-http@npm:3.972.15"
-  dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/fetch-http-handler": "npm:^5.3.11"
-    "@smithy/node-http-handler": "npm:^4.4.12"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-stream": "npm:^4.5.15"
+"@aws-sdk/credential-provider-http@npm:^3.972.6":
+  version: 3.972.6
+  resolution: "@aws-sdk/credential-provider-http@npm:3.972.6"
+  dependencies:
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/fetch-http-handler": "npm:^5.3.9"
+    "@smithy/node-http-handler": "npm:^4.4.8"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/smithy-client": "npm:^4.11.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-stream": "npm:^4.5.10"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/48f1c95b51180e249755a59dcc839e5f118be5b57a16395f7c79435853a8cb62b21998bcef355653531a14e39be7a7503b13bdfc81f7c474f663fddf8770e318
-  languageName: node
-  linkType: hard
-
-"@aws-sdk/credential-provider-ini@npm:^3.972.13":
-  version: 3.972.13
-  resolution: "@aws-sdk/credential-provider-ini@npm:3.972.13"
-  dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/credential-provider-env": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-http": "npm:^3.972.15"
-    "@aws-sdk/credential-provider-login": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-process": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-sso": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-web-identity": "npm:^3.972.13"
-    "@aws-sdk/nested-clients": "npm:^3.996.3"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/credential-provider-imds": "npm:^4.2.10"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+  checksum: 10c0/6c1cee3976c857950b3a429dd10fd53343b4d57b8a05405f6a0af49bf9ec842eee6592bd936c01f07abad701256ca15be8b921b34a2fa6d70e178b2adfa05a6f
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/credential-provider-ini@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/credential-provider-ini@npm:3.972.4"
+  dependencies:
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/credential-provider-env": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-http": "npm:^3.972.6"
+    "@aws-sdk/credential-provider-login": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-process": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-sso": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-web-identity": "npm:^3.972.4"
+    "@aws-sdk/nested-clients": "npm:3.982.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/credential-provider-imds": "npm:^4.2.8"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/7f7e85bda8c970955bc8afc3720736d7254fff20c11d5431aca1c0cf286e3621d19037dd3fc7a48062fff2966693987d0f83988183ec852fbe10a2e8ac21f533
+  checksum: 10c0/a5c86d61d5299ce566d41522d3d1cdcf2963738548e6d742875b24193a1d444f3e5248875ae1d4e1760438972e448e3486927d6c5ec30d5e230ade542872ee1c
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-login@npm:^3.972.13":
-  version: 3.972.13
-  resolution: "@aws-sdk/credential-provider-login@npm:3.972.13"
+"@aws-sdk/credential-provider-login@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/credential-provider-login@npm:3.972.4"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/nested-clients": "npm:^3.996.3"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/nested-clients": "npm:3.982.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/ecea88131e1edb591f7b65651e07090fb9f426cc6f52a7a3806447506a8b9ebdafedcfff27c3d799b9c099f3898bac3fe50e91055ad7beaeb7317a3836de6b95
+  checksum: 10c0/6660a356b6315ccde07df5e0d3f89157fb69bf9daaad060fd5150357a18bbb96729e7425c7a1da20344d18f2bd92291bb41db8e82d4987745ada0f3fadc0d5a2
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-node@npm:^3.972.14":
-  version: 3.972.14
-  resolution: "@aws-sdk/credential-provider-node@npm:3.972.14"
+"@aws-sdk/credential-provider-node@npm:^3.972.5":
+  version: 3.972.5
+  resolution: "@aws-sdk/credential-provider-node@npm:3.972.5"
   dependencies:
-    "@aws-sdk/credential-provider-env": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-http": "npm:^3.972.15"
-    "@aws-sdk/credential-provider-ini": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-process": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-sso": "npm:^3.972.13"
-    "@aws-sdk/credential-provider-web-identity": "npm:^3.972.13"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/credential-provider-imds": "npm:^4.2.10"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/credential-provider-env": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-http": "npm:^3.972.6"
+    "@aws-sdk/credential-provider-ini": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-process": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-sso": "npm:^3.972.4"
+    "@aws-sdk/credential-provider-web-identity": "npm:^3.972.4"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/credential-provider-imds": "npm:^4.2.8"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/a0e83837a18674791d7bf8c9b31e60a0eb74bd7a254d59034679a82a2f406086e74ebd88fdd251a6d72b956d44c755c0f3383b4cce94f212dc50aa4891c40795
+  checksum: 10c0/6768c622206ac40cd6ba6f4bb3e703bdfc34d2166ff8728e1b9d4d4b835a69c39c587b346f348ba870089dedd076f8fa85a47fc257664fe26e5e9f1c04883acd
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-process@npm:^3.972.13":
-  version: 3.972.13
-  resolution: "@aws-sdk/credential-provider-process@npm:3.972.13"
+"@aws-sdk/credential-provider-process@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/credential-provider-process@npm:3.972.4"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/eac541e75099a50187f99ef4cbb26344deb7d76fa16a101561347d7596114ba0d928815b1d58f7e6a52f539bcb5101f23385b0b78863bbbb0f6063ed1a4a4b7a
+  checksum: 10c0/bb65d4b22e7cb97bf5999eaee0334e0497b2f7c0316b7e2b44329652566d09cc442a775a3d1c472ce9fa8bbaa4581b94f133fd561d7997bb7b4444276ac5b743
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-sso@npm:^3.972.13":
-  version: 3.972.13
-  resolution: "@aws-sdk/credential-provider-sso@npm:3.972.13"
+"@aws-sdk/credential-provider-sso@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/credential-provider-sso@npm:3.972.4"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/nested-clients": "npm:^3.996.3"
-    "@aws-sdk/token-providers": "npm:3.999.0"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/client-sso": "npm:3.982.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/token-providers": "npm:3.982.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/17f5e9b83f2222fdf94719f973374880660a11d901260903034caf8f757bab56a463c6a982c09a375d7f6b5930eb13d3e296eee30cad9c064ec1179d2b26d6d6
+  checksum: 10c0/c8b0fcabfe029d7ade4cc0a8c4efbdbfad5e0fa69bde4d96228dfb36800bf42b42ec5bb8e3ffcc61d82c636c6c0a066280875e1b7a0638aef99ecc8d3f4d1596
   languageName: node
   linkType: hard
 
-"@aws-sdk/credential-provider-web-identity@npm:^3.972.13":
-  version: 3.972.13
-  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.972.13"
+"@aws-sdk/credential-provider-web-identity@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/credential-provider-web-identity@npm:3.972.4"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/nested-clients": "npm:^3.996.3"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/nested-clients": "npm:3.982.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/a5e56193198bdf9be33da37b13aac081efed0b0c46719bd41f426104294cbb5250e5a309265e7347b63b8a891467a8a0c418cbc9bc2158d4587ade466d3304ff
+  checksum: 10c0/6ac61dc6666eb96d0ba3c5af63aaf6298bb4e7fb69ef59ccac27ce93d8e75477dd9cbeeb7bea34ae4f91cfa6799892b484f3fdd6535272107e7f4d57966115bc
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-bucket-endpoint@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.972.6"
+"@aws-sdk/middleware-bucket-endpoint@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-bucket-endpoint@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
+    "@aws-sdk/types": "npm:^3.973.1"
     "@aws-sdk/util-arn-parser": "npm:^3.972.2"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-config-provider": "npm:^4.2.1"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-config-provider": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/c0ac2400ffc62744fbcfd3a99170f2218e9bd3294a3375bbef8a1bbe06168014415e6010fb43052dccb18fbde4e66a705ba0ea11462c8aad94e663b68aba4168
+  checksum: 10c0/391c8f6d514c41543c6a66578ce6d7d29c9cf8677d9a4d07bc0cae27418fb47b65e8104a7a4f9ac2bc3d6ae2ce73dca3ed44fd7fbafb4bcb3cb06858bcae8230
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-expect-continue@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-expect-continue@npm:3.972.6"
+"@aws-sdk/middleware-expect-continue@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-expect-continue@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/98878b37ee46911194807c5ee7d277994cd038f0e18456bec9b8396b90bd21bcf244465b343b9f6c7dce408a5f6189d9509e2346307769ee9f4471e520089eb9
+  checksum: 10c0/69bcb15de22c3895df744d85eb668238fb7a307975b4e236c6c19f41f3c2f07a036de06db637abd8accbfadf06c557d3578ad71ac18ef71a3d52091f8ade5b87
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-flexible-checksums@npm:^3.973.1":
-  version: 3.973.1
-  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.973.1"
+"@aws-sdk/middleware-flexible-checksums@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/middleware-flexible-checksums@npm:3.972.4"
   dependencies:
     "@aws-crypto/crc32": "npm:5.2.0"
     "@aws-crypto/crc32c": "npm:5.2.0"
     "@aws-crypto/util": "npm:5.2.0"
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/crc64-nvme": "npm:^3.972.3"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/is-array-buffer": "npm:^4.2.1"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-stream": "npm:^4.5.15"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/crc64-nvme": "npm:3.972.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/is-array-buffer": "npm:^4.2.0"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-stream": "npm:^4.5.10"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/5dfcca0de1e8942596e550dc442f2253895ba51bada0557fa84d21f128509c7868896690dabf35be0f08e711b3ba3f39a2426c5b542b96861f1b3dd8ff6e9763
+  checksum: 10c0/1a87b03fe834e10287768162b219a3ef4c55c9adce3134c7f2b29ecb730e92aa141057889475855c8d1d6498a5e22381028d17a4b8dcc137f6dfc9f37506c634
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-host-header@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-host-header@npm:3.972.6"
+"@aws-sdk/middleware-host-header@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-host-header@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/53ee2ee8eeb5cf37080562312c05ee811f2185cf058b4ee0e39c7826e3823d5bf46b77db4fc272a32029a0e770c74f256edfed589ae74346af38fe1d2ca27685
+  checksum: 10c0/680a1934403b1544cbe1998ca22d684ff28bbbea78db8bea515bae80f7ede7ce762b2eb6fd5a56030b3a9a56a964e1c62ad40a8e2343e06862e1ccaa0cc3331b
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-location-constraint@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-location-constraint@npm:3.972.6"
+"@aws-sdk/middleware-location-constraint@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-location-constraint@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/391d425ad97b8d838ed51338f25409db282268f9f04e3ef289342e321b5cb07a48ef366d23b44a7004cb70edbd913d25dca4f1f27a43c871f096d182b15a835e
+  checksum: 10c0/a2a284f24147aaf2a5367cd280f6646700bec03bd5dc66e1db0cf871904d64d21d77f45767edc2cbe2d9ffbd7d55141ff30df0143cc63ae7fe8b89559916bbb5
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-logger@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-logger@npm:3.972.6"
+"@aws-sdk/middleware-logger@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-logger@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/5f8e7a681ab7cecb531f844b67c52a377d3fe472fd5526177eb28b49882c89474e7fd219f62c6ffaaec197fabc9beed5595cb52d8b93fe4109b98a4c289a76f9
+  checksum: 10c0/3cb6c1eddb7344f14f634fe1d6c9e7571ec8fe856ccf62dab71fae5fcef302f3b0e97d9ddb5ee90a427e14f28672cf406e8dadf30693e590f0d2a7eb1b439934
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-recursion-detection@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.972.6"
+"@aws-sdk/middleware-recursion-detection@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-recursion-detection@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
+    "@aws-sdk/types": "npm:^3.973.1"
     "@aws/lambda-invoke-store": "npm:^0.2.2"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/27105c07565e2866ef677f4ed40eab818ecafdc41fe2b9e7c846839131c8e8d77ae0d3f95440bf35d8262408c329b354b1510ebf5d1f93478ece21c1c009fa5b
+  checksum: 10c0/cc3e30e6968f18a5456c9b786b95579f688dd429422f6792211ebeaa462cf87186fd93996a8f034ce4abd95f39cfc0071c1cb801ad751be766617aac585cbb09
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-sdk-s3@npm:^3.972.15":
-  version: 3.972.15
-  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.972.15"
+"@aws-sdk/middleware-sdk-s3@npm:^3.972.6":
+  version: 3.972.6
+  resolution: "@aws-sdk/middleware-sdk-s3@npm:3.972.6"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/types": "npm:^3.973.4"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/types": "npm:^3.973.1"
     "@aws-sdk/util-arn-parser": "npm:^3.972.2"
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/signature-v4": "npm:^5.3.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-config-provider": "npm:^4.2.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-stream": "npm:^4.5.15"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/core": "npm:^3.22.0"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/signature-v4": "npm:^5.3.8"
+    "@smithy/smithy-client": "npm:^4.11.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-config-provider": "npm:^4.2.0"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-stream": "npm:^4.5.10"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/9895a46be6ea8035460dbb7190b2ba67d1ccb143f5edd8502129e795d3d73afafcb3a0b9aea8966293903d09f50b28f1da4402c9d75120fd6a5641ce440db278
+  checksum: 10c0/47a02069a24a7ed750ee15eea878d45d4aee11e119f3307100463a47d59ebd73f2b151620f2c78257aad8e6551644c3b03f7826685f302ed4168adadb8c07454
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-ssec@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/middleware-ssec@npm:3.972.6"
+"@aws-sdk/middleware-ssec@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/middleware-ssec@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/13af32722f45374e7aa04295331b49d9d894476f82afa832c892e3f85a5d70d3806b36975200e8b279a5b706b5c1eb4864eaa528a8da4b62dc3754e8fc71c123
+  checksum: 10c0/d4e1df3531947adbbd1cf64d89c5ad7b3596ffc471e83a32f555e0bd05e976d2bd183975689da60e4229bd0611cd53642a3b2355877348e99cdd3a1b7d4135ad
   languageName: node
   linkType: hard
 
-"@aws-sdk/middleware-user-agent@npm:^3.972.15":
-  version: 3.972.15
-  resolution: "@aws-sdk/middleware-user-agent@npm:3.972.15"
-  dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@aws-sdk/util-endpoints": "npm:^3.996.3"
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+"@aws-sdk/middleware-user-agent@npm:^3.972.6":
+  version: 3.972.6
+  resolution: "@aws-sdk/middleware-user-agent@npm:3.972.6"
+  dependencies:
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@aws-sdk/util-endpoints": "npm:3.982.0"
+    "@smithy/core": "npm:^3.22.0"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/bc9b57bc70cf949a51d728ae433bb6e2cc5d8a428144e0791ca6e8f810645093b3f2cd7f5361d99ff2ee846642920bbde8e9aba27fe2c5efd6e5835430b46246
+  checksum: 10c0/f1ca5fc20b8eef9061070d573f7d0aac1997017e538d0fd37a3bf628df38e81f0e7c28332cf4fbae429d36285f504b37e4ea2500f7cef06c92ed3c4fe25d2349
   languageName: node
   linkType: hard
 
-"@aws-sdk/nested-clients@npm:^3.996.3":
-  version: 3.996.3
-  resolution: "@aws-sdk/nested-clients@npm:3.996.3"
+"@aws-sdk/nested-clients@npm:3.982.0":
+  version: 3.982.0
+  resolution: "@aws-sdk/nested-clients@npm:3.982.0"
   dependencies:
     "@aws-crypto/sha256-browser": "npm:5.2.0"
     "@aws-crypto/sha256-js": "npm:5.2.0"
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/middleware-host-header": "npm:^3.972.6"
-    "@aws-sdk/middleware-logger": "npm:^3.972.6"
-    "@aws-sdk/middleware-recursion-detection": "npm:^3.972.6"
-    "@aws-sdk/middleware-user-agent": "npm:^3.972.15"
-    "@aws-sdk/region-config-resolver": "npm:^3.972.6"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@aws-sdk/util-endpoints": "npm:^3.996.3"
-    "@aws-sdk/util-user-agent-browser": "npm:^3.972.6"
-    "@aws-sdk/util-user-agent-node": "npm:^3.973.0"
-    "@smithy/config-resolver": "npm:^4.4.9"
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/fetch-http-handler": "npm:^5.3.11"
-    "@smithy/hash-node": "npm:^4.2.10"
-    "@smithy/invalid-dependency": "npm:^4.2.10"
-    "@smithy/middleware-content-length": "npm:^4.2.10"
-    "@smithy/middleware-endpoint": "npm:^4.4.20"
-    "@smithy/middleware-retry": "npm:^4.4.37"
-    "@smithy/middleware-serde": "npm:^4.2.11"
-    "@smithy/middleware-stack": "npm:^4.2.10"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/node-http-handler": "npm:^4.4.12"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/url-parser": "npm:^4.2.10"
-    "@smithy/util-base64": "npm:^4.3.1"
-    "@smithy/util-body-length-browser": "npm:^4.2.1"
-    "@smithy/util-body-length-node": "npm:^4.2.2"
-    "@smithy/util-defaults-mode-browser": "npm:^4.3.36"
-    "@smithy/util-defaults-mode-node": "npm:^4.2.39"
-    "@smithy/util-endpoints": "npm:^3.3.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-retry": "npm:^4.2.10"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/middleware-host-header": "npm:^3.972.3"
+    "@aws-sdk/middleware-logger": "npm:^3.972.3"
+    "@aws-sdk/middleware-recursion-detection": "npm:^3.972.3"
+    "@aws-sdk/middleware-user-agent": "npm:^3.972.6"
+    "@aws-sdk/region-config-resolver": "npm:^3.972.3"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@aws-sdk/util-endpoints": "npm:3.982.0"
+    "@aws-sdk/util-user-agent-browser": "npm:^3.972.3"
+    "@aws-sdk/util-user-agent-node": "npm:^3.972.4"
+    "@smithy/config-resolver": "npm:^4.4.6"
+    "@smithy/core": "npm:^3.22.0"
+    "@smithy/fetch-http-handler": "npm:^5.3.9"
+    "@smithy/hash-node": "npm:^4.2.8"
+    "@smithy/invalid-dependency": "npm:^4.2.8"
+    "@smithy/middleware-content-length": "npm:^4.2.8"
+    "@smithy/middleware-endpoint": "npm:^4.4.12"
+    "@smithy/middleware-retry": "npm:^4.4.29"
+    "@smithy/middleware-serde": "npm:^4.2.9"
+    "@smithy/middleware-stack": "npm:^4.2.8"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/node-http-handler": "npm:^4.4.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/smithy-client": "npm:^4.11.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
+    "@smithy/util-base64": "npm:^4.3.0"
+    "@smithy/util-body-length-browser": "npm:^4.2.0"
+    "@smithy/util-body-length-node": "npm:^4.2.1"
+    "@smithy/util-defaults-mode-browser": "npm:^4.3.28"
+    "@smithy/util-defaults-mode-node": "npm:^4.2.31"
+    "@smithy/util-endpoints": "npm:^3.2.8"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-retry": "npm:^4.2.8"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/fbb4633467d82635ed19508788cffa422d5bf55f5336114529e037db8ea8d0e428ee46793613243e86540cbf58317bf6a444bd81902de84be84522190e7790ca
+  checksum: 10c0/cf8b90bac196d73ba91ed8c71dce190b6f7c8dfad34108cd8017e5c08f23b27b0f2434f7bb22ff36be30bef84c75e3e57bbb87d54a2a26865538bb6bb12b7856
   languageName: node
   linkType: hard
 
-"@aws-sdk/region-config-resolver@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/region-config-resolver@npm:3.972.6"
+"@aws-sdk/region-config-resolver@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/region-config-resolver@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/config-resolver": "npm:^4.4.9"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/config-resolver": "npm:^4.4.6"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/01da247b934cb4bc4bb5e213a450d8c07b5a59faeee453c22cf909b0492e6ba4afe9082e169a9382a3587a2cd82bbf0bfd9288f8892da04c7ccb5bde43853eeb
+  checksum: 10c0/6682f729ba131b9067f7af77bcb49f3cae41668614e5c3b21ce8f091346a6961e852d0b72e15f262ad1fdccc9f4190680b35f756244cd691b6314b2866e071d9
   languageName: node
   linkType: hard
 
-"@aws-sdk/signature-v4-multi-region@npm:^3.996.3":
-  version: 3.996.3
-  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.996.3"
+"@aws-sdk/signature-v4-multi-region@npm:3.984.0":
+  version: 3.984.0
+  resolution: "@aws-sdk/signature-v4-multi-region@npm:3.984.0"
   dependencies:
-    "@aws-sdk/middleware-sdk-s3": "npm:^3.972.15"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/signature-v4": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/middleware-sdk-s3": "npm:^3.972.6"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/signature-v4": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/aaf8b90a55f4b12c231eafcb017c0155e2960b7fe02576b8dca30a446e9b315596e134e87875881839e053955c1499e28c72a9c94fee21a617cafe7333e0422d
+  checksum: 10c0/181ba83561b331955b63483bb91f13231e25b9e367ae910f34f46aa99a82f693e71fe807b886b4a16361dcac258d33d5a5fff83f5696eca0345b83818595c751
   languageName: node
   linkType: hard
 
-"@aws-sdk/token-providers@npm:3.999.0":
-  version: 3.999.0
-  resolution: "@aws-sdk/token-providers@npm:3.999.0"
+"@aws-sdk/token-providers@npm:3.982.0":
+  version: 3.982.0
+  resolution: "@aws-sdk/token-providers@npm:3.982.0"
   dependencies:
-    "@aws-sdk/core": "npm:^3.973.15"
-    "@aws-sdk/nested-clients": "npm:^3.996.3"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/core": "npm:^3.973.6"
+    "@aws-sdk/nested-clients": "npm:3.982.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/d51bb9e46a92846e9361a2cd29036422f5b0ff7207388e1bfb12d17e22e32541be3bdd43ce3f0ac29a0cd2cc65ab87b1bd787cf466a54800c1ed2b9cdb2e40c0
+  checksum: 10c0/255875330db17abba86353c558543aaad7b29fef57b336e8861fa559149a1b33906421bb059e602b8b2338f74dcad294195b04342dac3d32f996a9ecf4b5562e
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:^3.222.0, @aws-sdk/types@npm:^3.973.4":
+"@aws-sdk/types@npm:^3.222.0":
   version: 3.973.4
   resolution: "@aws-sdk/types@npm:3.973.4"
   dependencies:
@@ -639,6 +685,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@aws-sdk/types@npm:^3.973.1":
+  version: 3.973.1
+  resolution: "@aws-sdk/types@npm:3.973.1"
+  dependencies:
+    "@smithy/types": "npm:^4.12.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/8a4a183cc39b4d6f4d065ece884b50d397a54b17add32b649f49adbe676174e7bee2c3c94394fc5227a4fccb96c34482291a1eb2702158e1dbb12c441af32863
+  languageName: node
+  linkType: hard
+
 "@aws-sdk/util-arn-parser@npm:^3.972.2":
   version: 3.972.2
   resolution: "@aws-sdk/util-arn-parser@npm:3.972.2"
@@ -648,16 +704,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-endpoints@npm:^3.996.3":
-  version: 3.996.3
-  resolution: "@aws-sdk/util-endpoints@npm:3.996.3"
+"@aws-sdk/util-endpoints@npm:3.982.0":
+  version: 3.982.0
+  resolution: "@aws-sdk/util-endpoints@npm:3.982.0"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/url-parser": "npm:^4.2.10"
-    "@smithy/util-endpoints": "npm:^3.3.1"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
+    "@smithy/util-endpoints": "npm:^3.2.8"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/1ebdb4e53e80a5c8f8f742268bbbabd3834b58784e1f6f6015985865893261830e3143282d84a6b1730f069ccd66e0e5d41b1082738c6800b2dac70f189c7e58
+  languageName: node
+  linkType: hard
+
+"@aws-sdk/util-endpoints@npm:3.984.0":
+  version: 3.984.0
+  resolution: "@aws-sdk/util-endpoints@npm:3.984.0"
+  dependencies:
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
+    "@smithy/util-endpoints": "npm:^3.2.8"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/a8fa65d58c66de68c71085eb622f16fcb86c37e558a1e7a1ceeb6eb3ca0495e3920e54bcc8f53045ef8931d6298dc2e10ea759cffe8d41965359988ea9d99346
+  checksum: 10c0/5b49c27e11b94f3a505920b41e7a96be6cd3f370ccf2921d322f65f93ba4d50f99a0c32d9adc0d27500caa1b0ebd4491d6efe773d8f124c8272c9857a0ae4f1a
   languageName: node
   linkType: hard
 
@@ -670,44 +739,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-browser@npm:^3.972.6":
-  version: 3.972.6
-  resolution: "@aws-sdk/util-user-agent-browser@npm:3.972.6"
+"@aws-sdk/util-user-agent-browser@npm:^3.972.3":
+  version: 3.972.3
+  resolution: "@aws-sdk/util-user-agent-browser@npm:3.972.3"
   dependencies:
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/types": "npm:^4.12.0"
     bowser: "npm:^2.11.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/84154d72bca9f11d29918f26b9d4063791717fadffa5d7b165463c481e9df75d617af749ea58c5a3fa7acd15a02dc47ba67445d57f18f48a99b7bcee80d6e28b
+  checksum: 10c0/637f1396cfbca7b352ffaf332998c4223c35d0fa41431c106151a34c6bfe7c9e32e6a6dc7e75c495714e05f3729ae1f61996da923156c3edcb33e217e24328ad
   languageName: node
   linkType: hard
 
-"@aws-sdk/util-user-agent-node@npm:^3.973.0":
-  version: 3.973.0
-  resolution: "@aws-sdk/util-user-agent-node@npm:3.973.0"
+"@aws-sdk/util-user-agent-node@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/util-user-agent-node@npm:3.972.4"
   dependencies:
-    "@aws-sdk/middleware-user-agent": "npm:^3.972.15"
-    "@aws-sdk/types": "npm:^3.973.4"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@aws-sdk/middleware-user-agent": "npm:^3.972.6"
+    "@aws-sdk/types": "npm:^3.973.1"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
   peerDependencies:
     aws-crt: ">=1.0.0"
   peerDependenciesMeta:
     aws-crt:
       optional: true
-  checksum: 10c0/1039f441a6d8fc6bf0031c431a964e362c8cb113be8fe8963cab02ad7022c36c30fa502ea86a2d3b8888e6adbc5b2310b7a4d3ed5bbe89a2797d414e8d5250d8
+  checksum: 10c0/2168c3be4dcdca97289a1d863a00026fb0ee66f3861a90c9b3abba342089ed6d50f1d4b6545047a1f6a98e968614100e8cd8b73856f24b12695bc7e116ef92cb
   languageName: node
   linkType: hard
 
-"@aws-sdk/xml-builder@npm:^3.972.8":
-  version: 3.972.8
-  resolution: "@aws-sdk/xml-builder@npm:3.972.8"
+"@aws-sdk/xml-builder@npm:^3.972.4":
+  version: 3.972.4
+  resolution: "@aws-sdk/xml-builder@npm:3.972.4"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
-    fast-xml-parser: "npm:5.3.6"
+    "@smithy/types": "npm:^4.12.0"
+    fast-xml-parser: "npm:5.3.4"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/867579db08cfedef6da90c042a83f00dc8a52fc7ccfb2dd9ba42e0a20f4d3654ae8bbd1075ea8aca44f3c7cd35376729f1d73a59a87b30395081c42322d03ce9
+  checksum: 10c0/6ed7ace0e74902ddb1075404312182330827b9cc23439676f8a076bd90d10115232854e8e5512fd6a85c290c88b5b381b98b9bf79f573f5eb05b49e944d49f02
   languageName: node
   linkType: hard
 
@@ -800,6 +869,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.28.6":
+  version: 7.28.6
+  resolution: "@babel/generator@npm:7.28.6"
+  dependencies:
+    "@babel/parser": "npm:^7.28.6"
+    "@babel/types": "npm:^7.28.6"
+    "@jridgewell/gen-mapping": "npm:^0.3.12"
+    "@jridgewell/trace-mapping": "npm:^0.3.28"
+    jsesc: "npm:^3.0.2"
+  checksum: 10c0/162fa358484a9a18e8da1235d998f10ea77c63bab408c8d3e327d5833f120631a77ff022c5ed1d838ee00523f8bb75df1f08196d3657d0bca9f2cfeb8503cc12
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:^7.29.0, @babel/generator@npm:^7.7.2":
   version: 7.29.1
   resolution: "@babel/generator@npm:7.29.1"
@@ -2130,7 +2212,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.28.5, @babel/traverse@npm:^7.28.6, @babel/traverse@npm:^7.29.0, @babel/traverse@npm:^7.7.2":
+"@babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.28.5, @babel/traverse@npm:^7.28.6, @babel/traverse@npm:^7.7.2":
+  version: 7.28.6
+  resolution: "@babel/traverse@npm:7.28.6"
+  dependencies:
+    "@babel/code-frame": "npm:^7.28.6"
+    "@babel/generator": "npm:^7.28.6"
+    "@babel/helper-globals": "npm:^7.28.0"
+    "@babel/parser": "npm:^7.28.6"
+    "@babel/template": "npm:^7.28.6"
+    "@babel/types": "npm:^7.28.6"
+    debug: "npm:^4.3.1"
+  checksum: 10c0/ed5deb9c3f03e2d1ad2d44b9c92c84cce24593245c3f7871ce27ee1b36d98034e6cd895fa98a94eb44ebabe1d22f51b10b09432939d1c51a0fcaab98f17a97bc
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:^7.29.0":
   version: 7.29.0
   resolution: "@babel/traverse@npm:7.29.0"
   dependencies:
@@ -2145,7 +2242,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.5, @babel/types@npm:^7.28.6, @babel/types@npm:^7.29.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.5, @babel/types@npm:^7.28.6, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4":
+  version: 7.28.6
+  resolution: "@babel/types@npm:7.28.6"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.27.1"
+    "@babel/helper-validator-identifier": "npm:^7.28.5"
+  checksum: 10c0/54a6a9813e48ef6f35aa73c03b3c1572cad7fa32b61b35dd07e4230bc77b559194519c8a4d8106a041a27cc7a94052579e238a30a32d5509aa4da4d6fd83d990
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.29.0":
   version: 7.29.0
   resolution: "@babel/types@npm:7.29.0"
   dependencies:
@@ -2156,10 +2263,10 @@ __metadata:
   linkType: hard
 
 "@base-ui/utils@npm:^0.2.3":
-  version: 0.2.5
-  resolution: "@base-ui/utils@npm:0.2.5"
+  version: 0.2.4
+  resolution: "@base-ui/utils@npm:0.2.4"
   dependencies:
-    "@babel/runtime": "npm:^7.28.6"
+    "@babel/runtime": "npm:^7.28.4"
     "@floating-ui/utils": "npm:^0.2.10"
     reselect: "npm:^5.1.1"
     use-sync-external-store: "npm:^1.6.0"
@@ -2170,7 +2277,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 10c0/c871763ab132f6373895eef41477ff5a263330bc926317ed625226909ccb230109b1282556913eebd692094342644d7447a6f7bcb61aa8d6b0c60965ad3724a7
+  checksum: 10c0/98305af23d44fb42a2c331a95a0d90be1008a183dfaf767b3804f0962cee7d339d71d29732b2cb102b32f2b9c0ca5b756d5ca47d9c654673e72e4dbf4dba7f07
   languageName: node
   linkType: hard
 
@@ -2181,17 +2288,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@bramus/specificity@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "@bramus/specificity@npm:2.4.2"
-  dependencies:
-    css-tree: "npm:^3.0.0"
-  bin:
-    specificity: bin/cli.js
-  checksum: 10c0/c5f4e04e0bca0d2202598207a5eb0733c8109d12a68a329caa26373bec598d99db5bb785b8865fefa00fc01b08c6068138807ceb11a948fe15e904ed6cf4ba72
-  languageName: node
-  linkType: hard
-
 "@codemirror/autocomplete@npm:^6.0.0, @codemirror/autocomplete@npm:^6.20.0":
   version: 6.20.0
   resolution: "@codemirror/autocomplete@npm:6.20.0"
@@ -2205,14 +2301,14 @@ __metadata:
   linkType: hard
 
 "@codemirror/commands@npm:^6.0.0, @codemirror/commands@npm:^6.1.0":
-  version: 6.10.2
-  resolution: "@codemirror/commands@npm:6.10.2"
+  version: 6.10.1
+  resolution: "@codemirror/commands@npm:6.10.1"
   dependencies:
     "@codemirror/language": "npm:^6.0.0"
     "@codemirror/state": "npm:^6.4.0"
     "@codemirror/view": "npm:^6.27.0"
     "@lezer/common": "npm:^1.1.0"
-  checksum: 10c0/b7b99083f518f022f2a27095f240c2caae1d456852b58a7e33d35061418f18aeb5cc2ff2f888bda19d4dca78d89809c7d25614924e158f40208e22deef854f07
+  checksum: 10c0/1841d8ad6751f0d10d10200e81333c5c9b0d6afb55692e41df85992a3737abc8c2ee97e14816ce624276381fbb0261e7aaf8474e170b74f796c3ba62500be3da
   languageName: node
   linkType: hard
 
@@ -2232,8 +2328,8 @@ __metadata:
   linkType: hard
 
 "@codemirror/language@npm:^6.0.0, @codemirror/language@npm:^6.6.0":
-  version: 6.12.2
-  resolution: "@codemirror/language@npm:6.12.2"
+  version: 6.12.1
+  resolution: "@codemirror/language@npm:6.12.1"
   dependencies:
     "@codemirror/state": "npm:^6.0.0"
     "@codemirror/view": "npm:^6.23.0"
@@ -2241,18 +2337,18 @@ __metadata:
     "@lezer/highlight": "npm:^1.0.0"
     "@lezer/lr": "npm:^1.0.0"
     style-mod: "npm:^4.0.0"
-  checksum: 10c0/7a167eca996970f08a58b864b3ec37246c152c37cb4a31dcf13d6154232b968c45e0e17296050784ecc279100c2b40313f26681164d6628f6a6e9b8927ae58a7
+  checksum: 10c0/d37e526a839f571f767372c49e28649c4e79a539c73845a74117ee408ad31c29d60a32b5e1bad439637b1456d18154d672eb225e9b4482d3e00eca150461bc6a
   languageName: node
   linkType: hard
 
 "@codemirror/lint@npm:^6.0.0":
-  version: 6.9.4
-  resolution: "@codemirror/lint@npm:6.9.4"
+  version: 6.9.3
+  resolution: "@codemirror/lint@npm:6.9.3"
   dependencies:
     "@codemirror/state": "npm:^6.0.0"
     "@codemirror/view": "npm:^6.35.0"
     crelt: "npm:^1.0.5"
-  checksum: 10c0/ae11d4d61250010732b10e4d392bd987c78afbc06ea4ccc351b57050bb5ffc74a866e5efdd7b05684d899330d4913c81b88fb7b4a0ff9762f689722ec889c7aa
+  checksum: 10c0/729af1fc39ced59edb5ad73ef95a71df8e4a7ed7bccac53bac3e6232a4f018f5d8b2b1c320eb014f5ba07a1a0e53fbc094907679e017dc5f3b5707765b2c6541
   languageName: node
   linkType: hard
 
@@ -2289,14 +2385,14 @@ __metadata:
   linkType: hard
 
 "@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0, @codemirror/view@npm:^6.27.0, @codemirror/view@npm:^6.35.0, @codemirror/view@npm:^6.37.0":
-  version: 6.39.15
-  resolution: "@codemirror/view@npm:6.39.15"
+  version: 6.39.12
+  resolution: "@codemirror/view@npm:6.39.12"
   dependencies:
     "@codemirror/state": "npm:^6.5.0"
     crelt: "npm:^1.0.6"
     style-mod: "npm:^4.1.0"
     w3c-keyname: "npm:^2.2.4"
-  checksum: 10c0/bdcae5b2c6b86cd20c4aad6dbacb8876c83c3e4976414596477fbd185714ee3649c06b4549804495635d9427aa02316fee7eb085ee188b8a60e0aa67d09b3553
+  checksum: 10c0/b5584fbe3f642fb3c5b35a7e1e36be9432b2967b5a937d31f89d311e83b3f9190c2bbdacfedeb6c10b294b2d9d8c3c54d49eb23790e5ff9193b438e6d21f1a2b
   languageName: node
   linkType: hard
 
@@ -2307,33 +2403,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "@csstools/color-helpers@npm:6.0.2"
-  checksum: 10c0/4c66574563d7c960010c11e41c2673675baff07c427cca6e8dddffa5777de45770d13ff3efce1c0642798089ad55de52870d9d8141f78db3fa5bba012f2d3789
+"@csstools/color-helpers@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "@csstools/color-helpers@npm:6.0.1"
+  checksum: 10c0/866844267d5aa5a02fe9d54f6db6fc18f6306595edb03664cc8ef15c99d3e6f3b42eb1a413c98bafa5b2dc0d8e0193da9b3bcc9d6a04f5de74cbd44935e74b3c
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@csstools/css-calc@npm:3.1.1"
+"@csstools/css-calc@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/css-calc@npm:3.0.0"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^4.0.0
     "@csstools/css-tokenizer": ^4.0.0
-  checksum: 10c0/6efcc016d988edf66e54c7bad03e352d61752cbd1b56c7557fd013868aab23505052ded8f912cd4034e216943ea1e04c957d81012489e3eddc14a57b386510ef
+  checksum: 10c0/2f062db206dcdcb561a802d791aaf8b410f0e4d91ded89eb4075f75f1eafe8f5392c431a8d602d6ae660fca6299e02fcc555efdb235f3403ffc56ac6f14a1c2b
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@csstools/css-color-parser@npm:4.0.2"
+"@csstools/css-color-parser@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "@csstools/css-color-parser@npm:4.0.1"
   dependencies:
-    "@csstools/color-helpers": "npm:^6.0.2"
-    "@csstools/css-calc": "npm:^3.1.1"
+    "@csstools/color-helpers": "npm:^6.0.1"
+    "@csstools/css-calc": "npm:^3.0.0"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^4.0.0
     "@csstools/css-tokenizer": ^4.0.0
-  checksum: 10c0/487cf507ef4630f74bd67d84298294ed269900b206ade015a968d20047e07ff46f235b72e26fe0c6b949a03f8f9f00a22c363da49c1b06ca60b32d0188e546be
+  checksum: 10c0/c46be5b9f5c0ef3cd25b47a71bd2a4d1c4856b123ecba4abe8eaa0688d3fc47f58fa67ea281d6b9efca4b9fdfa88fb045c51d0f9b8c612a56bd546d38260b138
   languageName: node
   linkType: hard
 
@@ -2346,10 +2442,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-syntax-patches-for-csstree@npm:^1.0.28":
-  version: 1.0.28
-  resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.0.28"
-  checksum: 10c0/d3334499545a4d7abdd7b18364c055aec22f66323828af9b87a9adb43153e0e12319876c5ab128b972605f21da60cb05857f4d143eac9ddffe51c33f3dfb7fff
+"@csstools/css-syntax-patches-for-csstree@npm:^1.0.21":
+  version: 1.0.26
+  resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.0.26"
+  checksum: 10c0/65ac2a9e3a6908ce503ae1ba354c59ffdda04fef1f4c6e2b64f083c2896fe24fd775861e693e0eb2f84a1e7e0d333eab0fa26b5873268945833b62d7fae97404
   languageName: node
   linkType: hard
 
@@ -2595,26 +2691,26 @@ __metadata:
   linkType: hard
 
 "@eslint/eslintrc@npm:^3.3.1":
-  version: 3.3.4
-  resolution: "@eslint/eslintrc@npm:3.3.4"
+  version: 3.3.3
+  resolution: "@eslint/eslintrc@npm:3.3.3"
   dependencies:
-    ajv: "npm:^6.14.0"
+    ajv: "npm:^6.12.4"
     debug: "npm:^4.3.2"
     espree: "npm:^10.0.1"
     globals: "npm:^14.0.0"
     ignore: "npm:^5.2.0"
     import-fresh: "npm:^3.2.1"
     js-yaml: "npm:^4.1.1"
-    minimatch: "npm:^3.1.3"
+    minimatch: "npm:^3.1.2"
     strip-json-comments: "npm:^3.1.1"
-  checksum: 10c0/1fe481a6af03c09be8d92d67e2bbf693b7522b0591934bfb44bd13e297649b13e4ec5e3fc70b02e4497a17c1afbfa22f5bf5efa4fc06a24abace8e5d097fec8c
+  checksum: 10c0/532c7acc7ddd042724c28b1f020bd7bf148fcd4653bb44c8314168b5f772508c842ce4ee070299cac51c5c5757d2124bdcfcef5551c8c58ff9986e3e17f2260d
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.39.3":
-  version: 9.39.3
-  resolution: "@eslint/js@npm:9.39.3"
-  checksum: 10c0/df1c70d6681c8daf4a3c86dfac159fcd98a73c4620c4fbe2be6caab1f30a34c7de0ad88ab0e81162376d2cde1a2eed1c32eff5f917ca369870930a51f8e818f1
+"@eslint/js@npm:9.39.2":
+  version: 9.39.2
+  resolution: "@eslint/js@npm:9.39.2"
+  checksum: 10c0/00f51c52b04ac79faebfaa65a9652b2093b9c924e945479f1f3945473f78aee83cbc76c8d70bbffbf06f7024626575b16d97b66eab16182e1d0d39daff2f26f5
   languageName: node
   linkType: hard
 
@@ -2635,15 +2731,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@exodus/bytes@npm:^1.11.0, @exodus/bytes@npm:^1.6.0":
-  version: 1.14.1
-  resolution: "@exodus/bytes@npm:1.14.1"
+"@exodus/bytes@npm:^1.6.0":
+  version: 1.11.0
+  resolution: "@exodus/bytes@npm:1.11.0"
   peerDependencies:
     "@noble/hashes": ^1.8.0 || ^2.0.0
   peerDependenciesMeta:
     "@noble/hashes":
       optional: true
-  checksum: 10c0/486dad30992a8c81058b6b59341ee934c10a7e8016b440770de0f86d2e270950c5d37fc6724ea017295b8654c7564abf6a21cc49bed569d74721b545f571e416
+  checksum: 10c0/85d0b296cef91ee90f89f17b3a2cd23fa33bda4ae7b96545e9b8e2e68d64c0280eb3cefb77fc3f59f82377379ee7a52a5a5b3a9f99e45fca4166e5e2fa4c0939
   languageName: node
   linkType: hard
 
@@ -2735,15 +2831,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gar/promise-retry@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "@gar/promise-retry@npm:1.0.2"
-  dependencies:
-    retry: "npm:^0.13.1"
-  checksum: 10c0/748a84fb0ab962f7867966f21dc24d1872c53c1656dd3352320fe69ad3b2043f2dfdb3be024c7636ce4904c5ba1da22d0f3558e489c3de578f5bb520f062d0fd
-  languageName: node
-  linkType: hard
-
 "@godaddy/terminus@npm:^4.12.1":
   version: 4.12.1
   resolution: "@godaddy/terminus@npm:4.12.1"
@@ -3114,12 +3201,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jsonjoy.com/base64@npm:17.67.0":
-  version: 17.67.0
-  resolution: "@jsonjoy.com/base64@npm:17.67.0"
+"@jsonjoy.com/base64@npm:17.65.0":
+  version: 17.65.0
+  resolution: "@jsonjoy.com/base64@npm:17.65.0"
   peerDependencies:
     tslib: 2
-  checksum: 10c0/d9616ec1ac0ea6aa455968b1f96f2d48ce38a2b1835922a909a55147d7b8cff3d648d45e9efe6781c6926beb5f04dc41c75ce548b6b84141b14bc122893e16ee
+  checksum: 10c0/44d014fa409e31379fbf4e19f95483dd988bbffb69b005840fdf1efe9900bf8abbce395fa37d4249607674fea552ce858cf427912510f6f37b4f2d18b646b488
   languageName: node
   linkType: hard
 
@@ -3132,6 +3219,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jsonjoy.com/buffers@npm:17.65.0":
+  version: 17.65.0
+  resolution: "@jsonjoy.com/buffers@npm:17.65.0"
+  peerDependencies:
+    tslib: 2
+  checksum: 10c0/493ca68067d6ae5ee12623223f63f538f1b2a5ab606288d214763c4a16f5698e42bb1f86a718ea163b747f5fb17490849959ce89af76691e21a8f31627d75746
+  languageName: node
+  linkType: hard
+
 "@jsonjoy.com/buffers@npm:17.67.0, @jsonjoy.com/buffers@npm:^17.65.0":
   version: 17.67.0
   resolution: "@jsonjoy.com/buffers@npm:17.67.0"
@@ -3150,6 +3246,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jsonjoy.com/codegen@npm:17.65.0":
+  version: 17.65.0
+  resolution: "@jsonjoy.com/codegen@npm:17.65.0"
+  peerDependencies:
+    tslib: 2
+  checksum: 10c0/c34c4d54bc50330e4c593d58ca02f119c8d15f5d752ab9a33ac95366ef3de81cc66954400a0d890ab8ba91f2513df7b2ddc01c957c3f23f439eee2376c0c99a4
+  languageName: node
+  linkType: hard
+
 "@jsonjoy.com/codegen@npm:17.67.0":
   version: 17.67.0
   resolution: "@jsonjoy.com/codegen@npm:17.67.0"
@@ -3290,31 +3395,31 @@ __metadata:
   linkType: hard
 
 "@jsonjoy.com/json-pack@npm:^17.65.0":
-  version: 17.67.0
-  resolution: "@jsonjoy.com/json-pack@npm:17.67.0"
-  dependencies:
-    "@jsonjoy.com/base64": "npm:17.67.0"
-    "@jsonjoy.com/buffers": "npm:17.67.0"
-    "@jsonjoy.com/codegen": "npm:17.67.0"
-    "@jsonjoy.com/json-pointer": "npm:17.67.0"
-    "@jsonjoy.com/util": "npm:17.67.0"
+  version: 17.65.0
+  resolution: "@jsonjoy.com/json-pack@npm:17.65.0"
+  dependencies:
+    "@jsonjoy.com/base64": "npm:17.65.0"
+    "@jsonjoy.com/buffers": "npm:17.65.0"
+    "@jsonjoy.com/codegen": "npm:17.65.0"
+    "@jsonjoy.com/json-pointer": "npm:17.65.0"
+    "@jsonjoy.com/util": "npm:17.65.0"
     hyperdyperid: "npm:^1.2.0"
     thingies: "npm:^2.5.0"
     tree-dump: "npm:^1.1.0"
   peerDependencies:
     tslib: 2
-  checksum: 10c0/fee56d024c84f031ef011a85ccca071c73b8a0739506083bd3dc7a17c720a498599f285e79082a9626314324ea938f189d18d47a03341cb76286ca2e7098bf53
+  checksum: 10c0/e5db5601d98262c4ae4b371fe9afa1ee6c40630488949a18971a807d3d7f180e6b463ad36b1b4ff5212fd2eaf1f07cf611e059a4b846c0d8feae4a64a624f996
   languageName: node
   linkType: hard
 
-"@jsonjoy.com/json-pointer@npm:17.67.0":
-  version: 17.67.0
-  resolution: "@jsonjoy.com/json-pointer@npm:17.67.0"
+"@jsonjoy.com/json-pointer@npm:17.65.0":
+  version: 17.65.0
+  resolution: "@jsonjoy.com/json-pointer@npm:17.65.0"
   dependencies:
-    "@jsonjoy.com/util": "npm:17.67.0"
+    "@jsonjoy.com/util": "npm:17.65.0"
   peerDependencies:
     tslib: 2
-  checksum: 10c0/763e0b1bc274390a605073b49e5bf55bdf386e784f5940d456faca958d90915b7d9a47dd9d58a08e2113f40167b0640d313897811680eb91630726920618fe7d
+  checksum: 10c0/3f3125204f2462e7b1fdb2d8f0a917713040dc5ab89458a529b524ce399aef6bda7105cbf661ef30e254514a73147d6c6c863bfd89d7fb8f386ac7d5a5605696
   languageName: node
   linkType: hard
 
@@ -3330,15 +3435,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jsonjoy.com/util@npm:17.67.0, @jsonjoy.com/util@npm:^17.65.0":
-  version: 17.67.0
-  resolution: "@jsonjoy.com/util@npm:17.67.0"
+"@jsonjoy.com/util@npm:17.65.0":
+  version: 17.65.0
+  resolution: "@jsonjoy.com/util@npm:17.65.0"
   dependencies:
-    "@jsonjoy.com/buffers": "npm:17.67.0"
-    "@jsonjoy.com/codegen": "npm:17.67.0"
+    "@jsonjoy.com/buffers": "npm:17.65.0"
+    "@jsonjoy.com/codegen": "npm:17.65.0"
   peerDependencies:
     tslib: 2
-  checksum: 10c0/44be53d94c99ce74a0eff1bb111f0ff4392a1226e34637321c8bc45b569da3f9e12db8b225eef3694c44b9fd2e9b800d7baf5ea0d38e1d7767bfcbef4fbf91b0
+  checksum: 10c0/c8eb05d060760fae99fd76f7d86ac8a5a6ef645af2325f8146f788c517fff59a8f308637136fdebebf481b45784a15f0093efb1f79425605a9039a523f1c0f3d
   languageName: node
   linkType: hard
 
@@ -3354,6 +3459,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jsonjoy.com/util@npm:^17.65.0":
+  version: 17.67.0
+  resolution: "@jsonjoy.com/util@npm:17.67.0"
+  dependencies:
+    "@jsonjoy.com/buffers": "npm:17.67.0"
+    "@jsonjoy.com/codegen": "npm:17.67.0"
+  peerDependencies:
+    tslib: 2
+  checksum: 10c0/44be53d94c99ce74a0eff1bb111f0ff4392a1226e34637321c8bc45b569da3f9e12db8b225eef3694c44b9fd2e9b800d7baf5ea0d38e1d7767bfcbef4fbf91b0
+  languageName: node
+  linkType: hard
+
 "@leichtgewicht/ip-codec@npm:^2.0.1":
   version: 2.0.5
   resolution: "@leichtgewicht/ip-codec@npm:2.0.5"
@@ -3404,22 +3521,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/core-downloads-tracker@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "@mui/core-downloads-tracker@npm:7.3.8"
-  checksum: 10c0/bbce4375e47b8ef46af762d8837e006ccca26cc56c0efb34ac497a090e7e9fff868ea2dd423d3c28c4cf51ff9e4fbbb024d3afe1d19849533b06e6924fcfc4e9
+"@mui/core-downloads-tracker@npm:^7.3.7":
+  version: 7.3.7
+  resolution: "@mui/core-downloads-tracker@npm:7.3.7"
+  checksum: 10c0/a1352bb47e1d9dc8dad3c33f7f2f8e544806d7a2de40049a3f24cbde8c7a101b6d54fcd251bd0051ab55303ffef1355eb567c8cf5447918797ea0ca920b1a097
   languageName: node
   linkType: hard
 
 "@mui/material@npm:^7.3.7":
-  version: 7.3.8
-  resolution: "@mui/material@npm:7.3.8"
+  version: 7.3.7
+  resolution: "@mui/material@npm:7.3.7"
   dependencies:
-    "@babel/runtime": "npm:^7.28.6"
-    "@mui/core-downloads-tracker": "npm:^7.3.8"
-    "@mui/system": "npm:^7.3.8"
-    "@mui/types": "npm:^7.4.11"
-    "@mui/utils": "npm:^7.3.8"
+    "@babel/runtime": "npm:^7.28.4"
+    "@mui/core-downloads-tracker": "npm:^7.3.7"
+    "@mui/system": "npm:^7.3.7"
+    "@mui/types": "npm:^7.4.10"
+    "@mui/utils": "npm:^7.3.7"
     "@popperjs/core": "npm:^2.11.8"
     "@types/react-transition-group": "npm:^4.4.12"
     clsx: "npm:^2.1.1"
@@ -3430,7 +3547,7 @@ __metadata:
   peerDependencies:
     "@emotion/react": ^11.5.0
     "@emotion/styled": ^11.3.0
-    "@mui/material-pigment-css": ^7.3.8
+    "@mui/material-pigment-css": ^7.3.7
     "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
     react: ^17.0.0 || ^18.0.0 || ^19.0.0
     react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -3443,16 +3560,16 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 10c0/065b97627cfdb7dd6237ff4437639c5d8df610e844bfa6f8c84e647d1f7bb0157cfd7b1938cf371d2b281d8bf85580c8b405638d741aae797ff64ee3b98943fc
+  checksum: 10c0/e9355505d34cea112f9aef2498af415666b12a78985ec5a936918d14202ef10e7da7cce9d5480dca86af25e307424d93e6d72b04c78446b3fd70536cc5559c62
   languageName: node
   linkType: hard
 
-"@mui/private-theming@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "@mui/private-theming@npm:7.3.8"
+"@mui/private-theming@npm:^7.3.7":
+  version: 7.3.7
+  resolution: "@mui/private-theming@npm:7.3.7"
   dependencies:
-    "@babel/runtime": "npm:^7.28.6"
-    "@mui/utils": "npm:^7.3.8"
+    "@babel/runtime": "npm:^7.28.4"
+    "@mui/utils": "npm:^7.3.7"
     prop-types: "npm:^15.8.1"
   peerDependencies:
     "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -3460,15 +3577,15 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 10c0/4e7f1528dcaf00a036ee03a430569d66fe66313c2e11d6d70df705a54cb15e88af00e69ef55de2182ea86966c66d9f9f7e4d389059a8213901159fb03ecd679d
+  checksum: 10c0/aa848bea257f0c4a6a8784ab71aa7189aa31a2a98f02628c783c956a25e759be71a65d7809688c6ac1835504d21e798123aeb3eeaedea1473a16337e60a5d50c
   languageName: node
   linkType: hard
 
-"@mui/styled-engine@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "@mui/styled-engine@npm:7.3.8"
+"@mui/styled-engine@npm:^7.3.7":
+  version: 7.3.7
+  resolution: "@mui/styled-engine@npm:7.3.7"
   dependencies:
-    "@babel/runtime": "npm:^7.28.6"
+    "@babel/runtime": "npm:^7.28.4"
     "@emotion/cache": "npm:^11.14.0"
     "@emotion/serialize": "npm:^1.3.3"
     "@emotion/sheet": "npm:^1.4.0"
@@ -3483,19 +3600,19 @@ __metadata:
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 10c0/44defb63e5c489943c36c6b0a8551093389a65429c9c2cf21fe5f3fb338962a45f5fd57300a64c965de43be755424b65aef762944a55e2de862018d99b82f6a8
+  checksum: 10c0/7350f45ea8314643ffc95430b9cc980d0a88d3144629af1deb2842c9aea62d34d8736dfa8197bb51e28785e56144b252fdbb7904c7800d69c547f479bca87805
   languageName: node
   linkType: hard
 
-"@mui/system@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "@mui/system@npm:7.3.8"
+"@mui/system@npm:^7.3.7":
+  version: 7.3.7
+  resolution: "@mui/system@npm:7.3.7"
   dependencies:
-    "@babel/runtime": "npm:^7.28.6"
-    "@mui/private-theming": "npm:^7.3.8"
-    "@mui/styled-engine": "npm:^7.3.8"
-    "@mui/types": "npm:^7.4.11"
-    "@mui/utils": "npm:^7.3.8"
+    "@babel/runtime": "npm:^7.28.4"
+    "@mui/private-theming": "npm:^7.3.7"
+    "@mui/styled-engine": "npm:^7.3.7"
+    "@mui/types": "npm:^7.4.10"
+    "@mui/utils": "npm:^7.3.7"
     clsx: "npm:^2.1.1"
     csstype: "npm:^3.2.3"
     prop-types: "npm:^15.8.1"
@@ -3511,7 +3628,21 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 10c0/e584af421b553c1ab11783a769c26ca38f2415d71ffd0fc7296e299e47ab0650d35c6be408f8486239b1eab78481af8a663615c758f96bc1e8290482afcc0c22
+  checksum: 10c0/0b020d39812431e29ac20ebc0ce1317750d108633237a27f6fb595824eb1f979ffd283e8a89f2487ea1d658aee18c23d68226f6efa2bdfd621493a4aabcf1e74
+  languageName: node
+  linkType: hard
+
+"@mui/types@npm:^7.4.10":
+  version: 7.4.10
+  resolution: "@mui/types@npm:7.4.10"
+  dependencies:
+    "@babel/runtime": "npm:^7.28.4"
+  peerDependencies:
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 10c0/2e1e807795dcb6f5bdb62eb49068a7f4414299c62f55ceaaa05925a1d043799216150873c00c02f086fd631f7171c97ea416dc66c099c98649503ee3046dab3d
   languageName: node
   linkType: hard
 
@@ -3529,7 +3660,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/utils@npm:^7.3.5, @mui/utils@npm:^7.3.8":
+"@mui/utils@npm:^7.3.5":
   version: 7.3.8
   resolution: "@mui/utils@npm:7.3.8"
   dependencies:
@@ -3549,9 +3680,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@mui/utils@npm:^7.3.7":
+  version: 7.3.7
+  resolution: "@mui/utils@npm:7.3.7"
+  dependencies:
+    "@babel/runtime": "npm:^7.28.4"
+    "@mui/types": "npm:^7.4.10"
+    "@types/prop-types": "npm:^15.7.15"
+    clsx: "npm:^2.1.1"
+    prop-types: "npm:^15.8.1"
+    react-is: "npm:^19.2.3"
+  peerDependencies:
+    "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
+    react: ^17.0.0 || ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
+    "@types/react":
+      optional: true
+  checksum: 10c0/2732a01a24968c8fe73b1cf3c7afabffd8a5f13556f3f8078529eaf09d855a05cb7905421b733cb671f771406eb857f5dddb3b82166ecc2a3d0ab1a987954d08
+  languageName: node
+  linkType: hard
+
 "@mui/x-data-grid@npm:^8.26.0":
-  version: 8.27.3
-  resolution: "@mui/x-data-grid@npm:8.27.3"
+  version: 8.27.0
+  resolution: "@mui/x-data-grid@npm:8.27.0"
   dependencies:
     "@babel/runtime": "npm:^7.28.4"
     "@mui/utils": "npm:^7.3.5"
@@ -3572,13 +3723,13 @@ __metadata:
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 10c0/ce4771d2c8d1d92b66a550ad970e7c142e699d33964a4e9d71fb72bb07f095f6a1ef64ac3a962d41a719316da2922f073defb6b123c335523e2381350030a783
+  checksum: 10c0/6e30e206e90c99959c94ec6aa96251bd839db0ca4c1162339ed97b30402dd7f5e1202127355e7ffab1089bf02ed986f405a33ffa832452a770563e86b82894d2
   languageName: node
   linkType: hard
 
 "@mui/x-date-pickers@npm:^8.26.0":
-  version: 8.27.2
-  resolution: "@mui/x-date-pickers@npm:8.27.2"
+  version: 8.27.0
+  resolution: "@mui/x-date-pickers@npm:8.27.0"
   dependencies:
     "@babel/runtime": "npm:^7.28.4"
     "@mui/utils": "npm:^7.3.5"
@@ -3620,7 +3771,7 @@ __metadata:
       optional: true
     moment-jalaali:
       optional: true
-  checksum: 10c0/41f2cbb3048ab431baf0d6d9ca4764b2aa75cd9627a93209c1136f0292e1311b076ea3613a8b74aff0eb1a704dc89b9fb9a88346f3290d6d3671fe5e0687a6fb
+  checksum: 10c0/07849731396c324862e9c499ee40c64ec513a42133740c9c94813c1e7f552af19115d2c5471d7352799caaa41e5fe2b44b91481645de7fab6ca8316ad27779fb
   languageName: node
   linkType: hard
 
@@ -3639,8 +3790,8 @@ __metadata:
   linkType: hard
 
 "@mui/x-tree-view@npm:^8.26.0":
-  version: 8.27.2
-  resolution: "@mui/x-tree-view@npm:8.27.2"
+  version: 8.27.0
+  resolution: "@mui/x-tree-view@npm:8.27.0"
   dependencies:
     "@babel/runtime": "npm:^7.28.4"
     "@base-ui/utils": "npm:^0.2.3"
@@ -3662,7 +3813,7 @@ __metadata:
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 10c0/281cf08d9264f898b0ad43ae3ecfdf02c8443abb08877d45140d91c82717b64567ceae7c0513502dd34b844f7de8e00db13cdbb4c8b19859504466d31368cd67
+  checksum: 10c0/01ee328c77a2366e291314d3658cd1ac5f2404a47bf2f2b9c6f7ce597c275411c156c9b3acaad6fbe948d18d311cbb92cab20ee0394834c51ba2c83934a1d203
   languageName: node
   linkType: hard
 
@@ -3752,7 +3903,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openforis/arena-core@npm:^1.0.91":
+"@openforis/arena-core@file:../arena-core::locator=open-foris-arena%40workspace%3A.":
+  version: 1.0.90
+  resolution: "@openforis/arena-core@file:../arena-core#../arena-core::hash=ff1c6b&locator=open-foris-arena%40workspace%3A."
+  dependencies:
+    "@jsep-plugin/regex": "npm:^1.0.4"
+    "@turf/destination": "npm:^7.3.4"
+    bignumber.js: "npm:^9.3.1"
+    jsep: "npm:^1.4.0"
+    lodash.differencewith: "npm:^4.5.0"
+    lodash.frompairs: "npm:^4.0.1"
+    lodash.isequal: "npm:^4.5.0"
+    lodash.topairs: "npm:^4.3.0"
+    moment: "npm:^2.30.1"
+    proj4: "npm:^2.20.2"
+    uuid: "npm:^11.1.0"
+  checksum: 10c0/b0258688fa04c8f0346a8c8b7d7ea705bc9920b636fcc45ee018df309446a570a05beb0068be0c9c060a97cd24265e4bdbe6baea374f63d760e1014c32765d30
+  languageName: node
+  linkType: hard
+
+"@openforis/arena-core@npm:^1.0.90":
   version: 1.0.91
   resolution: "@openforis/arena-core@npm:1.0.91::__archiveUrl=https%3A%2F%2Fnpm.pkg.github.com%2Fdownload%2F%40openforis%2Farena-core%2F1.0.91%2Fb803ce3c669ee52849b5e1c1ed993741f6d26f73"
   dependencies:
@@ -3771,12 +3941,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openforis/arena-server@npm:^1.2.19":
-  version: 1.2.19
-  resolution: "@openforis/arena-server@npm:1.2.19::__archiveUrl=https%3A%2F%2Fnpm.pkg.github.com%2Fdownload%2F%40openforis%2Farena-server%2F1.2.19%2F5072660bd91c4e2e4fc6a4d7ef353110d4969a37"
+"@openforis/arena-server@file:../arena-server::locator=open-foris-arena%40workspace%3A.":
+  version: 1.2.18
+  resolution: "@openforis/arena-server@file:../arena-server#../arena-server::hash=1a64a8&locator=open-foris-arena%40workspace%3A."
   dependencies:
     "@godaddy/terminus": "npm:^4.12.1"
-    "@openforis/arena-core": "npm:^1.0.91"
+    "@openforis/arena-core": "npm:^1.0.90"
     bcryptjs: "npm:^3.0.3"
     compression: "npm:^1.8.1"
     cookie-parser: "npm:^1.4.7"
@@ -3794,7 +3964,7 @@ __metadata:
     passport-local: "npm:^1.0.0"
     pg-promise: "npm:^12.6.1"
     socket.io: "npm:^4.8.3"
-  checksum: 10c0/b8a8deb2bc77a7d1dccb36619586e3476b7f3e6db1c86fc75781b71eaced5dbd11aa77350b83c10cd782f1bf9f1376749372a29c196630ba16046a780421ed47
+  checksum: 10c0/11f917fbd5230a5c5236b5c708c46a377795a309ac03ee437408c5f20456e8ad61be7d9f6a34039582682fbca7a4e5bed91768fd55a4e6da4202846b01c6fc3f
   languageName: node
   linkType: hard
 
@@ -3990,7 +4160,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@peculiar/asn1-cms@npm:^2.6.0, @peculiar/asn1-cms@npm:^2.6.1":
+"@peculiar/asn1-cms@npm:^2.6.0":
   version: 2.6.1
   resolution: "@peculiar/asn1-cms@npm:2.6.1"
   dependencies:
@@ -4004,72 +4174,72 @@ __metadata:
   linkType: hard
 
 "@peculiar/asn1-csr@npm:^2.6.0":
-  version: 2.6.1
-  resolution: "@peculiar/asn1-csr@npm:2.6.1"
+  version: 2.6.0
+  resolution: "@peculiar/asn1-csr@npm:2.6.0"
   dependencies:
     "@peculiar/asn1-schema": "npm:^2.6.0"
-    "@peculiar/asn1-x509": "npm:^2.6.1"
+    "@peculiar/asn1-x509": "npm:^2.6.0"
     asn1js: "npm:^3.0.6"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/5ea1ef27bf3879c793acb0b370b9fc1cb45df244b4706cecf075e45b58d19d65e612f4777eb12aa37f2037c1c725e96543ab9caf41d5a92378c5069071deae1f
+  checksum: 10c0/1984e6c4f2200ca758e5cf3d632c23b8862553d023881cf51e153f2e90590ebb6a9dafb217e85aeac84e77be3013b14e7c4d61c4dbe6866c6885ca91fd45a098
   languageName: node
   linkType: hard
 
 "@peculiar/asn1-ecc@npm:^2.6.0":
-  version: 2.6.1
-  resolution: "@peculiar/asn1-ecc@npm:2.6.1"
+  version: 2.6.0
+  resolution: "@peculiar/asn1-ecc@npm:2.6.0"
   dependencies:
     "@peculiar/asn1-schema": "npm:^2.6.0"
-    "@peculiar/asn1-x509": "npm:^2.6.1"
+    "@peculiar/asn1-x509": "npm:^2.6.0"
     asn1js: "npm:^3.0.6"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/7804600f12a8993085232839ea020f51a329a195ce991ebbce077668d9ee1e57301bf97d5ef9657bd81717888f36f51f7aed3a9eee59fe4345c55d04eff89927
+  checksum: 10c0/9181c991f0cab70c4ab97564d91cf3f2489dbf64b56085e92cc28899a16bdf285edaa0a35164b3c6ddebcdd07bb7612d0eaddbaa7bc876ff06811346a7449a38
   languageName: node
   linkType: hard
 
-"@peculiar/asn1-pfx@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "@peculiar/asn1-pfx@npm:2.6.1"
+"@peculiar/asn1-pfx@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "@peculiar/asn1-pfx@npm:2.6.0"
   dependencies:
-    "@peculiar/asn1-cms": "npm:^2.6.1"
-    "@peculiar/asn1-pkcs8": "npm:^2.6.1"
-    "@peculiar/asn1-rsa": "npm:^2.6.1"
+    "@peculiar/asn1-cms": "npm:^2.6.0"
+    "@peculiar/asn1-pkcs8": "npm:^2.6.0"
+    "@peculiar/asn1-rsa": "npm:^2.6.0"
     "@peculiar/asn1-schema": "npm:^2.6.0"
     asn1js: "npm:^3.0.6"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/69c86ed339b945f7c77173da06207af71553a5b033cc1f2bde262085e7b5870543f358a29efd8981ca7247ec7f1c5d722a014cc0979679045909cb13e2ca527e
+  checksum: 10c0/1bca317ad8b94c8b4925deddc2cbdf36a30a0e71fb0ed9e1f5871278436d7f878a312eed4a1fcc9216100db0361fed9453db41154732eaeb0c24b076e5ebdff1
   languageName: node
   linkType: hard
 
-"@peculiar/asn1-pkcs8@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "@peculiar/asn1-pkcs8@npm:2.6.1"
+"@peculiar/asn1-pkcs8@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "@peculiar/asn1-pkcs8@npm:2.6.0"
   dependencies:
     "@peculiar/asn1-schema": "npm:^2.6.0"
-    "@peculiar/asn1-x509": "npm:^2.6.1"
+    "@peculiar/asn1-x509": "npm:^2.6.0"
     asn1js: "npm:^3.0.6"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/d712dc79ab877152f20c1772cbe065f5beb2a20e3dcae7892cc72f3227a1d3f7ae8eecba8bc29cf2b77cfdd8a01b0660f5390a416ca78ca7147f0e3c13d4d755
+  checksum: 10c0/42b3c8a9adcd20aa658436880523abc23cd7245c3680d0c3d66e9726f2543a2a1fb362c6056f1330d2f880abd5b6d8d77fe5a76d1b46b919eedb7f23b3699f12
   languageName: node
   linkType: hard
 
 "@peculiar/asn1-pkcs9@npm:^2.6.0":
-  version: 2.6.1
-  resolution: "@peculiar/asn1-pkcs9@npm:2.6.1"
+  version: 2.6.0
+  resolution: "@peculiar/asn1-pkcs9@npm:2.6.0"
   dependencies:
-    "@peculiar/asn1-cms": "npm:^2.6.1"
-    "@peculiar/asn1-pfx": "npm:^2.6.1"
-    "@peculiar/asn1-pkcs8": "npm:^2.6.1"
+    "@peculiar/asn1-cms": "npm:^2.6.0"
+    "@peculiar/asn1-pfx": "npm:^2.6.0"
+    "@peculiar/asn1-pkcs8": "npm:^2.6.0"
     "@peculiar/asn1-schema": "npm:^2.6.0"
-    "@peculiar/asn1-x509": "npm:^2.6.1"
-    "@peculiar/asn1-x509-attr": "npm:^2.6.1"
+    "@peculiar/asn1-x509": "npm:^2.6.0"
+    "@peculiar/asn1-x509-attr": "npm:^2.6.0"
     asn1js: "npm:^3.0.6"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/4a2f815bbeee3f65aea391d5e2287a19701d757d2781b3ecfd908a67028f2752796bd22f8ba3eb486911fcc34b52b0f7c1ff3e3b7d7f04ef58767be9ddbc851d
+  checksum: 10c0/241e2d1c6cc738d971401c2ed5df1819e2b55b4a2d9f1b2d83ab4b150c21af37dfd120dc23953422cc648dbb7d1ed5ed4bbb035c856d4e036379e8c8692a419d
   languageName: node
   linkType: hard
 
-"@peculiar/asn1-rsa@npm:^2.6.0, @peculiar/asn1-rsa@npm:^2.6.1":
+"@peculiar/asn1-rsa@npm:^2.6.0":
   version: 2.6.1
   resolution: "@peculiar/asn1-rsa@npm:2.6.1"
   dependencies:
@@ -4092,6 +4262,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@peculiar/asn1-x509-attr@npm:^2.6.0":
+  version: 2.6.0
+  resolution: "@peculiar/asn1-x509-attr@npm:2.6.0"
+  dependencies:
+    "@peculiar/asn1-schema": "npm:^2.6.0"
+    "@peculiar/asn1-x509": "npm:^2.6.0"
+    asn1js: "npm:^3.0.6"
+    tslib: "npm:^2.8.1"
+  checksum: 10c0/599ec61a8f193eed0653e19172c7c627485f0311d50b82524530a555b7f237a8547f50ec5ffdcdafa2756f0df24125fcb754fd4b66ad8eb67b3e7017652668a6
+  languageName: node
+  linkType: hard
+
 "@peculiar/asn1-x509-attr@npm:^2.6.1":
   version: 2.6.1
   resolution: "@peculiar/asn1-x509-attr@npm:2.6.1"
@@ -4337,190 +4519,190 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/abort-controller@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/abort-controller@npm:4.2.10"
+"@smithy/abort-controller@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/abort-controller@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/c07517dd50c20282ae46e2d464fca7ba8db85f622cd70b168977f973eeedb48bf2cb73e106309a96b274144e7b519d2f19202e1d5fb894033589a290994f50d3
+  checksum: 10c0/2c2094ebd0b842a478746da74a74feaf579ca5fe03d7a1a7868ba7d048d88e2479edad8d2791d22d7bb9e5e774c1df4201a3ffa360c3aefaf158f692c45594f8
   languageName: node
   linkType: hard
 
-"@smithy/chunked-blob-reader-native@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "@smithy/chunked-blob-reader-native@npm:4.2.2"
+"@smithy/chunked-blob-reader-native@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@smithy/chunked-blob-reader-native@npm:4.2.1"
   dependencies:
-    "@smithy/util-base64": "npm:^4.3.1"
+    "@smithy/util-base64": "npm:^4.3.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/86fbd6e5f021f58a2d0d157410e5eb37df2b5bfdf6b6eb0b2491276e9322649ab763bb87c5bcd2da99399ff5989aec2f10e15fe831c9d6f7b6efa75703bc2303
+  checksum: 10c0/63831fe47a5b3a1ea6821846a5fb009298da57159e4818238e8110b77245805c1a07cb854df7955a39de1f5f2dfb7c8803ac942117e622665e089d715cb2041c
   languageName: node
   linkType: hard
 
-"@smithy/chunked-blob-reader@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "@smithy/chunked-blob-reader@npm:5.2.1"
+"@smithy/chunked-blob-reader@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "@smithy/chunked-blob-reader@npm:5.2.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/44f477ffa90b12a981d81be066740db631f33807cf9de4e4b8fc2f6eaaecec200b80855f61369abe0090a7d50b845dbe2b8a1727b07235f293394e386dab6c66
+  checksum: 10c0/9fe95b788e022ce2b59c8cab607c8f71d73cce367329871d2a7eafdc0d77cec8d1939fe8141f446bbe4051dcfffce864a562762ac2691c368df3b6c2f6ed62b3
   languageName: node
   linkType: hard
 
-"@smithy/config-resolver@npm:^4.4.9":
-  version: 4.4.9
-  resolution: "@smithy/config-resolver@npm:4.4.9"
+"@smithy/config-resolver@npm:^4.4.6":
+  version: 4.4.6
+  resolution: "@smithy/config-resolver@npm:4.4.6"
   dependencies:
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-config-provider": "npm:^4.2.1"
-    "@smithy/util-endpoints": "npm:^3.3.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-config-provider": "npm:^4.2.0"
+    "@smithy/util-endpoints": "npm:^3.2.8"
+    "@smithy/util-middleware": "npm:^4.2.8"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/efd294dc45960a5bf8a728d719e26f53d92796f3cbd0ef1ee66a65f9325ba14b689ce12aea18cf1e39048529db208feb2a2a4d85afafbfcd71dff1778ac7210d
+  checksum: 10c0/ab3de62329d53ca886d0efb2e10e904c3d3a7e564cda6b4d710d8512d2f4b9980e5346614da511d978c6a9a6c3c71f968e7c752dac36dfd61219d2e6fd0695cc
   languageName: node
   linkType: hard
 
-"@smithy/core@npm:^3.23.6":
-  version: 3.23.6
-  resolution: "@smithy/core@npm:3.23.6"
+"@smithy/core@npm:^3.22.0, @smithy/core@npm:^3.22.1":
+  version: 3.22.1
+  resolution: "@smithy/core@npm:3.22.1"
   dependencies:
-    "@smithy/middleware-serde": "npm:^4.2.11"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-base64": "npm:^4.3.1"
-    "@smithy/util-body-length-browser": "npm:^4.2.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-stream": "npm:^4.5.15"
-    "@smithy/util-utf8": "npm:^4.2.1"
-    "@smithy/uuid": "npm:^1.1.1"
+    "@smithy/middleware-serde": "npm:^4.2.9"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-base64": "npm:^4.3.0"
+    "@smithy/util-body-length-browser": "npm:^4.2.0"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-stream": "npm:^4.5.11"
+    "@smithy/util-utf8": "npm:^4.2.0"
+    "@smithy/uuid": "npm:^1.1.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/12350b146dadde0d0beda457b6991750a6bafee6e4623edea535833bfa09774fd770378545a99c8c7a1f2a63128c1b377776b48f5d54e4f1bca7106d270d9d84
+  checksum: 10c0/f1f65f7f323128f0b2d9a3ee13b1b4a5942e966ff12016549f4bff8a83ccd6d8d539e29d27c11ccf66d4948e4766bb1b2ea8f37b08c70f85ae8cb2a2ab034e3b
   languageName: node
   linkType: hard
 
-"@smithy/credential-provider-imds@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/credential-provider-imds@npm:4.2.10"
+"@smithy/credential-provider-imds@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/credential-provider-imds@npm:4.2.8"
   dependencies:
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/url-parser": "npm:^4.2.10"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/8e2b3f0b327a5ba476d0b6de2907ec4d37cd7d2efcf5203159fca3385d6bf9dd0a004b91c69206d504e6cc92c4616266493e51aacb7269628f89f951baafd855
+  checksum: 10c0/e53cec39703aa197df6bf38985403ad69ecd45e17ee5caadb53945d0a36b22332ff04e4d2d6a8d7c8e4bea9e6edabf6abf7cc6dafbc6cfbf7c20a88223e6fc55
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-codec@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/eventstream-codec@npm:4.2.10"
+"@smithy/eventstream-codec@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/eventstream-codec@npm:4.2.8"
   dependencies:
     "@aws-crypto/crc32": "npm:5.2.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-hex-encoding": "npm:^4.2.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-hex-encoding": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/e6a4424e8c23e4d396b8fbc9c287bf73b4e5bef3b9f29065ce9803b1b8b5bda2bba05312721986bec83336e2c1e30560869ef1d1c91e3815081ce78d48287be1
+  checksum: 10c0/ec468850dabce86d88075765b3a5f95e865850a6d98f6f395ead49af3d20316f50cce755b31f0e0b9ab027676f688814f76f68acc7c642483a6e196b25643e78
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-browser@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/eventstream-serde-browser@npm:4.2.10"
+"@smithy/eventstream-serde-browser@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/eventstream-serde-browser@npm:4.2.8"
   dependencies:
-    "@smithy/eventstream-serde-universal": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/eventstream-serde-universal": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/29c7ad443d2cef74ec5aaaa8d536bbcb2031ae40894c61244f2ff135dcc23d439c980f7109b28d2c2b80aaddfae80541331c4d7704c19f6a0a461af5c4df7a55
+  checksum: 10c0/9f5abf3073ac58dcd88db3cf28f1edaa73c2b5c4b3249b0b6bfdb4cd51b328f64f66ac5918145aa20842a3277b38339d88ae414c86610b9ee6ef099b2f8310a0
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-config-resolver@npm:^4.3.10":
-  version: 4.3.10
-  resolution: "@smithy/eventstream-serde-config-resolver@npm:4.3.10"
+"@smithy/eventstream-serde-config-resolver@npm:^4.3.8":
+  version: 4.3.8
+  resolution: "@smithy/eventstream-serde-config-resolver@npm:4.3.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/b53bd51fb6858aa44791eaff519504df708e4ccd78a3f980cd19a9c38642349410fc58feb4306c8160e7a94fd2f4f7b9058dfcd62800b7fff6abdcdc789f966e
+  checksum: 10c0/10f80501ab34918e26caed612d7bd8c4cfb0771994c108212be27dd0a05cec4175141b24edfc455255af3677513cf75154946fc4c2e3ae5093ee1065e06801f2
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-node@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/eventstream-serde-node@npm:4.2.10"
+"@smithy/eventstream-serde-node@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/eventstream-serde-node@npm:4.2.8"
   dependencies:
-    "@smithy/eventstream-serde-universal": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/eventstream-serde-universal": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/1d4a6d7bb33f721639edb198b4a5d4f5eb52f14ed89f932d370740c80636ed2bfbd989f438986fd4f4feaa6b08f96244216c6515f410df41bcc0a83c83d58eff
+  checksum: 10c0/9b0c37ffd3f0d08a9c4170742fbc8fb14e38e34ee164642d102477a9e339fa8f12920b2ff9017903954e036a7219bbc9008a6942d3e68fefbfd1285a5fd9168b
   languageName: node
   linkType: hard
 
-"@smithy/eventstream-serde-universal@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/eventstream-serde-universal@npm:4.2.10"
+"@smithy/eventstream-serde-universal@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/eventstream-serde-universal@npm:4.2.8"
   dependencies:
-    "@smithy/eventstream-codec": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/eventstream-codec": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/a970df4af9900b88ba7f8d1fe33f501674eb3a71b261e686be1596ce9c4ee8eacb88a7a33a01b3a2551c022600041ffe353782bde2d6b344c2107f480ae7ecbe
+  checksum: 10c0/06a3388efbc10bebb97b78800c72dea0baf5552b33e51d64cada6fa5eea891389c81a8e214d1eb0b5d72a8135c121b610b7dcecaef2a160e017d59d99110e956
   languageName: node
   linkType: hard
 
-"@smithy/fetch-http-handler@npm:^5.3.11":
-  version: 5.3.11
-  resolution: "@smithy/fetch-http-handler@npm:5.3.11"
+"@smithy/fetch-http-handler@npm:^5.3.9":
+  version: 5.3.9
+  resolution: "@smithy/fetch-http-handler@npm:5.3.9"
   dependencies:
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/querystring-builder": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-base64": "npm:^4.3.1"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/querystring-builder": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-base64": "npm:^4.3.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/8faffa446cebc91f1356f354e3c70f91b0a770cd70a0585dba38e2fc30cdabe665812176c54dc487388e438e169e409fcec6292603a0bc01bec764b4a4645d56
+  checksum: 10c0/43b341d1594da4a076a48896f552b96d5e817054e9a354d10001ad51f05cb0f976c8d12529bd462a88cff23c8ab3ca475705db0855751616c08505fc6d083db2
   languageName: node
   linkType: hard
 
-"@smithy/hash-blob-browser@npm:^4.2.11":
-  version: 4.2.11
-  resolution: "@smithy/hash-blob-browser@npm:4.2.11"
+"@smithy/hash-blob-browser@npm:^4.2.9":
+  version: 4.2.9
+  resolution: "@smithy/hash-blob-browser@npm:4.2.9"
   dependencies:
-    "@smithy/chunked-blob-reader": "npm:^5.2.1"
-    "@smithy/chunked-blob-reader-native": "npm:^4.2.2"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/chunked-blob-reader": "npm:^5.2.0"
+    "@smithy/chunked-blob-reader-native": "npm:^4.2.1"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/52591638cccbc2a4e2016d345ae7db434641356bf5db8817972995b17e59321c9a4cb2cfe5902b5f45be7cd6e9ce24ac6c801bd04d88da5028d267e26bce875c
+  checksum: 10c0/19a55c5ebd62ea489e6a7c4e47267739ee83c00cc73430c4584b1685db7f1444d33814e78489f8346bcf20689d719e554010ec9cd4d2758acf9c724fa3590692
   languageName: node
   linkType: hard
 
-"@smithy/hash-node@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/hash-node@npm:4.2.10"
+"@smithy/hash-node@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/hash-node@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-buffer-from": "npm:^4.2.1"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-buffer-from": "npm:^4.2.0"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/b6fc9c4c3b8cc103f1a2de2a4cd389f7897c2b098fa217d3a3335cfad32051b436907a032ea3f8987b6fed5d1e917dd656261421806bb8cff8c678ab50282abc
+  checksum: 10c0/541de03fce0623ea72c0e44cb15d16001d3c4ff7f0ac8b03a53b59c3c526d9d0196297f0f2bc9b08f9e108c4920983a54df0281ba36941b30c7940195c618222
   languageName: node
   linkType: hard
 
-"@smithy/hash-stream-node@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/hash-stream-node@npm:4.2.10"
+"@smithy/hash-stream-node@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/hash-stream-node@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/8860c3365217cbf41f0e51380ec002fd5d5ab262f7f3ed2ea500159590f134f898ca53067c8e1e0dd69320ffedab70569d2b3f005d9874c784e57a23356b0622
+  checksum: 10c0/fc9639d55e4131fe40a299abb0a83b22a43ea88138c0a5074768b5b1ce2e7c9980b34298983739d01507b2408d5fd9fe4f234f581ad4656fb7198605c5dc3d35
   languageName: node
   linkType: hard
 
-"@smithy/invalid-dependency@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/invalid-dependency@npm:4.2.10"
+"@smithy/invalid-dependency@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/invalid-dependency@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/8d4a2b163eaaeb2e0c1af26dd39fd36b03ee319eac4fba2d329e99e2cd2849c65ed6bc510c9b58dd20e1f2ee7634d61ccc21b15c8a871fb2109e87c1337df057
+  checksum: 10c0/b224c6692ec745c30c022114c53328a69caf00e6848f3920fe180e5836440a9dfebf67bf4d6cc8f1fabe4d88be2f60f5428c93cbe80de3baefb0710b7a4b0e7c
   languageName: node
   linkType: hard
 
@@ -4533,204 +4715,213 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/is-array-buffer@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/is-array-buffer@npm:4.2.1"
+"@smithy/is-array-buffer@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/is-array-buffer@npm:4.2.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/8e84ae3542ca85aade7a1d00809f29bd22e3dae3282df8a7d558e002d47b1245de55add7a5ca310170d8336f46c95c4f812a0641f44af95364a510d22eb4c4ea
+  checksum: 10c0/8e3e21cff5929d627bbf4a9beded28bd54555cfd37772226290964af6950cc10d700776a2ce7553f34ddf88a2e7e3d4681de58c94e9805592d901fc0f32cb597
   languageName: node
   linkType: hard
 
-"@smithy/md5-js@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/md5-js@npm:4.2.10"
+"@smithy/md5-js@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/md5-js@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/5be25be720951546188f5ad34e279f3f72bce650c0cc16879b49025039ad504759f08bd7c98b3743c3354c126145875ef5d8557185be35b252c708a5dceda909
+  checksum: 10c0/cbc2ad4862214437ca04c0e946d21df9c2553006725a13f97c3dc3b5bc9fd9b95ccbb1005c0763e75b29f88ebcbbd7b217f19c8f4c88ab36be1ab60ded030859
   languageName: node
   linkType: hard
 
-"@smithy/middleware-content-length@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/middleware-content-length@npm:4.2.10"
+"@smithy/middleware-content-length@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/middleware-content-length@npm:4.2.8"
   dependencies:
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/f250d96f4b0c8cc28be5b842ac8538df5117a7f40e15652be39757b8817e929e0ddb41dd3e4f97e29799d3031efcb5b0aece4a0a263ac25ce23a1b10fcc87a70
+  checksum: 10c0/27a732a4207936da2b57212d7abb2d55d398d483e507fefb540e2ea20247795770bd73bfc7a4d488de3aa923810241014eb05a4cfa1b8354b4e284161d1bec42
   languageName: node
   linkType: hard
 
-"@smithy/middleware-endpoint@npm:^4.4.20":
-  version: 4.4.20
-  resolution: "@smithy/middleware-endpoint@npm:4.4.20"
+"@smithy/middleware-endpoint@npm:^4.4.12, @smithy/middleware-endpoint@npm:^4.4.13":
+  version: 4.4.13
+  resolution: "@smithy/middleware-endpoint@npm:4.4.13"
   dependencies:
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/middleware-serde": "npm:^4.2.11"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/url-parser": "npm:^4.2.10"
-    "@smithy/util-middleware": "npm:^4.2.10"
+    "@smithy/core": "npm:^3.22.1"
+    "@smithy/middleware-serde": "npm:^4.2.9"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/url-parser": "npm:^4.2.8"
+    "@smithy/util-middleware": "npm:^4.2.8"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/173ed875421cc4612a0921c602f8bc414f02385305d64236d869e14c800e6e5f74886d96c3311dbdc5934e5e7581293512d8630d3237b46f998d9b97f42c44af
+  checksum: 10c0/0a67cf539065c1c2750006d37eee92ed50aca976febf3281f5cb7b52ee028a6f5c66ee8337d9ba7afd21915a17756e8301f0540911ad6d59669353b22450a119
   languageName: node
   linkType: hard
 
-"@smithy/middleware-retry@npm:^4.4.37":
-  version: 4.4.37
-  resolution: "@smithy/middleware-retry@npm:4.4.37"
+"@smithy/middleware-retry@npm:^4.4.29":
+  version: 4.4.30
+  resolution: "@smithy/middleware-retry@npm:4.4.30"
   dependencies:
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/service-error-classification": "npm:^4.2.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-retry": "npm:^4.2.10"
-    "@smithy/uuid": "npm:^1.1.1"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/service-error-classification": "npm:^4.2.8"
+    "@smithy/smithy-client": "npm:^4.11.2"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-retry": "npm:^4.2.8"
+    "@smithy/uuid": "npm:^1.1.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/9397340a6e64f21a744d1465263835e257c357e1439d408bfa9bf20521aff8d9dea0f6927d61de1c619a875158ccca2bb6c669d1c1d94436ac497b772adbbeea
+  checksum: 10c0/bf3294fd62696714a5c66a54e5ce01ce578c55a62f657ea409d55d2c7fe1cb806db9f9f4125fb17fba1d15323165f68758923686c45ab50579c7578e56945894
   languageName: node
   linkType: hard
 
-"@smithy/middleware-serde@npm:^4.2.11":
-  version: 4.2.11
-  resolution: "@smithy/middleware-serde@npm:4.2.11"
+"@smithy/middleware-serde@npm:^4.2.9":
+  version: 4.2.9
+  resolution: "@smithy/middleware-serde@npm:4.2.9"
   dependencies:
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/fd62e4a68c497e225fc6ec63a7451180dfd8c64f1db3b7df8b9b99d90e43b6c5f4979a86c980530641964b7f9a938ad65ba440fd70a59806ee5c08cf711a3ea7
+  checksum: 10c0/72164c91690f3cb3bcbb1638dad4ddc245c48cf92f1663740a65df430c35e5f6c94c51a88645c0085ff138ad6ededba45106b94698fbaaec527ae653e40829a9
   languageName: node
   linkType: hard
 
-"@smithy/middleware-stack@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/middleware-stack@npm:4.2.10"
+"@smithy/middleware-stack@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/middleware-stack@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/79e83c21a79ffe649675f9dc85f8ee3d362f1f23352b8ddba183462c9b3fd7e8d6b8e7ee08581cffe7a94f046194ae7058d8c57f9ce834b5cc973cbb6bc80a21
+  checksum: 10c0/3d931a12f1e9d691bcdca5f1889378266fcd20ab97f46983a08585492bf90fecb644b00886db908ec902efadb5f983a6365ae0dd351245d52c78ef3091e0d058
   languageName: node
   linkType: hard
 
-"@smithy/node-config-provider@npm:^4.3.10":
-  version: 4.3.10
-  resolution: "@smithy/node-config-provider@npm:4.3.10"
+"@smithy/node-config-provider@npm:^4.3.8":
+  version: 4.3.8
+  resolution: "@smithy/node-config-provider@npm:4.3.8"
   dependencies:
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/shared-ini-file-loader": "npm:^4.4.5"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/shared-ini-file-loader": "npm:^4.4.3"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/c015b5d29c739d378630c43a1bbc91e23ad4c48ea71123fb69ebbd4dea12573b61339827061d588625e4897f03d0401da5bc5e6ead51e37764726ba1a7662bb3
+  checksum: 10c0/da474576b586f70e90db8f7c2c0d03aac40380435b973b4c5c759910b11cd5c75d89191da21499a83bae3ef12b8317b7421e509c3b5114f3d42d672de7c35f93
   languageName: node
   linkType: hard
 
-"@smithy/node-http-handler@npm:^4.4.12":
-  version: 4.4.12
-  resolution: "@smithy/node-http-handler@npm:4.4.12"
+"@smithy/node-http-handler@npm:^4.4.8, @smithy/node-http-handler@npm:^4.4.9":
+  version: 4.4.9
+  resolution: "@smithy/node-http-handler@npm:4.4.9"
   dependencies:
-    "@smithy/abort-controller": "npm:^4.2.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/querystring-builder": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/abort-controller": "npm:^4.2.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/querystring-builder": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/337a4e95b4e61f0dd2d66edf3c30579aa2666947aeaf3637c729df0450b4b45695b97abf2ad46f6cb3d9eac934df19292c11309dd12f53024adb7f4c8587992a
+  checksum: 10c0/e60d3724aa8a09273688ca81d5c3d613c3952b0011dc34034b78ab16b08d404c11cf9676b3265f299f7347fc5ad05c9ac0637b70488d9356a7c4b01222ab49e8
   languageName: node
   linkType: hard
 
-"@smithy/property-provider@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/property-provider@npm:4.2.10"
+"@smithy/property-provider@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/property-provider@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/bb4775be0b766eca77ecf348739cd9466a74eec26df582f088b7aeb5888213135652b05b9cd0df281a720c1b5ea0cf8b720be261a654faf8aa52453cbd7da800
+  checksum: 10c0/3883dc620ad63db9df86aae19c6cad12be76deb8775f5b75a94773c1b907173dce5dcdd6cd255bcd7f8156ea2840c05e15c9e68e975344989710daaa3e63761c
   languageName: node
   linkType: hard
 
-"@smithy/protocol-http@npm:^5.3.10":
-  version: 5.3.10
-  resolution: "@smithy/protocol-http@npm:5.3.10"
+"@smithy/protocol-http@npm:^5.3.8":
+  version: 5.3.8
+  resolution: "@smithy/protocol-http@npm:5.3.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/9c801aa785a17a1904e88570ece5ee6e035b24ab9fb2231886f7ce444942954268849692c8b46909ad021bb75cfc23266f1baeecd530db6f9acef6dedd778f70
+  checksum: 10c0/13285091174a893c695f4e44debcaf7fc8be3e8140188020c9a29d9cc70acf46345039b231b0b7c136f864dc02b87d48e7aedb657f6888eaa5ff76295a7deafe
   languageName: node
   linkType: hard
 
-"@smithy/querystring-builder@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/querystring-builder@npm:4.2.10"
+"@smithy/querystring-builder@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/querystring-builder@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-uri-escape": "npm:^4.2.1"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-uri-escape": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/f35460dd4a5e8757b8a872c41ee4734e5e053a9e8892b7c29bb805c1faee99ea7df06dd0f20b6c15ecba5e43549542d6862a3085d0dd146a335f53de5be58b4a
+  checksum: 10c0/21995656fad2198b6d2960367e84ec847609dd317a6dcc2eb133b78abd3c3816221316a50cbdcd20fb773d24e942a182b3844a334c7694bae091085c6edc2798
   languageName: node
   linkType: hard
 
-"@smithy/querystring-parser@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/querystring-parser@npm:4.2.10"
+"@smithy/querystring-parser@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/querystring-parser@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/cf5c0302143d841c9996a4a91c898531d04b5ab187e17c7b881b5619506a61109c3125894a97be021f6638e561a8d59a4e389bbf47c20ed7ee7872af3657e5a2
+  checksum: 10c0/997a4e94438091461c1e8ccc66b3c1e7f243eaac22b2598d34d67de7332c1b8a2963cca98499f91638a4505aab07c968b3c9db1ff2aa29682a783fb6374b53e1
   languageName: node
   linkType: hard
 
-"@smithy/service-error-classification@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/service-error-classification@npm:4.2.10"
+"@smithy/service-error-classification@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/service-error-classification@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
-  checksum: 10c0/c234383b5b9f78623537bebcfef1191855d8352c2dbc1d9df0592d01cce8372da6d26369ced29e31fac4e30c444f4918caacd96bdd5ee3fabed5492c0447fcfb
+    "@smithy/types": "npm:^4.12.0"
+  checksum: 10c0/10a31e4c73839f2b372df026223df3370f06ea584854c57e13967a306eac3de073af1f3998ae4df5ecb0d46ccc2cb737270794f9be572b36510ece946010a5b3
   languageName: node
   linkType: hard
 
-"@smithy/shared-ini-file-loader@npm:^4.4.5":
-  version: 4.4.5
-  resolution: "@smithy/shared-ini-file-loader@npm:4.4.5"
+"@smithy/shared-ini-file-loader@npm:^4.4.3":
+  version: 4.4.3
+  resolution: "@smithy/shared-ini-file-loader@npm:4.4.3"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/e4dfbb6e7265d07abe94a5b3f085c2191cfbb4cb1b4dff48f011dc148de651caf1bf47844dec2e7b35a52f9a4e58a4b09017edb5faa5ff551f3b4f270b63fffa
+  checksum: 10c0/6d625499d5c61d68c0adbfca8e9f04f0c1e011137226f8af09fc8c7aa1594e4297317d7ef64345f5ca09b8948833ea7f4f3df7df621f2fc68c74d540c1a017b8
   languageName: node
   linkType: hard
 
-"@smithy/signature-v4@npm:^5.3.10":
-  version: 5.3.10
-  resolution: "@smithy/signature-v4@npm:5.3.10"
+"@smithy/signature-v4@npm:^5.3.8":
+  version: 5.3.8
+  resolution: "@smithy/signature-v4@npm:5.3.8"
   dependencies:
-    "@smithy/is-array-buffer": "npm:^4.2.1"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-hex-encoding": "npm:^4.2.1"
-    "@smithy/util-middleware": "npm:^4.2.10"
-    "@smithy/util-uri-escape": "npm:^4.2.1"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/is-array-buffer": "npm:^4.2.0"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-hex-encoding": "npm:^4.2.0"
+    "@smithy/util-middleware": "npm:^4.2.8"
+    "@smithy/util-uri-escape": "npm:^4.2.0"
+    "@smithy/util-utf8": "npm:^4.2.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10c0/5959ae4d22fedb707543b193a4fb12902fcc9b07452ea1ea9366fde702680a6e862f4b92d12a2f7d1677bc62a97963e707092147f1e7876bb2e419d7a8842d67
+  languageName: node
+  linkType: hard
+
+"@smithy/smithy-client@npm:^4.11.1, @smithy/smithy-client@npm:^4.11.2":
+  version: 4.11.2
+  resolution: "@smithy/smithy-client@npm:4.11.2"
+  dependencies:
+    "@smithy/core": "npm:^3.22.1"
+    "@smithy/middleware-endpoint": "npm:^4.4.13"
+    "@smithy/middleware-stack": "npm:^4.2.8"
+    "@smithy/protocol-http": "npm:^5.3.8"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-stream": "npm:^4.5.11"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/b6a03a1868b14c2ff6332ed42b05541ebd33f1362769c7e3e884b9de947da98ed5855b4a1626f16dc79184f61ce13a2145fd8583aedeff018ae0104623b83315
+  checksum: 10c0/496ef496306a5acfb0faeb6a5235c8089ac6fb928b6f1b14fb714d60cdf592c2fb6fb5f5f288da5395adc96948314357d47b815397409f4a6aa2db7cc3cc41cd
   languageName: node
   linkType: hard
 
-"@smithy/smithy-client@npm:^4.12.0":
+"@smithy/types@npm:^4.12.0":
   version: 4.12.0
-  resolution: "@smithy/smithy-client@npm:4.12.0"
+  resolution: "@smithy/types@npm:4.12.0"
   dependencies:
-    "@smithy/core": "npm:^3.23.6"
-    "@smithy/middleware-endpoint": "npm:^4.4.20"
-    "@smithy/middleware-stack": "npm:^4.2.10"
-    "@smithy/protocol-http": "npm:^5.3.10"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-stream": "npm:^4.5.15"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/f1310d57fff750d25395bfe2338e48501429069fa9cb495e7882a06f27211c7538edfbc930b8a1ab24c0bca5eb0418ef00c0d7403cb6e4c9efc84308686c2f87
+  checksum: 10c0/ac81de3f24b43e52a5089279bced4ff04a853e0bdc80143a234e79f7f40cbd61d85497b08a252265570b4637a3cf265cf85a7a09e5f194937fe30706498640b7
   languageName: node
   linkType: hard
 
@@ -4743,43 +4934,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/url-parser@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/url-parser@npm:4.2.10"
+"@smithy/url-parser@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/url-parser@npm:4.2.8"
   dependencies:
-    "@smithy/querystring-parser": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/querystring-parser": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/dffabdfd18d214ff6b561c497f23ed1f2cf248178113e55721223061963c84b463ac0e1e2dfb94c8d7fe82c7c9acb62f7274d567e56334f1361928d451f17de5
+  checksum: 10c0/a3a5fa00b01ccc89de620a12286278f3dc86a14c1de0a7a576db2f2296c71a8b21b7ed8f8776d770647225a73f33afba4fe1a69de741515246117506532dad3c
   languageName: node
   linkType: hard
 
-"@smithy/util-base64@npm:^4.3.1":
-  version: 4.3.1
-  resolution: "@smithy/util-base64@npm:4.3.1"
+"@smithy/util-base64@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "@smithy/util-base64@npm:4.3.0"
   dependencies:
-    "@smithy/util-buffer-from": "npm:^4.2.1"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/util-buffer-from": "npm:^4.2.0"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/050c2b22f231c3c6f46e1c2ae5c322f0f8adaafe1d82c9bba54c429099dfb1f81947f99309a0e32e77c5d471054370d784d9b8eb7bb1a96a25449a780e29bddd
+  checksum: 10c0/02dd536b9257914cc9a595a865faac64fc96db10468d52d0cba475df78764fc25ba255707ccd061ee197fca189d7859d70af8cf89b0b0c3e27c1c693676eb6e4
   languageName: node
   linkType: hard
 
-"@smithy/util-body-length-browser@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/util-body-length-browser@npm:4.2.1"
+"@smithy/util-body-length-browser@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/util-body-length-browser@npm:4.2.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/5c3ba12d980ad9bbfc4b00eff11f928e111e32f59ef55d3ecd4baf67389a531614d1ee21d23bfef347b86e735d1e0b14ebdd4cd2a33ada61b949f17cf7fe628b
+  checksum: 10c0/15553c249088d59406c6917c19ed19810c7dbcc0967c44e5f3fbb2cc870c004b35f388c082b77f370a2c440a69ec7e8336c7a066af904812a66944dd5cb4c8cc
   languageName: node
   linkType: hard
 
-"@smithy/util-body-length-node@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "@smithy/util-body-length-node@npm:4.2.2"
+"@smithy/util-body-length-node@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@smithy/util-body-length-node@npm:4.2.1"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/683d9d01dd12a3caad11304edacefe131de585a665b354bfc6965ad873e71e5ee105934c19a3e25871df2390a653a602b5e87805bb9961b181b390cca3530f3e
+  checksum: 10c0/3c32306735af5b62f75375e976a531ab45f171dfb0dc23ee035478d2132eaf21f244c31b0f3e861c514ff97d8112055e74c98ed44595ad24bd31434d5fdaf4bf
   languageName: node
   linkType: hard
 
@@ -4793,115 +4984,115 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/util-buffer-from@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/util-buffer-from@npm:4.2.1"
+"@smithy/util-buffer-from@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/util-buffer-from@npm:4.2.0"
   dependencies:
-    "@smithy/is-array-buffer": "npm:^4.2.1"
+    "@smithy/is-array-buffer": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/9784ead40c7d2aa312a7d690f329c84be5f0107b9bb42e5c8cd377aac9e62e6cc03a5f543961d0367fa1c1418f32eb6abbc6ba18916372a4d06ce2ed50f82c78
+  checksum: 10c0/4842d5607240c11400db30762ef6cb4def8d13e3474c5a901a4e2a1783198f5b163ab6011cf24a7f0acbba9a4d7cc79db1d811dc8aa9da446448e52773223997
   languageName: node
   linkType: hard
 
-"@smithy/util-config-provider@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/util-config-provider@npm:4.2.1"
+"@smithy/util-config-provider@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/util-config-provider@npm:4.2.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/7c17ec9b5f9e28eb44abdb25cf8046abd646aef6988c87c1640a504b9ef9f5eeac792ab2289d6c2fcff56c3a40a36b45632846b276b00ff3b91ee593bbbd78c9
+  checksum: 10c0/0699b9980ef94eac8f491c2ac557dc47e01c6ae71dabcb4464cc064f8dbf0855797461dbec8ba1925d45f076e968b0df02f0691c636cd1043e560f67541a1d27
   languageName: node
   linkType: hard
 
-"@smithy/util-defaults-mode-browser@npm:^4.3.36":
-  version: 4.3.36
-  resolution: "@smithy/util-defaults-mode-browser@npm:4.3.36"
+"@smithy/util-defaults-mode-browser@npm:^4.3.28":
+  version: 4.3.29
+  resolution: "@smithy/util-defaults-mode-browser@npm:4.3.29"
   dependencies:
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/smithy-client": "npm:^4.11.2"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/e0b0ef46a9c1a9b612e4c7df95e2a5fe49a65b4e7f3a9b5668494a8547b4554e874262fce0c6027b4e419670f112fddf7ca05f2fb4d0b2963ce953c378696f0c
+  checksum: 10c0/1e74208a450182cc786fd59e33b256791690512e233338a68506b932149755297fe08ce8f87da90bc63d6594870d58f7c9b3d100ec3aeea9361688601c8a5f23
   languageName: node
   linkType: hard
 
-"@smithy/util-defaults-mode-node@npm:^4.2.39":
-  version: 4.2.39
-  resolution: "@smithy/util-defaults-mode-node@npm:4.2.39"
+"@smithy/util-defaults-mode-node@npm:^4.2.31":
+  version: 4.2.32
+  resolution: "@smithy/util-defaults-mode-node@npm:4.2.32"
   dependencies:
-    "@smithy/config-resolver": "npm:^4.4.9"
-    "@smithy/credential-provider-imds": "npm:^4.2.10"
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/property-provider": "npm:^4.2.10"
-    "@smithy/smithy-client": "npm:^4.12.0"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/config-resolver": "npm:^4.4.6"
+    "@smithy/credential-provider-imds": "npm:^4.2.8"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/property-provider": "npm:^4.2.8"
+    "@smithy/smithy-client": "npm:^4.11.2"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/7945450028261b972f2fa42ffc732045836e5eb376ed0d4b5bf87d50efa9f8890a5fa59f2f4f7533e04d59fe354196549266c6d6a7319d307e2c5b42ca433602
+  checksum: 10c0/fb8eee0a2cf72cc055d6944912279940365dc584aa341922aa3b8b59809cff13ef55b483017405bb46e905e90960d20760126f7abd4c88d763b5f2bd687895b2
   languageName: node
   linkType: hard
 
-"@smithy/util-endpoints@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "@smithy/util-endpoints@npm:3.3.1"
+"@smithy/util-endpoints@npm:^3.2.8":
+  version: 3.2.8
+  resolution: "@smithy/util-endpoints@npm:3.2.8"
   dependencies:
-    "@smithy/node-config-provider": "npm:^4.3.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/node-config-provider": "npm:^4.3.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/6b339f5e372bbea377c935d35ca90e9933e34dc0621efe2ba045041fc2f0fb921cb81f619ffe8d090f46e9e774af04be633ad2fbb4dcb4e4339aa9d0ddf7250b
+  checksum: 10c0/7baade0e0b8c1a9ae04251aea5572908d27007305eaf9a9a01350d702ac02492cf4311040edcb766e77091c70dc58c0aadb6145b319ca309dc43caf43512c05c
   languageName: node
   linkType: hard
 
-"@smithy/util-hex-encoding@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/util-hex-encoding@npm:4.2.1"
+"@smithy/util-hex-encoding@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/util-hex-encoding@npm:4.2.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/3e007c57e75a828b2933f354d11a9a0035f5b25053c0391c402a24b32b5f86082db937cbd22f997a22c0b55e875b905521686ea414fa32ee6b0a5a7f52aabb74
+  checksum: 10c0/aaa94a69f03d14d3f28125cc915ca421065735e2d05d7305f0958a50021b2fce4fc68a248328e6b5b612dbaa49e471d481ff513bf89554f659f0a49573e97312
   languageName: node
   linkType: hard
 
-"@smithy/util-middleware@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/util-middleware@npm:4.2.10"
+"@smithy/util-middleware@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/util-middleware@npm:4.2.8"
   dependencies:
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/28eaca81bf2041e78287d660c97793dc0c5a000079e4956a9ba0e7d8f5354d3890408cb427a42585a05b1c0797fc71684b2b4d463280e234254bb5a9eac08dc4
+  checksum: 10c0/9c3faa8445e377d83da404a449e84ebc95c29faed210bb0f1fe28ddfb0ab0f8fe9ef54db7920a2dc0312c7db04c1590c805e25abcb9c1e3ac21f79597fc2c25c
   languageName: node
   linkType: hard
 
-"@smithy/util-retry@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/util-retry@npm:4.2.10"
+"@smithy/util-retry@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/util-retry@npm:4.2.8"
   dependencies:
-    "@smithy/service-error-classification": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/service-error-classification": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/b4a2478e7a156e3718a10424ee5c266205e52ff3f935190c4fbb96cdbe66a26c5554ed1650113befc918d62fa3d973e82b0499cc47b89c54726952debc293e0f
+  checksum: 10c0/5329f7e0144114ce7bece310a30c0f094adfe3bcb4a3c9d6d67bb0a8fef72b454bad4ccfecb8cfbeaae025c10a668e88beca08a7e04f28ec8faad8f16db791e9
   languageName: node
   linkType: hard
 
-"@smithy/util-stream@npm:^4.5.15":
-  version: 4.5.15
-  resolution: "@smithy/util-stream@npm:4.5.15"
+"@smithy/util-stream@npm:^4.5.10, @smithy/util-stream@npm:^4.5.11":
+  version: 4.5.11
+  resolution: "@smithy/util-stream@npm:4.5.11"
   dependencies:
-    "@smithy/fetch-http-handler": "npm:^5.3.11"
-    "@smithy/node-http-handler": "npm:^4.4.12"
-    "@smithy/types": "npm:^4.13.0"
-    "@smithy/util-base64": "npm:^4.3.1"
-    "@smithy/util-buffer-from": "npm:^4.2.1"
-    "@smithy/util-hex-encoding": "npm:^4.2.1"
-    "@smithy/util-utf8": "npm:^4.2.1"
+    "@smithy/fetch-http-handler": "npm:^5.3.9"
+    "@smithy/node-http-handler": "npm:^4.4.9"
+    "@smithy/types": "npm:^4.12.0"
+    "@smithy/util-base64": "npm:^4.3.0"
+    "@smithy/util-buffer-from": "npm:^4.2.0"
+    "@smithy/util-hex-encoding": "npm:^4.2.0"
+    "@smithy/util-utf8": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/e40d55065a022c6556a3f5f8d11d029c9c7ffd24e7dbd36c74c7f65ad184289b540d80d91b3b7930eedf1e701abdd9a7b47d64f685a643040774c34a2bbb0ba3
+  checksum: 10c0/ebc5f2b46ffacea6530df5ff8940a6d1a4d0019bd9b4bc9158b8ad4973b4a25143fa007c75c6f45a6971813b3c7b6d6c69cc0291f9f451e5972307740cfe1bed
   languageName: node
   linkType: hard
 
-"@smithy/util-uri-escape@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/util-uri-escape@npm:4.2.1"
+"@smithy/util-uri-escape@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/util-uri-escape@npm:4.2.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/cad0a1a589be437718bff36466add86c14e87da3f241dc706d7b6f13cde0eeafc0ab3837e866279a42cd468574e0ecba6480133f91853b086b9c02151c6dad85
+  checksum: 10c0/1933e8d939dc52e1ee5e7d2397f4c208a9eac0283397a19ee72078d04db997ebe3ad39709b56aac586ffce10d1cf5ab17dfc068ea6ab030098fc06fe3532e085
   languageName: node
   linkType: hard
 
@@ -4915,33 +5106,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@smithy/util-utf8@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@smithy/util-utf8@npm:4.2.1"
+"@smithy/util-utf8@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "@smithy/util-utf8@npm:4.2.0"
   dependencies:
-    "@smithy/util-buffer-from": "npm:^4.2.1"
+    "@smithy/util-buffer-from": "npm:^4.2.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/6f53ce67e79d7e1b6712b2fef0e042b63b1b0255ad390ca79b506f9e19f389cc6e5042814186454fef382ee3bb8f5af7819d0ce4f8d302906c2584e0675258cd
+  checksum: 10c0/689a1f2295d52bec0dde7215a075d79ef32ad8b146cb610a529b2cab747d96978401fd31469c225e31f3042830c54403e64d39b28033df013c8de27a84b405a2
   languageName: node
   linkType: hard
 
-"@smithy/util-waiter@npm:^4.2.10":
-  version: 4.2.10
-  resolution: "@smithy/util-waiter@npm:4.2.10"
+"@smithy/util-waiter@npm:^4.2.8":
+  version: 4.2.8
+  resolution: "@smithy/util-waiter@npm:4.2.8"
   dependencies:
-    "@smithy/abort-controller": "npm:^4.2.10"
-    "@smithy/types": "npm:^4.13.0"
+    "@smithy/abort-controller": "npm:^4.2.8"
+    "@smithy/types": "npm:^4.12.0"
     tslib: "npm:^2.6.2"
-  checksum: 10c0/f47189255cf88fdb6b25df2d3d9ca2437402f55054d31a83ec5876f6f2b7265dc21b3f4cec2e0da8adb294d3ed36a71a760464cdf45ae8ccf88c1b612161e46f
+  checksum: 10c0/456ef90229d342af8869599a4977c5058f798d051bf9b5df4069cf742e07be7ec62d0d9793829099dd90b96595fd2d4035346db8e75986b2166edb27d44423d4
   languageName: node
   linkType: hard
 
-"@smithy/uuid@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@smithy/uuid@npm:1.1.1"
+"@smithy/uuid@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@smithy/uuid@npm:1.1.0"
   dependencies:
     tslib: "npm:^2.6.2"
-  checksum: 10c0/083807ef29bdcc64ab692b50127d7ac98529ef5b564295ffec50d55515e8ba1b2257af113fdc813f9638c23897520e32dad4e9896613ebc012c5252531195ff8
+  checksum: 10c0/f8a8bfcc0e241457636884e778e261d45d8a3aaad533775111170cac36ac666275b59ec6d86d3d5b8d470ff4b864202d2a1a188b3c0e0ed0c86a0b693acf1ecf
   languageName: node
   linkType: hard
 
@@ -4981,53 +5172,65 @@ __metadata:
   linkType: hard
 
 "@turf/area@npm:^7.3.2":
-  version: 7.3.4
-  resolution: "@turf/area@npm:7.3.4"
+  version: 7.3.3
+  resolution: "@turf/area@npm:7.3.3"
   dependencies:
-    "@turf/helpers": "npm:7.3.4"
-    "@turf/meta": "npm:7.3.4"
+    "@turf/helpers": "npm:7.3.3"
+    "@turf/meta": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/185d5b4b8c23206b3792d5eb8d3830de2da33c6143e774d411ca2c80fae4770491b0e682e163648376a38c5a168e181db93efbc54f16b82459bf1d5a1580b4aa
+  checksum: 10c0/8d87e81383da1bfbbecf22b19fe43fbebb6b2d102628905d75bdb99b036b6b9ccfe2044fb6db90e22828a7f3a84f26f45aa83fa5f94eadde9edf4b281b9893ea
   languageName: node
   linkType: hard
 
 "@turf/bbox-polygon@npm:^7.3.2":
-  version: 7.3.4
-  resolution: "@turf/bbox-polygon@npm:7.3.4"
+  version: 7.3.3
+  resolution: "@turf/bbox-polygon@npm:7.3.3"
   dependencies:
-    "@turf/helpers": "npm:7.3.4"
+    "@turf/helpers": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/62807160f701986c32a8953185e23ba5a90b7e2a8bbbbd2e50ffb45cb34208339614c232e2a6cebb1bd338e77bd7074ad75aac9cea2191e977bf57c30787f4fb
+  checksum: 10c0/9ce35627e95fc9703c3daa26a5bcf7920a46174cba7003a08a47fe329c3fe44701bc6cc4925228054cb1cfa2b9824db02fe390f219f3f40f82046c953edfce1d
   languageName: node
   linkType: hard
 
 "@turf/centroid@npm:^7.3.2":
-  version: 7.3.4
-  resolution: "@turf/centroid@npm:7.3.4"
+  version: 7.3.3
+  resolution: "@turf/centroid@npm:7.3.3"
   dependencies:
-    "@turf/helpers": "npm:7.3.4"
-    "@turf/meta": "npm:7.3.4"
+    "@turf/helpers": "npm:7.3.3"
+    "@turf/meta": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/2cd5064d22b264b11091a6c07767d4addae4e175d3adf3601271fe8c3fa6e86987b48fcb0db125e810c96d22b92cc06d97c4284d7a84e83e05aaf1c1a425d5d5
+  checksum: 10c0/d0b916b0d28a2f2fa773b5982d9b2cb780f48c63a9774a4c10d26f662d186001fc8852a8abb8bfb8aaee597f7fefd0d48168a46efbcfe9f45e3fac19c1b3fa4e
   languageName: node
   linkType: hard
 
 "@turf/circle@npm:^7.3.2":
-  version: 7.3.4
-  resolution: "@turf/circle@npm:7.3.4"
+  version: 7.3.3
+  resolution: "@turf/circle@npm:7.3.3"
   dependencies:
-    "@turf/destination": "npm:7.3.4"
-    "@turf/helpers": "npm:7.3.4"
+    "@turf/destination": "npm:7.3.3"
+    "@turf/helpers": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/23b4e5dae48973c4987c93aed522a0a99e5211e903870b62ca004fb31089bf9324c936f2c1111753f194e1b012934e6d1800f69f1cc522627dee596286e30001
+  checksum: 10c0/27d874d97a0995b3fabb67f648db0628c04edaeb0178354399ad8668eea5a621d0a30af5235cf8bac37f4364c69ca3524d242e9320e57d0481b9a93c9e077fbb
   languageName: node
   linkType: hard
 
-"@turf/destination@npm:7.3.4, @turf/destination@npm:^7.3.4":
+"@turf/destination@npm:7.3.3":
+  version: 7.3.3
+  resolution: "@turf/destination@npm:7.3.3"
+  dependencies:
+    "@turf/helpers": "npm:7.3.3"
+    "@turf/invariant": "npm:7.3.3"
+    "@types/geojson": "npm:^7946.0.10"
+    tslib: "npm:^2.8.1"
+  checksum: 10c0/f15e998ed29b01fe118baa84bb277b4ee3cf43508f2137b98c9001d248b86dd7bc5fa23300c157ee574d30757920ebaa473eaf59f0be256ace8bf7be0f83b74e
+  languageName: node
+  linkType: hard
+
+"@turf/destination@npm:^7.3.4":
   version: 7.3.4
   resolution: "@turf/destination@npm:7.3.4"
   dependencies:
@@ -5039,15 +5242,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@turf/distance@npm:7.3.4":
-  version: 7.3.4
-  resolution: "@turf/distance@npm:7.3.4"
+"@turf/distance@npm:7.3.3":
+  version: 7.3.3
+  resolution: "@turf/distance@npm:7.3.3"
   dependencies:
-    "@turf/helpers": "npm:7.3.4"
-    "@turf/invariant": "npm:7.3.4"
+    "@turf/helpers": "npm:7.3.3"
+    "@turf/invariant": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/cb91c32ff6fb41b1e3487537dcade88c1366b7acdc6c9af19732fffb9a463d75be1576aa51783802a03bbb4a36f2d3ba2003cd01a418b74e2aee2ee1c7b49d21
+  checksum: 10c0/5e214b9f395df8dc8f4f29474656f6b4bf78daecb541bfb3cb59a0aa835e43c5e49c69fbc339e78552a96531b4ea19500fda1766f595f2e5f38ad0ab175e2101
+  languageName: node
+  linkType: hard
+
+"@turf/helpers@npm:7.3.3":
+  version: 7.3.3
+  resolution: "@turf/helpers@npm:7.3.3"
+  dependencies:
+    "@types/geojson": "npm:^7946.0.10"
+    tslib: "npm:^2.8.1"
+  checksum: 10c0/dd4ea19b6d6f93bb268a46846ecb731f731b1a8a0bc2e864dd9a74ac5aee6ba72cab34202d6ef4394793464aa5dc0c21a99aa12832a72e29150536a98bf18bce
   languageName: node
   linkType: hard
 
@@ -5061,6 +5274,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@turf/invariant@npm:7.3.3":
+  version: 7.3.3
+  resolution: "@turf/invariant@npm:7.3.3"
+  dependencies:
+    "@turf/helpers": "npm:7.3.3"
+    "@types/geojson": "npm:^7946.0.10"
+    tslib: "npm:^2.8.1"
+  checksum: 10c0/c64c13637b947afaeb7465c91cbb2dd920e397409e4183883996d59d32bc5cf773dbd02c42a5293a6d483b14a511fda6db642a1d4a02ac6e924d9d4556f3739f
+  languageName: node
+  linkType: hard
+
 "@turf/invariant@npm:7.3.4":
   version: 7.3.4
   resolution: "@turf/invariant@npm:7.3.4"
@@ -5073,26 +5297,26 @@ __metadata:
   linkType: hard
 
 "@turf/length@npm:^7.3.2":
-  version: 7.3.4
-  resolution: "@turf/length@npm:7.3.4"
+  version: 7.3.3
+  resolution: "@turf/length@npm:7.3.3"
   dependencies:
-    "@turf/distance": "npm:7.3.4"
-    "@turf/helpers": "npm:7.3.4"
-    "@turf/meta": "npm:7.3.4"
+    "@turf/distance": "npm:7.3.3"
+    "@turf/helpers": "npm:7.3.3"
+    "@turf/meta": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/f3428c7c0d08736802b781c003d38b3e847dd579bdb573eb9773ac617cef81da5f5d8d3e219a8eadeff57d347ff49376298ed048f20eb188fe7df09eca1192de
+  checksum: 10c0/f9fc7cb5226fbc353328bed74917d7617540cd6dc36b7ad13704086108a3a90ae82a546b4fb6814b556fd4539cf48ee5b3d3e7c022d5a30c59ebbc6dc22b5c94
   languageName: node
   linkType: hard
 
-"@turf/meta@npm:7.3.4":
-  version: 7.3.4
-  resolution: "@turf/meta@npm:7.3.4"
+"@turf/meta@npm:7.3.3":
+  version: 7.3.3
+  resolution: "@turf/meta@npm:7.3.3"
   dependencies:
-    "@turf/helpers": "npm:7.3.4"
+    "@turf/helpers": "npm:7.3.3"
     "@types/geojson": "npm:^7946.0.10"
     tslib: "npm:^2.8.1"
-  checksum: 10c0/756bb9e227323fbd9262fbe8323962f0d82852a6452e9e4db1ac5f6947081a450b9389a71b15f109d1d0621cc1b45cc1b68ee4b6c8eaf7e01442ef5cb2dee71b
+  checksum: 10c0/4b8824dff1f3d9d7511989e2176ba53a8b21723e959b508fe46ad35d2619513b558d6b159ef5acdfbadde30230be9a7f02ee04f4fb0161122cceb5dc3be63f7b
   languageName: node
   linkType: hard
 
@@ -5434,9 +5658,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:*":
-  version: 4.17.24
-  resolution: "@types/lodash@npm:4.17.24"
-  checksum: 10c0/b72f60d4daacdad1fa643edb3faba204c02a01eb1ac00a83ff73496a6d236fc55e459c06106e8ced42277dba932d087d8fc090f8de4ef590d3f91e6d6f7ce85a
+  version: 4.17.23
+  resolution: "@types/lodash@npm:4.17.23"
+  checksum: 10c0/9d9cbfb684e064a2b78aab9e220d398c9c2a7d36bc51a07b184ff382fa043a99b3d00c16c7f109b4eb8614118f4869678dbae7d5c6700ed16fb9340e26cc0bf6
   languageName: node
   linkType: hard
 
@@ -5448,11 +5672,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*, @types/node@npm:>=10.0.0":
-  version: 25.3.2
-  resolution: "@types/node@npm:25.3.2"
+  version: 25.2.1
+  resolution: "@types/node@npm:25.2.1"
   dependencies:
-    undici-types: "npm:~7.18.0"
-  checksum: 10c0/946c8758668762d3c3b475281b420e580d0ce828c6847534a822b92be791e23e5879b53001ea928e5352dec8908082d854b8076b7bcfc69549e23ad54b1f98ab
+    undici-types: "npm:~7.16.0"
+  checksum: 10c0/ce42fa07495093c55b6398e3c4346d644a61b8c4f59d2e0c0ed152ea0e4327c60a41d5fdfa3e0fc4f4776eb925e2b783b6b942501fc044328a44980bc2de4dc6
   languageName: node
   linkType: hard
 
@@ -5641,92 +5865,99 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/project-service@npm:8.56.1":
-  version: 8.56.1
-  resolution: "@typescript-eslint/project-service@npm:8.56.1"
+"@typescript-eslint/project-service@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@typescript-eslint/project-service@npm:8.54.0"
   dependencies:
-    "@typescript-eslint/tsconfig-utils": "npm:^8.56.1"
-    "@typescript-eslint/types": "npm:^8.56.1"
+    "@typescript-eslint/tsconfig-utils": "npm:^8.54.0"
+    "@typescript-eslint/types": "npm:^8.54.0"
     debug: "npm:^4.4.3"
   peerDependencies:
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/ca61cde575233bc79046d73ddd330d183fb3cbb941fddc31919336317cda39885c59296e2e5401b03d9325a64a629e842fd66865705ff0d85d83ee3ee40871e8
+  checksum: 10c0/3392ae259199021a80616a44d9484d1c363f61bc5c631dff2d08c6a906c98716a20caa7b832b8970120a1eb1eb2de3ee890cd527d6edb04f532f4e48a690a792
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.56.1":
-  version: 8.56.1
-  resolution: "@typescript-eslint/scope-manager@npm:8.56.1"
+"@typescript-eslint/scope-manager@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.54.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.56.1"
-    "@typescript-eslint/visitor-keys": "npm:8.56.1"
-  checksum: 10c0/89cc1af2635eee23f2aa2ff87c08f88f3ad972ebf67eaacdc604a4ef4178535682bad73fd086e6f3c542e4e5d874253349af10d58291d079cc29c6c7e9831de4
+    "@typescript-eslint/types": "npm:8.54.0"
+    "@typescript-eslint/visitor-keys": "npm:8.54.0"
+  checksum: 10c0/794740a5c0c1afc38d71e6bc59cc62870286e40d99f15e9760e76fb3d4197e961ee151c286c428535c404f5137721242a14da21350b749d0feb1f589f167814f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/tsconfig-utils@npm:8.56.1, @typescript-eslint/tsconfig-utils@npm:^8.56.1":
-  version: 8.56.1
-  resolution: "@typescript-eslint/tsconfig-utils@npm:8.56.1"
+"@typescript-eslint/tsconfig-utils@npm:8.54.0, @typescript-eslint/tsconfig-utils@npm:^8.54.0":
+  version: 8.54.0
+  resolution: "@typescript-eslint/tsconfig-utils@npm:8.54.0"
   peerDependencies:
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/d03b64d7ff19020beeefa493ae667c2e67a4547d25a3ecb9210a3a52afe980c093d772a91014bae699ee148bfb60cc659479e02bfc2946ea06954a8478ef1fe1
+  checksum: 10c0/e8598b0f051650c085d749002138d12249a3efd03e7de02e9e7913939dddd649d159b91f29ca3d28f5ee798b3f528a7195688e23c5e0b315d534e7af20a0c99a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.56.1, @typescript-eslint/types@npm:^8.54.0, @typescript-eslint/types@npm:^8.56.1":
+"@typescript-eslint/types@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@typescript-eslint/types@npm:8.54.0"
+  checksum: 10c0/2219594fe5e8931ff91fd1b7a2606d33cd4f093d43f9ca71bcaa37f106ef79ad51f830dea51392f7e3d8bca77f7077ef98733f87bc008fad2f0bbd9ea5fb8a40
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:^8.54.0":
   version: 8.56.1
   resolution: "@typescript-eslint/types@npm:8.56.1"
   checksum: 10c0/e5a0318abddf0c4f98da3039cb10b3c0601c8601f7a9f7043630f0d622dabfe83a4cd833545ad3531fc846e46ca2874377277b392c2490dffec279d9242d827b
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.56.1":
-  version: 8.56.1
-  resolution: "@typescript-eslint/typescript-estree@npm:8.56.1"
+"@typescript-eslint/typescript-estree@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.54.0"
   dependencies:
-    "@typescript-eslint/project-service": "npm:8.56.1"
-    "@typescript-eslint/tsconfig-utils": "npm:8.56.1"
-    "@typescript-eslint/types": "npm:8.56.1"
-    "@typescript-eslint/visitor-keys": "npm:8.56.1"
+    "@typescript-eslint/project-service": "npm:8.54.0"
+    "@typescript-eslint/tsconfig-utils": "npm:8.54.0"
+    "@typescript-eslint/types": "npm:8.54.0"
+    "@typescript-eslint/visitor-keys": "npm:8.54.0"
     debug: "npm:^4.4.3"
-    minimatch: "npm:^10.2.2"
+    minimatch: "npm:^9.0.5"
     semver: "npm:^7.7.3"
     tinyglobby: "npm:^0.2.15"
     ts-api-utils: "npm:^2.4.0"
   peerDependencies:
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/92f4421dac41be289761200dc2ed85974fa451deacb09490ae1870a25b71b97218e609a90d4addba9ded5b2abdebc265c9db7f6e9ce6d29ed20e89b8487e9618
+  checksum: 10c0/1a1a7c0a318e71f3547ab5573198d36165ea152c50447ef92e6326303f9a5c397606201ba80c7b86a725dcdd2913e924be94466a0c33b1b0c3ee852059e646b6
   languageName: node
   linkType: hard
 
 "@typescript-eslint/utils@npm:^8.0.0":
-  version: 8.56.1
-  resolution: "@typescript-eslint/utils@npm:8.56.1"
+  version: 8.54.0
+  resolution: "@typescript-eslint/utils@npm:8.54.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.9.1"
-    "@typescript-eslint/scope-manager": "npm:8.56.1"
-    "@typescript-eslint/types": "npm:8.56.1"
-    "@typescript-eslint/typescript-estree": "npm:8.56.1"
+    "@typescript-eslint/scope-manager": "npm:8.54.0"
+    "@typescript-eslint/types": "npm:8.54.0"
+    "@typescript-eslint/typescript-estree": "npm:8.54.0"
   peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+    eslint: ^8.57.0 || ^9.0.0
     typescript: ">=4.8.4 <6.0.0"
-  checksum: 10c0/d9ffd9b2944a2c425e0532f71dc61e61d0a923d1a17733cf2777c2a4ae638307d12d44f63b33b6b3dc62f02f47db93ec49344ecefe17b76ee3e4fb0833325be3
+  checksum: 10c0/949a97dca8024d39666e04ecdf2d4e12722f5064c387901e72bdcc7adafb96cf650a070dc79f9dd46fa1aae6ac2b5eac5ae3fe5a6979385208c28809a1bd143f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.56.1":
-  version: 8.56.1
-  resolution: "@typescript-eslint/visitor-keys@npm:8.56.1"
+"@typescript-eslint/visitor-keys@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.54.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.56.1"
-    eslint-visitor-keys: "npm:^5.0.0"
-  checksum: 10c0/86d97905dec1af964cc177c185933d040449acf6006096497f2e0093c6a53eb92b3ac1db9eb40a5a2e8d91160f558c9734331a9280797f09f284c38978b22190
+    "@typescript-eslint/types": "npm:8.54.0"
+    eslint-visitor-keys: "npm:^4.2.1"
+  checksum: 10c0/f83a9aa92f7f4d1fdb12cbca28c6f5704c36371264606b456388b2c869fc61e73c86d3736556e1bb6e253f3a607128b5b1bf6c68395800ca06f18705576faadd
   languageName: node
   linkType: hard
 
-"@uiw/codemirror-extensions-basic-setup@npm:4.25.5":
-  version: 4.25.5
-  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.25.5"
+"@uiw/codemirror-extensions-basic-setup@npm:4.25.4":
+  version: 4.25.4
+  resolution: "@uiw/codemirror-extensions-basic-setup@npm:4.25.4"
   dependencies:
     "@codemirror/autocomplete": "npm:^6.0.0"
     "@codemirror/commands": "npm:^6.0.0"
@@ -5743,19 +5974,19 @@ __metadata:
     "@codemirror/search": ">=6.0.0"
     "@codemirror/state": ">=6.0.0"
     "@codemirror/view": ">=6.0.0"
-  checksum: 10c0/8e15e2c8a8e1cacede8bb81077e783f73ed9ec6e282ed66d6142d1413e68d5979c3ca6b3ab37d6c29e5bc952c178e10d9a2dea54f39fa83a3104948b0eb8834f
+  checksum: 10c0/ab18dd6694c39ba0c2c42b18b1a16ed23087ad5c365cd53aa1799318a419f83fd19618fa099be0e9acacbf07c70a3f4e250830ed4c602e25c556452b480b2bfb
   languageName: node
   linkType: hard
 
 "@uiw/react-codemirror@npm:^4.25.4":
-  version: 4.25.5
-  resolution: "@uiw/react-codemirror@npm:4.25.5"
+  version: 4.25.4
+  resolution: "@uiw/react-codemirror@npm:4.25.4"
   dependencies:
     "@babel/runtime": "npm:^7.18.6"
     "@codemirror/commands": "npm:^6.1.0"
     "@codemirror/state": "npm:^6.1.1"
     "@codemirror/theme-one-dark": "npm:^6.0.0"
-    "@uiw/codemirror-extensions-basic-setup": "npm:4.25.5"
+    "@uiw/codemirror-extensions-basic-setup": "npm:4.25.4"
     codemirror: "npm:^6.0.0"
   peerDependencies:
     "@babel/runtime": ">=7.11.0"
@@ -5765,7 +5996,7 @@ __metadata:
     codemirror: ">=6.0.0"
     react: ">=17.0.0"
     react-dom: ">=17.0.0"
-  checksum: 10c0/541634c8428f7be48de687742d0c6717287b6b465c265bc52506a0e78c64bb24f3de3b332a3a0483d807afb7a0dbe599fe543fb287df414e19b333f23990cdff
+  checksum: 10c0/95446ae76a65659faa91bfeff47cd24b26577f979d7569ae54985f882a8c730b0be01b4b0923562895b33e25ee7b7c50bfad644c8849d33d8febc1e05b8dd23b
   languageName: node
   linkType: hard
 
@@ -6071,11 +6302,11 @@ __metadata:
   linkType: hard
 
 "acorn-walk@npm:^8.0.0":
-  version: 8.3.5
-  resolution: "acorn-walk@npm:8.3.5"
+  version: 8.3.4
+  resolution: "acorn-walk@npm:8.3.4"
   dependencies:
     acorn: "npm:^8.11.0"
-  checksum: 10c0/e31bf5b5423ed1349437029d66d708b9fbd1b77a644b031501e2c753b028d13b56348210ed901d5b1d0d86eb3381c0a0fc0d0998511a9d546d1194936266a332
+  checksum: 10c0/76537ac5fb2c37a64560feaf3342023dadc086c46da57da363e64c6148dc21b57d49ace26f949e225063acb6fb441eabffd89f7a3066de5ad37ab3e328927c62
   languageName: node
   linkType: hard
 
@@ -6097,12 +6328,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.11.0, acorn@npm:^8.15.0, acorn@npm:^8.16.0, acorn@npm:^8.2.4":
-  version: 8.16.0
-  resolution: "acorn@npm:8.16.0"
+"acorn@npm:^8.0.4, acorn@npm:^8.11.0, acorn@npm:^8.15.0, acorn@npm:^8.2.4":
+  version: 8.15.0
+  resolution: "acorn@npm:8.15.0"
   bin:
     acorn: bin/acorn
-  checksum: 10c0/c9c52697227661b68d0debaf972222d4f622aa06b185824164e153438afa7b08273432ca43ea792cadb24dada1d46f6f6bb1ef8de9956979288cc1b96bf9914e
+  checksum: 10c0/dec73ff59b7d6628a01eebaece7f2bdb8bb62b9b5926dcad0f8931f2b8b79c2be21f6c68ac095592adb5adb15831a3635d9343e6a91d028bbe85d564875ec3ec
   languageName: node
   linkType: hard
 
@@ -6182,7 +6413,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.1.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5, ajv@npm:^6.14.0":
+"ajv@npm:^6.1.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
   version: 6.14.0
   resolution: "ajv@npm:6.14.0"
   dependencies:
@@ -6195,14 +6426,14 @@ __metadata:
   linkType: hard
 
 "ajv@npm:^8.0.0, ajv@npm:^8.9.0":
-  version: 8.18.0
-  resolution: "ajv@npm:8.18.0"
+  version: 8.17.1
+  resolution: "ajv@npm:8.17.1"
   dependencies:
     fast-deep-equal: "npm:^3.1.3"
     fast-uri: "npm:^3.0.1"
     json-schema-traverse: "npm:^1.0.0"
     require-from-string: "npm:^2.0.2"
-  checksum: 10c0/e7517c426173513a07391be951879932bdf3348feaebd2199f5b901c20f99d60db8cd1591502d4d551dc82f594e82a05c4fe1c70139b15b8937f7afeaed9532f
+  checksum: 10c0/ec3ba10a573c6b60f94639ffc53526275917a2df6810e4ab5a6b959d87459f9ef3f00d5e7865b82677cb7d21590355b34da14d1d0b9c32d75f95a187e76fff35
   languageName: node
   linkType: hard
 
@@ -6695,13 +6926,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.12.0, axios@npm:^1.13.4":
-  version: 1.13.5
-  resolution: "axios@npm:1.13.5"
+  version: 1.13.4
+  resolution: "axios@npm:1.13.4"
   dependencies:
-    follow-redirects: "npm:^1.15.11"
-    form-data: "npm:^4.0.5"
+    follow-redirects: "npm:^1.15.6"
+    form-data: "npm:^4.0.4"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/abf468c34f2d145f3dc7dbc0f1be67e520630624307bda69a41bbe8d386bd672d87b4405c4ee77f9ff54b235ab02f96a9968fb00e75b13ce64706e352a3068fd
+  checksum: 10c0/474c00b7d71f4de4ad562589dae6b615149df7c2583bbc5ebba96229f3f85bfb0775d23705338df072f12e48d3e85685c065a3cf6855d58968a672d19214c728
   languageName: node
   linkType: hard
 
@@ -6713,14 +6944,14 @@ __metadata:
   linkType: hard
 
 "b4a@npm:^1.6.4":
-  version: 1.8.0
-  resolution: "b4a@npm:1.8.0"
+  version: 1.7.3
+  resolution: "b4a@npm:1.7.3"
   peerDependencies:
     react-native-b4a: "*"
   peerDependenciesMeta:
     react-native-b4a:
       optional: true
-  checksum: 10c0/27eab5c50ea1f1314f36256f160d2e6d6950f55f02ee4942732ecafd8bcc4b3a2ed209fab532b288770d41df2befa97a2745175c06471875b716eb87abf31519
+  checksum: 10c0/ac16d186e00fa0d16de1f1a4af413953bc762d50d5a0e382aaa744a13886600313b7293403ad77fc83f6b1489c3fc2610494d1026754a51d1b7cdac2115a7598
   languageName: node
   linkType: hard
 
@@ -6911,11 +7142,11 @@ __metadata:
   linkType: hard
 
 "baseline-browser-mapping@npm:^2.9.0":
-  version: 2.10.0
-  resolution: "baseline-browser-mapping@npm:2.10.0"
+  version: 2.9.19
+  resolution: "baseline-browser-mapping@npm:2.9.19"
   bin:
-    baseline-browser-mapping: dist/cli.cjs
-  checksum: 10c0/da9c3ec0fcd7f325226a47d2142794d41706b6e0a405718a2c15410bbdb72aacadd65738bedef558c6f1b106ed19458cb25b06f63b66df2c284799905dbbd003
+    baseline-browser-mapping: dist/cli.js
+  checksum: 10c0/569928db78bcd081953d7db79e4243a59a579a34b4ae1806b9b42d3b7f84e5bc40e6e82ae4fa06e7bef8291bf747b33b3f9ef5d3c6e1e420cb129d9295536129
   languageName: node
   linkType: hard
 
@@ -7033,9 +7264,9 @@ __metadata:
   linkType: hard
 
 "bn.js@npm:^4.0.0, bn.js@npm:^4.11.9":
-  version: 4.12.3
-  resolution: "bn.js@npm:4.12.3"
-  checksum: 10c0/53b6a4db8a583abd2522eacd480fece26fe6c4d8d35d03e5e11e15cb0873a3044eb4e3d1f9fef56f47eb008219e99ba5b620c26f57db49a687c6ab2cf848d50b
+  version: 4.12.2
+  resolution: "bn.js@npm:4.12.2"
+  checksum: 10c0/09a249faa416a9a1ce68b5f5ec8bbca87fe54e5dd4ef8b1cc8a4969147b80035592bddcb1e9cc814c3ba79e573503d5c5178664b722b509fb36d93620dba9b57
   languageName: node
   linkType: hard
 
@@ -7094,9 +7325,9 @@ __metadata:
   linkType: hard
 
 "bowser@npm:^2.11.0":
-  version: 2.14.1
-  resolution: "bowser@npm:2.14.1"
-  checksum: 10c0/bb69b55ba7f0456e3dc07d0cfd9467f985581f640ba8fd426b08754a6737ee0d6cf3b50607941e5255f04c83075b952ece0599f978dd4d20f1e95461104c5ffd
+  version: 2.13.1
+  resolution: "bowser@npm:2.13.1"
+  checksum: 10c0/a57ef440c68e80ce736b95017e13f65d1476cdfa3cae10e0958ab71a8ed3e804aad761c5809b98fbaeaacd8cd1986d46ee7c317937c601897c9b1d17971bc8d1
   languageName: node
   linkType: hard
 
@@ -7110,7 +7341,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"brace-expansion@npm:^2.0.1, brace-expansion@npm:^2.0.2":
+"brace-expansion@npm:^2.0.1":
   version: 2.0.2
   resolution: "brace-expansion@npm:2.0.2"
   dependencies:
@@ -7458,9 +7689,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001759":
-  version: 1.0.30001774
-  resolution: "caniuse-lite@npm:1.0.30001774"
-  checksum: 10c0/cc6a340a5421b9a67d8fa80889065ee27b2839ad62993571dded5296e18f02bbf685ce7094e93fe908cddc9fefdfad35d6c010b724cc3d22a6479b0d0b679f8c
+  version: 1.0.30001768
+  resolution: "caniuse-lite@npm:1.0.30001768"
+  checksum: 10c0/16808cb39f9563098deab6d45bcd0642a79fc5ace8dbcea8106b008b179820353e3ec089ed7e54f1f3c8bb84f2c2835b451f308212d8f36c2b7942f879e91955
   languageName: node
   linkType: hard
 
@@ -8181,8 +8412,8 @@ __metadata:
   linkType: hard
 
 "css-loader@npm:^7.1.3":
-  version: 7.1.4
-  resolution: "css-loader@npm:7.1.4"
+  version: 7.1.3
+  resolution: "css-loader@npm:7.1.3"
   dependencies:
     icss-utils: "npm:^5.1.0"
     postcss: "npm:^8.4.40"
@@ -8193,14 +8424,14 @@ __metadata:
     postcss-value-parser: "npm:^4.2.0"
     semver: "npm:^7.6.3"
   peerDependencies:
-    "@rspack/core": 0.x || ^1.0.0 || ^2.0.0-0
+    "@rspack/core": 0.x || 1.x
     webpack: ^5.27.0
   peerDependenciesMeta:
     "@rspack/core":
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/a3a3a6b564d4fcf978961be8bc6ca06fb3836fc8fbd729ddae4b0b94166a0f5ccf119fb3301a6fecbe90608a8edbfd418bdc644cf053615e6271aa65b3fdc00b
+  checksum: 10c0/8743a8f1a0beff371d0fbeae7dbae7b079e546c734e3c936f0c5dc4603a716a576200e9261c934565584cf0e090cca444efb613efa4282ee3fcab81db4c73c7e
   languageName: node
   linkType: hard
 
@@ -8251,7 +8482,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-tree@npm:^3.0.0, css-tree@npm:^3.1.0":
+"css-tree@npm:^3.1.0":
   version: 3.1.0
   resolution: "css-tree@npm:3.1.0"
   dependencies:
@@ -8384,15 +8615,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "cssstyle@npm:6.1.0"
+"cssstyle@npm:^5.3.4":
+  version: 5.3.7
+  resolution: "cssstyle@npm:5.3.7"
   dependencies:
-    "@asamuzakjp/css-color": "npm:^5.0.0"
-    "@csstools/css-syntax-patches-for-csstree": "npm:^1.0.28"
+    "@asamuzakjp/css-color": "npm:^4.1.1"
+    "@csstools/css-syntax-patches-for-csstree": "npm:^1.0.21"
     css-tree: "npm:^3.1.0"
-    lru-cache: "npm:^11.2.6"
-  checksum: 10c0/61ee24c2d974408853f0550d7f7835f96c1b89c30e6629fcfbf7538fe277414c1309d280d9ceeb72f01ddeeef9a89fee76787880340d2bf5e04109eabbdeb586
+    lru-cache: "npm:^11.2.4"
+  checksum: 10c0/9330f014f4209df06305264b92b8e963dfef636fdc2ae7d13f24ea7da6468aba1dc5eb13082621258bdd22cbd7fb7cb291894e188a3cdf660e8b79cd2c5e5e0e
   languageName: node
   linkType: hard
 
@@ -8782,13 +9013,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "data-urls@npm:7.0.0"
+"data-urls@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "data-urls@npm:6.0.1"
   dependencies:
     whatwg-mimetype: "npm:^5.0.0"
-    whatwg-url: "npm:^16.0.0"
-  checksum: 10c0/08d88ef50d8966a070ffdaa703e1e4b29f01bb2da364dfbc1612b1c2a4caa8045802c9532d81347b21781100132addb36a585071c8323b12cce97973961dee9f
+    whatwg-url: "npm:^15.1.0"
+  checksum: 10c0/d407cc5bcc5090e4613d5796ee0cfa4754841a773486fd5d3e1c8143d2391285f279b9ee8cdfa631326745ad8e41d4f6e4367decbfec864bbb145ae467a4e7d9
   languageName: node
   linkType: hard
 
@@ -9269,9 +9500,9 @@ __metadata:
   linkType: hard
 
 "dotenv@npm:^17.2.3":
-  version: 17.3.1
-  resolution: "dotenv@npm:17.3.1"
-  checksum: 10c0/c78e0c2d5a549c751e544cc60e2b95e7cb67e0c551f42e094d161c6b297aa44b630a3c2dcacf5569e529a6c2a6b84e2ab9be8d37b299d425df5a18b81ce4a35f
+  version: 17.2.4
+  resolution: "dotenv@npm:17.2.4"
+  checksum: 10c0/901aeee9cb40860291bdb452f6ca66aada78438331a026b0bd86fd41b94a79752dbc6a8971f4f26e6cafef11b4a27bb12ea99c0cbe7dfa61791f194727f799e5
   languageName: node
   linkType: hard
 
@@ -9357,9 +9588,9 @@ __metadata:
   linkType: hard
 
 "electron-to-chromium@npm:^1.5.263":
-  version: 1.5.302
-  resolution: "electron-to-chromium@npm:1.5.302"
-  checksum: 10c0/014413f2b4ec3a0e043c68f6c07a760d230b14e36b8549c5b124f386a6318d9641e69be2aa0df1877395dd99922745c1722c8ecb3d72205f0f3b3b3dc44c8442
+  version: 1.5.286
+  resolution: "electron-to-chromium@npm:1.5.286"
+  checksum: 10c0/5384510f9682d7e46f98fa48b874c3901d9639de96e9e387afce1fe010fbac31376df0534524edc15f66e9902bfacee54037a5e598004e9c6a617884e379926d
   languageName: node
   linkType: hard
 
@@ -9420,6 +9651,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"encoding@npm:^0.1.13":
+  version: 0.1.13
+  resolution: "encoding@npm:0.1.13"
+  dependencies:
+    iconv-lite: "npm:^0.6.2"
+  checksum: 10c0/36d938712ff00fe1f4bac88b43bcffb5930c1efa57bbcdca9d67e1d9d6c57cfb1200fb01efe0f3109b2ce99b231f90779532814a81370a1bd3274a0f58585039
+  languageName: node
+  linkType: hard
+
 "end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1":
   version: 1.4.5
   resolution: "end-of-stream@npm:1.4.5"
@@ -9531,6 +9771,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"err-code@npm:^2.0.2":
+  version: 2.0.3
+  resolution: "err-code@npm:2.0.3"
+  checksum: 10c0/b642f7b4dd4a376e954947550a3065a9ece6733ab8e51ad80db727aaae0817c2e99b02a97a3d6cecc648a97848305e728289cf312d09af395403a90c9d4d8a66
+  languageName: node
+  linkType: hard
+
 "errno@npm:~0.1.7":
   version: 0.1.8
   resolution: "errno@npm:0.1.8"
@@ -9934,13 +10181,13 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jest@npm:^29.12.1":
-  version: 29.15.0
-  resolution: "eslint-plugin-jest@npm:29.15.0"
+  version: 29.12.2
+  resolution: "eslint-plugin-jest@npm:29.12.2"
   dependencies:
     "@typescript-eslint/utils": "npm:^8.0.0"
   peerDependencies:
     "@typescript-eslint/eslint-plugin": ^8.0.0
-    eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
+    eslint: ^8.57.0 || ^9.0.0
     jest: "*"
     typescript: ">=4.8.4 <6.0.0"
   peerDependenciesMeta:
@@ -9950,13 +10197,13 @@ __metadata:
       optional: true
     typescript:
       optional: true
-  checksum: 10c0/e3d8f67708ba4a77a628f8d97a9ebbb20f62ad690d7cc155c0a1066d36b74a6ad8e943fda5c54264c4ad4186dd8d212075bce9f5c2debdd35708ed74ecdc81ef
+  checksum: 10c0/e314b1171e7fa14c1cba9d02a1d88c0258f57ff00b4d45297ccb9d15d293378924afb4a402aa18c00c42500cdcd6f64acfc2a2210d2da17f19989bb591287194
   languageName: node
   linkType: hard
 
 "eslint-plugin-jsdoc@npm:^62.4.1":
-  version: 62.7.1
-  resolution: "eslint-plugin-jsdoc@npm:62.7.1"
+  version: 62.5.2
+  resolution: "eslint-plugin-jsdoc@npm:62.5.2"
   dependencies:
     "@es-joy/jsdoccomment": "npm:~0.84.0"
     "@es-joy/resolve.exports": "npm:1.2.0"
@@ -9969,12 +10216,12 @@ __metadata:
     html-entities: "npm:^2.6.0"
     object-deep-merge: "npm:^2.0.0"
     parse-imports-exports: "npm:^0.2.4"
-    semver: "npm:^7.7.4"
+    semver: "npm:^7.7.3"
     spdx-expression-parse: "npm:^4.0.0"
     to-valid-identifier: "npm:^1.0.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
-  checksum: 10c0/949c1f11ed86ddac0903ffe65e5e30d36766badea2e42ceeaf85168ec6f540f94a9974896600410ce1fcbbf34809b39236cc9614411c15d05b93be166c21ec3c
+    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
+  checksum: 10c0/1872627695be78d30f7073e16393564012ea0b4560bec421cc95a8dfdb405272469c00d509e3a128d17f6abbe2c21201c85f37da42b7e572ddbe8e6dec44b4ab
   languageName: node
   linkType: hard
 
@@ -10132,7 +10379,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^5.0.0, eslint-visitor-keys@npm:^5.0.1":
+"eslint-visitor-keys@npm:^5.0.0":
   version: 5.0.1
   resolution: "eslint-visitor-keys@npm:5.0.1"
   checksum: 10c0/16190bdf2cbae40a1109384c94450c526a79b0b9c3cb21e544256ed85ac48a4b84db66b74a6561d20fe6ab77447f150d711c2ad5ad74df4fcc133736bce99678
@@ -10140,8 +10387,8 @@ __metadata:
   linkType: hard
 
 "eslint@npm:^9.39.2":
-  version: 9.39.3
-  resolution: "eslint@npm:9.39.3"
+  version: 9.39.2
+  resolution: "eslint@npm:9.39.2"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.8.0"
     "@eslint-community/regexpp": "npm:^4.12.1"
@@ -10149,7 +10396,7 @@ __metadata:
     "@eslint/config-helpers": "npm:^0.4.2"
     "@eslint/core": "npm:^0.17.0"
     "@eslint/eslintrc": "npm:^3.3.1"
-    "@eslint/js": "npm:9.39.3"
+    "@eslint/js": "npm:9.39.2"
     "@eslint/plugin-kit": "npm:^0.4.1"
     "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -10184,7 +10431,7 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/5e5dbf84d4f604f5d2d7a58c5c3fcdde30a01b8973ff3caeca8b2bacc16066717cedb4385ce52db1a2746d0b621770d4d4227cc7f44982b0b03818be2c31538d
+  checksum: 10c0/bb88ca8fd16bb7e1ac3e13804c54d41c583214460c0faa7b3e7c574e69c5600c7122295500fb4b0c06067831111db740931e98da1340329527658e1cf80073d3
   languageName: node
   linkType: hard
 
@@ -10212,13 +10459,13 @@ __metadata:
   linkType: hard
 
 "espree@npm:^11.1.0":
-  version: 11.1.1
-  resolution: "espree@npm:11.1.1"
+  version: 11.1.0
+  resolution: "espree@npm:11.1.0"
   dependencies:
-    acorn: "npm:^8.16.0"
+    acorn: "npm:^8.15.0"
     acorn-jsx: "npm:^5.3.2"
-    eslint-visitor-keys: "npm:^5.0.1"
-  checksum: 10c0/2feae74efdfb037b9e9fcb30506799845cf20900de5e441ed03e5c51aaa249f85ea5818ff177682acc0c9bfb4ac97e1965c238ee44ac7c305aab8747177bab69
+    eslint-visitor-keys: "npm:^5.0.0"
+  checksum: 10c0/32228d12896f5aa09f59fad8bf5df228d73310e436c21389876cdd21513b620c087d24b40646cdcff848540d11b078653db0e37ea67ac9c7012a12595d86630c
   languageName: node
   linkType: hard
 
@@ -10648,14 +10895,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-xml-parser@npm:5.3.6":
-  version: 5.3.6
-  resolution: "fast-xml-parser@npm:5.3.6"
+"fast-xml-parser@npm:5.3.4":
+  version: 5.3.4
+  resolution: "fast-xml-parser@npm:5.3.4"
   dependencies:
-    strnum: "npm:^2.1.2"
+    strnum: "npm:^2.1.0"
   bin:
     fxparser: src/cli/cli.js
-  checksum: 10c0/0150cc0566f327a76115de8b11628d717fb179010ed9bb77c52e579a7e6055a0f92f42f83678a6f1ec5b74411faec09713cb1f9b94bc687068ad86884a9199fa
+  checksum: 10c0/d77866ca860ad185153e12f6ba12274d32026319ad8064e4681342b8a8e1ffad3f1f98daf04d77239fb12eb1d906ee7185fd328deda74529680e8dae0f3e9327
   languageName: node
   linkType: hard
 
@@ -10946,7 +11193,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.11":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.6":
   version: 1.15.11
   resolution: "follow-redirects@npm:1.15.11"
   peerDependenciesMeta:
@@ -10998,7 +11245,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:^4.0.5":
+"form-data@npm:^4.0.4":
   version: 4.0.5
   resolution: "form-data@npm:4.0.5"
   dependencies:
@@ -11200,13 +11447,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-east-asian-width@npm:^1.0.0, get-east-asian-width@npm:^1.3.1, get-east-asian-width@npm:^1.5.0":
+"get-east-asian-width@npm:^1.0.0, get-east-asian-width@npm:^1.3.1":
   version: 1.5.0
   resolution: "get-east-asian-width@npm:1.5.0"
   checksum: 10c0/bff8bbc8d81790b9477f7aa55b1806b9f082a8dc1359fff7bd8b96939622c86b729685afc2bfeb22def1fc6ef1e5228e4d87dd4e6da60bc43a5edfb03c4ee167
   languageName: node
   linkType: hard
 
+"get-east-asian-width@npm:^1.3.0":
+  version: 1.4.0
+  resolution: "get-east-asian-width@npm:1.4.0"
+  checksum: 10c0/4e481d418e5a32061c36fbb90d1b225a254cc5b2df5f0b25da215dcd335a3c111f0c2023ffda43140727a9cafb62dac41d022da82c08f31083ee89f714ee3b83
+  languageName: node
+  linkType: hard
+
 "get-intrinsic@npm:^1.2.4, get-intrinsic@npm:^1.2.5, get-intrinsic@npm:^1.2.6, get-intrinsic@npm:^1.2.7, get-intrinsic@npm:^1.3.0":
   version: 1.3.1
   resolution: "get-intrinsic@npm:1.3.1"
@@ -11336,7 +11590,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^13.0.0, glob@npm:^13.0.3":
+"glob@npm:^13.0.0":
   version: 13.0.6
   resolution: "glob@npm:13.0.6"
   dependencies:
@@ -11867,17 +12121,17 @@ __metadata:
   linkType: hard
 
 "i18next-browser-languagedetector@npm:^8.2.0":
-  version: 8.2.1
-  resolution: "i18next-browser-languagedetector@npm:8.2.1"
+  version: 8.2.0
+  resolution: "i18next-browser-languagedetector@npm:8.2.0"
   dependencies:
     "@babel/runtime": "npm:^7.23.2"
-  checksum: 10c0/d200847a79b4cb2764ef59b33e5399085d4d56b2b038e884bb54fffe17953b467899142a6ef6e985592234f10049d14d06b80f2c56441ae80648c5a6717704f3
+  checksum: 10c0/4fcb6ec316e0fd4a10eee67a8d1e3d7e1407f14d5bed98978c50ed6f1853f5d559dc18ea7fd4b2de445ac0a4ed44df5b38f0b31b89b9ac883f99050d59ffec82
   languageName: node
   linkType: hard
 
 "i18next@npm:^25.8.0":
-  version: 25.8.13
-  resolution: "i18next@npm:25.8.13"
+  version: 25.8.4
+  resolution: "i18next@npm:25.8.4"
   dependencies:
     "@babel/runtime": "npm:^7.28.4"
   peerDependencies:
@@ -11885,7 +12139,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/12c661c2b58fe70445f8491b72f937eef28a5f9413f76bd178bbca92d4378d8436003c3bea1d5d760b8a69f809cbcef2ce389beffd9bc0434651134c6b37fecc
+  checksum: 10c0/c2582bd97893b4417c06c5b5f8f3bb37cdf77fc5918d00ff3a0e79c856b94bf8bb52377754bb5d62ade88b457f8ac541471987d359c1adc67bcaeea18121a2b5
   languageName: node
   linkType: hard
 
@@ -11898,7 +12152,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6":
+"iconv-lite@npm:0.6, iconv-lite@npm:^0.6.2":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -11907,7 +12161,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:^0.7.0, iconv-lite@npm:^0.7.2, iconv-lite@npm:~0.7.0":
+"iconv-lite@npm:^0.7.0, iconv-lite@npm:~0.7.0":
   version: 0.7.2
   resolution: "iconv-lite@npm:0.7.2"
   dependencies:
@@ -11975,9 +12229,9 @@ __metadata:
   linkType: hard
 
 "immer@npm:^11.0.0":
-  version: 11.1.4
-  resolution: "immer@npm:11.1.4"
-  checksum: 10c0/77beca6b0a4e361b30414189d63c64beb7df40ac1d8cbf524308fcbabe755e9aa49db3c6e95a6e412911416fec621f2c8470be5ec79feedc6abd6e4f7f18a9ce
+  version: 11.1.3
+  resolution: "immer@npm:11.1.3"
+  checksum: 10c0/2d0bcb7946274bb99254b8129026da9579591569afdd4f29e5ef3ebf231375c7ab97c344ffbfc9eeabea27a2145623fca1287c17e3ebd007c8cdcfd82954eeb7
   languageName: node
   linkType: hard
 
@@ -12337,9 +12591,9 @@ __metadata:
   linkType: hard
 
 "is-network-error@npm:^1.0.0":
-  version: 1.3.1
-  resolution: "is-network-error@npm:1.3.1"
-  checksum: 10c0/389b4a4cc6838bc5764c1d4ab8af11ec68c63825d53f7ce9f5a31aa4d2c9e5d33896c052f4c44100911e8db47bcf854c4aae6c03d6b1d84700f7c6aa72d16693
+  version: 1.3.0
+  resolution: "is-network-error@npm:1.3.0"
+  checksum: 10c0/3e85a69e957988db66d5af5412efdd531a5a63e150d1bdd5647cfd4dc54fd89b1dbdd472621f8915233c3176ba1e6922afa8a51a9e363ba4693edf96a294f898
   languageName: node
   linkType: hard
 
@@ -12542,11 +12796,11 @@ __metadata:
   linkType: hard
 
 "is-wsl@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "is-wsl@npm:3.1.1"
+  version: 3.1.0
+  resolution: "is-wsl@npm:3.1.0"
   dependencies:
     is-inside-container: "npm:^1.0.0"
-  checksum: 10c0/7e5023522bfb8f27de4de960b0d82c4a8146c0bddb186529a3616d78b5bbbfc19ef0c5fc60d0b3a3cc0bf95a415fbdedc18454310ea3049587c879b07ace5107
+  checksum: 10c0/d3317c11995690a32c362100225e22ba793678fe8732660c6de511ae71a0ff05b06980cf21f98a6bf40d7be0e9e9506f859abe00a1118287d63e53d0a3d06947
   languageName: node
   linkType: hard
 
@@ -12578,10 +12832,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isexe@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "isexe@npm:4.0.0"
-  checksum: 10c0/5884815115bceac452877659a9c7726382531592f43dc29e5d48b7c4100661aed54018cb90bd36cb2eaeba521092570769167acbb95c18d39afdccbcca06c5ce
+"isexe@npm:^3.1.1":
+  version: 3.1.2
+  resolution: "isexe@npm:3.1.2"
+  checksum: 10c0/1081adb0e9d8dd6d313916e39c81b683ab0e304bcec388b7bb400da988180dc576be7b298e6cd55d89fc5e98f32c1d73c2e04d2454c6115f58b28a8040d421ed
   languageName: node
   linkType: hard
 
@@ -12593,12 +12847,12 @@ __metadata:
   linkType: hard
 
 "isomorphic-dompurify@npm:^2.35.0":
-  version: 2.36.0
-  resolution: "isomorphic-dompurify@npm:2.36.0"
+  version: 2.35.0
+  resolution: "isomorphic-dompurify@npm:2.35.0"
   dependencies:
     dompurify: "npm:^3.3.1"
-    jsdom: "npm:^28.0.0"
-  checksum: 10c0/28fe65d37708ffc56547ed93b2c2fc3b3a5f7a9d96fc8ca4fae88b2ca64c7cb65c4441c09905d3638d0e15e55d0fcafb6259db8a087ae2d8eb24940ed3e7d004
+    jsdom: "npm:^27.4.0"
+  checksum: 10c0/53cef89f22597882352890b43149c94b8ac5409b75b7c07debcb919993f78a728432afb7b34d97e49004f2e22345dfc58ac38fadd4d27b04b7d2c6283382d812
   languageName: node
   linkType: hard
 
@@ -13339,16 +13593,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^28.0.0":
-  version: 28.1.0
-  resolution: "jsdom@npm:28.1.0"
+"jsdom@npm:^27.4.0":
+  version: 27.4.0
+  resolution: "jsdom@npm:27.4.0"
   dependencies:
-    "@acemir/cssom": "npm:^0.9.31"
-    "@asamuzakjp/dom-selector": "npm:^6.8.1"
-    "@bramus/specificity": "npm:^2.4.2"
-    "@exodus/bytes": "npm:^1.11.0"
-    cssstyle: "npm:^6.0.1"
-    data-urls: "npm:^7.0.0"
+    "@acemir/cssom": "npm:^0.9.28"
+    "@asamuzakjp/dom-selector": "npm:^6.7.6"
+    "@exodus/bytes": "npm:^1.6.0"
+    cssstyle: "npm:^5.3.4"
+    data-urls: "npm:^6.0.0"
     decimal.js: "npm:^10.6.0"
     html-encoding-sniffer: "npm:^6.0.0"
     http-proxy-agent: "npm:^7.0.2"
@@ -13358,18 +13611,18 @@ __metadata:
     saxes: "npm:^6.0.0"
     symbol-tree: "npm:^3.2.4"
     tough-cookie: "npm:^6.0.0"
-    undici: "npm:^7.21.0"
     w3c-xmlserializer: "npm:^5.0.0"
-    webidl-conversions: "npm:^8.0.1"
-    whatwg-mimetype: "npm:^5.0.0"
-    whatwg-url: "npm:^16.0.0"
+    webidl-conversions: "npm:^8.0.0"
+    whatwg-mimetype: "npm:^4.0.0"
+    whatwg-url: "npm:^15.1.0"
+    ws: "npm:^8.18.3"
     xml-name-validator: "npm:^5.0.0"
   peerDependencies:
     canvas: ^3.0.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/341ecb4005be2dab3247dacc349a20285d7991b5cee3382301fcd69a4294b705b4147e7d9ae1ddfab466ba4b3aace97ded4f7b070de285262221cb2782965b25
+  checksum: 10c0/291bb71a611dbaed81ce516587b71a5ffd9d43337d65bbd0731e7924cd7018f5871cf66614facadfd0dffec2b23a0fc57b2ee36b5a39e20f0f569e2949b3418c
   languageName: node
   linkType: hard
 
@@ -13607,12 +13860,12 @@ __metadata:
   linkType: hard
 
 "launch-editor@npm:^2.6.1":
-  version: 2.13.1
-  resolution: "launch-editor@npm:2.13.1"
+  version: 2.12.0
+  resolution: "launch-editor@npm:2.12.0"
   dependencies:
     picocolors: "npm:^1.1.1"
     shell-quote: "npm:^1.8.3"
-  checksum: 10c0/6ceb606b16a8c6520f79e0370b94958ab91206bea60375fbc18bcdd343508a0e225c6d74592e1dfe784db8b2a6d30f8bb67fbac6f297ae6ec616e2a513636ad7
+  checksum: 10c0/fac5e7ad90bf185594cad4c831a52419eef50e667c4eddb5b0a58eb5f944e16d947636ee767b9896ffd46a51db34925edd3b854c48efb47f6d767ffd7d904e71
   languageName: node
   linkType: hard
 
@@ -14200,13 +14453,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^11.0.0, lru-cache@npm:^11.1.0, lru-cache@npm:^11.2.1, lru-cache@npm:^11.2.6":
+"lru-cache@npm:^11.0.0, lru-cache@npm:^11.1.0, lru-cache@npm:^11.2.1":
   version: 11.2.6
   resolution: "lru-cache@npm:11.2.6"
   checksum: 10c0/73bbffb298760e71b2bfe8ebc16a311c6a60ceddbba919cfedfd8635c2d125fbfb5a39b71818200e67973b11f8d59c5a9e31d6f90722e340e90393663a66e5cd
   languageName: node
   linkType: hard
 
+"lru-cache@npm:^11.2.4, lru-cache@npm:^11.2.5":
+  version: 11.2.5
+  resolution: "lru-cache@npm:11.2.5"
+  checksum: 10c0/cc98958d25dddf1c8a8cbdc49588bd3b24450e8dfa78f32168fd188a20d4a0331c7406d0f3250c86a46619ee288056fd7a1195e8df56dc8a9592397f4fbd8e1d
+  languageName: node
+  linkType: hard
+
 "lru-cache@npm:^5.1.1":
   version: 5.1.1
   resolution: "lru-cache@npm:5.1.1"
@@ -14252,10 +14512,9 @@ __metadata:
   linkType: hard
 
 "make-fetch-happen@npm:^15.0.0":
-  version: 15.0.4
-  resolution: "make-fetch-happen@npm:15.0.4"
+  version: 15.0.3
+  resolution: "make-fetch-happen@npm:15.0.3"
   dependencies:
-    "@gar/promise-retry": "npm:^1.0.0"
     "@npmcli/agent": "npm:^4.0.0"
     cacache: "npm:^20.0.1"
     http-cache-semantics: "npm:^4.1.1"
@@ -14265,8 +14524,9 @@ __metadata:
     minipass-pipeline: "npm:^1.2.4"
     negotiator: "npm:^1.0.0"
     proc-log: "npm:^6.0.0"
+    promise-retry: "npm:^2.0.1"
     ssri: "npm:^13.0.0"
-  checksum: 10c0/b874bf6879fc0b8ef3a3cafdddadea4d956acf94790f8dede1a9d3c74c7886b6cd3eb992616b8e5935e6fd550016a465f10ba51bf6723a0c6f4d98883ae2926b
+  checksum: 10c0/525f74915660be60b616bcbd267c4a5b59481b073ba125e45c9c3a041bb1a47a2bd0ae79d028eb6f5f95bf9851a4158423f5068539c3093621abb64027e8e461
   languageName: node
   linkType: hard
 
@@ -14515,7 +14775,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^10.2.1, minimatch@npm:^10.2.2":
+"minimatch@npm:^10.2.2":
   version: 10.2.4
   resolution: "minimatch@npm:10.2.4"
   dependencies:
@@ -14524,7 +14784,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2, minimatch@npm:^3.1.3":
+"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.5
   resolution: "minimatch@npm:3.1.5"
   dependencies:
@@ -14534,20 +14794,20 @@ __metadata:
   linkType: hard
 
 "minimatch@npm:^5.1.0":
-  version: 5.1.9
-  resolution: "minimatch@npm:5.1.9"
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/4202718683815a7288b13e470160a4f9560cf392adef4f453927505817e01ef6b3476ecde13cfcaed17e7326dd3b69ad44eb2daeb19a217c5500f9277893f1d6
+  checksum: 10c0/3defdfd230914f22a8da203747c42ee3c405c39d4d37ffda284dac5e45b7e1f6c49aa8be606509002898e73091ff2a3bbfc59c2c6c71d4660609f63aa92f98e3
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.4":
-  version: 9.0.9
-  resolution: "minimatch@npm:9.0.9"
+"minimatch@npm:^9.0.4, minimatch@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
   dependencies:
-    brace-expansion: "npm:^2.0.2"
-  checksum: 10c0/0b6a58530dbb00361745aa6c8cffaba4c90f551afe7c734830bd95fd88ebf469dd7355a027824ea1d09e37181cfeb0a797fb17df60c15ac174303ac110eb7e86
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed
   languageName: node
   linkType: hard
 
@@ -14568,17 +14828,17 @@ __metadata:
   linkType: hard
 
 "minipass-fetch@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "minipass-fetch@npm:5.0.2"
+  version: 5.0.1
+  resolution: "minipass-fetch@npm:5.0.1"
   dependencies:
-    iconv-lite: "npm:^0.7.2"
+    encoding: "npm:^0.1.13"
     minipass: "npm:^7.0.3"
     minipass-sized: "npm:^2.0.0"
     minizlib: "npm:^3.0.1"
   dependenciesMeta:
-    iconv-lite:
+    encoding:
       optional: true
-  checksum: 10c0/ce4ab9f21cfabaead2097d95dd33f485af8072fbc6b19611bce694965393453a1639d641c2bcf1c48f2ea7d41ea7fab8278373f1d0bee4e63b0a5b2cdd0ef649
+  checksum: 10c0/50bcf48c9841ebb25e29a2817468595219c72cfffc7c175a1d7327843c8bef9b72cb01778f46df7eca695dfe47ab98e6167af4cb026ddd80f660842919a5193c
   languageName: node
   linkType: hard
 
@@ -14893,18 +15153,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-exports-info@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "node-exports-info@npm:1.6.0"
-  dependencies:
-    array.prototype.flatmap: "npm:^1.3.3"
-    es-errors: "npm:^1.3.0"
-    object.entries: "npm:^1.1.9"
-    semver: "npm:^6.3.1"
-  checksum: 10c0/3613f21c60b047e66f168d3499a6be0060d89fb01ddceaa7032c2fb318aff12e4b9b111449c1a9aeb3b848bfdc1d4b6bc8fab327af692319597d21a1e7063692
-  languageName: node
-  linkType: hard
-
 "node-fs@npm:~0.1.5":
   version: 0.1.7
   resolution: "node-fs@npm:0.1.7"
@@ -14996,13 +15244,13 @@ __metadata:
   linkType: hard
 
 "nodemon@npm:^3.1.11":
-  version: 3.1.14
-  resolution: "nodemon@npm:3.1.14"
+  version: 3.1.11
+  resolution: "nodemon@npm:3.1.11"
   dependencies:
     chokidar: "npm:^3.5.2"
     debug: "npm:^4"
     ignore-by-default: "npm:^1.0.1"
-    minimatch: "npm:^10.2.1"
+    minimatch: "npm:^3.1.2"
     pstree.remy: "npm:^1.1.8"
     semver: "npm:^7.5.3"
     simple-update-notifier: "npm:^2.0.0"
@@ -15011,7 +15259,7 @@ __metadata:
     undefsafe: "npm:^2.0.5"
   bin:
     nodemon: bin/nodemon.js
-  checksum: 10c0/074f2056051a148ad11cda0d6c3f905bdef93a878792385f16e1dff0c63dcf07f23ebe1ab3763dca7314d0266e12129f066070545d817a205ee050a22eff50b0
+  checksum: 10c0/f3c17897146f680eaf93f5e1f53b1fd4acbd61e4f7526ec6cbcc993d1c14cee8c722c41b30aa8b101447f672d38e6d7b17c97e77540df191d724826bb16ce474
   languageName: node
   linkType: hard
 
@@ -15314,7 +15562,8 @@ __metadata:
     "@mui/x-data-grid": "npm:^8.26.0"
     "@mui/x-date-pickers": "npm:^8.26.0"
     "@mui/x-tree-view": "npm:^8.26.0"
-    "@openforis/arena-server": "npm:^1.2.19"
+    "@openforis/arena-core": ../arena-core
+    "@openforis/arena-server": ../arena-server
     "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.6.2"
     "@reduxjs/toolkit": "npm:^2.11.2"
     "@sendgrid/mail": "npm:^8.1.6"
@@ -15927,6 +16176,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pg-connection-string@npm:^2.10.1":
+  version: 2.10.1
+  resolution: "pg-connection-string@npm:2.10.1"
+  checksum: 10c0/f218a72b59c661022caca9a7f2116655632b1d7e7d6dc9a8ee9f238744e0927e0d6f44e12f50d9767c6d9cd47d9b3766aa054b77504b15c6bf503400530e053e
+  languageName: node
+  linkType: hard
+
 "pg-connection-string@npm:^2.11.0":
   version: 2.11.0
   resolution: "pg-connection-string@npm:2.11.0"
@@ -15934,12 +16190,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-cursor@npm:^2.18.0":
-  version: 2.18.0
-  resolution: "pg-cursor@npm:2.18.0"
+"pg-cursor@npm:^2.17.0":
+  version: 2.17.0
+  resolution: "pg-cursor@npm:2.17.0"
   peerDependencies:
     pg: ^8
-  checksum: 10c0/54b5984fdfa91dc2afe5a16a28a3d14601afbc4ac4a909b81ecb528d3e2383642ebbc223da0ba3952919e8559325d779b6b00fd784d29e36056f1531fd41d52a
+  checksum: 10c0/62ec41f410498f36d0bda9481be1e01aa2b7d29cef2a69a350bc6065bc9bb02e4236eaa7d135b4700b533f8f59fd61b4b6f7a88227af69ee221969129a4d4707
   languageName: node
   linkType: hard
 
@@ -15957,7 +16213,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-pool@npm:^3.11.0, pg-pool@npm:^3.12.0":
+"pg-pool@npm:^3.11.0":
   version: 3.12.0
   resolution: "pg-pool@npm:3.12.0"
   peerDependencies:
@@ -15980,7 +16236,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pg-protocol@npm:^1.11.0, pg-protocol@npm:^1.12.0":
+"pg-protocol@npm:^1.11.0":
   version: 1.12.0
   resolution: "pg-protocol@npm:1.12.0"
   checksum: 10c0/577f33c756f6503682d9ac17fd813f9edbe4a1716e497f17d36b6edaf9bf8383accaf8cd7422c49e2fbe4eb28ef275bc52fbd8287e154d4510f50b9ccefe4165
@@ -15988,13 +16244,13 @@ __metadata:
   linkType: hard
 
 "pg-query-stream@npm:^4.11.2":
-  version: 4.13.0
-  resolution: "pg-query-stream@npm:4.13.0"
+  version: 4.12.0
+  resolution: "pg-query-stream@npm:4.12.0"
   dependencies:
-    pg-cursor: "npm:^2.18.0"
+    pg-cursor: "npm:^2.17.0"
   peerDependencies:
     pg: ^8
-  checksum: 10c0/7e787fa9d253d7e9ee4167328d7e7f9769e67624bcffcf19258f87c45f9a9197a7dbf5fb94f99fe26bdeb0a96ee7129357e513beaa4e5390835e04b771c5dfb8
+  checksum: 10c0/435d10cb8c254b4ea66e965186ff934787b896f829ce6d97156888f9f23a2e4f2cb5e0630e5be22bedab09f1ab66c764f2f1c19863ac09c0a92c871e9eb6466a
   languageName: node
   linkType: hard
 
@@ -16034,13 +16290,13 @@ __metadata:
   linkType: hard
 
 "pg@npm:^8.11.2, pg@npm:^8.17.2":
-  version: 8.19.0
-  resolution: "pg@npm:8.19.0"
+  version: 8.17.2
+  resolution: "pg@npm:8.17.2"
   dependencies:
     pg-cloudflare: "npm:^1.3.0"
-    pg-connection-string: "npm:^2.11.0"
-    pg-pool: "npm:^3.12.0"
-    pg-protocol: "npm:^1.12.0"
+    pg-connection-string: "npm:^2.10.1"
+    pg-pool: "npm:^3.11.0"
+    pg-protocol: "npm:^1.11.0"
     pg-types: "npm:2.2.0"
     pgpass: "npm:1.0.5"
   peerDependencies:
@@ -16051,7 +16307,7 @@ __metadata:
   peerDependenciesMeta:
     pg-native:
       optional: true
-  checksum: 10c0/7713d6ef9f32746370f2bd599ebfa54d22bbdbb3a256a64b76997dd8a7279a5734dde260d6a1da22047171604fba88bd273d570c77b16f08ebe32a47ffbe2aba
+  checksum: 10c0/74b022587f92953f498dba747ccf9c7c90767af70326595d30c7ab0e2f00b2b468226c8abae54caef63ab444a8ac6f1597d859174386c7ba7c318c225d711c5f
   languageName: node
   linkType: hard
 
@@ -16166,11 +16422,11 @@ __metadata:
   linkType: hard
 
 "playwright-core@npm:>=1.2.0":
-  version: 1.58.2
-  resolution: "playwright-core@npm:1.58.2"
+  version: 1.58.1
+  resolution: "playwright-core@npm:1.58.1"
   bin:
     playwright-core: cli.js
-  checksum: 10c0/5aa15b2b764e6ffe738293a09081a6f7023847a0dbf4cd05fe10eed2e25450d321baf7482f938f2d2eb330291e197fa23e57b29a5b552b89927ceb791266225b
+  checksum: 10c0/2c12755579148cbd13811cc1a01e9693432f0e4595c76ebb02d2e1b4ee7286719c6769fdb26cda61f218bc49b7ddd4de5d856abbd034acde4ff3dbeee93e4773
   languageName: node
   linkType: hard
 
@@ -16763,6 +17019,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"promise-retry@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "promise-retry@npm:2.0.1"
+  dependencies:
+    err-code: "npm:^2.0.2"
+    retry: "npm:^0.12.0"
+  checksum: 10c0/9c7045a1a2928094b5b9b15336dcd2a7b1c052f674550df63cc3f36cd44028e5080448175b6f6ca32b642de81150f5e7b1a98b728f15cb069f2dd60ac2616b96
+  languageName: node
+  linkType: hard
+
 "prompt@npm:^1.0.0":
   version: 1.3.0
   resolution: "prompt@npm:1.3.0"
@@ -16901,11 +17167,11 @@ __metadata:
   linkType: hard
 
 "qs@npm:^6.14.0, qs@npm:^6.14.1":
-  version: 6.15.0
-  resolution: "qs@npm:6.15.0"
+  version: 6.14.1
+  resolution: "qs@npm:6.14.1"
   dependencies:
     side-channel: "npm:^1.1.0"
-  checksum: 10c0/ff341078a78a991d8a48b4524d52949211447b4b1ad907f489cac0770cbc346a28e47304455c0320e5fb000f8762d64b03331e3b71865f663bf351bcba8cdb4b
+  checksum: 10c0/0e3b22dc451f48ce5940cbbc7c7d9068d895074f8c969c0801ac15c1313d1859c4d738e46dc4da2f498f41a9ffd8c201bd9fb12df67799b827db94cc373d2613
   languageName: node
   linkType: hard
 
@@ -17088,15 +17354,15 @@ __metadata:
   linkType: hard
 
 "react-dropzone@npm:^14.3.8":
-  version: 14.4.1
-  resolution: "react-dropzone@npm:14.4.1"
+  version: 14.4.0
+  resolution: "react-dropzone@npm:14.4.0"
   dependencies:
     attr-accept: "npm:^2.2.4"
     file-selector: "npm:^2.1.0"
     prop-types: "npm:^15.8.1"
   peerDependencies:
     react: ">= 16.8 || 18.0.0"
-  checksum: 10c0/ee66f88a06fcd1250f0e0d79cc967055f9b9fb9ce1d024c2ca92ff165b81fb44fe680b5f4e1bd49f9ca64dd834018868a6d8996548426cafcc0d770c075570c8
+  checksum: 10c0/a714b171af3c3a51b0a940e8e16e1a9ed2ee2ff5e9b6ccc8bd2c21a2dcee310532a46479eee0833ceb6d607086b99716f06749e014ed293e68694a9bb2ebbaee
   languageName: node
   linkType: hard
 
@@ -17787,18 +18053,15 @@ __metadata:
   linkType: hard
 
 "resolve@npm:^2.0.0-next.5":
-  version: 2.0.0-next.6
-  resolution: "resolve@npm:2.0.0-next.6"
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    es-errors: "npm:^1.3.0"
-    is-core-module: "npm:^2.16.1"
-    node-exports-info: "npm:^1.6.0"
-    object-keys: "npm:^1.1.1"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/4e44cb84aa9a3c7c82d4a98e8111879671150496160a53ca6cdbed6101bf239f19105f8b8b84e40c0b76d46b0d9626813510b19a80e01f4ae18692e9d0b47749
+  checksum: 10c0/a6c33555e3482ea2ec4c6e3d3bf0d78128abf69dca99ae468e64f1e30acaa318fd267fb66c8836b04d558d3e2d6ed875fe388067e7d8e0de647d3c21af21c43a
   languageName: node
   linkType: hard
 
@@ -17823,18 +18086,15 @@ __metadata:
   linkType: hard
 
 "resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
-  version: 2.0.0-next.6
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.6#optional!builtin<compat/resolve>::version=2.0.0-next.6&hash=c3c19d"
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
-    es-errors: "npm:^1.3.0"
-    is-core-module: "npm:^2.16.1"
-    node-exports-info: "npm:^1.6.0"
-    object-keys: "npm:^1.1.1"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10c0/dca533e38820b0d8d636f269824cef3b7435802ab7401211c6f10af03be0e2f7e216047234e1623046c0a6791577079767e0c04f0d36e42c7f567b1bff7b0742
+  checksum: 10c0/78ad6edb8309a2bfb720c2c1898f7907a37f858866ce11a5974643af1203a6a6e05b2fa9c53d8064a673a447b83d42569260c306d43628bff5bb101969708355
   languageName: node
   linkType: hard
 
@@ -17855,6 +18115,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"retry@npm:^0.12.0":
+  version: 0.12.0
+  resolution: "retry@npm:0.12.0"
+  checksum: 10c0/59933e8501727ba13ad73ef4a04d5280b3717fd650408460c987392efe9d7be2040778ed8ebe933c5cbd63da3dcc37919c141ef8af0a54a6e4fca5a2af177bfe
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.13.1":
   version: 0.13.1
   resolution: "retry@npm:0.13.1"
@@ -17906,14 +18173,14 @@ __metadata:
   linkType: hard
 
 "rimraf@npm:^6.1.2":
-  version: 6.1.3
-  resolution: "rimraf@npm:6.1.3"
+  version: 6.1.2
+  resolution: "rimraf@npm:6.1.2"
   dependencies:
-    glob: "npm:^13.0.3"
+    glob: "npm:^13.0.0"
     package-json-from-dist: "npm:^1.0.1"
   bin:
     rimraf: dist/esm/bin.mjs
-  checksum: 10c0/4a56537850102e20ba5d5eb49f366b4b7b2435389734b4b8480cf0e0eb0f6f5d0c44120a171aeb0d8f9ab40312a10d2262f3f50acbad803e32caef61b6cf86fc
+  checksum: 10c0/c11a6a6fad937ada03c12fe688860690df8296d7cd08dbe59e3cc087f44e43573ae26ecbe48e54cb7a6db745b8c81fe5a15b9359233cc21d52d9b5b3330fcc74
   languageName: node
   linkType: hard
 
@@ -18034,12 +18301,12 @@ __metadata:
   linkType: hard
 
 "sass-loader@npm:^16.0.6":
-  version: 16.0.7
-  resolution: "sass-loader@npm:16.0.7"
+  version: 16.0.6
+  resolution: "sass-loader@npm:16.0.6"
   dependencies:
     neo-async: "npm:^2.6.2"
   peerDependencies:
-    "@rspack/core": 0.x || ^1.0.0 || ^2.0.0-0
+    "@rspack/core": 0.x || 1.x
     node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     sass: ^1.3.0
     sass-embedded: "*"
@@ -18055,7 +18322,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/eb352777cb3aff4bf0029c88e276a37ca10f415de0765eb1276f742455ebb152faffc2417770bf4a26da389d6115e27dd6c8e66c8b71396b21811f6e4d1b4eea
+  checksum: 10c0/a66df6ecc01c80011a2bc9356d2b262753ad425382171d120ec5d4b5015d5131e919384a22cd148d48ecc1cb4fa598acaaa6308b260f8951f3558b5785816bb4
   languageName: node
   linkType: hard
 
@@ -18200,7 +18467,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3, semver@npm:^7.7.3, semver@npm:^7.7.4":
+"semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3, semver@npm:^7.7.3":
   version: 7.7.4
   resolution: "semver@npm:7.7.4"
   bin:
@@ -18768,9 +19035,9 @@ __metadata:
   linkType: hard
 
 "spdx-license-ids@npm:^3.0.0":
-  version: 3.0.23
-  resolution: "spdx-license-ids@npm:3.0.23"
-  checksum: 10c0/8495620f6f2a237749cce922ea2d593a66f7885c301b1a0f5542183e7041182f27f616a8f13345cefdea0c9b3e0899328e0aa8cec100cf4f3fac4bb3bd975515
+  version: 3.0.22
+  resolution: "spdx-license-ids@npm:3.0.22"
+  checksum: 10c0/4a85e44c2ccfc06eebe63239193f526508ebec1abc7cf7bca8ee43923755636234395447c2c87f40fb672cf580a9c8e684513a676bfb2da3d38a4983684bbb38
   languageName: node
   linkType: hard
 
@@ -18856,11 +19123,11 @@ __metadata:
   linkType: hard
 
 "ssri@npm:^13.0.0":
-  version: 13.0.1
-  resolution: "ssri@npm:13.0.1"
+  version: 13.0.0
+  resolution: "ssri@npm:13.0.0"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: 10c0/cf6408a18676c57ff2ed06b8a20dc64bb3e748e5c7e095332e6aecaa2b8422b1e94a739a8453bf65156a8a47afe23757ba4ab52d3ea3b62322dc40875763e17a
+  checksum: 10c0/405f3a531cd98b013cecb355d63555dca42fd12c7bc6671738aaa9a82882ff41cdf0ef9a2b734ca4f9a760338f114c29d01d9238a65db3ccac27929bd6e6d4b2
   languageName: node
   linkType: hard
 
@@ -19038,12 +19305,12 @@ __metadata:
   linkType: hard
 
 "string-width@npm:^8.0.0":
-  version: 8.2.0
-  resolution: "string-width@npm:8.2.0"
+  version: 8.1.1
+  resolution: "string-width@npm:8.1.1"
   dependencies:
-    get-east-asian-width: "npm:^1.5.0"
-    strip-ansi: "npm:^7.1.2"
-  checksum: 10c0/d8915428b43519b0f494da6590dbe4491857d8a12e40250e50fc01fbb616ffd8400a436bbe25712255ee129511fe0414c49d3b6b9627e2bc3a33dcec1d2eda02
+    get-east-asian-width: "npm:^1.3.0"
+    strip-ansi: "npm:^7.1.0"
+  checksum: 10c0/479841b1f7a816d04ca39c486f4c130512c1a9363b445b3424dfca88ec3e71689908e3c62a3e130c2f7037d78a65880b16655f2ba1324638b4956fcd14f28f29
   languageName: node
   linkType: hard
 
@@ -19192,7 +19459,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0, strip-ansi@npm:^7.1.2":
+"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
   version: 7.2.0
   resolution: "strip-ansi@npm:7.2.0"
   dependencies:
@@ -19236,7 +19503,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strnum@npm:^2.1.2":
+"strnum@npm:^2.1.0":
   version: 2.1.2
   resolution: "strnum@npm:2.1.2"
   checksum: 10c0/4e04753b793540d79cd13b2c3e59e298440477bae2b853ab78d548138385193b37d766d95b63b7046475d68d44fb1fca692f0a3f72b03f4168af076c7b246df9
@@ -19390,11 +19657,11 @@ __metadata:
   linkType: hard
 
 "swagger-ui-dist@npm:>=5.0.0":
-  version: 5.31.2
-  resolution: "swagger-ui-dist@npm:5.31.2"
+  version: 5.31.0
+  resolution: "swagger-ui-dist@npm:5.31.0"
   dependencies:
     "@scarf/scarf": "npm:=1.4.0"
-  checksum: 10c0/a7770f5dfb02933e61873e1e82d1fbc831c0abdd7926a64827771946ad68def71a421fc773a7c8b9e2a91e7e2fdc6da87a4484e6e4d820b69aa6fcc44e40623e
+  checksum: 10c0/9f06121207f078a90fe252cced6a33863910506f2beac0aa87a18e660c97f9ce544c0c4f406d003eb61a8591b5224040123bfa8407df9c885f2f7f85ba56e50c
   languageName: node
   linkType: hard
 
@@ -19483,15 +19750,15 @@ __metadata:
   linkType: hard
 
 "tar@npm:^7.5.4":
-  version: 7.5.9
-  resolution: "tar@npm:7.5.9"
+  version: 7.5.7
+  resolution: "tar@npm:7.5.7"
   dependencies:
     "@isaacs/fs-minipass": "npm:^4.0.0"
     chownr: "npm:^3.0.0"
     minipass: "npm:^7.1.2"
     minizlib: "npm:^3.1.0"
     yallist: "npm:^5.0.0"
-  checksum: 10c0/e870beb1b2477135ca2abe86b2d18f7b35d0a4e3a37bbc523d3b8f7adca268dfab543f26528a431d569897f8c53a7cac745cdfbc4411c2f89aeeacc652b81b0a
+  checksum: 10c0/51f261afc437e1112c3e7919478d6176ea83f7f7727864d8c2cce10f0b03a631d1911644a567348c3063c45abdae39718ba97abb073d22aa3538b9a53ae1e31c
   languageName: node
   linkType: hard
 
@@ -19560,11 +19827,11 @@ __metadata:
   linkType: hard
 
 "text-decoder@npm:^1.1.0":
-  version: 1.2.7
-  resolution: "text-decoder@npm:1.2.7"
+  version: 1.2.3
+  resolution: "text-decoder@npm:1.2.3"
   dependencies:
     b4a: "npm:^1.6.4"
-  checksum: 10c0/929938ed154fbadb660a7f3d1aca30b7e53649a731af7583168fcfba0c158046325d35d945926e2a512bb62d1a49a7818151c987ea38b48853f01e1615722fc5
+  checksum: 10c0/569d776b9250158681c83656ef2c3e0a5d5c660c27ca69f87eedef921749a4fbf02095e5f9a0f862a25cf35258379b06e31dee9c125c9f72e273b7ca1a6d1977
   languageName: node
   linkType: hard
 
@@ -19642,21 +19909,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tldts-core@npm:^7.0.23":
-  version: 7.0.23
-  resolution: "tldts-core@npm:7.0.23"
-  checksum: 10c0/b3d936a75b5f65614c356a58ef37563681c6224187dcce9f57aac76d92aae83b1a6fe6ab910f77472b35456bc145a8441cb3e572b4850be43cb4f3465e0610ec
+"tldts-core@npm:^7.0.22":
+  version: 7.0.22
+  resolution: "tldts-core@npm:7.0.22"
+  checksum: 10c0/30fa12370d6bbac12b4dece2e6828ee719f12cdc0b1f24d00136b6fc3111c928d1f94dc13e4af9df566f86e835324fdd0eafa7234f9cb4695ca076c477c37bee
   languageName: node
   linkType: hard
 
 "tldts@npm:^7.0.5":
-  version: 7.0.23
-  resolution: "tldts@npm:7.0.23"
+  version: 7.0.22
+  resolution: "tldts@npm:7.0.22"
   dependencies:
-    tldts-core: "npm:^7.0.23"
+    tldts-core: "npm:^7.0.22"
   bin:
     tldts: bin/cli.js
-  checksum: 10c0/492874770afaade724a10f8a97cce511d74bed07735c7f1100b7957254d7a5bbbc18becaf5cd049f9d7b0feeb945a64af64d5a300dfb851a4ac57cf3a5998afc
+  checksum: 10c0/8a2ae2ae15d2fc15dc4fde506e9d3bcd00b8767818284f1d57d97fe035f7828dbdecd70e957c8be4282de77419ef99aa70f92fb8b128b8d334e7093fa1e5145b
   languageName: node
   linkType: hard
 
@@ -20051,9 +20318,9 @@ __metadata:
   linkType: hard
 
 "underscore@npm:^1.8.3":
-  version: 1.13.8
-  resolution: "underscore@npm:1.13.8"
-  checksum: 10c0/6677688daeda30484823e77c0b89ce4dcf29964a77d5a06f37299c007ab4bb1c66a0ff75e0d274620b62a1fe2a6ba29879f8214533ca611d71a1ae504f2bfc9b
+  version: 1.13.7
+  resolution: "underscore@npm:1.13.7"
+  checksum: 10c0/fad2b4aac48847674aaf3c30558f383399d4fdafad6dd02dd60e4e1b8103b52c5a9e5937e0cc05dacfd26d6a0132ed0410ab4258241240757e4a4424507471cd
   languageName: node
   linkType: hard
 
@@ -20064,17 +20331,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici-types@npm:~7.18.0":
-  version: 7.18.2
-  resolution: "undici-types@npm:7.18.2"
-  checksum: 10c0/85a79189113a238959d7a647368e4f7c5559c3a404ebdb8fc4488145ce9426fcd82252a844a302798dfc0e37e6fb178ff481ed03bc4caf634c5757d9ef43521d
-  languageName: node
-  linkType: hard
-
-"undici@npm:^7.21.0":
-  version: 7.22.0
-  resolution: "undici@npm:7.22.0"
-  checksum: 10c0/09777c06f3f18f761f03e3a4c9c04fd9fcca8ad02ccea43602ee4adf73fcba082806f1afb637f6ea714ef6279c5323c25b16d435814c63db720f63bfc20d316b
+"undici-types@npm:~7.16.0":
+  version: 7.16.0
+  resolution: "undici-types@npm:7.16.0"
+  checksum: 10c0/3033e2f2b5c9f1504bdc5934646cb54e37ecaca0f9249c983f7b1fc2e87c6d18399ebb05dc7fd5419e02b2e915f734d872a65da2e3eeed1813951c427d33cc9a
   languageName: node
   linkType: hard
 
@@ -20504,7 +20764,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^8.0.1":
+"webidl-conversions@npm:^8.0.0":
   version: 8.0.1
   resolution: "webidl-conversions@npm:8.0.1"
   checksum: 10c0/3f6f327ca5fa0c065ed8ed0ef3b72f33623376e68f958e9b7bd0df49fdb0b908139ac2338d19fb45bd0e05595bda96cb6d1622222a8b413daa38a17aacc4dd46
@@ -20654,16 +20914,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-sources@npm:^3.3.4":
-  version: 3.3.4
-  resolution: "webpack-sources@npm:3.3.4"
-  checksum: 10c0/94a42508531338eb41939cf1d48a4a8a6db97f3a47e5453cff2133a68d3169ca779d4bcbe9dfed072ce16611959eba1e16f085bc2dc56714e1a1c1783fd661a3
+"webpack-sources@npm:^3.3.3":
+  version: 3.3.3
+  resolution: "webpack-sources@npm:3.3.3"
+  checksum: 10c0/ab732f6933b513ba4d505130418995ddef6df988421fccf3289e53583c6a39e205c4a0739cee98950964552d3006604912679c736031337fb4a9d78d8576ed40
   languageName: node
   linkType: hard
 
 "webpack@npm:^5.104.1":
-  version: 5.105.3
-  resolution: "webpack@npm:5.105.3"
+  version: 5.105.0
+  resolution: "webpack@npm:5.105.0"
   dependencies:
     "@types/eslint-scope": "npm:^3.7.7"
     "@types/estree": "npm:^1.0.8"
@@ -20671,7 +20931,7 @@ __metadata:
     "@webassemblyjs/ast": "npm:^1.14.1"
     "@webassemblyjs/wasm-edit": "npm:^1.14.1"
     "@webassemblyjs/wasm-parser": "npm:^1.14.1"
-    acorn: "npm:^8.16.0"
+    acorn: "npm:^8.15.0"
     acorn-import-phases: "npm:^1.0.3"
     browserslist: "npm:^4.28.1"
     chrome-trace-event: "npm:^1.0.2"
@@ -20689,13 +20949,13 @@ __metadata:
     tapable: "npm:^2.3.0"
     terser-webpack-plugin: "npm:^5.3.16"
     watchpack: "npm:^2.5.1"
-    webpack-sources: "npm:^3.3.4"
+    webpack-sources: "npm:^3.3.3"
   peerDependenciesMeta:
     webpack-cli:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 10c0/a9a9a3a369d14f24348bd932feb07eef74a9fe194ad16704dc4f125b6055fe51a5ef1c6fdb3aa398c6f180f59aa14cb1b360695d8ea862a5ed130103ebd255e0
+  checksum: 10c0/4aea6b976485b5364e122f301c08f48efa84ddb2c0cb5d09f27445d1f2da0b9875cd889e41b58cac3ff05618a9c965be716df52586d151b5f52a7bbed7662174
   languageName: node
   linkType: hard
 
@@ -20733,6 +20993,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "whatwg-mimetype@npm:4.0.0"
+  checksum: 10c0/a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df
+  languageName: node
+  linkType: hard
+
 "whatwg-mimetype@npm:^5.0.0":
   version: 5.0.0
   resolution: "whatwg-mimetype@npm:5.0.0"
@@ -20740,14 +21007,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^16.0.0":
-  version: 16.0.1
-  resolution: "whatwg-url@npm:16.0.1"
+"whatwg-url@npm:^15.1.0":
+  version: 15.1.0
+  resolution: "whatwg-url@npm:15.1.0"
   dependencies:
-    "@exodus/bytes": "npm:^1.11.0"
     tr46: "npm:^6.0.0"
-    webidl-conversions: "npm:^8.0.1"
-  checksum: 10c0/e75565566abf3a2cdbd9f06c965dbcccee6ec4e9f0d3728ad5e08ceb9944279848bcaa211d35a29cb6d2df1e467dd05cfb59fbddf8a0adcd7d0bce9ffb703fd2
+    webidl-conversions: "npm:^8.0.0"
+  checksum: 10c0/40c49b47044787c87486aaaa5b504da122820661c45ae20ab466c62595ed03c64be7c10c1d180d028949a393cd455db14144966a68359cd37fe6417e3426d128
   languageName: node
   linkType: hard
 
@@ -20860,13 +21126,13 @@ __metadata:
   linkType: hard
 
 "which@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "which@npm:6.0.1"
+  version: 6.0.0
+  resolution: "which@npm:6.0.0"
   dependencies:
-    isexe: "npm:^4.0.0"
+    isexe: "npm:^3.1.1"
   bin:
     node-which: bin/which.js
-  checksum: 10c0/7e710e54ea36d2d6183bee2f9caa27a3b47b9baf8dee55a199b736fcf85eab3b9df7556fca3d02b50af7f3dfba5ea3a45644189836df06267df457e354da66d5
+  checksum: 10c0/fe9d6463fe44a76232bb6e3b3181922c87510a5b250a98f1e43a69c99c079b3f42ddeca7e03d3e5f2241bf2d334f5a7657cfa868b97c109f3870625842f4cc15
   languageName: node
   linkType: hard
 
@@ -20992,7 +21258,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.18.0, ws@npm:^8.19.0":
+"ws@npm:^8.18.0, ws@npm:^8.18.3, ws@npm:^8.19.0":
   version: 8.19.0
   resolution: "ws@npm:8.19.0"
   peerDependencies: