feat(revit)!: Enable config for disabling API listening events (#1255 )

* Expose options to disable revit listening events * fix mistake * Disable change tracking for revit when document listener is disabled * Check first
Add logging for revitildlemanager reentry misuse (#1253 )
2026-01-21 19:10:34 +00:00 · 2026-01-21 17:52:06 +00:00 · 2026-01-19 17:12:23 +00:00 · 2026-01-16 18:19:25 +02:00 · 2026-01-16 18:13:52 +02:00 · 2026-01-16 18:08:34 +02:00
248 changed files with 8355 additions and 4283 deletions
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -20,7 +20,7 @@ jobs:
          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)

      - name: Cache Nuget
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        with:
          path: ~/.nuget/packages
          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -16,7 +16,7 @@ jobs:
      file_version: ${{ steps.set-version.outputs.file_version }}
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
        with:
          fetch-depth: 0

@@ -26,7 +26,7 @@ jobs:
          dotnet-version: 8.0.4xx # Align with global.json (including roll forward rules)

      - name: Cache Nuget
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        with:
          path: ~/.nuget/packages
          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
@@ -35,7 +35,7 @@ jobs:
        run: ./build.ps1 zip

      - name: ⬆️ Upload artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
        with:
          name: output-${{ env.SEMVER }}
          path: output/*.*
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -292,7 +312,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -336,35 +356,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -292,7 +312,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -336,35 +356,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -293,7 +313,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -155,6 +155,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -210,9 +229,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -244,7 +262,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -288,33 +306,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -155,6 +155,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -210,9 +229,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -244,7 +262,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -288,33 +306,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -178,6 +178,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -268,9 +289,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -302,7 +322,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,35 +366,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -178,6 +178,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -268,9 +289,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -302,7 +322,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,35 +366,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -178,6 +178,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -268,9 +289,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -302,7 +322,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -346,35 +366,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -164,6 +164,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -219,9 +238,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -254,7 +272,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -298,33 +316,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -164,6 +164,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -219,9 +238,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -254,7 +272,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -298,33 +316,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.etabs21": {
@@ -335,35 +355,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -155,6 +155,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -210,9 +229,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -236,7 +254,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.etabs22": {
@@ -286,33 +304,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -2,33 +2,63 @@
 <Project>
  <PropertyGroup>
    <UseWpf>true</UseWpf>
-
    <Description>NextGen Speckle Connector for Autodesk Navisworks Manage</Description>
    <Authors>$(Authors) jonathon@speckle.systems</Authors>
    <PackageTags>$(PackageTags) connector nwd nwc nwf navisworks manage</PackageTags>

    <PluginBundleTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Navisworks.bundle</PluginBundleTarget>
-    <PluginVersionContentTarget>$(AppData)\Autodesk\ApplicationPlugins\Speckle.Connectors.Navisworks.bundle\Contents\$(NavisworksVersion)</PluginVersionContentTarget>
+    <PluginVersionContentTarget>$(PluginBundleTarget)\Contents\$(NavisworksVersion)</PluginVersionContentTarget>
    <RootNamespace>Speckle.Connector.Navisworks</RootNamespace>
  </PropertyGroup>

-  <!-- Post Builds -->
-  <ItemGroup>
-    <RibbonFiles Include="$(OutDir)Plugin\NavisworksRibbon.*"/>
-    <ResourceFiles Include="$(OutDir)Resources\**\*.png"/>
-    <ResourceFiles Include="$(OutDir)Resources\**\*.ico"/>
-    <AllFiles Include="$(OutDir)*"/>
-  </ItemGroup>
+  <Target Name="PostBuild"
+          AfterTargets="Build"
+          Condition="'$(OS)' == 'Windows_NT' and '$(NavisworksVersion)' != ''">

-
-  <Target Name="PostBuild" AfterTargets="Build" Condition="'$(NavisworksVersion)' != '' And '$(ContinuousIntegrationBuild)' != 'true' And '$(OS)' == 'Windows_NT'">
    <Message Text="Navisworks Version $(NavisworksVersion)" Importance="high"/>
+
    <RemoveDir Directories="$(PluginVersionContentTarget)" Condition="Exists('$(PluginVersionContentTarget)')"/>
-  
-    <Copy SourceFiles="$(OutDir)Plugin\PackageContents.xml" DestinationFolder="$(PluginBundleTarget)\"/>
-    <Copy SourceFiles="@(RibbonFiles)" DestinationFolder="$(PluginVersionContentTarget)\en-US\"/>
-    <Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(PluginVersionContentTarget)\Resources\"/>
-  
-    <Copy SourceFiles="@(AllFiles)" DestinationFolder="$(PluginVersionContentTarget)\" />
+
+    <MakeDir Directories="
+      $(PluginBundleTarget);
+      $(PluginBundleTarget)\Contents;
+      $(PluginVersionContentTarget);
+      $(PluginVersionContentTarget)\en-US;
+      $(PluginVersionContentTarget)\Resources"/>
+
+    <!-- Re-evaluate outputs at execution time -->
+    <ItemGroup>
+      <PackageXml Include="$(OutDir)Plugin\PackageContents.xml"/>
+      <RibbonFiles Include="$(OutDir)Plugin\NavisworksRibbon.*"/>
+      <ResourceFiles Include="$(OutDir)Resources\**\*.png;$(OutDir)Resources\**\*.ico"/>
+      <AllFiles Include="$(OutDir)**\*.*"/>
+
+      <Message Text="AllFiles count: @(AllFiles->Count())" Importance="high"/>
+      <Warning Condition="'@(AllFiles)' == ''" Text="No files in $(OutDir) at PostBuild time."/>
+
+    </ItemGroup>
+
+    <Copy SourceFiles="@(PackageXml)"
+          DestinationFolder="$(PluginBundleTarget)\"
+          SkipUnchangedFiles="true"/>
+
+    <Copy SourceFiles="@(RibbonFiles)"
+          DestinationFolder="$(PluginVersionContentTarget)\en-US\"
+          SkipUnchangedFiles="true"/>
+
+    <Copy SourceFiles="@(ResourceFiles)"
+          DestinationFiles="@(ResourceFiles->'$(PluginVersionContentTarget)\Resources\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true"/>
+
+    <Copy SourceFiles="@(AllFiles)"
+          DestinationFiles="@(AllFiles->'$(PluginVersionContentTarget)\%(RecursiveDir)%(Filename)%(Extension)')"
+          SkipUnchangedFiles="true"/>
+
+    <Message Text="Copied build to $(PluginVersionContentTarget)" Importance="high"/>
+  </Target>
+
+  <Target Name="ValidateNavisworksVersion" BeforeTargets="PostBuild"
+          Condition="'$(NavisworksVersion)' == '' and '$(OS)' == 'Windows_NT'">
+    <Error Text="NavisworksVersion property is required for PostBuild packaging."/>
  </Target>
 </Project>
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2020": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2021": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2022": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2023": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -169,6 +169,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -259,9 +280,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2024": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -175,6 +175,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -265,9 +286,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -291,7 +311,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2025": {
@@ -337,35 +357,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -184,6 +184,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -266,9 +287,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -292,7 +312,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.navisworks2026": {
@@ -339,35 +359,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    ".NETFramework,Version=v4.8/win-x64": {
@@ -6,32 +6,22 @@ using Speckle.Sdk;

 namespace Speckle.Connector.Navisworks.Bindings;

-public class NavisworksBasicConnectorBinding : IBasicConnectorBinding
+public class NavisworksBasicConnectorBinding(
+  IBrowserBridge parent,
+  DocumentModelStore store,
+  ISpeckleApplication speckleApplication
+) : IBasicConnectorBinding
 {
  public string Name => "baseBinding";
-  public IBrowserBridge Parent { get; }
-  public BasicConnectorBindingCommands Commands { get; }
+  public IBrowserBridge Parent { get; } = parent;

-  private readonly DocumentModelStore _store;
-  private readonly ISpeckleApplication _speckleApplication;
+  public BasicConnectorBindingCommands Commands { get; } = new(parent);

-  public NavisworksBasicConnectorBinding(
-    IBrowserBridge parent,
-    DocumentModelStore store,
-    ISpeckleApplication speckleApplication
-  )
-  {
-    Parent = parent;
-    _store = store;
-    _speckleApplication = speckleApplication;
-    Commands = new BasicConnectorBindingCommands(parent);
-  }
+  public string GetSourceApplicationName() => speckleApplication.Slug;

-  public string GetSourceApplicationName() => _speckleApplication.Slug;
+  public string GetSourceApplicationVersion() => speckleApplication.HostApplicationVersion;

-  public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
-
-  public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
+  public string GetConnectorVersion() => speckleApplication.SpeckleVersion;

  public DocumentInfo? GetDocumentInfo() =>
    NavisworksApp.ActiveDocument is null || NavisworksApp.ActiveDocument.Models.Count == 0
@@ -42,15 +32,15 @@ public class NavisworksBasicConnectorBinding : IBasicConnectorBinding
        NavisworksApp.ActiveDocument.GetHashCode().ToString()
      );

-  public DocumentModelStore GetDocumentState() => _store;
+  public DocumentModelStore GetDocumentState() => store;

-  public void AddModel(ModelCard model) => _store.AddModel(model);
+  public void AddModel(ModelCard model) => store.AddModel(model);

-  public void UpdateModel(ModelCard model) => _store.UpdateModel(model);
+  public void UpdateModel(ModelCard model) => store.UpdateModel(model);

-  public void RemoveModel(ModelCard model) => _store.RemoveModel(model);
+  public void RemoveModel(ModelCard model) => store.RemoveModel(model);

-  public void RemoveModels(List<ModelCard> models) => _store.RemoveModels(models);
+  public void RemoveModels(List<ModelCard> models) => store.RemoveModels(models);

  public Task HighlightModel(string modelCardId) => Task.CompletedTask;

@@ -1,6 +1,6 @@
-using Speckle.Connector.Navisworks.Services;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Converter.Navisworks.Services;

 namespace Speckle.Connector.Navisworks.Bindings;

@@ -12,6 +12,7 @@ using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Settings;
+using Speckle.Converter.Navisworks.Services;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Common;
@@ -58,12 +59,12 @@ public class NavisworksSendBinding : ISendBinding

  private static void SubscribeToNavisworksEvents() { }

-  // Do not change the behavior/scope of this class on send binding unless make sure the behavior is same. Otherwise, we might not be able to update list of saved sets.
+  // WARNING: Changes to filter behavior here must match everywhere filters are used, or saved sets won't update correctly
  public List<ISendFilter> GetSendFilters() =>
    [
      new NavisworksSelectionFilter() { IsDefault = true },
-      new NavisworksSavedSetsFilter(new ElementSelectionService()),
-      new NavisworksSavedViewsFilter(new ElementSelectionService())
+      new NavisworksSavedSetsFilter(new ConnectorElementSelectionService()),
+      new NavisworksSavedViewsFilter(new ConnectorElementSelectionService())
    ];

  public List<ICardSetting> GetSendSettings() =>
@@ -105,6 +106,7 @@ public class NavisworksSendBinding : ISendBinding
  )
  {
    var selectedPaths = modelCard.SendFilter.NotNull().RefreshObjectIds();
+
    var convertHiddenElementsSetting =
      modelCard.Settings!.FirstOrDefault(s => s.Id == "convertHiddenElements")?.Value as bool? ?? false;
    var message = convertHiddenElementsSetting
@@ -115,30 +117,78 @@ public class NavisworksSendBinding : ISendBinding
    {
      throw new SpeckleSendFilterException(message);
    }
+
    onOperationProgressed.Report(new CardProgress("Getting selection...", null));
    await Task.CompletedTask;

-    var modelItems = new List<NAV.ModelItem>();
+    int estimatedCapacity = selectedPaths.Count * 10;
+    var modelItems = new List<NAV.ModelItem>(estimatedCapacity);
    double count = 0;
+
    foreach (var path in selectedPaths)
    {
      onOperationProgressed.Report(new CardProgress("Getting selection...", count / selectedPaths.Count));
      await Task.CompletedTask;
+
      var modelItem = _selectionService.GetModelItemFromPath(path);
-      modelItems.AddRange(_selectionService.GetGeometryNodes(modelItem).Where(_selectionService.IsVisible));
+      var hasChildren = modelItem.Children.Any();
+
+      if (hasChildren)
+      {
+        int nodesVisited = 0;
+        int hiddenBranchesPruned = 0;
+        const int REPORT_INTERVAL = 1000;
+
+        void TraverseWithProgress(NAV.ModelItem node)
+        {
+          nodesVisited++;
+
+          if (nodesVisited % REPORT_INTERVAL == 0)
+          {
+            onOperationProgressed.Report(
+              new CardProgress(
+                $"Expanding tree: {nodesVisited} visited, {modelItems.Count} with geometry, {hiddenBranchesPruned} hidden",
+                null
+              )
+            );
+            Task.Delay(1).Wait();
+          }
+
+          if (!_selectionService.IsVisible(node))
+          {
+            hiddenBranchesPruned++;
+            return;
+          }
+
+          if (node.HasGeometry)
+          {
+            modelItems.Add(node);
+          }
+
+          foreach (var child in node.Children)
+          {
+            TraverseWithProgress(child);
+          }
+        }
+
+        TraverseWithProgress(modelItem);
+      }
+      else
+      {
+        if (modelItem.HasGeometry && _selectionService.IsVisible(modelItem))
+        {
+          modelItems.Add(modelItem);
+        }
+      }
+
      count++;
    }
+
    return modelItems.Count == 0 ? throw new SpeckleSendFilterException(message) : modelItems;
  }

  public void CancelSend(string modelCardId) => _cancellationManager.CancelOperation(modelCardId);

-  /// <summary>
-  /// Cancels all outstanding send operations for the current document.
-  /// This method is called when the active document changes, to ensure
-  /// that any in-progress send operations are properly canceled before
-  /// the new document is loaded.
-  /// </summary>
  public void CancelAllSendOperations()
  {
    foreach (var modelCardId in _store.GetSenders().Select(m => m.ModelCardId))
@@ -15,6 +15,7 @@ using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
+using Speckle.Converter.Navisworks.Constants.Registers;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Models.GraphTraversal;
@@ -60,6 +61,9 @@ public static class NavisworksConnectorServiceRegistration
    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
    serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();

+    // Registers and caches
+    serviceCollection.AddScoped<IInstanceFragmentRegistry, InstanceFragmentRegistry>();
+
    // Register Intercom/interop
    serviceCollection.AddSingleton<NavisworksDocumentModelStore>();
    serviceCollection.AddSingleton<DocumentModelStore>(sp => sp.GetRequiredService<NavisworksDocumentModelStore>());
@@ -69,6 +73,9 @@ public static class NavisworksConnectorServiceRegistration
    serviceCollection.AddScoped<ISendFilter, NavisworksSelectionFilter>();
    serviceCollection.AddScoped<ISendFilter, NavisworksSavedSetsFilter>();
    serviceCollection.AddScoped<ISendFilter, NavisworksSavedViewsFilter>();
-    serviceCollection.AddScoped<IElementSelectionService, ElementSelectionService>();
+    serviceCollection.AddScoped<
+      Converter.Navisworks.Services.IElementSelectionService,
+      ConnectorElementSelectionService
+    >();
  }
 }
@@ -1,31 +1,12 @@
-using Speckle.InterfaceGenerator;
-using static Speckle.Converter.Navisworks.Helpers.ElementSelectionHelper;
+namespace Speckle.Connector.Navisworks.Services;

-namespace Speckle.Connector.Navisworks.Services;
-
-[GenerateAutoInterface]
-public class ElementSelectionService : IElementSelectionService
+/// <summary>
+/// Connector-specific element selection service that extends the converter's base implementation.
+/// Inherits the cached visibility checking and path resolution from the converter layer.
+/// </summary>
+public class ConnectorElementSelectionService : Converter.Navisworks.Services.ElementSelectionService
 {
-  private readonly Dictionary<Guid, bool> _visibleCache = new();
-
-  public string GetModelItemPath(NAV.ModelItem modelItem) => ResolveModelItemToIndexPath(modelItem);
-
-  public NAV.ModelItem GetModelItemFromPath(string path) => ResolveIndexPathToModelItem(path);
-
-  public bool IsVisible(NAV.ModelItem modelItem)
-  {
-    var key = modelItem.InstanceGuid;
-    if (_visibleCache.TryGetValue(key, out var isVisible))
-    {
-      return isVisible;
-    }
-    //same as ElementSelectionHelper.IsElementVisible
-    foreach (var item in modelItem.AncestorsAndSelf)
-    {
-      _visibleCache[item.InstanceGuid] = !item.IsHidden;
-    }
-    return _visibleCache[key];
-  }
-
-  public IEnumerable<NAV.ModelItem> GetGeometryNodes(NAV.ModelItem modelItem) => ResolveGeometryLeafNodes(modelItem);
+  // This inherits all functionality from the converter's ElementSelectionService
+  // including cached IsVisible, GetModelItemPath, GetModelItemFromPath, and GetGeometryNodes
+  // Connector-specific extensions can be added here if needed in the future
 }
@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;
-using Speckle.Connector.Navisworks.Services;
 using Speckle.Converter.Navisworks.Helpers;
+using Speckle.Converter.Navisworks.Services;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
@@ -16,7 +16,13 @@ public class NavisworksColorUnpacker(
  IElementSelectionService selectionService
 )
 {
-  private static T Select<T>(RepresentationMode mode, T active, T permanent, T original, T defaultValue) =>
+  private static T SelectByRepresentationMode<T>(
+    RepresentationMode mode,
+    T active,
+    T permanent,
+    T original,
+    T defaultValue
+  ) =>
    mode switch
    {
      RepresentationMode.Active => active,
@@ -71,14 +77,14 @@ public class NavisworksColorUnpacker(

        using var defaultColor = new NAV.Color(1.0, 1.0, 1.0);

-        var representationColor = Select(
+        var representationColor = SelectByRepresentationMode(
          mode,
          geometry.ActiveColor,
          geometry.PermanentColor,
          geometry.OriginalColor,
          defaultColor
        );
-        var colorId = Select(
+        var colorId = SelectByRepresentationMode(
          mode,
          $"{geometry.ActiveColor.GetHashCode()}_{geometry.ActiveTransparency}".GetHashCode(),
          $"{geometry.PermanentColor.GetHashCode()}_{geometry.PermanentTransparency}".GetHashCode(),
@@ -124,30 +130,53 @@ public class NavisworksColorUnpacker(
    var comSelection = ComBridge.ToInwOpSelection([modelItem]);
    try
    {
-      foreach (ComApi.InwOaPath path in comSelection.Paths())
+      var paths = comSelection.Paths();
+      try
      {
-        GC.KeepAlive(path);
-
-        foreach (ComApi.InwOaFragment3 fragment in path.Fragments())
+        foreach (ComApi.InwOaPath path in paths)
        {
-          GC.KeepAlive(fragment);
+          GC.KeepAlive(path);

-          fragment.GenerateSimplePrimitives(ComApi.nwEVertexProperty.eNORMAL, primitiveChecker);
-
-          // Exit early if triangles are found
-          if (primitiveChecker.HasTriangles)
+          var fragments = path.Fragments();
+          try
          {
-            return false;
+            foreach (ComApi.InwOaFragment3 fragment in fragments)
+            {
+              GC.KeepAlive(fragment);
+
+              fragment.GenerateSimplePrimitives(ComApi.nwEVertexProperty.eNORMAL, primitiveChecker);
+
+              if (primitiveChecker.HasTriangles)
+              {
+                return false;
+              }
+            }
+          }
+          finally
+          {
+            if (fragments != null)
+            {
+              System.Runtime.InteropServices.Marshal.ReleaseComObject(fragments);
+            }
          }
        }
-      }

-      // Return true if any 2D primitives are found
-      return primitiveChecker.HasLines || primitiveChecker.HasPoints || primitiveChecker.HasSnapPoints;
+        return primitiveChecker.HasLines || primitiveChecker.HasPoints || primitiveChecker.HasSnapPoints;
+      }
+      finally
+      {
+        if (paths != null)
+        {
+          System.Runtime.InteropServices.Marshal.ReleaseComObject(paths);
+        }
+      }
    }
    finally
    {
-      System.Runtime.InteropServices.Marshal.ReleaseComObject(comSelection);
+      if (comSelection != null)
+      {
+        System.Runtime.InteropServices.Marshal.ReleaseComObject(comSelection);
+      }
    }
  }
 }
@@ -120,17 +120,6 @@ public sealed class NavisworksDocumentEvents
    }
  }

-  private void UnsubscribeFromDocumentModelEvents(object _)
-  {
-    var activeDocument = NavisworksApp.ActiveDocument;
-    if (activeDocument != null)
-    {
-      UnsubscribeFromModelEvents(activeDocument);
-    }
-
-    _isSubscribed = false;
-  }
-
  private void UnsubscribeFromModelEvents(NAV.Document document)
  {
    document.Models.CollectionChanged -= HandleDocumentModelCountChanged;
@@ -1,10 +1,11 @@
 using Microsoft.Extensions.Logging;
-using Speckle.Connector.Navisworks.Services;
 using Speckle.Converter.Navisworks.Helpers;
+using Speckle.Converter.Navisworks.Services;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
+using static Speckle.Converter.Navisworks.Constants.MaterialConstants;

 namespace Speckle.Connector.Navisworks.HostApp;

@@ -14,9 +15,13 @@ public class NavisworksMaterialUnpacker(
  IElementSelectionService selectionService
 )
 {
-  // Helper function to select a property based on the representation mode
-  // Selector method for individual properties
-  private static T Select<T>(RepresentationMode mode, T active, T permanent, T original, T defaultValue) =>
+  private static T SelectByRepresentationMode<T>(
+    RepresentationMode mode,
+    T active,
+    T permanent,
+    T original,
+    T defaultValue
+  ) =>
    mode switch
    {
      RepresentationMode.Active => active,
@@ -64,26 +69,27 @@ public class NavisworksMaterialUnpacker(

        var navisworksObjectId = selectionService.GetModelItemPath(navisworksObject);
        var finalId = mergedIds.TryGetValue(navisworksObjectId, out var mergedId) ? mergedId : navisworksObjectId;
+
        var geometry = navisworksObject.Geometry;
        var mode = converterSettings.Current.User.VisualRepresentationMode;

        using var defaultColor = new NAV.Color(1.0, 1.0, 1.0);

-        var renderColor = Select(
+        var renderColor = SelectByRepresentationMode(
          mode,
          geometry.ActiveColor,
          geometry.PermanentColor,
          geometry.OriginalColor,
          defaultColor
        );
-        var renderTransparency = Select(
+        var renderTransparency = SelectByRepresentationMode(
          mode,
          geometry.ActiveTransparency,
          geometry.PermanentTransparency,
          geometry.OriginalTransparency,
          0.0
        );
-        var renderMaterialId = Select(
+        var renderMaterialId = SelectByRepresentationMode(
          mode,
          $"{geometry.ActiveColor.GetHashCode()}_{geometry.ActiveTransparency}".GetHashCode(),
          $"{geometry.PermanentColor.GetHashCode()}_{geometry.PermanentTransparency}".GetHashCode(),
@@ -92,9 +98,8 @@ public class NavisworksMaterialUnpacker(
        );

        var materialName =
-          $"NavisworksMaterial_{Math.Abs(ColorConverter.NavisworksColorToColor(renderColor).ToArgb())}";
+          $"{DEFAULT_MATERIAL_NAME_PREFIX}{Math.Abs(ColorConverter.NavisworksColorToColor(renderColor).ToArgb())}";

-        // Check Item category for material name
        var itemCategory = navisworksObject.PropertyCategories.FindCategoryByDisplayName("Item");
        if (itemCategory != null)
        {
@@ -106,7 +111,6 @@ public class NavisworksMaterialUnpacker(
          }
        }

-        // Check Material category for material name
        var materialPropertyCategory = navisworksObject.PropertyCategories.FindCategoryByDisplayName("Material");
        if (materialPropertyCategory != null)
        {
@@ -126,12 +130,7 @@ public class NavisworksMaterialUnpacker(
        {
          renderMaterialProxies[renderMaterialId.ToString()] = new RenderMaterialProxy()
          {
-            value = ConvertRenderColorAndTransparencyToSpeckle(
-              materialName,
-              renderTransparency,
-              renderColor,
-              renderMaterialId
-            ),
+            value = CreateRenderMaterial(materialName, renderTransparency, renderColor, renderMaterialId),
            objects = [finalId]
          };
        }
@@ -145,7 +144,7 @@ public class NavisworksMaterialUnpacker(
    return renderMaterialProxies.Values.ToList();
  }

-  private static RenderMaterial ConvertRenderColorAndTransparencyToSpeckle(
+  private static RenderMaterial CreateRenderMaterial(
    string name,
    double transparency,
    NAV.Color navisworksColor,
@@ -156,7 +155,7 @@ public class NavisworksMaterialUnpacker(

    var speckleRenderMaterial = new RenderMaterial()
    {
-      name = !string.IsNullOrEmpty(name) ? name : $"NavisworksMaterial_{Math.Abs(color.ToArgb())}",
+      name = !string.IsNullOrEmpty(name) ? name : $"{DEFAULT_MATERIAL_NAME_PREFIX}{Math.Abs(color.ToArgb())}",
      opacity = 1 - transparency,
      metalness = 0,
      roughness = 1,
@@ -1,7 +1,7 @@
-using Speckle.Connector.Navisworks.Services;
-using Speckle.Connectors.DUI.Exceptions;
+using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Utils;
+using Speckle.Converter.Navisworks.Services;

 namespace Speckle.Connector.Navisworks.Operations.Send.Filters;

@@ -1,7 +1,7 @@
-using Speckle.Connector.Navisworks.Services;
-using Speckle.Connectors.DUI.Exceptions;
+using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Utils;
+using Speckle.Converter.Navisworks.Services;

 namespace Speckle.Connector.Navisworks.Operations.Send.Filters;

@@ -48,8 +48,6 @@ public class NavisworksSavedViewsFilter : DiscriminatedObject, ISendFilterSelect
      return objectIds;
    }

-    var savedViews = NavisworksApp.ActiveDocument.SavedViewpoints;
-
    foreach (var savedViewItem in SelectedItems.Select(item => ResolveSavedView(item.Id)))
    {
      // Get the visible elements in the saved view.
@@ -82,12 +80,12 @@ public class NavisworksSavedViewsFilter : DiscriminatedObject, ISendFilterSelect
  {
    var objectIds = new List<string>();

-    // THIS IS COMMENTED OUT AS IT IS LEGACY DEFENSIVE BEHAVIOUR - DISCUSSION REQUIRED
+    // THIS IS COMMENTED OUT AS IT IS LEGACY DEFENSIVE BEHAVIOR - DISCUSSION REQUIRED
    // if (!savedView.ContainsVisibilityOverrides)
    // {
    //   // We check this again as the view settings may have changed in the saved card.
    //   // If the saved view does not contain visibility overrides, this is effectively everything in the model.
-    //   // This will need to be the documented behaviour.
+    //   // This will need to be the documented behavior.
    //   throw new SpeckleSendFilterException(
    //     "Saved view does not contain visibility overrides. This would effectively publish everything in the model."
    //   );
@@ -154,7 +152,7 @@ public class NavisworksSavedViewsFilter : DiscriminatedObject, ISendFilterSelect
      switch (item)
      {
        // case NAV.SavedViewpoint { ContainsVisibilityOverrides: false }:
-        // Legacy defensive behaviour: skip viewpoints without visibility overrides.
+        // Legacy defensive behavior: skip viewpoints without visibility overrides.
        // Essentially, send everything, or whatever the current view state for hidden elements is.
        // break;
        case NAV.SavedViewpointAnimationCut:
@@ -1,4 +1,4 @@
-using Speckle.Converter.Navisworks.Constants;
+using static Speckle.Converter.Navisworks.Constants.PathConstants;

 namespace Speckle.Connector.Navisworks.Operations.Send.Filters;

@@ -15,6 +15,6 @@ public static class SavedItemHelpers
      current = current.Parent;
    }

-    return string.Join(PathConstants.SET_SEPARATOR, pathParts);
+    return string.Join(SET_SEPARATOR, pathParts);
  }
 }
@@ -1,5 +1,5 @@
 using Speckle.Connector.Navisworks.Services;
-using Speckle.Converter.Navisworks.Constants;
+using static Speckle.Converter.Navisworks.Constants.PathConstants;

 namespace Speckle.Connector.Navisworks.Operations.Send;

@@ -10,29 +10,29 @@ public static class GeometryNodeMerger
 {
  /// <summary>
  /// Groups sibling geometry nodes based on material properties for merging.
-  /// Only merges nodes that share the same parent and have identical material properties.
+  /// This only merges nodes that share the same parent and have identical material properties.
  /// </summary>
  /// <param name="nodes">The collection of ModelItems to process</param>
  /// <returns>Dictionary mapping parent paths (with material signature suffix) to their mergeable child nodes</returns>
  public static Dictionary<string, List<NAV.ModelItem>> GroupSiblingGeometryNodes(IReadOnlyList<NAV.ModelItem> nodes)
  {
-    var selectionService = new ElementSelectionService();
+    var selectionService = new ConnectorElementSelectionService();

    // Group nameless geometry nodes by parent path and material signature
    var mergeableGroups = nodes
      .Where(node => node.HasGeometry && string.IsNullOrEmpty(node.DisplayName)) // Only anonymous geometry nodes
      .GroupBy(node =>
      {
-        // Get parent path
+        // Get the parent path
        var path = selectionService.GetModelItemPath(node);
-        var lastSeparatorIndex = path.LastIndexOf(PathConstants.SEPARATOR);
+        var lastSeparatorIndex = path.LastIndexOf(SEPARATOR);
        var parentPath = lastSeparatorIndex == -1 ? path : path[..lastSeparatorIndex];

        // Generate material signature
        string signature = GenerateSignature(node);

        // Combine parent path with signature
-        return $"{parentPath}{PathConstants.MATERIAL_SEPARATOR}{signature}";
+        return $"{parentPath}{MATERIAL_SEPARATOR}{signature}";
      })
      .Where(group => group.Count() > 1) // Only include groups with multiple children
      .ToDictionary(group => group.Key, group => group.ToList());
@@ -95,7 +95,7 @@ public static class GeometryNodeMerger
    // Build a consistent string representation of all properties
    var hashInput = new System.Text.StringBuilder();

-    // Sort keys to ensure consistent order
+    // Sort keys to ensure a consistent order
    var sortedKeys = properties.Keys.OrderBy(k => k).ToList();

    foreach (var key in sortedKeys)
@@ -139,7 +139,7 @@ public static class GeometryNodeMerger
  /// </summary>
  private static string GetMaterialName(NAV.ModelItem node)
  {
-    // Check Item category for material name
+    // Check the Item category for material name
    var itemCategory = node.PropertyCategories.FindCategoryByDisplayName("Item");
    if (itemCategory != null)
    {
@@ -1,8 +1,8 @@
-using Speckle.Connector.Navisworks.Services;
-using Speckle.Converter.Navisworks.Constants;
+using Speckle.Converter.Navisworks.Services;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
+using static Speckle.Converter.Navisworks.Constants.PathConstants;

 namespace Speckle.Connector.Navisworks.Operations.Send;

@@ -59,8 +59,8 @@ public class NavisworksHierarchyBuilder
    allPaths.Sort(
      (a, b) =>
      {
-        var depthA = a.Count(c => c == PathConstants.SEPARATOR);
-        var depthB = b.Count(c => c == PathConstants.SEPARATOR);
+        var depthA = a.Count(c => c == SEPARATOR);
+        var depthB = b.Count(c => c == SEPARATOR);
        return depthB.CompareTo(depthA); // <- Sort in ascending order of path length
      }
    );
@@ -126,7 +126,7 @@ public class NavisworksHierarchyBuilder

  private static string GetParentPath(string path)
  {
-    var idx = path.LastIndexOf(PathConstants.SEPARATOR);
+    var idx = path.LastIndexOf(SEPARATOR);
    return idx == -1 ? string.Empty : path[..idx];
  }

@@ -1,11 +1,11 @@
 using Microsoft.Extensions.Logging;
 using Speckle.Connector.Navisworks.HostApp;
-using Speckle.Connector.Navisworks.Services;
 using Speckle.Connectors.Common.Builders;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Converter.Navisworks.Helpers;
+using Speckle.Converter.Navisworks.Services;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Objects.Data;
@@ -13,7 +13,10 @@ using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
+using Speckle.Sdk.Models.Instances;
 using static Speckle.Connector.Navisworks.Operations.Send.GeometryNodeMerger;
+using static Speckle.Connectors.Common.Operations.ProxyKeys;
+using static Speckle.Converter.Navisworks.Constants.InstanceConstants;

 namespace Speckle.Connector.Navisworks.Operations.Send;

@@ -25,12 +28,15 @@ public class NavisworksRootObjectBuilder(
  ISdkActivityFactory activityFactory,
  NavisworksMaterialUnpacker materialUnpacker,
  NavisworksColorUnpacker colorUnpacker,
-  IElementSelectionService elementSelectionService
+  Speckle.Converter.Navisworks.Constants.Registers.IInstanceFragmentRegistry instanceRegistry,
+  IElementSelectionService elementSelectionService,
+  IUiUnitsCache uiUnitsCache
 ) : IRootObjectBuilder<NAV.ModelItem>
 {
+#pragma warning disable CA1823
+#pragma warning restore CA1823
  private bool SkipNodeMerging { get; set; }
-
-  internal NavisworksConversionSettings GetCurrentSettings() => converterSettings.Current;
+  private bool DisableGroupingForInstanceTesting { get; set; }

  public async Task<RootObjectBuilderResult> Build(
    IReadOnlyList<NAV.ModelItem> navisworksModelItems,
@@ -40,23 +46,16 @@ public class NavisworksRootObjectBuilder(
  )
  {
 #if DEBUG
-    // This is a temporary workaround to disable node merging for debugging purposes - false is default, true is for debugging
    SkipNodeMerging = false;
+    DisableGroupingForInstanceTesting = false;
 #endif
    using var activity = activityFactory.Start("Build");

    ValidateInputs(navisworksModelItems, projectId, onOperationProgressed);

-    // 2. Initialize root collection
    var rootCollection = InitializeRootCollection();
-
-    // 3. Convert all model items and store results
-    var (convertedElements, conversionResults) = await ConvertModelItemsAsync(
-      navisworksModelItems,
-      projectId,
-      onOperationProgressed,
-      cancellationToken
-    );
+    (Dictionary<string, Base?> convertedElements, List<SendConversionResult> conversionResults) =
+      await ConvertModelItemsAsync(navisworksModelItems, projectId, onOperationProgressed, cancellationToken);

    ValidateConversionResults(conversionResults);

@@ -65,6 +64,13 @@ public class NavisworksRootObjectBuilder(

    await AddProxiesToCollection(rootCollection, navisworksModelItems, groupedNodes);

+    AddInstanceDefinitionsToCollection(rootCollection, ref finalElements);
+    int finalInstanceProxyCount = CountInstanceProxiesRecursive(finalElements);
+    logger.LogInformation(
+      "Final output contains {count} InstanceProxy objects in displayValues",
+      finalInstanceProxyCount
+    );
+
    rootCollection.elements = finalElements;
    return new RootObjectBuilderResult(rootCollection, conversionResults);
  }
@@ -111,16 +117,32 @@ public class NavisworksRootObjectBuilder(
    var convertedBases = new Dictionary<string, Base?>();
    int processedCount = 0;
    int totalCount = navisworksModelItems.Count;
+    int instanceProxyCount = 0;

    foreach (var item in navisworksModelItems)
    {
      cancellationToken.ThrowIfCancellationRequested();
      var converted = ConvertNavisworksItem(item, convertedBases, projectId);
      results.Add(converted);
+
+      if (
+        converted.Status == Status.SUCCESS
+        && convertedBases.TryGetValue(elementSelectionService.GetModelItemPath(item), out var convertedBase)
+        && convertedBase?["displayValue"] is List<Base> displayValues
+      )
+      {
+        instanceProxyCount += displayValues.Count(dv => dv.GetType().Name == "InstanceProxy");
+      }
+
      processedCount++;
      onOperationProgressed.Report(new CardProgress("Converting", (double)processedCount / totalCount));
    }

+    logger.LogInformation(
+      "Converted {total} items, found {instanceProxies} InstanceProxy objects",
+      totalCount,
+      instanceProxyCount
+    );
    return Task.FromResult((convertedBases, results));
  }

@@ -137,27 +159,39 @@ public class NavisworksRootObjectBuilder(
    Dictionary<string, List<NAV.ModelItem>> groupedNodes
  )
  {
-    // First build the grouped nodes as before
    var finalElements = new List<Base>();
    var processedPaths = new HashSet<string>();
-    AddGroupedElements(finalElements, convertedBases, groupedNodes, processedPaths);

-    // If hierarchy mode is enabled, reorganize into proper nested structure
+    if (!DisableGroupingForInstanceTesting)
+    {
+      AddGroupedElements(finalElements, convertedBases, groupedNodes, processedPaths);
+      logger.LogInformation(
+        "After grouping: {grouped} paths processed, {elements} elements in collection",
+        processedPaths.Count,
+        finalElements.Count
+      );
+    }
+    else
+    {
+      logger.LogInformation("Grouping disabled for instance testing");
+    }
+
    if (converterSettings.Current.User.PreserveModelHierarchy)
    {
+      logger.LogInformation("Building hierarchy (PreserveModelHierarchy=true)");
      var hierarchyBuilder = new NavisworksHierarchyBuilder(
        convertedBases,
        rootToSpeckleConverter,
        elementSelectionService
      );

-      var hierarchy = hierarchyBuilder.BuildHierarchy();
-
-      return hierarchy;
+      return hierarchyBuilder.BuildHierarchy();
    }

-    // Otherwise continue with flat mode
+    logger.LogInformation("Adding remaining elements (flat mode)");
    AddRemainingElements(finalElements, convertedBases, processedPaths);
+
+    logger.LogInformation("Final elements count: {count}", finalElements.Count);
    return finalElements;
  }

@@ -170,7 +204,7 @@ public class NavisworksRootObjectBuilder(
  {
    foreach (var group in groupedNodes)
    {
-      var siblingBases = new List<Base>();
+      var siblingBases = new List<Base>(group.Value.Count);
      foreach (var itemPath in group.Value.Select(elementSelectionService.GetModelItemPath))
      {
        processedPaths.Add(itemPath);
@@ -213,41 +247,48 @@ public class NavisworksRootObjectBuilder(
    }
  }

-  private (string name, string path) GetContext(string applicationId)
+  private (string name, string path) GetElementNameAndPath(string applicationId)
  {
    var modelItem = elementSelectionService.GetModelItemFromPath(applicationId);
    var context = HierarchyHelper.ExtractContext(modelItem);
    return (context.Name, context.Path);
  }

-  /// <summary>
-  /// Processes and adds any remaining non-grouped elements.
-  /// </summary>
-  /// <remarks>
-  /// Handles both Collection and Base type elements differently.
-  /// Only processes elements that weren't handled in grouped processing.
-  /// </remarks>
  private NavisworksObject CreateNavisworksObject(string groupKey, List<Base> siblingBases)
  {
    string cleanParentPath = ElementSelectionHelper.GetCleanPath(groupKey);
-    (string name, string path) = GetContext(cleanParentPath);
+    (string name, string path) = GetElementNameAndPath(cleanParentPath);
+
+    int estimatedCapacity = siblingBases.Sum(b => (b["displayValue"] as List<Base>)?.Count ?? 0);
+    var displayValues = new List<Base>(estimatedCapacity);
+    displayValues.AddRange(
+      siblingBases
+        .Where(sibling => sibling["displayValue"] is List<Base>)
+        .SelectMany(sibling => (List<Base>)sibling["displayValue"]!)
+    );
+
+    var instanceProxyCount = displayValues.Count(dv => dv.GetType().Name == "InstanceProxy");
+    if (instanceProxyCount > 0)
+    {
+      logger.LogDebug(
+        "Group {groupKey} merging {siblings} siblings with {proxies} InstanceProxy objects",
+        groupKey,
+        siblingBases.Count,
+        instanceProxyCount
+      );
+    }

    return new NavisworksObject
    {
      name = name,
-      displayValue = siblingBases.SelectMany(b => b["displayValue"] as List<Base> ?? []).ToList(),
+      displayValue = displayValues,
      properties = siblingBases.First()["properties"] as Dictionary<string, object?> ?? [],
      units = converterSettings.Current.Derived.SpeckleUnits,
-      applicationId = groupKey, // Use the full composite key as applicationId to preserve uniqueness
+      applicationId = groupKey,
      ["path"] = path
    };
  }

-  /// <summary>
-  /// Creates a NavisworksObject from a single converted base.
-  /// </summary>
-  /// <param name="convertedBase">The converted Speckle Base object.</param>
-  /// <returns>A new NavisworksObject containing the converted data.</returns>
  private NavisworksObject? CreateNavisworksObject(Base convertedBase)
  {
    if (convertedBase.applicationId == null)
@@ -255,14 +296,16 @@ public class NavisworksRootObjectBuilder(
      return null;
    }

-    (string name, string path) = GetContext(convertedBase.applicationId);
+    (string name, string path) = GetElementNameAndPath(convertedBase.applicationId);
+
+    var units = uiUnitsCache.Ensure();

    return new NavisworksObject
    {
      name = name,
      displayValue = convertedBase["displayValue"] as List<Base> ?? [],
      properties = convertedBase["properties"] as Dictionary<string, object?> ?? [],
-      units = converterSettings.Current.Derived.SpeckleUnits,
+      units = units.ToString(),
      applicationId = convertedBase.applicationId,
      ["path"] = path
    };
@@ -279,27 +322,100 @@ public class NavisworksRootObjectBuilder(
    var renderMaterials = materialUnpacker.UnpackRenderMaterial(navisworksModelItems, groupedNodes);
    if (renderMaterials.Count > 0)
    {
-      rootCollection[ProxyKeys.RENDER_MATERIAL] = renderMaterials;
+      rootCollection[RENDER_MATERIAL] = renderMaterials;
    }

    var colors = colorUnpacker.UnpackColor(navisworksModelItems, groupedNodes);
    if (colors.Count > 0)
    {
-      rootCollection[ProxyKeys.COLOR] = colors;
+      rootCollection[COLOR] = colors;
    }

    return Task.CompletedTask;
  }

-  /// <summary>
-  /// Converts a single Navisworks item to a Speckle object.
-  /// </summary>
-  /// <remarks>
-  /// Attempts to retrieve from cache first.
-  /// Falls back to fresh conversion if not cached.
-  /// Logs errors but doesn't throw exceptions.
-  /// </remarks>
-  /// <returns>A SendConversionResult indicating success or failure.</returns>
+  private void AddInstanceDefinitionsToCollection(Collection rootCollection, ref List<Base> finalElements)
+  {
+    using var _ = activityFactory.Start("BuildInstanceDefinitions");
+
+    // Get all definition geometries from the registry
+    var allDefinitions = instanceRegistry.GetAllDefinitionGeometries();
+
+    if (allDefinitions.Count == 0)
+    {
+      logger.LogInformation("No instance definitions found - instancing may be disabled");
+      return;
+    }
+
+    logger.LogInformation("Building instance structure for {count} definition groups", allDefinitions.Count);
+
+    if (allDefinitions.Count > 100)
+    {
+      logger.LogWarning(
+        "Large number of definition groups ({count}) detected - this may indicate instance grouping is not working effectively",
+        allDefinitions.Count
+      );
+    }
+
+    var instanceDefinitionProxies = new List<InstanceDefinitionProxy>(allDefinitions.Count);
+
+    int estimatedGeometryCount = allDefinitions.Sum(kvp => kvp.Value.Count);
+    var allDefinitionGeometries = new List<Base>(estimatedGeometryCount);
+
+    foreach (var kvp in allDefinitions)
+    {
+      var groupKey = kvp.Key;
+      var geometries = kvp.Value;
+      var groupKeyHash = groupKey.ToHashString();
+
+      var defProxy = new InstanceDefinitionProxy
+      {
+        name = $"Shared Geometry {groupKeyHash}",
+        objects = geometries.Select(g => g.applicationId ?? "").Where(id => !string.IsNullOrEmpty(id)).ToList(),
+        applicationId = $"{DEFINITION_ID_PREFIX}{groupKeyHash}",
+        maxDepth = 0
+      };
+
+      instanceDefinitionProxies.Add(defProxy);
+      allDefinitionGeometries.AddRange(geometries);
+    }
+
+    rootCollection[INSTANCE_DEFINITION] = instanceDefinitionProxies;
+    var geometryDefinitionsCollection = new Collection
+    {
+      name = "Geometry Definitions",
+      elements = allDefinitionGeometries
+    };
+
+    var objectCollection = new Collection { name = "", elements = finalElements };
+
+    finalElements = [geometryDefinitionsCollection, objectCollection];
+
+    logger.LogInformation(
+      "Added {proxyCount} instance definition proxies and {geomCount} definition geometries",
+      instanceDefinitionProxies.Count,
+      allDefinitionGeometries.Count
+    );
+  }
+
+  private int CountInstanceProxiesRecursive(List<Base> elements)
+  {
+    int count = 0;
+    foreach (var element in elements)
+    {
+      if (element["displayValue"] is List<Base> displayValues)
+      {
+        count += displayValues.Count(dv => dv.GetType().Name == "InstanceProxy");
+      }
+
+      if (element is Collection { elements: not null } collection)
+      {
+        count += CountInstanceProxiesRecursive(collection.elements);
+      }
+    }
+    return count;
+  }
+
  private SendConversionResult ConvertNavisworksItem(
    NAV.ModelItem navisworksItem,
    Dictionary<string, Base?> convertedBases,
@@ -1,5 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using Speckle.Connectors.Common.Caching;
+using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.InterfaceGenerator;
@@ -8,158 +7,106 @@ using Speckle.Sdk.Common;
 namespace Speckle.Connector.Navisworks.Operations.Send.Settings;

 [GenerateAutoInterface]
-public class ToSpeckleSettingsManagerNavisworks : IToSpeckleSettingsManagerNavisworks
+public class ToSpeckleSettingsManagerNavisworks(ISendConversionCache sendConversionCache)
+  : IToSpeckleSettingsManagerNavisworks
 {
-  private readonly ISendConversionCache _sendConversionCache;
-
-  // cache invalidation process run with ModelCardId since the settings are model specific
+  // cache invalidation process run with ModelCardId since the settings are model-specific
  private readonly Dictionary<string, RepresentationMode> _visualRepresentationCache = [];
  private readonly Dictionary<string, OriginMode> _originModeCache = [];
-  private readonly Dictionary<string, bool?> _convertHiddenElementsCache = [];
-  private readonly Dictionary<string, bool?> _includeInternalPropertiesCache = [];
-  private readonly Dictionary<string, bool?> _preserveModelHierarchyCache = [];
-  private readonly Dictionary<string, bool?> _revitCategoryMappingCache = [];
+  private readonly Dictionary<string, bool> _convertHiddenElementsCache = [];
+  private readonly Dictionary<string, bool> _includeInternalPropertiesCache = [];
+  private readonly Dictionary<string, bool> _preserveModelHierarchyCache = [];
+  private readonly Dictionary<string, bool> _revitCategoryMappingCache = [];

-  public ToSpeckleSettingsManagerNavisworks(ISendConversionCache sendConversionCache)
-  {
-    _sendConversionCache = sendConversionCache;
-  }
-
-  public RepresentationMode GetVisualRepresentationMode(SenderModelCard modelCard)
+  /// <summary>
+  /// Generic helper to get a setting value with caching and cache invalidation.
+  /// </summary>
+  private T GetCachedSetting<T>(
+    SenderModelCard modelCard,
+    string settingId,
+    Dictionary<string, T> cache,
+    Func<object?, T> valueExtractor,
+    T defaultValue
+  )
  {
    if (modelCard == null)
    {
      throw new ArgumentNullException(nameof(modelCard));
    }

-    var representationString = modelCard.Settings?.First(s => s.Id == "visualRepresentation").Value as string;
+    var settingValue = modelCard.Settings?.FirstOrDefault(s => s.Id == settingId)?.Value;
+    var returnValue = settingValue != null ? valueExtractor(settingValue) : defaultValue;

    if (
-      representationString is not null
-      && VisualRepresentationSetting.VisualRepresentationMap.TryGetValue(
-        representationString,
-        out RepresentationMode representation
-      )
+      cache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousValue)
+      && !EqualityComparer<T>.Default.Equals(previousValue, returnValue)
    )
-    {
-      if (_visualRepresentationCache.TryGetValue(modelCard.ModelCardId.NotNull(), out RepresentationMode previousType))
-      {
-        if (previousType != representation)
-        {
-          EvictCacheForModelCard(modelCard);
-        }
-      }
-
-      _visualRepresentationCache[modelCard.ModelCardId.NotNull()] = representation;
-      return representation;
-    }
-
-    throw new ArgumentException($"Invalid visual representation value: {representationString}");
-  }
-
-  public OriginMode GetOriginMode(SenderModelCard modelCard)
-  {
-    if (modelCard == null)
-    {
-      throw new ArgumentNullException(nameof(modelCard));
-    }
-
-    var originString = modelCard.Settings?.FirstOrDefault(s => s.Id == "originMode")?.Value as string;
-    if (!OriginModeSetting.OriginModeMap.TryGetValue(originString ?? string.Empty, out var origin))
-    {
-      return OriginMode.ModelOrigin; // Default to ModelOrigin if not specified or invalid
-    }
-
-    if (_originModeCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousType) && previousType != origin)
    {
      EvictCacheForModelCard(modelCard);
    }

-    _originModeCache[modelCard.ModelCardId.NotNull()] = origin;
-    return origin;
-  }
-
-  public bool GetMappingToRevitCategories(SenderModelCard modelCard)
-  {
-    if (modelCard == null)
-    {
-      throw new ArgumentNullException(nameof(modelCard));
-    }
-
-    var value = modelCard.Settings?.FirstOrDefault(s => s.Id == "mappingToRevitCategories")?.Value as bool?;
-
-    var returnValue = value != null && value.NotNull();
-    if (_revitCategoryMappingCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousValue))
-    {
-      if (previousValue != returnValue)
-      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
-
-    _revitCategoryMappingCache[modelCard.ModelCardId] = returnValue;
+    cache[modelCard.ModelCardId.NotNull()] = returnValue;
    return returnValue;
  }

-  public bool GetConvertHiddenElements(SenderModelCard modelCard)
-  {
-    if (modelCard == null)
-    {
-      throw new ArgumentNullException(nameof(modelCard));
-    }
-
-    var value = modelCard.Settings?.FirstOrDefault(s => s.Id == "convertHiddenElements")?.Value as bool?;
-
-    var returnValue = value != null && value.NotNull();
-    if (_convertHiddenElementsCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousValue))
-    {
-      if (previousValue != returnValue)
+  public RepresentationMode GetVisualRepresentationMode(SenderModelCard modelCard) =>
+    GetCachedSetting(
+      modelCard,
+      "visualRepresentation",
+      _visualRepresentationCache,
+      value =>
      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
+        var representationString = value as string;
+        return
+          representationString is not null
+          && VisualRepresentationSetting.VisualRepresentationMap.TryGetValue(
+            representationString,
+            out RepresentationMode representation
+          )
+          ? representation
+          : throw new ArgumentException($"Invalid visual representation value: {representationString}");
+      },
+      RepresentationMode.Active // default value if setting not found
+    );

-    _convertHiddenElementsCache[modelCard.ModelCardId] = returnValue;
-    return returnValue;
-  }
-
-  public bool GetIncludeInternalProperties([NotNull] SenderModelCard modelCard)
-  {
-    var value = modelCard.Settings?.FirstOrDefault(s => s.Id == "includeInternalProperties")?.Value as bool?;
-
-    var returnValue = value != null && value.NotNull();
-    if (_includeInternalPropertiesCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousValue))
-    {
-      if (previousValue != returnValue)
+  public OriginMode GetOriginMode(SenderModelCard modelCard) =>
+    GetCachedSetting(
+      modelCard,
+      "originMode",
+      _originModeCache,
+      value =>
      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
+        var originString = value as string;
+        if (OriginModeSetting.OriginModeMap.TryGetValue(originString ?? string.Empty, out var origin))
+        {
+          return origin;
+        }
+        return OriginMode.ModelOrigin;
+      },
+      OriginMode.ModelOrigin
+    );

-    _includeInternalPropertiesCache[modelCard.ModelCardId] = returnValue;
-    return returnValue;
-  }
+  public bool GetMappingToRevitCategories(SenderModelCard modelCard) =>
+    GetCachedSetting(modelCard, "mappingToRevitCategories", _revitCategoryMappingCache, value => value is true, false);

-  public bool GetPreserveModelHierarchy([NotNull] SenderModelCard modelCard)
-  {
-    var value = modelCard.Settings?.FirstOrDefault(s => s.Id == "preserveModelHierarchy")?.Value as bool?;
+  public bool GetConvertHiddenElements(SenderModelCard modelCard) =>
+    GetCachedSetting(modelCard, "convertHiddenElements", _convertHiddenElementsCache, value => value is true, false);

-    var returnValue = value != null && value.NotNull();
-    if (_preserveModelHierarchyCache.TryGetValue(modelCard.ModelCardId.NotNull(), out var previousValue))
-    {
-      if (previousValue != returnValue)
-      {
-        EvictCacheForModelCard(modelCard);
-      }
-    }
+  public bool GetIncludeInternalProperties(SenderModelCard modelCard) =>
+    GetCachedSetting(
+      modelCard,
+      "includeInternalProperties",
+      _includeInternalPropertiesCache,
+      value => value is true,
+      false
+    );

-    _preserveModelHierarchyCache[modelCard.ModelCardId] = returnValue;
-    return returnValue;
-  }
+  public bool GetPreserveModelHierarchy(SenderModelCard modelCard) =>
+    GetCachedSetting(modelCard, "preserveModelHierarchy", _preserveModelHierarchyCache, value => value is true, false);

  private void EvictCacheForModelCard(SenderModelCard modelCard)
  {
    var objectIds = modelCard.SendFilter != null ? modelCard.SendFilter.NotNull().SelectedObjectIds : [];
-    _sendConversionCache.EvictObjects(objectIds);
+    sendConversionCache.EvictObjects(objectIds);
  }
 }
@@ -14,7 +14,7 @@ public static class SpeckleV3Tool
  public const string RIBBON_STRINGS = "NavisworksRibbon.name";
  public const string PLUGIN_SUFFIX = ".Speckle";

-  public static Speckle.Sdk.Application App =>
+  public static Sdk.Application App =>
 #if NAVIS
    HostApplications.Navisworks;
 #else
@@ -191,6 +191,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -281,9 +302,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -306,7 +326,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.revit2022": {
@@ -351,11 +371,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
      "Speckle.Revit.API": {
@@ -363,29 +383,6 @@
        "requested": "[2023.0.0, )",
        "resolved": "2022.0.2.1",
        "contentHash": "IrLN4WyI2ix+g3zCpo7sX8zNB3FrtrdQ3E2RpceGVPNG00v8OfD+Kei7o1bn1u/ML46iBYRAr/JcsLbwfUQsBw=="
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -191,6 +191,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -281,9 +302,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -306,7 +326,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.revit2023": {
@@ -351,11 +371,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
      "Speckle.Revit.API": {
@@ -363,29 +383,6 @@
        "requested": "[2023.0.0, )",
        "resolved": "2023.0.0",
        "contentHash": "tq40eD7psgTbV+epNouYyqfo6+hEi7FmXZqcxEOsAV7zfYyWhL6Rt3vmojkWGNuerGbH6oRI6KIIxrnlCNb8Hw=="
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -191,6 +191,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -281,9 +302,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -306,7 +326,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.revit2024": {
@@ -351,11 +371,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
      "Speckle.Revit.API": {
@@ -363,29 +383,6 @@
        "requested": "[2023.0.0, )",
        "resolved": "2024.0.0",
        "contentHash": "a4dsvZ00ocvzTgCD6dUdydf0jIZDVcDhs6dUX9cv+y3aTDbU8rmzhYXWt8sThedIG+IPSVa0vHmAH9pKiJL3SQ=="
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -171,6 +171,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -226,9 +245,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -251,7 +269,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.revit2025": {
@@ -296,11 +314,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
      "Speckle.Revit.API": {
@@ -308,27 +326,6 @@
        "requested": "[2023.0.0, )",
        "resolved": "2025.0.0",
        "contentHash": "Hwf/3Ydc7KxvjgD9pSZKLSJRsFTsxYg95YyTm6f43hcsGjmk49GsLFQt921Z9OcvUVewOggQHcmBgti+P2EPHw=="
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -3,17 +3,15 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:wv2="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
-             xmlns:dui="clr-namespace:Speckle.Connectors.DUI;assembly=Speckle.Connectors.DUI"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800">
-  <UserControl.Resources>
-    <wv2:CoreWebView2CreationProperties x:Key="EvergreenWebView2CreationProperties" UserDataFolder="C:\temp" />
-  </UserControl.Resources>
-  <DockPanel>
-    <wv2:WebView2 
-      CreationProperties="{StaticResource EvergreenWebView2CreationProperties}" 
-      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" 
-      Name="Browser" Grid.Row="0" Source="{x:Static dui:Url.Netlify}" />
-  </DockPanel>
+  <!-- WebView2 is created lazily -->
+  <Border Name="BrowserContainer" Background="White">
+    <TextBlock Name="LoadingText"
+               Text="Loading Speckle..."
+               HorizontalAlignment="Center"
+               VerticalAlignment="Center"
+               FontSize="14"
+               Foreground="Gray" />
+  </Border>
 </UserControl>
@@ -2,6 +2,8 @@ using System.Windows.Controls;
 using System.Windows.Threading;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2.Core;
+using Microsoft.Web.WebView2.Wpf;
+using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.Revit.Plugin;
@@ -12,6 +14,10 @@ public sealed partial class RevitControlWebView : UserControl, IBrowserScriptExe
 {
  private readonly IServiceProvider _serviceProvider;
  private readonly IRevitTask _revitTask;
+#pragma warning disable CA2213
+  private WebView2? _browser;
+#pragma warning restore CA2213
+  private bool _isInitializing;

  public RevitControlWebView(IServiceProvider serviceProvider, IRevitTask revitTask)
  {
@@ -19,35 +25,61 @@ public sealed partial class RevitControlWebView : UserControl, IBrowserScriptExe
    _revitTask = revitTask;
    InitializeComponent();

-    Browser.CoreWebView2InitializationCompleted += (sender, args) =>
+    // Delay WebView2 creation until the panel is actually visible
+    // This avoids conflicts with other plugins (like pyRevit) during startup
+    IsVisibleChanged += OnIsVisibleChanged;
+  }
+
+  private void OnIsVisibleChanged(object sender, System.Windows.DependencyPropertyChangedEventArgs e)
+  {
+    if (e.NewValue is true && _browser == null && !_isInitializing)
+    {
+      _isInitializing = true;
+      Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, CreateWebView2);
+    }
+  }
+
+  private void CreateWebView2()
+  {
+    _browser = new WebView2
+    {
+      CreationProperties = new CoreWebView2CreationProperties { UserDataFolder = "C:\\temp" },
+      HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+      VerticalAlignment = System.Windows.VerticalAlignment.Stretch,
+      Source = Url.Netlify
+    };
+
+    _browser.CoreWebView2InitializationCompleted += (sender, args) =>
      _serviceProvider
        .GetRequiredService<ITopLevelExceptionHandler>()
        .CatchUnhandled(() => OnInitialized(sender, args));
+
+    BrowserContainer.Child = _browser;
  }

-  public bool IsBrowserInitialized => Browser.IsInitialized;
+  public bool IsBrowserInitialized => _browser?.IsInitialized ?? false;

-  public object BrowserElement => Browser;
+  public object BrowserElement => _browser!;

  public void ExecuteScript(string script)
  {
-    if (!Browser.IsInitialized)
+    if (_browser == null || !_browser.IsInitialized)
    {
      throw new InvalidOperationException("Failed to execute script, Webview2 is not initialized yet.");
    }
-    _revitTask.Run(() => Browser.ExecuteScriptAsync(script));
+    _revitTask.Run(() => _browser.ExecuteScriptAsync(script));
  }

  public void SendProgress(string script)
  {
-    if (!Browser.IsInitialized)
+    if (_browser == null || !_browser.IsInitialized)
    {
      throw new InvalidOperationException("Failed to execute script, Webview2 is not initialized yet.");
    }
    //always invoke even on the main thread because it's better somehow
-    Browser.Dispatcher.Invoke(
+    _browser.Dispatcher.Invoke(
      //fire and forget
-      () => Browser.ExecuteScriptAsync(script),
+      () => _browser.ExecuteScriptAsync(script),
      DispatcherPriority.Background
    );
  }
@@ -74,11 +106,18 @@ public sealed partial class RevitControlWebView : UserControl, IBrowserScriptExe
  private void SetupBinding(IBinding binding)
  {
    binding.Parent.AssociateWithBinding(binding);
-    Browser.CoreWebView2.AddHostObjectToScript(binding.Name, binding.Parent);
+    _browser!.CoreWebView2.AddHostObjectToScript(binding.Name, binding.Parent);
  }

-  public void ShowDevTools() => Browser.CoreWebView2.OpenDevToolsWindow();
+  public void ShowDevTools() => _browser?.CoreWebView2?.OpenDevToolsWindow();

  //https://github.com/MicrosoftEdge/WebView2Feedback/issues/2161
-  public void Dispose() => Browser.Dispatcher.Invoke(() => Browser.Dispose(), DispatcherPriority.Send);
+  public void Dispose()
+  {
+    if (_browser != null)
+    {
+      _browser.Dispatcher.Invoke(() => _browser.Dispose(), DispatcherPriority.Send);
+      _browser = null;
+    }
+  }
 }
@@ -164,6 +164,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -219,9 +238,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -244,7 +262,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.revit2026": {
@@ -280,11 +298,11 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
      "Speckle.Revit.API": {
@@ -292,27 +310,6 @@
        "requested": "[2023.0.0, )",
        "resolved": "2026.0.0",
        "contentHash": "SiqqKbF1pXyZWXZhAl2JhjYhTt7RiYO5JaQrAjq+OlleAjT4zatwAp/DnTwQspFbP7UZr3b2Ed2kuWNN0ZFelw=="
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -24,7 +24,7 @@ namespace Speckle.Connectors.Revit.Bindings;

 internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
 {
-  private readonly IAppIdleManager _idleManager;
+  private readonly RevitIdleManager _revitIdleManager;
  private readonly RevitContext _revitContext;
  private readonly DocumentModelStore _store;
  private readonly ICancellationManager _cancellationManager;
@@ -38,6 +38,9 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
  private readonly LinkedModelHandler _linkedModelHandler;
  private readonly IThreadContext _threadContext;
  private readonly ISendOperationManagerFactory _sendOperationManagerFactory;
+  private bool _isDocChangedSubscribed;
+  private EventHandler<Autodesk.Revit.DB.Events.DocumentChangedEventArgs>? _documentChangedHandler;
+  private readonly ConnectorConfig _config;

  /// <summary>
  /// Used internally to aggregate the changed objects' id. Note we're using a concurrent dictionary here as the expiry check method is not thread safe, and this was causing problems. See:
@@ -48,7 +51,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
  private ConcurrentHashSet<ElementId> ChangedObjectIds { get; set; } = new();

  public RevitSendBinding(
-    IAppIdleManager idleManager,
+    RevitIdleManager revitIdleManager,
    RevitContext revitContext,
    DocumentModelStore store,
    ICancellationManager cancellationManager,
@@ -62,11 +65,12 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
    LinkedModelHandler linkedModelHandler,
    IThreadContext threadContext,
    IRevitTask revitTask,
-    ISendOperationManagerFactory sendOperationManagerFactory
+    ISendOperationManagerFactory sendOperationManagerFactory,
+    IConfigStore configStore
  )
    : base("sendBinding", bridge)
  {
-    _idleManager = idleManager;
+    _revitIdleManager = revitIdleManager;
    _revitContext = revitContext;
    _store = store;
    _cancellationManager = cancellationManager;
@@ -79,6 +83,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
    _linkedModelHandler = linkedModelHandler;
    _threadContext = threadContext;
    _sendOperationManagerFactory = sendOperationManagerFactory;
+    _config = configStore.GetConnectorConfig();

    Commands = new SendBindingUICommands(bridge);
    // TODO expiry events
@@ -86,15 +91,61 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding

    revitTask.Run(() =>
    {
-      revitContext.UIApplication.NotNull().Application.DocumentChanged += (_, e) =>
-        _topLevelExceptionHandler.CatchUnhandled(() => DocChangeHandler(e));
+      // revitContext.UIApplication.NotNull().Application.DocumentChanged += (_, e) =>
+      //   _topLevelExceptionHandler.CatchUnhandled(() => DocChangeHandler(e));
+      _documentChangedHandler = (_, e) => _topLevelExceptionHandler.CatchUnhandled(() => DocChangeHandler(e));
+      _store.ModelCardsChanged += (_, e) => OnModelCardsChanged(e);
      _store.DocumentChanged += (_, _) => topLevelExceptionHandler.FireAndForget(async () => await OnDocumentChanged());
    });
  }

+  private void OnModelCardsChanged(ModelCardsChangedEventArgs e)
+  {
+    if (
+      !_config.DocumentChangeListeningDisabled
+      && e.ModelCards.Count > 0
+      && e.ModelCards.Any(m => m.TypeDiscriminator == nameof(SenderModelCard))
+    )
+    {
+      SubscribeDocChanged();
+    }
+    else
+    {
+      UnsubscribeDocChanged();
+    }
+  }
+
+  private void SubscribeDocChanged()
+  {
+    if (_documentChangedHandler == null || _isDocChangedSubscribed)
+    {
+      return;
+    }
+
+    _threadContext.RunOnMain(() =>
+    {
+      _revitContext.UIApplication.NotNull().Application.DocumentChanged += _documentChangedHandler;
+    });
+    _isDocChangedSubscribed = true;
+  }
+
+  private void UnsubscribeDocChanged()
+  {
+    if (_documentChangedHandler == null || !_isDocChangedSubscribed)
+    {
+      return;
+    }
+
+    _threadContext.RunOnMain(() =>
+    {
+      _revitContext.UIApplication.NotNull().Application.DocumentChanged -= _documentChangedHandler;
+    });
+    _isDocChangedSubscribed = false;
+  }
+
  public List<ISendFilter> GetSendFilters() =>
    [
-      new RevitSelectionFilter() { IsDefault = true },
+      new RevitSelectionFilter { IsDefault = true },
      new RevitViewsFilter(_revitContext),
      new RevitCategoriesFilter(_revitContext)
    ];
@@ -276,7 +327,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding

    if (addedElementIds.Count > 0)
    {
-      _idleManager.SubscribeToIdle(nameof(PostSetObjectIds), PostSetObjectIds);
+      _revitIdleManager.SubscribeToIdle(nameof(PostSetObjectIds), PostSetObjectIds);
    }

    if (HaveUnitsChanged(doc))
@@ -296,8 +347,8 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
      _sendConversionCache.EvictObjects(unpackedObjectIds);
    }

-    _idleManager.SubscribeToIdle(nameof(CheckFilterExpiration), CheckFilterExpiration);
-    _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
+    _revitIdleManager.SubscribeToIdle(nameof(CheckFilterExpiration), CheckFilterExpiration);
+    _revitIdleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
  }

  // Keeps track of doc and current units
@@ -1,5 +1,6 @@
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Settings;
 using Speckle.Connectors.Revit.Plugin;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk.Common;
@@ -17,27 +18,32 @@ internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, ID
  public SelectionBinding(
    RevitContext revitContext,
    IBrowserBridge parent,
-    IAppIdleManager idleManager,
+    RevitIdleManager idleManager,
+#if REVIT2022
    ITopLevelExceptionHandler topLevelExceptionHandler,
-    IRevitTask revitTask
+#endif
+    IRevitTask revitTask,
+    IConfigStore configStore
  )
    : base("selectionBinding", parent)
  {
    _revitContext = revitContext;

+    if (!configStore.GetConnectorConfig().SelectionChangeListeningDisabled)
+    {
 #if REVIT2022
-    // NOTE: getting the selection data should be a fast function all, even for '000s of elements - and having a timer hitting it every 1s is ok.
-    _selectionTimer = new System.Timers.Timer(1000);
-    _selectionTimer.Elapsed += (_, _) => topLevelExceptionHandler.CatchUnhandled(OnSelectionChanged);
-    _selectionTimer.Start();
+      // NOTE: getting the selection data should be a fast function all, even for '000s of elements - and having a timer hitting it every 1s is ok.
+      _selectionTimer = new System.Timers.Timer(1000);
+      _selectionTimer.Elapsed += (_, _) => topLevelExceptionHandler.CatchUnhandled(OnSelectionChanged);
+      _selectionTimer.Start();
 #else
-
-    revitTask.Run(
-      () =>
-        _revitContext.UIApplication.NotNull().SelectionChanged += (_, _) =>
-          idleManager.SubscribeToIdle(nameof(OnSelectionChanged), OnSelectionChanged)
-    );
+      revitTask.Run(
+        () =>
+          _revitContext.UIApplication.NotNull().SelectionChanged += (_, _) =>
+            idleManager.SubscribeToIdle(nameof(OnSelectionChanged), OnSelectionChanged)
+      );
 #endif
+    }
  }

  private void OnSelectionChanged()
@@ -48,16 +48,18 @@ public static class ServiceRegistration
    serviceCollection.AddSingleton<IBinding, SelectionBinding>();
    serviceCollection.AddSingleton<IBinding, RevitSendBinding>();
    serviceCollection.AddSingleton<IBinding, RevitReceiveBinding>();
+    serviceCollection.AddSingleton<RevitIdleManager>();

    serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
    serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBindingRevit>();

-    serviceCollection.AddSingleton<IAppIdleManager, RevitIdleManager>();
+    // serviceCollection.AddSingleton<IAppIdleManager, RevitIdleManager>();

    // send operation and dependencies
    serviceCollection.AddScoped<SendOperation<DocumentToConvert>>();
    serviceCollection.AddScoped<ElementUnpacker>();
    serviceCollection.AddScoped<LevelUnpacker>();
+    serviceCollection.AddScoped<ViewUnpacker>();
    serviceCollection.AddScoped<SendCollectionManager>();
    serviceCollection.AddScoped<IRootObjectBuilder<DocumentToConvert>, RevitRootObjectBuilder>();
    serviceCollection.AddSingleton<ISendConversionCache, SendConversionCache>();
@@ -74,7 +76,6 @@ public static class ServiceRegistration
    serviceCollection.AddSingleton<RevitUtils>();
    serviceCollection.AddSingleton<IFailuresPreprocessor, HideWarningsFailuresPreprocessor>();
    serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
-
    serviceCollection.AddScoped<LocalToGlobalConverterUtils>();

    // operation progress manager
@@ -1,5 +1,6 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.Architecture;
+using Speckle.Converters.RevitShared.Extensions;

 namespace Speckle.Connectors.Revit.HostApp;

@@ -23,11 +24,11 @@ public class ElementUnpacker
    // Step 1: unpack groups
    var atomicObjects = UnpackElements(selectionElements, doc);

-    // Step 2: pack curtain wall elements, once we know the full extent of our flattened item list.
-    // The behaviour we're looking for:
-    // If parent wall is part of selection, does not select individual elements out. Otherwise, selects individual elements (Panels, Mullions) as atomic objects.
-    // NOTE: this also conditionally "packs" stacked wall elements if their parent is present. See detailed note inside the function.
-    return PackCurtainWallElementsAndStackedWalls(atomicObjects, doc);
+    // Step 2: Deduplicate parent-child elements in selection
+    // Removes child elements (mullions, panels, top rails, stacked wall members) when
+    // their parent element is also selected, since parents include children in their conversion.
+    // Children are only converted independently when their parent is NOT in the selection.
+    return RemoveKnownChildElementsWhenParentPresent(atomicObjects, doc);
  }

  /// <summary>
@@ -108,7 +109,7 @@ public class ElementUnpacker
  // We use the nullable document (happiness level 5/10) for the sake of linked models - bc we use this function in 2 different places
  // 1- RootObjectBuilder with linked model document - otherwise we cannot unpack elements from correct document.
  // 2- Evicting the cache while introducing the settings
-  private List<Element> PackCurtainWallElementsAndStackedWalls(List<Element> elements, Document doc)
+  private List<Element> RemoveKnownChildElementsWhenParentPresent(List<Element> elements, Document doc)
  {
    //just used for contains so use ToHashSet
    var ids = elements.Select(el => el.Id).ToHashSet();
@@ -131,64 +132,37 @@ public class ElementUnpacker
      // If you wonder why revit is driving people to insanity, this is one of those moments.
      // See [CNX-851: Stacked Wall Duplicate Geometry or Materials not applied](https://linear.app/speckle/issue/CNX-851/stacked-wall-duplicate-geometry-or-materials-not-applied)
      || (element is Wall { IsStackedWallMember: true } wall && ids.Contains(wall.StackedWallOwnerId))
+      // Railings: Remove TopRail when parent railing is selected
+      // Prevents duplication since railing converter includes TopRail as a child element
+      // TODO: Consider adding HandRail support (also inherits from ContinuousRail)
+      || (
+        element is TopRail topRail
+        && doc.GetElement(topRail.HostRailingId) is Railing railing
+        && ids.Contains(railing.Id)
+      )
    );
    return elements;
  }

  /// <summary>
-  /// Given a set of atomic elements, it will return a list of all their ids as well as their subelements. This currently handles <b>curtain walls</b> and <b>stacked walls</b>.
-  /// This might not be an exhaustive list of valid objects with "subelements" in revit, and will need revisiting.
+  /// Returns element IDs and their known child element IDs for cache tracking.
+  /// Uses <see cref="ElementExtensions.GetKnownChildrenElements"/> to determine which children to include.
  /// </summary>
-  /// <param name="elements"></param>
-  /// <returns></returns>
+  /// <param name="elements">Elements to process</param>
+  /// <returns>Flattened list of parent and child element IDs</returns>
  public List<string> GetElementsAndSubelementIdsFromAtomicObjects(List<Element> elements)
  {
    var ids = new HashSet<string>();
    foreach (var element in elements)
    {
-      switch (element)
-      {
-        case Wall wall:
-          if (wall.CurtainGrid is { } grid)
-          {
-            foreach (var mullionId in grid.GetMullionIds())
-            {
-              ids.Add(mullionId.ToString());
-            }
-            foreach (var panelId in grid.GetPanelIds())
-            {
-              ids.Add(panelId.ToString());
-            }
-          }
-          else if (wall.IsStackedWall)
-          {
-            foreach (var stackedWallId in wall.GetStackedWallMemberIds())
-            {
-              ids.Add(stackedWallId.ToString());
-            }
-          }
-          break;
-        case FootPrintRoof footPrintRoof:
-          if (footPrintRoof.CurtainGrids is { } gs)
-          {
-            foreach (CurtainGrid roofGrid in gs)
-            {
-              foreach (var mullionId in roofGrid.GetMullionIds())
-              {
-                ids.Add(mullionId.ToString());
-              }
-              foreach (var panelId in roofGrid.GetPanelIds())
-              {
-                ids.Add(panelId.ToString());
-              }
-            }
-          }
-          break;
-        default:
-          break;
-      }
-
+      // add the element's own ID
      ids.Add(element.Id.ToString());
+
+      // add all known children IDs using the extension method. trying to consolidate duplication here with converter
+      foreach (var childId in element.GetKnownChildrenElements())
+      {
+        ids.Add(childId.ToString());
+      }
    }

    return ids.ToList();
@@ -17,13 +17,16 @@ namespace Speckle.Connectors.Revit.HostApp;
 internal sealed class RevitDocumentStore : DocumentModelStore
 {
  private readonly ILogger<RevitDocumentStore> _logger;
-  private readonly IAppIdleManager _idleManager;
+
+  //private readonly IAppIdleManager _idleManager;
+  private readonly RevitIdleManager _idleManager;
  private readonly RevitContext _revitContext;
  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
  private readonly ISqLiteJsonCacheManager _jsonCacheManager;

  public RevitDocumentStore(
-    IAppIdleManager idleManager,
+    //IAppIdleManager idleManager,
+    RevitIdleManager idleManager,
    RevitContext revitContext,
    IJsonSerializer jsonSerializer,
    ITopLevelExceptionHandler topLevelExceptionHandler,
@@ -34,6 +37,7 @@ internal sealed class RevitDocumentStore : DocumentModelStore
    : base(logger, jsonSerializer)
  {
    _jsonCacheManager = jsonCacheManagerFactory.CreateForUser("ConnectorsFileData");
+    //_idleManager = idleManager;
    _idleManager = idleManager;
    _revitContext = revitContext;
    _topLevelExceptionHandler = topLevelExceptionHandler;
@@ -50,7 +50,8 @@ public static class SupportedCategoriesUtils
        return
 #if REVIT2023_OR_GREATER
          category.BuiltInCategory != BuiltInCategory.OST_AreaSchemes
-          && category.BuiltInCategory != BuiltInCategory.OST_AreaSchemeLines;
+          && category.BuiltInCategory != BuiltInCategory.OST_AreaSchemeLines
+          && category.BuiltInCategory != BuiltInCategory.INVALID;
 #else
          category.Name != "OST_AreaSchemeLines" && category.Name != "OST_AreaSchemes";
 #endif
@@ -0,0 +1,87 @@
+using Autodesk.Revit.DB;
+using Microsoft.Extensions.Logging;
+using Speckle.Objects.Other;
+using Speckle.Sdk;
+
+namespace Speckle.Connectors.Revit.HostApp;
+
+/// <summary>
+/// Unpacks Revit Views for sending
+/// </summary>
+
+public class ViewUnpacker
+{
+  private readonly ILogger<ViewUnpacker> _logger;
+  private readonly Converters.Common.IRootToSpeckleConverter _rootToSpeckleConverter;
+
+  public ViewUnpacker(Converters.Common.IRootToSpeckleConverter rootToSpeckleConverter, ILogger<ViewUnpacker> logger)
+  {
+    _rootToSpeckleConverter = rootToSpeckleConverter;
+    _logger = logger;
+  }
+
+  private Camera? ConvertViewToCamera(View3D view)
+  {
+    try
+    {
+      var converted = (Camera)_rootToSpeckleConverter.Convert(view);
+      if (converted is null)
+      {
+        _logger.LogError("Failed to create a view from {view}", view.Name);
+        return null;
+      }
+
+      return converted;
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogError(ex, "Failed to create a view from {view}", view.Name);
+      return null;
+    }
+  }
+
+  /// <summary>
+  /// Iterates through the 3D views in the provided document to create cameras
+  /// </summary>
+  /// <param name="doc">Document to retrieve 3D views from</param>
+  /// <returns></returns>
+  public List<Camera> Unpack(Document doc)
+  {
+    List<Camera> cameras = new();
+    using FilteredElementCollector collector = new(doc);
+    List<View> views = collector
+      .WhereElementIsNotElementType()
+      .OfCategory(BuiltInCategory.OST_Views)
+      .Cast<View>()
+      .Where(x => x.ViewType == ViewType.ThreeD)
+      .ToList();
+
+    foreach (View view in views)
+    {
+      if (view is not View3D view3D)
+      {
+        continue;
+      }
+
+      // not supporting parallel project yet, since it is too complex to match in the viewer for now
+      try
+      {
+        if (!view3D.IsPerspective)
+        {
+          continue;
+        }
+      }
+      catch (Autodesk.Revit.Exceptions.InvalidOperationException)
+      {
+        continue; // some threed views will throw an exception: returns true if view is not a view template
+      }
+
+      if (ConvertViewToCamera(view3D) is Camera camera)
+      {
+        cameras.Add(camera);
+      }
+    }
+
+    return cameras;
+  }
+}
@@ -21,6 +21,7 @@ using Speckle.Sdk.Common;
 using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Instances;
 using Transform = Speckle.Objects.Other.Transform;

 namespace Speckle.Connectors.Revit.Operations.Receive;
@@ -38,12 +39,15 @@ public sealed class RevitHostObjectBuilder(
  IThreadContext threadContext,
  RevitToHostCacheSingleton revitToHostCacheSingleton,
  ITypedConverter<
-    (Base atomicObject, IReadOnlyCollection<Matrix4x4> matrix),
+    (Base atomicObject, IReadOnlyCollection<Matrix4x4> matrix, DataObject? parentDataObject),
    DirectShape
  > localToGlobalDirectShapeConverter,
  IReceiveConversionHandler conversionHandler
 ) : IHostObjectBuilder, IDisposable
 {
+  // Maps atomic object applicationId -> parent DataObject
+  private readonly Dictionary<string, DataObject> _atomicObjectToParentDataObject = new();
+
  public Task<HostObjectBuilderResult> Build(
    Base rootObject,
    string projectName,
@@ -102,6 +106,9 @@ public sealed class RevitHostObjectBuilder(
      unpackedRoot.ObjectsToConvert.ToList()
    );

+    // Register DataObjects with InstanceProxy displayValues
+    RegisterDataObjectsWithInstanceProxies(unpackedRoot);
+
    // NOTE: below is 💩... https://github.com/specklesystems/speckle-sharp-connectors/pull/813 broke sketchup to revit workflow
    // ids were modified to fix receiving instances [CNX-1707](https://linear.app/speckle/issue/CNX-1707/revit-curves-and-meshes-in-blocks-come-as-duplicated)
    // but we then broke sketchup to revit because applicationIds in proxies didn't match modified application ids which cam from #813 hack
@@ -176,6 +183,9 @@ public sealed class RevitHostObjectBuilder(
      }
    }

+    // Update DataObject lookup IDs
+    UpdateAtomicObjectLookupWithModifiedIds(originalToModifiedIds);
+
    // 2 - Bake materials (now with the updated IDs)
    if (unpackedRoot.RenderMaterialProxies != null)
    {
@@ -234,6 +244,87 @@ public sealed class RevitHostObjectBuilder(
    return conversionResults.builderResult;
  }

+  /// <summary>
+  /// Registers DataObjects that have InstanceProxy displayValues and builds the lookup.
+  /// </summary>
+  private void RegisterDataObjectsWithInstanceProxies(RootObjectUnpackerResult unpackedRoot)
+  {
+    var definitionToDataObject = new Dictionary<string, DataObject>();
+
+    foreach (var tc in unpackedRoot.ObjectsToConvert)
+    {
+      if (tc.Current is DataObject dataObject)
+      {
+        var instanceProxies = dataObject.displayValue.OfType<InstanceProxy>().ToList();
+        if (instanceProxies.Count > 0)
+        {
+          foreach (var ip in instanceProxies)
+          {
+            definitionToDataObject[ip.definitionId] = dataObject;
+          }
+        }
+      }
+    }
+
+    // Build lookup: definition object applicationId -> parent DataObject
+    _atomicObjectToParentDataObject.Clear();
+    if (unpackedRoot.DefinitionProxies is not null)
+    {
+      foreach (var defProxy in unpackedRoot.DefinitionProxies)
+      {
+        if (
+          defProxy.applicationId is not null
+          && definitionToDataObject.TryGetValue(defProxy.applicationId, out var parentDataObject)
+        )
+        {
+          foreach (var objectId in defProxy.objects)
+          {
+            _atomicObjectToParentDataObject[objectId] = parentDataObject;
+          }
+        }
+        else
+        {
+          logger.LogError(
+            "Could not find parent DataObject for DefinitionProxy {ApplicationId}",
+            defProxy.applicationId
+          );
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Updates the atomic object lookup with modified IDs
+  /// </summary>
+  private void UpdateAtomicObjectLookupWithModifiedIds(Dictionary<string, List<string>> originalToModifiedIds)
+  {
+    // Build updated entries first to avoid modifying collection during iteration
+    var entriesToAdd = new List<KeyValuePair<string, DataObject>>();
+    var keysToRemove = new List<string>();
+
+    foreach (var kvp in _atomicObjectToParentDataObject)
+    {
+      if (originalToModifiedIds.TryGetValue(kvp.Key, out var modifiedIds))
+      {
+        keysToRemove.Add(kvp.Key);
+        foreach (var modifiedId in modifiedIds)
+        {
+          entriesToAdd.Add(new(modifiedId, kvp.Value));
+        }
+      }
+    }
+
+    foreach (var key in keysToRemove)
+    {
+      _atomicObjectToParentDataObject.Remove(key);
+    }
+
+    foreach (var entry in entriesToAdd)
+    {
+      _atomicObjectToParentDataObject[entry.Key] = entry.Value;
+    }
+  }
+
  private Autodesk.Revit.DB.Transform? CalculateNewTransform(
    Autodesk.Revit.DB.Transform? receiveTransform,
    Autodesk.Revit.DB.Transform? rootTransform
@@ -278,9 +369,17 @@ public sealed class RevitHostObjectBuilder(
        onOperationProgressed.Report(new("Converting", (double)++count / localToGlobalMaps.Count));
        if (result is DirectShapeDefinitionWrapper)
        {
+          // Look up parent DataObject for this atomic object (handles InstanceProxy displayValue)
+          var atomicId = localToGlobalMap.AtomicObject.applicationId;
+          DataObject? parentDataObject = null;
+          if (atomicId is not null)
+          {
+            _atomicObjectToParentDataObject.TryGetValue(atomicId, out parentDataObject);
+          }
+
          // direct shape creation happens here
          DirectShape directShapes = localToGlobalDirectShapeConverter.Convert(
-            (localToGlobalMap.AtomicObject, localToGlobalMap.Matrix)
+            (localToGlobalMap.AtomicObject, localToGlobalMap.Matrix, parentDataObject)
          );

          bakedObjectIds.Add(directShapes.UniqueId);
@@ -351,6 +450,7 @@ public sealed class RevitHostObjectBuilder(
    DirectShapeLibrary.GetDirectShapeLibrary(converterSettings.Current.Document).Reset(); // Note: this needs to be cleared, as it is being used in the converter

    revitToHostCacheSingleton.MaterialsByObjectId.Clear(); // Massive hack!
+    _atomicObjectToParentDataObject.Clear();
    groupManager.PurgeGroups(baseGroupName);
    materialBaker.PurgeMaterials(baseGroupName);
  }
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Autodesk.Revit.DB;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Builders;
@@ -7,6 +8,7 @@ using Speckle.Connectors.Common.Extensions;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Exceptions;
+using Speckle.Connectors.DUI.Settings;
 using Speckle.Connectors.Revit.HostApp;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Helpers;
@@ -24,11 +26,13 @@ public class RevitRootObjectBuilder(
  ISendConversionCache sendConversionCache,
  ElementUnpacker elementUnpacker,
  LevelUnpacker levelUnpacker,
+  ViewUnpacker viewUnpacker,
  IThreadContext threadContext,
  SendCollectionManager sendCollectionManager,
  ILogger<RevitRootObjectBuilder> logger,
  RevitToSpeckleCacheSingleton revitToSpeckleCacheSingleton,
-  LinkedModelHandler linkedModelHandler
+  LinkedModelHandler linkedModelHandler,
+  IConfigStore configStore
 ) : IRootObjectBuilder<DocumentToConvert>
 {
  public Task<RootObjectBuilderResult> Build(
@@ -41,6 +45,7 @@ public class RevitRootObjectBuilder(
      () => Task.FromResult(BuildSync(documentElementContexts, projectId, onOperationProgressed, ct))
    );

+  [SuppressMessage("Maintainability", "CA1506:Avoid excessive class coupling")]
  private RootObjectBuilderResult BuildSync(
    IReadOnlyList<DocumentToConvert> documentElementContexts,
    string projectId,
@@ -133,6 +138,8 @@ public class RevitRootObjectBuilder(
    var cacheHitCount = 0;
    var skippedObjectCount = 0;

+    var config = configStore.GetConnectorConfig();
+
    foreach (var atomicObjectByDocumentAndTransform in atomicObjectsByDocumentAndTransform)
    {
      string? modelDisplayName = null;
@@ -184,7 +191,11 @@ public class RevitRootObjectBuilder(
            // TODO: Potential here to transform cached objects and NOT reconvert,
            // TODO: we wont do !hasTransform here, and re-set application id before this

-            if (!hasTransform && sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
+            if (
+              !hasTransform
+              && !config.DocumentChangeListeningDisabled //This is experimental
+              && sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value)
+            )
            {
              converted = value;
              cacheHitCount++;
@@ -240,6 +251,7 @@ public class RevitRootObjectBuilder(
      throw new SpeckleException("Failed to convert all objects.");
    }

+    // STEP 5: Unpack proxies to attach to root collection
    var flatElements = atomicObjectsByDocumentAndTransform.SelectMany(t => t.Elements).ToList();
    var idsAndSubElementIds = elementUnpacker.GetElementsAndSubelementIdsFromAtomicObjects(flatElements);

@@ -260,6 +272,13 @@ public class RevitRootObjectBuilder(
      }
    );

+    // STEP 6: Unpack all other objects to attach to root collection
+    List<Objects.Other.Camera> views = viewUnpacker.Unpack(converterSettings.Current.Document);
+    if (views.Count > 0)
+    {
+      rootObject[RootKeys.VIEW] = views;
+    }
+
    // NOTE: these are currently not used anywhere, we'll skip them until someone calls for it back
    // rootObject[ProxyKeys.PARAMETER_DEFINITIONS] = _parameterDefinitionHandler.Definitions;

@@ -1,43 +1,112 @@
 using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Events;
+using Microsoft.Extensions.Logging;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk.Common;

 namespace Speckle.Connectors.Revit.Plugin;

-public sealed class RevitIdleManager : AppIdleManager
+/// <remarks>
+/// Please do NOT try and refactor this class.
+/// Whether it's to try and generalize with the <see cref="IdleCallManager"/> class
+/// or to unnecessary try and make this class thread safe.
+/// This class is a simple singleton, targeted to a Revit's host app requirements
+/// where everything happens on the main thread, and we can avoid overly complex threading/thread-safty.
+///
+/// Previous good refactors with good intention have lead to poor debugging experiences, over-engineered threading,
+/// and low confidence in the reliability.
+/// </remarks>
+/// should be registered as singleton
+public class RevitIdleManager(
+  RevitContext revitContext,
+  ITopLevelExceptionHandler topLevelExceptionHandler,
+  ILogger<RevitIdleManager> logger
+)
 {
-  private readonly UIApplication _uiApplication;
-  private readonly IIdleCallManager _idleCallManager;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
+  private readonly UIApplication _uiApplication = revitContext.UIApplication.NotNull();

-  private event EventHandler<IdlingEventArgs>? OnIdle;
+  private readonly Dictionary<string, Func<Task>> _calls = new();
+  private bool _hasSubscribed;

-  public RevitIdleManager(
-    RevitContext revitContext,
-    IIdleCallManager idleCallManager,
-    ITopLevelExceptionHandler topLevelExceptionHandler,
-    IRevitTask revitTask
-  )
-    : base(idleCallManager)
+  private bool _isExecutingIdle;
+
+  /// <summary>
+  /// Defers the invocation of an <paramref name="action"/> until next Revit idle tick (deduped by name).
+  /// The <paramref name="action"/> will be called only once.
+  /// </summary>
+  /// <param name="name">A key that prevents enqueuing duplicate events</param>
+  /// <param name="action">The action to be invoked</param>
+  /// <example>
+  /// Some events in host app are triggered many times, we might get 10x per object
+  /// Making this more like a deferred action, so we don't update the UI many times
+  /// </example>
+  /// <remarks>
+  /// This function must be called on the main thread
+  /// </remarks>
+  public void SubscribeToIdle(string name, Action action)
  {
-    _topLevelExceptionHandler = topLevelExceptionHandler;
-    _uiApplication = revitContext.UIApplication.NotNull();
-    _idleCallManager = idleCallManager;
-    revitTask.Run(
-      () => _uiApplication.Idling += (s, e) => OnIdle?.Invoke(s, e) // will be called on the main thread always and fixing the Revit exceptions on subscribing/unsubscribing Idle events
+    SubscribeToIdle(
+      name,
+      () =>
+      {
+        action.Invoke();
+        return Task.CompletedTask;
+      }
    );
  }

-  protected override void AddEvent()
+  /// <inheritdoc cref="SubscribeToIdle(string, Action)"/>
+  public void SubscribeToIdle(string name, Func<Task> action)
  {
-    _topLevelExceptionHandler.CatchUnhandled(() =>
+    if (_isExecutingIdle)
    {
-      OnIdle += RevitAppOnIdle;
-    });
+      logger.LogWarning("SubscribeToIdle called while already executing idle events");
+    }
+
+    _calls[name] = action;
+
+    if (_hasSubscribed)
+    {
+      return;
+    }
+    _hasSubscribed = true;
+
+    _uiApplication.Idling += RevitAppOnIdle;
  }

-  private void RevitAppOnIdle(object? sender, IdlingEventArgs e) =>
-    _idleCallManager.AppOnIdle(() => OnIdle -= RevitAppOnIdle);
+  private void RevitAppOnIdle(object? sender, IdlingEventArgs e)
+  {
+    topLevelExceptionHandler.CatchUnhandled(() =>
+    {
+      if (_isExecutingIdle)
+      {
+        logger.LogWarning("SubscribeToIdle called while already executing idle events");
+      }
+
+      _isExecutingIdle = true;
+      try
+      {
+        try
+        {
+          foreach (KeyValuePair<string, Func<Task>> kvp in _calls)
+          {
+            topLevelExceptionHandler.FireAndForget(kvp.Value.Invoke);
+          }
+        }
+        finally
+        {
+          _calls.Clear();
+        }
+      }
+      finally
+      {
+        _uiApplication.Idling -= RevitAppOnIdle;
+
+        _isExecutingIdle = false;
+        // setting last will delay entering re-subscription
+        _hasSubscribed = false;
+      }
+    });
+  }
 }
@@ -24,6 +24,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\LevelUnpacker.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\LinkedModelHandler.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitMaterialBaker.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\ViewUnpacker.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\SupportedCategoriesUtils.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RevitViewManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\HideWarningsFailuresPreprocessor.cs" />
@@ -53,11 +54,11 @@
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\DetailLevelSetting.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\IRevitPlugin.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitIdleManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitTask.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitExternalApplication.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitIdleManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitThreadContext.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCefPlugin.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\SpeckleRevitTaskException.cs" />
  </ItemGroup>
-</Project>
+</Project>
@@ -202,6 +202,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -325,9 +346,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.logging": {
@@ -337,7 +357,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.rhino7": {
@@ -382,35 +402,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -29,8 +29,8 @@

  <ItemGroup>
    <PackageReference Include="GrasshopperAsyncComponent" />
-    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" />
-    <PackageReference Include="Grasshopper" IncludeAssets="compile; build" PrivateAssets="all" />
+    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" VersionOverride="8.9.24194.18121"/>
+    <PackageReference Include="Grasshopper" IncludeAssets="compile; build" PrivateAssets="all" VersionOverride="8.9.24194.18121"/>
    <PackageReference Include="System.Resources.Extensions" />
  </ItemGroup>

@@ -202,6 +202,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -325,9 +346,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.logging": {
@@ -337,7 +357,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.rhino8": {
@@ -381,35 +401,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    }
  }
@@ -47,6 +47,11 @@ public class CollectionPathsSelector : ValueSet<IGH_Goo>
      // note: we are skipping the input collection, to make the output paths more intuitive
      foreach (var element in wrapper.Elements)
      {
+        if (element is null)
+        {
+          continue; // skip nulls (CNX-2855)
+        }
+
        if (element is SpeckleCollectionWrapper childCollectionWrapper)
        {
          paths.AddRange(GetPaths(childCollectionWrapper));
@@ -70,11 +75,15 @@ public class CollectionPathsSelector : ValueSet<IGH_Goo>
    void GetPathsInternal(SpeckleCollectionWrapper w)
    {
      currentPath.Add(w.Name);
-      var subCols = w.Elements.OfType<SpeckleCollectionWrapper>().ToList();
+      var subCols = w
+        .Elements.Where(e => e != null) // skip nulls (CNX-2855)
+        .OfType<SpeckleCollectionWrapper>()
+        .ToList();

      // NOTE: here we're basically outputting only paths that correspond to a collection
      // that has values inside of it.
-      if (subCols.Count != w.Elements.Count)
+      var nonNullElementCount = w.Elements.Count(e => e != null);
+      if (subCols.Count != nonNullElementCount)
      {
        allPaths.Add(string.Join(Constants.LAYER_PATH_DELIMITER, currentPath));
      }
@@ -0,0 +1,311 @@
+using System.Runtime.InteropServices;
+using Grasshopper.Kernel;
+using Grasshopper.Kernel.Types;
+using Speckle.Connectors.GrasshopperShared.HostApp;
+using Speckle.Connectors.GrasshopperShared.Parameters;
+using Speckle.Connectors.GrasshopperShared.Properties;
+using Speckle.Sdk.Models.Collections;
+
+namespace Speckle.Connectors.GrasshopperShared.Components.Collections;
+
+/// <summary>
+/// Creates collections by matching name tree structure to elements tree structure.
+/// Each branch in the names tree corresponds to the same-path branch in the elements tree.
+/// </summary>
+[Guid("7E8F9A1B-2C3D-4E5F-6A7B-8C9D0E1F2A3B")]
+public class CollectionsByName : GH_Component
+{
+  public override Guid ComponentGuid => GetType().GUID;
+  protected override Bitmap Icon => Resources.speckle_collections_create; // TODO: Update to specific icon if available
+  public override GH_Exposure Exposure => GH_Exposure.primary;
+
+  public CollectionsByName()
+    : base(
+      "Collections by Name",
+      "CbN",
+      "Creates collections by matching name tree structure to objects tree structure. Each branch in the names tree corresponds to the same-path branch in the objects tree.",
+      ComponentCategories.PRIMARY_RIBBON,
+      ComponentCategories.COLLECTIONS
+    ) { }
+
+  protected override void RegisterInputParams(GH_InputParamManager pManager)
+  {
+    pManager.AddTextParameter(
+      "Names",
+      "N",
+      "Collection names (tree structure must match Objects tree structure)",
+      GH_ParamAccess.tree
+    );
+
+    pManager.AddGenericParameter(
+      "Objects",
+      "O",
+      "Objects to group into collections (tree structure must match Names tree structure)",
+      GH_ParamAccess.tree
+    );
+  }
+
+  protected override void RegisterOutputParams(GH_OutputParamManager pManager) =>
+    pManager.AddParameter(
+      new SpeckleCollectionParam(),
+      "Collection",
+      "C",
+      "Root collection containing named sub-collections",
+      GH_ParamAccess.item
+    );
+
+  protected override void SolveInstance(IGH_DataAccess da)
+  {
+    // access the tree data directly from parameters
+    var namesParam = Params.Input[0];
+    var elementsParam = Params.Input[1];
+
+    var namesTree = namesParam.VolatileData;
+    var elementsTree = elementsParam.VolatileData;
+
+    // validate that both inputs have data
+    if (namesTree.IsEmpty)
+    {
+      AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, "Names tree is empty");
+      return;
+    }
+
+    if (elementsTree.IsEmpty)
+    {
+      AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, "Objects tree is empty");
+      return;
+    }
+
+    // validate tree structures match exactly
+    if (!TreeStructuresMatch(namesTree, elementsTree))
+    {
+      AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "Tree structures and topologies must match exactly");
+      return;
+    }
+
+    // create root collection
+    var rootCollection = CollectionHelpers.CreateRootCollection(InstanceGuid.ToString());
+
+    // process each path
+    foreach (var path in namesTree.Paths)
+    {
+      var nameBranch = namesTree.get_Branch(path);
+      var elementsBranch = elementsTree.get_Branch(path);
+
+      // validate name branch - throw if empty
+      if (nameBranch.Count == 0)
+      {
+        AddRuntimeMessage(GH_RuntimeMessageLevel.Error, $"Name branch at path {path} is empty");
+        return;
+      }
+
+      // validate name branch - just warn if multiple, use first
+      if (nameBranch.Count > 1)
+      {
+        AddRuntimeMessage(
+          GH_RuntimeMessageLevel.Warning,
+          $"Name branch at path {path} has {nameBranch.Count} names - using first name only"
+        );
+      }
+
+      // get the collection name
+      string collectionName = GetCollectionName(nameBranch[0]);
+      if (string.IsNullOrWhiteSpace(collectionName))
+      {
+        AddRuntimeMessage(GH_RuntimeMessageLevel.Error, $"Invalid collection name at path {path}");
+        return;
+      }
+
+      // skip empty element branches with warning
+      if (elementsBranch.Count == 0)
+      {
+        AddRuntimeMessage(GH_RuntimeMessageLevel.Warning, $"Skipping empty elements branch at path {path}");
+        continue;
+      }
+
+      // parse nested collection path (e.g. parent::child)
+      var collectionNames = collectionName.Split(
+        new[] { Constants.LAYER_PATH_DELIMITER },
+        StringSplitOptions.RemoveEmptyEntries
+      );
+
+      // create or get nested collection structure
+      var targetCollection = GetOrCreateNestedCollection(rootCollection, collectionNames, elementsBranch, path);
+
+      // add elements to deepest collection
+      AddElementsToCollection(targetCollection, elementsBranch, path);
+    }
+
+    // validate collection has content
+    if (rootCollection.Elements.Count == 0)
+    {
+      AddRuntimeMessage(
+        GH_RuntimeMessageLevel.Error,
+        "Collection contains no valid geometry. All branches were empty or contained unsupported types."
+      );
+      return;
+    }
+
+    // validate for duplicate application IDs (following CreateCollection pattern)
+    if (CollectionHelpers.HasDuplicateApplicationIds(rootCollection))
+    {
+      AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "The same object(s) cannot appear in multiple collections");
+      return;
+    }
+
+    da.SetData(0, new SpeckleCollectionWrapperGoo(rootCollection));
+  }
+
+  /// <summary>
+  /// Validates that two tree structures have exactly matching paths
+  /// </summary>
+  private bool TreeStructuresMatch(
+    Grasshopper.Kernel.Data.IGH_Structure namesTree,
+    Grasshopper.Kernel.Data.IGH_Structure elementsTree
+  )
+  {
+    if (namesTree.PathCount != elementsTree.PathCount)
+    {
+      return false;
+    }
+
+    // check that all paths match exactly
+    var namePaths = namesTree.Paths.ToList();
+    var elementPaths = elementsTree.Paths.ToList();
+
+    for (int i = 0; i < namePaths.Count; i++)
+    {
+      if (namePaths[i].CompareTo(elementPaths[i]) != 0)
+      {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  /// <summary>
+  /// Extracts collection name, handling GH_String and other text types
+  /// </summary>
+  private string GetCollectionName(object nameObj) =>
+    nameObj switch
+    {
+      GH_String ghString => ghString.Value,
+      IGH_Goo goo => goo.ToString(),
+      _ => nameObj.ToString()
+    };
+
+  /// <summary>
+  /// Gets or creates a nested collection structure based on the collection names.
+  /// </summary>
+  /// <remarks>
+  /// Handles paths like "parent::child::grandchild" by creating intermediate collections.
+  /// </remarks>
+  private SpeckleCollectionWrapper GetOrCreateNestedCollection(
+    SpeckleCollectionWrapper rootCollection,
+    string[] collectionNames,
+    System.Collections.IList elementsBranch,
+    Grasshopper.Kernel.Data.GH_Path path
+  )
+  {
+    SpeckleCollectionWrapper currentCollection = rootCollection;
+    var currentPath = new List<string>(rootCollection.Path);
+
+    foreach (var collectionName in collectionNames)
+    {
+      // build path for this level
+      currentPath.Add(collectionName);
+
+      // check if child collection already exists
+      var existingChild = currentCollection
+        .Elements.OfType<SpeckleCollectionWrapper>()
+        .FirstOrDefault(c => c.Name == collectionName);
+
+      if (existingChild != null)
+      {
+        // use existing collection
+        currentCollection = existingChild;
+      }
+      else
+      {
+        // create new child collection
+        var newChild = new SpeckleCollectionWrapper
+        {
+          Base = new Collection(),
+          Name = collectionName,
+          Path = currentPath.ToList(),
+          Color = null,
+          Material = null,
+          Topology = null, // only set topology on leaf collections
+          ApplicationId = Guid.NewGuid().ToString()
+        };
+
+        currentCollection.Elements.Add(newChild);
+        currentCollection = newChild;
+      }
+    }
+
+    // set topology on the final (leaf) collection
+    currentCollection.Topology = GetBranchTopology(path, elementsBranch.Count);
+
+    return currentCollection;
+  }
+
+  /// <summary>
+  /// Adds elements from a branch to the target collection
+  /// </summary>
+  private void AddElementsToCollection(
+    SpeckleCollectionWrapper targetCollection,
+    System.Collections.IList elementsBranch,
+    Grasshopper.Kernel.Data.GH_Path path
+  )
+  {
+    foreach (var item in elementsBranch)
+    {
+      if (item == null)
+      {
+        // preserve nulls for topology (CNX-2855 pattern)
+        targetCollection.Elements.Add(null);
+        continue;
+      }
+
+      // convert to SpeckleWrapper if possible - cast to IGH_Goo first
+      if (item is not IGH_Goo goo)
+      {
+        AddRuntimeMessage(
+          GH_RuntimeMessageLevel.Warning,
+          $"Unsupported object type in branch {path}: {item.GetType().Name}"
+        );
+        continue;
+      }
+
+      var wrapper = goo.ToSpeckleObjectWrapper();
+      if (wrapper == null)
+      {
+        AddRuntimeMessage(
+          GH_RuntimeMessageLevel.Warning,
+          $"Unsupported object type in branch {path}: {item.GetType().Name}"
+        );
+        continue;
+      }
+
+      if (wrapper is ISpeckleCollectionObject collectionObject)
+      {
+        targetCollection.Elements.Add(collectionObject);
+      }
+      else
+      {
+        AddRuntimeMessage(
+          GH_RuntimeMessageLevel.Warning,
+          $"Object type {wrapper.GetType().Name} is not a valid collection element"
+        );
+      }
+    }
+  }
+
+  /// <summary>
+  /// Creates topology string for a single branch (following GrasshopperHelpers.GetParamTopology pattern)
+  /// </summary>
+  private string GetBranchTopology(Grasshopper.Kernel.Data.GH_Path path, int count) =>
+    $"{path.ToString(false)}-{count}";
+}
@@ -47,7 +47,8 @@ public class CreateCollection : VariableParameterComponentBase

  protected override void SolveInstance(IGH_DataAccess dataAccess)
  {
-    var rootCollection = CreateRootCollection();
+    var rootCollection = CollectionHelpers.CreateRootCollection(InstanceGuid.ToString());
+    bool hasAnyInput = false;

    foreach (var inputParam in Params.Input)
    {
@@ -57,6 +58,7 @@ public class CreateCollection : VariableParameterComponentBase
        continue;
      }

+      hasAnyInput = true;
      var childCollection = ProcessInputParameter(inputParam, data, rootCollection.Name);
      if (childCollection != null)
      {
@@ -64,19 +66,46 @@ public class CreateCollection : VariableParameterComponentBase
      }
    }

+    // Skip validation if no input provided
+    if (!hasAnyInput)
+    {
+      return;
+    }
+
    // validate for duplicate application IDs across the entire collection hierarchy
-    if (HasDuplicateApplicationIds(rootCollection))
+    if (CollectionHelpers.HasDuplicateApplicationIds(rootCollection))
    {
      AddRuntimeMessage(GH_RuntimeMessageLevel.Error, "The same object(s) cannot appear in multiple collections");
-      return; // error already added in validation method
+      return;
+    }
+
+    // validate collection isn't empty (CNX-2855)
+    if (rootCollection.Elements.Count == 0 || !rootCollection.Elements.Any(CollectionHelpers.HasAnyValidContent))
+    {
+      AddRuntimeMessage(
+        GH_RuntimeMessageLevel.Error,
+        "Collection contains no valid geometry. All input objects are unsupported types."
+      );
+      return;
    }

    dataAccess.SetData(0, new SpeckleCollectionWrapperGoo(rootCollection));
  }

-  private SpeckleCollectionWrapper CreateRootCollection()
-  {
-    return new SpeckleCollectionWrapper
+  /// <summary>
+  /// Recursively checks if collection or any descendants contain valid geometry/data objects
+  /// </summary>
+  private bool HasAnyValidContent(ISpeckleCollectionObject? element) =>
+    element switch
+    {
+      SpeckleGeometryWrapper => true,
+      SpeckleDataObjectWrapper => true,
+      SpeckleCollectionWrapper collection => collection.Elements.Any(HasAnyValidContent),
+      _ => false
+    };
+
+  private SpeckleCollectionWrapper CreateRootCollection() =>
+    new()
    {
      Base = new Collection(),
      Name = "Unnamed",
@@ -85,7 +114,6 @@ public class CreateCollection : VariableParameterComponentBase
      Material = null,
      ApplicationId = InstanceGuid.ToString()
    };
-  }

  private SpeckleCollectionWrapper? ProcessInputParameter(IGH_Param inputParam, List<IGH_Goo> data, string rootName)
  {
@@ -140,7 +168,10 @@ public class CreateCollection : VariableParameterComponentBase

      // Check for duplicate names within this collection
      foreach (
-        var subCollectionName in collectionGoo.Value.Elements.OfType<SpeckleCollectionWrapper>().Select(c => c.Name)
+        var subCollectionName in collectionGoo
+          .Value.Elements.Where(e => e != null) // skip nulls (CNX-2855)
+          .OfType<SpeckleCollectionWrapper>()
+          .Select(c => c.Name)
      )
      {
        if (!duplicateNames.Add(subCollectionName))
@@ -163,6 +194,8 @@ public class CreateCollection : VariableParameterComponentBase
    List<string> childPath
  )
  {
+    int skippedCount = 0;
+
    foreach (var obj in objects)
    {
      // handle data objects directly (deep copy to avoid mutations)
@@ -184,56 +217,19 @@ public class CreateCollection : VariableParameterComponentBase
      }
      else
      {
-        AddRuntimeMessage(GH_RuntimeMessageLevel.Remark, $"{obj?.GetType().Name} type cannot be added to collections.");
+        // add null placeholder to preserve topology (CNX-2855)
+        parentCollection.Elements.Add(null);
+        skippedCount++;
      }
    }
-  }

-  /// <summary>
-  /// Validates that all application IDs are unique across the entire collection hierarchy.
-  /// Shows an error if duplicates are found, indicating objects appear in multiple collections.
-  /// </summary>
-  /// <returns>True if duplicates exist, false if all IDs are unique</returns>
-  private bool HasDuplicateApplicationIds(SpeckleCollectionWrapper rootCollection)
-  {
-    // args to CheckForDuplicateApplicationIds passed in since the method can recursively check
-    var seenIds = new HashSet<string>();
-    var duplicateIds = new HashSet<string>();
-
-    // iterate, create hash set and check all application IDs
-    ProcessAndCheckForDuplicateApplicationIds(rootCollection, seenIds, duplicateIds);
-
-    return duplicateIds.Count > 0;
-  }
-
-  /// <summary>
-  /// Recursively collects application IDs from all in the collection hierarchy.
-  /// </summary>
-  /// <remarks>
-  /// Only checks the wrapper's ApplicationId, not for example geometries within DataObjects.
-  /// </remarks>
-  private void ProcessAndCheckForDuplicateApplicationIds(
-    SpeckleCollectionWrapper collection,
-    HashSet<string> seenIds,
-    HashSet<string> duplicateIds
-  )
-  {
-    foreach (var element in collection.Elements)
+    // add warning if objects were skipped (CNX-2855)
+    if (skippedCount > 0)
    {
-      switch (element)
-      {
-        case SpeckleCollectionWrapper childCollection:
-          // recurse into child collections
-          ProcessAndCheckForDuplicateApplicationIds(childCollection, seenIds, duplicateIds);
-          break;
-
-        case SpeckleWrapper wrapper:
-          if (wrapper.ApplicationId != null && !seenIds.Add(wrapper.ApplicationId))
-          {
-            duplicateIds.Add(wrapper.ApplicationId);
-          }
-          break;
-      }
+      AddRuntimeMessage(
+        GH_RuntimeMessageLevel.Warning,
+        $"Skipped {skippedCount} unsupported object(s) (Leaders, TextDots, Dimensions, etc.)"
+      );
    }
  }

@@ -51,11 +51,14 @@ public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
    Name = wrapper.Name;
    NickName = wrapper.Name;

-    // Separate objects and collections
+    // Separate objects and collections (skip nulls for non-topology outputs)
    // Note: SpeckleBlockInstanceWrapper inherits from SpeckleObjectWrapper,
    // so it will be included in objects
    List<SpeckleWrapper> objects = wrapper.GetAtomicObjects().ToList();
-    List<SpeckleCollectionWrapper> collections = wrapper.Elements.OfType<SpeckleCollectionWrapper>().ToList();
+    List<SpeckleCollectionWrapper> collections = wrapper
+      .Elements.Where(e => e != null)
+      .OfType<SpeckleCollectionWrapper>()
+      .ToList();

    var outputParams = new List<OutputParamWrapper>();
    if (objects.Count != 0)
@@ -69,22 +72,14 @@ public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
        Access = GH_ParamAccess.list
      };

-      // Create appropriate Goo types for each object (downside of the inheritance refactor)
+      // Don't use topology for _objects output (always list)
      List<IGH_Goo> atomicObjectGoos = objects.Select(obj => obj.CreateGoo()).ToList();
-
      outputParams.Add(new OutputParamWrapper(param, atomicObjectGoos, null));
    }

    foreach (SpeckleCollectionWrapper childWrapper in collections)
    {
-      /* POC: we shouldn't skip empty, people would probably expect to see what they see in browser.
-      if (childWrapper.Elements.Count == 0)
-      {
-        continue;
-      }
-      */
-
-      var hasInnerCollections = childWrapper.Elements.Any(el => el is SpeckleCollectionWrapper);
+      var hasInnerCollections = childWrapper.Elements.Where(e => e != null).Any(el => el is SpeckleCollectionWrapper);
      var topology = childWrapper.Topology;
      var nickName = childWrapper.Name;
      if (nickName.Length > 16)
@@ -111,8 +106,11 @@ public class ExpandCollection : GH_Component, IGH_VariableParameterComponent
      }
      else
      {
-        // Create appropriate Goo types for child objects
-        List<IGH_Goo> childObjectGoos = childWrapper.GetAtomicObjects().Select(obj => obj.CreateGoo()).ToList();
+        // If topology exists, include nulls to match topology count (CNX-2855)
+        List<IGH_Goo> childObjectGoos =
+          topology != null
+            ? childWrapper.ToGooListWithNulls()
+            : childWrapper.GetAtomicObjects().Select(obj => obj.CreateGoo()).ToList();
        outputValue = childObjectGoos;
      }

