Merge remote-tracking branch 'origin/v0.8.0' into test-ci

black
test cases #7291
2026-08-06 07:51:47 +00:00 · 2025-10-27 06:54:10 +01:00 · 2025-10-26 13:33:10 +01:00 · 2025-10-26 13:31:31 +01:00 · 2025-10-26 13:31:31 +01:00 · 2025-10-26 13:31:31 +01:00
872 changed files with 78874 additions and 43171 deletions
@@ -11,7 +11,7 @@ jobs:
      matrix:
        include:
          - os: macos
-            runner: macos-13
+            runner: macos-14
            arch: x64
            oldarch: 
          - os: macos
@@ -34,15 +34,11 @@ jobs:
          lfs: true
          token: ${{ secrets.BUILD_REPO_TOKEN }}

-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-        
      - name: Install Dependencies
        run: |
          brew update
-          brew install git bison autoconf automake libffi cmake findutils
+          # preinstalled: xz, cmake
+          brew install git bison autoconf automake libffi findutils
          echo "$(brew --prefix findutils)/libexec/gnubin" >> $GITHUB_PATH

      - name: Install aws cli
@@ -51,20 +47,48 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          install_root=$(find ./build -maxdepth 4 -name install)
-          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
-          key: ${GITHUB_WORKFLOW}-${{ matrix.os }}
+          key: mac-${{ matrix.arch }}

      - name: Run Build Script
+        shell: bash
        run: |
          if [ "${{ matrix.os }}" == "macos" ]; then
            DARWIN_C_SOURCE=-D_DARWIN_C_SOURCE
          fi
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+          if [ "${{ matrix.arch }}" == "x64" ]; then
+            arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+            MAC_INTEL=-mac-cross-compile-intel
+            # We don't use gmpcxx, but it comes preinstalled on macos runner as arm64 bottle
+            # and CGAL detects it and breaks cross compilation.
+            brew uninstall --ignore-dependencies gmp
+            # Otherwise Python will fallback to use arm64 `pkg-config`,
+            # will pick up arm64 libraries ('zstd' in particular),
+            # and break the build.
+            /usr/local/bin/brew install pkg-config
+            # Required by Python.
+            /usr/local/bin/brew install gettext openssl
+          fi
+          set -o pipefail
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release \
+            python3 ./nix/build-all.py -v --diskcleanup ${MAC_INTEL} \
+            | tee build.log
+
+      - name: Upload Build Logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-osx-${{ matrix.arch }}
+          path: |
+            build.log
+            build/*/*/*/logs/*.log
+            build/*/*/*/build/ifcopenshell/**/CMakeCache.txt
+          retention-days: 30

      - name: Pack Dependencies
        run: |
@@ -85,7 +109,7 @@ jobs:
      - name: Package .zip archives
        run: |
          VERSION=v`cat VERSION`
-          cd ./build/`uname`/*/10.9/install/ifcopenshell
+          cd ./build/`uname`/*/10.15/install/ifcopenshell
          mkdir ~/output

          ls -d python-* | while read py_version; do
@@ -14,33 +14,54 @@ jobs:
          submodules: recursive
          path: IfcOpenShell

-      - name: Checkout Pyodide
+      - name: Checkout Build Repository
        uses: actions/checkout@v3
        with:
-          submodules: recursive
-          repository: pyodide/pyodide
-          ref: '0.28.0a3'
+          repository: IfcOpenShell/build-outputs
+          path: ifcopenshell_build
+          ref: wasm
+          lfs: true
          token: ${{ secrets.BUILD_REPO_TOKEN }}
-          path: pyodide
+
+      - name: Unpack Dependencies
+        run: |
+          cd ifcopenshell_build
+          python ../IfcOpenShell/pyodide/cache_dependencies.py unpack
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ubuntu-22.04-${{ runner.arch }}

      - name: Build
        run: |
-          VERSION=`cat IfcOpenShell/VERSION`
-          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/meta.yaml
-          sed -i s/0.8.0/$VERSION/g IfcOpenShell/pyodide/setup.py
-          echo '#!/usr/bin/bash' > script.sh
-          echo 'cd pyodide' >> script.sh
-          echo 'make' >> script.sh
-          echo 'cd ..' >> script.sh
-          echo 'mkdir -p packages/ifcopenshell' >> script.sh
-          echo 'cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell' >> script.sh
-          echo 'PYODIDE_ROOT=/src/pyodide \' >> script.sh
-          echo 'PATH=/src/pyodide/emsdk/emsdk:/src/pyodide/emsdk/emsdk/node/22.16.0_64bit/bin:/src/pyodide/emsdk/emsdk/upstream/emscripten:$PATH \' >> script.sh
-          echo 'pyodide build-recipes ifcopenshell --install' >> script.sh
-          chmod +x script.sh
-          sed -i s/--tty// pyodide/run_docker
-          pyodide/run_docker ./script.sh
-          mv dist/ifcopenshell-$VERSION-py3-none-any.whl dist/ifcopenshell-$VERSION+${GITHUB_SHA:0:7}-cp313-cp313-emscripten_4_0_9_wasm32.whl
+          ./IfcOpenShell/pyodide/build_pyodide.sh
+          FILE=`echo dist/ifcopenshell-*.whl`
+          NEW_FILE=`echo $FILE | sed "s/-/+${GITHUB_SHA:0:7}-/2"`
+          mv $FILE $NEW_FILE
+
+      - name: Upload Build Logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-pyodide
+          path: |
+            ifcopenshell_build/*/*/logs/*.log
+          retention-days: 30
+
+      - name: Pack Dependencies
+        run: |
+          cd ifcopenshell_build
+          python ../IfcOpenShell/pyodide/cache_dependencies.py pack
+
+      - name: Commit and Push Changes to Build Repository
+        run: |
+          cd ifcopenshell_build
+          git config user.name "IfcOpenBot"
+          git config user.email "ifcopenbot@ifcopenshell.org"
+          git add */*/install/cache-*.tar.gz
+          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
+          git push || echo "Push failed"

      - name: Configure AWS credentials
        uses: aws-actions/configure-aws-credentials@v4
@@ -16,7 +16,8 @@ jobs:
                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
-                         findutils xz
+                         findutils xz byacc
+          python3 -m pip install typing_extensions
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -43,18 +44,30 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          install_root=$(find ./build -maxdepth 4 -name install)
-          find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \;
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
+          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

-      # Not supported on docker
-      # - name: ccache
-      #   uses: hendrikmuhs/ccache-action@v1
-      #   with:
-      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
+      - name: ccache
+        # Latest release (1.2.19) doesn't support Rocky, so using a specific commit.
+        uses: hendrikmuhs/ccache-action@eca11c308176d48942455b9e5b1b70ff6950a778
+        with:
+          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8

      - name: Run Build Script
