wip pipe implementation

Merge pull request #1222 from specklesystems/dev
dev -> main
2026-01-21 14:23:27 +00:00 · 2025-12-22 21:02:10 +07:00 · 2025-12-22 20:53:23 +07:00 · 2025-12-22 14:47:34 +01:00 · 2025-12-22 14:23:57 +01:00 · 2025-12-22 13:41:28 +01:00
195 changed files with 5926 additions and 3369 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": {
@@ -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.Services;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Sdk.Models.GraphTraversal;
@@ -52,6 +53,9 @@ public static class NavisworksConnectorServiceRegistration
    serviceCollection.AddScoped<NavisworksMaterialUnpacker>();
    serviceCollection.AddScoped<NavisworksColorUnpacker>();

+    // Register dual shared geometry stores for instancing pattern
+    serviceCollection.AddScoped<InstanceStoreManager>();
+
    serviceCollection.AddSingleton<IAppIdleManager, NavisworksIdleManager>();

    // Sending operations
@@ -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,49 @@ public class NavisworksColorUnpacker(
    var comSelection = ComBridge.ToInwOpSelection([modelItem]);
    try
    {
-      foreach (ComApi.InwOaPath path in comSelection.Paths())
+      var pathsCollection = comSelection.Paths();
+      try
      {
-        GC.KeepAlive(path);
-
-        foreach (ComApi.InwOaFragment3 fragment in path.Fragments())
+        foreach (ComApi.InwOaPath path in pathsCollection)
        {
-          GC.KeepAlive(fragment);
-
-          fragment.GenerateSimplePrimitives(ComApi.nwEVertexProperty.eNORMAL, primitiveChecker);
-
-          // Exit early if triangles are found
-          if (primitiveChecker.HasTriangles)
+          var fragmentsCollection = path.Fragments();
+          try
          {
-            return false;
+            foreach (ComApi.InwOaFragment3 fragment in fragmentsCollection.OfType<ComApi.InwOaFragment3>())
+            {
+              fragment.GenerateSimplePrimitives(ComApi.nwEVertexProperty.eNORMAL, primitiveChecker);
+
+              if (primitiveChecker.HasTriangles)
+              {
+                return false;
+              }
+            }
+          }
+          finally
+          {
+            if (fragmentsCollection != null)
+            {
+              System.Runtime.InteropServices.Marshal.ReleaseComObject(fragmentsCollection);
+            }
          }
        }
-      }

-      // Return true if any 2D primitives are found
-      return primitiveChecker.HasLines || primitiveChecker.HasPoints || primitiveChecker.HasSnapPoints;
+        return primitiveChecker.HasLines || primitiveChecker.HasPoints || primitiveChecker.HasSnapPoints;
+      }
+      finally
+      {
+        if (pathsCollection != null)
+        {
+          System.Runtime.InteropServices.Marshal.ReleaseComObject(pathsCollection);
+        }
+      }
    }
    finally
    {
-      System.Runtime.InteropServices.Marshal.ReleaseComObject(comSelection);
+      if (comSelection != null)
+      {
+        System.Runtime.InteropServices.Marshal.ReleaseComObject(comSelection);
+      }
    }
  }
 }
@@ -1,7 +1,11 @@
+using Autodesk.Navisworks.Api.ComApi;
+using Autodesk.Navisworks.Api.Interop.ComApi;
 using Microsoft.Extensions.Logging;
 using Speckle.Connector.Navisworks.Services;
+using Speckle.Converter.Navisworks.Constants;
 using Speckle.Converter.Navisworks.Helpers;
 using Speckle.Converter.Navisworks.Settings;
+using Speckle.Converter.Navisworks.ToSpeckle;
 using Speckle.Converters.Common;
 using Speckle.Objects.Other;
 using Speckle.Sdk;
@@ -11,12 +15,17 @@ namespace Speckle.Connector.Navisworks.HostApp;
 public class NavisworksMaterialUnpacker(
  ILogger<NavisworksMaterialUnpacker> logger,
  IConverterSettingsStore<NavisworksConversionSettings> converterSettings,
-  IElementSelectionService selectionService
+  IElementSelectionService selectionService,
+  GeometryToSpeckleConverter converter
 )
 {
-  // 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 +73,87 @@ public class NavisworksMaterialUnpacker(

        var navisworksObjectId = selectionService.GetModelItemPath(navisworksObject);
        var finalId = mergedIds.TryGetValue(navisworksObjectId, out var mergedId) ? mergedId : navisworksObjectId;
+
+        string hashId = "";
+        try
+        {
+          var item = selectionService.GetModelItemFromPath(finalId);
+          var comSelection = ComApiBridge.ToInwOpSelection([item]);
+          try
+          {
+            var paths = comSelection.Paths();
+            try
+            {
+              if (paths.Count > 0)
+              {
+                var firstPath = paths.OfType<InwOaPath>().FirstOrDefault();
+                if (firstPath != null)
+                {
+                  var fragments = firstPath.Fragments();
+                  try
+                  {
+                    if (fragments.Count > 1)
+                    {
+                      var fragmentId = converter.GenerateFragmentId(paths);
+                      hashId = $"{InstanceConstants.GEOMETRY_ID_PREFIX}{fragmentId}";
+                    }
+                  }
+                  finally
+                  {
+                    if (fragments != null)
+                    {
+                      System.Runtime.InteropServices.Marshal.ReleaseComObject(fragments);
+                    }
+                  }
+                }
+              }
+            }
+            finally
+            {
+              if (paths != null)
+              {
+                System.Runtime.InteropServices.Marshal.ReleaseComObject(paths);
+              }
+            }
+          }
+          finally
+          {
+            if (comSelection != null)
+            {
+              System.Runtime.InteropServices.Marshal.ReleaseComObject(comSelection);
+            }
+          }
+        }
+        catch (Exception ex) when (!ex.IsFatal())
+        { // If COM interop fails during hash generation, fall back to using finalId
+          logger.LogWarning(
+            ex,
+            "Failed to generate fragment hash ID for item {ItemId}, using finalId as fallback",
+            finalId
+          );
+          hashId = "";
+        }
+
        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 +162,8 @@ public class NavisworksMaterialUnpacker(
        );

        var materialName =
-          $"NavisworksMaterial_{Math.Abs(ColorConverter.NavisworksColorToColor(renderColor).ToArgb())}";
+          $"{MaterialConstants.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 +175,6 @@ public class NavisworksMaterialUnpacker(
          }
        }