@@ -115,7 +115,7 @@ public class DeconstructSpeckleParam : GH_Component, IGH_VariableParameterCompon
      SpeckleCollectionWrapperGoo collectionGoo when collectionGoo.Value != null
        => ParseSpeckleWrapper(
          collectionGoo.Value,
-          collectionGoo.Value.Elements.Select(o => ((SpeckleWrapper)o).CreateGoo()).ToList()
+          collectionGoo.Value.Elements.Select(o => ((SpeckleWrapper)o!).CreateGoo()).ToList()
        ),

      // get geometries from wrapper to override displayValue prop while parsing
@@ -15,7 +15,7 @@ public class TokenUrlComponent : GH_Component
 {
  public TokenUrlComponent()
    : base(
-      "Speckle Model URL",
+      "Speckle Model URL with Token",
      "URL",
      "Create a Speckle model link using URL and developer token",
      ComponentCategories.PRIMARY_RIBBON,
@@ -27,8 +27,7 @@ public class ExpandSpeckleProperties : GH_Component, IGH_VariableParameterCompon
  protected override Bitmap Icon => Resources.speckle_properties_expand;
  public override GH_Exposure Exposure => GH_Exposure.secondary;

-  protected override void RegisterInputParams(GH_InputParamManager pManager)
-  {
+  protected override void RegisterInputParams(GH_InputParamManager pManager) =>
    pManager.AddParameter(
      new SpecklePropertyGroupParam(),
      "Properties",
@@ -36,7 +35,6 @@ public class ExpandSpeckleProperties : GH_Component, IGH_VariableParameterCompon
      "Speckle Properties to expand",
      GH_ParamAccess.item
    );
-  }

  protected override void RegisterOutputParams(GH_OutputParamManager pManager) { }

@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using Grasshopper.Kernel;
+using Grasshopper.Kernel.Parameters;
 using Grasshopper.Kernel.Types;
 using Speckle.Connectors.GrasshopperShared.Components.BaseComponents;
 using Speckle.Connectors.GrasshopperShared.HostApp;
@@ -12,7 +13,7 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects;
 /// Given a list of objects, this component will filter the list for objects that match the queries.
 /// </summary>
 [Guid("26AEA046-4DD4-4F61-8251-E92A6D2AC880")]
-public class FilterSpeckleObjects : GH_Component
+public class FilterSpeckleObjects : GH_Component, IGH_VariableParameterComponent
 {
  public override Guid ComponentGuid => GetType().GUID;
  protected override Bitmap Icon => Resources.speckle_objects_filter;
@@ -49,17 +50,6 @@ public class FilterSpeckleObjects : GH_Component
      GH_ParamAccess.item
    );
    Params.Input[3].Optional = true;
-
-    pManager.AddTextParameter(
-      "Application Id",
-      "aID",
-      "Find objects with a matching applicationId",
-      GH_ParamAccess.item
-    );
-    Params.Input[4].Optional = true;
-
-    pManager.AddTextParameter("Speckle Id", "sID", "Find objects with a matching Speckle id", GH_ParamAccess.item);
-    Params.Input[5].Optional = true;
  }

  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
@@ -103,101 +93,39 @@ public class FilterSpeckleObjects : GH_Component
    dataAccess.GetData(2, ref property);
    string material = "";
    dataAccess.GetData(3, ref material);
+
+    // optional parameters - only read if they've been added via ⊕
    string appId = "";
-    dataAccess.GetData(4, ref appId);
    string speckleId = "";
-    dataAccess.GetData(5, ref speckleId);
+    int? appIdIndex = FindInputIndexByName("Application Id");
+    int? speckleIdIndex = FindInputIndexByName("Speckle Id");
+
+    if (appIdIndex.HasValue)
+    {
+      dataAccess.GetData(appIdIndex.Value, ref appId);
+    }
+
+    if (speckleIdIndex.HasValue)
+    {
+      dataAccess.GetData(speckleIdIndex.Value, ref speckleId);
+    }
+
+    bool filterByAppId = appIdIndex.HasValue;
+    bool filterBySpeckleId = speckleIdIndex.HasValue;

    List<SpeckleWrapper> matchedObjects = new();
    List<SpeckleWrapper> removedObjects = new();
-    for (int i = 0; i < objects.Count; i++)
+
+    foreach (SpeckleWrapper wrapper in objects.Cast<SpeckleWrapper>())
    {
-      SpeckleWrapper wrapper = objects[i]!;
-
-      // filter by name
-      if (!MatchesSearchPattern(name, wrapper.Name))
+      if (MatchesAllFilters(wrapper, name, property, material, appId, filterByAppId, speckleId, filterBySpeckleId))
      {
-        removedObjects.Add(wrapper);
-        continue;
-      }
-
-      // filter by property
-      bool foundProperty = false;
-      if (string.IsNullOrEmpty(property))
-      {
-        foundProperty = true;
+        matchedObjects.Add(wrapper);
      }
      else
-      {
-        SpecklePropertyGroupGoo? properties = wrapper is SpeckleDataObjectWrapper dataObjPropWrapper
-          ? dataObjPropWrapper.Properties
-          : wrapper is SpeckleGeometryWrapper geoPropWrapper
-            ? geoPropWrapper.Properties
-            : null;
-
-        if (properties is not null)
-        {
-          // use flattened properties to search ALL nested property keys
-          // fix for [CNX-2512](https://linear.app/speckle/issue/CNX-2512/filter-objects-material-and-property-key-inputs-dont-work-as-expected)
-          Dictionary<string, SpecklePropertyGoo> flattenedProps = properties.Flatten();
-          foreach (string key in flattenedProps.Keys)
-          {
-            if (MatchesSearchPattern(property, key))
-            {
-              foundProperty = true;
-              break;
-            }
-          }
-        }
-      }
-
-      if (!foundProperty)
      {
        removedObjects.Add(wrapper);
-        continue;
      }
-
-      // filter by material name
-      bool materialMatches = true;
-      if (!string.IsNullOrEmpty(material))
-      {
-        materialMatches = false;
-
-        if (wrapper is SpeckleGeometryWrapper geoWrapper)
-        {
-          materialMatches = MatchesSearchPattern(material, geoWrapper.Material?.Name ?? "");
-        }
-        else if (wrapper is SpeckleDataObjectWrapper dataObjWrapper)
-        {
-          // check if ANY geometry in the data object has a matching material (not sure about this...)
-          // fix for [CNX-2512](https://linear.app/speckle/issue/CNX-2512/filter-objects-material-and-property-key-inputs-dont-work-as-expected)
-          materialMatches = dataObjWrapper.Geometries.Any(geo =>
-            MatchesSearchPattern(material, geo.Material?.Name ?? "")
-          );
-        }
-      }
-
-      if (!materialMatches)
-      {
-        removedObjects.Add(wrapper);
-        continue;
-      }
-
-      // filter by application id
-      if (!MatchesSearchPattern(appId, wrapper.Base.applicationId ?? ""))
-      {
-        removedObjects.Add(wrapper);
-        continue;
-      }
-
-      // filter by speckle id
-      if (!MatchesSearchPattern(speckleId, wrapper.Base.id ?? ""))
-      {
-        removedObjects.Add(wrapper);
-        continue;
-      }
-
-      matchedObjects.Add(wrapper);
    }

    // Set output objects
@@ -214,4 +142,190 @@ public class FilterSpeckleObjects : GH_Component

    return Operator.IsSymbolNameLike(target, searchPattern);
  }