+        shell: bash
        run: |
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+          set -o pipefail
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
+
+      - name: Upload Build Logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-rocky
+          path: |
+            build.log
+            build/*/*/logs/*.log
+          retention-days: 30

      - name: Pack Dependencies
        run: |
@@ -16,7 +16,8 @@ jobs:
                         bzip2 patch mesa-libGL-devel libffi-devel fontconfig-devel      \
                         sqlite-devel bzip2-devel zlib-devel openssl-devel xz-devel      \
                         readline-devel ncurses-devel libffi-devel libuuid-devel git-lfs \
-                         findutils xz
+                         findutils xz byacc
+          python3 -m pip install typing_extensions
          git config --global --add safe.directory '*'

      - name: Install aws cli
@@ -43,18 +44,30 @@ jobs:

      - name: Unpack Dependencies
        run: |
-          install_root=$(find ./build -maxdepth 4 -name install)
+          install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true)
          [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true

-      # Not supported on docker
-      # - name: ccache
-      #   uses: hendrikmuhs/ccache-action@v1
-      #   with:
-      #     key: ${GITHUB_WORKFLOW}-rockylinux8-x64
+      - name: ccache
+        # Latest release (1.2.19) doesn't support Rocky, so using a specific commit.
+        uses: hendrikmuhs/ccache-action@eca11c308176d48942455b9e5b1b70ff6950a778
+        with:
+          key: ubuntu-22.04-${{ runner.arch }}-rockylinux8

      - name: Run Build Script
+        shell: bash
        run: |
-          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py --diskcleanup
+          set -o pipefail
+          CXXFLAGS="-O3" CFLAGS="-O3 ${DARWIN_C_SOURCE}" ADD_COMMIT_SHA=1 BUILD_CFG=Release python3 ./nix/build-all.py -v --diskcleanup 2>&1 | tee build.log
+
+      - name: Upload Build Logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-logs-rocky-arm64
+          path: |
+            build.log
+            build/*/*/logs/*.log
+          retention-days: 30

      - name: Pack Dependencies
        run: |
@@ -9,7 +9,6 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        python: ['3.9.11', '3.10.3', '3.11.8', '3.12.1', '3.13.0']
        arch: ['x64']
    steps:
      - name: Checkout Repository
@@ -30,14 +29,6 @@ jobs:
        run: |
          choco install -y sed 7zip.install awscli

-      - name: Install Python
-        run: |
-          $installer = "python-${{ matrix.python }}-amd64.exe"
-          $url = "https://www.python.org/ftp/python/${{ matrix.python }}/$installer"
-          Invoke-WebRequest -Uri $url -OutFile $installer
-          Start-Process -Wait -FilePath .\$installer -ArgumentList '/quiet InstallAllUsers=0 PrependPath=0 Include_test=0 TargetDir=C:\Python\${{ matrix.python }}'
-          Remove-Item .\$installer
-
      - name: Unpack Dependencies
        run: |
          cd _deps-vs2022-x64-installed
@@ -45,21 +36,21 @@ jobs:
            7z x $_.FullName
          }

-      - name: Run Build Script
+      - name: ccache
+        # Use fork to resolve cache misses / duplicated cache entries on Windows.
+        uses: Andrej730/ccache-action@main
+        with:
+          key: win-${{ matrix.arch }}
+          # Windows ccache needs ~1GB
+          # and with default 500MB some cache gets deleted, leading to misses.
+          max-size: 5000MB
+
+      - name: Run Build Script And Pack .zip Archives
        shell: cmd
        run: |
-          setlocal EnableDelayedExpansion
-          SET PYTHON_VERSION=${{ matrix.python }}
-          for /f "tokens=1,2,3 delims=." %%a in ("%PYTHON_VERSION%") do ( 
-              set PY_VER_MAJOR_MINOR=%%a%%b
-          )
          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-          SET IFCOS_INSTALL_PYTHON=FALSE
          cd win
-          echo y | call build-deps.cmd vs2022-x64 Release
-          SET PYTHONHOME=C:\Python\${{ matrix.python }}
-          call run-cmake.bat vs2022-x64 -DENABLE_BUILD_OPTIMIZATIONS=On -DGLTF_SUPPORT=ON -DADD_COMMIT_SHA=ON -DVERSION_OVERRIDE=ON
-          call install-ifcopenshell.bat vs2022-x64 Release
+          python build-all-win.py

      - name: Pack Dependencies
        run: |
@@ -81,35 +72,6 @@ jobs:
          git commit -m "Update build artifacts [skip ci]" || echo "No changes to commit"
          git push || echo "Push failed"

-      - name: Package .zip Archives
-        run: |
-          $VERSION = 'v' + ((Get-Content VERSION).Trim())
-          $SHA = ${env:GITHUB_SHA}.Substring(0, 7)
-          $OUTPUT_DIR = "$env:USERPROFILE\output"
-          New-Item -ItemType Directory -Force -Path $OUTPUT_DIR
-
-          if ("${{ matrix.python }}" -eq "3.9.11") {
-            # only for the first python version the executables are assembled for upload
-            cd _installed-vs2022-x64/bin
-            Get-ChildItem -Path . | ForEach-Object {
-              echo $_
-              $exe = $_.Name
-              $baseName = $exe.Substring(0, $exe.Length - 4)
-              $zipName = "${baseName}-$VERSION-$SHA-win64.zip"
-              7z a $zipName $exe
-            }
-            mv *.zip $OUTPUT_DIR
-          }
-
-          $pyVersion = "${{ matrix.python }}"
-          $pyVersionMajor = ($pyVersion -split '\.')[0..1] -join ''
-          cd C:\Python\${{ matrix.python }}\Lib\site-packages
-          Remove-Item -Recurse -Force ifcopenshell\__pycache__ -ErrorAction SilentlyContinue
-          Get-ChildItem -Path ifcopenshell -Filter "*.pyc" -Recurse | Remove-Item -Force
-          $zipName = "ifcopenshell-python-$pyVersionMajor-$VERSION-$SHA-win64.zip"
-          7z a $zipName ifcopenshell
-          mv $zipName $OUTPUT_DIR
-
      - name: Configure AWS Credentials
        uses: aws-actions/configure-aws-credentials@v4
        with:
@@ -34,7 +34,7 @@ jobs:
          cd src/bcf &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -47,6 +47,8 @@ jobs:
        id: ruff
        run: |
          uvx ruff check
+          # It's actually Python 3.6, but ruff only supports 3.7+, but it should do.
+          uvx ruff check nix/build-all.py --target-version py37
        continue-on-error: true

      - name: Final check
@@ -28,7 +28,7 @@ jobs:
          cd src/bsdd &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifc4d &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifc5d &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifccityjson &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcclash &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifccsv &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcdiff &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcfm &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -24,7 +24,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py39, py310, py311, py312, py313, py314]
        config:
          - {
            name: "Windows 64bit",
@@ -61,7 +61,7 @@ jobs:
          cd src/ifcopenshell_${{ matrix.config.short_name }}_${{ matrix.pyver }} &&
          make dist PLATFORM=${{ matrix.config.short_name }} PYVERSION=${{ matrix.pyver }} IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        pyver: [py39, py310, py311, py312]
+        pyver: [py39, py310, py311, py312, py313, py314]
        config:
          - {
            name: "Windows 64bit",
@@ -28,7 +28,7 @@ jobs:
          cd src/ifcpatch &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -0,0 +1,32 @@
+name: ci-ifctester-org
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - src/ifctester/**
+
+jobs:
+  publish_website:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout ifctester_org_static_html
+        uses: actions/checkout@v4
+        with:
+          repository: IfcOpenShell/ifctester_org_static_html
+          token: ${{ secrets.IFCOPENBOT_TOKEN }}
+          path: ifctester_org_static_html
+      - name: Build webapp
+        working-directory: ./src/ifctester
+        run: |
+          sudo apt update && sudo apt install -y nodejs
+          git config --global user.name 'IfcOpenBot'
+          git config --global user.email 'IfcOpenBot@users.noreply.github.com'
+          make webapp-build
+      - name: Commit and push
+        run: |
+          cp -r src/ifctester/webapp/dist/* ifctester_org_static_html/
+          git -C ifctester_org_static_html add .
+          git -C ifctester_org_static_html commit --allow-empty -m "$(git log --oneline -1)"
+          git -C ifctester_org_static_html push
@@ -28,7 +28,7 @@ jobs:
          cd src/ifctester &&
          make dist IS_STABLE=TRUE
      - name: Publish a Python distribution to PyPI
-        uses: ortega2247/pypi-upload-action@master
+        uses: pypa/gh-action-pypi-publish@release/v1
        with:
          user: __token__
          password: ${{ secrets.PYPI_API_TOKEN }}
@@ -49,7 +49,8 @@ jobs:
          python -m pip install --upgrade pip
          pip install xmlschema xsdata numpy lxml pytest isodate lark networkx tabulate python-dateutil shapely
          pip install src/bcf --no-deps
-          pip install https://github.com/Andrej730/aud/archive/refs/heads/master-reduced-size.zip
+          pip install git+https://github.com/zdhoward/aud
+          pip install pytest-xdist==3.8.0

      - name: Install C++ dependencies
        run: |
@@ -69,9 +70,30 @@ jobs:
          libhdf5-dev libcgal-dev libeigen3-dev
          
      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1
+        uses: hendrikmuhs/ccache-action@v1.2
        with:
-          key: ${GITHUB_WORKFLOW}
+          key: ubuntu-22.04-${{ runner.arch }}
+
+      # rocksdb on debian distros misses RTTI?
+      - name: build rocksdb
+        run: |
+          git clone https://github.com/facebook/rocksdb --branch v9.11.2
+          cd rocksdb
+          mkdir build && cd build
+          # rocksdb is using ccache automatically.
+          cmake -DFAIL_ON_WARNINGS=Off \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_INSTALL_PREFIX=/usr/local \
+            -DWITH_TESTS=OFF \
+            -DWITH_TOOLS=OFF \
+            -DWITH_GFLAGS=OFF \
+            -DWITH_BENCHMARK_TOOLS=OFF \
+            -DWITH_CORE_TOOLS=OFF \
+            -DROCKSDB_BUILD_SHARED=Off \
+            -DCMAKE_POSITION_INDEPENDENT_CODE=On \
+            -DUSE_RTTI=On \
+            ..
+          sudo make -j$(nproc) install

      - name: Build ifcopenshell
        run: |
@@ -79,9 +101,9 @@ jobs:
          echo ${{ env.pythonLocation }}
          
          mkdir build && cd build
+          # Ubuntu 22.04's libocct-foundation-dev package doesn't have Config.cmake, so we provide OCC paths directly.
+          # In later versions of Ubuntu, this can be simplified and the OCC paths can be removed.
          cmake \
-               -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-               -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
               -DCMAKE_CXX_STANDARD=17 \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_PREFIX_PATH=/usr \
@@ -92,34 +114,31 @@ jobs:
               -DPYTHON_INCLUDE_DIR:PATH=${{ env.pythonLocation }}/include/python3.11 \
               -DPYTHON_LIBRARY:FILEPATH=${{ env.pythonLocation }}/lib/libpython3.11.so \
               -DCOLLADA_SUPPORT=Off \
+               -DUSE_MMAP=On \
               "-DSCHEMA_VERSIONS=2x3;4;4x3_add2" \
               -DGLTF_SUPPORT=On \
-               -DJSON_INCLUDE_DIR=/usr/include \
-               -DCGAL_INCLUDE_DIR=/usr/include \
-               -DGMP_INCLUDE_DIR=/usr/include \
-               -DMPFR_INCLUDE_DIR=/usr/include \
-               -DGMP_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
-               -DMPFR_LIBRARY_DIR=/usr/lib/x86_64-linux-gnu \
-               -DHDF5_INCLUDE_DIR=/usr/include/hdf5/serial \
-               -DEIGEN_DIR=/usr/include/eigen3 \
+               -DWITH_ROCKSDB=On \
             ../cmake
          sudo make -j $(nproc)
          sudo make install

-      - name: Run IfcConvert on Sample files
-        run: |
-          (find test/input src/bonsai/test/files -name '*.ifc' | while read i; do \
-            echo $i | tee -a log; \
-            timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
-            echo $i $? >> statuses; \
-          done) || true
-          echo Failed 
-          grep -v 0$ statuses
-          grep -v 0$ statuses | wc -l
-          echo Succeeded
-          grep 0$ statuses
-          grep 0$ statuses | wc -l
+      # - name: Run IfcConvert on Sample files
+      #   run: |
+      #     (find test/input src/bonsai/test/files -name '*.ifc' | while read i; do \
+      #       echo $i | tee -a log; \
+      #       timeout 1m "$(which IfcConvert)" -yv "$i" "$i.obj" --validate >> log 2>&1; \
+      #       echo $i $? >> statuses; \
+      #     done) || true
+      #     echo Failed
+      #     grep -v 0$ statuses
+      #     grep -v 0$ statuses | wc -l
+      #     echo Succeeded
+      #     grep 0$ statuses
+      #     grep 0$ statuses | wc -l

+      - name: Run IfcConvert on Sample file
+        run: |
+          IfcConvert test/input/acad2010_walls.ifc test/input/acad2010_walls.obj

      - name: Test ifcopenshell-python
        run: |
@@ -129,7 +148,7 @@ jobs:
          mv ifcopenshell ifcopenshell-local # Force testing on installed module
          pip install -e ../ifcpatch --no-deps # Needed for sql.py tests.
          ERROR=0
-          make test || ERROR=1
+          make test-parallel || ERROR=1
          cd ../bcf && make test || ERROR=1
          pip install requests
          cd ../bsdd && make test || ERROR=1
@@ -107,4 +107,9 @@ src/ifcopenshell-python/ifcopenshell/ifcopenshell_wrapper.py
 src/bonsai/bonsai/bim/schema/Brick.ttl

 bonsaiDecoratorForLoads.code-workspace
+dev_environment.bat

+.pixi/
+
+src/ifcopenshell-python/ifcopenshell/express/*.exp
+src/ifcopenshell-python/ifcopenshell/express/*.exp.cache.dat
@@ -37,25 +37,25 @@ Contents

 | Name                      | Description                                                           | License             | Service |
 | ------------------------- | --------------------------------------------------------------------- | ------------------- | ------- |
-| bcf                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/bcf-client/badges/version.svg)](https://anaconda.org/conda-forge/bcf-client) |
-| bonsai                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
-| bsdd                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
-| ifc2ca                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
-| ifc4d                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |
-| ifc5d                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc5d?label=PyPI&color=006dad)](https://pypi.org/project/ifc5d/) |
-| ifcbimtester              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
+| [bcf](https://docs.ifcopenshell.org/bcf.html)                       | Library to read and write BCF-XML and query OpenCDE BCF-API modules   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bcf-client?label=PyPI&color=006dad)](https://pypi.org/project/bcf-client/) [![Anaconda-Server Badge](https://anaconda.org/conda-forge/bcf-client/badges/version.svg)](https://anaconda.org/conda-forge/bcf-client) |
+| [bonsai](https://docs.ifcopenshell.org/bonsai.html)                    | Add-on to Blender providing a graphical native IFC authoring platform | GPL-3.0-or-later    | [![Official](https://img.shields.io/badge/BonsaiBIM.org-Download-70ba35)](https://bonsaibim.org/download.html) [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=bonsai-*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=bonsai&expanded=true) [![Chocolatey](https://img.shields.io/chocolatey/v/blenderbim-nightly?label=Chocolatey&color=5c9fd8)](https://community.chocolatey.org/packages/blenderbim-nightly/) |
+| [bsdd](https://docs.ifcopenshell.org/bsdd.html)                      | Library to query the bSDD API                                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/bsdd?label=PyPI&color=006dad)](https://pypi.org/project/bsdd/) |
+| [ifc2ca](https://docs.ifcopenshell.org/ifc2ca.html)                    | Utility to convert IFC structural analysis models to Code_Aster       | LGPL-3.0-or-later   |
+| [ifc4d](https://docs.ifcopenshell.org/ifc4d.html)                     | Convert to and from IFC and project management software               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc4d?label=PyPI&color=006dad)](https://pypi.org/project/ifc4d/) |
+| [ifc5d](https://docs.ifcopenshell.org/ifc5d.html)                     | Report and optimise cost information from IFC                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifc5d?label=PyPI&color=006dad)](https://pypi.org/project/ifc5d/) |
+| [ifcbimtester](https://docs.ifcopenshell.org/bimtester.html)              | Wrapper for Gherkin based unit testing for IFC models                 | LGPL-3.0-or-later   |
 | ifcblender                | Historic Blender IFC import add-on                                    | LGPL-3.0-or-later\* |
-| ifccityjson               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
-| ifcclash                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
-| ifcconvert                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
-| ifccsv                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
-| ifcdiff                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
-| ifcfm                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
-| ifcmax                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
-| ifcopenshell-python       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
-| ifcpatch                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
-| ifcsverchok               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
-| ifctester                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |
+| [ifccityjson](https://docs.ifcopenshell.org/ifccityjson.html)               | Convert CityJSON to IFC                                               | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccityjson?label=PyPI&color=006dad)](https://pypi.org/project/ifccityjson/) |
+| [ifcclash](https://docs.ifcopenshell.org/ifcclash.html)                  | Clash detection library and CLI app                                   | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcclash?label=PyPI&color=006dad)](https://pypi.org/project/ifcclash/) |
+| [ifcconvert](https://docs.ifcopenshell.org/ifcconvert.html)                | CLI app to convert IFC to many other formats                          | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcconvert/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcconvert-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcconvert&expanded=true)
+| [ifccsv](https://docs.ifcopenshell.org/ifccsv.html)                    | Library and CLI app to export and import schedules from IFC           | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifccsv?label=PyPI&color=006dad)](https://pypi.org/project/ifccsv/) |
+| [ifcdiff](https://docs.ifcopenshell.org/ifcdiff.html)                   | Compare changes between IFC models                                    | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcdiff?label=PyPI&color=006dad)](https://pypi.org/project/ifcdiff/) |
+| [ifcfm](https://docs.ifcopenshell.org/ifcfm.html)                     | Extract IFC data for FM handover requirements                         | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcfm?label=PyPI&color=006dad)](https://pypi.org/project/ifcfm/) |
+| [ifcmax](https://docs.ifcopenshell.org/ifcmax.html)                    | Historic extension for IFC support in 3DS Max                         | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcmax.html)
+| [ifcopenshell-python](https://docs.ifcopenshell.org/ifcopenshell-python.html)       | Python library for IFC manipulation                                   | LGPL-3.0-or-later\* | [![Official](https://img.shields.io/badge/IfcOpenShell.org-Download-70ba35)](https://docs.ifcopenshell.org/ifcopenshell-python/installation.html) [![GitHub](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcopenshell-python-*&label=GitHub&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcopenshell-python&expanded=true) [![PyPI](https://img.shields.io/pypi/v/ifcopenshell?label=PyPI&color=006dad)](https://pypi.org/project/ifcopenshell/) [![Anaconda](https://img.shields.io/conda/vn/conda-forge/ifcopenshell?label=Anaconda&color=43b02a)](https://anaconda.org/conda-forge/ifcopenshell) [![Anaconda](https://img.shields.io/conda/vn/ifcopenshell/ifcopenshell?label=Anaconda-Unstable&color=43b02a)](https://anaconda.org/ifcopenshell/ifcopenshell) [![Docker](https://img.shields.io/docker/pulls/aecgeeks/ifcopenshell?label=Docker&color=1D63ED)](https://hub.docker.com/r/aecgeeks/ifcopenshell) [![AUR](https://img.shields.io/aur/version/ifcopenshell?label=AUR&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell) [![AUR Unstable](https://img.shields.io/aur/version/ifcopenshell-git?label=AUR-Unstable&color=1793d1)](https://aur.archlinux.org/packages/ifcopenshell-git) |
+| [ifcpatch](https://docs.ifcopenshell.org/ifcpatch.html)                  | Utility to run pre-packaged scripts to manipulate IFCs                | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifcpatch?label=PyPI&color=006dad)](https://pypi.org/project/ifcpatch/) |
+| [ifcsverchok](https://docs.ifcopenshell.org/ifcsverchok.html)               | Blender Add-on for visual node programming with IFC                   | GPL-3.0-or-later    | [![GitHub Unstable](https://img.shields.io/github/v/release/ifcopenshell/ifcopenshell?filter=ifcsverchok-*.*.*.*&label=GitHub-Unstable&color=f6f8fa)](https://github.com/IfcOpenShell/IfcOpenShell/releases?q=ifcsverchok&expanded=true)
+| [ifctester](https://docs.ifcopenshell.org/ifctester.html)                 | Library, CLI and webapp for IDS model auditing                        | LGPL-3.0-or-later   | [![PyPI](https://img.shields.io/pypi/v/ifctester?label=PyPI&color=006dad)](https://pypi.org/project/ifctester/) |

 The IfcOpenShell C++ codebase is split into multiple interal libraries:

@@ -27,20 +27,17 @@ endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON) # not necessary, but encouraged
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-endif()
-
 add_definitions(-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)

-cmake_policy(SET CMP0048 NEW)
-cmake_policy(SET CMP0074 NEW)
-cmake_policy(SET CMP0078 NEW)
-cmake_policy(SET CMP0086 NEW)
-if (POLICY CMP0144)
+if(POLICY CMP0141) # 3.25+
+  cmake_policy(SET CMP0141 NEW) # Support for `CMAKE_MSVC_DEBUG_INFORMATION_FORMAT`.
+endif()
+if(POLICY CMP0144) # 3.27
    cmake_policy(SET CMP0144 NEW) # find_package() uses upper-case <PACKAGENAME>_ROOT variables.
 endif()
+if(POLICY CMP0167) # 3.30
+    cmake_policy(SET CMP0167 OLD)
+endif()

 if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE "Release")
@@ -69,7 +66,7 @@ option(BUILD_IFCPYTHON "Build IfcPython." ON)
 option(BUILD_CONVERT "Build IfcConvert executable." ON)
 option(BUILD_DOCUMENTATION "Build IfcOpenShell Documentation." OFF)
 option(BUILD_EXAMPLES "Build example applications." ON)
-option(BUILD_GEOMSERVER "Build IfcGeomServer executable." ON)
+option(BUILD_GEOMSERVER "Build IfcGeomServer executable (Open CASCADE is required)." ON)
 option(BUILD_IFCMAX "Build IfcMax, a 3ds Max plug-in, Windows-only." OFF)
 option(BUILD_QTVIEWER "Build IfcOpenShell Qt GUI Viewer" OFF) # QtViewer requires Qt6
 option(BUILD_PACKAGE "" OFF)
@@ -84,10 +81,18 @@ option(IFCXML_SUPPORT "Build IfcParse with ifcXML support (requires libxml2)." O
 option(USD_SUPPORT "Build IfcConvert with USD support (requires pixar's USD library)." OFF)
 option(CITYJSON_SUPPORT "Build IfcConvert with CityJSON support (requires CityJSON library)." OFF)
 option(WITH_RELATIONSHIP_VALIDATION "Build IfcConvert with option to validate geometrical relationships." OFF)
+option(WITH_ROCKSDB "Support a RocksDB key-value store as a file backend in IfcOpenShell" OFF)
+option(WITH_ZSTD "Use Zstd compression in RocksDB writes" OFF)

 option(USERSPACE_PYTHON_PREFIX "Installs IfcPython for the current user only instead of system-wide." OFF)
-option(ADD_COMMIT_SHA "Add commit sha and branch in version number, warning results in many rebuilds, requires git" OFF)
-option(VERSION_OVERRIDE "Override the version defined in IfcParse.h with the file VERSION in the repository root" OFF)
+option(ADD_COMMIT_SHA "Add commit sha and branch in version number, requires git" OFF)
+option(VERSION_OVERRIDE "Override the version defined in buildinfo.cpp with the file VERSION in the repository root" OFF)
+
+set(
+    PYTHON_MODULE_INSTALL_DIR
+    "" CACHE PATH
+    "Directory to install IfcPython package to. By default package is installed in found Python's site-packages."
+)

 if (VERSION_OVERRIDE)
    file(READ "../VERSION" "RELEASE_VERSION_")
@@ -116,6 +121,28 @@ if((BUILD_CONVERT OR BUILD_GEOMSERVER OR BUILD_IFCPYTHON) AND(NOT BUILD_IFCGEOM)
    set(BUILD_IFCGEOM ON)
 endif()

+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+    message(STATUS "`ccache` is found, using it as a compiler launcher.")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_FOUND}")
+    if(MSVC)
+        # By default Visual Studio generators will use /Zi which is not compatible
+        # with ccache, so tell Visual Studio to use /Z7 instead.
+        set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
+        # Not needed for Ninja.
+        if(CMAKE_GENERATOR MATCHES "Visual Studio")
+            file(COPY_FILE
+                ${CCACHE_FOUND} ${CMAKE_BINARY_DIR}/cl.exe
+                ONLY_IF_DIFFERENT)
+            set(CMAKE_VS_GLOBALS
+                "CLToolExe=cl.exe"
+                "CLToolPath=${CMAKE_BINARY_DIR}"
+                "UseMultiToolTask=true"
+            )
+        endif()
+    endif()
+endif()
+
 if(MSVC AND MSVC_PARALLEL_BUILD)
    add_definitions("/MP")
 endif()
@@ -181,6 +208,8 @@ if(NOT MINIMAL_BUILD)
    UNIFY_ENVVARS_AND_CACHE(LIBXML2_INCLUDE_DIR)
    UNIFY_ENVVARS_AND_CACHE(LIBXML2_LIBRARIES)
    UNIFY_ENVVARS_AND_CACHE(PCRE_LIBRARY_DIR)
+    UNIFY_ENVVARS_AND_CACHE(PYTHON_INCLUDE_DIR)
+    UNIFY_ENVVARS_AND_CACHE(PYTHON_LIBRARY)
    UNIFY_ENVVARS_AND_CACHE(PYTHON_EXECUTABLE)
    UNIFY_ENVVARS_AND_CACHE(HDF5_INCLUDE_DIR)
    UNIFY_ENVVARS_AND_CACHE(HDF5_LIBRARY_DIR)
@@ -222,6 +251,25 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 endmacro()

 if(WITH_CGAL)
+    if(NOT CGAL_INCLUDE_DIR)
+	# CGAL is not respecting default Boost_USE_STATIC_LIBS value
+	# and sometiems it's getting in the way.
+	if(NOT DEFINED Boost_USE_STATIC_LIBS)
+		set(CGAL_Boost_USE_STATIC_LIBS OFF)
+	else()
+		set(CGAL_Boost_USE_STATIC_LIBS "${Boost_USE_STATIC_LIBS}")
+	endif()
+        find_package(CGAL REQUIRED)
+        if(NOT CGAL_DIR)
+            message(
+                FATAL_ERROR
+                "CGAL_SUPPORT enabled, but CGAL_INCLUDE_DIR wasn't provided and CGAL package couldn't be found."
+            )
+        endif()
+        message(STATUS "CGAL: found config at '${CGAL_DIR}'.")
+        link_libraries(CGAL::CGAL)
+    endif()
+
    add_definitions(-DIFOPSH_WITH_CGAL)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_CGAL)

@@ -240,22 +288,33 @@ endif()

 if(GLTF_SUPPORT OR CITYJSON_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(JSON_INCLUDE_DIR)
-    clear_wasm_sysroot()
-    find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
-    restore_wasm_sysroot()
-    set(JSON_INCLUDE_DIR ${json_header_path})
+    if(NOT JSON_INCLUDE_DIR)
+        find_package(nlohmann_json CONFIG)
+        if(nlohmann_json_DIR)
+            link_libraries(nlohmann_json::nlohmann_json)
+        else()
+            message(STATUS "Unable to find nlohmann_json package, trying to find it as a header-only library.")
+        endif()
+    endif()

-    if(json_header_path)
-        message(STATUS "JSON for Modern C++ header file found in ${JSON_INCLUDE_DIR}")
-    else()
-        message(FATAL_ERROR "Unable to find JSON for Modern C++ header file, aborting")
+    if(NOT nlohmann_json_DIR)
+        clear_wasm_sysroot()
+        find_path(json_header_path "nlohmann/json.hpp" HINTS ${JSON_INCLUDE_DIR})
+        restore_wasm_sysroot()
+        set(JSON_INCLUDE_DIR ${json_header_path})
+
+        if(json_header_path)
+            message(STATUS "JSON for Modern C++ header file found in '${JSON_INCLUDE_DIR}'.")
+        else()
+            message(FATAL_ERROR "Unable to find JSON for Modern C++ header file / package, aborting")
+        endif()
    endif()

    add_definitions(-DWITH_GLTF)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_GLTF)
 endif()

-# Add USD support to serializers 
+# Add USD support to serializers
 if(USD_SUPPORT)
    UNIFY_ENVVARS_AND_CACHE(USD_INCLUDE_DIR)
    UNIFY_ENVVARS_AND_CACHE(USD_LIBRARY_DIR)
@@ -278,13 +337,13 @@ if(USD_SUPPORT)
    endif()

    set(USD_LIBRARIES
-            usd_usd 
+            usd_usd
            usd_usdGeom
-            usd_usdShade 
-            usd_usdLux 
-            usd_vt 
-            usd_sdf 
-            usd_tf 
+            usd_usdShade
+            usd_usdLux
+            usd_vt
+            usd_sdf
+            usd_tf
            usd_gf
        )

@@ -302,6 +361,38 @@ if(USD_SUPPORT)
    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_USD)
 endif(USD_SUPPORT)

+if (WITH_ROCKSDB)
+    # Temporaily mess with CMAKE_FIND_PACKAGE_PREFER_CONFIG to help RocksDB
+    # find it's zstd dependency on Windows.
+    # Only do it on Windows, otherwise it might create problems as
+    # findzstd and zstd-config target names do not match.
+    if(WIN32)
+        set(TEMP CMAKE_FIND_PACKAGE_PREFER_CONFIG)
+        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
+    endif()
+    find_package(RocksDB CONFIG REQUIRED)
+    if(WIN32)
+        set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ${TEMP})
+    endif()
+
+    message(STATUS "RocksDB: found at '${RocksDB_DIR}'.")
+    add_definitions(-DIFOPSH_WITH_ROCKSDB)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB)
+    link_libraries(RocksDB::rocksdb)
+
+    if (WITH_ZSTD)
+        # @todo do we actually need the zstd include dir or rather just pass
+        # the libzstd.a along with the rocksdb library when needed and feature
+        # detect based on rocksdb API?
+        find_package(zstd CONFIG REQUIRED)
+        message(STATUS "zstd: found at '${zstd_DIR}'.")
+        link_libraries(zstd::libzstd_static)
+
+        add_definitions(-DIFOPSH_WITH_ROCKSDB_ZSTD)
+        set(SWIG_DEFINES ${SWIG_DEFINES} -DIFOPSH_WITH_ROCKSDB_ZSTD)
+    endif()
+endif()
+
 # Find Boost: On win32 the (hardcoded) default is to use static libraries and
 # runtime, when doing running conda-build we pick what conda prepared for us.
 if(WIN32 AND("$ENV{CONDA_BUILD}" STREQUAL ""))
@@ -335,7 +426,7 @@ if(WASM_BUILD)
 else()
    # @todo review this, shouldn't this be all possible header-only now?
    # ... or rewritten using C++17 features?
-    set(BOOST_COMPONENTS system program_options regex thread date_time)
+    set(BOOST_COMPONENTS system program_options regex thread date_time iostreams)
 endif()

 if(USE_MMAP)
@@ -358,7 +449,34 @@ message(STATUS "Boost libraries found in ${Boost_LIBRARY_DIRS}")
 if(NOT MINIMAL_BUILD)
    # libxml2 is required for IFCXML (optional) and SVGFILL (mandatory)
    clear_wasm_sysroot()
-    find_package(LibXml2 REQUIRED)
+    if(IFCXML_SUPPORT)
+        if((NOT LIBXML2_INCLUDE_DIR AND NOT LIBXML2_LIBRARIES))
+            # First try config mode (probably works with vcpkg, Conan, macOS brew installs, but not on ubuntu 22.04)
+            # CONFIG is provided using root path, so no need to clear sysroot here.
+            restore_wasm_sysroot()
+            find_package(LibXml2 REQUIRED CONFIG)
+            clear_wasm_sysroot()
+
+            if(NOT LibXml2_FOUND)
+                # Fallback to CMake's builtin FindLibXml2 module (works on Ubuntu)
+                find_package(LibXml2 REQUIRED)
+            else()
+                message(STATUS "Found LibXml2 config: ${LibXml2_DIR}")
+            endif()
+
+            if(TARGET LibXml2::LibXml2)
+                # Config mode already gives us the target
+                set(LIBXML2_LIBRARIES LibXml2::LibXml2)
+                get_target_property(LIBXML2_INCLUDE_DIR LibXml2::LibXml2 INTERFACE_INCLUDE_DIRECTORIES)
+            else()
+                # Module mode (Ubuntu)
+                set(LIBXML2_LIBRARIES ${LibXml2_LIBRARIES})
+                set(LIBXML2_INCLUDE_DIR ${LibXml2_INCLUDE_DIRS})
+            endif()
+        else()
+            find_package(LibXml2 REQUIRED)
+        endif()
+    endif()
    restore_wasm_sysroot()
 endif()

@@ -368,50 +486,73 @@ if(IFCXML_SUPPORT)
 endif()

 if(BUILD_IFCGEOM)
-    if(MSVC)
+    if(MSVC AND NOT LibXml2_DIR)
        add_debug_variants(LIBXML2_LIBRARIES "${LIBXML2_LIBRARIES}" d)
    endif()

    # Open CASCADE
    if(WITH_OPENCASCADE)
-    if("${OCC_INCLUDE_DIR}" STREQUAL "")
-	clear_wasm_sysroot()
-        find_path(OCC_INCLUDE_DIR Standard_Version.hxx
-            PATHS
-                /usr/include/occt
-                /usr/include/oce
-                /usr/include/opencascade
-            REQUIRED
-        )
-	restore_wasm_sysroot()
-
-        if(OCC_INCLUDE_DIR)
-            message(STATUS "Found Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
-        else()
-            message(FATAL_ERROR "Unable to find Open CASCADE include directory, specify OCC_INCLUDE_DIR manually.")
-        endif()
-    else()
+    if(OCC_INCLUDE_DIR)
        set(OCC_INCLUDE_DIR ${OCC_INCLUDE_DIR} CACHE FILEPATH "Open CASCADE header files")
        message(STATUS "Looking for Open CASCADE include files in: ${OCC_INCLUDE_DIR}")
    endif()

-    if(OCC_INCLUDE_DIR)
+    if(OCC_LIBRARY_DIR)
+        set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
+        message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
+    endif()
+
+    # No specific paths specified, try to find package.
+    if(OCC_INCLUDE_DIR AND OCC_LIBRARY_DIR)
+        message(
+            STATUS
+            "Using provided OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') "
+            "and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}')."
+        )
+        # Parse OCC_VERSION_STRING.
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAJOR
            REGEX "#define OCC_VERSION_MAJOR.*"
        )
        string(REGEX MATCH "[0-9]+" OCC_MAJOR ${OCC_MAJOR})
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MINOR
-          REGEX "#define OCC_VERSION_MINOR.*"
+            REGEX "#define OCC_VERSION_MINOR.*"
        )
        string(REGEX MATCH "[0-9]+" OCC_MINOR ${OCC_MINOR})
        file(STRINGS ${OCC_INCLUDE_DIR}/Standard_Version.hxx OCC_MAINT
-          REGEX "#define OCC_VERSION_MAINTENANCE.*"
+            REGEX "#define OCC_VERSION_MAINTENANCE.*"
        )
        string(REGEX MATCH "[0-9]+" OCC_MAINT ${OCC_MAINT})
        set(OCC_VERSION_STRING "${OCC_MAJOR}.${OCC_MINOR}.${OCC_MAINT}")
-    endif(OCC_INCLUDE_DIR)
+    elseif(NOT OCC_INCLUDE_DIR AND NOT OCC_LIBRARY_DIR)
+        # OCE is not supported for find_package, because it's using a different name (`oce`)
+        # and also has an odd directory structure (install/lib/oce-0.18/*.cmake).
+        find_package(OpenCASCADE CONFIG REQUIRED)
+        set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
+        # Do not use OpenCASCADE_LIBRARY_DIR for OCC_LIBRARY_DIR - check target property explicitly.
+        # On Windows there is a case with OpenCASCADE_LIBRARY_DIR points to `lib` folder,
+        # while TKernel is actually in `libi`.
+        get_target_property(TKERNEL_LIB_PATH TKernel LOCATION)
+        get_filename_component(OCC_LIBRARY_DIR "${TKERNEL_LIB_PATH}" DIRECTORY)
+        set(OCC_VERSION_STRING ${OpenCASCADE_VERSION})
+        message(
+            STATUS
+            "Found Open CASCADE package at '${OpenCASCADE_DIR}', "
+            "deducing from it OCC_INCLUDE_DIR: '${OCC_INCLUDE_DIR}' "
+            "and OCC_LIBRARY_DIR: '${OCC_LIBRARY_DIR}'."
+        )
+    else()
+        message(
+            FATAL_ERROR
+            "Couldn't find Open CASCADE installation. "
+            "Either both OCC_INCLUDE_DIR ('${OCC_INCLUDE_DIR}') and OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}') "
+            "must be specified or OpenCASCADE package should be discoverable. "
+            "If you're using OCE, then providing a package is not available "
+            "and you need to provide OCE_INCLUDE_DIR and OCE_LIBRARY_DIR directly."
+        )
+    endif()

-    set(OPENCASCADE_LIBRARY_NAMES
+    set(
+        OPENCASCADE_LIBRARY_NAMES
        TKernel TKMath TKBRep TKGeomBase TKGeomAlgo TKG3d TKG2d TKShHealing TKTopAlgo TKMesh TKPrim TKBool TKBO
        TKFillet TKXSBase TKOffset TKHLR

@@ -425,24 +566,6 @@ if(BUILD_IFCGEOM)
        list(APPEND OPENCASCADE_LIBRARY_NAMES TKDESTEP TKDEIGES)
    endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)

-    if("${OCC_LIBRARY_DIR}" STREQUAL "")
-        find_library(OCC_LIBRARY TKernel
-            PATHS
-                /usr/lib
-            REQUIRED
-        )
-
-        if(OCC_LIBRARY)
-            GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
-            message(STATUS "Found Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-        else()
-            message(FATAL_ERROR "Unable find Open CASCADE library directory, specify OCC_LIBRARY_DIR manually.")
-        endif()
-    else()
-        set(OCC_LIBRARY_DIR ${OCC_LIBRARY_DIR} CACHE FILEPATH "Open CASCADE library files")
-        message(STATUS "Looking for Open CASCADE library files in: ${OCC_LIBRARY_DIR}")
-    endif()
-
    clear_wasm_sysroot()
    find_library(libTKernel NAMES TKernel TKerneld PATHS ${OCC_LIBRARY_DIR} NO_DEFAULT_PATH)
    restore_wasm_sysroot()
@@ -450,7 +573,10 @@ if(BUILD_IFCGEOM)
    if(libTKernel)
        message(STATUS "Required Open Cascade Library files found")
    else()
-        message(FATAL_ERROR "Unable to find Open Cascade library files, aborting")
+        message(
+            FATAL_ERROR
+            "Unable to find Open Cascade library files in OCC_LIBRARY_DIR ('${OCC_LIBRARY_DIR}'), aborting"
+        )
    endif()

    # Use the found libTKernel as a template for all other OCC libraries
@@ -481,7 +607,7 @@ if(BUILD_IFCGEOM)

    if(OCCT_STATIC)
        find_package(Threads)
-        
+
        if(WASM_BUILD)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
        else()
@@ -493,7 +619,7 @@ if(BUILD_IFCGEOM)
                set(OPENCASCADE_LIBRARIES -Wl,--start-group ${OPENCASCADE_LIBRARIES} -Wl,--end-group ${CMAKE_THREAD_LIBS_INIT})
            endif()
        endif()
-        
+
        if(NOT APPLE AND NOT WIN32)
            set(OPENCASCADE_LIBRARIES ${OPENCASCADE_LIBRARIES} "rt")
        endif()
@@ -504,7 +630,18 @@ if(BUILD_IFCGEOM)
    endif(WITH_OPENCASCADE)
 endif(BUILD_IFCGEOM)

-if(COLLADA_SUPPORT)
+if(COLLADA_SUPPORT AND (NOT OPENCOLLADA_INCLUDE_DIR AND NOT OPENCOLLADA_LIBRARY_DIR))
+    # If package is found, automatically sets
+    # OPENCOLLADA_INCLUDE_DIRS and OPENCOLLADA_LIBRARIES (list of targets, not paths).
+    find_package(OpenCOLLADA CONFIG)
+    if(OpenCOLLADA_DIR)
+        message(STATUS "Found OpenCOLLADA: '${OpenCOLLADA_DIR}'.")
+        set(OPENCOLLADA_FOUND TRUE)
+    else()
+        message(STATUS "OpenCOLLADA package not found, falling back to manual search.")
+    endif()
+endif()
+if(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
    # Find OpenCOLLADA
    if("${OPENCOLLADA_INCLUDE_DIR}" STREQUAL "")
        message(STATUS "No OpenCOLLADA include directory specified")
@@ -537,8 +674,7 @@ if(COLLADA_SUPPORT)

    if(COLLADASWStreamWriter_h)
        message(STATUS "OpenCOLLADA header files found")
-        add_definitions(-DWITH_OPENCOLLADA)
-        set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
+        set(OPENCOLLADA_FOUND TRUE)

        set(OPENCOLLADA_LIBRARY_NAMES
            GeneratedSaxParser MathMLSolver OpenCOLLADABaseUtils OpenCOLLADAFramework OpenCOLLADASaxFrameworkLoader
@@ -586,7 +722,12 @@ if(COLLADA_SUPPORT)
        message(FATAL_ERROR "COLLADA_SUPPORT enabled, but unable to find OpenCOLLADA headers. "
            "Disable COLLADA_SUPPORT or fix OpenCOLLADA paths to proceed.")
    endif()
-endif(COLLADA_SUPPORT)
+endif(COLLADA_SUPPORT AND NOT OpenCOLLADA_DIR)
+if(COLLADA_SUPPORT AND OPENCOLLADA_FOUND)
+    add_definitions(-DWITH_OPENCOLLADA)
+    set(SWIG_DEFINES ${SWIG_DEFINES} -DWITH_OPENCOLLADA)
+endif()
+

 if(HDF5_SUPPORT)
    if("${HDF5_INCLUDE_DIR}" STREQUAL "")
@@ -653,15 +794,26 @@ if(HDF5_SUPPORT)
        endif()
    endif()

-    if(NOT HDF5_LIBRARIES)
-        # debian default
-        set(HDF5_LIBRARIES
-            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5_cpp.so
-            /usr/lib/x86_64-linux-gnu/hdf5/serial/libhdf5.so
-            /usr/lib/x86_64-linux-gnu/libsz.so
-            /usr/lib/x86_64-linux-gnu/libaec.so
-            z dl
-        )
+    if(NOT HDF5_INCLUDE_DIR OR NOT HDF5_LIBRARY_DIR)
+        # First try to find it as a config.
+        find_package(HDF5 CONFIG)
+        if(HDF5_DIR)
+            message(STATUS "HDF5: found config at '${HDF5_DIR}'.")
+            set(HDF5_LIBRARIES hdf5_cpp-static)
+        else()
+            # If it failed, still try to find as a module.
+            # E.g. on Ubuntu `libhdf5-dev` doesn't provie hdf5-config.cmake.
+            # Will automatically fill HDF5_LIBRARIES and HDF5_INCLUDE_DIR.
+            find_package(HDF5 COMPONENTS CXX)
+            if(NOT HDF5_INCLUDE_DIR)
+                message(
+                    FATAL_ERROR
+                    "HDF5_INCLUDE_DIR is not provided (current value: '${HDF5_INCLUDE_DIR}'). "
+                    "HDF5_LIBRARY_DIR is not provided (current value: '${HDF5_LIBRARY_DIR}'). "
+                    "Also could not find HDF5 package (neither module or config)."
+                )
+            endif()
+        endif()
    endif()

    add_definitions(-DWITH_HDF5)
@@ -778,6 +930,23 @@ else()
    endif()
 endif(MSVC)

+
+# Ensure other dependencies are provided.
+if(NOT EXISTS "${EIGEN_DIR}")
+    find_package(Eigen3 CONFIG)
+    if(Eigen3_DIR)
+        message(STATUS "Eigen3: found config at '${Eigen3_DIR}'.")
+    else()
+        message(
+            FATAL_ERROR
+            "EIGEN_DIR is not provided or provided folder doesn't exist (current value: '${EIGEN_DIR}'). "
+            "Also couldn't find Eigen3 as a package."
+        )
+    endif()
+    link_libraries(Eigen3::Eigen)
+endif()
+
+
 include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCLUDE_DIRS}
 	${Boost_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${JSON_INCLUDE_DIR} ${HDF5_INCLUDE_DIR}
    ${EIGEN_DIR} ${CGAL_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${MPFR_INCLUDE_DIR} ${USD_INCLUDE_DIR}
@@ -787,7 +956,7 @@ include_directories(${INCLUDE_DIRECTORIES} ${OCC_INCLUDE_DIR} ${OPENCOLLADA_INCL
 if(NOT SCHEMA_VERSIONS)
    if(WASM_BUILD)
        # super arbitrarily try to keep size down at least a little bit
-        set(SCHEMA_VERSIONS "2x3" "4")
+        set(SCHEMA_VERSIONS "2x3" "4" "4x3_add2")
    else()
        set(SCHEMA_VERSIONS "2x3" "4" "4x1" "4x2" "4x3" "4x3_tc1" "4x3_add1" "4x3_add2")
    endif()
@@ -875,11 +1044,7 @@ if(BUILD_IFCGEOM)
 	foreach(schema ${SCHEMA_VERSIONS})
 		set(IFCGEOM_SCHEMA_LIBRARIES ${IFCGEOM_SCHEMA_LIBRARIES} geometry_mapping_ifc${schema})
 	endforeach()
-	if(WASM_BUILD)
-	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
-	else()
-	    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})	
-	endif()
+    set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} IfcGeom ${IFCGEOM_SCHEMA_LIBRARIES})
 endif()

 if(BUILD_CONVERT OR BUILD_IFCPYTHON)
@@ -893,12 +1058,14 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
            set(GEOM_SERIALIZER_SCHEMA_LIBRARIES ${GEOM_SERIALIZER_SCHEMA_LIBRARIES} GeometrySerializers_ifc${schema})

            add_library(geometry_serializer_ifc${schema} STATIC ../src/ifcgeom/Serialization/schema/Serialization.cpp)
-            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
+            set_target_properties(geometry_serializer_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOMSERIALIZATION_EXPORTS -DIfcSchema=Ifc${schema}")
+            target_link_libraries(geometry_serializer_ifc${schema} ${OPENCASCADE_LIBRARIES})
            list(APPEND geometry_serializer_libraries geometry_serializer_ifc${schema})
        endforeach()

-        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.cpp)
-        target_link_libraries(geometry_serializer ${geometry_serializer_libraries})
+        add_library(geometry_serializer STATIC ../src/ifcgeom/Serialization/Serialization.h ../src/ifcgeom/Serialization/Serialization.cpp)
+        set_target_properties(geometry_serializer PROPERTIES COMPILE_FLAGS "-DIFC_GEOMSERIALIZATION_EXPORTS")
+        target_link_libraries(geometry_serializer ${geometry_serializer_libraries} IfcParse)
        set(IFCOPENSHELL_LIBRARIES ${IFCOPENSHELL_LIBRARIES} geometry_serializer ${geometry_serializer_libraries})
    endif()
 endif()
@@ -937,8 +1104,12 @@ endforeach()
 set(IFCPARSE_FILES ${IFCPARSE_CPP_FILES} ${IFCPARSE_H_FILES})

 add_library(IfcParse ${IFCPARSE_FILES})
+target_link_libraries(IfcParse ${STDCPPFS})
 set_target_properties(IfcParse PROPERTIES COMPILE_FLAGS -DIFC_PARSE_EXPORTS VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

+if(LibXml2_DIR)
+    target_compile_definitions(IfcParse PRIVATE ${LIBXML2_DEFINITIONS})
+endif()
 if(WASM_BUILD)
    target_link_libraries(IfcParse ${BCRYPT_LIBRARIES} ${LIBXML2_LIBRARIES})
 else()
@@ -946,7 +1117,11 @@ else()
 endif()

 if(BUILD_IFCGEOM)
-    if(WITH_CGAL)
+    # CGAL::CGAL target already has dependencies resolved.
+    if(WITH_CGAL AND CGAL_DIR)
+        set(CGAL_LIBRARIES CGAL::CGAL)
+        message(STATUS "Using found CGAL package at '${CGAL_DIR}'")
+    elseif(WITH_CGAL AND NOT CGAL_DIR)
 	clear_wasm_sysroot()
        find_library(libGMP NAMES gmp mpir PATHS ${GMP_LIBRARY_DIR} NO_DEFAULT_PATH)
        find_library(libMPFR NAMES mpfr PATHS ${MPFR_LIBRARY_DIR} NO_DEFAULT_PATH)
@@ -967,24 +1142,24 @@ if(BUILD_IFCGEOM)
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/kernels/${kernel}/*.cpp)
        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES})
-        
-        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES})
-        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOM_EXPORTS")
+
+        add_library(geometry_kernel_${kernel} ${IFCGEOM_FILES} ../src/ifcgeom/kernels/ifc_geomlibrary_api.h)
+        set_property(TARGET geometry_kernel_${kernel} APPEND PROPERTY COMPILE_FLAGS "-DIFC_GEOMLIBRARY_EXPORTS")
        # needed?
        # if(NOT WASM_BUILD)
        # endif()
-        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES})
+        target_link_libraries(geometry_kernel_${kernel} ${${KERNEL_UPPER}_LIBRARIES} IfcGeom IfcParse)
        list(APPEND kernel_libraries geometry_kernel_${kernel})
-        
+
        if(${kernel} STREQUAL "cgal")
            set_property(TARGET geometry_kernel_${kernel} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCGAL_HAS_THREADS")

            add_library(geometry_kernel_${kernel}_simple ${IFCGEOM_FILES})
-            set_target_properties(geometry_kernel_${kernel}_simple PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
+            set_target_properties(geometry_kernel_${kernel}_simple PROPERTIES COMPILE_FLAGS "-DIFC_GEOMLIBRARY_EXPORTS -DIFOPSH_SIMPLE_KERNEL -DCGAL_HAS_THREADS")
            # needed?
            # if(NOT WASM_BUILD)
            # endif()
-            target_link_libraries(geometry_kernel_${kernel}_simple ${${KERNEL_UPPER}_LIBRARIES})
+            target_link_libraries(geometry_kernel_${kernel}_simple ${${KERNEL_UPPER}_LIBRARIES} IfcGeom IfcParse)
            list(APPEND kernel_libraries geometry_kernel_${kernel}_simple)
        endif()
    endforeach()
@@ -995,10 +1170,13 @@ if(BUILD_IFCGEOM)
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/mapping/*.h)
        file(GLOB IFCGEOM_CPP_FILES ../src/ifcgeom/mapping/*.cpp)
        set(IFCGEOM_FILES ${IFCGEOM_CPP_FILES} ${IFCGEOM_H_FILES} ${IFCGEOM_I_FILES})
-        
+
        add_library(geometry_mapping_ifc${schema} STATIC ${IFCGEOM_FILES})
        set_target_properties(geometry_mapping_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
        target_link_libraries(geometry_mapping_ifc${schema} IfcParse)
+        if (NOT BUILD_SHARED_LIBS)
+            target_link_libraries(geometry_mapping_ifc${schema} IfcGeom)
+        endif()
        list(APPEND mapping_libraries geometry_mapping_ifc${schema})
    endforeach()

@@ -1014,11 +1192,7 @@ if(BUILD_IFCGEOM)
        find_package(Threads)
    endif()

-    if(WASM_BUILD)
-        target_link_libraries(IfcGeom ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
-    else()
-        target_link_libraries(IfcGeom IfcParse ${kernel_libraries} ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})
-    endif()
+    target_link_libraries(IfcGeom IfcParse ${mapping_libraries} ${CMAKE_THREAD_LIBS_INIT})

 endif(BUILD_IFCGEOM)

@@ -1033,8 +1207,8 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)

    foreach(schema ${SCHEMA_VERSIONS})
        add_library(Serializers_ifc${schema} STATIC ${SERIALIZERS_S_FILES})
-        set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS -DIfcSchema=Ifc${schema}")
-        
+        set_target_properties(Serializers_ifc${schema} PROPERTIES COMPILE_FLAGS "-DSERIALIZERS_EXPORTS -DIfcSchema=Ifc${schema}")
+
        if(WASM_BUILD)
            target_link_libraries(Serializers_ifc${schema} ${HDF5_LIBRARIES})
        else()
@@ -1043,7 +1217,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
    endforeach()

    add_library(Serializers ${SERIALIZERS_FILES})
-    set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DIFC_GEOM_EXPORTS" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
+    set_target_properties(Serializers PROPERTIES COMPILE_FLAGS "-DSERIALIZERS_EXPORTS" VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")

    if(WITH_PROJ)
        target_compile_definitions(Serializers PRIVATE "WITH_PROJ")
@@ -1054,7 +1228,7 @@ if(BUILD_CONVERT OR BUILD_IFCPYTHON)
        target_link_libraries(Serializers ${PROJ_LIBRARIES})
    endif()

-    target_link_libraries(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES})
+    target_link_libraries(Serializers ${SERIALIZER_SCHEMA_LIBRARIES} ${OPENCOLLADA_LIBRARIES} ${USD_LIBRARIES} IfcGeom ${OPENCASCADE_LIBRARIES} ${kernel_libraries} IfcParse)

 endif(BUILD_CONVERT OR BUILD_IFCPYTHON)

@@ -1101,7 +1275,7 @@ if(BUILD_CONVERT)
    set(IFCCONVERT_FILES ${IFCCONVERT_CPP_FILES} ${IFCCONVERT_H_FILES})
    add_executable(IfcConvert ${IFCCONVERT_FILES})

-    target_link_libraries(IfcConvert ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
+    target_link_libraries(IfcConvert IfcGeom IfcParse Serializers ${kernel_libraries} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES} ${HDF5_LIBRARIES} ${USD_LIBRARIES})
 	if (WITH_RELATIONSHIP_VALIDATION)
        set_property(TARGET IfcConvert APPEND_STRING PROPERTY COMPILE_FLAGS " -DWITH_RELATIONSHIP_VALIDATION")
    endif()
@@ -1126,11 +1300,16 @@ endif(BUILD_CONVERT)

 # IfcGeomServer
 if(BUILD_GEOMSERVER)
+
+    if(NOT WITH_OPENCASCADE)
+        message(FATAL_ERROR "Open CASCADE is required to build IfcGeomServer.")
+    endif()
+
    file(GLOB CPP_FILES ../src/ifcgeomserver/*.cpp)
    file(GLOB H_FILES ../src/ifcgeomserver/*.h)
    set(SOURCE_FILES ${CPP_FILES} ${H_FILES})
    add_executable(IfcGeomServer ${SOURCE_FILES})
-    target_link_libraries(IfcGeomServer ${IFCOPENSHELL_LIBRARIES} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES})
+    target_link_libraries(IfcGeomServer IfcGeom IfcParse Serializers ${kernel_libraries} ${OPENCASCADE_LIBRARIES} ${Boost_LIBRARIES})

    if((NOT WIN32) AND BUILD_SHARED_LIBS)
        SET_INSTALL_RPATHS(IfcGeomServer "${IFCOPENSHELL_LIBRARY_DIR};${OCC_LIBRARY_DIR};${Boost_LIBRARY_DIRS}")
@@ -1146,6 +1325,10 @@ endif(BUILD_GEOMSERVER)
 if(ADD_COMMIT_SHA)
    find_package(Git)

+    if(NOT GIT_FOUND)
+        message(FATAL_ERROR "Failed to find Git for ADD_COMMIT_SHA option.")
+    endif()
+
    if(GIT_FOUND)
        if (VERSION_OVERRIDE)
            set (git_branch ${RELEASE_VERSION})
@@ -1183,8 +1366,10 @@ if(ADD_COMMIT_SHA)
            message(FATAL_ERROR "Unable to determine commit sha and/or branch")
        endif()

-        add_definitions(-DIFCOPENSHELL_BRANCH=${git_branch})
-        add_definitions(-DIFCOPENSHELL_COMMIT=${git_sha})
+        target_compile_definitions(IfcParse PRIVATE
+            -DIFCOPENSHELL_BRANCH=${git_branch}
+            -DIFCOPENSHELL_COMMIT=${git_sha}
+        )
    endif()
 endif(ADD_COMMIT_SHA)

@@ -1214,7 +1399,7 @@ if(BUILD_IFCMAX)
 endif()

 if(WITH_CGAL)
-    add_subdirectory(../src/svgfill svgfill)        
+    add_subdirectory(../src/svgfill svgfill)
 endif()

 if(BUILD_QTVIEWER)
@@ -1241,6 +1426,11 @@ if(BUILD_IFCGEOM)
        DESTINATION ${INCLUDEDIR}/ifcgeom
    )

+    file(GLOB SERIALIZATION_H_FILES ../src/ifcgeom/serialization/*.h)
+    install(FILES ${SERIALIZATION_H_FILES}
+        DESTINATION ${INCLUDEDIR}/ifcgeom/serialization
+    )
+
    foreach(kernel ${GEOMETRY_KERNELS})
        file(GLOB IFCGEOM_H_FILES ../src/ifcgeom/kernels/${kernel}/*.h)
         install(FILES ${IFCGEOM_H_FILES}
@@ -1272,11 +1462,13 @@ if(BUILD_CONVERT)
 endif(BUILD_CONVERT)

 if(BUILD_CONVERT OR BUILD_IFCPYTHON)
-    install(TARGETS geometry_serializer ${geometry_serializer_libraries}
-        ARCHIVE DESTINATION ${LIBDIR}
-        LIBRARY DESTINATION ${LIBDIR}
-        RUNTIME DESTINATION ${BINDIR}
-    )
+    if(WITH_OPENCASCADE)
+        install(TARGETS geometry_serializer ${geometry_serializer_libraries}
+            ARCHIVE DESTINATION ${LIBDIR}
+            LIBRARY DESTINATION ${LIBDIR}
+            RUNTIME DESTINATION ${BINDIR}
+        )
+    endif()
 endif(BUILD_CONVERT OR BUILD_IFCPYTHON)

 # Cmake uninstall target
@@ -0,0 +1,114 @@
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "shared",
+      "generator": "Ninja",
+      "hidden": true,
+      "cacheVariables": {
+        "BUILD_IFCPYTHON": "ON",
+        "BUILD_IFCGEOM": "ON",
+        "COLLADA_SUPPORT": "OFF",
+        "BUILD_EXAMPLES": "OFF",
+        "BUILD_GEOMSERVER": "OFF",
+        "GLTF_SUPPORT": "ON",
+        "BUILD_CONVERT": "ON",
+        "BUILD_IFCMAX": "OFF",
+        "IFCXML_SUPPORT": "ON",
+        "HDF5_SUPPORT": "ON",
+        "SCHEMA_VERSIONS": "4x3_add2",
+        "CITYJSON_SUPPORT": "OFF",
+        "CMAKE_GENERATOR_PLATFORM": "",
+        "CMAKE_GENERATOR_TOOLSET": ""
+      }
+    },
+    {
+      "name": "win-shared",
+      "inherits": [
+        "shared"
+      ],
+      "hidden": true,
+      "environment": {
+        "CONDA_BUILD": "ON",
+        "CONDA_PY": "312"
+      },
+      "cacheVariables": {
+        "Boost_USE_STATIC_LIBS": "OFF",
+        "CMAKE_INSTALL_PREFIX": "$env{LIBRARY_PREFIX}",
+        "PYTHON_EXECUTABLE": "$env{PREFIX}/python.exe",
+        "PYTHON_INCLUDE_DIR": "$env{PREFIX}/include",
+        "PYTHON_LIBRARY": "$env{PREFIX}/libs/python$env{CONDA_PY}.lib",
+        "CMAKE_FIND_ROOT_PATH": "$env{LIBRARY_PREFIX}",
+        "CMAKE_PREFIX_PATH": "$env{LIBRARY_PREFIX}",
+        "LIBXML2_LIBRARIES": "$env{LIBRARY_PREFIX}/lib/libxml2.lib",
+        "OCC_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include/opencascade",
+        "OCC_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
+        "CGAL_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "EIGEN_DIR": "$env{LIBRARY_PREFIX}/include/eigen3",
+        "JSON_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "GMP_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "GMP_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
+        "MPFR_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
+        "Boost_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
+        "Boost_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "HDF5_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include",
+        "HDF5_LIBRARY_DIR": "$env{LIBRARY_PREFIX}/lib",
+        "ZLIB_INCLUDE_DIR": "$env{LIBRARY_PREFIX}/include"
+      }
+    },
+    {
+      "name": "win-release",
+      "inherits": [
+        "win-shared"
+      ],
+      "hidden": false,
+      "warnings": {
+        "dev": false
+      },
+      "environment": {
+        "PREFIX": "${sourceDir}/../.pixi/envs/prod",
+        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/prod/Library"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "win-debug",
+      "inherits": [
+        "win-shared"
+      ],
+      "hidden": false,
+      "binaryDir": "${sourceDir}/../build/win-debug",
+      "warnings": {
+        "dev": false
+      },
+      "environment": {
+        "PREFIX": "${sourceDir}/../.pixi/envs/dev",
+        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/dev/Library"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+      }
+    },
+    {
+      "name": "win-test",
+      "inherits": [
+        "win-shared"
+      ],
+      "hidden": false,
+      "binaryDir": "${sourceDir}/../build/win-test",
+      "warnings": {
+        "dev": false
+      },
+      "environment": {
+        "PREFIX": "${sourceDir}/../.pixi/envs/tests",
+        "LIBRARY_PREFIX": "${sourceDir}/../.pixi/envs/tests/Library"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "SCHEMA_VERSIONS": "2x3;4;4x3_add2"
+      }
+    }
+  ]
+}
@@ -121,4 +121,4 @@ function(files_for_ifc_version IFC_VERSION RESULT_NAME)
        ${IFC_PARSE_DIR}/Ifc${IFC_VERSION}.cpp
        PARENT_SCOPE
    )
-endfunction()
+endfunction()
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34300d41ad..09b2e0d45f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -721,6 +721,8 @@ else()
+   OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
+ endif()
+ 
+list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+
+ # bison
+ if (BUILD_YACCLEX)
+   list (APPEND OCCT_3RDPARTY_CMAKE_LIST "adm/cmake/bison")
@@ -0,0 +1,13 @@
+diff --git a/OpenCOLLADAConfig.cmake.in b/OpenCOLLADAConfig.cmake.in
+index d765b108..6800c2a7 100644
+--- a/OpenCOLLADAConfig.cmake.in
+++ b/OpenCOLLADAConfig.cmake.in
+@@ -31,7 +31,7 @@ set(OPENCOLLADA_INCLUDE_DIRS
+ include("@PACKAGE_OPENCOLLADA_INST_CMAKECONFIG@/OpenCOLLADATargets.cmake")
+ 
+ # Set the library variable
+-if(UNIX)
+if(0)
+ 	set(OPENCOLLADA_LIBRARIES
+ 		ftoa_shared
+ 		buffer_shared
@@ -0,0 +1,84 @@
+[project]
+name = "IfcOpenShell"
+version = "0.8.4"
+description = "IfcOpenShell is a library to support the IFC file format"
+channels = ["conda-forge"]
+platforms = ["win-64", "linux-64", "osx-64"]
+
+[environments]
+common = { features = ["common"], no-default-feature = true }
+prod = { features = ["prod", "common"], no-default-feature = true }
+dev = { features = ["dev", "common"], no-default-feature = true }
+lint = { features = ["lint"], no-default-feature = true }
+tests = { features = ["tests", "common"], no-default-feature = true }
+
+[feature.lint.dependencies]
+ruff = "*"
+black = "*"
+
+[feature.common.dependencies]
+# Build deps
+cmake = "==3.30.5"
+ninja = "*"
+swig = "*"
+c-compiler = "*"
+cxx-compiler = "*"
+
+# Runtime deps
+python = "3.12.*"
+libboost-devel = "*"
+occt = { version = "*", build = "*novtk*" }
+cgal-cpp = "*"
+numpy = "*"
+lark = "*"
+hdf5 = "*"
+eigen = "*"
+mpfr = "*"
+gmp = "*"
+nlohmann_json = "*"
+zlib = "*"
+# Not strictly necessary
+pythonocc-core = "*"
+
+[feature.tests.dependencies]
+pytest = "*"
+shapely = "*"
+tabulate = "*"
+isodate = "*"
+python-dateutil = "*"
+xmlschema = "*"
+xsdata = "*"
+lxml = "*"
+networkx = "*"
+
+[feature.common.target.win-64.dependencies]
+vs2022_win-64 = "*"
+#vs_win-64 = "*" # Visual Studio
+#vswhere = "*" # Visual Studio
+
+[feature.common.tasks]
+init-submodules = { cmd = "git submodule update --init --recursive", outputs =["$PIXI_PROJECT_ROOT/src/svgfill/3rdparty/svgpp/*"]}
+
+[feature.prod.target.win-64.tasks]
+configure-release = { cmd = ["cmake", "--preset", "win-release", "-B", "build/win-release", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }] }
+build-release = { cmd = ["cmake", "--build", "build/win-release", "--config", "Release"], description = "Build the project" }
+
+[feature.dev.target.win-64.tasks]
+configure-debug = { cmd = ["cmake", "--preset", "win-debug", "-B", "build/win-debug", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-debug/CMakeCache.txt"] }
+build-debug = { cmd = ["cmake", "--build", "build/win-debug", "--config", "Debug"], description = "Build the project", depends-on = ["configure-debug"] }
+install-debug = { cmd = ["cmake", "--install", "build/win-debug", "--config", "Debug"], description = "Install the project" } # Optionally Install files to your desired env using --prefix
+
+vsdebug = { cmd = ["python"], description = "Run a python script with vs debugger attached" }
+
+[feature.tests.tasks]
+configure-test = { cmd = ["cmake", "--preset", "win-test", "-B", "build/win-test", "cmake"], description = "Configure the project", depends-on=[{ task="init-submodules", environment = "common" }], outputs=["build/win-test/CMakeCache.txt"] }
+build-test = { cmd = ["cmake", "--build", "build/win-test", "--config", "Release"], description = "Build the project", depends-on = ["configure-test"], outputs=["build/win-test/IfcGeom.lib"] }
+install-test = { cmd = ["cmake", "--install", "build/win-test", "--config", "Release"], description = "Install the project", depends-on = ["build-test"] } # Optionally Install files to your desired env using --prefix
+
+test = { cmd = "pytest .", cwd="src/ifcopenshell-python/test", depends-on=["install-test"], env = {PYTHONPATH="$PIXI_PROJECT_ROOT/src/ifcpatch"}}
+
+[feature.lint.tasks]
+lint = { cmd = "ruff check && black --diff --check ."}
+
+[feature.common.target.win-64.activation]
+#scripts = ["cmake/activate.bat"]
@@ -0,0 +1,33 @@
+
+There are two ways to build pyodide ifcopenshell Python wrapper wheel.
+
+1. Using pyodide build system (`build_pyodide.yml` does it):
+
+- install prebuilt pyodide build and emscripten environment (see `build_pyodide.sh`)
+- clone IfcOpenShell to `IfcOpenShell` folder
+- create `packages/ifcopenshell` folder that will be used by pyodide build system
+- from `IfcOpenShell` move building recipe `pyodide/meta.yaml` to `packages/ifcopenshell`
+- run `pyodide build-recipes ifcopenshell --install`, it will
+    - execute `meta.yaml` recipe - it will:
+        - copy IfcOpenShell source to build folder `packages/ifcopenhell/build/ifcopenshell-0.8.0`
+        - build ifcopenshell and its dependencies
+        - note that rerunning `pyodide build-recipes` will remove previous build folder and rebuild all dependencies.  
+        The way to avoid it, if build fails, is to use `pyodide build-recipes-no-deps ifcopenshell --continue` instead.
+    - run `setup.py` in `IfcOpenShell` root, producing a wheel in `IfcOpenShell/dist`
+    - copy that wheel to `packages/ifcopenshell/dist`
+    - `--install` it to current build envrionment
+        - copy the wheel next to `dist` folder (in root directory, next to `packages`)
+        - add wheel to `dist/pyodide-lock.json`
+
+2. Build it outside of pyodide build system.
+
+Building inside pyodide build system should be preferred, option to build it outside is useful for debugging purposes,
+since it's pure cmake without any additional moving parts.
+
+- setup pyodide environment, see above
+- clone IfcOpenShell repo next to it to `IfcOpenShell` folder
+- setup debug build environment using `source pyodide/debug_build_env.sh /path/to/pyodide_root`
+- run `python nix/build-all.py -wasm -py-313` in `IfcOpenShell`
+    - it will produce Python package in `IfcOpenShell/ifcopenshell`
+- run `pyodide build`
+    - it will produce a wheel in `IfcOpenShell/dist`
@@ -0,0 +1,36 @@
+#!/usr/bin/bash
+set -ex
+
+# Install uv.
+curl -LsSf https://astral.sh/uv/install.sh | sh
+uv venv --python 3.13
+source .venv/bin/activate
+
+# Install pyodide cross build environment.
+# Instructions: https://pyodide.org/en/stable/development/building-packages.html
+uv pip install pyodide-build
+# `uv run` is required, so xbuildenv would skip using `pip`.
+uv run pyodide xbuildenv install
+
+# Emscripten doesn't come with xbuildenv.
+git clone https://github.com/emscripten-core/emsdk
+pushd emsdk
+PYODIDE_EMSCRIPTEN_VERSION=$(pyodide config get emscripten_version)
+./emsdk install ${PYODIDE_EMSCRIPTEN_VERSION}
+./emsdk activate ${PYODIDE_EMSCRIPTEN_VERSION}
+source emsdk_env.sh
+which emcc
+popd
+
+mkdir -p packages/ifcopenshell
+VERSION=`cat IfcOpenShell/VERSION`
+cp IfcOpenShell/pyodide/meta.yaml packages/ifcopenshell
+sed -i s/0.8.0/$VERSION/g packages/ifcopenshell/meta.yaml
+
+# Use custom build ifcopenshell directory in build-all to make caching simpler
+# Otherwise pyodide build path typically includes package version, so cached cmake configs might break.
+export BUILD_DIR=`readlink -f ifcopenshell_build`
+
+# Use build-recipes-no-deps first, so logs would be printed to stdout.
+pyodide build-recipes-no-deps ifcopenshell
+pyodide build-recipes ifcopenshell --install
@@ -0,0 +1,64 @@
+"""
+Cache built dependencies for builds.
+
+This script is finding common install directory and either
+packs each folder into a tar.gz archive, if it wasn't packed before,
+or unpacks existing archives.
+
+Usage: python cache_dependencies.py [pack|unpack]
+"""
+
+import tarfile
+import sys
+from pathlib import Path
+from typing import Literal
+
+
+CACHE_PREFIX = "cache-"
+
+
+def get_install_dir() -> Path:
+    for data in Path.cwd().glob("*/*/install"):
+        return data
+    raise Exception("No install dir found")
+
+
+def pack_dependencies(install_dir: Path) -> None:
+    # Process each install_dir
+    for dependency_path in install_dir.iterdir():
+        if not dependency_path.is_dir():
+            continue
+        dependency_name = dependency_path.name
+        tar_path = install_dir / f"{CACHE_PREFIX}{dependency_name}.tar.gz"
+        if tar_path.exists():
+            print(f"Skipping existing cache: '{tar_path}'")
+        else:
+            with tarfile.open(tar_path, "w:gz") as tar:
+                tar.add(dependency_path, arcname=dependency_path.name)
+            print(f"Created cache: '{tar_path}'")
+
+
+def unpack_dependencies(install_dir: Path) -> None:
+    # `filter` argument was fully introduced in 3.12
+    # and results in deprecation warnings in 3.12-3.13, if not provided.
+    tar_filter: "dict[Literal['filter'], Literal['data']]" = (
+        {"filter": "data"} if bool(sys.version_info >= (3, 12)) else {}
+    )
+    for tar_path in install_dir.glob(f"{CACHE_PREFIX}*.tar.gz"):
+        with tarfile.open(tar_path, "r:gz") as tar:
+            tar.extractall(path=install_dir, **tar_filter)
+        print(f"Extracted cache: '{tar_path.name}'.")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2 or (action := sys.argv[1].lower()) not in ("pack", "unpack"):
+        print(__doc__)
+        sys.exit(1)
+
+    install_dir = get_install_dir()
+    print(f"Found install dir: '{install_dir}'")
+
+    if action == "pack":
+        pack_dependencies(install_dir)
+    else:
+        unpack_dependencies(install_dir)
@@ -0,0 +1,10 @@
+#!/bin/bash
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 <pyodide_root>"
+  exit 1
+fi
+export PYODIDE_ROOT=$(readlink -f "$1")
+export PATH="$PYODIDE_ROOT/emsdk/emsdk:$PYODIDE_ROOT/emsdk/emsdk/node/22.16.0_64bit/bin:$PYODIDE_ROOT/emsdk/emsdk/upstream/emscripten:$PATH"
+# build-all.py vars.
+export WASM_PYTHON_PATH="$PYODIDE_ROOT/cpython/installs/python-3.13.2"
+export WASM_TOOLCHAIN_FILE="$PYODIDE_ROOT/pyodide-build/pyodide_build/tools/cmake/Modules/Platform/Emscripten.cmake"
@@ -3,13 +3,12 @@ package:
  version: 0.8.0

 source:
+  # meta.yaml is placed as `packages/ifcopenshell/meta.yaml`.
  path: ../../IfcOpenShell

 build:
  script: |
-    BUILD_CFG=Release python nix/build-all.py --without-hdf5 --without-opencollada --without-swig --without-pcre -v --wasm --py313 IfcOpenShell-Python
-    mv package/ifcopenshell .
-    cp pyodide/setup.py .
+    BUILD_CFG=Release python nix/build-all.py -v --wasm --py313

 about:
  home: http://ifcopenshell.org
@@ -1,11 +1,48 @@
-from setuptools import setup, find_packages
+# setup.py is getting deprecated, but we still use it,
+# because `tool.setuptools.ext-modules` is still experimental in pyproject.toml
+# and we need it to get the wheel suffix right.
+import os
+from pathlib import Path

-setup(name='ifcopenshell',
-      version='0.8.0',
-      description='IfcOpenShell is an open source (LGPL) software library for working with the Industry Foundation Classes (IFC) file format.',
-      author='Thomas Krijnen',
-      author_email='thomas@aecgeeks.com',
-      url='http://ifcopenshell.org',
-      packages=find_packages(),
-      package_data={'': ['*.so', '*.json']},
+import tomllib
+from setuptools import Extension, setup
+
+
+REPO_FOLDER = Path(__file__).parent
+
+
+def get_version() -> str:
+    if "PKG_VERSION" in os.environ:
+        # Inside pyodide build environment.
+        return os.environ["PKG_VERSION"]
+    return (REPO_FOLDER / "VERSION").read_text().strip()
+
+
+# Read dependencies from pyproject.toml
+def get_dependencies() -> list[str]:
+    pyproject_toml = REPO_FOLDER / "src" / "ifcopenshell-python" / "pyproject.toml"
+    pyproject_data = tomllib.loads(pyproject_toml.read_text())
+    dependencies = pyproject_data["project"]["dependencies"]
+    return dependencies
+
+
+setup(
+    name="ifcopenshell",
+    version=get_version(),
+    description=(
+        "IfcOpenShell is an open source (LGPL) software library "
+        "for working with the Industry Foundation Classes (IFC) file format."
+    ),
+    author="Thomas Krijnen",
+    author_email="thomas@aecgeeks.com",
+    url="https://ifcopenshell.org",
+    install_requires=get_dependencies(),
+    packages=["ifcopenshell"],
+    package_data={
+        # "*.so" is needed to include prebuilt binary extension. Otherwise it would try to build it and fail.
+        "ifcopenshell": ["util/schema/*.json", "util/schema/*.ifc", "*.so"],
+        "": ["*.json", "*.ifc"],
+    },
+    # Has to provide extension to get the correct wheel suffix.
+    ext_modules=[Extension("ifcopenshell._ifcopenshell_wrapper", sources=[])],
 )
@@ -1,6 +1,9 @@
 [tool.black]
 line-length = 120
-include = "src/.*.pyi?$"
+include = '''
+    src/.*.pyi?$
+    |nix/.*.pyi?$
+'''
 extend-exclude = '''
    src/ifcopenshell-python/ifcopenshell/express/*
    |src/ifcopenshell-python/ifcopenshell/mvd/*
@@ -35,6 +38,7 @@ exclude = [
    "src/ifc2ca/templates",
 ]
 [tool.ruff.lint]
+preview = true
 select = [
    # Default Ruff rules.
    # "E4",        # imports
@@ -45,6 +49,7 @@ select = [
    "FA",          # future annotations
    "UP",          # pyupgrade
    "RUF015",      # next() > list_comprehension[0]
+    "RUF022",      # sort __all__
 ]
 ignore = [
    "FA100", # Conflicts with Blender using annotations for props definitions.
@@ -56,7 +61,4 @@ ignore = [
    "UP030", # implicit references for positional format fields
    "UP031", # Replace % with .format
    "UP032", # Replace .format with f-string
-
-    # Deprecated Ruff rules.
-    "UP038", # Use X | Y in isinstance
 ]
@@ -6,7 +6,7 @@ from numpy.typing import NDArray

 def camera_vectors_from_element_placement(
    elem_placement: NDArray[np.float64],
-) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
+) -> tuple[list[float], list[float], list[float]]:
    """
    Calculate the vectors of a camera pointing to an element.

@@ -22,7 +22,7 @@ def camera_vectors_from_element_placement(

 def camera_vectors_from_target_position(
    target_position: NDArray[np.float64], offset: Optional[NDArray[np.float64]] = None
-) -> tuple[NDArray[np.float64], NDArray[np.float64], NDArray[np.float64]]:
+) -> tuple[list[float], list[float], list[float]]:
    """
    Calculate the vectors of a camera pointing to a target point.

@@ -38,16 +38,7 @@ def camera_vectors_from_target_position(
    camera_direction = unit_vector(-camera_offset)  # pylint: disable=invalid-unary-operand-type
    camera_right = unit_vector(np.cross(np.array([0.0, 0.0, 1.0]), camera_direction))
    camera_up = unit_vector(np.cross(camera_direction, camera_right))
-    return camera_position, camera_direction, camera_up
-    # rotation_transform = np.eye(4)
-    # rotation_transform[0, :3] = camera_right
-    # rotation_transform[1, :3] = camera_up
-    # rotation_transform[2, :3] = camera_direction
-    # translation_transform = np.eye(4)
-    # translation_transform[:3, -1] = -camera_position
-    # look_at_transform = np.matmul(rotation_transform, translation_transform)
-    # mat = np.linalg.inv(look_at_transform)
-    # return camera_position, -mat[:3, 2], mat[:3, 1]
+    return camera_position.tolist(), camera_direction.tolist(), camera_up.tolist()


 def unit_vector(v: NDArray[np.float64]) -> NDArray[np.float64]:
@@ -36,20 +36,10 @@ from bcf.v2.model.visinfo import (

 __all__ = [
    "BimSnippet",
-    "Comment",
-    "CommentViewpoint",
-    "Header",
-    "HeaderFile",
-    "Markup",
-    "Topic",
-    "TopicDocumentReference",
-    "TopicRelatedTopic",
-    "ViewPoint",
-    "Project",
-    "ProjectExtension",
-    "Version",
    "BitmapFormat",
    "ClippingPlane",
+    "Comment",
+    "CommentViewpoint",
    "Component",
    "ComponentColoring",
    "ComponentColoringColor",
@@ -58,10 +48,20 @@ __all__ = [
    "ComponentVisibilityExceptions",
    "Components",
    "Direction",
+    "Header",
+    "HeaderFile",
    "Line",
+    "Markup",
    "OrthogonalCamera",
    "PerspectiveCamera",
    "Point",
+    "Project",
+    "ProjectExtension",
+    "Topic",
+    "TopicDocumentReference",
+    "TopicRelatedTopic",
+    "Version",
+    "ViewPoint",
    "ViewSetupHints",
    "VisualizationInfo",
    "VisualizationInfoBitmap",
@@ -192,6 +192,8 @@ class TopicHandler:
            bcf_zip: The BCF zip file to save to.
        """
        topic_dir = self.guid
+        # simulating directory creation (ZipFile in python < 3.11 doesn't have mkdir)
+        destination_zip.writestr(f"{topic_dir}/", "")
        self._save_xml(destination_zip, self._markup, "markup.bcf")
        self._save_viewpoints(destination_zip, topic_dir)
        self._save_bim_snippet(destination_zip)
@@ -319,9 +319,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    ifc_file = element.wrapped_data.file
    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
    elem_placement = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-    elem_placement[0][3] *= unit_scale
-    elem_placement[1][3] *= unit_scale
-    elem_placement[2][3] *= unit_scale
+    elem_placement[:3, 3] *= unit_scale

    return mdl.VisualizationInfo(
        guid=str(uuid.uuid4()),
@@ -381,7 +379,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:


 def build_camera_from_vectors(
-    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
+    camera_position: list[float], camera_dir: list[float], camera_up: list[float]
 ) -> mdl.PerspectiveCamera:
    """
    Return a BCF camera for an IFC element placement matrix.
@@ -55,40 +55,12 @@ from bcf.v3.model.visinfo import (
 )

 __all__ = [
-    "Document",
-    "DocumentInfo",
-    "DocumentInfoDocuments",
-    "Extensions",
-    "ExtensionsPriorities",
-    "ExtensionsSnippetTypes",
-    "ExtensionsStages",
-    "ExtensionsTopicLabels",
-    "ExtensionsTopicStatuses",
-    "ExtensionsTopicTypes",
-    "ExtensionsUsers",
    "BimSnippet",
-    "Comment",
-    "CommentViewpoint",
-    "DocumentReference",
-    "File",
-    "Header",
-    "HeaderFiles",
-    "Markup",
-    "Topic",
-    "TopicComments",
-    "TopicDocumentReferences",
-    "TopicLabels",
-    "TopicReferenceLinks",
-    "TopicRelatedTopics",
-    "TopicRelatedTopicsRelatedTopic",
-    "TopicViewpoints",
-    "ViewPoint",
-    "Project",
-    "ProjectInfo",
-    "Version",
    "Bitmap",
    "BitmapFormat",
    "ClippingPlane",
+    "Comment",
+    "CommentViewpoint",
    "Component",
    "ComponentColoring",
    "ComponentColoringColor",
@@ -98,10 +70,38 @@ __all__ = [
    "ComponentVisibilityExceptions",
    "Components",
    "Direction",
+    "Document",
+    "DocumentInfo",
+    "DocumentInfoDocuments",
+    "DocumentReference",
+    "Extensions",
+    "ExtensionsPriorities",
+    "ExtensionsSnippetTypes",
+    "ExtensionsStages",
+    "ExtensionsTopicLabels",
+    "ExtensionsTopicStatuses",
+    "ExtensionsTopicTypes",
+    "ExtensionsUsers",
+    "File",
+    "Header",
+    "HeaderFiles",
    "Line",
+    "Markup",
    "OrthogonalCamera",
    "PerspectiveCamera",
    "Point",
+    "Project",
+    "ProjectInfo",
+    "Topic",
+    "TopicComments",
+    "TopicDocumentReferences",
+    "TopicLabels",
+    "TopicReferenceLinks",
+    "TopicRelatedTopics",
+    "TopicRelatedTopicsRelatedTopic",
+    "TopicViewpoints",
+    "Version",
+    "ViewPoint",
    "ViewSetupHints",
    "VisualizationInfo",
    "VisualizationInfoBitmaps",
@@ -179,6 +179,8 @@ class TopicHandler:
            bcf_zip: The BCF zip file to save to.
        """
        topic_dir = self.guid
+        # simulating directory creation (ZipFile in python < 3.11 doesn't have mkdir)
+        destination_zip.writestr(f"{topic_dir}/", "")
        self._save_xml(destination_zip, self._markup, "markup.bcf")
        self._save_viewpoints(destination_zip, topic_dir)
        self._save_bim_snippet(destination_zip)
@@ -319,9 +319,7 @@ def build_viewpoint(element: entity_instance) -> mdl.VisualizationInfo:
    ifc_file = element.wrapped_data.file
    unit_scale = ifcopenshell.util.unit.calculate_unit_scale(ifc_file)
    elem_placement = ifcopenshell.util.placement.get_local_placement(element.ObjectPlacement)
-    elem_placement[0][3] *= unit_scale
-    elem_placement[1][3] *= unit_scale
-    elem_placement[2][3] *= unit_scale
+    elem_placement[:3, 3] *= unit_scale

    return mdl.VisualizationInfo(
        guid=str(uuid.uuid4()),
@@ -381,7 +379,7 @@ def build_camera(elem_placement: NDArray[np.float64]) -> mdl.PerspectiveCamera:


 def build_camera_from_vectors(
-    camera_position: NDArray[np.float64], camera_dir: NDArray[np.float64], camera_up: NDArray[np.float64]
+    camera_position: list[float], camera_dir: list[float], camera_up: list[float]
 ) -> mdl.PerspectiveCamera:
    """
    Return a BCF camera for an IFC element placement matrix.
@@ -87,7 +87,7 @@ BLENDER_PLATFORM:=windows-x64
 endif

 # Current build commit hash.
-OLD:=ec13294
+OLD:=6924012
 .PHONY: bump
 bump:
 ifndef NEW
@@ -127,7 +127,7 @@ endif
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download GitPython --dest=./wheels
 	# Provides audio playback for costing
 	# This is a REALLY IMPORTANT feature
-	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel git+https://github.com/Andrej730/aud.git --wheel-dir=./wheels
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) wheel git+https://github.com/zdhoward/aud --wheel-dir=./wheels
 	# IfcOpenShell dependency - support for new typing features
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download typing_extensions --dest=./wheels
 	# Required by IfcCSV
@@ -192,6 +192,8 @@ else ifeq ($(PLATFORM), macos)
 else
 	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download pyradiance $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels
 endif
+	# Required by ifctester web ui.
+	cd build && . env/$(VENV_ACTIVATE) && $(PIP) download flask $(PYPI_PLATFORM) --python-version $(PYPI_VERSION) --implementation $(PYPI_IMP) --only-binary=:all: --dest=./wheels

 	# jQuery is required for web UI functionality
 	cd build/bonsai/bim/data/webui/static/js/ && wget https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js
@@ -110,6 +110,7 @@ classes = [
    operator.ClippingPlaneCutWithCappings,
    operator.CloseBlendWarning,
    operator.CloseError,
+    operator.CreateMacBonsaiApp,
    operator.CopyTextToClipboard,
    operator.EditBlenderCollection,
    operator.FileAssociate,
@@ -131,6 +132,7 @@ classes = [
    prop.ObjProperty,
    prop.MultipleFileSelect,
    prop.Attribute,
+    prop.ISODuration,
    prop.BIMAreaProperties,
    prop.BIMTabProperties,
    prop.BIMProperties,
@@ -13,10 +13,10 @@ DATA;
 #6=IFCSIMPLEPROPERTYTEMPLATE('0AK5C2UpL4$eaac2LszAx$',$,'HasUnderlay','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #7=IFCSIMPLEPROPERTYTEMPLATE('2j2ZEZR8X5tONm7kli5hM6',$,'HasLinework','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #8=IFCSIMPLEPROPERTYTEMPLATE('1ttChRysH9UuEX2FeMj5Hu',$,'HasAnnotation','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
-#9=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#9=IFCSIMPLEPROPERTYTEMPLATE('2NPPxuABv1huDTVh32TFgw',$,'GlobalReferencing','Whether or not this drawing can be referenced in other drawings.',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
 #10=IFCSIMPLEPROPERTYTEMPLATE('10hT_1zrzEbRRKMXYAWvtD',$,'Metadata','Comma separated list of selector expressions to evaluate for each drawing elementand add results to their ''class'' attribute.\X2\000A\X0\E.g. ''Name, id'' would add to ''class'' value similar to ''Name-Wall id-1220''.\X2\000A\X0\Then it can be used to applied css styles based on the resulting class.\X2\000A\X0\If attribute is not present on the element, then it won''t be added to it''s ''class''.',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#11=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
-#12=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude ifc elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#11=IFCSIMPLEPROPERTYTEMPLATE('3Z0BXPSG5CWgtI33ioV7aj',$,'Include','Selector expression to include elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
+#12=IFCSIMPLEPROPERTYTEMPLATE('1RVts_g3PAw98PJA2yL3bO',$,'Exclude','Selector expression to exclude elements in the drawing',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 #13=IFCSIMPLEPROPERTYTEMPLATE('0c1$8NpYDEaBiJrj16jHIo',$,'Stylesheet','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 #14=IFCSIMPLEPROPERTYTEMPLATE('3mRF52q81FQB$h4oTh7M45',$,'Markers','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 #15=IFCSIMPLEPROPERTYTEMPLATE('1rhr_0N3LDtuORcEJP0KXM',$,'Symbols','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
@@ -5,10 +5,10 @@ FILE_NAME('Psets_BBIM_Annotation.ifc','2020-01-01T00:00:00',$,$,'Psets_BBIM_Anno
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
-#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation,IfcTypeProduct',(#2,#3,#4,#29));
+#1=IFCPROPERTYSETTEMPLATE('3VuPUwdCD2Qx3XDDRs0R1N',$,'EPset_Annotation','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation,IfcTypeProduct',(#4,#33,#29,#32,#3,#2));
 #2=IFCSIMPLEPROPERTYTEMPLATE('2P7JN79n96Q9pElZ83LKe4',$,'ZIndex','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
 #3=IFCSIMPLEPROPERTYTEMPLATE('1Wpx_r2xj1_9w5JpI0QRJy',$,'Symbol','',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
-#4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','Classes separarated by spaces that end up in classes for this element in svg. Can be used to specify the text font size: small - 1.8mm; regular - 2.5mm; large - 3.5mm; header - 5mm; title - 7mm. By default regular size is used.',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
+#4=IFCSIMPLEPROPERTYTEMPLATE('3q0oxMUKP47vZ4jnyG$dDb',$,'Classes','Classes separated by spaces that end up in classes for this element in svg. Can be used to specify the text font size: small - 1.8mm; regular - 2.5mm; large - 3.5mm; header - 5mm; title - 7mm. By default regular size is used.',.P_SINGLEVALUE.,'IfcLabel',$,$,$,$,$,.READWRITE.);
 #5=IFCPROPERTYSETTEMPLATE('0iKwujnQL9IevVQato8f7Z',$,'BBIM_Batting','',.PSET_TYPEDRIVENOVERRIDE.,'IfcAnnotation/BATTING,IfcTypeProduct',(#6,#7));
 #6=IFCSIMPLEPROPERTYTEMPLATE('0t2LEesGT1QRQtrIZUAR8L',$,'Thickness','Batting thickness',.P_SINGLEVALUE.,'IfcPositiveLengthMeasure',$,$,$,$,$,.READWRITE.);
 #7=IFCSIMPLEPROPERTYTEMPLATE('082PndS6v2kBOiJoSboMnh',$,'Reverse pattern direction','Reverse batting pattern (swap starting and ending points)',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
@@ -36,5 +36,7 @@ DATA;
 #29=IFCSIMPLEPROPERTYTEMPLATE('2pJmUDpB50VBdCOib1zcJJ',$,'Newline_At','',.P_SINGLEVALUE.,'IfcInteger',$,$,$,$,$,.READWRITE.);
 #30=IFCSIMPLEPROPERTYTEMPLATE('2TJn72t_v2cvBUG916Dpev',$,'CustomUnit','Dimension''s custom unit',.P_ENUMERATEDVALUE.,'IfcText',$,#31,$,$,$,.READWRITE.);
 #31=IFCPROPERTYENUMERATION('CustomUnit',(IFCTEXT('Feet and Inches - Fractional'),IFCTEXT('Feet - Decimal'),IFCTEXT('Inches - Fractional'),IFCTEXT('Inches - Decimal'),IFCTEXT('Meters'),IFCTEXT('Decimeters'),IFCTEXT('Centimeters'),IFCTEXT('Millimeters')),$);
+#32=IFCSIMPLEPROPERTYTEMPLATE('0gjJzDYBX8P85qn1xcAOOo',$,'Reverse_List','',.P_SINGLEVALUE.,'IfcBoolean',$,$,$,$,$,.READWRITE.);
+#33=IFCSIMPLEPROPERTYTEMPLATE('22TrcxF8jFNB4buSmzjGEF',$,'List_Separator','',.P_SINGLEVALUE.,'IfcText',$,$,$,$,$,.READWRITE.);
 ENDSEC;
 END-ISO-10303-21;
@@ -36,6 +36,7 @@ from bonsai.bim.ifc import IfcStore
 from mathutils import Vector
 from typing import Union
 from logging import Logger
+from math import radians


 class IfcExporter:
@@ -74,12 +75,12 @@ class IfcExporter:
                    json.dump(jsonData, outfile, indent=None if self.ifc_export_settings.json_compact else 4)

    def set_header(self):
-        self.file.wrapped_data.header.file_name.name = os.path.basename(self.ifc_export_settings.output_file)
-        self.file.wrapped_data.header.file_name.time_stamp = (
+        self.file.header.file_name.name = os.path.basename(self.ifc_export_settings.output_file)
+        self.file.header.file_name.time_stamp = (
            datetime.datetime.utcnow().replace(tzinfo=datetime.UTC).astimezone().replace(microsecond=0).isoformat()
        )
-        self.file.wrapped_data.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
-        self.file.wrapped_data.header.file_name.originating_system = "{} {}".format(
+        self.file.header.file_name.preprocessor_version = "IfcOpenShell {}".format(ifcopenshell.version)
+        self.file.header.file_name.originating_system = "{} {}".format(
            self.get_application_name(), tool.Blender.get_bonsai_version()
        )

@@ -104,7 +105,16 @@ class IfcExporter:

    def sync_object_placement(self, obj: bpy.types.Object) -> Union[ifcopenshell.entity_instance, None]:
        element = self.file.by_id(tool.Blender.get_object_bim_props(obj).ifc_definition_id)
-        if tool.Geometry.is_scaled(obj):
+        # Handle camera scales specially
+        if obj.type == "CAMERA":
+            # Check if this is a reflected ceiling plan camera
+            camera = tool.Ifc.get_entity(obj)
+            if ifcopenshell.util.element.get_pset(camera, "EPset_Drawing", "TargetView") == "REFLECTED_PLAN_VIEW":
+                # Ensure reflected ceiling cameras have the correct scale
+                if obj.scale != (-1, -1, -1):
+                    obj.scale = (-1, -1, -1)
+            # Skip all other scale handling for cameras
+        elif tool.Geometry.is_scaled(obj):
            bpy.ops.bim.update_representation(obj=obj.name)
            # update_representation might not apply scale if the object has openings
            # reset it, so let user know that the scale wasn't saved.
@@ -219,12 +219,10 @@ def refresh_ui_data():
        except AttributeError:
            pass

-    if isinstance(tool.Ifc.get(), ifcopenshell.sqlite):
-        tool.Ifc.get().clear_cache()
+    if isinstance(ifc_file := tool.Ifc.get(), ifcopenshell.sqlite):
+        ifc_file.clear_cache()

-    props = tool.Drawing.get_document_props()
-    props.should_draw_decorations = props.should_draw_decorations
-    if bpy.context.scene.WebProperties.is_connected:
+    if tool.Web.get_web_props().is_connected:
        tool.Web.send_webui_data()


@@ -29,7 +29,7 @@ from ifcopenshell.util.doc import get_attribute_doc, get_predefined_type_doc, ge
 import bonsai.tool as tool
 from types import EllipsisType
 from typing import Optional, Any, Union, TYPE_CHECKING
-from collections.abc import Callable, Iterable
+from collections.abc import Callable, Iterable, Sequence

 if TYPE_CHECKING:
    import bonsai.bim.prop
@@ -51,7 +51,7 @@ if TYPE_CHECKING:


 def draw_attributes(
-    props: bpy.types.bpy_prop_collection_idprop[Attribute],
+    props: Union[bpy.types.bpy_prop_collection_idprop[Attribute], Sequence[Attribute]],
    layout: bpy.types.UILayout,
    copy_operator: Optional[str] = None,
    popup_active_attribute: Optional[bonsai.bim.prop.Attribute] = None,
@@ -111,7 +111,7 @@ def draw_attribute(
        op = layout.operator("bim.attribute_add_subitem", icon="ADD", text="")
        op.data_path = data_path

-    elif attribute.name in ("ScheduleDuration", "ActualDuration", "FreeFloat", "TotalFloat"):
+    elif attribute.special_type == "DURATION":
        props = tool.Sequence.get_work_schedule_props()
        for item in props.durations_attributes:
            if item.name == attribute.name:
@@ -296,7 +296,13 @@ def add_attribute_enum_items_descriptions(
        new_enum_description.name = description


-def add_attribute_description(attribute_blender: bonsai.bim.prop.Attribute, attribute_ifc=None):
+def add_attribute_description(
+    attribute_blender: bonsai.bim.prop.Attribute,
+    attribute_ifc: Union[ifcopenshell.entity_instance, None] = None,
+) -> None:
+    """
+    :param attribute_ifc: IFC Entity to use as a fallback source of description (using "Description" attribute).
+    """
    if not attribute_blender.name:
        return
    version = tool.Ifc.get_schema()
@@ -360,22 +366,35 @@ def prop_with_search(
    prop_name: str,
    should_click_ok: bool = False,
    original_operator_path: Optional[str] = None,
+    *,
+    enable_relating_type_suggestions: bool = False,
+    search_threshold: int = 10,
+    button_kwargs: Union[dict[str, Any], None] = None,
    **kwargs: Any,
 ) -> bpy.types.UILayout:
    """
+    Draw a row with enum prop and enum search operator.
+
+    Search operator appears only in case if there's more than `search_threshold` items in enum.
+
+    :arg button_kwargs: kwargs to pass to ``UILayout.operator()``.
+    :arg kwargs: kwargs to pass to ``UILayout.prop()``.
+    :arg enable_relating_type_suggestions: Enable additional suggestions for relating type properties.
+    :arg search_threshold: Minimum number of enum items required to show search button.
    :return: Added row.
    """
    # kwargs are layout.prop arguments (text, icon, etc.)
    row = layout.row(align=True)
    row.prop(data, prop_name, **kwargs)
    try:
-        if len(get_enum_items(data, prop_name, original_operator_path=original_operator_path)) > 10:
+        if len(get_enum_items(data, prop_name, original_operator_path=original_operator_path)) > search_threshold:
            # Magick courtesy of https://blender.stackexchange.com/a/203443/86891
            row.context_pointer_set(name="data", data=data)
-            op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM")
+            op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM", **(button_kwargs or {}))
            op.prop_name = prop_name
            op.should_click_ok = should_click_ok
            op.original_operator_path = original_operator_path or ""
+            op.enable_relating_type_suggestions = enable_relating_type_suggestions
    except TypeError:  # Prop is not iterable
        pass
    return row
@@ -537,6 +556,7 @@ def draw_filter(
            elif ifc_filter.type == "query":
                row = box.row(align=True)
                row.prop(ifc_filter, "name", text="", icon="POINTCLOUD_DATA")
+                row.prop(ifc_filter, "comparison", text="")
                row.prop(ifc_filter, "value", text="")
            elif ifc_filter.type == "instance":
                row = box.row(align=True)
@@ -64,7 +64,11 @@ class TransactionStep(TypedDict):

 class IfcStore:
    path: str = ""
+    """Should be set only using ``tool.Ifc.set_path``."""
+
    file: Optional[ifcopenshell.file] = None
+    """Should be set only using ``tool.Ifc.set``."""
+
    schema: Optional[ifcopenshell.ifcopenshell_wrapper.schema_definition] = None
    cache: Optional[ifcopenshell.ifcopenshell_wrapper.HdfSerializer] = None
    cache_path: Optional[str] = None
@@ -112,6 +116,7 @@ class IfcStore:
            if IfcStore.path:
                try:
                    IfcStore.load_file(IfcStore.path)
+                    tool.Ifc.after_file_loaded()
                except Exception as e:
                    print(f"Failed to load file {IfcStore.path}. Error details: {e}")
        return IfcStore.file
@@ -123,14 +128,26 @@ class IfcStore:
        if IfcStore.path and not os.path.isabs(IfcStore.path):
            IfcStore.path = os.path.abspath(os.path.join(bpy.path.abspath("//"), IfcStore.path))

+    @staticmethod
+    def generate_cache_path() -> str:
+        """Generate cache path based on the active file and it's path."""
+        assert IfcStore.file
+        ifc_key = IfcStore.path + IfcStore.file.header.file_name.time_stamp
+        ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
+        prefs = tool.Blender.get_addon_preferences()
+        cache_path = os.path.join(prefs.cache_dir, f"{ifc_hash}.h5")
+        return cache_path
+
    @staticmethod
    def get_cache() -> ifcopenshell.geom.serializers.hdf5 | None:
+        """Get existing cache for the current file or create a new one.
+
+        .h5 cache name reflects IFC filepath and it's current header's timestamp.
+        """
        if IfcStore.cache is None and IfcStore.path:
-            prefs = tool.Blender.get_addon_preferences()
-            ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
-            ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
-            os.makedirs(prefs.cache_dir, exist_ok=True)
-            IfcStore.cache_path = os.path.join(prefs.cache_dir, f"{ifc_hash}.h5")
+            cache_path = IfcStore.generate_cache_path()
+            os.makedirs(os.path.dirname(cache_path), exist_ok=True)
+            IfcStore.cache_path = cache_path
            cache_path = Path(IfcStore.cache_path)
            cache_settings = ifcopenshell.geom.settings()
            serializer_settings = ifcopenshell.geom.serializer_settings()
@@ -164,14 +181,11 @@ class IfcStore:

    @staticmethod
    def update_cache() -> None:
+        """Update cache filename after timestamp was updated."""
        if not IfcStore.cache:
            return
        assert IfcStore.cache_path
-        assert IfcStore.file
-        ifc_key = IfcStore.path + IfcStore.file.wrapped_data.header.file_name.time_stamp
-        ifc_hash = hashlib.md5(ifc_key.encode("utf-8")).hexdigest()
-        prefs = tool.Blender.get_addon_preferences()
-        new_cache_path = os.path.join(prefs.cache_dir, f"{ifc_hash}.h5")
+        new_cache_path = IfcStore.generate_cache_path()
        IfcStore.cache = None
        try:
            shutil.move(IfcStore.cache_path, new_cache_path)
@@ -201,6 +215,7 @@ class IfcStore:
            IfcStore.file = ifcopenshell.open(path, should_stream=True)
        else:
            IfcStore.file = ifcopenshell.open(path)
+        tool.Ifc.after_file_loaded()

    @staticmethod
    def get_schema() -> ifcopenshell.ifcopenshell_wrapper.schema_definition:
@@ -445,8 +460,11 @@ class IfcStore:

        return callback

-    @staticmethod
+    modal_in_progress = False
+
+    @classmethod
    def execute_ifc_operator(
+        cls,
        operator: tool.Ifc.Operator,
        context: bpy.types.Context,
        event=None,
@@ -456,16 +474,33 @@ class IfcStore:
        props = tool.Blender.get_bim_props()
        props.is_dirty = True
        # Modals don't nest, and Blender handles the loop that continuously calls modal()
-        is_top_level_operator = not bool(IfcStore.current_transaction) or (method == "MODAL")
+        # So for modal operators we emulate nesting - first modal call is starting transaction
+        # and modal call with FINISHED/CANCELLED result finishes it.
+
+        # Example call chain for modal operators:
+        # Operator1.execute called
+        # -> Operator.execute called nested Operator2
+        #    -> Operator2.execute returned RUNNING_MODAL
+        #    -> Operator2.execute is finished
+        # -> Operator1.execute is finished
+        # -> Operator2.modal is called and returned PASS_THROUGH (going to another modal loop)
+        # -> Operator2.modal is finished
+        # -> Operator2.modal called again and last two steps repeat until FINISHED or CANCELLED
+        is_top_level_operator = not bool(IfcStore.current_transaction) and not cls.modal_in_progress

        if is_top_level_operator:
            IfcStore.begin_transaction(operator)
-            if tool.Ifc.get():
-                tool.Ifc.get().begin_transaction()
+            if ifc_file := tool.Ifc.get():
+                assert (
+                    ifc_file.transaction is None
+                ), "Trying to override existing transaction, possible IFC undo data loss."
+                ifc_file.begin_transaction()
            if BrickStore.graph is not None:  # `if BrickStore.graph` by itself takes ages.
                BrickStore.begin_transaction()
            # This empty transaction ensures that each operator has at least one transaction
            IfcStore.add_transaction_operation(operator, rollback=lambda data: True, commit=lambda data: True)
+            if method == "MODAL":
+                cls.modal_in_progress = True
        else:
            operator.transaction_key = IfcStore.current_transaction

@@ -483,6 +518,9 @@ class IfcStore:
                IfcStore.end_transaction(operator)
                bonsai.bim.handler.refresh_ui_data()

+                if method == "MODAL":
+                    cls.modal_in_progress = False
+
        try:
            if method == "EXECUTE":
                result = getattr(operator, "_execute")(context)
@@ -503,8 +541,10 @@ class IfcStore:

        if method == "MODAL":
            if result == {"FINISHED"}:
+                is_top_level_operator = True
                end_top_level_operator()
            elif result == {"CANCELLED"}:
+                is_top_level_operator = True
                # Please read the docs: https://docs.blender.org/api/current/bpy.types.Operator.html
                # > "when an operator returns {'CANCELLED'}, no undo step will be created".
                # This means that if your modal edits IFC data, then the user
@@ -219,9 +219,7 @@ class IfcImporter:
        self.gross_elements: set[ifcopenshell.entity_instance] = set()
        self.element_types: set[ifcopenshell.entity_instance] = set()
        self.spatial_elements: set[ifcopenshell.entity_instance] = set()
-        self.type_products = {}
        self.meshes: dict[str, OBJECT_DATA_TYPE] = {}
-        self.mesh_shapes = {}
        self.time = 0
        self.unit_scale = 1.0
        # ifc definition ids to blender elements mapping
@@ -285,6 +283,7 @@ class IfcImporter:
        self.place_objects_in_collections()
        self.profile_code("Place objects in collections")
        self.setup_arrays()
+        self.update_linked_aggregates()
        self.profile_code("Setup arrays")
        tool.Project.load_linked_models_from_ifc()
        self.profile_code("Load linked models")
@@ -463,6 +462,10 @@ class IfcImporter:
        return False

    def calculate_model_offset(self) -> None:
+        # TODO:
+        if isinstance(self.file, ifcopenshell.sqlite):
+            print("WARNING. Calculating model offset for IFCSQLite is not supported.")
+            return
        props = tool.Georeference.get_georeference_props()
        if self.ifc_import_settings.false_origin_mode == "MANUAL":
            tool.Loader.set_manual_blender_offset(self.file)
@@ -516,11 +519,52 @@ class IfcImporter:
            self.set_matrix_world(obj, tool.Loader.apply_blender_offset_to_matrix_world(obj, grid_placement))

    def create_element_types(self):
+        # TODO:
+        if isinstance(self.file, ifcopenshell.sqlite):
+            self.create_element_types_sqlite(self.element_types)
+            return
        for element_type in self.element_types:
-            if not element_type:
-                continue
            self.create_element_type(element_type)

+    def create_element_types_sqlite(self, element_types: set[ifcopenshell.entity_instance]) -> None:
+        assert isinstance(self.file, ifcopenshell.sqlite)
+        geometry_cache = self.file.get_geometry([e.id() for e in element_types])
+        geometry_meshes: dict[str, bpy.types.Mesh] = {}
+        for geometry_id, geometry in geometry_cache["geometry"].items():
+            verts = geometry["verts"]
+            fake_geometry = type("Geometry", (), {"id": geometry_id})
+            mesh_name = tool.Loader.get_mesh_name_from_shape(fake_geometry)  # pyright: ignore[reportArgumentType]
+            mesh = bpy.data.meshes.new(mesh_name)
+
+            if geometry["faces"].size:
+                mesh = tool.Loader.create_mesh_from_shape(
+                    mesh=mesh, faces=geometry["faces"].reshape(-1, 3), verts=verts.reshape(-1, 3)
+                )
+            else:
+                vertices = verts.reshape(-1, 3).tolist()
+                edges = geometry["edges"].reshape(-1, 2).tolist()
+                mesh.from_pydata(vertices, edges, [])
+            tool.Loader.link_mesh(fake_geometry, mesh)  # pyright: ignore[reportArgumentType]
+
+            mesh["ios_materials"] = geometry["materials"]
+            mesh["ios_material_ids"] = geometry["material_ids"]
+            self.meshes[mesh_name] = mesh
+            geometry_meshes[geometry_id] = mesh
+
+        shapes = geometry_cache["shapes"]
+        for element in element_types:
+            # Allow missing element types to accomodate older ifcsqlite files
+            # that didn't store element types geometry.
+            shape = shapes.get(element.id())
+            if shape:
+                geometry_id = shapes[element.id()]["geometry"]
+            else:
+                geometry_id = None
+            mesh = None if geometry_id is None else geometry_meshes[geometry_id]
+            obj = bpy.data.objects.new(tool.Loader.get_name(element), mesh)
+            self.link_element(element, obj)
+            self.material_creator.create(element, obj, mesh, False)
+
    def create_element_type(self, element: ifcopenshell.entity_instance) -> None:
        self.ifc_import_settings.logger.info("Creating object %s", element)
        mesh = None
@@ -547,7 +591,6 @@ class IfcImporter:
        obj = bpy.data.objects.new(tool.Loader.get_name(element), mesh)
        self.link_element(element, obj)
        self.material_creator.create(element, obj, mesh, False)
-        self.type_products[element.GlobalId] = obj

    def create_native_elements(self):
        if not self.ifc_import_settings.should_load_geometry:
@@ -582,18 +625,13 @@ class IfcImporter:
        print("Done creating geometry")

    def create_spatial_elements(self) -> None:
-        if tool.Blender.get_addon_preferences().spatial_elements_unselectable:
-            self.create_generic_elements(self.spatial_elements, unselectable=True)
-        else:
-            self.create_generic_elements(self.spatial_elements, unselectable=False)
+        self.create_generic_elements(self.spatial_elements)

    def create_elements(self) -> None:
        self.create_generic_elements(self.elements)
        self.create_generic_elements(self.gross_elements, is_gross=True)

-    def create_generic_elements(
-        self, elements: set[ifcopenshell.entity_instance], unselectable=False, is_gross=False
-    ) -> None:
+    def create_generic_elements(self, elements: set[ifcopenshell.entity_instance], is_gross=False) -> None:
        if isinstance(self.file, ifcopenshell.sqlite):
            return self.create_generic_sqlite_elements(elements)

@@ -617,10 +655,6 @@ class IfcImporter:
                print("{} / {} elements processed ...".format(i, total))
            objects.add(self.create_product(element))

-        if unselectable:
-            for obj in objects:
-                obj.hide_select = True
-
    def create_generic_sqlite_elements(self, elements: set[ifcopenshell.entity_instance]) -> None:
        assert isinstance(self.file, ifcopenshell.sql.sqlite)
        self.geometry_cache = self.file.get_geometry([e.id() for e in elements])
@@ -631,15 +665,13 @@ class IfcImporter:
            verts = geometry["verts"]
            mesh["has_cartesian_point_offset"] = False

-            if geometry["faces"]:
+            if geometry["faces"].size:
                mesh = tool.Loader.create_mesh_from_shape(
                    mesh=mesh, faces=geometry["faces"].reshape(-1, 3), verts=verts.reshape(-1, 3)
                )
            else:
-                e = geometry["edges"]
-                v = verts
-                vertices = [[v[i], v[i + 1], v[i + 2]] for i in range(0, len(v), 3)]
-                edges = [[e[i], e[i + 1]] for i in range(0, len(e), 2)]
+                vertices = verts.reshape(-1, 3).tolist()
+                edges = geometry["edges"].reshape(-1, 2).tolist()
                mesh.from_pydata(vertices, edges, [])

            mesh["ios_materials"] = geometry["materials"]
@@ -884,7 +916,8 @@ class IfcImporter:
        for material in self.material_creator.materials.values():
            bpy.data.materials.remove(material)

-    def add_project_to_scene(self):
+    def add_project_to_scene(self) -> None:
+        assert bpy.context.scene
        try:
            bpy.context.scene.collection.children.link(self.project["blender"])
        except:
@@ -909,6 +942,7 @@ class IfcImporter:
        bpy.ops.mesh.normals_make_consistent()
        bpy.ops.object.editmode_toggle()

+        assert bpy.context.view_layer
        bpy.context.view_layer.objects.active = last_obj
        IfcStore.edited_objs.clear()

@@ -918,6 +952,9 @@ class IfcImporter:
        if not props.ifc_file:
            props.ifc_file = self.ifc_import_settings.input_file
        self.file = tool.Ifc.get()
+        # IFC4 Reference View shall have no booleans https://github.com/BuildingSMART/IFC4-CV/issues/14
+        if self.file.schema == "IFC4" and "ReferenceView" in str(self.file.header.file_description.description):
+            self.ifc_import_settings.void_limit = 0

    def calculate_unit_scale(self):
        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)
@@ -927,6 +964,7 @@ class IfcImporter:
        if not (assignment := self.file.by_type("IfcProject")[0].UnitsInContext):
            return  # Geometry is optional in IFC
        props = tool.Blender.get_bim_props()
+        assert bpy.context.scene
        for unit in assignment.Units:
            if unit.is_a("IfcNamedUnit") and unit.UnitType == "LENGTHUNIT":
                if unit.is_a("IfcSIUnit"):
@@ -974,6 +1012,7 @@ class IfcImporter:
        )
        obj = self.create_product(self.project["ifc"])
        obj.hide_select = True
+        obj.hide_viewport = True
        self.project["blender"].objects.link(obj)
        self.project["blender"].BIMCollectionProperties.obj = obj
        props = tool.Blender.get_object_bim_props(obj)
@@ -1065,11 +1104,11 @@ class IfcImporter:
    def create_mesh(
        self,
        element: ifcopenshell.entity_instance,
-        shape: Union[ifcopenshell.geom.ShapeElementType, ifcopenshell.geom.ShapeType],
+        shape: Union[W.Triangulation, W.TriangulationElement],
        cartesian_point_offset: Union[npt.NDArray[np.float64], Literal[False]] = None,
    ) -> Union[bpy.types.Mesh, None]:
        try:
-            if isinstance(shape, ifcopenshell.geom.ShapeElementType):
+            if isinstance(shape, W.TriangulationElement):
                # shape is ShapeElementType
                geometry = shape.geometry
            else:
@@ -1175,6 +1214,36 @@ class IfcImporter:
                        tool.Blender.Modifier.Array.set_children_lock_state(element, i, True)
                        tool.Blender.Modifier.Array.constrain_children_to_parent(element)

+    def update_linked_aggregates(self):
+        # TODO Remove this after a while. See commit 17d6b8a
+        # https://github.com/IfcOpenShell/IfcOpenShell/commit/17d6b8af61c8dd7cd82f6e72b2fb3831d851a33d#commitcomment-163151609
+
+        groups = self.file.by_type("IfcGroup")
+        target_groups = [group for group in groups if group.Name == "BBIM_Linked_Aggregate"]
+        if not target_groups:
+            return
+
+        for i, group in enumerate(target_groups):
+            name = "Default"
+            elements = ifcopenshell.util.element.get_grouped_by(self.file.by_id(group.id()), is_recursive=True)
+            for j, element in enumerate(elements):
+                split = element.Name.rsplit("_")
+                name = split[0]
+                try:
+                    aggregate_index = int(split[1])
+                except:
+                    aggregate_index = 0
+                pset = ifcopenshell.util.element.get_pset(element, "BBIM_Linked_Aggregate", should_inherit=False)
+                if not pset:
+                    return
+                if "Aggregate_Index" not in pset.keys():
+                    ifcopenshell.api.run(
+                        "pset.edit_pset",
+                        self.file,
+                        pset=self.file.by_id(pset["id"]),
+                        properties={"Aggregate_Index": aggregate_index, "Name": name},
+                    )
+

 class IfcImportSettings:
    """
@@ -1219,6 +1288,7 @@ class IfcImportSettings:
        context=None, input_file: Optional[str] = None, logger: Optional[logging.Logger] = None
    ) -> IfcImportSettings:
        scene_diff = tool.Blender.get_diff_props()
+        prefs = tool.Blender.get_addon_preferences()
        props = tool.Project.get_project_props()
        settings = IfcImportSettings()
        settings.input_file = input_file
@@ -1231,7 +1301,7 @@ class IfcImportSettings:
        settings.should_merge_materials_by_colour = props.should_merge_materials_by_colour
        settings.should_load_geometry = props.should_load_geometry
        settings.should_clean_mesh = props.should_clean_mesh
-        settings.should_cache = props.should_cache
+        settings.should_cache = prefs.should_always_cache or props.should_cache
        settings.deflection_tolerance = props.deflection_tolerance
        settings.angular_tolerance = props.angular_tolerance
        settings.void_limit = props.void_limit
@@ -94,6 +94,9 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, tool.Ifc.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
+        aggregates_to_check = set()
+
+        # First pass: unassign all parts and track their aggregates
        for obj in tool.Blender.get_selected_objects():
            element = tool.Ifc.get_entity(obj)
            if not element:
@@ -101,6 +104,10 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, tool.Ifc.Operator):
            aggregate = ifcopenshell.util.element.get_aggregate(element)
            if not aggregate:
                continue
+
+            # Track this aggregate for later checking
+            aggregates_to_check.add(aggregate)
+
            core.unassign_object(
                tool.Ifc,
                tool.Aggregate,
@@ -116,6 +123,29 @@ class BIM_OT_aggregate_unassign_object(bpy.types.Operator, tool.Ifc.Operator):
                    pset = tool.Ifc.get().by_id(pset["id"])
                    ifcopenshell.api.pset.remove_pset(tool.Ifc.get(), product=element, pset=pset)

+        # Second pass: delete aggregates that now have no parts
+        deleted_aggregates = []
+        for aggregate in aggregates_to_check:
+            related_objects = ifcopenshell.util.element.get_parts(aggregate)
+            if len(related_objects) == 0:
+                aggregate_name = aggregate.Name or f"{aggregate.is_a()} #{aggregate.id()}"
+                deleted_aggregates.append(aggregate_name)
+
+                aggregate_obj = tool.Ifc.get_object(aggregate)
+                if aggregate_obj:
+                    ifcopenshell.api.root.remove_product(tool.Ifc.get(), product=aggregate)
+                    bpy.data.objects.remove(aggregate_obj, do_unlink=True)
+
+        # Show info message if aggregates were deleted
+        if deleted_aggregates:
+            if len(deleted_aggregates) == 1:
+                self.report(
+                    {"INFO"}, f"Aggregate '{deleted_aggregates[0]}' was deleted because it had no remaining parts"
+                )
+            else:
+                aggregate_list = ", ".join(f"'{name}'" for name in deleted_aggregates)
+                self.report({"INFO"}, f"Aggregates {aggregate_list} were deleted because they had no remaining parts")
+

 class BIM_OT_enable_editing_aggregate(bpy.types.Operator):
    """Enable editing aggregation relationship"""
@@ -1215,7 +1215,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        assert blender_topic
        topic = bcfxml.topics[blender_topic.name]
        if self.viewpoint_guid:
-            viewpoint_guid = self.viewpoint_guid
+            viewpoint_guid = self.viewpoint_guid + ".bcfv"
            if viewpoint_guid not in topic.viewpoints:
                self.report({"ERROR"}, f"No such viewpoint in the active topic: '{viewpoint_guid}'.")
                return {"CANCELLED"}
@@ -1313,7 +1313,7 @@ class ActivateBcfViewpoint(bpy.types.Operator):
        x_axis = y_axis.cross(z_axis).normalized()
        rotation = Matrix((x_axis, y_axis, z_axis))
        rotation.invert()
-        matrix = np.matrix(
+        matrix = np.array(
            (
                [x_axis[0], y_axis[0], z_axis[0], camera.camera_view_point.x],
                [x_axis[1], y_axis[1], z_axis[1], camera.camera_view_point.y],
@@ -40,6 +40,7 @@ from mathutils import Vector, Matrix
 from bonsai.bim.ifc import IfcStore
 from bonsai.bim.module.model.decorator import ProfileDecorator
 from bonsai.bim.module.boundary.decorator import BoundaryDecorator
+from ifcopenshell.util.shape_builder import ShapeBuilder
 import bonsai.core
 import bonsai.core.geometry
 from typing import Union, Optional
@@ -1058,15 +1059,11 @@ class AddBoundary(bpy.types.Operator, tool.Ifc.Operator):

        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
        tool.Model.unit_scale = self.unit_scale
+        builder = ShapeBuilder(tool.Ifc.get())

        surface = tool.Ifc.get().createIfcCurveBoundedPlane()
-        surface.BasisSurface = tool.Ifc.get().createIfcPlane(
-            tool.Ifc.get().createIfcAxis2Placement3D(
-                tool.Ifc.get().createIfcCartesianPoint([o / self.unit_scale for o in p1]),
-                tool.Ifc.get().createIfcDirection([float(o) for o in z_axis]),
-                tool.Ifc.get().createIfcDirection([float(o) for o in x_axis]),
-            )
-        )
+        placement = builder.create_axis2_placement_3d([o / self.unit_scale for o in p1], z_axis, x_axis)
+        surface.BasisSurface = tool.Ifc.get().create_entity("IfcPlane", placement)

        if tool.Ifc.get().schema != "IFC2X3":
            points = [tool.Model.convert_si_to_unit(list(co)) for co in polygon.exterior.coords]
@@ -25,6 +25,7 @@ classes = (
    operator.LoadBSDDDictionaries,
    operator.SearchBSDDClassifications,
    operator.SearchBSDDProperties,
+    operator.BIM_OT_show_bsdd_description,
    prop.BSDDDictionary,
    prop.BSDDClassification,
    prop.BSDDProperty,
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.
-
+import textwrap
 import bpy
 import bsdd
 import bonsai.tool as tool
@@ -85,6 +85,14 @@ class AddBSDDProperties(bpy.types.Operator, tool.Ifc.Operator):
    obj: bpy.props.StringProperty()
    obj_type: bpy.props.StringProperty()

+    @classmethod
+    def poll(cls, context):
+        props = tool.Bsdd.get_bsdd_props()
+        if not props.selected_properties:
+            cls.poll_message_set("No properties selected to add.")
+            return False
+        return True
+
    def _execute(self, context):
        self.file = tool.Ifc.get()
        bprops = tool.Bsdd.get_bsdd_props()
@@ -93,10 +101,9 @@ class AddBSDDProperties(bpy.types.Operator, tool.Ifc.Operator):
        for selected_property in bprops.selected_properties:
            psets.setdefault(selected_property.metadata, {})[selected_property.name] = selected_property.get_value()

-        props = tool.Pset.get_pset_props(self.obj, self.obj_type)
        ifc_definition_id = tool.Blender.get_obj_ifc_definition_id(self.obj, self.obj_type, context)
+        assert ifc_definition_id
        element = tool.Ifc.get().by_id(ifc_definition_id)
-        properties = {}

        current_psets = ifcopenshell.util.element.get_psets(element, verbose=True)
        for pset_name, properties in psets.items():
@@ -105,3 +112,35 @@ class AddBSDDProperties(bpy.types.Operator, tool.Ifc.Operator):
            else:
                pset = ifcopenshell.api.pset.add_pset(self.file, product=element, name=pset_name)
            ifcopenshell.api.pset.edit_pset(self.file, pset=pset, properties=properties)
+
+
+class BIM_OT_show_bsdd_description(bpy.types.Operator):
+    bl_idname = "bim.show_bsdd_description"
+    bl_label = "bSDD Description"
+    url: bpy.props.StringProperty()
+
+    def invoke(self, context, event):
+        wm = context.window_manager
+        return wm.invoke_props_dialog(self, width=450)
+
+    def execute(self, context):
+        return {"FINISHED"}
+
+    def draw(self, context):
+        WIDTH = 80
+        layout = self.layout
+        wrapper = textwrap.TextWrapper(width=WIDTH)
+        result = tool.Bsdd.get_bsdd_property(self.url)
+        description = result.get("description") or ""
+        definition = result.get("definition") or ""
+        if description != definition:
+            text = wrapper.wrap(f"Description : {description}")
+            text.append("-" * (WIDTH - 15))
+            text += wrapper.wrap(f"Definition : {definition}")
+        else:
+            text = wrapper.wrap(f"Description : {description}")
+        for line in text:
+            layout.label(text=line)
+        if self.url:
+            url_op = layout.operator("bim.open_uri", icon="URL", text="Online bSDD Documentation")
+            url_op.uri = self.url
@@ -147,6 +147,7 @@ class BIM_UL_bsdd_properties(UIList):
        active_propname,
    ) -> None:
        if item:
+            layout.context_pointer_set("active_bsdd_property", item)  # used for context menu
            row = layout.row(align=True)
            name = item.name
            if name != item.code:
@@ -48,6 +48,7 @@ classes = (
    ui.BIM_PT_classification_references,
    ui.BIM_PT_material_classifications,
    ui.BIM_PT_cost_classifications,
+    ui.BIM_PT_zone_classifications,
    ui.BIM_UL_classifications,
 )

@@ -21,15 +21,16 @@ import ifcopenshell
 import ifcopenshell.util.date
 import ifcopenshell.util.classification
 import bonsai.tool as tool
-from typing import Any
+from typing import Any, Literal, Union
 from bonsai.bim.ifc import IfcStore


 def refresh():
    ClassificationsData.is_loaded = False
-    ClassificationReferencesData.is_loaded = False
+    ObjectClassificationsData.is_loaded = False
    MaterialClassificationsData.is_loaded = False
    CostClassificationsData.is_loaded = False
+    ZoneClassificationsData.is_loaded = False


 class ClassificationsData:
@@ -55,6 +56,7 @@ class ClassificationsData:
            data = element.get_info()
            if tool.Ifc.get().schema == "IFC2X3" and element.EditionDate:
                data["EditionDate"] = ifcopenshell.util.date.ifc2datetime(data["EditionDate"])
+            data["Name"] = data["Name"] or "Unnamed"
            results.append(data)
        return results

@@ -78,6 +80,34 @@ class ClassificationsData:


 class ReferencesData:
+    data: dict[str, Any]
+    is_loaded = False
+    obj_type: Literal["Object", "Material", "Cost", "Zone"]
+
+    @classmethod
+    def load(cls):
+        cls.is_loaded = True
+        cls.data = {}
+        cls.data["references"] = cls.references()
+        cls.data["active_classification_library"] = cls.active_classification_library()
+        cls.data["classifications"] = cls.classifications()
+
+    @classmethod
+    def get_element(cls) -> Union[ifcopenshell.entity_instance, None]:
+        """Get element to get classification references from."""
+        raise NotImplementedError
+
+    @classmethod
+    def references(cls) -> list[dict[str, Any]]:
+        results = []
+        element = cls.get_element()
+        if element:
+            for reference in ifcopenshell.util.classification.get_references(element):
+                data = reference.get_info()
+                del data["ReferencedSource"]
+                results.append(data)
+        return results
+
    @classmethod
    def active_classification_library(cls):
        if not IfcStore.classification_file or not IfcStore.classification_file.by_type("IfcClassification"):
@@ -92,80 +122,44 @@ class ReferencesData:
        return [(str(e.id()), e.Name, "") for e in tool.Ifc.get().by_type("IfcClassification")]


-class ClassificationReferencesData(ReferencesData):
-    data: dict[str, Any] = {}
-    is_loaded = False
+class ObjectClassificationsData(ReferencesData):
+    obj_type = "Object"

    @classmethod
-    def load(cls):
-        cls.is_loaded = True
-        cls.data["references"] = cls.references()
-        cls.data["active_classification_library"] = cls.active_classification_library()
-        cls.data["classifications"] = cls.classifications()
-        cls.data["object_type"] = "Object"
-
-    @classmethod
-    def references(cls):
-        results = []
-        element = tool.Ifc.get_entity(bpy.context.active_object)
-        if element:
-            for reference in ifcopenshell.util.classification.get_references(element):
-                data = reference.get_info()
-                del data["ReferencedSource"]
-                results.append(data)
-        return results
+    def get_element(cls) -> Union[ifcopenshell.entity_instance, None]:
+        if obj := bpy.context.active_object:
+            return tool.Ifc.get_entity(obj)
+        return None


 class MaterialClassificationsData(ReferencesData):
-    data: dict[str, Any] = {}
-    is_loaded = False
+    obj_type = "Material"

    @classmethod
-    def load(cls):
-        cls.is_loaded = True
-        cls.data["references"] = cls.references()
-        cls.data["active_classification_library"] = cls.active_classification_library()
-        cls.data["classifications"] = cls.classifications()
-        cls.data["object_type"] = "Material"
-
-    @classmethod
-    def references(cls):
-        results = []
-
+    def get_element(cls) -> Union[ifcopenshell.entity_instance, None]:
        props = tool.Material.get_material_props()
        if material := props.active_material:
-            if material.ifc_definition_id:
-                element = tool.Ifc.get().by_id(material.ifc_definition_id)
-                for reference in ifcopenshell.util.classification.get_references(element):
-                    data = reference.get_info()
-                    del data["ReferencedSource"]
-                    results.append(data)
-        return results
+            return tool.Ifc.get().by_id(material.ifc_definition_id)
+        return None


 class CostClassificationsData(ReferencesData):
-    data: dict[str, Any] = {}
-    is_loaded = False
+    obj_type = "Cost"

    @classmethod
-    def load(cls):
-        cls.is_loaded = True
-        cls.data["references"] = cls.references()
-        cls.data["active_classification_library"] = cls.active_classification_library()
-        cls.data["classifications"] = cls.classifications()
-        cls.data["object_type"] = "Cost"
-
-    @classmethod
-    def references(cls) -> list[dict[str, Any]]:
-        results: list[dict[str, Any]] = []
+    def get_element(cls) -> Union[ifcopenshell.entity_instance, None]:
        props = tool.Cost.get_cost_props()
-        active_cost_item = props.active_cost_item
-        if not active_cost_item:
-            return results
-        element = tool.Ifc.get().by_id(active_cost_item.ifc_definition_id)
-        if element:
-            for reference in ifcopenshell.util.classification.get_references(element):
-                data = reference.get_info()
-                del data["ReferencedSource"]
-                results.append(data)
-        return results
+        if cost_item := props.active_cost_item:
+            return tool.Ifc.get().by_id(cost_item.ifc_definition_id)
+        return None
+
+
+class ZoneClassificationsData(ReferencesData):
+    obj_type = "Zone"
+
+    @classmethod
+    def get_element(cls) -> Union[ifcopenshell.entity_instance, None]:
+        props = tool.System.get_zone_props()
+        if active_zone := props.active_zone:
+            return tool.Ifc.get().by_id(active_zone.ifc_definition_id)
+        return None
@@ -17,7 +17,6 @@
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

 import bpy
-import json
 import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.api.pset
@@ -192,21 +191,11 @@ class EnableEditingClassification(bpy.types.Operator):
    classification: bpy.props.IntProperty()

    def execute(self, context):
-        def callback(name, prop, data):
-            if name == "ReferenceTokens":
-                geo_props = tool.Georeference.get_georeference_props()
-                new = geo_props.projected_crs.add()
-                new.name = name
-                new.data_type = "string"
-                new.is_null = data[name] is None
-                new.is_optional = True
-                new.string_value = "" if new.is_null else json.dumps(data[name])
-                return True
-
        props = tool.Classification.get_classification_props()
        props.classification_attributes.clear()
        bonsai.bim.helper.import_attributes(
-            tool.Ifc.get().by_id(self.classification), props.classification_attributes, callback
+            tool.Ifc.get().by_id(self.classification),
+            props.classification_attributes,
        )
        props.active_classification_id = self.classification
        return {"FINISHED"}
@@ -248,13 +237,7 @@ class EditClassification(bpy.types.Operator, tool.Ifc.Operator):

    def _execute(self, context):
        props = tool.Classification.get_classification_props()
-
-        def callback(attributes, prop):
-            if prop.name == "ReferenceTokens":
-                attributes[prop.name] = json.loads(prop.string_value)
-                return True
-
-        attributes = bonsai.bim.helper.export_attributes(props.classification_attributes, callback=callback)
+        attributes = bonsai.bim.helper.export_attributes(props.classification_attributes)
        ifc_file = tool.Ifc.get()
        ifcopenshell.api.classification.edit_classification(
            ifc_file,
@@ -19,7 +19,7 @@
 import bpy
 import bonsai.tool as tool
 from bonsai.bim.prop import Attribute
-from bonsai.bim.module.classification.data import ClassificationsData, ClassificationReferencesData
+from bonsai.bim.module.classification.data import ClassificationsData, ObjectClassificationsData
 from bpy.types import PropertyGroup
 from bpy.props import (
    PointerProperty,
@@ -43,9 +43,9 @@ def get_available_classifications(


 def get_classifications(self, context):
-    if not ClassificationReferencesData.is_loaded:
-        ClassificationReferencesData.load()
-    return ClassificationReferencesData.data["classifications"]
+    if not ObjectClassificationsData.is_loaded:
+        ObjectClassificationsData.load()
+    return ObjectClassificationsData.data["classifications"]


 def get_classification_source(
@@ -24,9 +24,10 @@ import bonsai.bim.module.classification.prop as classification_prop
 from bpy.types import Panel, UIList
 from bonsai.bim.module.classification.data import (
    ClassificationsData,
-    ClassificationReferencesData,
+    ObjectClassificationsData,
    MaterialClassificationsData,
    CostClassificationsData,
+    ZoneClassificationsData,
 )
 from typing import TYPE_CHECKING, Any, Union

@@ -72,6 +73,7 @@ class BIM_PT_classifications(Panel):
                self.draw_ui(classification)

    def draw_add_manual_ui(self, context):
+        assert self.layout
        if self.props.is_adding:
            bonsai.bim.helper.draw_attributes(self.props.classification_attributes, self.layout)
            row = self.layout.row(align=True)
@@ -82,10 +84,12 @@ class BIM_PT_classifications(Panel):
            row.operator("bim.enable_adding_manual_classification", text="Add Classification", icon="ADD")

    def draw_add_bsdd_ui(self, context):
+        assert self.layout
        row = self.layout.row()
        row.operator("bim.add_classification_from_bsdd", icon="ADD")

    def draw_add_file_ui(self, context):
+        assert self.layout
        if ClassificationsData.data["has_classification_file"]:
            row = self.layout.row(align=True)
            row.prop(self.props, "available_classifications", text="")
@@ -96,13 +100,15 @@ class BIM_PT_classifications(Panel):
            row.label(text="No Active Classification Library")
            row.operator("bim.load_classification_library", text="", icon="IMPORT")

-    def draw_editable_ui(self):
+    def draw_editable_ui(self) -> None:
+        assert self.layout
        row = self.layout.row(align=True)
        row.operator("bim.edit_classification", text="Save changes", icon="CHECKMARK")
        row.operator("bim.disable_editing_classification", text="", icon="CANCEL")
        bonsai.bim.helper.draw_attributes(self.props.classification_attributes, self.layout)

-    def draw_ui(self, classification):
+    def draw_ui(self, classification: dict[str, Any]) -> None:
+        assert self.layout
        row = self.layout.row(align=True)
        row.label(text=classification["Name"], icon="ASSET_MANAGER")
        if not self.props.active_classification_id:
@@ -112,16 +118,29 @@ class BIM_PT_classifications(Panel):


 class ReferenceUI:
-    layout: bpy.types.UILayout
+    layout: Union[bpy.types.UILayout, None]
    data: type[
        Union[
-            ClassificationReferencesData,
+            ObjectClassificationsData,
            MaterialClassificationsData,
            CostClassificationsData,
+            ZoneClassificationsData,
        ]
    ]

-    def draw_ui(self, context) -> None:
+    obj: str
+    """Object name."""
+
+    def get_object_name(self, context: bpy.types.Context) -> str:
+        return ""
+
+    def draw(self, context: bpy.types.Context) -> None:
+        if not self.data.is_loaded:
+            self.data.load()
+        self.obj = self.get_object_name(context)
+        self.draw_ui(context)
+
+    def draw_ui(self, context: bpy.types.Context) -> None:
        self.sprops = tool.Classification.get_classification_props()
        self.bprops = tool.Bsdd.get_bsdd_props()
        self.props = tool.Classification.get_classification_reference_props()
@@ -139,7 +158,7 @@ class ReferenceUI:
            else:
                self.draw_reference_ui(reference)

-    def draw_add_ui(self, context) -> None:
+    def draw_add_ui(self, context: bpy.types.Context) -> None:
        row = self.layout.row(align=True)
        row.label(text="Source", icon="OUTLINER")
        row.prop(self.sprops, "classification_source", text="")
@@ -151,20 +170,20 @@ class ReferenceUI:
        else:
            self.draw_add_bsdd_ui(context)

-    def draw_add_manual_ui(self, context) -> None:
+    def draw_add_manual_ui(self, context: object) -> None:
        row = self.layout.row()
        row.prop(self.props, "classifications", text="")
        if self.props.is_adding:
            bonsai.bim.helper.draw_attributes(self.props.reference_attributes, self.layout)
            row = self.layout.row(align=True)
            op = row.operator("bim.add_manual_classification_reference", text="Save", icon="CHECKMARK")
-            op.obj_type = self.data.data["object_type"]
+            op.obj_type = self.data.obj_type
            row.operator("bim.disable_adding_manual_classification_reference", text="", icon="CANCEL")
        else:
            row = self.layout.row()
            row.operator("bim.enable_adding_manual_classification_reference", text="Add Reference", icon="ADD")

-    def draw_add_bsdd_ui(self, context) -> None:
+    def draw_add_bsdd_ui(self, context: object) -> None:
        row = self.layout.row(align=True)
        row.prop(self.bprops, "keyword", text="")
        row.prop(self.bprops, "should_filter_ifc_class", text="", icon="FILTER")
@@ -189,9 +208,9 @@ class ReferenceUI:
                "bim.add_classification_reference_from_bsdd", text="Add Classification Reference", icon="ADD"
            )
            op.obj = self.obj
-            op.obj_type = self.obj_type
+            op.obj_type = self.data.obj_type

-    def draw_add_file_ui(self, context) -> None:
+    def draw_add_file_ui(self, context: object) -> None:
        if not self.data.data["active_classification_library"]:
            row = self.layout.row(align=True)
            row.label(text="No Active Classification Library", icon="ERROR")
@@ -211,7 +230,7 @@ class ReferenceUI:
        if self.sprops.active_library_reference_index < len(self.sprops.available_library_references):
            op = row.operator("bim.add_classification_reference", text="", icon="ADD")
            op.obj = self.obj
-            op.obj_type = self.obj_type
+            op.obj_type = self.data.obj_type
            op.reference = self.sprops.available_library_references[
                self.sprops.active_library_reference_index
            ].ifc_definition_id
@@ -247,7 +266,7 @@ class ReferenceUI:
        op = row.operator("bim.remove_classification_reference", text="", icon="X")
        op.reference = reference["id"]
        op.obj = self.obj
-        op.obj_type = self.obj_type
+        op.obj_type = self.data.obj_type


 class BIM_PT_classification_references(Panel, ReferenceUI):
@@ -259,19 +278,19 @@ class BIM_PT_classification_references(Panel, ReferenceUI):
    bl_context = "object"
    bl_parent_id = "BIM_PT_tab_object_metadata"

+    data = ObjectClassificationsData
+
    @classmethod
    def poll(cls, context):
-        if not context.active_object:
-            return False
-        return bool(tool.Ifc.get_entity(context.active_object))
+        return (
+            (obj := tool.Blender.get_active_object())
+            and (element := tool.Ifc.get_entity(obj))
+            and element.is_a("IfcObjectDefinition")
+        )

-    def draw(self, context):
-        if not ClassificationReferencesData.is_loaded:
-            ClassificationReferencesData.load()
-        self.data = ClassificationReferencesData
-        self.obj = context.active_object.name
-        self.obj_type = "Object"
-        self.draw_ui(context)
+    def get_object_name(self, context: bpy.types.Context) -> str:
+        assert (obj := context.active_object)
+        return obj.name


 class BIM_PT_material_classifications(Panel, ReferenceUI):
@@ -283,6 +302,8 @@ class BIM_PT_material_classifications(Panel, ReferenceUI):
    bl_context = "scene"
    bl_parent_id = "BIM_PT_materials"

+    data = MaterialClassificationsData
+
    @classmethod
    def poll(cls, context):
        if not tool.Ifc.get():
@@ -292,14 +313,6 @@ class BIM_PT_material_classifications(Panel, ReferenceUI):
            return True
        return False

-    def draw(self, context):
-        if not MaterialClassificationsData.is_loaded:
-            MaterialClassificationsData.load()
-        self.data = MaterialClassificationsData
-        self.obj = ""
-        self.obj_type = "Material"
-        self.draw_ui(context)
-

 class BIM_PT_cost_classifications(Panel, ReferenceUI):
    bl_label = "Cost Item Classifications"
@@ -310,6 +323,8 @@ class BIM_PT_cost_classifications(Panel, ReferenceUI):
    bl_context = "scene"
    bl_parent_id = "BIM_PT_cost_schedules"

+    data = CostClassificationsData
+
    @classmethod
    def poll(cls, context):
        if not tool.Ifc.get():
@@ -317,13 +332,22 @@ class BIM_PT_cost_classifications(Panel, ReferenceUI):
        props = tool.Cost.get_cost_props()
        return bool(props.cost_items)

-    def draw(self, context):
-        if not CostClassificationsData.is_loaded:
-            CostClassificationsData.load()
-        self.data = CostClassificationsData
-        self.obj = ""
-        self.obj_type = "Cost"
-        self.draw_ui(context)
+
+class BIM_PT_zone_classifications(Panel, ReferenceUI):
+    bl_label = "Zone Classifications"
+    bl_idname = "BIM_PT_zone_classifications"
+    bl_options = {"DEFAULT_CLOSED"}
+    bl_space_type = "PROPERTIES"
+    bl_region_type = "WINDOW"
+    bl_context = "scene"
+    bl_parent_id = "BIM_PT_zones"
+
+    data = ZoneClassificationsData
+
+    @classmethod
+    def poll(cls, context):
+        props = tool.System.get_zone_props()
+        return bool(props.active_zone)


 class BIM_UL_classifications(UIList):
@@ -37,6 +37,7 @@ classes = (
    operator.ContractCostItemRate,
    operator.ContractCostItems,
    operator.CopyCostItem,
+    operator.CopyCostSchedule,
    operator.CopyCostItemValues,
    operator.DisableEditingCostItem,
    operator.DisableEditingCostItemQuantity,
@@ -131,6 +131,7 @@ class CostSchedulesData:
            cls._load_cost_values(cost_item, data)
            cls._load_nesting_index(cost_item, data)
            cls._load_assigned_cost_rate(cost_item, data)
+            cls._load_parent_cost_schedule(cost_item, data)
            results[cost_item.id()] = data
        return results

@@ -182,6 +183,10 @@ class CostSchedulesData:
    def _load_assigned_cost_rate(cls, cost_item: ifcopenshell.entity_instance, data: CostItem) -> None:
        data["AssignedCostRate"] = tool.Cost.get_assigned_rate_cost_item(cost_item)

+    @classmethod
+    def _load_parent_cost_schedule(cls, cost_item: ifcopenshell.entity_instance, data: CostItem) -> None:
+        data["ParentCostSchedule"] = tool.Cost.get_cost_schedule(cost_item)
+
    @classmethod
    def _load_cost_item_quantities(cls, cost_item: ifcopenshell.entity_instance, data: CostItem) -> None:
        # parametric_quantities = []
@@ -82,6 +82,20 @@ class RemoveCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
        core.remove_cost_schedule(tool.Ifc, tool.Cost, cost_schedule=tool.Ifc.get().by_id(self.cost_schedule))


+class CopyCostSchedule(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.copy_cost_schedule"
+    bl_label = "Copy Cost Schedule"
+    bl_description = "Create a duplicate of the provided cost schedule."
+    bl_options = {"REGISTER", "UNDO"}
+    cost_schedule: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]
+
+    if TYPE_CHECKING:
+        cost_schedule: int
+
+    def _execute(self, context):
+        core.copy_cost_schedule(tool.Cost, cost_schedule=tool.Ifc.get().by_id(self.cost_schedule))
+
+
 class EnableEditingCostSchedule(bpy.types.Operator):
    bl_idname = "bim.enable_editing_cost_schedule_attributes"
    bl_label = "Enable Editing Cost Schedule"
@@ -687,6 +701,7 @@ class ShowAssignedCostRate(bpy.types.Operator):
    bl_idname = "bim.show_assigned_cost_rate"
    bl_label = "Info about the assigned cost item rate"
    bl_options = {"REGISTER"}
+    parent_cost_schedule_name: bpy.props.StringProperty()
    assigned_rate_identification: bpy.props.StringProperty()
    assigned_rate_name: bpy.props.StringProperty()
    assigned_rate_description: bpy.props.StringProperty()
@@ -703,6 +718,7 @@ class ShowAssignedCostRate(bpy.types.Operator):
    def draw(self, context):
        layout = self.layout
        wrapper = textwrap.TextWrapper(width=80)
+        layout.label(text=f"COST SCHEDULE: {self.parent_cost_schedule_name}")
        layout.label(text=f"ID: {self.assigned_rate_identification}")
        layout.label(text=f"Name: {self.assigned_rate_name}")
        layout.label(text="Description:")
@@ -926,12 +942,12 @@ class ExportCostSchedulesToPDF(bpy.types.Operator, ExportHelper):
        default=True,
    )
    force_schedule_type: bpy.props.EnumProperty(
-        name="Force output type",
-        description="Force the output to this type\nalso if it is not coincident with the cost schedule Predefined Type",
+        name="Output type",
+        description='Force the output to this type.\n"Auto" defaults to selected cost schedule Predefined Type',
        items=[
            (
-                "OFF",
-                "Off",
+                "AUTO",
+                "By PredefinedType",
                "Uses Cost Schedule Predefined Type",
            ),
            (
@@ -945,7 +961,7 @@ class ExportCostSchedulesToPDF(bpy.types.Operator, ExportHelper):
                "Forces the output as a schedule of rates",
            ),
        ],
-        default="OFF",
+        default="AUTO",
    )

    def draw(self, context):
@@ -38,6 +38,8 @@ class BIM_PT_cost_schedules(Panel):
    bl_parent_id = "BIM_PT_tab_cost"
    bl_options = {"HIDE_HEADER"}

+    layout: bpy.types.UILayout
+
    @classmethod
    def poll(cls, context):
        file = tool.Ifc.get()
@@ -127,6 +129,7 @@ class BIM_PT_cost_schedules(Panel):
            row.operator("bim.enable_editing_cost_schedule_attributes", text="", icon="GREASEPENCIL").cost_schedule = (
                cost_schedule["id"]
            )
+            row.operator("bim.copy_cost_schedule", text="", icon="DUPLICATE").cost_schedule = cost_schedule["id"]
            row.operator("bim.remove_cost_schedule", text="", icon="X").cost_schedule = cost_schedule["id"]
        if self.props.active_cost_schedule_id == cost_schedule["id"]:
            if self.props.is_editing == "COST_SCHEDULE_ATTRIBUTES":
@@ -138,13 +141,13 @@ class BIM_PT_cost_schedules(Panel):
                    self.draw_currency_ui()
                self.draw_editable_cost_item_ui()

-    def draw_column_ui(self):
+    def draw_column_ui(self) -> None:
        row = self.layout.row(align=True)
        row.prop(self.props, "cost_column", text="")
        row.operator("bim.add_cost_column", text="", icon="ADD").name = self.props.cost_column
        self.layout.template_list("BIM_UL_cost_columns", "", self.props, "columns", self.props, "active_column_index")

-    def draw_currency_ui(self):
+    def draw_currency_ui(self) -> None:
        row = self.layout.row(align=True)
        if CostSchedulesData.data["currency"]:
            text = "Currency used: {}".format(CostSchedulesData.data["currency"]["name"])
@@ -161,7 +164,7 @@ class BIM_PT_cost_schedules(Panel):
    def draw_editable_cost_schedule_ui(self):
        bonsai.bim.helper.draw_attributes(self.props.cost_schedule_attributes, self.layout)

-    def draw_editable_cost_item_ui(self):
+    def draw_editable_cost_item_ui(self) -> None:
        row = self.layout.row(align=True)
        row.alignment = "RIGHT"
        ifc_definition_id = None
@@ -217,7 +220,7 @@ class BIM_PT_cost_schedules(Panel):
            elif self.props.cost_item_editing_type == "VALUES":
                self.draw_editable_cost_item_values_ui()

-    def draw_editable_cost_item_attributes_ui(self):
+    def draw_editable_cost_item_attributes_ui(self) -> None:
        bonsai.bim.helper.draw_attributes(self.props.cost_item_attributes, self.layout)

    def draw_editable_cost_item_quantities_ui(self, cost_item: dict[str, Any]):
@@ -731,6 +734,9 @@ class BIM_UL_cost_items_trait:
        if cost_item["AssignedCostRate"] is not None:
            op = row.operator("bim.show_assigned_cost_rate", text="", emboss=False, icon="ZOOM_IN")
            identification = cost_item["AssignedCostRate"].Identification
+            op.parent_cost_schedule_name = CostSchedulesData.data["cost_items"][cost_item["AssignedCostRate"].id()][
+                "ParentCostSchedule"
+            ].Name
            op.assigned_rate_identification = identification if identification is not None else "XXX"
            op.assigned_rate_name = cost_item["AssignedCostRate"].Name or ""
            op.assigned_rate_description = cost_item["AssignedCostRate"].Description or ""
@@ -121,7 +121,14 @@ class CoveringToolUI:
        if AuthoringData.data["ifc_classes"]:
            row = cls.layout.row(align=True)
            row.label(text="", icon="FILE_3D")
-            prop_with_search(row, cls.props, "relating_type_id", text="")
+            prop_with_search(
+                row,
+                cls.props,
+                "relating_type_id",
+                text="",
+                enable_relating_type_suggestions=True,
+                search_threshold=0,
+            )
            row.operator("bim.launch_type_manager", icon=tool.Blender.TYPE_MANAGER_ICON, text="")
        else:
            row.label(text=f"No {AuthoringData.data['ifc_element_type']} Found", icon="ERROR")
@@ -34,13 +34,14 @@ class Login(bpy.types.Operator):
    bl_options = {"REGISTER", "UNDO"}

    def execute(self, context):
-        token = api.login(context.scene.CoveToolProperties.username, context.scene.CoveToolProperties.password)
+        props = tool.Blender.get_covetool_props()
+        token = api.login(props.username, props.password)
        if token:
-            context.scene.CoveToolProperties.token = token
+            props.token = token

            projects = api.get_request("projects")
            for project in projects:
-                new_project = context.scene.CoveToolProperties.projects.add()
+                new_project = props.projects.add()
                new_project.name = project["name"]
                new_project.run_set = project["run_set"][0]
                new_project.url = project["url"]
@@ -54,11 +55,10 @@ class RunSimpleAnalysis(bpy.types.Operator):
    bl_label = "Run Simple Analysis"

    def execute(self, context):
-        simple_analysis = context.scene.CoveToolProperties.simple_analysis
+        props = tool.Blender.get_covetool_props()
+        simple_analysis = props.simple_analysis
        data = {
-            "run": context.scene.CoveToolProperties.projects[
-                context.scene.CoveToolProperties.active_project_index
-            ].run_set,
+            "run": props.projects[props.active_project_index].run_set,
            "si_units": simple_analysis.si_units,
            "building_height": simple_analysis.building_height,
            "roof_area": simple_analysis.roof_area,
@@ -92,6 +92,7 @@ class RunAnalysis(bpy.types.Operator):
    bl_label = "Run Analysis"

    def execute(self, context):
+        props = tool.Blender.get_covetool_props()
        self.file = tool.Ifc.get()
        self.inputs = {
            "floors": [],
@@ -104,9 +105,7 @@ class RunAnalysis(bpy.types.Operator):
        }
        self.parse_objects(context)
        data = {
-            "run": context.scene.CoveToolProperties.projects[
-                context.scene.CoveToolProperties.active_project_index
-            ].run_set,
+            "run": props.projects[props.active_project_index].run_set,
            "source": "Bonsai",
            "rotation_angle": self.get_rotation_angle(),
            **self.inputs,
@@ -16,15 +16,18 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

-import bpy.props
-import bpy.types
+import bpy
+from typing import TYPE_CHECKING


 class CoveToolProject(bpy.types.PropertyGroup):
-    name: bpy.props.StringProperty(name="Name")
    run_set: bpy.props.StringProperty(name="Run Set")
    url: bpy.props.StringProperty(name="URL")

+    if TYPE_CHECKING:
+        run_set: str
+        url: set
+

 class CoveToolSimpleAnalysis(bpy.types.PropertyGroup):
    si_units: bpy.props.BoolProperty(name="SI Units")
@@ -49,6 +52,29 @@ class CoveToolSimpleAnalysis(bpy.types.PropertyGroup):
    window_area_s: bpy.props.StringProperty(name="Window Area S")
    window_area_se: bpy.props.StringProperty(name="Window Area SE")

+    if TYPE_CHECKING:
+        si_units: bool
+        building_height: str
+        roof_area: str
+        floor_area: str
+        skylight_area: str
+        wall_area_e: str
+        wall_area_ne: str
+        wall_area_n: str
+        wall_area_nw: str
+        wall_area_w: str
+        wall_area_sw: str
+        wall_area_s: str
+        wall_area_se: str
+        window_area_e: str
+        window_area_ne: str
+        window_area_n: str
+        window_area_nw: str
+        window_area_w: str
+        window_area_sw: str
+        window_area_s: str
+        window_area_se: str
+

 class CoveToolProperties(bpy.types.PropertyGroup):
    username: bpy.props.StringProperty(name="Username")
@@ -57,3 +83,11 @@ class CoveToolProperties(bpy.types.PropertyGroup):
    projects: bpy.props.CollectionProperty(name="Projects", type=CoveToolProject)
    active_project_index: bpy.props.IntProperty(name="Active Project Index")
    simple_analysis: bpy.props.PointerProperty(type=CoveToolSimpleAnalysis)
+
+    if TYPE_CHECKING:
+        username: str
+        password: str
+        token: str
+        projects: bpy.types.bpy_prop_collection_idprop[CoveToolProject]
+        active_project_index: int
+        simple_analysis: CoveToolSimpleAnalysis
@@ -16,7 +16,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Bonsai.  If not, see <http://www.gnu.org/licenses/>.

+from __future__ import annotations
 import bpy.types
+import bonsai.tool as tool
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from bonsai.bim.module.covetool.prop import CoveToolProperties, CoveToolProject


 class BIM_PT_covetool(bpy.types.Panel):
@@ -32,8 +38,7 @@ class BIM_PT_covetool(bpy.types.Panel):
        layout = self.layout
        layout.use_property_split = True

-        scene = context.scene
-        props = scene.CoveToolProperties
+        props = tool.Blender.get_covetool_props()

        if not props.token:
            row = layout.row()
@@ -81,7 +86,16 @@ class BIM_PT_covetool(bpy.types.Panel):


 class BIM_UL_covetool_projects(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+    def draw_item(
+        self,
+        context,
+        layout: bpy.types.UILayout,
+        data: CoveToolProperties,
+        item: CoveToolProject,
+        icon,
+        active_data,
+        active_propname,
+    ) -> None:
        ob = data
        if item:
            layout.prop(item, "name", text="", emboss=False)
@@ -269,7 +269,7 @@ class ExportIfcCsv(bpy.types.Operator, ExportHelper):
            schedule_creator = scheduler.Scheduler()
            schedule_creator.schedule(self.filepath, tool.Drawing.get_path_with_ext(self.filepath, "svg"))
        if props.format == "web":
-            if not context.scene.WebProperties.is_connected:
+            if not tool.Web.get_web_props().is_connected:
                bpy.ops.bim.connect_websocket_server()
            df = ifc_csv.dataframe
            assert df is not None
@@ -32,6 +32,7 @@ class BIM_PT_ifccsv(Panel):
    bl_parent_id = "BIM_PT_tab_collaboration"

    def draw(self, context):
+        assert self.layout
        layout = self.layout
        props = tool.Blender.get_csv_props()

@@ -28,6 +28,7 @@ import ifcopenshell
 import ifcopenshell.api
 import ifcopenshell.api.pset
 import ifcopenshell.geom
+import ifcopenshell.ifcopenshell_wrapper as W
 import ifcopenshell.util.element
 import ifcopenshell.util.placement
 import ifcopenshell.util.unit
@@ -60,8 +61,8 @@ class CopyDebugInformation(bpy.types.Operator):
                {
                    "ifc": os.path.basename(tool.Ifc.get_path()) if os.path.isfile(tool.Ifc.get_path()) else "Unsaved",
                    "schema": tool.Ifc.get().schema,
-                    "preprocessor_version": tool.Ifc.get().wrapped_data.header.file_name.preprocessor_version,
-                    "originating_system": tool.Ifc.get().wrapped_data.header.file_name.originating_system,
+                    "preprocessor_version": tool.Ifc.get().header.file_name.preprocessor_version,
+                    "originating_system": tool.Ifc.get().header.file_name.originating_system,
                }
            )

@@ -253,13 +254,17 @@ class ProfileImportIFC(bpy.types.Operator):
 class CreateAllShapes(bpy.types.Operator):
    bl_idname = "bim.create_all_shapes"
    bl_label = "Test All Shapes"
-    bl_description = "Look for errors in all the shapes contained in the file"
+    bl_description = (
+        "Look for errors in all the shapes contained in the file.\n\nSee system console for the detailed results."
+    )
    bl_options = {"REGISTER"}

    geometry_library: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Geometry Library",
+        description="Geometry library to use for testing shape creation.",
        items=[(i, i, "") for i in get_args(ifcopenshell.geom.GEOMETRY_LIBRARY)],
-        default="opencascade",
+        # By default use the same library as used for importing ifc project.
+        default="hybrid-cgal-simple-opencascade",
    )
    custom_geometry_library: bpy.props.StringProperty(  # pyright: ignore[reportRedeclaration]
        name="Custom Geometry Library",
@@ -272,19 +277,23 @@ class CreateAllShapes(bpy.types.Operator):

    @classmethod
    def poll(cls, context):
-        return tool.Ifc.get()
+        if not tool.Ifc.get():
+            cls.poll_message_set("No IFC file is loaded.")
+            return False
+        return True

    def execute(self, context):
        self.file = tool.Ifc.get()
        geometry_library = self.custom_geometry_library or self.geometry_library
        elements = self.file.by_type("IfcElement") + self.file.by_type("IfcSpace")
+        print(f"Testing geometry library '{geometry_library}'.")

        total = len(elements)
        settings = ifcopenshell.geom.settings()
        settings.set("keep-bounding-boxes", True)
        settings_2d = ifcopenshell.geom.settings()
        settings_2d.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)
-        failures = []
+        failures: list[ifcopenshell.entity_instance] = []
        excludes = ()  # For the developer to debug with
        for i, element in enumerate(elements, 1):
            if element.GlobalId in excludes:
@@ -303,12 +312,11 @@ class CreateAllShapes(bpy.types.Operator):
                    failures.append(element)
                    print("***** FAILURE *****")
            if shape:
+                assert isinstance(shape, W.TriangulationElement)
+                geom = shape.geometry
                print(
-                    "Success",
-                    time.time() - start,
-                    len(shape.geometry.verts),
-                    len(shape.geometry.edges),
-                    len(shape.geometry.faces),
+                    f"Success {time.time() - start:.3f}s "
+                    f"V:{(len(geom.verts)//3)} E:{(len(geom.edges)//2)} F:{(len(geom.faces)//3)}"
                )
        self.report({"INFO"}, f"Failed shapes: {len(failures)}, check the system console for details.")
        for failure in failures:
@@ -322,7 +330,7 @@ class CreateShapeFromStepId(bpy.types.Operator):
    bl_description = "Recreate a mesh object from a STEP ID"
    bl_options = {"REGISTER", "UNDO"}

-    should_include_curves: bpy.props.BoolProperty()
+    should_include_curves: bpy.props.BoolProperty(default=True)
    step_id: bpy.props.IntProperty(default=0)
    geometry_library: bpy.props.EnumProperty(
        name="Geometry Library",
@@ -348,6 +356,7 @@ class CreateShapeFromStepId(bpy.types.Operator):
        return True

    def execute(self, context):
+        assert context.scene
        geometry_library = self.custom_geometry_library or self.geometry_library
        logger = logging.getLogger("ImportIFC")
        self.ifc_import_settings = import_ifc.IfcImportSettings.factory(context, IfcStore.path, logger)
@@ -365,6 +374,7 @@ class CreateShapeFromStepId(bpy.types.Operator):
        else:
            mesh = None
        obj = bpy.data.objects.new(f"Debug/{element.is_a()}/{element.id()}", mesh)
+        obj.location = context.scene.cursor.location
        context.scene.collection.objects.link(obj)
        return {"FINISHED"}

@@ -808,7 +818,12 @@ class PurgeUnusedObjects(bpy.types.Operator, tool.Ifc.Operator):
 class MergeIdenticalObjects(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.merge_identical_objects"
    bl_label = "Merge Identical Objects"
-    bl_description = "For materials currently only IfcMaterials are supported"
+    bl_description = (
+        "Merge identical IFC objects (that match all attributes).\n"
+        "\n"
+        "SHIFT + CLICK to merge by name/identification attribute only.\n"
+        "Merges names with number suffix, as well (ex: foo, foo.001, foo.002)\n"
+    )
    bl_options = {"REGISTER", "UNDO"}

    object_type: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
@@ -816,18 +831,36 @@ class MergeIdenticalObjects(bpy.types.Operator, tool.Ifc.Operator):
        items=((s, s.capitalize(), "") for s in get_args(tool.Debug.PurgeMergeObjectType)),
    )

+    by_name_or_identification_only: bpy.props.BoolProperty(
+        name="By Name/Identification Only",
+        description="Merge based only on Name or Identification attribute, ignoring other properties",
+        default=False,
+    )
+
    if TYPE_CHECKING:
        object_type: tool.Debug.PurgeMergeObjectType

+    def invoke(self, context, event):
+        # Check if shift key is pressed
+        if event.shift:
+            self.by_name_or_identification_only = True
+        else:
+            self.by_name_or_identification_only = False
+
+        return self.execute(context)
+
    def _execute(self, context):
        object_type: str = self.object_type
        if object_type in ("PROFILE", "TYPE"):
            self.report({"ERROR"}, f"Unsupported object type {object_type}.")
            return {"CANCELLED"}

-        merged_data = tool.Debug.merge_identical_objects(object_type)
+        merged_data = tool.Debug.merge_identical_objects(
+            object_type, by_name_or_identification_only=self.by_name_or_identification_only
+        )
        plural_object_type = f"{object_type.lower().replace('_', ' ')}s"
        if merged_data:
+            merge_mode = " by name/identification" if self.by_name_or_identification_only else ""
            for element_type, element_names in merged_data.items():
                print(f"- {element_type}:")
                for name in element_names:
@@ -836,7 +869,8 @@ class MergeIdenticalObjects(bpy.types.Operator, tool.Ifc.Operator):
        merged = sum(len(v) for v in merged_data.values())

        msg = " See system console for details." if merged else ""
-        self.report({"INFO"}, f"{merged} identical {plural_object_type} were merged.{msg}")
+        merge_mode = " (by name/identification)" if self.by_name_or_identification_only else ""
+        self.report({"INFO"}, f"{merged} identical {plural_object_type} were merged{merge_mode}.{msg}")

        if merged == 0:
            return
@@ -1040,7 +1074,7 @@ class ChangeLogLevel(bpy.types.Operator):

    log_level: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
        name="Log Level",
-        items=((i, i, "") for i in get_args(LogLevelType)),
+        items=[(i, i, "") for i in get_args(LogLevelType)],
        default="WARNING",
    )

@@ -72,7 +72,10 @@ class BIM_PT_debug(Panel):
        row = layout.row()
        row.operator("bim.convert_to_blender")

-        row = layout.row()
+        row = layout.row(align=True)
+        op_props = wm.operator_properties_last(bpy.ops.bim.create_all_shapes.idname())
+        row.prop(op_props, "geometry_library", text="")
+        row.prop(op_props, "custom_geometry_library", text="", placeholder="Custom Geometry Library")
        row.operator("bim.create_all_shapes")

        row = layout.row()
@@ -92,8 +95,7 @@ class BIM_PT_debug(Panel):
        row.operator("bim.restart_blender")

        row = layout.split(factor=0.5, align=True)
-        row.operator("bim.create_shape_from_step_id").should_include_curves = False
-        row.operator("bim.create_shape_from_step_id", text="", icon="IPO_ELASTIC").should_include_curves = True
+        row.operator("bim.create_shape_from_step_id")
        row.prop(props, "step_id", text="")

        row = layout.split(factor=0.7, align=True)
@@ -75,7 +75,8 @@ class DemonstrateRenameProject(bpy.types.Operator, tool.Ifc.Operator):
        # properties. Generally, the inputs to the core function will come from
        # properties (such as an input field) or data from the scene (like the
        # actively selected object).
-        core.demonstrate_rename_project(tool.Ifc, tool.Demo, name=bpy.context.scene.BIMDemoProperties.name)
+        props = tool.Demo.get_demo_props()
+        core.demonstrate_rename_project(tool.Ifc, tool.Demo, name=props.name)


 class SendWebUiDemoMessage(bpy.types.Operator):
@@ -87,7 +88,8 @@ class SendWebUiDemoMessage(bpy.types.Operator):
        # First, we need to make sure that we are connected to the Web UI
        # We do that by checking the Web module properties' is_connected prop
        # and calling the operator connect_websocket_server if we aren't connected to a Web UI
-        if not context.scene.WebProperties.is_connected:
+        if not tool.Web.get_web_props().is_connected:
            bpy.ops.bim.connect_websocket_server(page="demo")
-        core.send_webui_demo_message(tool.Web, message=bpy.context.scene.BIMDemoProperties.webui_message)
+        props = tool.Demo.get_demo_props()
+        core.send_webui_demo_message(tool.Web, message=props.webui_message)
        return {"FINISHED"}
@@ -30,6 +30,8 @@
 # property. Properties are stored in the .blend file, so when your user closes
 # their Blender session, and reopens it, things are how they left it.

+from typing import TYPE_CHECKING
+
 import bpy
 from bpy.types import PropertyGroup

@@ -60,3 +62,11 @@ class BIMDemoProperties(PropertyGroup):
    message: StringProperty(name="Message")
    show_hints: BoolProperty(name="Show Hints", default=False)
    webui_message: StringProperty(name="Web UI Message", default="Hello, Web UI!")
+
+    # Type checking block is needed
+    # as type checker can't understand Blender props types by default.
+    if TYPE_CHECKING:
+        name: str
+        message: str
+        show_hints: bool
+        webui_message: str
@@ -27,6 +27,7 @@
 # panels, buttons, labels, and input fields are laid out.

 import bpy
+import bonsai.tool as tool
 from bonsai.bim.module.demo.data import DemoData


@@ -70,7 +71,7 @@ class BIM_PT_demo(bpy.types.Panel):

        # Interface panels often show properties. For convenience, define where
        # the properties are stored for the module.
-        self.props = context.scene.BIMDemoProperties
+        self.props = tool.Demo.get_demo_props()

        # This defines a new "row" in our layout. When a new row is defined, the
        # things on that row, like buttons, labels, and input fields, show on a
@@ -145,7 +146,7 @@ class BIM_PT_webui_demo(bpy.types.Panel):
    bl_parent_id = "BIM_PT_demo"

    def draw(self, context):
-        self.props = context.scene.BIMDemoProperties
+        self.props = tool.Demo.get_demo_props()

        row = self.layout.row()
        # we create an input field for the property webui_message
@@ -40,7 +40,6 @@ classes = (
    operator.BuildSchedule,
    operator.CleanWireframes,
    operator.ContractSheet,
-    operator.ContractTargetView,
    operator.ConvertSVGToDXF,
    operator.CreateDrawing,
    operator.CreateSheets,
@@ -62,8 +61,8 @@ classes = (
    operator.EnableEditingAssignedProduct,
    operator.EnableEditingElementFilter,
    operator.EnableEditingText,
+    operator.ExcludeAnnotation,
    operator.ExpandSheet,
-    operator.ExpandTargetView,
    operator.LoadDrawings,
    operator.LoadReferences,
    operator.LoadSchedules,
@@ -88,6 +87,7 @@ classes = (
    operator.SelectAllDrawings,
    operator.SelectAllSheets,
    operator.SelectAssignedProduct,
+    operator.ToggleTargetView,
    operator.OpenDocumentationWebUi,
    prop.Variable,
    prop.Drawing,
@@ -25,6 +25,7 @@ import ifcopenshell.util.unit
 import bonsai.tool as tool
 from pathlib import Path
 from typing import Any, Union
+from natsort import natsorted


 def refresh():
@@ -234,12 +235,18 @@ class DecoratorData:
    cut_cache = {}
    slice_cache = {}
    fill_cache = {}
+    camera_location_checksum = None
+    camera_rotation_checksum = None
+
+    @classmethod
+    def clear_cache(cls):
+        cls.cut_cache = {}
+        cls.layerset_cache = {}
+        cls.fill_cache = {}

    @classmethod
    def load(cls, handler):
        cls.is_loaded = True
-        cls.cut_cache = {}
-        cls.layerset_cache = {}

        text = {}
        dimension = {}
@@ -332,7 +339,7 @@ class DecoratorData:
        returns font size in mm for current ifc text object"""
        element = tool.Ifc.get_entity(obj)
        assert element
-        props = tool.Drawing.get_text_props(obj)
+
        # getting font size
        pset_data = ifcopenshell.util.element.get_pset(element, "EPset_Annotation") or {}
        # use `regular` as default
@@ -345,31 +352,35 @@ class DecoratorData:
            (font_size_type for font_size_type in FONT_SIZES if font_size_type in classes_split), "regular"
        )
        font_size = FONT_SIZES[font_size_type]
-
-        # get symbol
        symbol = tool.Drawing.get_annotation_symbol(element)
-
-        # get newline_at
        newline_at = pset_data.get("Newline_At", 0)
+        reverse_list = pset_data.get("Reverse_List", False)
+        list_separator = pset_data.get("List_Separator") or ", "

        # other attributes
-        props_literals = props.literals
-        props_literals_n = len(props.literals)
        literals = tool.Drawing.get_text_literal(obj, return_list=True)
-        literals_data = []
-        for i, literal in enumerate(literals):
+        assert isinstance(literals, list)
+        literals_data: list[dict[str, Any]] = []
+        product = tool.Drawing.get_assigned_product(element) or element
+        for literal in literals:
+            literal_value = literal.Literal
            literal_data = {
-                "Literal": literal.Literal,
+                "Literal": literal_value,
                "BoxAlignment": literal.BoxAlignment,
+                "CurrentValue": tool.Drawing.replace_text_literal_variables(
+                    literal_value, product, reverse_list, list_separator
+                ),
            }
-            if i < props_literals_n:
-                literal_data["CurrentValue"] = props_literals[i].value
-            else:
-                literal_data["CurrentValue"] = literal.Literal
-
            literals_data.append(literal_data)

-        return {"Literals": literals_data, "FontSize": font_size, "Symbol": symbol, "Newline_At": newline_at}
+        return {
+            "Literals": literals_data,
+            "FontSize": font_size,
+            "Symbol": symbol,
+            "Newline_At": newline_at,
+            "Reverse_List": reverse_list,
+            "List_Separator": list_separator,
+        }

    @classmethod
    def get_dimension_data(cls, obj: bpy.types.Object) -> dict[str, Any]:
@@ -483,9 +494,9 @@ class AnnotationData:
            if tool.Drawing.is_annotation_object_type(relating_type, object_type):
                relating_types.append(relating_type)

-        results = [("0", "Untyped", "")]
-        results.extend([(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in relating_types])
-        results.sort(key=lambda x: x[1].lower())
+        results = [(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in relating_types]
+        results = natsorted(results, key=lambda x: x[1])
+        results = [("0", "Untyped", "")] + results
        return results

    @classmethod
@@ -22,6 +22,7 @@ import blf
 import math
 import bmesh
 import shapely
+import numpy as np
 import ifcopenshell
 import ifcopenshell.util.element
 import ifcopenshell.util.representation
@@ -601,7 +602,7 @@ class BaseDecorator:
        props = tool.Drawing.get_text_props(obj)
        text_data = DecoratorData.data["text"].get(obj.name, None)
        if props.is_editing:
-            text_data = text_data | props.get_text_edited_data()
+            text_data = props.get_text_edited_data()
        literals_data = text_data["Literals"]
        symbol = text_data["Symbol"]
        newline_at = text_data["Newline_At"]
@@ -1205,17 +1206,7 @@ class PlanLevelDecorator(BaseDecorator):

            def get_text():
                abs_z = verts[0].z
-                z = abs_z
-
-                if element:
-                    spatial_container = ifcopenshell.util.element.get_container(element)
-
-                    if spatial_container:
-                        container_obj = tool.Ifc.get_object(spatial_container)
-
-                        if container_obj:
-                            spatial_container_z = container_obj.matrix_world.translation.z
-                            z = abs_z - spatial_container_z
+                z = helper.get_relative_z(obj, element, abs_z)

                rl = self.format_value(context, z)
                text = "{}{}".format("" if z < 0 else "+", rl)
@@ -1635,6 +1626,7 @@ class CutDecorator:
        if cls.installed:
            cls.uninstall()
        handler = cls()
+        handler.cache_camera_matrix()
        cls.installed = SpaceView3D.draw_handler_add(handler, (context,), "WINDOW", "POST_VIEW")

    @classmethod
@@ -1737,6 +1729,30 @@ class CutDecorator:
        shader.uniform_float("color", color)
        batch.draw(shader)

+    def cache_camera_matrix(self):
+        obj = bpy.context.scene.camera
+        DecoratorData.camera_location_checksum = repr(np.array(obj.matrix_world.translation).tobytes())
+        DecoratorData.camera_rotation_checksum = repr(np.array(obj.matrix_world.to_3x3()).tobytes())
+
+    def is_camera_moved(self):
+        if not DecoratorData.camera_location_checksum:
+            self.cache_camera_matrix()
+            return True  # Let's be conservative
+        obj = bpy.context.scene.camera
+        loc_check = np.frombuffer(eval(DecoratorData.camera_location_checksum))
+        loc_real = np.array(obj.matrix_world.translation).flatten()
+        if not np.allclose(loc_check, loc_real, atol=1e-4):  # 0.1 mm
+            self.cache_camera_matrix()
+            return True
+        rot_check = np.frombuffer(eval(DecoratorData.camera_rotation_checksum)).reshape(3, 3)
+        rot_real = np.array(obj.matrix_world.to_3x3())
+        rot_dot = np.dot(rot_check, rot_real.T)
+        angle_rad = np.arccos(np.clip((np.trace(rot_dot) - 1) / 2, -1, 1))
+        if angle_rad > 0.0017453292519943296:  # 0.1 degrees
+            self.cache_camera_matrix()
+            return True
+        return False
+
    def decorate(self, context, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
        has_cut_cache = element.id() in DecoratorData.cut_cache
        has_fill_cache = element.id() in DecoratorData.fill_cache
@@ -1744,9 +1760,9 @@ class CutDecorator:
        # Currently selected objects must be recalculated as they may be being moved / edited.
        # If the camera is selected, we also recalculate as the user may be moving the camera.

-        if not has_cut_cache or obj.select_get() or context.scene.camera.select_get():
+        if not has_cut_cache or obj.select_get() or self.is_camera_moved():
            self.recalculate_cut(context, obj, element)
-        if not has_fill_cache or obj.select_get() or context.scene.camera.select_get():
+        if not has_fill_cache or obj.select_get() or self.is_camera_moved():
            self.recalculate_fill(context, obj, element)

    def recalculate_cut(self, context, obj: bpy.types.Object, element: ifcopenshell.entity_instance) -> None:
@@ -1943,8 +1959,7 @@ class DecorationsHandler:
        # NOTE: we USE POST_PIXEL here so that we can use both POLYLINE_UNIFORM_COLOR
        # and drawing text in the same handler. BUT this means that we supply coordinates in WINSPACE
        cls.installed = SpaceView3D.draw_handler_add(handler, (context,), "WINDOW", "POST_PIXEL")
-        if not DecoratorData.is_loaded:
-            DecoratorData.load(handler)
+        DecoratorData.clear_cache()

    @classmethod
    def uninstall(cls):
@@ -1971,5 +1986,8 @@ class DecorationsHandler:
        if not DrawingsData.is_loaded:
            DrawingsData.load()

+        if not DecoratorData.is_loaded:
+            DecoratorData.load(self)
+
        for obj, decorator in DecoratorData.data["object_decorators"]:
            decorator.decorate(context, obj)
@@ -134,6 +134,7 @@ def format_distance(
    custom_unit=None,
 ):
    # Get Blender Scene Unit Settings
+    assert bpy.context.scene
    unit_scale = bpy.context.scene.unit_settings.scale_length
    unit_system = bpy.context.scene.unit_settings.system
    unit_length = bpy.context.scene.unit_settings.length_unit
@@ -538,3 +539,26 @@ def add_newline_between_words(text: str, newline_at: int) -> str:
        start = space_index + 1  # Skip the space itself

    return "\n".join(result)
+
+
+def get_relative_z(obj: bpy.types.Object, element, abs_z: float) -> float:
+    """Return relative Z of an element, accounting for its spatial container.
+
+    Args:
+        obj: The Blender object representing the element.
+        element: The IFC entity for the object.
+        abs_z: The absolute Z value in world coordinates.
+
+    Returns:
+        Relative Z value if the element is inside a spatial container,
+        otherwise the absolute Z.
+    """
+    z = abs_z
+    if element:
+        spatial_container = ifcopenshell.util.element.get_container(element)
+        if spatial_container:
+            container_obj = tool.Ifc.get_object(spatial_container)
+            if container_obj:
+                spatial_container_z = container_obj.matrix_world.translation.z
+                z = abs_z - spatial_container_z
+    return z
@@ -51,7 +51,7 @@ import bonsai.bim.export_ifc
 from bpy_extras.io_utils import ImportHelper
 from bonsai.bim.module.drawing.decoration import CutDecorator
 from bonsai.bim.module.drawing.data import DecoratorData
-from typing import NamedTuple, Union, Optional, Literal, TYPE_CHECKING, Any, TypedDict
+from typing import NamedTuple, Union, Optional, Literal, TYPE_CHECKING, Any, TypedDict, get_args
 from lxml import etree
 from math import radians
 from mathutils import Vector, Color, Matrix
@@ -106,14 +106,17 @@ class AddAnnotationType(bpy.types.Operator, tool.Ifc.Operator):
            obj = bpy.data.objects.new(object_type, None)

        obj.name = props.type_name
+        ifc_context = ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Model", "Annotation", "MODEL_VIEW")
        element = tool.Drawing.run_root_assign_class(
            obj=obj,
            ifc_class="IfcTypeProduct",
            predefined_type=object_type,
            should_add_representation=has_representation,
-            context=ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Model", "Annotation", "MODEL_VIEW"),
+            context=ifc_context,
            ifc_representation_class=tool.Drawing.get_ifc_representation_class(object_type),
        )
+        if representation := tool.Drawing.get_representation(element, ifc_context):
+            tool.Drawing.reload_representation(obj=obj, representation=representation)
        element.ApplicableOccurrence = f"IfcAnnotation/{object_type}"

        if props.create_representation_for_type and object_type == "IMAGE":
@@ -207,12 +210,6 @@ class DuplicateDrawing(bpy.types.Operator, tool.Ifc.Operator):
            should_duplicate_annotations=self.should_duplicate_annotations,
        )

-        # TODO: Why need to resync active drawing, if it wasn't changed.
-        drawing = props.get_active_drawing()
-        if drawing is None:
-            return
-        core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=drawing)
-

 class CreateDrawing(bpy.types.Operator):
    """Creates/refreshes a .svg drawing
@@ -435,21 +432,19 @@ class CreateDrawing(bpy.types.Operator):
        if os.path.isfile(svg_path) and self.props.should_use_underlay_cache:
            return svg_path

-        visible_object_names = {obj.name for obj in bpy.context.visible_objects}
-        for obj in bpy.context.view_layer.objects:
-            obj.hide_render = obj.name not in visible_object_names
-
        assert context.scene and context.view_layer and context.screen
        context.scene.render.filepath = str(Path(svg_path).with_suffix(".png"))
        assert (drawing_style := self.cprops.get_active_drawing_style())

+        tool.Blender.sync_render_visibility()
+
        if drawing_style.render_type == "DEFAULT":
            bpy.ops.render.render(write_still=True)
        else:
            previous_visibility: dict[str, bool] = {}
            collection = tool.Blender.get_object_bim_props(self.camera).collection
            assert collection
-            # Hie annotations.
+            # Hide annotations.
            for obj in collection.objects:
                if context.view_layer.objects.get(obj.name):
                    previous_visibility[obj.name] = obj.hide_get()
@@ -626,7 +621,7 @@ class CreateDrawing(bpy.types.Operator):
                path.attrib["d"] = d
            group.append(g)

-    def generate_wall_layers(self, context: bpy.types.Context, root) -> None:
+    def generate_material_layers(self, context: bpy.types.Context, root) -> None:
        for el in root.findall(".//{http://www.w3.org/2000/svg}g[@{http://www.ifcopenshell.org/ns}guid]"):
            if "projection" in el.get("class", "").split():
                continue
@@ -795,8 +790,9 @@ class CreateDrawing(bpy.types.Operator):
        edge_bm.to_mesh(edge_mesh)
        edge_bm.free()

-        actual_path = svg_path[0:-4] + "0001.svg"
+        freestyle_svg_exporter = tool.Blender.get_addon("freestyle_svg_exporter")
        context.scene.render.filepath = svg_path[0:-4]
+        actual_path = freestyle_svg_exporter.create_path(bpy.context.scene)
        bpy.ops.render.render(write_still=False)

        os.replace(actual_path, svg_path)
@@ -840,6 +836,8 @@ class CreateDrawing(bpy.types.Operator):

        if tool.Drawing.is_camera_orthographic():
            self.generate_bisect_linework(context, root)
+            if self.cprops.generate_material_layers:
+                self.generate_material_layers(context, root)
            self.merge_linework_and_add_metadata(root)
            self.move_elements_to_top(root)

@@ -886,7 +884,7 @@ class CreateDrawing(bpy.types.Operator):
        files = {bim_props.ifc_file: tool.Ifc.get()}

        props = tool.Project.get_project_props()
-        for link in props.get_loaded_links():
+        for link in props.get_loaded_links_for_drawings():
            files[link.name] = self.get_linked_file(link)

        target_view = ifcopenshell.util.element.get_psets(self.camera_element)["EPset_Drawing"]["TargetView"]
@@ -937,12 +935,14 @@ class CreateDrawing(bpy.types.Operator):
        if self.cprops.cut_mode == "BISECT":
            self.remove_cut_linework(root)
            self.generate_bisect_linework(context, root)
-            self.generate_wall_layers(context, root)
+            if self.cprops.generate_material_layers:
+                self.generate_material_layers(context, root)
            self.merge_linework_and_add_metadata(root)
            self.move_elements_to_top(root)
        elif self.cprops.cut_mode == "OPENCASCADE":
            self.move_projection_to_bottom(root)
-            self.generate_wall_layers(context, root)
+            if self.cprops.generate_material_layers:
+                self.generate_material_layers(context, root)
            self.merge_linework_and_add_metadata(root)
            self.move_elements_to_top(root)

@@ -1252,6 +1252,8 @@ class CreateDrawing(bpy.types.Operator):

    def get_svg_classes(self, element, layer=None):
        classes = [element.is_a()]
+
+        # ─── Material ──────────────────────────────────────────────
        material = ifcopenshell.util.element.get_material(element, should_skip_usage=True)
        material_name = ""
        if material:
@@ -1264,18 +1266,32 @@ class CreateDrawing(bpy.types.Operator):
        else:
            classes.append("material-null")

+        # ─── Layer ─────────────────────────────────────────────────
        if layer:
            classes.append(layer.is_a())
-            material_name = layer.Material.Name or "null"
-            material_name = tool.Drawing.canonicalise_class_name(material_name)
-            classes.append(f"layer-material-{material_name}")
+            layer_material = layer.Material
+            layer_material_name = layer_material.Name or "null"
+            layer_material_name = tool.Drawing.canonicalise_class_name(layer_material_name)
+            classes.append(f"layer-material-{layer_material_name}")

+            # Add material category if available
+            if hasattr(layer_material, "Category") and layer_material.Category:
+                layer_material_category = tool.Drawing.canonicalise_class_name(layer_material.Category)
+                classes.append(f"layer-material-category-{layer_material_category}")
+
+        # ─── Metadata ──────────────────────────────────────────────
        for key in self.metadata:
            value = ifcopenshell.util.selector.get_element_value(element, key)
            if value:
                classes.append(
                    tool.Drawing.canonicalise_class_name(key) + "-" + tool.Drawing.canonicalise_class_name(str(value))
                )
+
+        # ─── Target View ───────────────────────────────────────────
+        if getattr(self.cprops, "target_view", None):
+            target_view_class = tool.Drawing.canonicalise_class_name(str(self.cprops.target_view))
+            classes.append(f"target-view-{target_view_class}")
+
        return classes

    def is_manifold(self, obj) -> bool:
@@ -1308,7 +1324,7 @@ class CreateDrawing(bpy.types.Operator):
            return tool.Ifc.get().by_guid(guid)
        except RuntimeError:
            props = tool.Project.get_project_props()
-            for link in props.get_loaded_links():
+            for link in props.get_loaded_links_for_drawings():
                ifc_file = self.get_linked_file(link)
                try:
                    return ifc_file.by_guid(guid)
@@ -1324,7 +1340,7 @@ class CreateDrawing(bpy.types.Operator):
            return tool.Ifc.get().by_id(step_id)
        except RuntimeError:
            props = tool.Project.get_project_props()
-            for link in props.get_loaded_links():
+            for link in props.get_loaded_links_for_drawings():
                ifc_file = self.get_linked_file(link)
                try:
                    return ifc_file.by_id(step_id)
@@ -1342,7 +1358,13 @@ class CreateDrawing(bpy.types.Operator):
            join_criteria = join_criteria.split(",")
        else:
            # Drawing convention states that same objects classes with the same material are merged when cut.
-            join_criteria = ["class", "material.Name", "/Pset_.*Common/.Status", "EPset_Status.Status", "Material.Name"]
+            join_criteria = [
+                "class",
+                "material.Name",
+                "/Pset_.*Common/.Status",
+                "EPset_Status.Status",
+                "EPset_Status.UserDefinedStatus",
+            ]

        group = root.find("{http://www.w3.org/2000/svg}g")
        joined_paths = {}
@@ -1471,11 +1493,10 @@ class CreateDrawing(bpy.types.Operator):
                joined_paths.setdefault(hash_keys, []).append(el)

        for key, els in joined_paths.items():
-            polygons = []
-            classes = set()
+            queue = []

            for el in els:
-                classes.update(el.attrib["class"].split())
+                classes = set(el.attrib["class"].split())
                classes.add(el.attrib["{http://www.ifcopenshell.org/ns}guid"])
                is_closed_polygon = False
                for path in el.findall("{http://www.w3.org/2000/svg}path"):
@@ -1490,31 +1511,30 @@ class CreateDrawing(bpy.types.Operator):
                            coords.append(coords[0])
                        if len(coords) > 2 and coords[0] == coords[-1]:
                            is_closed_polygon = True
-                            polygons.append(shapely.Polygon(coords))
+                            queue.append((shapely.Polygon(coords), classes))
                if is_closed_polygon:
                    el.getparent().remove(el)

-            try:
-                merged_polygons = shapely.ops.unary_union(polygons)
-            except:
-                print("Warning. Portions of the merge failed. Please report a bug!", polygons)
-                merged_polygons = polygons
+            while queue:
+                polygon, polygon_classes = queue.pop()
+                for polygon2, polygon2_classes in queue[:]:
+                    try:
+                        merged_polygon = shapely.union(polygon, polygon2)
+                    except:
+                        print("Warning. Portions of the merge failed. Please report a bug!", polygon, polygon2)
+                        continue
+                    if type(merged_polygon) == shapely.Polygon:
+                        polygon = merged_polygon
+                        polygon_classes.update(polygon2_classes)
+                        queue.remove((polygon2, polygon2_classes))

-            if type(merged_polygons) == shapely.MultiPolygon:
-                merged_polygons = merged_polygons.geoms
-            elif type(merged_polygons) == shapely.Polygon:
-                merged_polygons = [merged_polygons]
-            else:
-                merged_polygons = []
-
-            for polygon in merged_polygons:
                g = etree.Element("g")
                path = etree.SubElement(g, "path")
                d = "M" + " L".join([",".join([str(o) for o in co]) for co in polygon.exterior.coords[0:-1]]) + " Z"
                for interior in polygon.interiors:
                    d += " M" + " L".join([",".join([str(o) for o in co]) for co in interior.coords[0:-1]]) + " Z"
                path.attrib["d"] = d
-                g.set("class", " ".join(list(classes)))
+                g.set("class", " ".join(list(polygon_classes)))
                group.append(g)

    def drawing_to_model_co(self, x: float, y: float) -> Vector:
@@ -1856,13 +1876,15 @@ class AddDrawingToSheet(bpy.types.Operator, tool.Ifc.Operator):
    @classmethod
    def poll(cls, context):
        props = tool.Drawing.get_document_props()
-        # Won't be visible in UI anyway.
-        prefs = tool.Blender.get_addon_preferences()
-        if not props.sheets or not prefs.data_dir:
-            return False
        if not tool.Drawing.get_active_drawing_item():
            cls.poll_message_set("No drawing selected.")
            return False
+        if not props.sheets:
+            cls.poll_message_set("No sheets available.")
+            return False
+        if not tool.Blender.get_user_data_dir():
+            cls.poll_message_set("BIM data directory not set.")
+            return False
        return True

    def _execute(self, context):
@@ -2157,64 +2179,104 @@ class ActivateModel(bpy.types.Operator):
    )

    def execute(self, context):
+        start_time = time.time()
+
        dprops = tool.Drawing.get_document_props()
        dprops.active_drawing_id = 0
        model_props = tool.Model.get_model_props()
        if model_props.show_cut_decorator:
            CutDecorator.uninstall()

-        # Preserve current visibility statuses for:
-        # - non-ifc objects
-        # - type product
-        # - annotations (so we won't unhide other drawings)
        ifc_file = tool.Ifc.get()
-        visibility_status: dict[bpy.types.Object, bool] = {}
-        for obj in bpy.data.objects:
-            element = tool.Ifc.get_entity(obj)
-            if not element:
-                hide = obj.hide_get()
-            elif element.is_a("IfcAnnotation"):
-                hide = True
-            elif element.is_a("IfcTypeProduct"):
-                hide = obj.hide_get()
-            else:
-                continue
-            visibility_status[obj] = hide

        if not bpy.app.background:
            with context.temp_override(**tool.Blender.get_viewport_context()):
-                bpy.ops.object.hide_view_clear()
                bpy.ops.bim.activate_status_filters(only_if_enabled=True)

-        for obj in context.visible_objects:
-            element = tool.Ifc.get_entity(obj)
-            if not element:
-                continue
-            model = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
-            if model:
+        elements = {e for obj in context.visible_objects if (e := tool.Ifc.get_entity(obj))}
+
+        def refine_elements(
+            elements_mutable: set[ifcopenshell.entity_instance],
+        ) -> dict[ifcopenshell.entity_instance, tuple[ifcopenshell.entity_instance, bpy.types.Object]]:
+            """
+            :return: element -> (representation, obj)
+            """
+            # TODO: in the future reimport_element_representations should have an option
+            # not recalculate elements completely, but get the from cache, to speed up the process further.
+            refined_elements: dict[
+                ifcopenshell.entity_instance, tuple[ifcopenshell.entity_instance, bpy.types.Object]
+            ] = {}
+            elements = elements_mutable
+            while elements:
+                element = elements.pop()
+                model = ifcopenshell.util.representation.get_representation(element, "Model", "Body", "MODEL_VIEW")
+                if not model:
+                    continue
+                assert isinstance(obj := tool.Ifc.get_object(element), bpy.types.Object)
                current_representation = tool.Geometry.get_active_representation(obj)
-                if current_representation != model:
-                    bonsai.core.geometry.switch_representation(
-                        tool.Ifc,
-                        tool.Geometry,
-                        obj=obj,
-                        representation=model,
-                        should_reload=False,
-                        is_global=True,
-                        should_sync_changes_first=True,
-                    )
+                if current_representation == model:
+                    continue

-        # restore visibility after hide_view_clear()
-        for obj, hide_status in visibility_status.items():
-            obj.hide_set(hide_status)
+                # reimport_element_representations automatically reloads all elements sharing representation.
+                # So we should avoid reloading same elements twice.
+                resolved_model = ifcopenshell.util.representation.resolve_representation(model)
+                elements_sharing_representation = ifcopenshell.util.element.get_elements_by_representation(
+                    ifc_file, resolved_model
+                )

+                refined_elements[element] = (model, obj)
+                elements = elements - elements_sharing_representation
+            return refined_elements
+
+        refined_elements = refine_elements(elements)
+        for _, (model, obj) in refined_elements.items():
+            bonsai.core.geometry.switch_representation(
+                tool.Ifc,
+                tool.Geometry,
+                obj=obj,
+                representation=model,
+            )
+
+        tool.Blender.reset_object_visibility()
+        tool.Drawing.hide_all_drawing_collections()
        tool.Blender.update_viewport()
        bonsai.bim.handler.refresh_ui_data()
+
+        operator_time = time.time() - start_time
+        if operator_time > 10:
+            self.report({"INFO"}, f"{self.bl_label} was finished in {operator_time:.2f} seconds.")
+
        return {"FINISHED"}


 class ActivateDrawingBase(tool.Ifc.Operator):
    # Ifc Operator is necessary, because sync_references may create or remove IFC elements.
+    bl_label = "Activate Drawing"
+    bl_options = {"REGISTER", "UNDO"}
+    bl_description = (
+        "Activates the selected drawing view.\n\n"
+        + "ALT+CLICK to keep the viewport position.\n\n"
+        + "SHIFT+CLICK to load a quick preview of the drawing view"
+    )
+
+    drawing: bpy.props.IntProperty()  # pyright: ignore[reportRedeclaration]
+    should_view_from_camera: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
+        name="Should View From Camera",
+        description="Move view to the activated drawing's camera position.",
+        default=True,
+        options={"SKIP_SAVE"},
+    )
+    use_quick_preview: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
+        name="Use Quick Preview",
+        description="Just move the camera to the drawing view, without loading anything else.",
+        default=False,
+        options={"SKIP_SAVE"},
+    )
+
+    if TYPE_CHECKING:
+        drawing: int
+        should_view_from_camera: bool
+        use_quick_preview: bool

    def invoke(self, context, event) -> set["rna_enums.OperatorReturnItems"]:
        if event.type == "LEFTMOUSE" and event.alt:
@@ -2237,20 +2299,44 @@ class ActivateDrawingBase(tool.Ifc.Operator):
            return {"FINISHED"}

        viewport_position = None
-        if not self.should_view_from_camera:
-            viewport_position = tool.Blender.get_viewport_position()
+
+        v3d_space = tool.Blender.get_view3d_space()
+        assert v3d_space
+        if self.should_view_from_camera:
+            # Since we must switch to drawing camera, undo local camera in viewport.
+            # The code is needed to undo `else` branch from activating other cameras.
+            v3d_space.use_local_camera = False
+        else:
+            # Since we use `scene.camera` to store active drawing,
+            # the only way to preserve previous drawing camera position is making it local.
+            r3d = v3d_space.region_3d
+            assert r3d
+            if r3d.view_perspective == "CAMERA":
+                if v3d_space.use_local_camera:
+                    # Nothing to do, local camera is already set by user.
+                    pass
+                else:
+                    previous_camera = context.scene.camera
+                    if previous_camera:
+                        v3d_space.camera = previous_camera
+                        v3d_space.use_local_camera = True
+            else:
+                viewport_position = tool.Blender.get_viewport_position()

        core.activate_drawing_view(tool.Ifc, tool.Blender, tool.Drawing, drawing=drawing)

        if not self.should_view_from_camera:
-            assert viewport_position
-            tool.Blender.set_viewport_position(viewport_position)
+            if viewport_position is None:
+                # Local camera takes priority over active scene camera,
+                # so nothing to do after drawing view activation.
+                pass
+            else:
+                tool.Blender.set_viewport_position(viewport_position)

        dprops.active_drawing_id = self.drawing
        dprops.drawing_styles.clear()
-        if ifcopenshell.util.element.get_pset(drawing, "EPset_Drawing", "HasUnderlay"):
-            bpy.ops.bim.reload_drawing_styles()
-            bpy.ops.bim.activate_drawing_style()
+        bpy.ops.bim.reload_drawing_styles()
+        bpy.ops.bim.activate_drawing_style()

        if tool.Drawing.is_camera_orthographic():
            core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=tool.Ifc.get().by_id(self.drawing))
@@ -2263,10 +2349,22 @@ class ActivateDrawingBase(tool.Ifc.Operator):
        camera = context.scene.camera
        assert camera
        camera_props = tool.Drawing.get_camera_props(camera)
+        # Check if this is a reflected ceiling camera and preserve its scale
+        camera_element = tool.Ifc.get_entity(camera)
+        is_reflected = False
+        if camera_element:
+            is_reflected = (
+                ifcopenshell.util.element.get_pset(camera_element, "EPset_Drawing", "TargetView")
+                == "REFLECTED_PLAN_VIEW"
+            )
+            if is_reflected and camera.scale != (-1, -1, -1):
+                camera.scale = (-1, -1, -1)
+
        if camera_props.update_representation(camera.matrix_world):
            bpy.ops.bim.update_representation(obj=camera.name, ifc_representation_class="")
-        # See 6452 and 6478.
-        # bpy.ops.bim.refresh_clipping_planes("INVOKE_DEFAULT")
+            # Restore the scale after update if needed
+            if is_reflected:
+                camera.scale = (-1, -1, -1)

        return {"FINISHED"}

@@ -2281,10 +2379,6 @@ class ActivateDrawing(bpy.types.Operator, ActivateDrawingBase):
        + "SHIFT+CLICK to load a quick preview of the drawing view"
    )

-    drawing: bpy.props.IntProperty()
-    should_view_from_camera: bpy.props.BoolProperty(name="Should View From Camera", default=True, options={"SKIP_SAVE"})
-    use_quick_preview: bpy.props.BoolProperty(name="Use Quick Preview", default=False, options={"SKIP_SAVE"})
-

 class ActivateDrawingFromSheet(bpy.types.Operator, ActivateDrawingBase):
    bl_idname = "bim.activate_drawing_from_sheet"
@@ -2296,10 +2390,6 @@ class ActivateDrawingFromSheet(bpy.types.Operator, ActivateDrawingBase):
        + "SHIFT+CLICK to load a quick preview of the drawing view"
    )

-    drawing: bpy.props.IntProperty()
-    should_view_from_camera: bpy.props.BoolProperty(name="Should View From Camera", default=True, options={"SKIP_SAVE"})
-    use_quick_preview: bpy.props.BoolProperty(name="Use Quick Preview", default=False, options={"SKIP_SAVE"})
-
    @classmethod
    def poll(cls, context):
        props = tool.Drawing.get_document_props()
@@ -2750,8 +2840,13 @@ class AddScheduleToSheet(bpy.types.Operator, tool.Ifc.Operator):
        if not props.schedules:
            cls.poll_message_set("No schedule selected.")
            return False
-        prefs = tool.Blender.get_addon_preferences()
-        return props.schedules and props.sheets and prefs.data_dir
+        if not props.sheets:
+            cls.poll_message_set("No sheets available.")
+            return False
+        if not tool.Blender.get_user_data_dir():
+            cls.poll_message_set("BIM data directory not set.")
+            return False
+        return True

    def _execute(self, context):
        props = tool.Drawing.get_document_props()
@@ -2818,8 +2913,13 @@ class AddReferenceToSheet(bpy.types.Operator, tool.Ifc.Operator):
        if not props.references:
            cls.poll_message_set("No reference selected.")
            return False
-        bim_props = tool.Blender.get_bim_props()
-        return props.references and props.sheets and bim_props.data_dir
+        if not props.sheets:
+            cls.poll_message_set("No sheets available.")
+            return False
+        if not tool.Blender.get_user_data_dir():
+            cls.poll_message_set("BIM data directory not set.")
+            return False
+        return True

    def _execute(self, context):
        props = tool.Drawing.get_document_props()
@@ -2935,47 +3035,9 @@ class EditTextPopup(bpy.types.Operator):
    first_run: bpy.props.BoolProperty(default=True)

    def draw(self, context):
-        # shares most of the code with BIM_PT_text.draw()
-        # need to keep them in sync or move to some common function
-        # NOTE: that `popup_active_attribute` is used here when it's not used in `BIM_PT_text.draw()`
+        from bonsai.bim.module.drawing.ui import BIM_PT_text

-        assert self.layout
-        obj = context.active_object
-        assert obj
-        props = tool.Drawing.get_text_props(obj)
-
-        row = self.layout.row(align=True)
-        row.operator("bim.add_text_literal", icon="ADD", text="Add Literal")
-
-        row = self.layout.row(align=True)
-        row.prop(props, "font_size")
-
-        for i, literal_props in enumerate(props.literals):
-            box = self.layout.box()
-            row = self.layout.row(align=True)
-
-            row = box.row(align=True)
-            row.label(text=f"Literal[{i}]:")
-            row.operator("bim.remove_text_literal", icon="X", text="").literal_prop_id = i
-
-            # skip BoxAlignment since we're going to format it ourselves
-            attributes = [a for a in literal_props.attributes if a.name != "BoxAlignment"]
-            bonsai.bim.helper.draw_attributes(attributes, box, popup_active_attribute=attributes[0])
-
-            row = box.row(align=True)
-            cols = [row.column(align=True) for i in range(3)]
-            for i in range(9):
-                cols[i % 3].prop(
-                    literal_props,
-                    "box_alignment",
-                    text="",
-                    index=i,
-                    icon="RADIOBUT_ON" if literal_props.box_alignment[i] else "RADIOBUT_OFF",
-                )
-
-            col = row.column(align=True)
-            col.label(text="    Text box alignment:")
-            col.label(text=f'    {literal_props.attributes["BoxAlignment"].string_value}')
+        BIM_PT_text.draw_text_editing_ui(self, context, popup_mode=True)

    def cancel(self, context):
        # disable editing when dialog is closed
@@ -3030,7 +3092,6 @@ class DisableEditingText(bpy.types.Operator, tool.Ifc.Operator):

        # force update this object's font size for viewport display
        DecoratorData.data.pop(obj.name, None)
-        tool.Drawing.update_text_value(obj)
        tool.Blender.update_viewport()


@@ -3087,6 +3148,7 @@ class RemoveTextLiteral(bpy.types.Operator):
        assert obj
        props = tool.Drawing.get_text_props(obj)
        props.literals.remove(self.literal_prop_id)
+        tool.Blender.update_viewport()
        return {"FINISHED"}


@@ -3104,6 +3166,7 @@ class OrderTextLiteralUp(bpy.types.Operator):
        assert obj
        props = tool.Drawing.get_text_props(obj)
        props.literals.move(self.literal_prop_id, self.literal_prop_id - 1)
+        tool.Blender.update_viewport()
        return {"FINISHED"}


@@ -3121,6 +3184,7 @@ class OrderTextLiteralDown(bpy.types.Operator):
        assert obj
        props = tool.Drawing.get_text_props(obj)
        props.literals.move(self.literal_prop_id, self.literal_prop_id + 1)
+        tool.Blender.update_viewport()
        return {"FINISHED"}


@@ -3363,50 +3427,51 @@ class DisableEditingDrawings(bpy.types.Operator, tool.Ifc.Operator):
        core.disable_editing_drawings(tool.Drawing)


-class ExpandTargetView(bpy.types.Operator):
-    bl_idname = "bim.expand_target_view"
-    bl_label = "Expand Target View"
-    bl_description = "\nSHIFT+CLICK to expand all view categories"
+ToggleOption = Literal["EXPAND", "CONTRACT"]

+
+class ToggleTargetView(bpy.types.Operator):
+    bl_idname = "bim.toggle_target_view"
+    bl_label = "Toggle Target View"
    bl_options = {"REGISTER", "UNDO"}
-    target_view: bpy.props.StringProperty()
-    expand_all: bpy.props.BoolProperty(name="Expand All", default=False, options={"SKIP_SAVE"})
+
+    target_view: bpy.props.StringProperty()  # pyright: ignore[reportRedeclaration]
+    toggle_all: bpy.props.BoolProperty(  # pyright: ignore[reportRedeclaration]
+        default=False,
+        options={"SKIP_SAVE"},
+    )
+    option: bpy.props.EnumProperty(  # pyright: ignore[reportRedeclaration]
+        items=[(i, i, "") for i in get_args(ToggleOption)]
+    )
+
+    if TYPE_CHECKING:
+        target_view: str
+        toggle_all: bool
+        option: ToggleOption
+
+    @classmethod
+    def description(cls, context, properties) -> str:
+        option: ToggleOption = properties.option
+        if option == "EXPAND":
+            return "Expand target view.\n\nSHIFT+CLICK to expand all view categories."
+        else:
+            return "Contract target view.\n\nSHIFT+CLICK to contract all view categories."

    def invoke(self, context, event):
-        # Expanding all categories on shift+click.
+        # Toggling all categories on shift+click.
        # Make sure to use SKIP_SAVE on property, otherwise it might get stuck (copied from #4771).
        if event.type == "LEFTMOUSE" and event.shift:
-            self.expand_all = True
+            self.toggle_all = True
        return self.execute(context)

    def execute(self, context):
        props = tool.Drawing.get_document_props()
-        for drawing in [d for d in props.drawings if self.expand_all or d.target_view == self.target_view]:
-            drawing.is_expanded = True
-        core.load_drawings(tool.Drawing)
-        return {"FINISHED"}
-
-
-class ContractTargetView(bpy.types.Operator):
-    bl_idname = "bim.contract_target_view"
-    bl_label = "Contract Target View"
-    bl_description = "\n\nSHIFT+CLICK to hide all view categories"
-
-    bl_options = {"REGISTER", "UNDO"}
-    target_view: bpy.props.StringProperty()
-    contract_all: bpy.props.BoolProperty(name="Contract All", default=False, options={"SKIP_SAVE"})
-
-    def invoke(self, context, event):
-        # Contracting all categories on shift+click.
-        # Make sure to use SKIP_SAVE on property, otherwise it might get stuck (copied from #4771).
-        if event.type == "LEFTMOUSE" and event.shift:
-            self.contract_all = True
-        return self.execute(context)
-
-    def execute(self, context):
-        props = tool.Drawing.get_document_props()
-        for drawing in [d for d in props.drawings if self.contract_all or d.target_view == self.target_view]:
-            drawing.is_expanded = False
+        expanded = self.option == "EXPAND"
+        for drawing in props.drawings:
+            if drawing.is_drawing:
+                continue
+            if self.toggle_all or drawing.target_view == self.target_view:
+                drawing.is_expanded = expanded
        core.load_drawings(tool.Drawing)
        return {"FINISHED"}

@@ -3698,8 +3763,24 @@ class OpenDocumentationWebUi(bpy.types.Operator):
    bl_description = "Open the documentation web UI page"

    def execute(self, context):
-        if not context.scene.WebProperties.is_connected:
+        if not tool.Web.get_web_props().is_connected:
            bpy.ops.bim.connect_websocket_server(page="documentation")
        else:
            bpy.ops.bim.open_web_browser(page="documentation")
        return {"FINISHED"}
+
+
+class ExcludeAnnotation(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.exclude_annotation"
+    bl_label = "Exclude Annotation"
+    bl_description = "Excludes the automatic annotation reference from the drawing"
+    bl_options = {"REGISTER", "UNDO"}
+
+    def _execute(self, context):
+        if not (obj := bpy.context.scene.camera) or not (drawing := tool.Ifc.get_entity(obj)):
+            return
+        for obj in tool.Blender.get_selected_objects(include_active=False):
+            if (element := tool.Ifc.get_entity(obj)) and tool.Drawing.is_auto_annotation(element):
+                if referenced_element := tool.Drawing.get_annotation_element(element):
+                    tool.Drawing.exclude_annotation_from_drawing(referenced_element, drawing)
+        core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=drawing)
@@ -267,12 +267,6 @@ def update_titleblocks(self, context):
 def update_should_draw_decorations(self, context: bpy.types.Context) -> None:
    if self.should_draw_decorations:
        # TODO: design a proper text variable templating renderer
-        collection = tool.Blender.get_object_bim_props(context.scene.camera).collection
-        for obj in collection.objects:
-            element = tool.Ifc.get_entity(obj)
-            if not element or not tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"]):
-                continue
-            tool.Drawing.update_text_value(obj)
        refresh_drawing_data()
        if bpy.app.background:
            return
@@ -308,7 +302,9 @@ class Drawing(PropertyGroup):
    )
    is_selected: BoolProperty(name="Is Selected", default=True)
    is_drawing: BoolProperty(name="Is Drawing", default=False)
+    """``Drawing`` can be either a drawing or a drawing target view header."""
    is_expanded: BoolProperty(name="Is Expanded", default=True)
+    """Whether target view header is expanded in UI. Should be just unset for the actual drawings."""

    if TYPE_CHECKING:
        ifc_definition_id: int
@@ -396,9 +392,23 @@ RASTER_STYLE_PROPERTIES_EXCLUDE = ("scene.render.filepath",)


 class DocProperties(PropertyGroup):
-    should_use_underlay_cache: BoolProperty(name="Use Underlay Cache", default=False)
-    should_use_linework_cache: BoolProperty(name="Use Linework Cache", default=False)
-    should_use_annotation_cache: BoolProperty(name="Use Annotation Cache", default=False)
+    # Note that options are global in descriptions to prevent confusion,
+    # as options are available through Active Drawing UI, but they're actually global.
+    should_use_underlay_cache: BoolProperty(
+        name="Use Underlay Cache", description="Global option for all drawings.", default=False
+    )
+    should_use_linework_cache: BoolProperty(
+        name="Use Linework Cache", description="Global option for all drawings.", default=False
+    )
+    should_use_annotation_cache: BoolProperty(
+        name="Use Annotation Cache", description="Global option for all drawings.", default=False
+    )
+    should_draw_linked_projects: BoolProperty(
+        name="Draw Linked Projects",
+        description=("Whether to draw all currently loaded linked projects.\n\nGlobal option for all drawings."),
+        default=True,
+        options=set(),
+    )
    is_editing_drawings: BoolProperty(name="Is Editing Drawings", default=False)
    is_editing_schedules: BoolProperty(name="Is Editing Schedules", default=False)
    is_editing_references: BoolProperty(name="Is Editing References", default=False)
@@ -428,6 +438,7 @@ class DocProperties(PropertyGroup):
        should_use_underlay_cache: bool
        should_use_linework_cache: bool
        should_use_annotation_cache: bool
+        should_draw_linked_projects: bool
        is_editing_drawings: bool
        is_editing_schedules: bool
        is_editing_references: bool
@@ -454,6 +465,12 @@ class DocProperties(PropertyGroup):
            return None
        return tool.Ifc.get().by_id(drawing_id)

+    def get_active_target_view(self) -> Union[str, None]:
+        active_drawing = self.get_active_drawing()
+        if not active_drawing:
+            return None
+        return tool.Drawing.get_drawing_target_view(active_drawing)
+

 def update_width_height(self: "BIMCameraProperties", context: bpy.types.Context) -> None:
    self.update_camera_resolution()
@@ -481,6 +498,9 @@ class BIMCameraProperties(PropertyGroup):
        name="Linework Mode",
        update=get_update_layer_callback("linework_mode", "LineworkMode"),
    )
+    generate_material_layers: bpy.props.BoolProperty(
+        name="Generate Material Layers", description="Generate material layer linework in drawings", default=True
+    )
    fill_mode: EnumProperty(
        items=[
            ("NONE", "None", "Disable filling areas seen in projection"),
@@ -692,16 +712,12 @@ class LiteralProps(PropertyGroup):
        return self.get("box_alignment", DEFAULT_BOX_ALIGNMENT)

    attributes: CollectionProperty(name="Attributes", type=Attribute)
-    # Current text value with evaluated expressions stored in `value`.
-    # The original (Literal) value stored in `attributes['Literal']`
-    # and can be accessed with `get_text()`
-    value: StringProperty(name="Value", default="TEXT")
    box_alignment: BoolVectorProperty(
        name="Box alignment", size=9, set=set_box_alignment, get=get_box_alignment, default=DEFAULT_BOX_ALIGNMENT
    )
    ifc_definition_id: IntProperty(name="IFC definition ID", default=0)

-    def get_literal_edited_data(self):
+    def get_literal_edited_data(self) -> dict[str, str]:
        text_data = {
            "CurrentValue": self.attributes["Literal"].string_value,
            "Literal": self.attributes["Literal"].string_value,
@@ -712,7 +728,7 @@ class LiteralProps(PropertyGroup):
    if TYPE_CHECKING:
        attributes: bpy.types.bpy_prop_collection_idprop[Attribute]
        value: str
-        box_alignment: str
+        box_alignment: tuple[bool, bool, bool, bool, bool, bool, bool, bool, bool]
        ifc_definition_id: int


@@ -731,12 +747,50 @@ class BIMTextProperties(PropertyGroup):
        name="Font Size",
    )
    newline_at: IntProperty(name="Newline At")
+    reverse_list: BoolProperty(name="Reverse List", description="Reverses the order of any list.", default=False)
+    list_separator: StringProperty(  # pyright: ignore[reportRedeclaration]
+        name="List Separator",
+        description="Text used to separate lists. Uses a comma (, ) if empty.",
+    )
+    symbol: EnumProperty(  # pyright: ignore[reportRedeclaration]
+        name="Symbol",
+        description="Symbol from symbols.svg to use for this text.",
+        items=[(s, s, "") for s in ["NO SYMBOL", "CUSTOM SYMBOL"] + tool.Drawing.DEFAULT_SYMBOLS],
+        default="NO SYMBOL",
+    )
+    custom_symbol: StringProperty(  # pyright: ignore[reportRedeclaration]
+        name="Custom Symbol",
+        description="Non-default symbol to use for this text.",
+    )

    if TYPE_CHECKING:
        is_editing: bool
        literals: bpy.types.bpy_prop_collection_idprop[LiteralProps]
        font_size: str
        newline_at: int
+        reverse_list: bool
+        list_separator: str
+        symbol: Union[str, Literal["NO SYMBOL", "CUSTOM SYMBOL"]]
+        custom_symbol: str
+
+    def get_symbol(self) -> Union[str, None]:
+        if self.symbol == "NO SYMBOL":
+            return None
+        elif self.symbol == "CUSTOM SYMBOL":
+            return self.custom_symbol or None
+        else:
+            return self.symbol
+
+    def set_symbol(self, symbol: Union[str, None]):
+        if not symbol:
+            self.property_unset("symbol")
+            self.property_unset("custom_symbol")
+        elif symbol in tool.Drawing.DEFAULT_SYMBOLS:
+            self.symbol = symbol
+            self.property_unset("custom_symbol")
+        else:
+            self.symbol = "CUSTOM SYMBOL"
+            self.custom_symbol = symbol

    def get_text_edited_data(self) -> dict[str, Any]:
        """should be called only if `is_editing`
@@ -751,6 +805,9 @@ class BIMTextProperties(PropertyGroup):
            "Literals": literals_data,
            "FontSize": float(self.font_size),
            "Newline_At": int(self.newline_at),
+            "Symbol": self.get_symbol(),
+            "Reverse_List": self.reverse_list,
+            "List_Separator": self.list_separator or ", ",
        }
        return text_data

@@ -805,6 +862,19 @@ class BIMAnnotationProperties(PropertyGroup):
    )
    is_adding_type: bpy.props.BoolProperty(default=False)
    type_name: bpy.props.StringProperty(name="Name", default="TYPEX")
+    tag_rotation_mode: bpy.props.EnumProperty(
+        name="Tag Rotation Mode",
+        description="How to orient the tag relative to the tagged object",
+        items=[
+            ("NONE", "No Rotation", "Keep tag in default orientation"),
+            ("LOCAL_X", "Local X Axis", "Align tag with object's local X axis"),
+            ("LOCAL_Y", "Local Y Axis", "Align tag with object's local Y axis"),
+            ("LOCAL_Z", "Local Z Axis", "Align tag with object's local Z axis"),
+            ("CAMERA_Horizontal", "Camera Horizontal", "Align tag with camera X axis"),
+            ("CAMERA_Vertical", "Camera Vertical", "Align tag with camera Y axis"),
+        ],
+        default="NONE",
+    )

    if TYPE_CHECKING:
        object_type: str
@@ -46,6 +46,7 @@ class SheetBuilder:
        root = ET.Element("svg")
        root.attrib["xmlns"] = "http://www.w3.org/2000/svg"
        root.attrib["xmlns:xlink"] = "http://www.w3.org/1999/xlink"
+        root.attrib["xmlns:sodipodi"] = "http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
        root.attrib["id"] = "root"
        root.attrib["version"] = "1.1"

@@ -65,6 +66,7 @@ class SheetBuilder:
        view_height = self.convert_to_mm(view_root.attrib["height"])
        view = ET.SubElement(root, "g")
        view.attrib["data-type"] = "titleblock"
+        view.attrib["sodipodi:insensitive"] = "true"
        titleblock = ET.SubElement(view, "image")
        titleblock.attrib["xlink:href"] = Path(os.path.relpath(titleblock_path, sheet_dir)).as_posix()
        titleblock.attrib["x"] = "0"
@@ -823,6 +823,7 @@ class SvgWriter:
        x_offset = self.raw_width / 2
        y_offset = self.raw_height / 2
        element = tool.Ifc.get_entity(text_obj)
+        assert element
        text_literals = tool.Drawing.get_text_literal(text_obj, return_list=True)
        product = tool.Drawing.get_assigned_product(element)

@@ -838,6 +839,12 @@ class SvgWriter:

        symbol = tool.Drawing.get_annotation_symbol(element)
        newline_at = tool.Drawing.get_newline_at(element)
+
+        # Get reverse_list and list_separator from EPset_Annotation
+        pset_data = ifcopenshell.util.element.get_pset(element, "EPset_Annotation") or {}
+        reverse_list = pset_data.get("Reverse_List", False)
+        list_separator = pset_data.get("List_Separator") or ", "
+
        template_text_fields = []
        if symbol:
            symbol_transform = self.get_symbol_transform(text_position_svg_str, angle, text_obj)
@@ -854,7 +861,7 @@ class SvgWriter:
                    # NOTE: zip makes sure that we iterate over the shortest list
                    for field, text_literal in zip(template_text_fields, text_literals):
                        field.text = tool.Drawing.replace_text_literal_variables(
-                            text_literal.Literal, product or element
+                            text_literal.Literal, product or element, reverse_list, list_separator
                        )
                        field.attrib["class"] = classes_str

@@ -874,7 +881,9 @@ class SvgWriter:
        line_number = 0

        for text_literal in text_literals:
-            text = tool.Drawing.replace_text_literal_variables(text_literal.Literal, product or element)
+            text = tool.Drawing.replace_text_literal_variables(
+                text_literal.Literal, product or element, reverse_list, list_separator
+            )
            text_tags = self.create_text_tag(
                text,
                text_position_svg,
@@ -1011,7 +1020,9 @@ class SvgWriter:

            # TODO: allow metric to be configurable
            def get_text():
-                z = (matrix_world @ points[0].co.xyz).z
+                abs_z = (matrix_world @ points[0].co.xyz).z
+                z = helper.get_relative_z(obj, element, abs_z)
+
                rl = helper.format_distance(
                    z,
                    precision=self.precision,
@@ -29,10 +29,10 @@ from bonsai.bim.module.drawing.data import (
    ElementFiltersData,
    DecoratorData,
 )
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union

 if TYPE_CHECKING:
-    from bonsai.bim.module.drawing.prop import DocProperties, Drawing
+    from bonsai.bim.module.drawing.prop import DocProperties, Drawing, Sheet


 class BIM_PT_camera(Panel):
@@ -71,6 +71,25 @@ class BIM_PT_camera(Panel):
        row.prop(props, "has_annotation", icon="MOD_EDGESPLIT")
        row.prop(dprops, "should_use_annotation_cache", text="", icon="FILE_REFRESH")

+        # Drawing linked projects.
+        row = col.row(align=True)
+        row.prop(dprops, "should_draw_linked_projects")
+        if dprops.should_draw_linked_projects:
+            header, panel = self.layout.panel("links_to_draw")
+            header.label(text="Linked Projects to Draw", icon="OUTPUT")
+
+            pprops = tool.Project.get_project_props()
+            links = list(pprops.get_loaded_links())
+            if panel:
+                if links:
+                    for link in links:
+                        row = panel.row(align=True)
+                        split = row.split(factor=0.9)
+                        split.label(text=link.name, icon="FILE")
+                        split.prop(link, "include_in_drawings", text="")
+                else:
+                    panel.label(text="No IFC projects linked and loaded.")
+
        row = self.layout.row(align=True)
        row.prop(props, "target_view")

@@ -80,12 +99,13 @@ class BIM_PT_camera(Panel):

        row = self.layout.row()
        row.prop(props, "linework_mode")
+        row = self.layout.row()
+        row.prop(props, "generate_material_layers")
        if props.linework_mode == "OPENCASCADE":
            row = self.layout.row()
            row.prop(props, "fill_mode")
            row = self.layout.row()
            row.prop(props, "cut_mode")
-
        row = self.layout.row()
        row.prop(props, "width")
        row = self.layout.row()
@@ -174,6 +194,7 @@ class BIM_PT_element_filters(Panel):
            text = "Exclude Filter" if ElementFiltersData.data["has_exclude_filter"] else "No Exclude Filter Found"
            icon = "GREASEPENCIL" if ElementFiltersData.data["has_exclude_filter"] else "ADD"
            row.label(text=text, icon="FILTER")
+            row.operator("bim.exclude_annotation", icon="REMOVE", text="")
            row.operator("bim.enable_editing_element_filter", icon=icon, text="").filter_mode = "EXCLUDE"


@@ -546,56 +567,81 @@ class BIM_PT_text(Panel):
            return
        return tool.Drawing.is_annotation_object_type(element, ["TEXT", "TEXT_LEADER"])

+    def draw_text_editing_ui(
+        self: Union[bpy.types.Panel, bpy.types.Operator],
+        context: bpy.types.Context,
+        *,
+        popup_mode: bool = False,
+    ) -> None:
+        # The method is also used in EditTextPopup.draw().
+        assert self.layout
+        obj = context.active_object
+        assert obj
+        props = tool.Drawing.get_text_props(obj)
+
+        row = self.layout.row(align=True)
+
+        if popup_mode:
+            row.operator("bim.add_text_literal", icon="ADD", text="Add Literal")
+        else:
+            row.operator("bim.edit_text", icon="CHECKMARK")
+            row.operator("bim.add_text_literal", icon="ADD", text="")
+            row.operator("bim.disable_editing_text", icon="CANCEL", text="")
+
+        row = self.layout.row(align=True)
+        row.prop(props, "font_size")
+        row = self.layout.row(align=True)
+        row.prop(props, "newline_at")
+        row = self.layout.row(align=True)
+        row.prop(props, "reverse_list")
+        row = self.layout.row(align=True)
+        row.prop(props, "list_separator")
+
+        row = self.layout.row(align=True)
+        row.prop(props, "symbol")
+        if props.symbol == "CUSTOM SYMBOL":
+            row = self.layout.row(align=True)
+            row.prop(props, "custom_symbol", text="")
+
+        for i, literal_props in enumerate(props.literals):
+            box = self.layout.box()
+            row = self.layout.row(align=True)
+
+            row = box.row(align=True)
+            row.label(text=f"Literal[{i}]:")
+            if i > 0:
+                row.operator("bim.order_text_literal_up", icon="TRIA_UP", text="").literal_prop_id = i
+            if i < len(props.literals) - 1:
+                row.operator("bim.order_text_literal_down", icon="TRIA_DOWN", text="").literal_prop_id = i
+            row.operator("bim.remove_text_literal", icon="X", text="").literal_prop_id = i
+
+            # skip BoxAlignment since we're going to format it ourselves
+            attributes = [a for a in literal_props.attributes if a.name != "BoxAlignment"]
+            popup_active_attribute = attributes[0] if popup_mode else None
+            bonsai.bim.helper.draw_attributes(attributes, box, popup_active_attribute=popup_active_attribute)
+
+            row = box.row(align=True)
+            cols = [row.column(align=True) for i in range(3)]
+            for i in range(9):
+                cols[i % 3].prop(
+                    literal_props,
+                    "box_alignment",
+                    text="",
+                    index=i,
+                    icon="RADIOBUT_ON" if literal_props.box_alignment[i] else "RADIOBUT_OFF",
+                )
+
+            col = row.column(align=True)
+            col.label(text="    Text box alignment:")
+            col.label(text=f'    {literal_props.attributes["BoxAlignment"].string_value}')
+
    def draw(self, context):
        obj = context.active_object
        assert obj
        props = tool.Drawing.get_text_props(obj)

        if props.is_editing:
-            # shares most of the code with EditTextPopup.draw()
-            # need to keep them in sync or move to some common function
-
-            row = self.layout.row(align=True)
-            row.operator("bim.edit_text", icon="CHECKMARK")
-            row.operator("bim.add_text_literal", icon="ADD", text="")
-            row.operator("bim.disable_editing_text", icon="CANCEL", text="")
-
-            row = self.layout.row(align=True)
-            row.prop(props, "font_size")
-            row = self.layout.row(align=True)
-            row.prop(props, "newline_at")
-
-            for i, literal_props in enumerate(props.literals):
-                box = self.layout.box()
-                row = self.layout.row(align=True)
-
-                row = box.row(align=True)
-                row.label(text=f"Literal[{i}]:")
-                if i > 0:
-                    row.operator("bim.order_text_literal_up", icon="TRIA_UP", text="").literal_prop_id = i
-                if i < len(props.literals) - 1:
-                    row.operator("bim.order_text_literal_down", icon="TRIA_DOWN", text="").literal_prop_id = i
-                row.operator("bim.remove_text_literal", icon="X", text="").literal_prop_id = i
-
-                # skip BoxAlignment since we're going to format it ourselves
-                attributes = [a for a in literal_props.attributes if a.name != "BoxAlignment"]
-                bonsai.bim.helper.draw_attributes(attributes, box)
-
-                row = box.row(align=True)
-                cols = [row.column(align=True) for i in range(3)]
-                for i in range(9):
-                    cols[i % 3].prop(
-                        literal_props,
-                        "box_alignment",
-                        text="",
-                        index=i,
-                        icon="RADIOBUT_ON" if literal_props.box_alignment[i] else "RADIOBUT_OFF",
-                    )
-
-                col = row.column(align=True)
-                col.label(text="    Text box alignment:")
-                col.label(text=f'    {literal_props.attributes["BoxAlignment"].string_value}')
-
+            self.draw_text_editing_ui(context)
        else:
            text_data = DecoratorData.get_text_data(obj)

@@ -608,6 +654,12 @@ class BIM_PT_text(Panel):
            row = self.layout.row(align=True)
            row.label(text="Newline_At")
            row.label(text=str(text_data["Newline_At"]))
+            row = self.layout.row(align=True)
+            row.label(text="Reverse_List")
+            row.label(text=str(text_data["Reverse_List"]))
+            row = self.layout.row(align=True)
+            row.label(text="List_Separator")
+            row.label(text=str(text_data["List_Separator"]))

            for literal_data in text_data["Literals"]:
                box = self.layout.box()
@@ -667,18 +719,27 @@ class BIM_UL_drawinglist(bpy.types.UIList):
            else:
                icon = "CLIPUV_HLT"
            if item.is_expanded:
-                row.operator(
-                    "bim.contract_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN"
-                ).target_view = item.target_view
+                op = row.operator("bim.toggle_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_DOWN")
+                op.target_view = item.target_view
+                op.option = "CONTRACT"
            else:
-                row.operator(
-                    "bim.expand_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT"
-                ).target_view = item.target_view
+                op = row.operator("bim.toggle_target_view", text="", emboss=False, icon="DISCLOSURE_TRI_RIGHT")
+                op.target_view = item.target_view
+                op.option = "EXPAND"
            row.prop(item, "name", text="", icon=icon, emboss=False)


 class BIM_UL_sheets(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
+    def draw_item(
+        self,
+        context,
+        layout: bpy.types.UILayout,
+        data: DocProperties,
+        item: Sheet,
+        icon,
+        active_data,
+        active_propname,
+    ) -> None:
        if not item:
            layout.label(text="", translate=False)
            return
@@ -180,9 +180,6 @@ def create_annotation_occurrence(context):
            tool.Geometry,
            obj=obj,
            representation=representation,
-            should_reload=True,
-            is_global=True,
-            should_sync_changes_first=False,
        )

    if obj.data and not relating_type_rep:
@@ -231,19 +228,28 @@ class AnnotationToolUI:
    def draw_type_selection_interface(cls):
        # shared by both sidebar and header
        object_type = cls.props.object_type
-
        row = cls.layout.row(align=True)
        row.label(text="", icon="FILE_VOLUME")
        prop_with_search(row, cls.props, "object_type", text="")

        row = cls.layout.row(align=True)
        row.label(text="", icon="FILE_3D")
-        prop_with_search(row, cls.props, "relating_type_id", text="")
+        prop_with_search(
+            row,
+            cls.props,
+            "relating_type_id",
+            text="",
+            enable_relating_type_suggestions=True,
+            search_threshold=0,
+        )
        row.operator("bim.launch_annotation_type_manager", icon=tool.Blender.TYPE_MANAGER_ICON, text="")

        add_layout_hotkey_operator(cls.layout, "Add", "S_A", "Create a new annotation")

        if object_type in tool.Drawing.ANNOTATION_TYPES_SUPPORT_SETUP:
+            row = cls.layout.row(align=True)
+            row.label(text="", icon="DRIVER_ROTATIONAL_DIFFERENCE")
+            row.prop(cls.props, "tag_rotation_mode", text="")
            add_layout_hotkey_operator(
                cls.layout,
                "Bulk Tag",
@@ -295,6 +301,8 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
            return

        related_objects = bpy.context.selected_objects
+        created_objects = []
+
        for related_object in related_objects:
            obj = core.add_annotation(
                tool.Ifc,
@@ -307,7 +315,15 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
                ),
                enable_editing=False,
            )
-            tool.Drawing.setup_annotation_object(obj, object_type, related_object)
+            tool.Drawing.setup_annotation_object(obj, object_type, related_object, props.tag_rotation_mode)
+            created_objects.append(obj)
+
+        # Select the created annotation objects
+        bpy.ops.object.select_all(action="DESELECT")
+        for obj in created_objects:
+            obj.select_set(True)
+        if created_objects:
+            bpy.context.view_layer.objects.active = created_objects[-1]

    def hotkey_S_A(self):
        if bpy.ops.bim.add_annotation.poll():
@@ -337,4 +353,5 @@ class Hotkey(bpy.types.Operator, tool.Ifc.Operator):
                continue
            related_object = tool.Ifc.get_object(related_product)

-            tool.Drawing.setup_annotation_object(obj, annotation_type, related_object)
+            rotation_mode = tool.Drawing.get_annotation_props().tag_rotation_mode
+            tool.Drawing.setup_annotation_object(obj, annotation_type, related_object, rotation_mode)
@@ -109,8 +109,9 @@ def block_scale(scene: bpy.types.Scene) -> None:
            if obj.type == "CAMERA":
                camera = tool.Ifc.get_entity(obj)
                if ifcopenshell.util.element.get_pset(camera, "EPset_Drawing", "TargetView") == "REFLECTED_PLAN_VIEW":
-                    obj.scale = (-1, -1, -1)
-                    obj.rotation_euler = (0.0, 0.0, math.radians(180))
+                    # Only update if scale isn't already (-1, -1, -1)
+                    if obj.scale != (-1, -1, -1):
+                        obj.scale = (-1, -1, -1)
            else:
                if obj.scale != (1, 1, 1):
                    obj.scale = (1, 1, 1)
@@ -20,7 +20,7 @@ import bpy
 import ifcopenshell.util.element
 import ifcopenshell.util.geolocation
 import ifcopenshell.util.placement
-import ifcopenshell.util.schema
+import ifcopenshell.util.representation
 import ifcopenshell.util.unit
 import bonsai.tool as tool
 from typing import Any, Union
@@ -117,16 +117,23 @@ class RepresentationsData:

        for representation in tool.Geometry.get_representations_iter(element):
            representation_type = representation.RepresentationType
-            if representation_type == "MappedRepresentation":
-                representation_type = representation.Items[0].MappingSource.MappedRepresentation.RepresentationType
-                representation_type += "*"
+            resolved_representation = ifcopenshell.util.representation.resolve_representation(representation)
+
+            if resolved_representation != representation:
+                representation_type = resolved_representation.RepresentationType + "*"
+
+            is_active = (
+                representation.id() == active_representation_id
+                or resolved_representation.id() == active_representation_id
+            )
+
            data = {
                "id": representation.id(),
                "ContextType": representation.ContextOfItems.ContextType or "",
                "ContextIdentifier": "",
                "TargetView": "",
                "RepresentationType": representation_type or "",
-                "is_active": representation.id() == active_representation_id,
+                "is_active": is_active,
            }
            if representation.ContextOfItems.is_a("IfcGeometricRepresentationSubContext"):
                data["ContextIdentifier"] = representation.ContextOfItems.ContextIdentifier or ""
@@ -28,6 +28,7 @@ import bonsai.tool as tool
 from math import pi, pow
 from mathutils import Vector, Matrix, geometry
 from typing import Union, Any, TypeVar, Optional
+from ifcopenshell.util.shape_builder import ShapeBuilder

 T = TypeVar("T")

@@ -35,6 +36,7 @@ T = TypeVar("T")
 class Helper:
    def __init__(self, file: ifcopenshell.file):
        self.file = file
+        self.builder = ShapeBuilder(file)
        self.unit_scale = ifcopenshell.util.unit.calculate_unit_scale(self.file)

    # We can detect a rectangular extrusion by picking any face, then find an
@@ -340,8 +342,10 @@ class Helper:
    def create_extruded_area_solid(
        self, mesh: bpy.types.Mesh, extrusion_indices: list[int], profile_def: dict[str, Any]
    ) -> ifcopenshell.entity_instance:
-        position = self.create_ifc_axis_2_placement_3d(
-            profile_def["curve_ucs"]["center"], profile_def["curve_ucs"]["z_axis"], profile_def["curve_ucs"]["x_axis"]
+        position = self.builder.create_axis2_placement_3d(
+            self.convert_si_to_unit(profile_def["curve_ucs"]["center"]),
+            profile_def["curve_ucs"]["z_axis"],
+            profile_def["curve_ucs"]["x_axis"],
        )
        direction = self.get_extrusion_direction(mesh, extrusion_indices, profile_def["curve_ucs"])
        unit_direction = direction.normalized()
@@ -505,12 +509,3 @@ class Helper:
        return self.file.createIfcAxis2Placement2D(
            self.create_cartesian_point(point.x, point.y), self.file.createIfcDirection((forward.x, forward.y))
        )
-
-    def create_ifc_axis_2_placement_3d(
-        self, point: Vector, up: Vector, forward: Vector
-    ) -> ifcopenshell.entity_instance:
-        return self.file.createIfcAxis2Placement3D(
-            self.create_cartesian_point(point.x, point.y, point.z),
-            self.file.createIfcDirection((up.x, up.y, up.z)),
-            self.file.createIfcDirection((forward.x, forward.y, forward.z)),
-        )
@@ -22,6 +22,7 @@ import bmesh
 import numpy as np
 import numpy.typing as npt
 import ifcopenshell
+import ifcopenshell.api.drawing
 import ifcopenshell.api.group
 import ifcopenshell.api.pset
 import ifcopenshell.api.geometry
@@ -51,6 +52,7 @@ from mathutils import Vector, Matrix, Quaternion
 from time import time
 from bonsai.bim.ifc import IfcStore
 from ifcopenshell.util.shape_builder import ShapeBuilder
+from collections.abc import Sequence
 from typing import Any, Union, Literal, get_args, TYPE_CHECKING, assert_never, NamedTuple
 from bonsai.bim.module.model.decorator import ProfileDecorator

@@ -425,9 +427,7 @@ class SwitchRepresentation(bpy.types.Operator, tool.Ifc.Operator):
    bl_options = {"REGISTER", "UNDO"}
    obj: bpy.props.StringProperty()
    ifc_definition_id: bpy.props.IntProperty()
-    should_reload: bpy.props.BoolProperty()
    disable_opening_subtractions: bpy.props.BoolProperty()
-    should_switch_all_meshes: bpy.props.BoolProperty()

    @classmethod
    def poll(cls, context):
@@ -463,9 +463,6 @@ class SwitchRepresentation(bpy.types.Operator, tool.Ifc.Operator):
                tool.Geometry,
                obj=obj,
                representation=representation,
-                should_reload=self.should_reload,
-                is_global=self.should_switch_all_meshes,
-                should_sync_changes_first=True,
            )


@@ -719,9 +716,6 @@ class UpdateParametricRepresentation(bpy.types.Operator):
            tool.Geometry,
            obj=obj,
            representation=tool.Ifc.get().by_id(props.ifc_definition_id),
-            should_reload=True,
-            is_global=True,
-            should_sync_changes_first=False,
        )
        if show_representation_parameters:
            core.get_representation_ifc_parameters(tool.Geometry, obj=obj)
@@ -864,6 +858,10 @@ class OverrideDelete(bpy.types.Operator):
        objects_to_remove = context.selected_objects

        self.process_arrays(context)
+
+        # Track aggregates before deleting their parts
+        aggregates_to_check = self.track_aggregates(objects_to_remove)
+
        clear_active_object = True

        for i, obj in enumerate(objects_to_remove, 1):
@@ -888,13 +886,28 @@ class OverrideDelete(bpy.types.Operator):
                    continue
                if ifcopenshell.util.element.get_pset(element, "BBIM_Array"):
                    self.report({"INFO"}, "Elements that are part of an array cannot be deleted.")
-                    return {"FINISHED"}
+                    continue
+                if element.is_a("IfcGridAxis"):
+                    # Deleting the last W axis is OK
+                    if ((grid := element.PartOfU) and len(grid[0].UAxes) == 1) or (
+                        (grid := element.PartOfV) and len(grid[0].VAxes) == 1
+                    ):
+                        self.report(
+                            {"INFO"}, "The last grid axis of a grid cannot be deleted. Delete the grid instead."
+                        )
+                        continue
+                if tool.Drawing.is_auto_annotation(element):
+                    self.report({"INFO"}, "References cannot be deleted. Exclude the referenced element instead.")
+                    continue
                tool.Geometry.delete_ifc_object(obj)
            elif tool.Geometry.is_representation_item(obj):
                tool.Geometry.delete_ifc_item(obj)
            else:
                bpy.data.objects.remove(obj)

+        # Delete empty aggregates after deleting their parts
+        self.delete_empty_aggregates(aggregates_to_check)
+
        for opening in tool.Model.get_model_props().openings:
            if opening.obj is not None and not tool.Ifc.get_entity(opening.obj):
                bpy.data.objects.remove(opening.obj)
@@ -927,6 +940,49 @@ class OverrideDelete(bpy.types.Operator):
        data["old_file"].redo()
        tool.Ifc.set(data["new_file"])

+    def track_aggregates(self, objects_to_remove):
+        """Track aggregates that contain objects being deleted"""
+        aggregates_to_check = set()
+        for obj in objects_to_remove:
+            if not tool.Blender.is_valid_data_block(obj):
+                continue
+            element = tool.Ifc.get_entity(obj)
+            if not element:
+                continue
+            aggregate = ifcopenshell.util.element.get_aggregate(element)
+            if aggregate:
+                aggregates_to_check.add(aggregate)
+        return aggregates_to_check
+
+    def delete_empty_aggregates(self, aggregates_to_check):
+        """Delete aggregates that now have no parts"""
+        deleted_aggregates = []
+        for aggregate in aggregates_to_check:
+            # Check if aggregate still exists (might have been deleted already)
+            try:
+                aggregate.id()
+            except:
+                continue
+
+            related_objects = ifcopenshell.util.element.get_parts(aggregate)
+            if len(related_objects) == 0:
+                aggregate_name = aggregate.Name or f"{aggregate.is_a()} #{aggregate.id()}"
+                deleted_aggregates.append(aggregate_name)
+
+                aggregate_obj = tool.Ifc.get_object(aggregate)
+                if aggregate_obj and tool.Blender.is_valid_data_block(aggregate_obj):
+                    tool.Geometry.delete_ifc_object(aggregate_obj)
+
+        # Show info message if aggregates were deleted
+        if deleted_aggregates:
+            if len(deleted_aggregates) == 1:
+                self.report(
+                    {"INFO"}, f"Aggregate '{deleted_aggregates[0]}' was deleted because it had no remaining parts"
+                )
+            else:
+                aggregate_list = ", ".join(f"'{name}'" for name in deleted_aggregates)
+                self.report({"INFO"}, f"Aggregates {aggregate_list} were deleted because they had no remaining parts")
+
    def process_arrays(self, context: bpy.types.Context) -> None:
        ifc_file = tool.Ifc.get()
        selected_objects = set(context.selected_objects)
@@ -1192,16 +1248,20 @@ class DuplicateMoveLinkedAggregate(bpy.types.Operator):
                    obj = tool.Ifc.get_object(part)
                    obj.select_set(True)

-        def add_linked_aggregate_pset(part, index):
-            pset = ifcopenshell.util.element.get_pset(part, self.pset_name)
+        def add_linked_aggregate_pset(element, index):
+            pset = ifcopenshell.util.element.get_pset(element, self.pset_name)
+            if index == 0:
+                properties = {"Index": index, "Name": element.Name, "Aggregate_Index": 0}
+            else:
+                properties = {"Index": index}

            if not pset:
-                pset = ifcopenshell.api.pset.add_pset(ifc_file, product=part, name=self.pset_name)
+                pset = ifcopenshell.api.pset.add_pset(ifc_file, product=element, name=self.pset_name)

                ifcopenshell.api.pset.edit_pset(
                    ifc_file,
                    pset=pset,
-                    properties={"Index": index},
+                    properties=properties,
                )

                index += 1
@@ -1233,18 +1293,9 @@ class DuplicateMoveLinkedAggregate(bpy.types.Operator):
                        if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
                    )

-                    number = len(group_elements) - 1
-                    number = f"{number:02d}"
+                    pset = ifcopenshell.util.element.get_pset(new[0], "BBIM_Linked_Aggregate")
                    new_obj = tool.Ifc.get_object(new[0])
-                    pattern1 = r"_\d"
-                    if re.findall(pattern1, new_obj.name):
-                        split_name = new_obj.name.split("_")
-                        new_obj.name = split_name[0] + "_" + number
-                        continue
-                    pattern2 = r"\.\d{3}"
-                    if re.findall(pattern2, new_obj.name):
-                        split_name = new_obj.name.split(".")
-                        new_obj.name = split_name[0] + "_" + number
+                    new_obj.name = pset["Name"] + "_" + str(pset["Aggregate_Index"])

        def get_max_index(parts):
            psets = [ifcopenshell.util.element.get_pset(p, "BBIM_Linked_Aggregate") for p in parts]
@@ -1257,16 +1308,6 @@ class DuplicateMoveLinkedAggregate(bpy.types.Operator):

        def copy_linked_aggregate_data(old_to_new):
            for old, new in old_to_new.items():
-                pset = ifcopenshell.util.element.get_pset(old, "BBIM_Linked_Aggregate")
-                if pset:
-                    new_pset = ifcopenshell.api.pset.add_pset(ifc_file, product=new[0], name=self.pset_name)
-
-                    ifcopenshell.api.pset.edit_pset(
-                        ifc_file,
-                        pset=new_pset,
-                        properties={"Index": pset["Index"]},
-                    )
-
                if new[0].is_a("IfcElementAssembly"):
                    linked_aggregate_group = [
                        r.RelatingGroup
@@ -1276,6 +1317,31 @@ class DuplicateMoveLinkedAggregate(bpy.types.Operator):
                    ]
                    ifcopenshell.api.group.assign_group(ifc_file, group=linked_aggregate_group[0], products=new)

+                    group_elements: list[ifcopenshell.entity_instance] = next(
+                        r.RelatedObjects
+                        for r in getattr(new[0], "HasAssignments", []) or []
+                        if r.is_a("IfcRelAssignsToGroup")
+                        if "BBIM_Linked_Aggregate" in r.RelatingGroup.Name
+                    )
+
+                pset = ifcopenshell.util.element.get_pset(old, "BBIM_Linked_Aggregate")
+                if pset:
+                    new_pset = ifcopenshell.api.pset.add_pset(ifc_file, product=new[0], name=self.pset_name)
+                    if pset["Index"] == 0:
+                        properties = {
+                            "Index": pset["Index"],
+                            "Name": pset["Name"],
+                            "Aggregate_Index": len(group_elements) - 1,
+                        }
+                    else:
+                        properties = {"Index": pset["Index"]}
+
+                    ifcopenshell.api.pset.edit_pset(
+                        ifc_file,
+                        pset=new_pset,
+                        properties=properties,
+                    )
+
        def get_location_from_3d_cursor(old_to_new, aggregate):
            base_obj = tool.Ifc.get_object(aggregate)
            base_obj_location = base_obj.location.copy()
@@ -1357,7 +1423,7 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
        self.pset_name = "BBIM_Linked_Aggregate"
        refresh_start_time = time()
        old_to_new = {}
-        original_names: dict[int, dict[int, str]] = {}
+        original_data: dict[int, dict[int, str]] = {}

        def delete_objects(element: ifcopenshell.entity_instance) -> None:
            """Remove IfcElementAssembly and it's parts."""
@@ -1372,25 +1438,62 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):

            tool.Geometry.delete_ifc_object(tool.Ifc.get_object(element))

-        def get_original_names(element: ifcopenshell.entity_instance) -> dict[int, dict[int, str]]:
+        def get_assignments(element: ifcopenshell.entity_instance) -> Sequence[ifcopenshell.entity_instance]:
+            annotations = []
+            inverse = list(tool.Ifc.get().get_inverse(element))
+            assignments = [a for a in inverse if a.is_a("IfcRelAssignsToProduct")]
+            if not assignments:
+                pass
+            else:
+                for assignment in assignments:
+                    annotations = assignment.RelatedObjects
+            return annotations
+
+        def assign_to_annotations(obj: bpy.types.Object, assignments: Sequence[ifcopenshell.entity_instance]) -> None:
+            ifc_file = tool.Ifc.get()
+            for assignment in assignments:
+                product = tool.Ifc.get_entity(obj)
+                annotation = tool.Ifc.get_object(assignment)
+                if annotation:
+                    bonsai.core.drawing.edit_assigned_product(tool.Ifc, tool.Drawing, obj=annotation, product=product)
+                else:
+                    existing_product = tool.Drawing.get_assigned_product(assignment)
+                    if existing_product != product:
+                        if existing_product:
+                            ifcopenshell.api.drawing.unassign_product(
+                                ifc_file, relating_product=existing_product, related_object=assignment
+                            )
+                        if product:
+                            ifcopenshell.api.drawing.assign_product(
+                                ifc_file, relating_product=product, related_object=assignment
+                            )
+                tool.Blender.update_viewport()
+
+        def get_original_data(element: ifcopenshell.entity_instance) -> dict[int, dict[int, str]]:
            group = next(
                r.RelatingGroup
                for r in getattr(element, "HasAssignments", []) or []
                if r.is_a("IfcRelAssignsToGroup")
                if self.group_name in r.RelatingGroup.Name
            ).id()
-            original_names[group] = {}
+            original_data[group] = {}

            pset = ifcopenshell.util.element.get_pset(element, self.pset_name)
            index = pset["Index"]
-            original_names[group][index] = tool.Ifc.get_object(element).name
+            annotations = get_assignments(element)
+            container = ifcopenshell.util.element.get_container(element)
+            original_data[group][index] = {
+                "Name": pset["Name"],
+                "Aggregate_Index": pset["Aggregate_Index"],
+                "Assignment": annotations,
+                "Container": container,
+            }

            parts = ifcopenshell.util.element.get_parts(element)
            if parts:
                for part in parts:
                    if part.is_a("IfcElementAssembly"):
-                        # TODO: missing assignment.
-                        original_names | get_original_names(part)
+                        original_data | get_original_data(part)
                    else:
                        try:
                            pset = ifcopenshell.util.element.get_pset(part, self.pset_name)
@@ -1398,11 +1501,15 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
                            continue
                        if pset:
                            index = pset["Index"]
-                            original_names[group][index] = tool.Ifc.get_object(part).name
+                            annotations = get_assignments(part)
+                            original_data[group][index] = {
+                                "Name": tool.Ifc.get_object(part).name,
+                                "Assignment": annotations,
+                            }

-            return original_names
+            return original_data

-        def set_original_name(obj: bpy.types.Object, original_names: dict[int, dict[int, str]]) -> None:
+        def set_original_data(obj: bpy.types.Object, original_data: dict[int, dict[int, str]]) -> None:
            element = tool.Ifc.get_entity(obj)
            aggregate = ifcopenshell.util.element.get_aggregate(element)
            if ifcopenshell.util.element.get_parts(
@@ -1410,24 +1517,49 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
            ):  # if element has parts it means it is the base of and aggregate or sub-aggregate
                aggregate = element

-            group = [
+            group = next(
                r.RelatingGroup
                for r in getattr(aggregate, "HasAssignments", []) or []
                if r.is_a("IfcRelAssignsToGroup")
                if self.group_name in r.RelatingGroup.Name
-            ]
+            ).id()
            if not group:
                return

-            group = group[0].id()
-
            pset = ifcopenshell.util.element.get_pset(element, self.pset_name)
            index = pset["Index"]

-            try:
-                obj.name = original_names[group][index]
-            except:
-                return
+            if index == 0:
+                obj.name = pset["Name"] + "_" + str(original_data[group][index]["Aggregate_Index"])
+                ifc_file = tool.Ifc.get()
+                ifcopenshell.api.pset.edit_pset(
+                    ifc_file,
+                    ifc_file.by_id(pset["id"]),
+                    properties={"Aggregate_Index": int(original_data[group][index]["Aggregate_Index"])},
+                )
+                bonsai.core.spatial.assign_container(
+                    tool.Ifc,
+                    tool.Collector,
+                    tool.Spatial,
+                    container=original_data[group][index]["Container"],
+                    element_obj=obj,
+                )
+                for part in ifcopenshell.util.element.get_parts(tool.Ifc.get_entity(obj)):
+                    tool.Collector.assign(tool.Ifc.get_object(part))
+                assignments = original_data[group][index]["Assignment"]
+                if assignments:
+                    assign_to_annotations(obj, assignments)
+            else:
+                try:
+                    obj.name = original_data[group][index]["Name"]
+                except:
+                    pass
+                try:
+                    assignments = original_data[group][index]["Assignment"]
+                except:
+                    assignments = []
+                if assignments:
+                    assign_to_annotations(obj, assignments)

        def get_element_assembly(element: ifcopenshell.entity_instance) -> Union[ifcopenshell.entity_instance, None]:
            if element.is_a("IfcElementAssembly"):
@@ -1525,6 +1657,9 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):
                base_instance = active_element
                instances_to_refresh = elements

+            base_pset = ifcopenshell.util.element.get_pset(base_instance, self.pset_name)
+            base_obj = tool.Ifc.get_object(base_instance)
+            base_obj.name = base_pset["Name"] + "_" + str(base_pset["Aggregate_Index"])
            for element in instances_to_refresh:
                if element.GlobalId == base_instance.GlobalId:
                    continue
@@ -1533,7 +1668,7 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):

                selected_matrix, duplicate_matrix = get_original_matrix(element, base_instance)

-                original_names = get_original_names(element)
+                original_data = get_original_data(element)

                delete_objects(element)

@@ -1561,7 +1696,7 @@ class RefreshLinkedAggregate(bpy.types.Operator, tool.Ifc.Operator):

                for old, new in old_to_new.items():
                    new_obj = tool.Ifc.get_object(new[0])
-                    set_original_name(new_obj, original_names)
+                    set_original_data(new_obj, original_data)

        bonsai.bim.handler.refresh_ui_data()

@@ -1823,9 +1958,6 @@ class OverrideJoin(bpy.types.Operator, tool.Ifc.Operator):
                tool.Geometry,
                obj=self.target,
                representation=representation,
-                should_reload=True,
-                is_global=True,
-                should_sync_changes_first=False,
                apply_openings=True,
            )

@@ -2062,7 +2194,7 @@ class OverrideModeSetEdit(bpy.types.Operator, tool.Ifc.Operator):
    def has_aggregates(self, objs):
        for obj in objs:
            element = tool.Ifc.get_entity(obj)
-            if not element:
+            if not element or element.is_a("IfcSpatialElement"):
                continue
            aggregate = ifcopenshell.util.element.get_aggregate(element)
            parts = ifcopenshell.util.element.get_parts(element)
@@ -2373,11 +2505,14 @@ class FlipObject(bpy.types.Operator):
 class EnableEditingRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.enable_editing_representation_items"
    bl_label = "Enable Editing Representation Items"
+    bl_description = "Enable editing representation items for all selected objects."
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
-        obj = tool.Geometry.get_active_or_representation_obj()
+        for obj in tool.Geometry.get_selected_objects_with_representations():
+            self.process_obj(obj)

+    def process_obj(self, obj: bpy.types.Object) -> None:
        props = tool.Geometry.get_object_geometry_props(obj)
        props.is_editing = True

@@ -2455,12 +2590,13 @@ class EnableEditingRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
 class DisableEditingRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.disable_editing_representation_items"
    bl_label = "Disable Editing Representation Items"
+    bl_description = "Disable editing representation items for all selected objects"
    bl_options = {"REGISTER", "UNDO"}

    def _execute(self, context):
-        obj = tool.Geometry.get_active_or_representation_obj()
-        assert obj
-        tool.Geometry.get_object_geometry_props(obj).is_editing = False
+        for obj in tool.Geometry.get_selected_objects_with_representations():
+            props = tool.Geometry.get_object_geometry_props(obj)
+            props.is_editing = False


 class RemoveRepresentationItem(bpy.types.Operator, tool.Ifc.Operator):
@@ -2899,6 +3035,7 @@ class ImportRepresentationItems(bpy.types.Operator, tool.Ifc.Operator):
            item_mesh = bpy.data.meshes.new("tmp")
            tool.Ifc.link(item, item_mesh)
            item_obj = bpy.data.objects.new("tmp", item_mesh)
+            tool.Geometry.lock_scale(item_obj)
            tool.Geometry.name_item_object(item_obj, item)
            item_obj.matrix_world = obj.matrix_world
            bpy.context.collection.objects.link(item_obj)
@@ -3443,23 +3580,23 @@ class UnassignRepresentationLayer(bpy.types.Operator, tool.Ifc.Operator):
 class CreateInstance(bpy.types.Operator, tool.Ifc.Operator):
    bl_idname = "bim.create_instance"
    bl_label = "IFC Create Instance"
-    bl_description = "Create an instance of the type associated with the selected object"
+    bl_description = "Create an instance of the type associated with the active object."
    bl_options = {"REGISTER", "UNDO"}

-    def _execute(self, context):
-        if not context.selected_objects or len(context.selected_objects) > 1:
-            self.report({"ERROR"}, "Select exactly one object to create an instance of its type")
-            return {"CANCELLED"}
+    @classmethod
+    def poll(cls, context):
+        if not (obj := context.active_object) or not tool.Ifc.get_entity(obj):
+            cls.poll_message_set("Active object is not an IFC element.")
+            return False
+        return True

-        active_obj = context.active_object
-        element = tool.Ifc.get_entity(active_obj)
-        if not element:
-            self.report({"ERROR"}, "Selected object is not an IFC element")
-            return {"CANCELLED"}
+    def _execute(self, context):
+        assert (obj := context.active_object)
+        assert (element := tool.Ifc.get_entity(obj))

        relating_type = ifcopenshell.util.element.get_type(element)
        if not relating_type:
-            self.report({"ERROR"}, "Selected object has no associated type")
+            self.report({"ERROR"}, "Active object has no associated type")
            return {"CANCELLED"}

        try:
@@ -157,8 +157,6 @@ class BIM_PT_representations(Panel):
                icon="FILE_REFRESH" if representation["is_active"] else "OUTLINER_DATA_MESH",
                text="",
            )
-            op.should_switch_all_meshes = True
-            op.should_reload = True
            op.ifc_definition_id = representation["id"]
            op.disable_opening_subtractions = False
            row.operator("bim.remove_representation", icon="X", text="").representation_id = representation["id"]
--- a/Show More
+++ b/Show More