-        // Check Material category for material name
        var materialPropertyCategory = navisworksObject.PropertyCategories.FindCategoryByDisplayName("Material");
        if (materialPropertyCategory != null)
        {
@@ -120,19 +188,14 @@ public class NavisworksMaterialUnpacker(

        if (renderMaterialProxies.TryGetValue(renderMaterialId.ToString(), out RenderMaterialProxy? value))
        {
-          value.objects.Add(finalId);
+          value.objects.Add(!string.IsNullOrEmpty(hashId) ? hashId : finalId);
        }
        else
        {
          renderMaterialProxies[renderMaterialId.ToString()] = new RenderMaterialProxy()
          {
-            value = ConvertRenderColorAndTransparencyToSpeckle(
-              materialName,
-              renderTransparency,
-              renderColor,
-              renderMaterialId
-            ),
-            objects = [finalId]
+            value = CreateRenderMaterial(materialName, renderTransparency, renderColor, renderMaterialId),
+            objects = [!string.IsNullOrEmpty(hashId) ? hashId : finalId]
          };
        }
      }
@@ -145,7 +208,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 +219,9 @@ public class NavisworksMaterialUnpacker(

    var speckleRenderMaterial = new RenderMaterial()
    {
-      name = !string.IsNullOrEmpty(name) ? name : $"NavisworksMaterial_{Math.Abs(color.ToArgb())}",
+      name = !string.IsNullOrEmpty(name)
+        ? name
+        : $"{MaterialConstants.DEFAULT_MATERIAL_NAME_PREFIX}{Math.Abs(color.ToArgb())}",
      opacity = 1 - transparency,
      metalness = 0,
      roughness = 1,
@@ -6,6 +6,7 @@ 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;
@@ -25,7 +26,9 @@ public class NavisworksRootObjectBuilder(
  ISdkActivityFactory activityFactory,
  NavisworksMaterialUnpacker materialUnpacker,
  NavisworksColorUnpacker colorUnpacker,
-  IElementSelectionService elementSelectionService
+  IElementSelectionService elementSelectionService,
+  IUiUnitsCache uiUnitsCache,
+  InstanceStoreManager instanceStoreManager
 ) : IRootObjectBuilder<NAV.ModelItem>
 {
  private bool SkipNodeMerging { get; set; }
@@ -40,32 +43,45 @@ 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;
+    SkipNodeMerging = true;
 #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);

    var groupedNodes = SkipNodeMerging ? [] : GroupSiblingGeometryNodes(navisworksModelItems);
    var finalElements = BuildFinalElements(convertedElements, groupedNodes);
+    List<Base> geometryDefinitions = instanceStoreManager.GetGeometryDefinitions();

    await AddProxiesToCollection(rootCollection, navisworksModelItems, groupedNodes);

-    rootCollection.elements = finalElements;
+    var geometryDefinitionsCollection = new Collection
+    {
+      name = "Geometry Definitions",
+      ["units"] = converterSettings.Current.Derived.SpeckleUnits,
+      elements = geometryDefinitions
+    };
+
+    var mainElementsCollection = new Collection
+    {
+      name = rootCollection.name,
+      ["units"] = converterSettings.Current.Derived.SpeckleUnits,
+      elements = finalElements
+    };
+
+    rootCollection.elements = [mainElementsCollection];
+    if (geometryDefinitions.Count > 0)
+    {
+      rootCollection.elements.Add(geometryDefinitionsCollection);
+    }
+
    return new RootObjectBuilderResult(rootCollection, conversionResults);
  }

@@ -137,12 +153,10 @@ 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 (converterSettings.Current.User.PreserveModelHierarchy)
    {
      var hierarchyBuilder = new NavisworksHierarchyBuilder(
@@ -151,12 +165,9 @@ public class NavisworksRootObjectBuilder(
        elementSelectionService
      );

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

-    // Otherwise continue with flat mode
    AddRemainingElements(finalElements, convertedBases, processedPaths);
    return finalElements;
  }
@@ -213,24 +224,17 @@ 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);

    return new NavisworksObject
    {
@@ -238,16 +242,11 @@ public class NavisworksRootObjectBuilder(
      displayValue = siblingBases.SelectMany(b => b["displayValue"] as List<Base> ?? []).ToList(),
      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 +254,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
    };
@@ -288,18 +289,16 @@ public class NavisworksRootObjectBuilder(
      rootCollection[ProxyKeys.COLOR] = colors;
    }

+    var instanceDefinitionProxies = instanceStoreManager.GetInstanceDefinitionProxies();
+
+    if (instanceDefinitionProxies.Count > 0)
+    {
+      rootCollection[ProxyKeys.INSTANCE_DEFINITION] = instanceDefinitionProxies.ToList();
+    }
+
    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 SendConversionResult ConvertNavisworksItem(
    NAV.ModelItem navisworksItem,
    Dictionary<string, Base?> convertedBases,
@@ -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": {
@@ -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": {
@@ -94,7 +94,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding

  public List<ISendFilter> GetSendFilters() =>
    [
-      new RevitSelectionFilter() { IsDefault = true },
+      new RevitSelectionFilter { IsDefault = true },
      new RevitViewsFilter(_revitContext),
      new RevitCategoriesFilter(_revitContext)
    ];
@@ -58,6 +58,7 @@ public static class ServiceRegistration
    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 +75,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();
@@ -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;
+  }
+}
@@ -24,6 +24,7 @@ public class RevitRootObjectBuilder(
  ISendConversionCache sendConversionCache,
  ElementUnpacker elementUnpacker,
  LevelUnpacker levelUnpacker,
+  ViewUnpacker viewUnpacker,
  IThreadContext threadContext,
  SendCollectionManager sendCollectionManager,
  ILogger<RevitRootObjectBuilder> logger,
@@ -41,7 +42,11 @@ public class RevitRootObjectBuilder(
      () => Task.FromResult(BuildSync(documentElementContexts, projectId, onOperationProgressed, ct))
    );

+#pragma warning disable CA1506
+#pragma warning disable CA1502
  private RootObjectBuilderResult BuildSync(
+#pragma warning restore CA1506
+#pragma warning restore CA1502
    IReadOnlyList<DocumentToConvert> documentElementContexts,
    string projectId,
    IProgress<CardProgress> onOperationProgressed,
@@ -55,6 +60,9 @@ public class RevitRootObjectBuilder(
      throw new SpeckleException("Family Environment documents are not supported.");
    }

+    // create a new send pipeline
+    using var sendPipeline = new Speckle.Sdk.Pipeline.Send();
+
    // init the root
    Collection rootObject =
      new() { name = converterSettings.Current.Document.PathName.Split('\\').Last().Split('.').First() };
@@ -183,10 +191,12 @@ public class RevitRootObjectBuilder(
            // non-transformed elements can safely rely on cache
            // TODO: Potential here to transform cached objects and NOT reconvert,
            // TODO: we wont do !hasTransform here, and re-set application id before this
-
+            bool wasCached = false;
            if (!hasTransform && sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
            {
+              // TODO: cahce hit
              converted = value;
+              wasCached = true;
              cacheHitCount++;
            }
            // not in cache means we convert
@@ -205,6 +215,12 @@ public class RevitRootObjectBuilder(
              converted.applicationId = applicationId;
            }

+            var reference = sendPipeline.Process(converted).Result; // .Wait(cancellationToken);//.ConfigureAwait(false);
+            if (!wasCached)
+            {
+              sendConversionCache.AppendSendResult(projectId, applicationId, reference);
+            }
+
            var collection = sendCollectionManager.GetAndCreateObjectHostCollection(
              revitElement,
              rootObject,
@@ -212,7 +228,7 @@ public class RevitRootObjectBuilder(
              modelDisplayName
            );

-            collection.elements.Add(converted);
+            collection.elements.Add(reference);
            results.Add(new(Status.SUCCESS, applicationId, sourceType, converted));
          }
          catch (Exception ex) when (!ex.IsFatal())
@@ -240,6 +256,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);

@@ -252,13 +269,27 @@ public class RevitRootObjectBuilder(
    rootObject[ProxyKeys.INSTANCE_DEFINITION] = revitToSpeckleCacheSingleton.GetInstanceDefinitionProxiesForObjects(
      idsAndSubElementIds
    );
-    rootObject.elements.Add(
-      new Collection()
-      {
-        elements = revitToSpeckleCacheSingleton.GetBaseObjectsForObjects(idsAndSubElementIds),
-        name = "revitInstancedObjects"
-      }
-    );
+    // NOTE: i might be overdoing things in here, but tldr:
+    // - all instance objects (meshes) are processed individually
+    // - process their collection individually, and then attach it to the root collection
+    // we could, theoretically, just process the collection as a whole (but it can be big?)
+    // note/ask: do these need to go in the conversion cache? or not?
+    var instanceObjects = revitToSpeckleCacheSingleton.GetBaseObjectsForObjects(idsAndSubElementIds);
+    var instanceReferences = new Collection("revitInstancedObjects");
+    foreach (var instanceObject in instanceObjects)
+    {
+      var referenceInstanceObject = sendPipeline.Process(instanceObject).Result;
+      instanceReferences.elements.Add(referenceInstanceObject);
+    }
+    var instanceReferenceCollection = sendPipeline.Process(instanceReferences).Result;
+    rootObject.elements.Add(instanceReferenceCollection);
+
+    // 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;
@@ -270,6 +301,10 @@ public class RevitRootObjectBuilder(
      rootObject[RootKeys.REFERENCE_POINT_TRANSFORM] = transformMatrix;
    }

-    return new RootObjectBuilderResult(rootObject, results);
+    // NOTE: could be
+    sendPipeline.Process(rootObject).Wait(cancellationToken);
+    sendPipeline.WaitForUpload().Wait(cancellationToken);
+
+    return new RootObjectBuilderResult(new Collection() { name = "ignore" }, results);
  }
 }
@@ -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" />
@@ -60,4 +61,4 @@
    <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));
      }
@@ -48,6 +48,7 @@ public class CreateCollection : VariableParameterComponentBase
  protected override void SolveInstance(IGH_DataAccess dataAccess)
  {
    var rootCollection = CreateRootCollection();
+    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))
    {
      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(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,9 +217,20 @@ 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++;
      }
    }
+
+    // add warning if objects were skipped (CNX-2855)
+    if (skippedCount > 0)
+    {
+      AddRuntimeMessage(
+        GH_RuntimeMessageLevel.Warning,
+        $"Skipped {skippedCount} unsupported object(s) (Leaders, TextDots, Dimensions, etc.)"
+      );
+    }
  }

  /// <summary>