+
+  /// <summary>
+  /// Determines if a wrapper matches all active filter criteria.
+  /// </summary>
+  private bool MatchesAllFilters(
+    SpeckleWrapper wrapper,
+    string name,
+    string property,
+    string material,
+    string appId,
+    bool filterByAppId,
+    string speckleId,
+    bool filterBySpeckleId
+  )
+  {
+    // filter by name
+    if (!MatchesSearchPattern(name, wrapper.Name))
+    {
+      return false;
+    }
+
+    // filter by property
+    if (!MatchesPropertyFilter(wrapper, property))
+    {
+      return false;
+    }
+
+    // filter by material name
+    if (!MatchesMaterialFilter(wrapper, material))
+    {
+      return false;
+    }
+
+    // filter by application id (only if parameter was added)
+    if (filterByAppId && !MatchesSearchPattern(appId, wrapper.Base.applicationId ?? ""))
+    {
+      return false;
+    }
+
+    // filter by speckle id (only if parameter was added)
+    if (filterBySpeckleId && !MatchesSearchPattern(speckleId, wrapper.Base.id ?? ""))
+    {
+      return false;
+    }
+
+    return true;
+  }
+
+  private bool MatchesPropertyFilter(SpeckleWrapper wrapper, string property)
+  {
+    if (string.IsNullOrEmpty(property))
+    {
+      return true;
+    }
+
+    SpecklePropertyGroupGoo? properties = wrapper is SpeckleDataObjectWrapper dataObjPropWrapper
+      ? dataObjPropWrapper.Properties
+      : wrapper is SpeckleGeometryWrapper geoPropWrapper
+        ? geoPropWrapper.Properties
+        : null;
+
+    if (properties is null)
+    {
+      return false;
+    }
+
+    // use flattened properties to search ALL nested property keys
+    return properties.Flatten().Keys.Any(key => MatchesSearchPattern(property, key));
+  }
+
+  private bool MatchesMaterialFilter(SpeckleWrapper wrapper, string material)
+  {
+    if (string.IsNullOrEmpty(material))
+    {
+      return true;
+    }
+
+    if (wrapper is SpeckleGeometryWrapper geoWrapper)
+    {
+      return MatchesSearchPattern(material, geoWrapper.Material?.Name ?? "");
+    }
+
+    if (wrapper is SpeckleDataObjectWrapper dataObjWrapper)
+    {
+      // check if ANY geometry in the data object has a matching material
+      return dataObjWrapper.Geometries.Any(geo => MatchesSearchPattern(material, geo.Material?.Name ?? ""));
+    }
+
+    return false;
+  }
+
+  /// <summary>
+  /// Finds the index of an input parameter by its Name.
+  /// Returns null if the parameter doesn't exist.
+  /// </summary>
+  private int? FindInputIndexByName(string paramName)
+  {
+    for (int i = 0; i < Params.Input.Count; i++)
+    {
+      if (Params.Input[i].Name == paramName)
+      {
+        return i;
+      }
+    }
+    return null;
+  }
+
+  #region IGH_VariableParameterComponent
+
+  public bool CanInsertParameter(GH_ParameterSide side, int index)
+  {
+    if (side != GH_ParameterSide.Input)
+    {
+      return false;
+    }
+
+    // only allow inserting after the fixed parameters (index 4+)
+    if (index < 4)
+    {
+      return false;
+    }
+
+    // check how many optional params are already added (total inputs - 4 fixed)
+    int addedOptionalCount = Params.Input.Count - 4;
+
+    // we have 2 optional parameters available
+    return addedOptionalCount < 2;
+  }
+
+  public bool CanRemoveParameter(GH_ParameterSide side, int index) =>
+    // only allow removing optional input parameters (index 4+)
+    side == GH_ParameterSide.Input
+    && index >= 4;
+
+  /// <remarks>
+  /// The ternary operator for NickName is needed due to a Grasshopper quirk where
+  /// dynamically created parameters don't respect the "Draw Full Names" setting automatically.
+  /// We check CanvasFullNames at creation time to set the appropriate NickName.
+  /// This does not handle the case where the user toggles "Draw Full Names" while the
+  /// component is already on the canvas. Handling that would require subscribing to
+  /// Grasshopper.CentralSettings.CanvasFullNamesChanged event, which is overkill for now.
+  /// </remarks>
+  public IGH_Param CreateParameter(GH_ParameterSide side, int index)
+  {
+    bool hasAppId = FindInputIndexByName("Application Id").HasValue;
+    bool hasSpeckleId = FindInputIndexByName("Speckle Id").HasValue;
+
+    if (!hasAppId)
+    {
+      return new Param_String
+      {
+        Name = "Application Id",
+        NickName = Grasshopper.CentralSettings.CanvasFullNames ? "Application Id" : "aID", // see remarks
+        Description = "Find objects with a matching applicationId",
+        Access = GH_ParamAccess.item,
+        Optional = true
+      };
+    }
+
+    if (!hasSpeckleId)
+    {
+      return new Param_String
+      {
+        Name = "Speckle Id",
+        NickName = Grasshopper.CentralSettings.CanvasFullNames ? "Speckle Id" : "sID", // see remarks
+        Description = "Find objects with a matching Speckle id",
+        Access = GH_ParamAccess.item,
+        Optional = true
+      };
+    }
+
+    return new Param_String();
+  }
+
+  public bool DestroyParameter(GH_ParameterSide side, int index) => side == GH_ParameterSide.Input && index >= 4;
+
+  public void VariableParameterMaintenance()
+  {
+    // ensure all optional parameters stay marked as optional
+    for (int i = 4; i < Params.Input.Count; i++)
+    {
+      Params.Input[i].Optional = true;
+    }
+  }
+
+  #endregion
 }
@@ -155,10 +155,11 @@ public class QuerySpeckleObjects : GH_Component, IGH_VariableParameterComponent

      var outputGoos = outputValues.Select(o => o.CreateGoo()).ToList();

-      // only use topology for the first output when we have a path
      if (i == 0 && targetCollectionWrapper?.Topology is string topology && !string.IsNullOrEmpty(topology))
      {
-        var tree = GrasshopperHelpers.CreateDataTreeFromTopologyAndItems(topology, outputGoos);
+        // include nulls to match topology count (CNX-2855)
+        var outputGoosWithNulls = targetCollectionWrapper.ToGooListWithNulls();
+        var tree = GrasshopperHelpers.CreateDataTreeFromTopologyAndItems(topology, outputGoosWithNulls);
        dataAccess.SetDataTree(i, tree);
      }
      else
@@ -9,7 +9,7 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects;

 [Guid("8D2E3F4A-1B5C-4E7F-9A8B-3C6D9E2F1A4B")]
 public class SpeckleBlockDefinitionPassthrough()
-  : SpeckleSolveInstance(
+  : SpecklePassthroughComponentBase(
    "Speckle Block Definition",
    "SBD",
    "Create or modify a Speckle Block Definition",
@@ -21,6 +21,9 @@ public class SpeckleBlockDefinitionPassthrough()
  protected override Bitmap Icon => Resources.speckle_objects_block_def;
  public override GH_Exposure Exposure => GH_Exposure.tertiary;

+  protected override int FixedInputCount => 3;
+  protected override int FixedOutputCount => 3;
+
  protected override void RegisterInputParams(GH_InputParamManager pManager)
  {
    pManager.AddParameter(
@@ -122,12 +125,16 @@ public class SpeckleBlockDefinitionPassthrough()
      result.Value.Name = inputName;
    }

-    // no need to process application Id.
-    // New definitions should have a new appID generated in the new() constructor, and we want to preserve old appID otherwise for changetracking.
+    // process application id (only if user provided one, otherwise preserve existing)
+    if (TryGetApplicationIdInput(da, out string? inputAppId))
+    {
+      result.Value.ApplicationId = inputAppId;
+    }

    // set outputs
    da.SetData(0, result);
    da.SetDataList(1, result.Value.Objects.Select(o => o.CreateGoo()));
    da.SetData(2, result.Value.Name);
+    SetApplicationIdOutput(da, result.Value.ApplicationId);
  }
 }
@@ -9,7 +9,7 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects;

 [Guid("2F8A9B1C-3D4E-5F6A-7B8C-9D0E1F2A3B4C")]
 public class SpeckleBlockInstancePassthrough()
-  : SpeckleSolveInstance(
+  : SpecklePassthroughComponentBase(
    "Speckle Block Instance",
    "SBI",
    "Create or modify a Speckle Block Instance",
@@ -21,6 +21,9 @@ public class SpeckleBlockInstancePassthrough()
  protected override Bitmap Icon => Resources.speckle_objects_block_inst;
  public override GH_Exposure Exposure => GH_Exposure.tertiary;

+  protected override int FixedInputCount => 7;
+  protected override int FixedOutputCount => 7;
+
  protected override void RegisterInputParams(GH_InputParamManager pManager)
  {
    int instanceIndex = pManager.AddParameter(
@@ -205,8 +208,11 @@ public class SpeckleBlockInstancePassthrough()
      result.Value.Material = inputMaterial.Value;
    }

-    // no need to process application id.
-    // new appids are generated if this is a new object, otherwise the input object appID should be preserved for change tracking.
+    // process application id (only if user provided one, otherwise preserve existing)
+    if (TryGetApplicationIdInput(da, out string? inputAppId))
+    {
+      result.Value.ApplicationId = inputAppId;
+    }

    // Set outputs
    da.SetData(0, result);
@@ -216,6 +222,7 @@ public class SpeckleBlockInstancePassthrough()
    da.SetData(4, result.Value.Properties);
    da.SetData(5, result.Value.Color);
    da.SetData(6, result.Value.Material);
+    SetApplicationIdOutput(da, result.Value.ApplicationId);
  }

  private Transform? ExtractTransform(IGH_Goo input) =>
@@ -8,7 +8,7 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects;

 [Guid("5CE8AA40-7706-4893-853D-4C77604548FA")]
 public class SpeckleDataObjectPassthrough()
-  : SpeckleSolveInstance(
+  : SpecklePassthroughComponentBase(
    "Speckle Data Object",
    "SDO",
    "Create or modify a Speckle Data Object",
@@ -20,6 +20,9 @@ public class SpeckleDataObjectPassthrough()
  protected override Bitmap Icon => Resources.speckle_objects_dataobject;
  public override GH_Exposure Exposure => GH_Exposure.secondary;

+  protected override int FixedInputCount => 4;
+  protected override int FixedOutputCount => 5;
+
  protected override void RegisterInputParams(GH_InputParamManager pManager)
  {
    int objIndex = pManager.AddParameter(
@@ -158,9 +161,17 @@ public class SpeckleDataObjectPassthrough()
      result.Properties = inputProperties;
    }

-    // generate application ID for new data objects. Unlike SpeckleGeometry, DataObject wrappers aren't created
-    // through casting (which auto-generates IDs), so we must explicitly ensure an ID exists here
-    result.ApplicationId ??= Guid.NewGuid().ToString();
+    // process application id (only if user provided one)
+    if (TryGetApplicationIdInput(da, out string? inputAppId))
+    {
+      result.ApplicationId = inputAppId;
+    }
+    else
+    {
+      // generate application ID for new data objects. Unlike SpeckleGeometry, DataObject wrappers aren't created
+      // through casting (which auto-generates IDs), so we must explicitly ensure an ID exists here
+      result.ApplicationId ??= Guid.NewGuid().ToString();
+    }

    // get the path
    string? path =
@@ -172,5 +183,6 @@ public class SpeckleDataObjectPassthrough()
    da.SetData(2, result.Name);
    da.SetData(3, result.Properties);
    da.SetData(4, path);
+    SetApplicationIdOutput(da, result.ApplicationId);
  }
 }
@@ -10,7 +10,7 @@ namespace Speckle.Connectors.GrasshopperShared.Components.Objects;

 [Guid("F9418610-ACAE-4417-B010-19EBEA6A121F")]
 public class SpeckleGeometryPassthrough()
-  : SpeckleSolveInstance(
+  : SpecklePassthroughComponentBase(
    "Speckle Geometry",
    "SG",
    "Create or modify a Speckle Geometry",
@@ -22,6 +22,9 @@ public class SpeckleGeometryPassthrough()
  protected override Bitmap Icon => Resources.speckle_objects_geometry;
  public override GH_Exposure Exposure => GH_Exposure.secondary;

+  protected override int FixedInputCount => 6;
+  protected override int FixedOutputCount => 7;
+
  protected override void RegisterInputParams(GH_InputParamManager pManager)
  {
    int objIndex = pManager.AddGenericParameter(
@@ -220,8 +223,11 @@ public class SpeckleGeometryPassthrough()
      result.Material = inputMaterial.Value;
    }

-    // no need to process application Id.
-    // New definitions should have a new appID generated in the new() constructor, and we want to preserve old appID otherwise for changetracking.
+    // process application id (only if user provided one, otherwise preserve existing)
+    if (TryGetApplicationIdInput(da, out string? inputAppId))
+    {
+      result.ApplicationId = inputAppId;
+    }

    // get the path
    string? path =
@@ -235,6 +241,7 @@ public class SpeckleGeometryPassthrough()
    da.SetData(4, result.Color);
    da.SetData(5, result.Material);
    da.SetData(6, path);
+    SetApplicationIdOutput(da, result.ApplicationId);
  }

  // keeps the geometry and wrapped base the same while assigning all other props from the inut wrapper
@@ -130,7 +130,7 @@ public class ReceiveAsyncComponent : GH_AsyncComponent<ReceiveAsyncComponent>
    {
      var autoReceiveMi = Menu_AppendItem(
        menu,
-        "Load automatically",
+        "Load new versions automatically",
        (s, e) =>
        {
          AutoReceive = !AutoReceive;
@@ -447,73 +447,89 @@ public sealed class ReceiveComponentWorker : WorkerInstance<ReceiveAsyncComponen
    }

    using var scope = PriorityLoader.CreateScopeForActiveDocument();
-    Root = await scope
-      .Get<GrasshopperReceiveOperation>()
-      .ReceiveCommitObject(receiveInfo, progress, CancellationToken)
-      .ConfigureAwait(false);
-
-    CancellationToken.ThrowIfCancellationRequested();
-
-    SpecklePropertyGroupGoo? rootPropertiesGoo = null;
-    if (Root is RootCollection rootCollection && rootCollection.properties.Count > 0)
+    try
    {
-      rootPropertiesGoo = new SpecklePropertyGroupGoo(rootCollection.properties);
+      Root = await scope
+        .Get<GrasshopperReceiveOperation>()
+        .ReceiveCommitObject(receiveInfo, progress, CancellationToken)
+        .ConfigureAwait(false);
+
+      CancellationToken.ThrowIfCancellationRequested();
+
+      SpecklePropertyGroupGoo? rootPropertiesGoo = null;
+      if (Root is RootCollection rootCollection && rootCollection.properties.Count > 0)
+      {
+        rootPropertiesGoo = new SpecklePropertyGroupGoo(rootCollection.properties);
+      }
+
+      // Step 2 - CONVERT
+      //receiveComponent.Message = $"Unpacking...";
+      SpeckleConversionContext.SetupCurrent(scope);
+
+      var unpackedRoot = scope.Get<RootObjectUnpacker>().Unpack(Root);
+
+      // separate atomic objects from block instances
+      var (atomicObjects, blockInstances) = scope
+        .Get<RootObjectUnpacker>()
+        .SplitAtomicObjectsAndInstances(unpackedRoot.ObjectsToConvert);
+
+      // initialize unpackers and collection builder (data holders - created with new)
+      var colorUnpacker = new GrasshopperColorUnpacker(unpackedRoot);
+      var materialUnpacker = new GrasshopperMaterialUnpacker(unpackedRoot);
+      var collectionRebuilder = new GrasshopperCollectionRebuilder(
+        (Root as Collection) ?? new Collection { name = "unnamed" }
+      );
+
+      // get handler from DI and initialize with per-operation data
+      var mapHandler = scope
+        .Get<LocalToGlobalMapHandler>()
+        .Initialize(
+          scope.Get<TraversalContextUnpacker>(),
+          colorUnpacker,
+          materialUnpacker,
+          collectionRebuilder,
+          unpackedRoot.DefinitionProxies
+        );
+
+      // handler deals with two-pass conversion: normal objects first, then DataObjects with InstanceProxies
+      mapHandler.ConvertAtomicObjects(atomicObjects);
+
+      // process block instances using converted atomic objects
+      // internally filters out InstanceProxies that belong to registered DataObjects
+      // block processing needs converted objects, but object filtering needs block definitions.
+      mapHandler.ConvertBlockInstances(blockInstances);
+
+      Result = new SpeckleCollectionWrapperGoo(collectionRebuilder.RootCollectionWrapper);
+      RootProperties = rootPropertiesGoo;
+
+      // TODO: If we have NodeRun events later, better to have `ComponentTracker` to use across components
+      var customProperties = new Dictionary<string, object>()
+      {
+        { "isAsync", true },
+        { "sourceHostApp", HostApplications.GetSlugFromHostAppNameAndVersion(receiveInfo.SourceApplication) },
+        { "auto", Parent.AutoReceive }
+      };
+      if (receiveInfo.WorkspaceId != null)
+      {
+        customProperties.Add("workspace_id", receiveInfo.WorkspaceId);
+      }
+
+      if (receiveInfo.SelectedVersionUserId != null)
+      {
+        customProperties.Add(
+          "isMultiplayer",
+          receiveInfo.SelectedVersionUserId != Parent.ApiClient.Account.userInfo.id
+        );
+      }
+
+      await scope
+        .Get<IMixPanelManager>()
+        .TrackEvent(MixPanelEvents.Receive, Parent.ApiClient.Account, customProperties);
    }
-
-    // Step 2 - CONVERT
-    //receiveComponent.Message = $"Unpacking...";
-    TraversalContextUnpacker traversalContextUnpacker = new();
-    var unpackedRoot = scope.Get<RootObjectUnpacker>().Unpack(Root);
-
-    // separate atomic objects from block instances
-    var (atomicObjects, blockInstances) = scope
-      .Get<RootObjectUnpacker>()
-      .SplitAtomicObjectsAndInstances(unpackedRoot.ObjectsToConvert);
-
-    // initialize unpackers and collection builder
-    var colorUnpacker = new GrasshopperColorUnpacker(unpackedRoot);
-    var materialUnpacker = new GrasshopperMaterialUnpacker(unpackedRoot);
-    var collectionRebuilder = new GrasshopperCollectionRebuilder(
-      (Root as Collection) ?? new Collection { name = "unnamed" }
-    );
-
-    // convert atomic objects directly
-    var mapHandler = new LocalToGlobalMapHandler(
-      traversalContextUnpacker,
-      collectionRebuilder,
-      colorUnpacker,
-      materialUnpacker
-    );
-
-    foreach (var atomicContext in atomicObjects)
+    finally
    {
-      mapHandler.ConvertAtomicObject(atomicContext);
+      SpeckleConversionContext.EndCurrent();
    }
-
-    // process block instances using converted atomic objects
-    // block processing needs converted objects, but object filtering needs block definitions.
-    mapHandler.ConvertBlockInstances(blockInstances, unpackedRoot.DefinitionProxies);
-
-    Result = new SpeckleCollectionWrapperGoo(collectionRebuilder.RootCollectionWrapper);
-    RootProperties = rootPropertiesGoo;
-
-    // TODO: If we have NodeRun events later, better to have `ComponentTracker` to use across components
-    var customProperties = new Dictionary<string, object>()
-    {
-      { "isAsync", true },
-      { "sourceHostApp", HostApplications.GetSlugFromHostAppNameAndVersion(receiveInfo.SourceApplication) },
-      { "auto", Parent.AutoReceive }
-    };
-    if (receiveInfo.WorkspaceId != null)
-    {
-      customProperties.Add("workspace_id", receiveInfo.WorkspaceId);
-    }
-
-    if (receiveInfo.SelectedVersionUserId != null)
-    {
-      customProperties.Add("isMultiplayer", receiveInfo.SelectedVersionUserId != Parent.ApiClient.Account.userInfo.id);
-    }
-    await scope.Get<IMixPanelManager>().TrackEvent(MixPanelEvents.Receive, Parent.ApiClient.Account, customProperties);
  }
 }

@@ -143,95 +143,102 @@ public class ReceiveComponent : SpeckleTaskCapableComponent<ReceiveComponentInpu
    }

    using var scope = PriorityLoader.CreateScopeForActiveDocument();
-    var clientFactory = scope.ServiceProvider.GetRequiredService<IClientFactory>();
-    var receiveOperation = scope.ServiceProvider.GetRequiredService<GrasshopperReceiveOperation>();

-    // Do the thing 👇🏼
-
-    Account? account = input.Resource.Account.GetAccount(scope);
-    if (account is null)
+    try
    {
-      throw new SpeckleAccountManagerException("No default account was found");
+      var clientFactory = scope.ServiceProvider.GetRequiredService<IClientFactory>();
+      var receiveOperation = scope.ServiceProvider.GetRequiredService<GrasshopperReceiveOperation>();
+
+      // Do the thing 👇🏼
+
+      Account? account = input.Resource.Account.GetAccount(scope);
+      if (account is null)
+      {
+        throw new SpeckleAccountManagerException("No default account was found");
+      }
+
+      using var client = clientFactory.Create(account);
+      var receiveInfo = await input.Resource.GetReceiveInfo(client, cancellationToken).ConfigureAwait(false);
+
+      // store version id for tracking
+      _lastVersionId = receiveInfo.SelectedVersionId;
+
+      var progress = new Progress<CardProgress>(_ =>
+      {
+        // TODO: Progress only makes sense in non-blocking async receive, which is not supported yet.
+        // Message = $"{progress.Status}: {progress.Progress}";
+      });
+
+      var root = await receiveOperation
+        .ReceiveCommitObject(receiveInfo, progress, cancellationToken)
+        .ConfigureAwait(false);
+
+      // extract model-wide root properties (see cnx-2722)
+      SpecklePropertyGroupGoo? rootPropertiesGoo = null;
+      if (root is RootCollection rootCollection && rootCollection.properties.Count > 0)
+      {
+        rootPropertiesGoo = new SpecklePropertyGroupGoo(rootCollection.properties);
+      }
+
+      // TODO: If we have NodeRun events later, better to have `ComponentTracker` to use across components
+      var customProperties = new Dictionary<string, object>
+      {
+        { "isAsync", false },
+        { "sourceHostApp", HostApplications.GetSlugFromHostAppNameAndVersion(receiveInfo.SourceApplication) }
+      };
+      if (receiveInfo.WorkspaceId != null)
+      {
+        customProperties.Add("workspace_id", receiveInfo.WorkspaceId);
+      }
+      if (receiveInfo.SelectedVersionUserId != null)
+      {
+        customProperties.Add("isMultiplayer", receiveInfo.SelectedVersionUserId != client.Account.userInfo.id);
+      }
+      var mixpanel = PriorityLoader.Container.GetRequiredService<IMixPanelManager>();
+      await mixpanel.TrackEvent(MixPanelEvents.Receive, account, customProperties);
+
+      // Setup conversion context BEFORE unpacking (which triggers DataObjectConverter)
+      SpeckleConversionContext.SetupCurrent(scope);
+
+      var rootObjectUnpacker = scope.ServiceProvider.GetService<RootObjectUnpacker>();
+      var unpackedRoot = rootObjectUnpacker.Unpack(root);
+
+      // split atomic objects from block components before conversion
+      var (atomicObjects, blockInstances) = rootObjectUnpacker.SplitAtomicObjectsAndInstances(
+        unpackedRoot.ObjectsToConvert
+      );
+
+      // Initialize unpackers and collection builder (data holders - created with new)
+      var colorUnpacker = new GrasshopperColorUnpacker(unpackedRoot);
+      var materialUnpacker = new GrasshopperMaterialUnpacker(unpackedRoot);
+      var collectionRebuilder = new GrasshopperCollectionRebuilder(
+        (root as Collection) ?? new Collection { name = "unnamed" }
+      );
+
+      // get handler from DI and initialize with per-operation data
+      var mapHandler = scope
+        .ServiceProvider.GetRequiredService<LocalToGlobalMapHandler>()
+        .Initialize(
+          scope.ServiceProvider.GetRequiredService<TraversalContextUnpacker>(),
+          colorUnpacker,
+          materialUnpacker,
+          collectionRebuilder,
+          unpackedRoot.DefinitionProxies
+        );
+
+      // two-pass conversion: normal objects first, then DataObjects with InstanceProxies
+      mapHandler.ConvertAtomicObjects(atomicObjects);
+
+      // process block instances (internally filters InstanceProxies belonging to registered DataObjects)
+      mapHandler.ConvertBlockInstances(blockInstances);
+
+      var goo = new SpeckleCollectionWrapperGoo(collectionRebuilder.RootCollectionWrapper);
+      return new ReceiveComponentOutput { RootObject = goo, RootProperties = rootPropertiesGoo };
    }
-
-    using var client = clientFactory.Create(account);
-    var receiveInfo = await input.Resource.GetReceiveInfo(client, cancellationToken).ConfigureAwait(false);
-
-    // store version id for tracking
-    _lastVersionId = receiveInfo.SelectedVersionId;
-
-    var progress = new Progress<CardProgress>(_ =>
+    finally
    {
-      // TODO: Progress only makes sense in non-blocking async receive, which is not supported yet.
-      // Message = $"{progress.Status}: {progress.Progress}";
-    });
-
-    var root = await receiveOperation
-      .ReceiveCommitObject(receiveInfo, progress, cancellationToken)
-      .ConfigureAwait(false);
-
-    // extract model-wide root properties (see cnx-2722)
-    SpecklePropertyGroupGoo? rootPropertiesGoo = null;
-    if (root is RootCollection rootCollection && rootCollection.properties.Count > 0)
-    {
-      rootPropertiesGoo = new SpecklePropertyGroupGoo(rootCollection.properties);
+      SpeckleConversionContext.EndCurrent();
    }
-
-    // TODO: If we have NodeRun events later, better to have `ComponentTracker` to use across components
-    var customProperties = new Dictionary<string, object>
-    {
-      { "isAsync", false },
-      { "sourceHostApp", HostApplications.GetSlugFromHostAppNameAndVersion(receiveInfo.SourceApplication) }
-    };
-    if (receiveInfo.WorkspaceId != null)
-    {
-      customProperties.Add("workspace_id", receiveInfo.WorkspaceId);
-    }
-    if (receiveInfo.SelectedVersionUserId != null)
-    {
-      customProperties.Add("isMultiplayer", receiveInfo.SelectedVersionUserId != client.Account.userInfo.id);
-    }
-    var mixpanel = PriorityLoader.Container.GetRequiredService<IMixPanelManager>();
-    await mixpanel.TrackEvent(MixPanelEvents.Receive, account, customProperties);
-
-    // We need to rethink these lovely unpackers, there's a bit too many of 'em
-    var rootObjectUnpacker = scope.ServiceProvider.GetService<RootObjectUnpacker>();
-    var traversalContextUnpacker = new TraversalContextUnpacker();
-
-    var unpackedRoot = rootObjectUnpacker.Unpack(root);
-
-    // split atomic objects from block components before conversion
-    var (atomicObjects, blockInstances) = rootObjectUnpacker.SplitAtomicObjectsAndInstances(
-      unpackedRoot.ObjectsToConvert
-    );
-
-    // Initialize unpackers and collection builder
-    var colorUnpacker = new GrasshopperColorUnpacker(unpackedRoot);
-    var materialUnpacker = new GrasshopperMaterialUnpacker(unpackedRoot);
-    var collectionRebuilder = new GrasshopperCollectionRebuilder(
-      (root as Collection) ?? new Collection { name = "unnamed" }
-    );
-
-    // convert atomic objects directly
-    var mapHandler = new LocalToGlobalMapHandler(
-      traversalContextUnpacker,
-      collectionRebuilder,
-      colorUnpacker,
-      materialUnpacker
-    );
-
-    foreach (var atomicContext in atomicObjects)
-    {
-      mapHandler.ConvertAtomicObject(atomicContext);
-    }
-
-    // process block instances using converted atomic objects
-    // block processing needs converted objects, but object filtering needs block definitions.
-    mapHandler.ConvertBlockInstances(blockInstances, unpackedRoot.DefinitionProxies);
-
-    // var x = new SpeckleCollectionGoo { Value = collGen.RootCollection };
-    var goo = new SpeckleCollectionWrapperGoo(collectionRebuilder.RootCollectionWrapper);
-    return new ReceiveComponentOutput { RootObject = goo, RootProperties = rootPropertiesGoo };
  }

  private void SetupSubscription(SpeckleUrlModelResource resource)
@@ -87,6 +87,7 @@ public class SendAsyncComponent : GH_AsyncComponent<SendAsyncComponent>
  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
  {
    pManager.AddParameter(new SpeckleUrlModelResourceParam());
+    pManager.AddTextParameter("Version ID", "V", "ID of the created version", GH_ParamAccess.item);
  }

  public override void AppendAdditionalMenuItems(ToolStripDropDown menu)
@@ -321,6 +322,7 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>

  private Stopwatch? _stopwatch;
  public SpeckleUrlModelResource? OutputParam { get; set; }
+  public string? OutputVersionId { get; set; }
  private List<(GH_RuntimeMessageLevel, string)> RuntimeMessages { get; } = new();

  public override WorkerInstance<SendAsyncComponent> Duplicate(string id, CancellationToken cancellationToken)
@@ -332,6 +334,7 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>
  {
    _stopwatch = new Stopwatch();
    _stopwatch.Start();
+    OutputVersionId = null;
  }

  public override void SetData(IGH_DataAccess da)
@@ -342,6 +345,7 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>
    {
      Parent.JustPastedIn = false;
      da.SetData(0, Parent.OutputParam);
+      da.SetData(1, OutputVersionId);
      return;
    }

@@ -357,6 +361,7 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>
    }

    da.SetData(0, OutputParam);
+    da.SetData(1, OutputVersionId);

    Parent.CurrentComponentState = ComponentState.UpToDate;
    Parent.OutputParam = OutputParam; // ref the outputs in the parent too, so we can serialise them on write/read
@@ -373,7 +378,7 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>
      */
      Parent.AddRuntimeMessage(
        GH_RuntimeMessageLevel.Remark,
-        $"Successfully published to Speckle. Right-click on the component to view online."
+        "Successfully published to Speckle. Right-click on the component to view online."
      );
      Parent.AddRuntimeMessage(
        GH_RuntimeMessageLevel.Remark,
@@ -471,6 +476,7 @@ public class SendComponentWorker : WorkerInstance<SendAsyncComponent>
        result.VersionId
      );
    OutputParam = createdVersion;
+    OutputVersionId = result.VersionId;
    Parent.Url = $"{createdVersion.Account.Server}/projects/{sendInfo.ProjectId}/models/{sendInfo.ModelId}";
  }
 }
@@ -36,9 +36,10 @@ public class SendComponentInput
  }
 }