@@ -222,6 +266,8 @@ public class CreateCollection : VariableParameterComponentBase
    {
      switch (element)
      {
+        case null:
+          break; // skip nulls (CNX-2855)
        case SpeckleCollectionWrapper childCollection:
          // recurse into child collections
          ProcessAndCheckForDuplicateApplicationIds(childCollection, seenIds, duplicateIds);
@@ -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) { }

@@ -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
@@ -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)
@@ -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,404 @@ 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 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>();
@@ -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);
+      }
+    }
+  }
+}
@@ -6,6 +6,7 @@ using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Instances;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Rhino.Extensions;
+using Speckle.Converters.Common.ToHost;
 using Speckle.DoubleNumerics;
 using Speckle.Sdk;
 using Speckle.Sdk.Common;
@@ -22,18 +23,21 @@ public class RhinoInstanceBaker : IInstanceBaker<IReadOnlyCollection<string>>
  private readonly RhinoLayerBaker _layerBaker;
  private readonly RhinoColorBaker _colorBaker;
  private readonly ILogger<RhinoInstanceBaker> _logger;
+  private readonly IDataObjectInstanceRegistry _dataObjectInstanceRegistry;

  public RhinoInstanceBaker(
    RhinoLayerBaker layerBaker,
    RhinoMaterialBaker rhinoMaterialBaker,
    RhinoColorBaker colorBaker,
-    ILogger<RhinoInstanceBaker> logger
+    ILogger<RhinoInstanceBaker> logger,
+    IDataObjectInstanceRegistry dataObjectInstanceRegistry
  )
  {
    _layerBaker = layerBaker;
    _materialBaker = rhinoMaterialBaker;
    _colorBaker = colorBaker;
    _logger = logger;
+    _dataObjectInstanceRegistry = dataObjectInstanceRegistry;
  }

  /// <summary>
@@ -155,6 +159,9 @@ public class RhinoInstanceBaker : IInstanceBaker<IReadOnlyCollection<string>>
          applicationIdMap[instanceProxyId] = new List<string>() { id.ToString() };
          createdObjectIds.Add(id.ToString());
          conversionResults.Add(new(Status.SUCCESS, instanceProxy, id.ToString(), "Instance (Block)"));
+
+          // link this baked instance back to its DataObject if it came from one (the method handles the check)
+          _dataObjectInstanceRegistry.LinkInstanceToDataObject(instanceProxyId, id.ToString());
        }
      }
      catch (Exception ex) when (!ex.IsFatal())
@@ -123,6 +123,12 @@ public class RhinoLayerBaker : TraversalContextUnpacker
      }

      var cleanNewLayerName = RhinoUtils.CleanLayerName(collection.name);
+
+      if (!ModelComponent.IsValidComponentName(cleanNewLayerName))
+      {
+        throw new SpeckleException($"Layer name '{currentLayerName}' is not valid");
+      }
+
      Layer newLayer = new() { Name = cleanNewLayerName, ParentLayerId = previousLayer?.Id ?? Guid.Empty };

      // set material
@@ -150,7 +156,7 @@ public class RhinoLayerBaker : TraversalContextUnpacker
      int index = currentDocument.Layers.Add(newLayer);
      if (index == -1)
      {
-        throw new SpeckleException($"Could not create layer '{currentLayerName}'.");
+        throw new SpeckleException($"Could not create layer '{currentLayerName}'");
      }

      _hostLayerCache.Add(currentLayerName, index);
@@ -1,27 +1,41 @@
+using System.Text;
+
 namespace Speckle.Connectors.Rhino.HostApp;

 public static class RhinoUtils
 {
-  public static string CleanBlockDefinitionName(string str)
-  {
-    return ReplaceChars(str, @"\/", "_");
-  }
+  private static readonly HashSet<char> s_skipChars = ['[', ']', '(', ')', '{', '}'];
+  private static readonly HashSet<char> s_replaceWithHyphen = [':', ';'];
+
+  public static string CleanBlockDefinitionName(string str) => str.Replace('/', '_').Replace('\\', '_');

  // Cleans up layer names to be "rhino" proof. Note this can be improved, as "()[] and {}" are illegal only at the start.
  // https://docs.mcneel.com/rhino/6/help/en-us/index.htm#information/namingconventions.htm?Highlight=naming
  public static string CleanLayerName(string str)
  {
-    str = ReplaceChars(str, @"[](){}", "");
-    return ReplaceChars(str, @":;", "-");
-  }
+    var sb = new StringBuilder(str.Length);

-  private static string ReplaceChars(string str, string invalidChars, string replaceString)
-  {
-    foreach (char c in invalidChars)
+    foreach (char c in str)
    {
-      str = str.Replace(c.ToString(), replaceString);
+      if (char.IsControl(c))
+      {
+        continue; // skip control characters (shoutout cnx-2809)
+      }
+
+      if (s_skipChars.Contains(c))
+      {
+        continue; // skip brackets
+      }
+
+      if (s_replaceWithHyphen.Contains(c))
+      {
+        sb.Append('-');
+        continue;
+      }
+
+      sb.Append(c);
    }

-    return str;
+    return sb.ToString();
  }
 }