-public class SendComponentOutput(SpeckleUrlModelResource? resource)
+public class SendComponentOutput(SpeckleUrlModelResource? resource, string? versionId = null)
 {
  public SpeckleUrlModelResource? Resource { get; } = resource;
+  public string? VersionId { get; } = versionId;
 }

 public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, SendComponentOutput>
@@ -86,8 +87,11 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
    pManager.AddBooleanParameter("Run", "r", "Run the publish operation", GH_ParamAccess.item);
  }

-  protected override void RegisterOutputParams(GH_OutputParamManager pManager) =>
+  protected override void RegisterOutputParams(GH_OutputParamManager pManager)
+  {
    pManager.AddParameter(new SpeckleUrlModelResourceParam());
+    pManager.AddTextParameter("Version ID", "V", "ID of the created version", GH_ParamAccess.item);
+  }

  protected override SendComponentInput GetInput(IGH_DataAccess da)
  {
@@ -134,6 +138,7 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
    else
    {
      da.SetData(0, result.Resource);
+      da.SetData(1, result.VersionId);
      Message = "Done";
    }
  }
@@ -216,7 +221,7 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen

    using var client = clientFactory.Create(account);
    var sendInfo = await input.Resource.GetSendInfo(client, cancellationToken).ConfigureAwait(false);
-    await sendOperation
+    var result = await sendOperation
      .Execute(
        new List<SpeckleCollectionWrapperGoo> { collectionToSend },
        sendInfo,
@@ -244,6 +249,6 @@ public class SendComponent : SpeckleTaskCapableComponent<SendComponentInput, Sen
        sendInfo.ModelId
      );
    Url = $"{sendInfo.Account.serverInfo.url}/projects/{sendInfo.ProjectId}/models/{sendInfo.ModelId}";
-    return new SendComponentOutput(createdVersionResource);
+    return new SendComponentOutput(createdVersionResource, result.VersionId);
  }
 }
@@ -0,0 +1,231 @@
+using GH_IO.Serialization;
+using Grasshopper.Kernel;
+using Grasshopper.Kernel.Parameters;
+
+namespace Speckle.Connectors.GrasshopperShared.Components;
+
+/// <summary>
+/// Base class for passthrough components with "hidden" Application ID parameter.
+/// </summary>
+/// <remarks>
+/// Users can click ⊕ to add an optional Application ID input and output.
+/// </remarks>
+public abstract class SpecklePassthroughComponentBase : SpeckleSolveInstance, IGH_VariableParameterComponent
+{
+  private const string APP_ID_NAME = "Application Id";
+  private const string APP_ID_NICKNAME = "aID";
+  private const string APP_ID_DESCRIPTION = "The application id of the Speckle objects";
+
+  protected abstract int FixedInputCount { get; }
+  protected abstract int FixedOutputCount { get; }
+
+  private bool HasApplicationIdParam => Params.Input.Count > FixedInputCount;
+
+  protected SpecklePassthroughComponentBase(
+    string name,
+    string nickname,
+    string description,
+    string category,
+    string subCategory
+  )
+    : base(name, nickname, description, category, subCategory) { }
+
+  /// <summary>
+  /// Reads the optional Application Id input. Returns true if user provided a valid value.
+  /// </summary>
+  protected bool TryGetApplicationIdInput(IGH_DataAccess da, out string? applicationId)
+  {
+    applicationId = null;
+
+    if (!HasApplicationIdParam)
+    {
+      return false;
+    }
+
+    string appId = string.Empty;
+    if (da.GetData(FixedInputCount, ref appId))
+    {
+      if (string.IsNullOrWhiteSpace(appId))
+      {
+        AddRuntimeMessage(
+          GH_RuntimeMessageLevel.Warning,
+          "Empty Application Id ignored - existing or auto-generated id will be used"
+        );
+        return false;
+      }
+
+      applicationId = appId;
+      return true;
+    }
+
+    return false;
+  }
+
+  /// <summary>
+  /// Sets the Application Id output (if the parameter exists).
+  /// </summary>
+  protected void SetApplicationIdOutput(IGH_DataAccess da, string? applicationId)
+  {
+    if (!HasApplicationIdParam)
+    {
+      return;
+    }
+
+    da.SetData(FixedOutputCount, applicationId);
+  }
+
+  public bool CanInsertParameter(GH_ParameterSide side, int index)
+  {
+    // only allow inserting if not yet added
+    if (HasApplicationIdParam)
+    {
+      return false;
+    }
+
+    // only allow at the end position
+    return side switch
+    {
+      GH_ParameterSide.Input => index == FixedInputCount,
+      GH_ParameterSide.Output => index == FixedOutputCount,
+      _ => false
+    };
+  }
+
+  public bool CanRemoveParameter(GH_ParameterSide side, int index)
+  {
+    if (!HasApplicationIdParam)
+    {
+      return false;
+    }
+
+    return side switch
+    {
+      GH_ParameterSide.Input => index == FixedInputCount,
+      GH_ParameterSide.Output => index == FixedOutputCount,
+      _ => false
+    };
+  }
+
+  /// <remarks>
+  /// The ternary for NickName handles a Grasshopper quirk where dynamically created parameters
+  /// don't respect the "Draw Full Names" setting automatically.
+  /// </remarks>
+  public IGH_Param CreateParameter(GH_ParameterSide side, int index)
+  {
+    // when adding on either side, add both input and output together
+    if (side == GH_ParameterSide.Input && Params.Output.Count == FixedOutputCount)
+    {
+      OnPingDocument()?.ScheduleSolution(5, _ => AddApplicationIdOutput());
+    }
+    else if (side == GH_ParameterSide.Output && Params.Input.Count == FixedInputCount)
+    {
+      OnPingDocument()?.ScheduleSolution(5, _ => AddApplicationIdInput());
+    }
+
+    return CreateApplicationIdParam();
+  }
+
+  public bool DestroyParameter(GH_ParameterSide side, int index)
+  {
+    // when removing from either side, remove both input and output together
+    if (side == GH_ParameterSide.Input && index == FixedInputCount && Params.Output.Count > FixedOutputCount)
+    {
+      OnPingDocument()?.ScheduleSolution(5, _ => RemoveApplicationIdOutput());
+    }
+    else if (side == GH_ParameterSide.Output && index == FixedOutputCount && Params.Input.Count > FixedInputCount)
+    {
+      OnPingDocument()?.ScheduleSolution(5, _ => RemoveApplicationIdInput());
+    }
+
+    return side switch
+    {
+      GH_ParameterSide.Input => index == FixedInputCount,
+      GH_ParameterSide.Output => index == FixedOutputCount,
+      _ => false
+    };
+  }
+
+  public void VariableParameterMaintenance()
+  {
+    // ensure the Application Id input stays optional
+    if (HasApplicationIdParam && Params.Input.Count > FixedInputCount)
+    {
+      Params.Input[FixedInputCount].Optional = true;
+    }
+  }
+
+  private static IGH_Param CreateApplicationIdParam() =>
+    new Param_String
+    {
+      Name = APP_ID_NAME,
+      NickName = Grasshopper.CentralSettings.CanvasFullNames ? APP_ID_NAME : APP_ID_NICKNAME,
+      Description = APP_ID_DESCRIPTION,
+      Access = GH_ParamAccess.item,
+      Optional = true
+    };
+
+  private void AddApplicationIdInput()
+  {
+    if (Params.Input.Count > FixedInputCount)
+    {
+      return;
+    }
+
+    Params.RegisterInputParam(CreateApplicationIdParam());
+    Params.OnParametersChanged();
+    VariableParameterMaintenance();
+    ExpireSolution(true);
+  }
+
+  private void AddApplicationIdOutput()
+  {
+    if (Params.Output.Count > FixedOutputCount)
+    {
+      return;
+    }
+
+    Params.RegisterOutputParam(CreateApplicationIdParam());
+    Params.OnParametersChanged();
+    ExpireSolution(true);
+  }
+
+  private void RemoveApplicationIdInput()
+  {
+    if (Params.Input.Count <= FixedInputCount)
+    {
+      return;
+    }
+
+    Params.UnregisterInputParameter(Params.Input[FixedInputCount]);
+    Params.OnParametersChanged();
+    ExpireSolution(true);
+  }
+
+  private void RemoveApplicationIdOutput()
+  {
+    if (Params.Output.Count <= FixedOutputCount)
+    {
+      return;
+    }
+
+    Params.UnregisterOutputParameter(Params.Output[FixedOutputCount]);
+    Params.OnParametersChanged();
+    ExpireSolution(true);
+  }
+
+  public override bool Write(GH_IWriter writer)
+  {
+    var result = base.Write(writer);
+    writer.SetBoolean("HasApplicationIdParam", HasApplicationIdParam);
+    return result;
+  }
+
+  public override bool Read(GH_IReader reader)
+  {
+    var result = base.Read(reader);
+    // parameters are restored by GH serialization, this flag is for reference
+    bool hasAppIdParam = false;
+    reader.TryGetBoolean("HasApplicationIdParam", ref hasAppIdParam);
+    return result;
+  }
+}
@@ -0,0 +1,83 @@
+using Speckle.Connectors.GrasshopperShared.Parameters;
+using Speckle.Sdk.Models.Collections;
+
+namespace Speckle.Connectors.GrasshopperShared.Components.Collections;
+
+/// <summary>
+/// Shared helper methods for collection components to avoid code duplication
+/// </summary>
+public static class CollectionHelpers
+{
+  /// <summary>
+  /// Creates a root collection wrapper with default values
+  /// </summary>
+  public static SpeckleCollectionWrapper CreateRootCollection(string instanceGuid) =>
+    new SpeckleCollectionWrapper
+    {
+      Base = new Collection(),
+      Name = "Unnamed",
+      Path = new List<string> { "Unnamed" },
+      Color = null,
+      Material = null,
+      ApplicationId = instanceGuid
+    };
+
+  /// <summary>
+  /// Validates that all application IDs are unique across the entire collection hierarchy.
+  /// </summary>
+  /// <returns>True if duplicates exist, false if all IDs are unique</returns>
+  public static bool HasDuplicateApplicationIds(SpeckleCollectionWrapper rootCollection)
+  {
+    var seenIds = new HashSet<string>();
+    var duplicateIds = new HashSet<string>();
+
+    ProcessAndCheckForDuplicateApplicationIds(rootCollection, seenIds, duplicateIds);
+
+    return duplicateIds.Count > 0;
+  }
+
+  /// <summary>
+  /// Recursively collects application IDs from all wrappers in the collection hierarchy.
+  /// </summary>
+  /// <remarks>
+  /// Only checks the wrapper's ApplicationId, not for example geometries within DataObjects.
+  /// </remarks>
+  private static void ProcessAndCheckForDuplicateApplicationIds(
+    SpeckleCollectionWrapper collection,
+    HashSet<string> seenIds,
+    HashSet<string> duplicateIds
+  )
+  {
+    foreach (var element in collection.Elements)
+    {
+      switch (element)
+      {
+        case null:
+          break; // skip nulls (CNX-2855)
+        case SpeckleCollectionWrapper childCollection:
+          // recurse into child collections
+          ProcessAndCheckForDuplicateApplicationIds(childCollection, seenIds, duplicateIds);
+          break;
+
+        case SpeckleWrapper wrapper:
+          if (wrapper.ApplicationId != null && !seenIds.Add(wrapper.ApplicationId))
+          {
+            duplicateIds.Add(wrapper.ApplicationId);
+          }
+          break;
+      }
+    }
+  }
+
+  /// <summary>
+  /// Recursively checks if collection or any descendants contain valid geometry/data objects
+  /// </summary>
+  public static bool HasAnyValidContent(ISpeckleCollectionObject? element) =>
+    element switch
+    {
+      SpeckleGeometryWrapper => true,
+      SpeckleDataObjectWrapper => true,
+      SpeckleCollectionWrapper collection => collection.Elements.Any(HasAnyValidContent),
+      _ => false
+    };
+}
@@ -107,17 +107,14 @@ public static class GrasshopperHelpers
      M12 = rhinoTransform.M01,
      M13 = rhinoTransform.M02,
      M14 = rhinoTransform.M03 * conversionFactor,