@@ -0,0 +1,65 @@
+using Microsoft.Extensions.Logging;
+using Rhino.DocObjects;
+using Rhino.DocObjects.Tables;
+using Speckle.Converters.Common;
+using Speckle.Objects.Other;
+using Speckle.Sdk;
+
+namespace Speckle.Connectors.Rhino.HostApp;
+
+public class RhinoViewUnpacker
+{
+  private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
+  private readonly ILogger<RhinoViewUnpacker> _logger;
+
+  public RhinoViewUnpacker(IRootToSpeckleConverter rootToSpeckleConverter, ILogger<RhinoViewUnpacker> logger)
+  {
+    _rootToSpeckleConverter = rootToSpeckleConverter;
+    _logger = logger;
+  }
+
+  private Camera? ConvertViewToCamera(ViewInfo view)
+  {
+    try
+    {
+      var converted = (Speckle.Objects.Other.Camera)_rootToSpeckleConverter.Convert(view);
+      if (converted is null)
+      {
+        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 a given set of rhino named views to create proxies
+  /// </summary>
+  /// <param name="views">current document named views</param>
+  /// <returns></returns>
+  public List<Camera> UnpackViews(NamedViewTable views)
+  {
+    List<Camera> cameras = new();
+    foreach (ViewInfo view in views)
+    {
+      // skip isometric views for now.
+      // getting the orthographic match between host apps and the viewer requires too much effort atm.
+      if (view.Viewport.IsParallelProjection)
+      {
+        continue;
+      }
+
+      if (ConvertViewToCamera(view) is Camera camera)
+      {
+        cameras.Add(camera);
+      }
+    }
+
+    return cameras;
+  }
+}
@@ -10,6 +10,7 @@ using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.Rhino.Extensions;
 using Speckle.Connectors.Rhino.HostApp;
 using Speckle.Converters.Common;
+using Speckle.Converters.Common.ToHost;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk.Common;
 using Speckle.Sdk.Common.Exceptions;
@@ -36,6 +37,8 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
  private readonly ISdkActivityFactory _activityFactory;
  private readonly IThreadContext _threadContext;
  private readonly IReceiveConversionHandler _conversionHandler;
+  private readonly IDataObjectInstanceRegistry _dataObjectInstanceRegistry;
+  private readonly DataObjectInstanceGrouper _dataObjectInstanceGrouper;

  public RhinoHostObjectBuilder(
    IRootToHostConverter converter,
@@ -48,7 +51,9 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
    RhinoGroupBaker groupBaker,
    ISdkActivityFactory activityFactory,
    IThreadContext threadContext,
-    IReceiveConversionHandler conversionHandler
+    IReceiveConversionHandler conversionHandler,
+    IDataObjectInstanceRegistry dataObjectInstanceRegistry,
+    DataObjectInstanceGrouper dataObjectInstanceGrouper
  )
  {
    _converter = converter;
@@ -62,6 +67,8 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
    _activityFactory = activityFactory;
    _threadContext = threadContext;
    _conversionHandler = conversionHandler;
+    _dataObjectInstanceRegistry = dataObjectInstanceRegistry;
+    _dataObjectInstanceGrouper = dataObjectInstanceGrouper;
  }

 #pragma warning disable CA1506
@@ -188,8 +195,14 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder

          if (conversionIds.Count == 0)
          {
-            // TODO: add this condition to report object - same as in autocad
-            throw new ConversionException("Object did not convert to any native geometry");
+            // Don't throw if this DataObject was registered for instance baking
+
+            if (!_dataObjectInstanceRegistry.IsRegistered(obj.applicationId ?? obj.id.NotNull()))
+            {
+              throw new ConversionException("Object did not convert to any native geometry");
+            }
+            // Skip normal processing - will be handled by DataObjectInstanceGrouper
+            return;
          }

          // 4: log
@@ -232,7 +245,10 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
      conversionResults.UnionWith(instanceConversionResults); // add instance conversion results to our list
    }

-    // 7 - Create groups
+    // 7.1 Group DataObject instances and apply metadata
+    _dataObjectInstanceGrouper.GroupAndApplyProperties();
+
+    // 7.2 Normal group creation
    if (unpackedRoot.GroupProxies is not null)
    {
      _groupBaker.BakeGroups(unpackedRoot.GroupProxies, applicationIdMap, baseLayerName);
@@ -244,6 +260,9 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder

  private void PreReceiveDeepClean(string baseLayerName)
  {
+    // Clear DataObject instance registry at start of new build
+    _dataObjectInstanceRegistry.Clear();
+
    // Remove all previously received layers and render materials from the document
    int rootLayerIndex = _converterSettings.Current.Document.Layers.Find(
      Guid.Empty,
@@ -354,7 +373,7 @@ public class RhinoHostObjectBuilder : IHostObjectBuilder
    if (objCount > 1)
    {
      var groupIndex = _converterSettings.Current.Document.Groups.Add(
-        $@"{originatingObject.speckle_type.Split('.').Last()} - {parentId}  ({baseLayerName})",
+        $"{originatingObject.speckle_type.Split('.').Last()} - {parentId}  ({baseLayerName})",
        objectIds
      );

@@ -33,6 +33,7 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
  private readonly RhinoGroupUnpacker _groupUnpacker;
  private readonly RhinoMaterialUnpacker _materialUnpacker;
  private readonly RhinoColorUnpacker _colorUnpacker;
+  private readonly RhinoViewUnpacker _viewUnpacker;
  private readonly PropertiesExtractor _propertiesExtractor;
  private readonly ILogger<RhinoRootObjectBuilder> _logger;
  private readonly ISdkActivityFactory _activityFactory;
@@ -46,6 +47,7 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
    RhinoGroupUnpacker groupUnpacker,
    RhinoMaterialUnpacker materialUnpacker,
    RhinoColorUnpacker colorUnpacker,
+    RhinoViewUnpacker viewUnpacker,
    PropertiesExtractor propertiesExtractor,
    ILogger<RhinoRootObjectBuilder> logger,
    ISdkActivityFactory activityFactory
@@ -59,6 +61,7 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
    _rootToSpeckleConverter = rootToSpeckleConverter;
    _materialUnpacker = materialUnpacker;
    _colorUnpacker = colorUnpacker;
+    _viewUnpacker = viewUnpacker;
    _propertiesExtractor = propertiesExtractor;
    _logger = logger;
    _activityFactory = activityFactory;
@@ -72,6 +75,8 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
  )
  {
    using var activity = _activityFactory.Start("Build");
+    using var sendPipeline = new Speckle.Sdk.Pipeline.Send();
+
    // 0 - Init the root
    Collection rootObjectCollection = new() { name = _converterSettings.Current.Document.Name ?? "Unnamed document" };
    rootObjectCollection["units"] = _converterSettings.Current.SpeckleUnits;
@@ -94,6 +99,7 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
    // 3 - Convert atomic objects
    List<SendConversionResult> results = new(atomicObjects.Count);
    int count = 0;
+
    using (var _ = _activityFactory.Start("Convert all"))
    {
      foreach (RhinoObject rhinoObject in atomicObjects)
@@ -105,9 +111,8 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
        Layer layer = _converterSettings.Current.Document.Layers[rhinoObject.Attributes.LayerIndex];
        Collection collectionHost = _layerUnpacker.GetHostObjectCollection(layer, rootObjectCollection);

-        var result = ConvertRhinoObject(rhinoObject, collectionHost, instanceProxies, projectId);
+        var result = await ConvertRhinoObject(rhinoObject, collectionHost, instanceProxies, projectId, sendPipeline);
        results.Add(result);
-
        ++count;
        onOperationProgressed.Report(new("Converting", (double)count / atomicObjects.Count));
        await Task.Yield();
@@ -122,32 +127,47 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
      throw new SpeckleException("Failed to convert all objects."); // fail fast instead creating empty commit! It will appear as model card error with red color.
    }

+    // 4 - Unpack all proxies for the root
    // Get all layers from the created collections on the root object commit for proxy processing
    List<Layer> layers = _layerUnpacker.GetUsedLayers().ToList();

    using (var _ = _activityFactory.Start("UnpackRenderMaterials"))
    {
-      // 4 - Unpack the render material proxies
      rootObjectCollection[ProxyKeys.RENDER_MATERIAL] = _materialUnpacker.UnpackRenderMaterials(atomicObjects, layers);
    }
+
    using (var _ = _activityFactory.Start("UnpackColors"))
    {
-      // 5 - Unpack the color proxies
      rootObjectCollection[ProxyKeys.COLOR] = _colorUnpacker.UnpackColors(atomicObjects, layers);
    }

-    return new RootObjectBuilderResult(rootObjectCollection, results);
+    // 5 - Unpack all other objects for the root
+    using (var _ = _activityFactory.Start("UnpackViews"))
+    {
+      List<Objects.Other.Camera> views = _viewUnpacker.UnpackViews(_converterSettings.Current.Document.NamedViews);
+      if (views.Count > 0)
+      {
+        rootObjectCollection[RootKeys.VIEW] = views;
+      }
+    }
+
+    await sendPipeline.Process(rootObjectCollection);
+    await sendPipeline.WaitForUpload();
+
+    return new RootObjectBuilderResult(new Collection() { name = "ignore" }, results);
  }

-  private SendConversionResult ConvertRhinoObject(
+  private async Task<SendConversionResult> ConvertRhinoObject(
    RhinoObject rhinoObject,
    Collection collectionHost,
    IReadOnlyDictionary<string, InstanceProxy> instanceProxies,
-    string projectId
+    string projectId,
+    Sdk.Pipeline.Send sendPipeline
  )
  {
    string applicationId = rhinoObject.Id.ToString();
    string sourceType = rhinoObject.ObjectType.ToString();
+    bool wasCached = false;
    try
    {
      // get from cache or convert:
@@ -161,6 +181,7 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
      else if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
      {
        converted = value;
+        wasCached = true;
      }
      else
      {
@@ -181,10 +202,17 @@ public class RhinoRootObjectBuilder : IRootObjectBuilder<RhinoObject>
        converted["properties"] = properties;
      }

-      // add to host
-      collectionHost.elements.Add(converted);
+      // process in pipeline
+      var reference = await sendPipeline.Process(converted).ConfigureAwait(false);
+      if (!wasCached)
+      {
+        _sendConversionCache.AppendSendResult(projectId, applicationId, reference);
+      }

-      return new(Status.SUCCESS, applicationId, sourceType, converted);
+      // add to host
+      collectionHost.elements.Add(reference);
+
+      return new(Status.SUCCESS, applicationId, sourceType, reference);
    }
    catch (Exception ex) when (!ex.IsFatal())
    {
@@ -6,7 +6,7 @@ using Speckle.Connectors.Rhino.DependencyInjection;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk;
 using Speckle.Sdk.Models.Extensions;
-
+  
 namespace Speckle.Connectors.Rhino.Plugin;

 ///<summary>
@@ -22,6 +22,7 @@ using Speckle.Connectors.Rhino.Operations.Receive;
 using Speckle.Connectors.Rhino.Operations.Send;
 using Speckle.Connectors.Rhino.Operations.Send.Settings;
 using Speckle.Connectors.Rhino.Plugin;
+using Speckle.Converters.Common.ToHost;
 using Speckle.Sdk.Models.GraphTraversal;

 namespace Speckle.Connectors.Rhino.DependencyInjection;
@@ -75,7 +76,7 @@ public static class ServiceRegistration
      InstanceObjectsManager<RhinoObject, List<string>>
    >();

-    // Register unpackers and bakers
+    // register unpackers and bakers
    serviceCollection.AddScoped<RhinoLayerUnpacker>();
    serviceCollection.AddScoped<RhinoLayerBaker>();

@@ -91,9 +92,15 @@ public static class ServiceRegistration
    serviceCollection.AddScoped<RhinoColorBaker>();
    serviceCollection.AddScoped<RhinoColorUnpacker>();

+    serviceCollection.AddScoped<RhinoViewUnpacker>();
+
    serviceCollection.AddScoped<PropertiesExtractor>();
    serviceCollection.AddScoped<RevitMappingResolver>();

+    // handling proxified display values
+    serviceCollection.AddScoped<IDataObjectInstanceRegistry, DataObjectInstanceRegistry>();
+    serviceCollection.AddScoped<DataObjectInstanceGrouper>();
+
    // register helpers
    serviceCollection.AddScoped<RhinoLayerHelper>();
    serviceCollection.AddScoped<RhinoObjectHelper>();
@@ -23,7 +23,9 @@
    <Compile Include="$(MSBuildThisFileDirectory)Bindings\RhinoSendBinding.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Bindings\RhinoSelectionBinding.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Extensions\AttributeExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\DataObjectInstanceGrouper.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Properties\PropertiesExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoViewUnpacker.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoIdleManager.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoLayerHelper.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoObjectHelper.cs" />
@@ -62,4 +64,4 @@
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\Speckle.Connectors.RhinoCommand.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)Plugin\Speckle.Connectors.RhinoPlugin.cs" />
  </ItemGroup>
-</Project>
+</Project>
@@ -208,6 +208,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.dui": {
@@ -360,7 +380,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "LibTessDotNet": {
@@ -410,35 +430,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=="
      }
    }
  }
@@ -227,6 +227,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",
@@ -406,9 +427,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": {
@@ -441,7 +461,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "LibTessDotNet": {
@@ -491,35 +511,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=="
      }
    }
  }
@@ -227,6 +227,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",
@@ -406,9 +427,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": {
@@ -441,7 +461,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "LibTessDotNet": {
@@ -491,35 +511,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",
@@ -258,7 +279,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.Logging": {
@@ -287,35 +308,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",
@@ -258,7 +279,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.Logging": {
@@ -287,35 +308,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": {
@@ -285,7 +305,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -329,35 +349,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, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -280,33 +298,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=="
      }
    }
  }
@@ -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, )"
        }
      },
      "Microsoft.Extensions.DependencyInjection": {
@@ -280,33 +298,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=="
      }
    }
  }
@@ -1,5 +1,6 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
+using Speckle.Converters.Autocad.ToHost.Helpers;
 using Speckle.Converters.AutocadShared.ToSpeckle;
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Registration;
@@ -30,5 +31,6 @@ public static class ServiceRegistration
    serviceCollection.AddScoped<IPropertiesExtractor, PropertiesExtractor>();
    serviceCollection.AddScoped<ExtensionDictionaryExtractor>();
    serviceCollection.AddScoped<XDataExtractor>();
+    serviceCollection.AddScoped<EntityUnitConverter>();
  }
 }
@@ -22,8 +22,11 @@
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\ExtrusionXToHostConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\SubDXToHostConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\BrepXToHostConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\SolidXToHostConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\MeshToHostConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Geometry\DataObjectConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Helpers\EntityUnitConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\RawEncodingToHostConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\AutocadPolycurveToHostPolyline2dRawConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\AutocadPolycurveToHostPolyline3dRawConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToHost\Raw\AutocadPolycurveToHostPolylineRawConverter.cs" />
@@ -58,6 +61,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Properties\ExtensionDictionaryExtractor.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Properties\IPropertiesExtractor.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Properties\PropertiesExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\Solid3dToRawEncodingConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\BrepToSpeckleRawConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\CircularArc2dToSpeckleRawConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\DBArcToSpeckleRawConverter.cs" />
@@ -88,4 +92,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\DBSplineToSpeckleRawConverter.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\VectorToSpeckleRawConverter.cs" />
  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="$(MSBuildThisFileDirectory)ToHost\Helpers\" />
+  </ItemGroup>
 </Project>
@@ -1,9 +1,12 @@
+using Speckle.Converters.Autocad.ToHost.Helpers;
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
 using Speckle.Objects;
 using Speckle.Objects.Data;
+using Speckle.Objects.Other;
 using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;
+using Speckle.Sdk.Models.Instances;

 namespace Speckle.Converters.AutocadShared.ToHost.Geometry;

@@ -17,6 +20,8 @@ public class DataObjectConverter : IToHostTopLevelConverter, ITypedConverter<Dat
  private readonly ITypedConverter<SOG.Point, ADB.DBPoint> _pointConverter;
  private readonly ITypedConverter<SOG.SubDX, List<(ADB.Entity a, Base b)>> _subDXConverter;
  private readonly ITypedConverter<SOG.Region, ADB.Entity> _regionConverter;
+  private readonly ITypedConverter<RawEncoding, List<ADB.Entity>> _rawEncodingConverter;
+  private readonly EntityUnitConverter _entityUnitConverter;

  public DataObjectConverter(
    ITypedConverter<ICurve, List<(ADB.Entity, Base)>> curveConverter,
@@ -25,7 +30,9 @@ public class DataObjectConverter : IToHostTopLevelConverter, ITypedConverter<Dat
    ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> meshConverter,
    ITypedConverter<SOG.Point, ADB.DBPoint> pointConverter,
    ITypedConverter<SOG.SubDX, List<(ADB.Entity a, Base b)>> subDXConverter,
-    ITypedConverter<SOG.Region, ADB.Entity> regionConverter
+    ITypedConverter<SOG.Region, ADB.Entity> regionConverter,
+    ITypedConverter<RawEncoding, List<ADB.Entity>> rawEncodingConverter,
+    EntityUnitConverter entityUnitConverter
  )
  {
    _curveConverter = curveConverter;
@@ -35,6 +42,8 @@ public class DataObjectConverter : IToHostTopLevelConverter, ITypedConverter<Dat
    _pointConverter = pointConverter;
    _subDXConverter = subDXConverter;
    _regionConverter = regionConverter;
+    _rawEncodingConverter = rawEncodingConverter;
+    _entityUnitConverter = entityUnitConverter;
  }

  public object Convert(Base target) => Convert((DataObject)target);
@@ -42,14 +51,41 @@ public class DataObjectConverter : IToHostTopLevelConverter, ITypedConverter<Dat
  public List<(ADB.Entity a, Base b)> Convert(DataObject target)
  {
    var result = new List<(ADB.Entity a, Base b)>();
+
+    if (target.displayValue.Count > 0 && target.displayValue[0] is InstanceProxy)
+    {
+      return []; // return empty - defer to instance baker
+    }
+
+    // Check for SAT encoding first for lossless round-trip
+    if (target["encodedValue"] is RawEncoding encoding && encoding.format == RawEncodingFormats.ACAD_SAT)
+    {
+      try
+      {
+        var entities = _rawEncodingConverter.Convert(encoding);
+        if (entities.Count > 0)
+        {
+          // SAT format is unitless - scale entities if source and target units differ
+          _entityUnitConverter.ScaleIfNeeded(entities, target["units"] as string);
+          return entities.Select(e => (e, (Base)target)).ToList();
+        }
+      }
+      catch (ConversionException)
+      {
+        // Fall through to displayValue conversion
+      }
+    }
+
+    // Fallback: convert displayValue geometry
    foreach (var item in target.displayValue)
    {
      result.AddRange(ConvertDisplayObject(item));
    }
+
    return result;
  }