-
      M21 = rhinoTransform.M10,
      M22 = rhinoTransform.M11,
      M23 = rhinoTransform.M12,
      M24 = rhinoTransform.M13 * conversionFactor,
-
      M31 = rhinoTransform.M20,
      M32 = rhinoTransform.M21,
      M33 = rhinoTransform.M22,
      M34 = rhinoTransform.M23 * conversionFactor,
-
      M41 = rhinoTransform.M30,
      M42 = rhinoTransform.M31,
      M43 = rhinoTransform.M32,
@@ -139,6 +136,8 @@ public static class GrasshopperHelpers
    {
      switch (element)
      {
+        case null:
+          break; // skip nulls (CNX-2855)
        case SpeckleDataObjectWrapper dataObject:
          yield return dataObject;
          break;
@@ -153,8 +152,7 @@ public static class GrasshopperHelpers
              yield return subElement;
            }
          }
-          break;
-        default:
+
          break;
      }
    }
@@ -173,11 +171,9 @@ public static class GrasshopperHelpers
    {
      return instanceGoo.Value;
    }
-    else
-    {
-      SpeckleGeometryWrapperGoo objGoo = new();
-      return objGoo.CastFrom(goo) ? objGoo.Value : null;
-    }
+
+    SpeckleGeometryWrapperGoo objGoo = new();
+    return objGoo.CastFrom(goo) ? objGoo.Value : null;
  }

  /// <summary>
@@ -270,7 +266,9 @@ public static class GrasshopperHelpers

        for (int i = 0; i < elCount; i++)
        {
-          tree.EnsurePath(myPath).Add(new Grasshopper.Kernel.Types.GH_ObjectWrapper(subset[subsetCount + i]));
+          var item = subset[subsetCount + i];
+          // GH_ObjectWrapper accepts null to preserve tree structure for failed conversions (CNX-2855)
+          tree.EnsurePath(myPath).Add(item != null ? new GH_ObjectWrapper(item) : new GH_ObjectWrapper(null!));
        }

        subsetCount += elCount;
@@ -293,6 +291,13 @@ public static class GrasshopperHelpers
    {
      topology += myPath.ToString(false) + "-" + param.VolatileData.get_Branch(myPath).Count + " ";
    }
+
    return topology;
  }
+
+  /// <summary>
+  /// Converts Elements to Goo list, converting nulls to GH_ObjectWrapper(null) for topology preservation (CNX-2855)
+  /// </summary>
+  public static List<IGH_Goo> ToGooListWithNulls(this SpeckleCollectionWrapper coll) =>
+    coll.Elements.Select(e => e == null ? new GH_ObjectWrapper(null!) : ((SpeckleWrapper)e).CreateGoo()).ToList();
 }
@@ -4,6 +4,7 @@ using Speckle.Connectors.GrasshopperShared.Registration;
 using Speckle.Converters.Common;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
+using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Connectors.GrasshopperShared.HostApp;
@@ -29,13 +30,13 @@ public class SpeckleConversionContext(IRootToSpeckleConverter speckleConverter,
    }
  }

-  public static void SetupCurrent()
+  public static void SetupCurrent(IServiceScope? scope = null)
  {
    if (s_currentContext != null)
    {
      return;
    }
-    s_scope = PriorityLoader.CreateScopeForActiveDocument();
+    s_scope = scope ?? PriorityLoader.CreateScopeForActiveDocument();
    s_currentContext = s_scope.Get<SpeckleConversionContext>();
  }

@@ -50,7 +51,21 @@ public class SpeckleConversionContext(IRootToSpeckleConverter speckleConverter,
    s_scope = null;
  }

-  public Base ConvertToSpeckle(object geo) => speckleConverter.Convert(geo);
+  public Base? ConvertToSpeckle(object geo)
+  {
+    try
+    {
+      return speckleConverter.Convert(geo);
+    }
+    catch (ConversionException ex)
+    {
+      // changed as of CNX-2855
+      // log for debugging but don't throw - let caller handle null return
+      // we don't want to throw and fail whole operation, but want a way to signal to component that sumting wong
+      System.Diagnostics.Debug.WriteLine($"Conversion failed for {geo.GetType().Name}: {ex.Message}");
+      return null;
+    }
+  }

  public List<(object, Base)> ConvertToHost(Base input)
  {
@@ -60,6 +75,7 @@ public class SpeckleConversionContext(IRootToSpeckleConverter speckleConverter,
    {
      GeometryBase geometry => [(geometry, input)],
      List<GeometryBase> geometryList => geometryList.Select(o => ((object)o, input)).ToList(),
+      List<(GeometryBase, Base)> pairList when pairList.Count == 0 => [],
      IEnumerable<(GeometryBase, Base)> fallbackConversionResult
        => fallbackConversionResult.Select(o => ((object)o.Item1, o.Item2)).ToList(),
      object obj => [(obj, input)],
@@ -1,12 +1,20 @@
+using Microsoft.Extensions.Logging;
 using Rhino.Geometry;
 using Speckle.Connectors.Common.Operations.Receive;
 using Speckle.Connectors.GrasshopperShared.HostApp;
-using Speckle.Connectors.GrasshopperShared.Operations.Receive;
 using Speckle.Connectors.GrasshopperShared.Parameters;
+using Speckle.Converters.Common;
+using Speckle.Converters.Common.ToHost;
+using Speckle.Converters.Rhino;
 using Speckle.Sdk;
+using Speckle.Sdk.Common;
 using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Collections;
 using Speckle.Sdk.Models.GraphTraversal;
 using Speckle.Sdk.Models.Instances;
+using DataObject = Speckle.Objects.Data.DataObject;
+
+namespace Speckle.Connectors.GrasshopperShared.Operations.Receive;

 /// <summary>
 /// Handles conversion of atomic objects from TraversalContexts into Grasshopper wrapper objects.
@@ -19,184 +27,412 @@ using Speckle.Sdk.Models.Instances;
 internal sealed class LocalToGlobalMapHandler
 {
  public Dictionary<string, SpeckleGeometryWrapper> ConvertedObjectsMap { get; } = new();
-  public readonly GrasshopperCollectionRebuilder CollectionRebuilder;

-  private readonly TraversalContextUnpacker _traversalContextUnpacker;
-  private readonly GrasshopperColorUnpacker _colorUnpacker;
-  private readonly GrasshopperMaterialUnpacker _materialUnpacker;
+  // injected via constructor (DI-managed)
+  private readonly IDataObjectInstanceRegistry _dataObjectInstanceRegistry;
+  private readonly ILogger<LocalToGlobalMapHandler> _logger;
+  private readonly IConverterSettingsStore<RhinoConversionSettings> _settingsStore;
+
+  // set via Initialize() method (per-operation data)
+  private TraversalContextUnpacker _traversalContextUnpacker = null!;
+  private GrasshopperColorUnpacker _colorUnpacker = null!;
+  private GrasshopperMaterialUnpacker _materialUnpacker = null!;
+  private IReadOnlyCollection<InstanceDefinitionProxy>? _definitionProxies;
+
+  // auto property (fixes IDE0032)
+  public GrasshopperCollectionRebuilder CollectionRebuilder { get; private set; } = null!;

  public LocalToGlobalMapHandler(
+    IDataObjectInstanceRegistry dataObjectInstanceRegistry,
+    ILogger<LocalToGlobalMapHandler> logger,
+    IConverterSettingsStore<RhinoConversionSettings> settingsStore
+  )
+  {
+    _dataObjectInstanceRegistry = dataObjectInstanceRegistry;
+    _logger = logger;
+    _settingsStore = settingsStore;
+  }
+
+  /// <summary>
+  /// Initializes the handler with per-operation data.
+  /// Must be called before using ConvertAtomicObjects or ConvertBlockInstances.
+  /// </summary>
+  public LocalToGlobalMapHandler Initialize(
    TraversalContextUnpacker traversalContextUnpacker,
-    GrasshopperCollectionRebuilder collectionRebuilder,
    GrasshopperColorUnpacker colorUnpacker,
-    GrasshopperMaterialUnpacker materialUnpacker
+    GrasshopperMaterialUnpacker materialUnpacker,
+    GrasshopperCollectionRebuilder collectionRebuilder,
+    IReadOnlyCollection<InstanceDefinitionProxy>? definitionProxies
  )
  {
    _traversalContextUnpacker = traversalContextUnpacker;
    _colorUnpacker = colorUnpacker;
    _materialUnpacker = materialUnpacker;
    CollectionRebuilder = collectionRebuilder;
+    _definitionProxies = definitionProxies;
+
+    return this;
  }

  /// <summary>
-  /// Converts atomic object from TraversalContext to SpeckleObjectWrapper.
+  /// Converts all atomic objects in two passes:
+  /// Pass 1 - Convert normal objects and populate ConvertedObjectsMap
+  /// Pass 2 - Resolve registered DataObjects with InstanceProxies using the populated map
  /// </summary>
-  public void ConvertAtomicObject(TraversalContext atomicContext)
+  public void ConvertAtomicObjects(IEnumerable<TraversalContext> atomicContexts)
+  {
+    // Cache to avoid re-iterating for registered check
+    var atomicList = atomicContexts as IList<TraversalContext> ?? atomicContexts.ToList();
+
+    // Pass 1: Convert all non-registered DataObjects to populate ConvertedObjectsMap
+    foreach (var atomicContext in atomicList)
+    {
+      ConvertObjectToCache(atomicContext);
+    }
+
+    // Pass 2: Process registered DataObjects (definitions now available in ConvertedObjectsMap)
+    foreach (var atomicContext in atomicList)
+    {
+      if (atomicContext.Current is DataObject dataObject)
+      {
+        var dataObjectId = dataObject.applicationId ?? dataObject.id;
+        if (dataObjectId is not null && _dataObjectInstanceRegistry.IsRegistered(dataObjectId))
+        {
+          ResolveDataObjectInstanceProxies(atomicContext);
+        }
+      }
+    }
+  }
+
+  /// <summary>
+  /// Converts and caches an atomic object for later lookup.
+  /// Skips registered DataObjects (displayValue is InstanceProxy) - they are resolved in ResolveDataObjectInstanceProxies.
+  /// </summary>
+  private void ConvertObjectToCache(TraversalContext atomicContext)
  {
    var obj = atomicContext.Current;
    var objId = obj.applicationId ?? obj.id;

-    if (objId == null || ConvertedObjectsMap.ContainsKey(objId))
+    if (objId is null || ConvertedObjectsMap.ContainsKey(objId))
    {
      return;
    }

+    // skip registered DataObjects - they'll be processed in second pass
+    if (obj is DataObject dataObject)
+    {
+      var id = dataObject.applicationId ?? dataObject.id.NotNull();
+      if (_dataObjectInstanceRegistry.IsRegistered(id))
+      {
+        return;
+      }
+    }
+
    try
    {
      List<(object, Base)> converted = SpeckleConversionContext.Current.ConvertToHost(obj);

-      if (converted.Count == 0)
-      {
-        return;
-      }
-
+      // get path and collection
      var path = _traversalContextUnpacker.GetCollectionPath(atomicContext).ToList();
-
-      // Always create collection - consumed objects will be cleaned up later
      var objectCollection = CollectionRebuilder.GetOrCreateSpeckleCollectionFromPath(
        path,
        _colorUnpacker,
        _materialUnpacker
      );

-      if (obj is Speckle.Objects.Data.DataObject dataObject)
+      // nothing converted - nothing to do
+      if (converted.Count == 0)
      {
-        // get color and mat on dataobject first
-        Color? dataObjColor = _colorUnpacker.Cache.TryGetValue(
-          dataObject.applicationId ?? "",
-          out var cachedDataObjColor
-        )
-          ? cachedDataObjColor
-          : null;
-
-        SpeckleMaterialWrapper? dataObjMat = _materialUnpacker.Cache.TryGetValue(
-          dataObject.applicationId ?? "",
-          out var cachedDataObjMaterial
-        )
-          ? cachedDataObjMaterial
-          : null;
-
-        // get geometries
-        List<SpeckleGeometryWrapper> geometries = new();
-        foreach ((object convertedObj, Base original) in converted)
-        {
-          if (convertedObj is GeometryBase geometryBase)
-          {
-            SpeckleGeometryWrapper wrapper =
-              new()
-              {
-                Base = original,
-                GeometryBase = geometryBase,
-                Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
-                  ? cachedObjColor
-                  : dataObjColor,
-                Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
-                  ? cachedObjMaterial
-                  : dataObjMat,
-              };
-
-            geometries.Add(wrapper);
-          }
-        }
-
-        SpecklePropertyGroupGoo propertyGroup = new();
-        propertyGroup.CastFrom(dataObject.properties);
-
-        // remove the displayvalue of the original dataobject since these are now processed and stored on the wrapper
-        // to prevent storing of duplicate Base
-        dataObject.displayValue.Clear();
-
-        var dataObjectWrapper = new SpeckleDataObjectWrapper()
-        {
-          Base = dataObject,
-          Geometries = geometries,
-          Path = path.Select(p => p.name).ToList(),
-          Parent = objectCollection,
-          Name = dataObject.name,
-          Properties = propertyGroup,
-          ApplicationId = dataObject.applicationId,
-        };
-
-        // Add to collections (not to map since these won't be definition objects)
-        CollectionRebuilder.AppendSpeckleGrasshopperObject(dataObjectWrapper, path, _colorUnpacker, _materialUnpacker);
+        return;
      }
-      else
+
+      // handle normal DataObject (has converted geometry)
+      if (obj is DataObject normalDataObject)
      {
-        SpecklePropertyGroupGoo propertyGroup = new();
-        if (obj[Constants.PROPERTIES_PROP] is Dictionary<string, object?> props)
-        {
-          propertyGroup.CastFrom(props);
-        }
+        var geometries = ConvertToGeometryWrappers(converted);
+        var dataObjectWrapper = CreateDataObjectWrapper(normalDataObject, geometries, path, objectCollection);

-        foreach ((object convertedObj, Base original) in converted)
+        CollectionRebuilder.AppendSpeckleGrasshopperObject(dataObjectWrapper, path, _colorUnpacker, _materialUnpacker);
+        return;
+      }
+
+      // handle normal geometry (not DataObject)
+      SpecklePropertyGroupGoo propertyGroup = new();
+      if (obj[Constants.PROPERTIES_PROP] is Dictionary<string, object?> props)
+      {
+        propertyGroup.CastFrom(props);
+      }
+
+      foreach ((object convertedObj, Base original) in converted)
+      {
+        if (convertedObj is GeometryBase geometryBase)
        {
-          if (convertedObj is GeometryBase geometryBase)
+          var wrapper = new SpeckleGeometryWrapper()
          {
-            var wrapper = new SpeckleGeometryWrapper()
-            {
-              Base = original,
-              Path = path.Select(p => p.name).ToList(),
-              Parent = objectCollection,
-              GeometryBase = geometryBase,
-              Properties = propertyGroup,
-              Name = obj[Constants.NAME_PROP] as string ?? "",
-              Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
-                ? cachedObjColor
-                : null,
-              Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
-                ? cachedObjMaterial
-                : null,
-              ApplicationId = objId
-            };
+            Base = original,
+            Path = path.Select(p => p.name).ToList(),
+            Parent = objectCollection,
+            GeometryBase = geometryBase,
+            Properties = propertyGroup,
+            Name = obj[Constants.NAME_PROP] as string ?? "",
+            Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
+              ? cachedObjColor
+              : null,
+            Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
+              ? cachedObjMaterial
+              : null,
+            ApplicationId = objId
+          };

-            // Always add to both map and collections
-            ConvertedObjectsMap[objId] = wrapper;
-            CollectionRebuilder.AppendSpeckleGrasshopperObject(wrapper, path, _colorUnpacker, _materialUnpacker);
-          }
+          ConvertedObjectsMap[objId] = wrapper;
+          CollectionRebuilder.AppendSpeckleGrasshopperObject(wrapper, path, _colorUnpacker, _materialUnpacker);
        }
      }
    }
    catch (Exception ex) when (!ex.IsFatal())
    {
-      // TODO: throw?
+      // don't throw - continue processing other objects
+      _logger.LogError(ex, "Failed to convert object {objectId} of type {objectType}", objId, obj.speckle_type);
+    }
+  }
+
+  /// <summary>
+  /// Resolves a registered DataObject by transforming its InstanceProxy definition objects.
+  /// Requires definition objects to exist in ConvertedObjectsMap (populated by ConvertObjectToCache).
+  /// </summary>
+  private void ResolveDataObjectInstanceProxies(TraversalContext atomicContext)
+  {
+    var obj = atomicContext.Current;
+    if (obj is not DataObject dataObject)
+    {
+      return;
+    }
+
+    var dataObjectId = dataObject.applicationId ?? dataObject.id.NotNull();
+    if (!_dataObjectInstanceRegistry.IsRegistered(dataObjectId))
+    {
+      return;
+    }
+
+    try
+    {
+      var path = _traversalContextUnpacker.GetCollectionPath(atomicContext).ToList();
+      var objectCollection = CollectionRebuilder.GetOrCreateSpeckleCollectionFromPath(
+        path,
+        _colorUnpacker,
+        _materialUnpacker
+      );
+
+      var entry = _dataObjectInstanceRegistry.GetEntries()[dataObjectId];
+      var resolvedGeometries = ResolveInstanceProxiesToGeometries(entry.InstanceProxies);
+
+      var primitiveConverted = dataObject
+        .displayValue.Where(item => item is not InstanceProxy)
+        .SelectMany(item => SpeckleConversionContext.Current.ConvertToHost(item))
+        .ToList();
+
+      resolvedGeometries.AddRange(ConvertToGeometryWrappers(primitiveConverted));
+
+      var dataObjectWrapper = CreateDataObjectWrapper(dataObject, resolvedGeometries, path, objectCollection);
+
+      CollectionRebuilder.AppendSpeckleGrasshopperObject(dataObjectWrapper, path, _colorUnpacker, _materialUnpacker);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      // don't throw - continue processing other DataObjects
+      _logger.LogError(ex, "Failed to resolve DataObject {dataObjectId} with InstanceProxies", dataObjectId);
    }
  }

  /// <summary>
  /// Converts block instances and definitions from traversal contexts into Grasshopper wrapper objects.
+  /// Automatically filters out InstanceProxies belonging to registered DataObjects.
  /// Automatically handles cleanup of consumed objects from the collection hierarchy.
  /// </summary>
-  /// <remarks>
-  /// Deliberately handles both block conversion AND consumed object cleanup in a single operation.
-  /// Too much, I know, BUT it ensures the cleanup always occurs immediately after block processing without
-  /// requiring receive components to call a separate cleanup method in the correct order.
-  /// </remarks>
-  public void ConvertBlockInstances(
-    IReadOnlyCollection<TraversalContext> blocks,
-    IReadOnlyCollection<InstanceDefinitionProxy>? definitionProxies
-  )
+  public void ConvertBlockInstances(IReadOnlyCollection<TraversalContext> blockInstances)
  {
+    // build set of registered InstanceProxy IDs for fast lookup
+    var registeredProxyIds = new HashSet<string>();
+    foreach (var entry in _dataObjectInstanceRegistry.GetEntries().Values)
+    {
+      foreach (var proxy in entry.InstanceProxies)
+      {
+        var proxyId = proxy.applicationId ?? proxy.id;
+        if (proxyId is not null)
+        {
+          registeredProxyIds.Add(proxyId);
+        }
+      }
+    }
+
+    // filter out InstanceProxies that belong to registered DataObjects
+    var filteredBlockInstances = blockInstances
+      .Where(tc =>
+      {
+        if (tc.Current is InstanceProxy proxy)
+        {
+          var proxyId = proxy.applicationId ?? proxy.id;
+          return proxyId is null || !registeredProxyIds.Contains(proxyId);
+        }
+        return true;
+      })
+      .ToList();
+
    var blockUnpacker = new GrasshopperBlockUnpacker(_traversalContextUnpacker, _colorUnpacker, _materialUnpacker);

-    // Get consumed object IDs from unpacker
+    // get consumed object IDs from unpacker
    var consumedObjectIds = blockUnpacker.UnpackBlocks(
-      blocks,
-      definitionProxies,
+      filteredBlockInstances,
+      _definitionProxies,
      ConvertedObjectsMap,
      CollectionRebuilder
    );

-    // Clean up consumed objects from collections
+    // clean up consumed objects from collections
    CollectionRebuilder.RemoveConsumedObjects(consumedObjectIds);
  }
+
+  /// <summary>
+  /// Creates a DataObjectWrapper from a DataObject and its geometries.
+  /// Handles color/material inheritance and property extraction.
+  /// </summary>
+  private SpeckleDataObjectWrapper CreateDataObjectWrapper(
+    DataObject dataObject,
+    List<SpeckleGeometryWrapper> geometries,
+    List<Collection> path,
+    SpeckleCollectionWrapper objectCollection
+  )
+  {
+    // Get color and material on DataObject
+    Color? dataObjColor = _colorUnpacker.Cache.TryGetValue(dataObject.applicationId ?? "", out var cachedDataObjColor)
+      ? cachedDataObjColor
+      : null;
+
+    SpeckleMaterialWrapper? dataObjMat = _materialUnpacker.Cache.TryGetValue(
+      dataObject.applicationId ?? "",
+      out var cachedDataObjMaterial
+    )
+      ? cachedDataObjMaterial
+      : null;
+
+    // Apply DataObject color/material to geometries that don't have their own
+    foreach (var geometry in geometries)
+    {
+      geometry.Color ??= dataObjColor;
+      geometry.Material ??= dataObjMat;
+    }
+
+    // Create property group
+    SpecklePropertyGroupGoo propertyGroup = new();
+    propertyGroup.CastFrom(dataObject.properties);
+
+    // Clear the displayValue to prevent storing duplicate Base
+    dataObject.displayValue.Clear();
+
+    return new SpeckleDataObjectWrapper()
+    {
+      Base = dataObject,
+      Geometries = geometries,
+      Path = path.Select(p => p.name).ToList(),
+      Parent = objectCollection,
+      Name = dataObject.name,
+      Properties = propertyGroup,
+      ApplicationId = dataObject.applicationId,
+    };
+  }
+
+  /// <summary>
+  /// Resolves InstanceProxy displayValues to transformed geometries.
+  /// Returns the list of resolved geometries that can be used as DataObject displayValue replacements.
+  /// </summary>
+  private List<SpeckleGeometryWrapper> ResolveInstanceProxiesToGeometries(List<InstanceProxy> instanceProxies)
+  {
+    var resolvedGeometries = new List<SpeckleGeometryWrapper>();
+
+    // build a lookup of definitionId -> definition objects for quick access
+    var definitionObjectsMap = new Dictionary<string, List<string>>();
+    if (_definitionProxies is not null)
+    {
+      foreach (var defProxy in _definitionProxies)
+      {
+        var defId = defProxy.applicationId ?? defProxy.id;
+        if (defId is not null)
+        {
+          definitionObjectsMap[defId] = defProxy.objects;
+        }
+      }
+    }
+
+    foreach (var instanceProxy in instanceProxies)
+    {
+      // get the definition objects for this instance
+      if (!definitionObjectsMap.TryGetValue(instanceProxy.definitionId, out var definitionObjectIds))
+      {
+        continue; // definition not found, skip this proxy
+      }
+
+      // get transform from the instance proxy
+      var transform = GrasshopperHelpers.MatrixToTransform(instanceProxy.transform, instanceProxy.units);
+
+      // apply transform to each definition object
+      foreach (var objectId in definitionObjectIds)
+      {
+        if (ConvertedObjectsMap.TryGetValue(objectId, out var definitionObject))
+        {
+          // deep copy and transform the geometry
+          var transformedWrapper = definitionObject.DeepCopy();
+
+          // transform the GeometryBase
+          transformedWrapper.GeometryBase.NotNull().Transform(transform);
+
+          // keep Base and GeometryBase in sync (CNX-2847)
+          // Exception shouldn't ever happen for objects in ConvertedObjectsMap
+          transformedWrapper.Base =
+            SpeckleConversionContext.Current.ConvertToSpeckle(transformedWrapper.GeometryBase)
+            ?? throw new InvalidOperationException($"Failed to convert transformed geometry for object {objectId}");
+
+          // preserve metadata from original Base
+          transformedWrapper.Base.applicationId = definitionObject.Base.applicationId;
+          transformedWrapper.Base["units"] = _settingsStore.Current.SpeckleUnits;
+
+          resolvedGeometries.Add(transformedWrapper);
+        }
+      }
+    }
+
+    return resolvedGeometries;
+  }
+
+  /// <summary>
+  /// Converts the raw converted objects to SpeckleGeometryWrappers for DataObject display values.
+  /// Does NOT apply DataObject-level colors/materials - that's handled by CreateDataObjectWrapper.
+  /// </summary>
+  private List<SpeckleGeometryWrapper> ConvertToGeometryWrappers(List<(object, Base)> converted)
+  {
+    var geometries = new List<SpeckleGeometryWrapper>();
+
+    foreach ((object convertedObj, Base original) in converted)
+    {
+      if (convertedObj is GeometryBase geometryBase)
+      {
+        SpeckleGeometryWrapper wrapper =
+          new()
+          {
+            Base = original,
+            GeometryBase = geometryBase,
+            // try to get color/material from the individual geometry first
+            Color = _colorUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjColor)
+              ? cachedObjColor
+              : null,
+            Material = _materialUnpacker.Cache.TryGetValue(original.applicationId ?? "", out var cachedObjMaterial)
+              ? cachedObjMaterial
+              : null,
+          };
+
+        geometries.Add(wrapper);
+      }
+    }
+
+    return geometries;
+  }
 }
@@ -78,12 +78,18 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
    colorPacker.ProcessColor(wrapper.ApplicationId, wrapper.Color);
    materialPacker.ProcessMaterial(wrapper.ApplicationId, wrapper.Material);

+    int skippedNulls = 0;
+
    // iterate through this wrapper's elements to unwrap children
    // HashSet<string> collObjectIds = new();
-    foreach (ISpeckleCollectionObject element in wrapper.Elements)
+    foreach (ISpeckleCollectionObject? element in wrapper.Elements)
    {
      switch (element)
      {
+        case null:
+          // CNX-2855: count skipped nulls and obvs don't add to collection (can't send nulls)
+          skippedNulls++;
+          continue;
        case SpeckleCollectionWrapper collWrapper:
          // create an application id for this collection if none exists. This will be used for color and render material proxies
          collWrapper.ApplicationId ??= collWrapper.GetSpeckleApplicationId();
@@ -132,6 +138,13 @@ public class GrasshopperRootObjectBuilder : IRootObjectBuilder<SpeckleCollection
    }
    */

+    // clear topology when nulls are present - no simple way to preserve tree structure since Collection.elements
+    // doesn't support nulls on publish. Topology is GH-specific and optional, so clearing it is safe. (CNX-2855)
+    if (skippedNulls > 0)
+    {
+      targetCollection[Constants.TOPOLOGY_PROP] = null;
+    }
+
    return targetCollection;
  }

@@ -79,6 +79,9 @@ public class SpecklePropertyGoo : GH_Goo<object>, ISpecklePropertyGoo
      case int i:
        Value = i;
        return true;
+      case long l:
+        Value = l;
+        return true;
      case string s:
        Value = s;
        return true;
@@ -13,49 +13,61 @@ public partial class SpeckleBlockDefinitionWrapperGoo
    switch (source)
    {
      case InstanceDefinition instanceDefinition:
-        List<SpeckleGeometryWrapper> objects = new();
-        foreach (var defObj in instanceDefinition.GetObjects())
-        {
-          SpeckleGeometryWrapperGoo defObjGoo = new();
-          if (defObjGoo.CastFrom(defObj))
-          {
-            objects.Add(defObjGoo.Value);
-          }
-        }
-
-        if (objects.Count == 0)
-        {
-          return false;
-        }
-
-        SetValueFromDefinitionProps(objects, instanceDefinition.Name, instanceDefinition.Id.ToString());
-        return true;
+        return TryConvertDefinition(
+          instanceDefinition.GetObjects().Cast<object>(),
+          instanceDefinition.Name,
+          instanceDefinition.Id.ToString()
+        );

      case ModelInstanceDefinition modelInstanceDef:
-        List<SpeckleGeometryWrapper> defObjs = new();
-        foreach (var defObj in modelInstanceDef.Objects)
-        {
-          SpeckleGeometryWrapperGoo geoWrapperGoo = new();
-          if (geoWrapperGoo.CastFrom(defObj))
-          {
-            defObjs.Add(geoWrapperGoo.Value);
-          }
-        }
+        return TryConvertDefinition(
+          modelInstanceDef.Objects.Cast<object>(),
+          modelInstanceDef.Name,
+          modelInstanceDef.Id.ToString()
+        );

-        if (defObjs.Count == 0)
-        {
-          throw new InvalidOperationException(
-            $"Block definition '{modelInstanceDef.Name}' did not have any valid geometry."
-          );
-        }
-
-        SetValueFromDefinitionProps(defObjs, modelInstanceDef.Name, modelInstanceDef.Id.ToString());
-        return true;
      default:
        return false;
    }
  }