-  public IEnumerable<(ADB.Entity a, Base b)> ConvertDisplayObject(Base displayObject)
+  private IEnumerable<(ADB.Entity a, Base b)> ConvertDisplayObject(Base displayObject)
  {
    switch (displayObject)
    {
@@ -0,0 +1,72 @@
+using Speckle.Converters.Autocad.ToHost.Helpers;
+using Speckle.Converters.Common;
+using Speckle.Converters.Common.Objects;
+using Speckle.Objects.Other;
+using Speckle.Sdk.Common.Exceptions;
+using Speckle.Sdk.Logging;
+using Speckle.Sdk.Models;
+
+namespace Speckle.Converters.Autocad.Geometry;
+
+/// <summary>
+/// Converts a SolidX to AutoCAD Solid3d entities with lossless round-tripping via SAT encoding.
+/// </summary>
+[NameAndRankValue(typeof(SOG.SolidX), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)]
+public class SolidXToHostConverter : IToHostTopLevelConverter, ITypedConverter<SOG.SolidX, List<(ADB.Entity a, Base b)>>
+{
+  private readonly ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> _meshConverter;
+  private readonly ITypedConverter<RawEncoding, List<ADB.Entity>> _rawEncodingConverter;
+  private readonly EntityUnitConverter _entityUnitConverter;
+  private readonly ISdkActivityFactory _activityFactory;
+
+  public SolidXToHostConverter(
+    ITypedConverter<SOG.Mesh, ADB.PolyFaceMesh> meshConverter,
+    ITypedConverter<RawEncoding, List<ADB.Entity>> rawEncodingConverter,
+    EntityUnitConverter entityUnitConverter,
+    ISdkActivityFactory activityFactory
+  )
+  {
+    _meshConverter = meshConverter;
+    _rawEncodingConverter = rawEncodingConverter;
+    _entityUnitConverter = entityUnitConverter;
+    _activityFactory = activityFactory;
+  }
+
+  public object Convert(Base target) => Convert((SOG.SolidX)target);
+
+  public List<(ADB.Entity a, Base b)> Convert(SOG.SolidX target)
+  {
+    // Try to decode raw encoding first for lossless conversion
+    if (target.encodedValue?.format == RawEncodingFormats.ACAD_SAT)
+    {
+      try
+      {
+        List<ADB.Entity> entities = _rawEncodingConverter.Convert(target.encodedValue);
+
+        if (entities.Count > 0)
+        {
+          // SAT format is unitless - scale entities if source and target units differ
+          _entityUnitConverter.ScaleIfNeeded(entities, target.units);
+          return entities.Select(entity => ((ADB.Entity)entity, (Base)target)).ToList();
+        }
+      }
+      catch (ConversionException ex)
+      {
+        // Log the failure and fall through to displayValue fallback
+        using var activity = _activityFactory.Start("SolidX Raw Encoding Fallback");
+        activity?.SetStatus(SdkActivityStatusCode.Error);
+        activity?.RecordException(ex);
+      }
+    }
+
+    // Fallback: Convert displayValue meshes to PolyFaceMesh
+    var result = new List<ADB.PolyFaceMesh>();
+    foreach (SOG.Mesh mesh in target.displayValue)
+    {
+      ADB.PolyFaceMesh convertedMesh = _meshConverter.Convert(mesh);
+      result.Add(convertedMesh);
+    }
+
+    return result.Zip(target.displayValue, (a, b) => ((ADB.Entity)a, (Base)b)).ToList();
+  }
+}
@@ -0,0 +1,31 @@
+using Speckle.Converters.Common;
+using Speckle.Sdk.Common;
+
+namespace Speckle.Converters.Autocad.ToHost.Helpers;
+
+/// <summary>
+/// Scales AutoCAD entities from source units to target units.
+/// SAT format is unitless, so we need to apply unit conversion manually after import.
+/// </summary>
+public class EntityUnitConverter(IConverterSettingsStore<AutocadConversionSettings> settingsStore)
+{
+  public void ScaleIfNeeded(List<ADB.Entity> entities, string? sourceUnits)
+  {
+    if (string.IsNullOrEmpty(sourceUnits))
+    {
+      return;
+    }
+
+    double scaleFactor = Units.GetConversionFactor(sourceUnits, settingsStore.Current.SpeckleUnits);
+    if (Math.Abs(scaleFactor - 1.0) < 1e-10)
+    {
+      return;
+    }
+
+    var scaleMatrix = AG.Matrix3d.Scaling(scaleFactor, AG.Point3d.Origin);
+    foreach (var entity in entities)
+    {
+      entity.TransformBy(scaleMatrix);
+    }
+  }
+}
@@ -0,0 +1,83 @@
+using Speckle.Converters.Common.Objects;
+using Speckle.Objects.Other;
+using Speckle.Sdk;
+using Speckle.Sdk.Common.Exceptions;
+
+namespace Speckle.Converters.Autocad.ToHost.Raw;
+
+/// <summary>
+/// Converts RawEncoding (SAT format) to AutoCAD entities.
+/// </summary>
+public class RawEncodingToHostConverter : ITypedConverter<RawEncoding, List<ADB.Entity>>
+{
+  public List<ADB.Entity> Convert(RawEncoding target)
+  {
+    if (target == null)
+    {
+      throw new ArgumentNullException(nameof(target));
+    }
+
+    // Route to appropriate handler based on format
+    switch (target.format)
+    {
+      case RawEncodingFormats.ACAD_SAT:
+        return HandleSat(target);
+      default:
+        throw new ConversionException(
+          $"Unsupported raw encoding format: {target.format}. Expected '{RawEncodingFormats.ACAD_SAT}'."
+        );
+    }
+  }
+
+  /// <summary>
+  /// Handles decoding of SAT (ACIS) format.
+  /// </summary>
+  private List<ADB.Entity> HandleSat(RawEncoding encoding)
+  {
+    try
+    {
+      var satBytes = System.Convert.FromBase64String(encoding.contents);
+
+      // Create a temporary file for the SAT data
+      string tempFile = System.IO.Path.GetTempFileName();
+      string tempSatFile = System.IO.Path.ChangeExtension(tempFile, ".sat");
+
+      try
+      {
+        System.IO.File.WriteAllBytes(tempSatFile, satBytes);
+
+        ADB.DBObjectCollection importedObjects = ADB.Body.AcisIn(tempSatFile);
+
+        var entities = new List<ADB.Entity>();
+        foreach (ADB.DBObject obj in importedObjects)
+        {
+          if (obj is ADB.Entity entity)
+          {
+            // Clone the entity to ensure it's detached
+            var clonedEntity = (ADB.Entity)entity.Clone();
+            entities.Add(clonedEntity);
+          }
+          obj.Dispose();
+        }
+
+        return entities;
+      }
+      finally
+      {
+        // Clean up temporary files
+        if (System.IO.File.Exists(tempSatFile))
+        {
+          System.IO.File.Delete(tempSatFile);
+        }
+        if (System.IO.File.Exists(tempFile))
+        {
+          System.IO.File.Delete(tempFile);
+        }
+      }
+    }
+    catch (System.Exception ex) when (!ex.IsFatal())
+    {
+      throw new ConversionException($"Failed to decode SAT format: {ex.Message}", ex);
+    }
+  }
+}
@@ -1,23 +1,75 @@
 using Speckle.Converters.Common;
 using Speckle.Converters.Common.Objects;
+using Speckle.Objects.Other;
+using Speckle.Sdk;
+using Speckle.Sdk.Common.Exceptions;
 using Speckle.Sdk.Models;

 namespace Speckle.Converters.Autocad.Geometry;

-[NameAndRankValue(typeof(ADB.Solid3d), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK)]
+/// <summary>
+/// Converts AutoCAD Solid3d entities to SolidX with SAT encoding for lossless round-trip.
+/// </summary>
+[NameAndRankValue(typeof(ADB.Solid3d), NameAndRankValueAttribute.SPECKLE_DEFAULT_RANK + 1)]
 public class Solid3dToSpeckleConverter : IToSpeckleTopLevelConverter
 {
-  private readonly ITypedConverter<ADB.Solid3d, SOG.Mesh> _solidConverter;
+  private readonly ITypedConverter<ADB.Solid3d, SOG.Mesh> _meshConverter;
+  private readonly ITypedConverter<ADB.Solid3d, RawEncoding> _encodingConverter;
+  private readonly IConverterSettingsStore<AutocadConversionSettings> _settingsStore;

-  public Solid3dToSpeckleConverter(ITypedConverter<ADB.Solid3d, SOG.Mesh> solidConverter)
+  public Solid3dToSpeckleConverter(
+    ITypedConverter<ADB.Solid3d, SOG.Mesh> meshConverter,
+    ITypedConverter<ADB.Solid3d, RawEncoding> encodingConverter,
+    IConverterSettingsStore<AutocadConversionSettings> settingsStore
+  )
  {
-    _solidConverter = solidConverter;
+    _meshConverter = meshConverter;
+    _encodingConverter = encodingConverter;
+    _settingsStore = settingsStore;
  }

  public Base Convert(object target) => RawConvert((ADB.Solid3d)target);

-  public SOG.Mesh RawConvert(ADB.Solid3d target)
+  public SOG.SolidX RawConvert(ADB.Solid3d target)
  {
-    return _solidConverter.Convert(target);
+    // Generate display mesh for viewer
+    SOG.Mesh displayMesh = _meshConverter.Convert(target);
+
+    // Calculate geometric properties
+    double? volume = null;
+    double? area = null;
+
+    try
+    {
+      using ABR.Brep brep = new(target);
+      if (!brep.IsNull)
+      {
+        area = brep.GetSurfaceArea();
+        try
+        {
+          volume = brep.GetVolume();
+        }
+        catch (ABR.Exception)
+        {
+          // Volume calculation can fail for non-volumetric solids
+        }
+      }
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      throw new ConversionException($"Failed to calculate geometric properties: {ex.Message}", ex);
+    }
+
+    // Create raw encoding for round-tripping
+    RawEncoding encoding = _encodingConverter.Convert(target);
+
+    return new SOG.SolidX
+    {
+      displayValue = [displayMesh],
+      encodedValue = encoding,
+      volume = volume ?? 0,
+      area = area ?? 0,
+      units = _settingsStore.Current.SpeckleUnits
+    };
  }
 }
@@ -0,0 +1,55 @@
+using Speckle.Converters.Common.Objects;
+using Speckle.Objects.Other;
+using Speckle.Sdk;
+using Speckle.Sdk.Common.Exceptions;
+
+namespace Speckle.Converters.Autocad.ToSpeckle.Raw;
+
+/// <summary>
+/// Converts AutoCAD Solid3d to SAT (ACIS) raw encoding for lossless round-trip.
+/// </summary>
+public class Solid3dToRawEncodingConverter : ITypedConverter<ADB.Solid3d, RawEncoding>
+{
+  public RawEncoding Convert(ADB.Solid3d target)
+  {
+    if (target == null)
+    {
+      throw new ArgumentNullException(nameof(target));
+    }
+
+    string tempFile = System.IO.Path.GetTempFileName();
+    string tempSatFile = System.IO.Path.ChangeExtension(tempFile, ".sat");
+
+    try
+    {
+      // Create collection with the solid
+      using var collection = new ADB.DBObjectCollection();
+      collection.Add(target);
+
+      // Export to SAT using Body.AcisOut
+      ADB.Body.AcisOut(tempSatFile, collection);
+
+      // Read file bytes and convert to base64
+      var satBytes = System.IO.File.ReadAllBytes(tempSatFile);
+      var satString = System.Convert.ToBase64String(satBytes);
+
+      return new RawEncoding { contents = satString, format = RawEncodingFormats.ACAD_SAT };
+    }
+    catch (System.Exception ex) when (!ex.IsFatal())
+    {
+      throw new ConversionException($"Failed to encode Solid3d to SAT format: {ex.Message}", ex);
+    }
+    finally
+    {
+      // Clean up temporary files
+      if (System.IO.File.Exists(tempSatFile))
+      {
+        System.IO.File.Delete(tempSatFile);
+      }
+      if (System.IO.File.Exists(tempFile))
+      {
+        System.IO.File.Delete(tempFile);
+      }
+    }
+  }
+}
@@ -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",
@@ -258,7 +279,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.Logging": {
@@ -287,35 +308,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",
@@ -209,7 +228,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.Logging": {
@@ -238,33 +257,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=="
      }
    }
  }