+  /// <summary>
+  /// Attempts to convert block definition objects to SpeckleGeometryWrappers.
+  /// Returns false if all objects are unsupported, true if at least one converts.
+  /// </summary>
+  private bool TryConvertDefinition(IEnumerable<object> definitionObjects, string definitionName, string definitionId)
+  {
+    var objects = definitionObjects as object[] ?? definitionObjects.ToArray();
+    int totalCount = objects.Length;
+    List<SpeckleGeometryWrapper> converted = new();
+
+    foreach (var defObj in objects)
+    {
+      SpeckleGeometryWrapperGoo defObjGoo = new();
+      if (defObjGoo.CastFrom(defObj))
+      {
+        converted.Add(defObjGoo.Value);
+      }
+    }
+
+    int skippedCount = totalCount - converted.Count;
+
+    // return false if nothing converted - Grasshopper handles this as warning (CNX-2855)
+    if (converted.Count == 0)
+    {
+      return false;
+    }
+
+    // show debug info if some objects skipped (CNX-2855)
+    if (skippedCount > 0)
+    {
+      System.Diagnostics.Debug.WriteLine($"Block '{definitionName}' skipped {skippedCount} unsupported object(s)");
+    }
+
+    SetValueFromDefinitionProps(converted, definitionName, definitionId);
+    return true;
+  }
+
  private void SetValueFromDefinitionProps(List<SpeckleGeometryWrapper> objs, string name, string id)
  {
    string validAppId = string.IsNullOrWhiteSpace(id) ? Guid.NewGuid().ToString() : id;
@@ -75,7 +75,13 @@ public partial class SpeckleBlockInstanceWrapperGoo : GH_Goo<SpeckleBlockInstanc
          return false;
        }

-        Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(instance);
+        Base? converted = SpeckleConversionContext.Current.ConvertToSpeckle(instance);
+
+        if (converted is null)
+        {
+          return false; // gh deals with false return from casting as warning 😎
+        }
+
        Value = new SpeckleBlockInstanceWrapper()
        {
          GeometryBase = instance,
@@ -51,7 +51,7 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
    }
  }

-  public List<ISpeckleCollectionObject> Elements { get; set; } = new();
+  public List<ISpeckleCollectionObject?> Elements { get; set; } = new();

  /// <summary>
  /// The Grasshopper Topology of this collection. This setter also sets the "topology" prop dynamically on <see cref="Collection"/>
@@ -92,6 +92,8 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
    {
      switch (element)
      {
+        case null:
+          continue; // skip nulls (CNX-2855)
        case SpeckleGeometryWrapper o:
          o.Path = newPath;
          o.Parent = this;
@@ -120,6 +122,7 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
        .Select(e =>
          e switch
          {
+            null => null, // preserve nulls (CNX-2855)
            SpeckleCollectionWrapper c => c.DeepCopy(),
            SpeckleBlockInstanceWrapper b => b.DeepCopy(),
            SpeckleGeometryWrapper o => o.DeepCopy(),
@@ -156,6 +159,11 @@ public class SpeckleCollectionWrapper : SpeckleWrapper, ISpeckleCollectionObject
    // then bake elements in this collection
    foreach (var obj in Elements)
    {
+      if (obj is null)
+      {
+        continue; // skip nulls (CNX-2855)
+      }
+
      if (obj is SpeckleGeometryWrapper so)
      {
        if (bakeObjects)
@@ -113,16 +113,18 @@ public class SpeckleCollectionParam : GH_Param<SpeckleCollectionWrapperGoo>, IGH
  {
    foreach (var element in collWrapper.Elements)
    {
-      if (element is SpeckleCollectionWrapper subCollWrapper)
+      switch (element)
      {
-        FlattenForPreview(subCollWrapper);
-      }
-
-      if (element is SpeckleGeometryWrapper objWrapper)
-      {
-        _previewObjects.Add(objWrapper);
-        var box = objWrapper.GeometryBase is null ? new() : objWrapper.GeometryBase.GetBoundingBox(false);
-        _clippingBox.Union(box);
+        case null:
+          continue; // skip nulls (CNX-2855)
+        case SpeckleCollectionWrapper subCollWrapper:
+          FlattenForPreview(subCollWrapper);
+          break;
+        case SpeckleGeometryWrapper objWrapper:
+          _previewObjects.Add(objWrapper);
+          var box = objWrapper.GeometryBase?.GetBoundingBox(false) ?? new BoundingBox();
+          _clippingBox.Union(box);
+          break;
      }
    }
  }
@@ -19,8 +19,8 @@ public partial class SpeckleDataObjectWrapperGoo : GH_Goo<SpeckleDataObjectWrapp
    switch (source)
    {
      case ModelObject modelObject:
-        var geometryWrapperGoo = new SpeckleGeometryWrapperGoo(modelObject);
-        if (geometryWrapperGoo.IsValid)
+        var geometryWrapperGoo = new SpeckleGeometryWrapperGoo();
+        if (geometryWrapperGoo.CastFrom(modelObject))
        {
          return CastFromSpeckleGeometryWrapper(geometryWrapperGoo.Value);
        }
@@ -192,6 +192,11 @@ public partial class SpeckleDataObjectWrapperGoo : GH_Goo<SpeckleDataObjectWrapp
    SpeckleGeometryWrapperGoo geoGoo = new();
    if (geoGoo.CastFrom(geometricGoo))
    {
+      // check if the geometry wrapper is valid before using it (CNX-2855)
+      if (!geoGoo.IsValid)
+      {
+        return false;
+      }
      return CastFromSpeckleGeometryWrapper(geoGoo.Value);
    }
    return false;
@@ -42,7 +42,12 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo<SpeckleGeometryWrapper>,
    }

    GeometryBase geometryBase = geometryGoo.ToGeometryBase();
-    Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(geometryBase);
+    Base? converted = SpeckleConversionContext.Current.ConvertToSpeckle(geometryBase);
+
+    if (converted is null)
+    {
+      return false; // gh deals with false return from casting as warning 😎
+    }

    // get layer, props, color, and mat
    SpeckleCollectionWrapper? collection = GetLayerCollectionFromModelObject(modelObject);
@@ -60,7 +60,13 @@ public partial class SpeckleGeometryWrapperGoo : GH_Goo<SpeckleGeometryWrapper>,
        return CastFromDataObject(dataObjectWrapper);
      case IGH_GeometricGoo geometricGoo:
        GeometryBase gb = geometricGoo.ToGeometryBase();
-        Base converted = SpeckleConversionContext.Current.ConvertToSpeckle(gb);
+        Base? converted = SpeckleConversionContext.Current.ConvertToSpeckle(gb);
+
+        if (converted is null)
+        {
+          return false; // gh deals with false return from casting as warning 😎
+        }
+
        string appId = Guid.NewGuid().ToString();
        Value = gb is InstanceReferenceGeometry instance
          ? new SpeckleBlockInstanceWrapper()
@@ -15,6 +15,7 @@ using Speckle.Connectors.GrasshopperShared.Operations.Send;
 using Speckle.Connectors.GrasshopperShared.Parameters;
 using Speckle.Connectors.GrasshopperShared.Properties;
 using Speckle.Converters.Common;
+using Speckle.Converters.Common.ToHost;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.GraphTraversal;
@@ -58,6 +59,8 @@ public class PriorityLoader : GH_AssemblyPriority
      services.AddTransient<GrasshopperReceiveOperation>();
      services.AddSingleton(DefaultTraversal.CreateTraversalFunc());
      services.AddTransient<TraversalContextUnpacker>();
+      services.AddScoped<IDataObjectInstanceRegistry, DataObjectInstanceRegistry>();
+      services.AddTransient<LocalToGlobalMapHandler>();

      // send
      services.AddTransient<IRootObjectBuilder<SpeckleCollectionWrapperGoo>, GrasshopperRootObjectBuilder>();
@@ -14,6 +14,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Components\BaseComponents\ValueSet.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\BaseComponents\VariableParameterComponentBase.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\Collections\CollectionPathsSelector.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Components\Collections\CollectionsByName.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\Collections\CreateCollection.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\Collections\ExpandCollection.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\Objects\ExpandSpeckleProperties.cs" />
@@ -41,7 +42,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)Components\Operations\Wizard\VersionMenuHandler.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\Operations\Wizard\WorkspaceMenuHandler.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\Operations\Wizard\SpeckleOperationWizard.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Components\SpecklePassthroughComponentBase.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Components\SpeckleSolveInstance.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\CollectionHelpers.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extras\StateTag.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\KeyWatcher.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\GrasshopperBlockUnpacker.cs" />
@@ -8,6 +8,7 @@
    <StartProgram>$(ProgramFiles)\Rhino $(RhinoVersion)\System\Rhino.exe</StartProgram>
    <EnableWindowsTargeting>true</EnableWindowsTargeting>
    <UseWpf>true</UseWpf>
+    <PlatformTarget>x64</PlatformTarget>
    <UseWindowsForms>true</UseWindowsForms>
    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
  </PropertyGroup>
@@ -183,6 +183,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -306,9 +327,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -341,7 +361,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.rhino7": {
@@ -401,36 +421,13 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
-      },
      "System.Resources.Extensions": {
        "type": "CentralTransitive",
        "requested": "[9.0.4, )",
@@ -7,14 +7,15 @@
    <TargetExt>.rhp</TargetExt>
    <StartProgram>$(ProgramFiles)\Rhino $(RhinoVersion)\System\Rhino.exe</StartProgram>
    <EnableWindowsTargeting>true</EnableWindowsTargeting>
+    <PlatformTarget>x64</PlatformTarget>
    <UseWpf>true</UseWpf>
    <UseWindowsForms>true</UseWindowsForms>
    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" />
-    <PackageReference Include="RhinoWindows" IncludeAssets="compile; build" PrivateAssets="all" />
+    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" VersionOverride="8.9.24194.18121"/>
+    <PackageReference Include="RhinoWindows" IncludeAssets="compile; build" PrivateAssets="all" VersionOverride="8.9.24194.18121"/>
  </ItemGroup>

  <ItemGroup>
@@ -183,6 +183,27 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.CSharp": "4.7.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -306,9 +327,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -341,7 +361,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.rhino8": {
@@ -400,36 +420,13 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
-          "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
-      },
      "System.Resources.Extensions": {
        "type": "CentralTransitive",
        "requested": "[9.0.4, )",
@@ -19,8 +19,8 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all" VersionOverride="8.21.25188.17001"/>
-    <PackageReference Include="RhinoWindows" IncludeAssets="compile; build" PrivateAssets="all" VersionOverride="8.21.25188.17001"/>
+    <PackageReference Include="RhinoCommon" IncludeAssets="compile; build" PrivateAssets="all"/>
+    <PackageReference Include="RhinoWindows" IncludeAssets="compile; build" PrivateAssets="all"/>
  </ItemGroup>

  <ItemGroup>
@@ -29,20 +29,20 @@
      },
      "RhinoCommon": {
        "type": "Direct",
-        "requested": "[8.21.25188.17001, )",
-        "resolved": "8.21.25188.17001",
-        "contentHash": "Wo6JXheyDBvilyIwDY6xZCQJC4170jzAlTSlMgh8yokUY+vYyCl4KJVXZofIOynNt/xx5wLqb2On5gZZekXR6w==",
+        "requested": "[8.25.25328.11001, )",
+        "resolved": "8.25.25328.11001",
+        "contentHash": "PDKR9GwqyUXUkTulV4J0dzDIf/aWqSJkL7nkS8ReAx8xhnt/+RQpE8gTjOSCmkSU2tjG6WzclowbTxwMTU7VAA==",
        "dependencies": {
          "System.Drawing.Common": "7.0.0"
        }
      },
      "RhinoWindows": {
        "type": "Direct",
-        "requested": "[8.21.25188.17001, )",
-        "resolved": "8.21.25188.17001",
-        "contentHash": "9zqCorcLRBeiW/j1RTwUS4E7bnZetAdA9WDdtd/AQccjOpxdtw76wdN+ciyQ6qslseWkwZ9qSBeh7QaM800Ntw==",
+        "requested": "[8.25.25328.11001, )",
+        "resolved": "8.25.25328.11001",
+        "contentHash": "I/+++piwtYTue+iAAQqcMF5QlontqwNnC7Leyhiv2FiF8JpAl6K44ZsJqB7ZEUC6ns0LDfa3mbFzQwUfHwYumQ==",
        "dependencies": {
-          "RhinoCommon": "[8.21.25188.17001]"
+          "RhinoCommon": "[8.25.25328.11001]"
        }
      },
      "Speckle.InterfaceGenerator": {
@@ -172,6 +172,25 @@
        "resolved": "13.0.2",
        "contentHash": "g1BejUZwax5PRfL6xHgLEK23sqHWOgOj9hE7RvfRRlN00AGt8GnPYt8HedSK7UB3HiRW8zCA9Pn0iiYxCK24BA=="
      },
+      "Speckle.Sdk": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "D04pCdleqLeDxthANCb8+X1xfEYr4+Q3GTuHtqOrMQeGHDAVPc5G3M0D6VYEUYbLYav0NBZ6tNuWO2Y/fqfWSw==",
+        "dependencies": {
+          "GraphQL.Client": "6.0.0",
+          "Microsoft.Data.Sqlite": "7.0.5",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
+          "Microsoft.Extensions.Logging": "2.2.0",
+          "Speckle.DoubleNumerics": "4.1.0",
+          "Speckle.Newtonsoft.Json": "13.0.2",
+          "Speckle.Sdk.Dependencies": "3.11.1"
+        }
+      },
+      "Speckle.Sdk.Dependencies": {
+        "type": "Transitive",
+        "resolved": "3.11.1",
+        "contentHash": "u8lJ+ECslmVPsn4yOCg3hAzj3zh6r+gp2oQh8RDGn22NihIPOsMhBFvoBruL1QVhXdJcS4rI2J6VEAbdvL9FRg=="
+      },
      "SQLitePCLRaw.bundle_e_sqlite3": {
        "type": "Transitive",
        "resolved": "2.1.4",
@@ -235,9 +254,8 @@
        "dependencies": {
          "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
          "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.9.0, )",
-          "Speckle.Sdk": "[3.9.0, )",
-          "Speckle.Sdk.Dependencies": "[3.9.0, )"
+          "Speckle.Converters.Common": "[1.0.0, )",
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.connectors.dui": {
@@ -261,7 +279,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "speckle.converters.rhino8": {
@@ -311,33 +329,12 @@
      },
      "Speckle.Objects": {
        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "fAOUhScCfDFVVynvipczjyw9RZlOgPOo8aH5A7EDAwZiDuDdd4EsnrqBCSPlmuoPYzY7hsN+5mfRkfw2rB36Ig==",
+        "requested": "[3.11.1, )",
+        "resolved": "3.11.1",
+        "contentHash": "JUCY3bA6Pa+fa6wZV9uQ9mhLRihvICkF58nIr28Yi94j0th7wSg4l8WeThl3ubKVnHDQE5mdVffVlY1e5ZUkuQ==",
        "dependencies": {
-          "Speckle.Sdk": "3.9.0"
+          "Speckle.Sdk": "3.11.1"
        }
-      },
-      "Speckle.Sdk": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "GtbvnySinrE6Canm6fVjyUOxs4G1bw0aRLs9oPVMdodOKc9TxIQjp1lzVBtr6Jli+nzIxtC86xP5J6r9tufnrQ==",
-        "dependencies": {
-          "GraphQL.Client": "6.0.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
-          "Speckle.DoubleNumerics": "4.1.0",
-          "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.9.0"
-        }
-      },
-      "Speckle.Sdk.Dependencies": {
-        "type": "CentralTransitive",
-        "requested": "[3.9.0, )",
-        "resolved": "3.9.0",
-        "contentHash": "m/3i+DX/1McN8ig0CcjmHM1BcNmNxgmny/735sKntzzDw23wdo868eOOTrogzmDoYHTyc7J4IjK+GE7iAyWn/g=="
      }
    },
    "net8.0-windows7.0/win-x64": {
@@ -0,0 +1,87 @@
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.Rhino.Extensions;
+using Speckle.Converters.Common;
+using Speckle.Converters.Common.ToHost;
+using Speckle.Converters.Rhino;
+using Speckle.Sdk;
+
+namespace Speckle.Connectors.Rhino.HostApp;
+
+/// <summary>
+/// Groups block instances created from DataObject with InstanceProxies as display values and applies DataObject metadata.
+/// </summary>
+public class DataObjectInstanceGrouper
+{
+  private readonly IConverterSettingsStore<RhinoConversionSettings> _converterSettings;
+  private readonly ILogger<DataObjectInstanceGrouper> _logger;
+  private readonly IDataObjectInstanceRegistry _dataObjectInstanceRegistry;
+
+  public DataObjectInstanceGrouper(
+    IConverterSettingsStore<RhinoConversionSettings> converterSettings,
+    ILogger<DataObjectInstanceGrouper> logger,
+    IDataObjectInstanceRegistry dataObjectInstanceRegistry
+  )
+  {
+    _converterSettings = converterSettings;
+    _logger = logger;
+    _dataObjectInstanceRegistry = dataObjectInstanceRegistry;
+  }
+
+  /// <summary>
+  /// After all instances have been created, we then run through the data object instance registry to see which instances
+  /// belonged to a data object. The method then groups all instances to "re-assemble" the original data object and
+  /// applies the properties of the data object on to the instances.
+  /// </summary>
+  /// <remarks>
+  /// This is a deferred action and can only occur once the RhinoInstanceBaker has done its thing.
+  /// </remarks>
+  public void GroupAndApplyProperties()
+  {
+    var doc = _converterSettings.Current.Document;
+    var entries = _dataObjectInstanceRegistry.GetEntries(); // see docstring
+
+    foreach (var kvp in entries)
+    {
+      var dataObjectId = kvp.Key;
+      var entry = kvp.Value;
+      try
+      {
+        var instanceIds = _dataObjectInstanceRegistry.GetInstanceIdsForDataObject(dataObjectId);
+        if (instanceIds.Count == 0)
+        {
+          continue;
+        }
+
+        // create group, name the group and apply properties
+        using var dataObjectAtts = entry.DataObject.GetAttributes();
+        var groupName = dataObjectAtts.Name;
+        var groupIndex = doc.Groups.Add(groupName, instanceIds.Select(id => new Guid(id)));
+
+        if (groupIndex >= 0)
+        {
+          // apply properties to each instance (doing this on an instance level because setting to group doesn't work)
+          foreach (var instanceId in instanceIds)
+          {
+            var rhinoObj = doc.Objects.FindId(new Guid(instanceId));
+            if (rhinoObj != null)
+            {
+              // set the name from DataObject
+              rhinoObj.Attributes.Name = dataObjectAtts.Name;
+
+              // copy all user strings
+              foreach (var key in dataObjectAtts.GetUserStrings().AllKeys)
+              {
+                rhinoObj.Attributes.SetUserString(key, dataObjectAtts.GetUserString(key));
+              }
+              rhinoObj.CommitChanges();
+            }
+          }
+        }
+      }
+      catch (Exception ex) when (!ex.IsFatal())
+      {
+        _logger.LogError(ex, "Failed to group DataObject instances {dataObjectId}", dataObjectId);
+      }
+    }
+  }
+}
--- a/Show More
+++ b/Show More