@@ -17,4 +17,4 @@
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\EtabsShellSectionResolver.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\TopLevel\EtabsObjectToSpeckleConverter.cs" />
  </ItemGroup>
-</Project>
+</Project>
@@ -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",
@@ -267,7 +288,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.Logging": {
@@ -296,35 +317,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",
@@ -267,7 +288,7 @@
        "type": "Project",
        "dependencies": {
          "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.9.0, )"
+          "Speckle.Objects": "[3.11.1, )"
        }
      },
      "Microsoft.Extensions.Logging": {
@@ -296,35 +317,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=="
      }
    }
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dimitrie Stefanescu	22c6303167	wip pipe implementation	2026-01-21 14:23:27 +00:00
Björn Steinhagen	a8cc4cebc7	Merge pull request #1222 from specklesystems/dev .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details dev -> main	2025-12-22 21:02:10 +07:00
Björn Steinhagen	678ba417d2	Merge pull request #1220 from specklesystems/main-dev main-dev -> dev	2025-12-22 20:53:23 +07:00
Björn Steinhagen	bc9fbe3cf7	Merge remote-tracking branch 'origin/dev' into main-dev	2025-12-22 14:47:34 +01:00
Björn Steinhagen	b09f085f07	fix(revit): mep geometry view-driven (#1218 )	2025-12-22 14:23:57 +01:00
Björn Steinhagen	539ae1fc78	fix(revit): correct transforms for modified elements and nested instances (#1217 ) * fix(revit): correct element transforms and instance proxies * chore(revit): docs	2025-12-22 13:41:28 +01:00
Jedd Morgan	cc47dfaac6	Merge pull request #1216 from specklesystems/jrm/rhino-importer-slug .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details fix(rhino-importer): report correct slug to ingestion	2025-12-16 14:35:57 +00:00
Jedd Morgan	691235a7ac	Merge pull request #1215 from specklesystems/main Main -> Dev backmerge	2025-12-15 16:31:39 +00:00
dependabot[bot]	deff607bcb	chore(deps): bump actions/cache from 4 to 5 (#1212 ) Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-15 14:43:54 +00:00
dependabot[bot]	cfb8aba55f	chore(deps): bump actions/upload-artifact from 5 to 6 (#1213 ) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-12-15 14:38:58 +00:00
Jedd Morgan	4bcc0d83a9	Use payload filename (#1214 ) .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details	2025-12-15 14:25:29 +00:00
Jedd Morgan	605d6faf42	feat(rhino-importer)!: Implement Model Ingestion (#1211 ) .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details * Model Ingestions for Rhino importer * add cancellation * cancellation * minor tweak * Requeue ingestion also * asdf * adjust cancellation log level * fix tests * remove unneeded path * pass version message	2025-12-12 16:33:54 +00:00
Oğuzhan Koral	28c5f1276a	Merge pull request #1210 from specklesystems/dev .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update dev into main	2025-12-08 21:58:48 +03:00
Jonathon Broughton	e80fe30acb	fix(navisworks): corrects Y-up transformations for Z-up models (#1209 ) * Improves handling of geometry definitions and transformations Adds support for multiple geometry types in shared geometry handling. Refines the method to log the count of geometries added. Implements Y-up to Z-up transformations to correct model orientation. * no logging --------- Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com>	2025-12-08 18:52:59 +00:00
Dogukan Karatas	034e1dcef8	feat (civil3d): data object with raw encoding for solid3d objects (#1208 ) * solidx converter added * some formatting * version bump * supress the check * dwg based dataobject * replace dwg with sat * update sdk package * some cleanup * change operation order * some formatting * ITypedConverter cast * static to ITypedConverter * minors * non-nullable parameters * unit conversion added --------- Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com>	2025-12-08 21:28:50 +03:00
Björn Steinhagen	dd34625acb	Merge pull request #1206 from specklesystems/bjorn/cnx-2855-handling-of-unsupported-elements refactor(grasshopper): handling of unsupported geometry	2025-12-08 17:00:44 +03:00
Björn Steinhagen	3090b5f5bb	Merge pull request #1207 from specklesystems/dev .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details merge dev -> main	2025-12-03 12:31:27 +02:00
Björn Steinhagen	7c609c93ae	fix(grasshopper): syncing `GeometryBase` to `Base` for re-publish workflows (#1205 )	2025-12-01 15:46:23 +03:00
Jedd Morgan	36a6572483	Merge pull request #1204 from specklesystems/main back merge Main -> dev	2025-12-01 10:56:30 +00:00
Jedd Morgan	ce04d2fd55	Merge pull request #1203 from specklesystems/dev Back merge dev -> main	2025-12-01 10:53:36 +00:00
Jedd Morgan	4dbe4dd9a0	fix(rhino-importer): Ensure non-zero exit code is propagated (#1199 ) * Ensure background service exit codes are properly propagated * detail log * fail fast * log * env exit works just as well * add comment * Use central management for importer version	2025-12-01 10:51:29 +00:00
Björn Steinhagen	6f72402b76	fix(revit): rebar and area reinforcement transforms with reference points (#1202 ) * fix: rebar transforms * fix: area reinf.	2025-11-28 17:25:37 +02:00
Björn Steinhagen	a7b3ae8780	refactor(grasshopper): appending "with Token" to "Speckle Model URL" component name (#1201 )	2025-11-28 11:41:47 +00:00
Björn Steinhagen	5da534aeb7	refactor(grasshopper): renaming component naming for automatic loading (#1200 )	2025-11-28 13:37:26 +02:00
Björn Steinhagen	93ede98135	fix(grasshopper): `CastFrom` with long (#1197 ) * fix: cast from with long * chore: be loud about future casting fails	2025-11-26 12:43:13 +02:00
Jedd Morgan	03cffcdf4c	Merge pull request #1196 from specklesystems/dependabot/github_actions/actions/checkout-6 chore(deps): bump actions/checkout from 5 to 6	2025-11-24 22:40:43 +03:00
dependabot[bot]	c533d0922a	chore(deps): bump actions/checkout from 5 to 6 Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-24 14:54:29 +00:00
Björn Steinhagen	c24fb7eaa0	fix(rhino): remove control characters from revit families for rhino layer names (#1195 )	2025-11-19 09:44:22 +00:00
Oğuzhan Koral	0b246cf95c	Merge pull request #1193 from specklesystems/dev .NET Build and Publish / build-connectors (push) Has been cancelled Details .NET Build and Publish / deploy-installers (push) Has been cancelled Details Update dev into main	2025-11-18 15:50:22 +03:00
Jonathon Broughton	003e310089	Adds room ID properties for family instances (#1192 ) Introduces extraction of 'toRoomId' and 'fromRoomId' for family instance elements, enhancing the representation of relationships between doors and associated rooms. Improves data completeness for elements with room associations.	2025-11-18 12:44:40 +00:00
Oğuzhan Koral	5917530761	Add account via binding (#1191 )	2025-11-18 13:26:19 +03:00
Claire Kuang	349009314b	feat(rhino/revit): publishes views (#1160 ) * adds view proxies and converter * adds rhino views * updates with new proxy field * adds views to revit send * updates views to not include parallel projections also adds rootkeys to connectors common * updates to 3.8.0 sdk * only add views if any	2025-11-17 17:50:41 +00:00
Jonathon Broughton	659a29a294	Improves property value conversion and extraction (#1183 ) * Refactors property extraction to use model units Uses the model's units when extracting properties to ensure consistency and accuracy of converted values. Extracts property sets as a static function to provide re-usability without the class instance. * Refactors Revit category extraction Improves Revit category extraction by utilizing UI units for property conversion, ensuring consistent unit handling. Additionally, refactors the extractor to a static class. * Improves property conversion and handling Introduces robust property conversion and handling logic. Leverages user interface units for length, area, and volume property conversions, ensuring consistency with the Navisworks UI. Enhances property data handling by using dictionaries to represent numerical properties with associated units, providing more context for downstream applications. Adds property name sanitization to ensure compatibility with Speckle's object model. * Removes the unused `Speckle.Converter.Navisworks.Helpers` import from the PropertySetsExtractor class to reduce clutter and improve code maintainability. Relates to CNX-2784 * Standardizes numerical property dictionary creation. Simplifies the creation of numerical property dictionaries by removing the `internalDefinitionName` parameter from the `NumObj` method. This ensures a consistent format for numerical properties across the connector. Relates to CNX-2784 * Refactors property conversion to service Moves property conversion logic into a dedicated service. This improves code organization and testability and allows to reuse logic and manage UI units consistently. * Refactors property conversion for consistency Standardizes property conversion by introducing a dedicated `IPropertyConverter` service. This change ensures consistent handling of property values across different extractors, improving data accuracy and reducing inconsistencies in quantity extraction. It also adds resets of the property converter to ensure clean conversions for each item. Relates to CNX-2784 * Update Converters/Navisworks/Speckle.Converters.NavisworksShared/Helpers/PropertyHelpers.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Converters/Navisworks/Speckle.Converters.NavisworksShared/Helpers/PropertyHelpers.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update Converters/Navisworks/Speckle.Converters.NavisworksShared/Helpers/PropertyHelpers.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Moves UI Units cache to service Moves the UI Units cache logic from the helpers to a dedicated service. This improves the separation of concerns and makes the code more maintainable and testable. Relates to CNX-2784 * Fixes unit label typos. Corrects minor spelling errors in the unit labels for centimeters, millimeters, micrometers, and kilometers. Relates to CNX-2784 * Ensures correct units are used on send Uses the UI Units Cache service to ensure the correct units are being applied to objects when sending them to Speckle. Relates to CNX-2784 * Enhances the property helper functionality to support additional features. Adjusts the constructor parameters to accommodate new requirements. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-11-17 20:42:52 +03:00
Jonathon Broughton	1ffeddbc2c	Implements geometry instancing and optimization in Navisworks connector (#1188 ) * Introduces shared geometry store service Creates a singleton service for deduplicating geometry during conversion. This service stores mesh objects, preventing redundant processing of identical geometries by leveraging application IDs. It uses a dictionary and a hash set to optimize lookup and storage, and includes thread safety mechanisms. * Adds instance store manager for geometry Introduces an instance store manager to handle shared geometry, which includes separate stores for geometry definitions and instance proxies. This change prepares for the implementation of an instancing pattern compatible with .NET Framework. It also registers settings from a factory to resolve conversion settings. * Adds shared project file for Navisworks converter Introduces a shared project file for the Navisworks converter, promoting code reuse and consistency across different Navisworks converter implementations. This file includes common data extractors, data handlers, helpers, services, and settings, reducing duplication and improving maintainability. * Implements geometry instancing for Navisworks Adds geometry instancing to improve performance and reduce data size when converting Navisworks models with shared geometry. It identifies shared geometries based on fragment paths, extracts the base geometry once, and creates instance references with transforms. This reduces data duplication and improves loading times in Speckle. Improves handling of COM array data for fragment ID generation and includes comprehensive logging for debugging instancing issues. * Introduces instance store management Adds a service to manage shared geometry and instance definition proxies. This system uses two stores for geometry definitions and their instance proxies, facilitating efficient handling of shared geometry. It provides methods for adding, retrieving, and clearing geometries, ensuring deduplication and optimized memory usage. * Refactors display value extraction Streamlines display value extraction by injecting the geometry converter. This change simplifies the DisplayValueExtractor by removing its dependencies on settings and logging. It now directly uses a GeometryToSpeckleConverter instance, which is passed in, for converting model item geometry. * Adds instance geometry support to Navisworks connector Introduces instance geometry handling for more efficient and accurate Navisworks data streams. This includes: - Scoping the `InstanceStoreManager` to each conversion session. - Creating a "Geometry Definitions" collection to store shared geometry. - Adding instance definition proxies to the root collection. Addresses issues with duplicate geometry and improves stream performance. * Fixes geometry processing for instance handling Refactors geometry processing logic to handle instances more efficiently. It now correctly applies transformations for single objects, ensuring accurate placement in the scene. Simplifies processing of transforms where necessary for single objects. Removes redundant logging. * LFG!!! Matrix4x4 Transposed Adds an application ID to instance references. * Fixes RenderMaterials * Refactors dependency injection for settings * Reduces comment clutter in Navisworks converters Removes unnecessary comments to enhance code readability and maintainability. Simplifies the logic flow by eliminating obsolete comments that do not provide value, promoting a cleaner codebase moving forward. Relates to issue jonathon/cnx-2817-adopt-displayvalue-proxification-pattern-in-navisworks. * Renames methods for clarity and updates logic Refactors method names to improve readability and understanding of functionality. Consolidates selection logic related to representation modes and enhances the cohesiveness of the code. Also updates the property extraction method for better clarity on its purpose. Relates to the adoption of the display-value proxification pattern. * Refines COM object management and method naming Improves memory safety by ensuring all COM objects are explicitly released in try-finally blocks. * Refactors constants usage for geometry identification Introduces new constant definitions to standardise fragment ID prefixing. * Refactors Navisworks build process for resilience Adds error checking to ensure the Navisworks version is set before build occurs, and improves error handling to avoid empty output directories. Updates file copy logic to handle resource and ribbon files correctly. Ensures that the Navisworks plugin is correctly packaged and deployed. Addresses CNX-2788 * Improves geometry retrieval and checks Refactors geometry definition retrieval for better readability. * Refactors property name sanitisation logic Consolidates the logic for sanitising property names into a more concise format. * Refactors method signature for clarity * Update Converters/Navisworks/Speckle.Converters.NavisworksShared/Services/InstanceStoreManager.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Enhances fragment processing logic and error handling Improves null handling for selection paths to prevent crashes. * Changes fragment ID method visibility to public Updates the visibility of the fragment ID generation method to public, allowing it to be accessed from outside the class. * implementing more robust error handling during COM interop operations. * Updates method signatures to replace base geometry types with shared models, ensuring consistent handling of geometry data. * Refactors parameter list for clarity --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com>	2025-11-17 19:37:02 +03:00
Björn Steinhagen	9d9a27d9cb	fix: bake transforms into curves/polylines/points for family instances (#1190 ) Co-authored-by: Oğuzhan Koral <45078678+oguzhankoral@users.noreply.github.com>	2025-11-17 16:02:58 +00:00
Björn Steinhagen	b2a885c193	fix(grasshopper): dispayValue proxies broke grasshopper load (#1187 ) * fix: poc * refactor: consolidating poc * fix: tweaking through testing * fix: async component * fix: ci * chore: is null and is not null form * refactor: using NotNull() * chore: csharpier * refactor: ogu bey	2025-11-17 17:52:56 +02:00
Björn Steinhagen	60c1811fa6	fix(revit): railing TopRail material proxy cache errors and duplication (#1186 ) * fix: first pass * refactor: cleanup	2025-11-17 15:47:14 +02:00
Björn Steinhagen	5365809172	fix(rhino): dispayValue proxies broke rhino load (#1182 ) * refactor: root object unpacker doesn't unpack proxified display values * fix: removes unnecessary using statement * refactor: sets appropriate methods as private * feat: adds ProxifiedDisplayValueManager class * refactor: manager class to do more * chore: di * feat: converter uses manager class * chore: adds sdk.connectors to converter project (NOT HAPPY) * chore: init manager * refactor: manager in Speckle.Converters.Common * fix: di * fix: don't need clear * chore: i don't even know what i did * fix: rhino materials * fix: autocad * fix: revit di * chore: format * refactor: meshes to instances pt 1 * refactor: new approach final v2.1 * fix: can't even remember anymore * fix: autocad * chore: pr comments from Oguzhan Bey	2025-11-14 07:40:40 +00:00