diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..a69d2d5
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+**/build
+**/vcpkg
+**/vcpkg_installed
\ No newline at end of file
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index d06af86..5e0d3c4 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -4,7 +4,13 @@
 name: Main Extension Distribution Pipeline
 on:
   push:
+    branches:
+      - main
   pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
   workflow_dispatch:
 
 concurrency:
@@ -14,20 +20,20 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.0.0
+    uses: ./.github/workflows/_extension_distribution.yml
     with:
       duckdb_version: v1.0.0
       extension_name: duckdb-bigquery
-      exclude_archs: "windows_amd64_rtools"
+      exclude_archs: 'linux_amd64_gcc4;linux_arm64;osx_amd64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_rtools'
 
-  duckdb-stable-deploy:
-    name: Deploy extension binaries
-    needs: duckdb-stable-build
-    uses: ./.github/workflows/_extension_deploy.yml
-    secrets: inherit
-    with:
-      duckdb_version: v1.0.0
-      extension_name: duckdb-bigquery
-      exclude_archs: "windows_amd64_rtools"
-      deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
-      deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
\ No newline at end of file
+  # duckdb-stable-deploy:
+  #   name: Deploy extension binaries
+  #   needs: duckdb-stable-build
+  #   uses: ./.github/workflows/_extension_deploy.yml
+  #   secrets: inherit
+  #   with:
+  #     duckdb_version: v1.0.0
+  #     extension_name: duckdb-bigquery
+  #     exclude_archs: 'linux_amd64;linux_amd64_gcc4;linux_arm64;osx_amd64;wasm_mvp;wasm_eh;wasm_threads;windows_amd64;windows_amd64_rtools'
+  #     deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
+  #     deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
\ No newline at end of file
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
new file mode 100644
index 0000000..030f83b
--- /dev/null
+++ b/.github/workflows/_extension_distribution.yml
@@ -0,0 +1,550 @@
+# Reusable workflow for building DuckDB extensions using a standardized environment
+#
+# The workflow:
+#   - builds the extension using the CI workflow from the corresponding DuckDB version
+#   - uploads the extensions as gh actions artifacts in the following format:
+#         <ext_name>-<duckdb_version>-extension-<arch><optional_postfix>
+#
+# note: extensions are simply uploaded to GitHub actions, deploying the extensions is done a separate step. More info on
+#       this can be found in https://github.com/duckdb/extension-template
+
+name: Extension distribution
+on:
+  workflow_call:
+    inputs:
+      # The name with which the extension will be built
+      extension_name:
+        required: true
+        type: string
+      # DuckDB version to build against, should in most cases be identical to
+      duckdb_version:
+        required: true
+        type: string
+      # ';' separated list of architectures to exclude, for example: 'linux_amd64;osx_arm64'
+      exclude_archs:
+        required: false
+        type: string
+        default: ""
+      # Postfix added to artifact names. Can be used to guarantee unique names when this workflow is called multiple times
+      artifact_postfix:
+        required: false
+        type: string
+        default: ""
+      # Override the default vcpkg commit used by this version of DuckDB
+      vcpkg_commit:
+        required: false
+        type: string
+        default: "3d72d8c930e1b6a1b2432b262c61af7d3287dcd0"
+      # Override the default script producing the matrices. Allows specifying custom matrices.
+      matrix_parse_script:
+        required: false
+        type: string
+        default: "./duckdb/scripts/modify_distribution_matrix.py"
+      # Enable building the DuckDB Shell
+      build_duckdb_shell:
+        required: false
+        type: boolean
+        default: true
+      enable_rust:
+        required: false
+        type: boolean
+        default: false
+      # Supply an override repository to build, instead of using the current one
+      override_repository:
+        required: false
+        type: string
+        default: ""
+      # The git ref used for the override_repository
+      override_ref:
+        required: false
+        type: string
+        default: ""
+jobs:
+  generate_matrix:
+    name: Generate matrix
+    runs-on: ubuntu-latest
+    outputs:
+      linux_matrix: ${{ steps.set-matrix-linux.outputs.linux_matrix }}
+      windows_matrix: ${{ steps.set-matrix-windows.outputs.windows_matrix }}
+      osx_matrix: ${{ steps.set-matrix-osx.outputs.osx_matrix }}
+      wasm_matrix: ${{ steps.set-matrix-wasm.outputs.wasm_matrix }}
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout override repository
+        if: ${{inputs.override_repository != ''}}
+        with:
+          repository: ${{ inputs.override_repository }}
+          ref: ${{ inputs.override_ref }}
+          fetch-depth: 0
+          submodules: 'true'
+
+      - uses: actions/checkout@v3
+        name: Checkout current repository
+        if: ${{inputs.override_repository == ''}}
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+
+      - name: Checkout DuckDB to version
+        run: |
+          cd duckdb
+          git checkout ${{ inputs.duckdb_version }}
+
+      - id: parse-matrices
+        run: |
+          python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os linux --output linux_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
+          python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os osx --output osx_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
+          python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os windows --output windows_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
+          python3 ${{ inputs.matrix_parse_script }} --input ./duckdb/.github/config/distribution_matrix.json --select_os wasm --output wasm_matrix.json --exclude "${{ inputs.exclude_archs }}" --pretty
+
+      - id: set-matrix-linux
+        run: |
+          linux_matrix="`cat linux_matrix.json`"
+          echo linux_matrix=$linux_matrix >> $GITHUB_OUTPUT
+          echo `cat $GITHUB_OUTPUT`
+
+      - id: set-matrix-osx
+        run: |
+          osx_matrix="`cat osx_matrix.json`"
+          echo osx_matrix=$osx_matrix >> $GITHUB_OUTPUT
+          echo `cat $GITHUB_OUTPUT`
+
+      - id: set-matrix-windows
+        run: |
+          windows_matrix="`cat windows_matrix.json`"
+          echo windows_matrix=$windows_matrix >> $GITHUB_OUTPUT
+          echo `cat $GITHUB_OUTPUT`
+
+      - id: set-matrix-wasm
+        run: |
+          wasm_matrix="`cat wasm_matrix.json`"
+          echo wasm_matrix=$wasm_matrix >> $GITHUB_OUTPUT
+          echo `cat $GITHUB_OUTPUT`
+
+  linux:
+    name: Linux
+    runs-on: ubuntu-latest
+    needs: generate_matrix
+    if: ${{ needs.generate_matrix.outputs.linux_matrix != '{}' && needs.generate_matrix.outputs.linux_matrix != '' }}
+    strategy:
+      matrix: ${{fromJson(needs.generate_matrix.outputs.linux_matrix)}}
+    env:
+      VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      BUILD_SHELL: ${{ inputs.build_duckdb_shell && '1' || '0' }}
+      DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+      REPO_REF: ${{ inputs.override_ref }}
+      REPO_NAME: ${{ inputs.override_repository != '' && inputs.override_repository || github.repository }}
+      GITHUB_REPOSITORY: ${{ github.repository }}
+      ENABLE_RUST: '0'
+      CC: ${{ matrix.duckdb_arch == 'linux_arm64' && 'aarch64-linux-gnu-gcc' || 'gcc' }}
+      CXX: ${{ matrix.duckdb_arch == 'linux_arm64' && 'aarch64-linux-gnu-g++' || 'g++' }}
+      RUN_TESTS: ${{ matrix.duckdb_arch != 'linux_arm64' && '1' }}
+      AARCH64_CROSS_COMPILE: ${{ matrix.duckdb_arch == 'linux_arm64' && 1 }}
+      CONTAINER: ${{ matrix.container }}
+
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout override repository
+        if: ${{inputs.override_repository != ''}}
+        with:
+          repository: ${{ inputs.override_repository }}
+          ref: ${{ inputs.override_ref }}
+          fetch-depth: 0
+          submodules: 'true'
+
+      - uses: actions/checkout@v3
+        name: Checkout current repository
+        if: ${{inputs.override_repository == ''}}
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+
+      - name: Setup and build extension
+        shell: bash
+        run: |
+          export CURR_DIR=/home/runner/work/${GITHUB_REPOSITORY#*/}/${GITHUB_REPOSITORY#*/}
+          cat > script.sh << ENDOFLINE
+          VCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+          export VCPKG_BUILD=1
+          export DUCKDB_PLATFORM="${DUCKDB_PLATFORM}"
+          export BUILD_SHELL="${BUILD_SHELL}"
+          export VCPKG_TOOLCHAIN_PATH=$CURR_DIR/vcpkg/scripts/buildsystems/vcpkg.cmake
+          set -eo pipefail
+          ###
+          echo "Install required ubuntu packages"
+          cd $CURR_DIR
+          if [ "${DUCKDB_PLATFORM}" != "linux_amd64_gcc4" ]; then
+            apt-get update -y -qq
+            apt-get install -y -qq software-properties-common
+            add-apt-repository ppa:git-core/ppa
+            apt-get update -y -qq
+            apt-get install -y -qq --fix-missing ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client flex bison
+          fi
+          ###
+          echo "Install Git 2.18.5"
+          cd $CURR_DIR
+          if [ "${DUCKDB_PLATFORM}" != "linux_amd64_gcc4" ]; then
+            wget https://github.com/git/git/archive/refs/tags/v2.18.5.tar.gz
+            tar xvf v2.18.5.tar.gz
+            cd git-2.18.5
+            make
+            make prefix=/usr install
+            git --version
+          fi
+          ###
+          echo "Checkout DuckDB to version"
+          cd $CURR_DIR
+          git config --global --add safe.directory $CURR_DIR
+          git config --global --add safe.directory $CURR_DIR/duckdb
+          cd duckdb
+          git checkout ${{ inputs.duckdb_version }}
+          ###
+          echo "Fix CentOS 7 EOL"
+          cd $CURR_DIR
+          if [[ "${DUCKDB_PLATFORM}" = "linux_amd64_gcc4" ]]; then
+            # Workaround the fact that CentOS 7 is EOL
+            sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+            sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+            yum-config-manager --disable centos-sclo-rh
+            yum install epel-release -y curl
+          fi
+          ###
+          echo "Setup ManyLinux2014"
+          cd $CURR_DIR
+          if [ "${DUCKDB_PLATFORM}" = "linux_amd64_gcc4" ]; then
+            ./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh python_alias openssl vcpkg
+          else
+            apt-get update -y -qq
+            apt-get install -y -qq software-properties-common
+            add-apt-repository ppa:git-core/ppa
+            apt-get update -y -qq
+            apt-get install -y -qq --fix-missing ninja-build make gcc-multilib g++-multilib libssl-dev wget openjdk-8-jdk zip maven unixodbc-dev libc6-dev-i386 lib32readline6-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev gettext unzip build-essential checkinstall libffi-dev curl libz-dev openssh-client pkg-config git flex bison
+            wget https://github.com/Kitware/CMake/releases/download/v3.30.0/cmake-3.30.0-linux-x86_64.sh
+            chmod +x cmake-3.30.0-linux-x86_64.sh
+            ./cmake-3.30.0-linux-x86_64.sh --skip-license --prefix=/usr/local
+            cmake --version
+            # echo "Install Python 3.8"
+            # wget https://www.python.org/ftp/python/3.8.17/Python-3.8.17.tgz
+            # tar xvf Python-3.8.17.tgz
+            # cd Python-3.8.17
+            # mkdir -p pythonbin
+            # ./configure --with-ensurepip=install
+            # make -j
+            # make install
+            # python3.8 --version
+            # python3.8 -m pip install pip
+            # python3.8 -m pip install requests awscli
+            echo "Install"
+            if [ -n "${AARCH64_CROSS_COMPILE}" ]; then
+              apt-get install -y -qq gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+            fi
+            git checkout ${{ inputs.git_ref }}
+            #python3 --version
+            #python3 -m pip install pip
+            #python3 -m pip install requests awscli
+            echo "Version Check"
+            ldd --version ldd
+            #python3 --version
+            git --version
+            git log -1 --format=%h
+          fi
+          ###
+          echo "Checkout, again"
+          cd $CURR_DIR
+          if [ -n "${REPO_REF}" ]; then
+            git checkout $REPO_REF
+          fi
+          ###
+          echo "Checkout DuckDB to version"
+          cd $CURR_DIR
+          cd duckdb
+          git checkout ${{ inputs.duckdb_version }}
+          ###
+          echo "Setup vcpkg"
+          cd $CURR_DIR
+          git clone https://github.com/microsoft/vcpkg.git
+          cd vcpkg
+          git fetch
+          git checkout 3d72d8c930e1b6a1b2432b262c61af7d3287dcd0
+          #export CC="${CC}"
+          #export CXX="${CXX}"
+          ./bootstrap-vcpkg.sh
+          ###
+          echo "Setup Rust for manylinux (dtolnay/rust-toolchain doesn't work due to curl being old here)"
+          cd $CURR_DIR
+          if [ -n "${ENABLE_RUST}" ]; then
+            curl --proto "https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+            #PATH="$HOME/.cargo/bin:$PATH"
+            #. "$HOME/.cargo/env"
+          fi
+          # - name: Setup Ccache
+          #   uses: hendrikmuhs/ccache-action@v1.2.11 # Note: pinned due to GLIBC incompatibility in later releases
+          #   continue-on-error: true
+          #   with:
+          #      key: ${{ github.job }}-${{ matrix.duckdb_arch }}
+          ###
+          #echo "Configure OpenSSL for Rust"
+          #cd $CURR_DIR
+          #if [ -n "${ENABLE_RUST}" ]; then
+          OPENSSL_ROOT_DIR=$CURR_DIR/build/release/vcpkg_installed/$VCPKG_TARGET_TRIPLET
+          OPENSSL_DIR=$CURR_DIR/build/release/vcpkg_installed/$VCPKG_TARGET_TRIPLET
+          OPENSSL_INCLUDE_DIR=$CURR_DIR/build/release/vcpkg_installed/$VCPKG_TARGET_TRIPLET/include
+          OPENSSL_USE_STATIC_LIBS=true
+          #fi
+          ###
+          echo "Build extension"
+          cd $CURR_DIR
+          # export VCPKG_TOOLCHAIN_PATH=/home/runner/work/quack/quack/vcpkgs/script/buildsystems/vcpkg.cmake
+          #export CC="${CC}"
+          #export CXX="${CXX}"
+          GEN=ninja make release
+          ###
+          echo "Test extension"
+          cd $CURR_DIR
+          if [ -n "${RUN_TESTS}" ]; then
+            make test
+          fi
+          ENDOFLINE
+          chmod +x script.sh
+          cat script.sh | docker run -i --rm -v /home/runner/work:/home/runner/work --workdir $CURR_DIR $CONTAINER
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}}
+          path: |
+            build/release/extension/${{ inputs.extension_name }}/${{ inputs.extension_name }}.duckdb_extension
+
+  macos:
+    name: MacOS
+    runs-on: macos-latest
+    needs: generate_matrix
+    if: ${{ needs.generate_matrix.outputs.osx_matrix != '{}' && needs.generate_matrix.outputs.osx_matrix != '' }}
+    strategy:
+      matrix: ${{fromJson(needs.generate_matrix.outputs.osx_matrix)}}
+    env:
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
+      OSX_BUILD_ARCH: ${{ matrix.osx_build_arch }}
+      GEN: ninja
+      BUILD_SHELL: ${{ inputs.build_duckdb_shell && '1' || '0' }}
+      DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout override repository
+        if: ${{inputs.override_repository != ''}}
+        with:
+          repository: ${{ inputs.override_repository }}
+          ref: ${{ inputs.override_ref }}
+          fetch-depth: 0
+          submodules: 'true'
+
+      - uses: actions/checkout@v3
+        name: Checkout current repository
+        if: ${{inputs.override_repository == ''}}
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+
+      - name: Install Ninja
+        run: |
+          brew install ninja
+
+      - name: Install bison
+        run: |
+          brew install bison
+
+      - name: Setup Ccache
+        uses: hendrikmuhs/ccache-action@main
+        continue-on-error: true
+        with:
+          key: ${{ github.job }}-${{ matrix.duckdb_arch }}
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Checkout DuckDB to version
+        run: |
+          cd duckdb
+          git checkout ${{ inputs.duckdb_version }}
+
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11.1
+        with:
+          vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}
+
+      - name: Install Rust cross compile dependency
+        if: ${{ inputs.enable_rust && matrix.osx_build_arch == 'x86_64'}}
+        run: |
+          rustup target add x86_64-apple-darwin
+
+      - name: Build extension
+        shell: bash
+        env:
+          DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+        run: |
+          make release
+
+      - name: Test Extension
+        if: ${{ matrix.osx_build_arch == 'x86_64'}}
+        shell: bash
+        run: |
+          make test
+
+      - uses: actions/upload-artifact@v3
+        with:
+          if-no-files-found: error
+          name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}}
+          path: |
+            build/release/extension/${{ inputs.extension_name }}/${{ inputs.extension_name }}.duckdb_extension
+
+  windows:
+    name: Windows
+    runs-on: windows-latest
+    needs: generate_matrix
+    if: ${{ needs.generate_matrix.outputs.windows_matrix != '{}' && needs.generate_matrix.outputs.windows_matrix != '' }}
+    strategy:
+      matrix: ${{fromJson(needs.generate_matrix.outputs.windows_matrix)}}
+    env:
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
+      BUILD_SHELL: ${{ inputs.build_duckdb_shell && '1' || '0' }}
+      DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+      CC: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 'gcc' || '' }}
+      CXX: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 'g++' || '' }}
+
+    steps:
+      - name: Keep \n line endings
+        shell: bash
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+
+      - uses: actions/checkout@v3
+        name: Checkout override repository
+        if: ${{inputs.override_repository != ''}}
+        with:
+          repository: ${{ inputs.override_repository }}
+          ref: ${{ inputs.override_ref }}
+          fetch-depth: 0
+          submodules: 'true'
+
+      - uses: actions/checkout@v3
+        name: Checkout current repository
+        if: ${{inputs.override_repository == ''}}
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Setup Rust
+        if: inputs.enable_rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: r-lib/actions/setup-r@v2
+        if: matrix.duckdb_arch == 'windows_amd64_rtools'
+        with:
+          r-version: 'devel'
+          update-rtools: true
+          rtools-version: '42' # linker bug in 43
+
+      - name: Checkout DuckDB to version
+        run: |
+          cd duckdb
+          git checkout ${{ inputs.duckdb_version }}
+
+      - name: Setup Ccache
+        uses: hendrikmuhs/ccache-action@main
+        continue-on-error: true
+        with:
+          key: ${{ github.job }}-${{ matrix.duckdb_arch }}
+
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11.1
+        with:
+          vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}
+
+      - name: Build & test extension
+        env:
+          DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+          DUCKDB_PLATFORM_RTOOLS: ${{ matrix.duckdb_arch == 'windows_amd64_rtools' && 1 || 0 }}
+        run: |
+          make test_release
+
+      - uses: actions/upload-artifact@v3
+        with:
+          if-no-files-found: error
+          name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}}
+          path: |
+            build/release/extension/${{ inputs.extension_name }}/${{ inputs.extension_name }}.duckdb_extension
+
+  wasm:
+    name: DuckDB-Wasm
+    runs-on: ubuntu-latest
+    needs: generate_matrix
+    if: ${{ needs.generate_matrix.outputs.wasm_matrix != '{}' && needs.generate_matrix.outputs.wasm_matrix != '' }}
+    strategy:
+      matrix: ${{fromJson(needs.generate_matrix.outputs.wasm_matrix)}}
+    env:
+      VCPKG_TARGET_TRIPLET: ${{ matrix.vcpkg_triplet }}
+      VCPKG_TOOLCHAIN_PATH: ${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
+      DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
+
+    steps:
+      - uses: actions/checkout@v3
+        name: Checkout override repository
+        if: ${{inputs.override_repository != ''}}
+        with:
+          repository: ${{ inputs.override_repository }}
+          ref: ${{ inputs.override_ref }}
+          fetch-depth: 0
+          submodules: 'true'
+
+      - uses: actions/checkout@v3
+        name: Checkout current repository
+        if: ${{inputs.override_repository == ''}}
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+
+      - name: Checkout DuckDB to version
+        run: |
+          cd duckdb
+          git checkout ${{ inputs.duckdb_version }}
+
+      - uses: mymindstorm/setup-emsdk@v13
+        with:
+          version: 'latest'
+
+      - name: Setup Rust for cross compilation
+        if: ${{ inputs.enable_rust}}
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: wasm32-unknown-emscripten
+
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11.1
+        with:
+          vcpkgGitCommitId: ${{ inputs.vcpkg_commit }}
+
+      - name: Setup Ccache
+        uses: hendrikmuhs/ccache-action@main
+        continue-on-error: true
+        with:
+          key: ${{ github.job }}-${{ matrix.duckdb_arch }}
+
+      - name: Build Wasm module
+        run: |
+          make ${{ matrix.duckdb_arch }}
+
+      - uses: actions/upload-artifact@v3
+        with:
+          if-no-files-found: error
+          name: ${{ inputs.extension_name }}-${{ inputs.duckdb_version }}-extension-${{matrix.duckdb_arch}}${{inputs.artifact_postfix}}
+          path: |
+            build/${{ matrix.duckdb_arch }}/extension/${{ inputs.extension_name }}/${{ inputs.extension_name }}.duckdb_extension.wasm
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd9834d..a0cb5bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 set(TARGET_NAME duckdb_bigquery)
 project(${TARGET_NAME})
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 
 find_package(google_cloud_cpp_bigquery REQUIRED)
 find_package(google_cloud_cpp_common REQUIRED)
diff --git a/scripts/extension_build/linux/build_with_image.sh b/scripts/extension_build/linux/build_with_image.sh
new file mode 100755
index 0000000..72edaf3
--- /dev/null
+++ b/scripts/extension_build/linux/build_with_image.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -exo pipefail
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+PROJECT_DIR="$SCRIPT_DIR/../../../"
+echo script dir $PROJECT_DIR
+
+
+docker run \
+        -ti \
+       -e VCPKG_TOOLCHAIN_PATH=/usr/app/vcpkg/scripts/buildsystems/vcpkg.cmake \
+       -v $PROJECT_DIR/.git:/usr/app/.git:rw \
+       -v $PROJECT_DIR/src:/usr/app/src:rw \
+       -v $PROJECT_DIR/duckdb:/usr/app/duckdb:rw \
+       -v $PROJECT_DIR/extension-ci-tools:/usr/app/extension-ci-tools:rw \
+       -v $PROJECT_DIR/vcpkg/build:/usr/app/vcpkg/build:rw \
+       -v $PROJECT_DIR/vcpkg/packages:/usr/app/vcpkg/packages:rw \
+       -v $PROJECT_DIR/vcpkg/downloads:/usr/app/vcpkg/downloads:rw \
+       -v $PROJECT_DIR/vcpkg/buildtrees:/usr/app/vcpkg/buildtrees:rw \
+       -v $PROJECT_DIR/vcpkg_installed:/usr/app/vcpkg_installed:rw \
+       -v $PROJECT_DIR/vcpkg.json:/usr/app/vcpkg.json \
+       -v $PROJECT_DIR/CMakeLists.txt:/usr/app/CMakeLists.txt \
+       -v $PROJECT_DIR/extension_config.cmake:/usr/app/extension_config.cmake \
+       -v $PROJECT_DIR/Makefile:/usr/app/Makefile \
+       duckdb_extension_build:master
\ No newline at end of file
diff --git a/scripts/extension_build/linux/build_with_image_arm.sh b/scripts/extension_build/linux/build_with_image_arm.sh
new file mode 100755
index 0000000..845fcca
--- /dev/null
+++ b/scripts/extension_build/linux/build_with_image_arm.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+set -exo pipefail
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+PROJECT_DIR="$SCRIPT_DIR/../../../"
+echo script dir $PROJECT_DIR
+
+
+docker run \
+        -ti \
+        -e VCPKG_FORCE_SYSTEM_BINARIES=1 \
+        -e VCPKG_TOOLCHAIN_PATH=/usr/app/vcpkg/scripts/buildsystems/vcpkg.cmake \
+        -v $PROJECT_DIR/.git:/usr/app/.git:rw \
+        -v $PROJECT_DIR/build_docker:/usr/app/build:rw \
+        -v $PROJECT_DIR/src:/usr/app/src \
+        -v $PROJECT_DIR/test:/usr/app/test \
+        -v $PROJECT_DIR/duckdb:/usr/app/duckdb:rw \
+        -v $PROJECT_DIR/extension-ci-tools:/usr/app/extension-ci-tools:rw \
+        -v $PROJECT_DIR/vcpkg/build:/usr/app/vcpkg/build:rw \
+        -v $PROJECT_DIR/vcpkg/packages:/usr/app/vcpkg/packages:rw \
+        -v $PROJECT_DIR/vcpkg/downloads:/usr/app/vcpkg/downloads:rw \
+        -v $PROJECT_DIR/vcpkg/buildtrees:/usr/app/vcpkg/buildtrees:rw \
+        -v $PROJECT_DIR/vcpkg/ports:/usr/app/vcpkg/ports:rw \
+        -v $PROJECT_DIR/vcpkg/installed:/usr/app/vcpkg/installed:rw \
+        -v $PROJECT_DIR/vcpkg.json:/usr/app/vcpkg.json \
+        -v $PROJECT_DIR/CMakeLists.txt:/usr/app/CMakeLists.txt \
+        -v $PROJECT_DIR/extension_config.cmake:/usr/app/extension_config.cmake \
+        -v $PROJECT_DIR/Makefile:/usr/app/Makefile \
+        duckdb_extension_build:arm64
diff --git a/scripts/extension_build/linux/entrypoint.sh b/scripts/extension_build/linux/entrypoint.sh
new file mode 100755
index 0000000..eaa6297
--- /dev/null
+++ b/scripts/extension_build/linux/entrypoint.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -eo pipefail
+
+# Build the extension
+cd /usr/app 
+GEN=ninja make release
+
+# Test the extension
+if [ -n "${RUN_TESTS}" ]; then \
+    cd /workspace && \
+    make test; \
+fi
\ No newline at end of file
diff --git a/scripts/extension_build/linux/extension_builder_image.sh b/scripts/extension_build/linux/extension_builder_image.sh
new file mode 100755
index 0000000..8462b6b
--- /dev/null
+++ b/scripts/extension_build/linux/extension_builder_image.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+set -eo pipefail
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+PROJECT_DIR="$SCRIPT_DIR/../../../"
+
+
+# Define variables from the matrix and inputs
+VCPKG_TARGET_TRIPLET=x64-linux
+DUCKDB_PLATFORM=linux_amd64
+ENABLE_RUST=0
+CC=$([[ $DUCKDB_PLATFORM == "linux_arm64" ]] && echo "aarch64-linux-gnu-gcc" || echo "gcc")
+CXX=$([[ $duckdb_platform == "linux_arm64" ]] && echo "aarch64-linux-gnu-g++" || echo "g++")
+RUN_TESTS=$([[ $duckdb_platform != "linux_arm64" ]] && echo "1" || echo "")
+AARCH64_CROSS_COMPILE=$([[ $duckdb_platform == "linux_arm64" ]] && echo "1" || echo "")
+
+# Build the docker image
+DOCKER_BUILDKIT=1 docker buildx build \
+    --platform linux/amd64 \
+    --build-arg VCPKG_BUILD=$VCPKG_BUILD \
+    --build-arg PROJECT_DIR=$PROJECT_DIR \
+    --build-arg VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET \
+    --build-arg VCPKG_TOOLCHAIN_PATH=$VCPKG_TOOLCHAIN_PATH \
+    --build-arg DUCKDB_PLATFORM=$DUCKDB_PLATFORM \
+    --build-arg ENABLE_RUST=$ENABLE_RUST \
+    --build-arg CC=$CC \
+    --build-arg CXX=$CCX \
+    --build-arg RUN_TESTS=$RUN_TESTS \
+    --build-arg AARCH64_CROSS_COMPILE=$AARCH64_CROSS_COMPILE \
+    --load \
+    -t duckdb_extension_build:master \
+    -f $SCRIPT_DIR/linux.Dockerfile $PROJECT_DIR
+
+# Define variables from the matrix and inputs
+VCPKG_TARGET_TRIPLET=x64-linux
+DUCKDB_PLATFORM=linux_amd64
+ENABLE_RUST=0
+CC=$([[ $DUCKDB_PLATFORM == "linux_arm64" ]] && echo "aarch64-linux-gnu-gcc" || echo "gcc")
+CXX=$([[ $duckdb_platform == "linux_arm64" ]] && echo "aarch64-linux-gnu-g++" || echo "g++")
+RUN_TESTS=$([[ $duckdb_platform != "linux_arm64" ]] && echo "1" || echo "")
+AARCH64_CROSS_COMPILE=$([[ $duckdb_platform == "linux_arm64" ]] && echo "1" || echo "")    
+    
+# Build the docker image
+DOCKER_BUILDKIT=1 docker buildx build \
+    --platform linux/amd64 \
+    --build-arg VCPKG_BUILD=$VCPKG_BUILD \
+    --build-arg PROJECT_DIR=$PROJECT_DIR \
+    --build-arg VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET \
+    --build-arg VCPKG_TOOLCHAIN_PATH=$VCPKG_TOOLCHAIN_PATH \
+    --build-arg DUCKDB_PLATFORM=$DUCKDB_PLATFORM \
+    --build-arg ENABLE_RUST=$ENABLE_RUST \
+    --build-arg CC=$CC \
+    --build-arg CXX=$CCX \
+    --build-arg RUN_TESTS=$RUN_TESTS \
+    --build-arg AARCH64_CROSS_COMPILE=$AARCH64_CROSS_COMPILE \
+    --build-arg CONTAINER=$CONTAINER \
+    --load \
+    -t duckdb_extension_build:arm64 \
+    -f $SCRIPT_DIR/linux.Dockerfile $PROJECT_DIR
diff --git a/scripts/extension_build/linux/extension_builder_image_arm.sh b/scripts/extension_build/linux/extension_builder_image_arm.sh
new file mode 100755
index 0000000..bc3c1b0
--- /dev/null
+++ b/scripts/extension_build/linux/extension_builder_image_arm.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -eo pipefail
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+PROJECT_DIR="$SCRIPT_DIR/../../../"
+
+
+
+# Define variables from the matrix and inputs
+VCPKG_TARGET_TRIPLET=arm64-linux
+DUCKDB_PLATFORM=linux_arm64
+ENABLE_RUST=0
+CC=$([[ $DUCKDB_PLATFORM == "linux_arm64" ]] && echo "aarch64-linux-gnu-gcc" || echo "gcc")
+CXX=$([[ $DUCKDB_PLATFORM == "linux_arm64" ]] && echo "aarch64-linux-gnu-g++" || echo "g++")
+RUN_TESTS=$([[ $DUCKDB_PLATFORM != "linux_arm64" ]] && echo "1" || echo "")
+AARCH64_CROSS_COMPILE=$([[ $DUCKDB_PLATFORM == "linux_arm64" ]] && echo "1" || echo "")  
+
+echo "AARCH64_CROSS_COMPILE: $AARCH64_CROSS_COMPILE"
+    
+# Build the docker image
+DOCKER_BUILDKIT=1 docker buildx build \
+    --platform linux/arm64 \
+    --build-arg VCPKG_BUILD=$VCPKG_BUILD \
+    --build-arg PROJECT_DIR=$PROJECT_DIR \
+    --build-arg VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET \
+    --build-arg VCPKG_TOOLCHAIN_PATH=$VCPKG_TOOLCHAIN_PATH \
+    --build-arg DUCKDB_PLATFORM=$DUCKDB_PLATFORM \
+    --build-arg ENABLE_RUST=$ENABLE_RUST \
+    --build-arg CC=$CC \
+    --build-arg CXX=$CCX \
+    --build-arg RUN_TESTS=$RUN_TESTS \
+    --build-arg AARCH64_CROSS_COMPILE=$AARCH64_CROSS_COMPILE \
+    --load \
+    -t duckdb_extension_build:arm64 \
+    -f $SCRIPT_DIR/linux.Dockerfile $PROJECT_DIR
diff --git a/scripts/extension_build/linux/linux.Dockerfile b/scripts/extension_build/linux/linux.Dockerfile
new file mode 100644
index 0000000..19f0a91
--- /dev/null
+++ b/scripts/extension_build/linux/linux.Dockerfile
@@ -0,0 +1,129 @@
+# Use an official Ubuntu as a parent image
+FROM ubuntu:24.04
+
+# Define build arguments
+ARG VCPKG_TARGET_TRIPLET
+ARG VCPKG_TOOLCHAIN_PATH=/usr/app/vcpkg/scripts/buildsystems/vcpkg.cmake
+ARG DUCKDB_PLATFORM
+ARG ENABLE_RUST=0
+ARG CC
+ARG CXX
+ARG RUN_TESTS
+ARG AARCH64_CROSS_COMPILE
+ARG PROJECT_DIR
+ARG BUILD_SHELL=0
+
+# Set environment variables using the build arguments
+ENV VCPKG_TARGET_TRIPLET=$VCPKG_TARGET_TRIPLET
+ENV VCPKG_TOOLCHAIN_PATH=$VCPKG_TOOLCHAIN_PATH
+ENV BUILD_SHELL=$BUILD_SHELL
+ENV DUCKDB_PLATFORM=$DUCKDB_PLATFORM
+ENV ENABLE_RUST=$ENABLE_RUST
+ENV CC=$CC
+ENV CXX=$CXX
+ENV RUN_TESTS=$RUN_TESTS
+ENV AARCH64_CROSS_COMPILE=$AARCH64_CROSS_COMPILE
+
+# Install necessary packages
+RUN apt-get update -y -qq && \
+    apt-get install -y -qq software-properties-common && \
+    add-apt-repository ppa:git-core/ppa && \
+    apt-get update -y -qq && \
+    apt-get install -y -qq --fix-missing \
+    ninja-build \
+    make \
+    libssl-dev \
+    wget \
+    openjdk-8-jdk \
+    zip \
+    maven \
+    unixodbc-dev \
+    libssl-dev \
+    libcurl4-gnutls-dev \
+    libexpat1-dev \
+    gettext \
+    unzip \
+    build-essential \
+    checkinstall \
+    libffi-dev \
+    curl \
+    libz-dev \
+    openssh-client \
+    flex \
+    bison \
+    git \
+    pkg-config && \
+    if [ "${DUCKDB_PLATFORM}" = "linux_arm64" ]; then \
+    export CMAKE_ARCH=aarch64; \
+    else \
+    export CMAKE_ARCH=x86_64; \
+    fi && \
+    wget https://github.com/Kitware/CMake/releases/download/v3.30.0/cmake-3.30.0-linux-$CMAKE_ARCH.sh && \
+    chmod +x cmake-3.30.0-linux-$CMAKE_ARCH.sh && \
+    ./cmake-3.30.0-linux-$CMAKE_ARCH.sh --skip-license --prefix=/usr/local && \
+    cmake --version
+
+RUN if [ "$AARCH64_CROSS_COMPILE" = "1" ]; then \
+apt-get install -y -qq \
+gcc-aarch64-linux-gnu \
+g++-aarch64-linux-gnu; \
+else \
+apt-get install -y -qq --fix-missing \
+gcc-multilib \
+g++-multilib \ 
+libc6-dev-i386 \
+lib32readline6-dev; \
+fi
+    
+
+# Set the working directory
+WORKDIR /usr/app
+
+# Clone the vcpkg repository if vcpkg is not copied in /usr/app/vcpkg directory
+RUN if [ ! -d "/usr/app/vcpkg" ]; then \
+    git clone https://github.com/microsoft/vcpkg.git && \
+    cd vcpkg && \
+    git fetch && \
+    git checkout master; \
+    fi
+
+# Bootstrap vcpkg
+RUN cd /usr/app && \
+     export VCPKG_FORCE_SYSTEM_BINARIES=1 && \
+    ./vcpkg/bootstrap-vcpkg.sh
+
+# Clone and setup the DuckDB repository
+# RUN git clone https://github.com/duckdb/duckdb.git && \
+#     cd duckdb && \
+#     git checkout ${REPO_REF}
+
+# Install specific version of Git
+# RUN if [ "${DUCKDB_PLATFORM}" != "linux_amd64_gcc4" ]; then \
+#     wget https://github.com/git/git/archive/refs/tags/v2.45.2.tar.gz && \
+#     tar xvf v2.45.2.tar.gz && \
+#     cd git-2.45.2 && \
+#     make && \
+#     make prefix=/usr install && \
+#     git --version && \
+#     cd ..; \
+#     fi
+
+# Setup ManyLinux2014 if necessary
+RUN if [ "${DUCKDB_PLATFORM}" = "linux_amd64_gcc4" ]; then \
+    ./duckdb/scripts/setup_manylinux2014.sh general aws-cli ccache ssh python_alias openssl vcpkg; \
+    fi
+
+# Install Rust if necessary
+RUN if [ "${ENABLE_RUST}" != "0" ]; then \
+    curl --proto "https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y; \
+    fi
+
+# Checkout the required git reference
+RUN if [ -n "${REPO_REF}" ]; then \
+    cd duckdb && \
+    git checkout ${REPO_REF}; \
+    fi
+
+COPY scripts/extension_build/linux/entrypoint.sh /usr/app/scripts/extension_build/linux/entrypoint.sh
+
+CMD ["/usr/app/scripts/extension_build/linux/entrypoint.sh"]
\ No newline at end of file
diff --git a/src/bigquery_execute.cpp b/src/bigquery_execute.cpp
index 62baf35..751c64f 100644
--- a/src/bigquery_execute.cpp
+++ b/src/bigquery_execute.cpp
@@ -1,12 +1,12 @@
 #include "duckdb.hpp"
 
-#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
-#include "bigquery_scanner.hpp"
 #include "duckdb/main/database_manager.hpp"
+//#include "duckdb/parser/parsed_data/create_table_function_info.hpp"
 #include "duckdb/main/attached_database.hpp"
+#include "bigquery_scanner.hpp"
+//#include "bigquery_connection.hpp"
 #include "storage/bigquery_catalog.hpp"
 #include "storage/bigquery_transaction.hpp"
-#include "bigquery_connection.hpp"
 
 namespace duckdb {
 
@@ -22,8 +22,8 @@ struct BigQueryExecuteBindData : public TableFunctionData {
 static duckdb::unique_ptr<FunctionData> BigQueryExecuteBind(ClientContext &context, TableFunctionBindInput &input,
                                                          vector<LogicalType> &return_types, vector<string> &names) {
 
-	return_types.emplace_back(LogicalType::BOOLEAN);
-	names.emplace_back("Success");
+	 return_types.emplace_back(LogicalType(LogicalTypeId::BOOLEAN));
+	 names.emplace_back("Success");
 
 	// look up the database to query
 	auto db_name = input.inputs[0].GetValue<string>();
diff --git a/src/bigquery_scanner.cpp b/src/bigquery_scanner.cpp
index 1b038e6..3956788 100644
--- a/src/bigquery_scanner.cpp
+++ b/src/bigquery_scanner.cpp
@@ -197,6 +197,8 @@ static void BigQueryScan(ClientContext &context, TableFunctionInput &data, DataC
 			 first_min,
 			 static_cast<int64_t>(STANDARD_VECTOR_SIZE));
 
+		D_ASSERT(record_batch->num_columns() == output.ColumnCount());
+
 	  //Printer::Print("max_rows: " + to_string(max_rows));
 
 	  //Printer::Print("Column count : " + to_string(output.ColumnCount()));
diff --git a/src/bigquery_utils.cpp b/src/bigquery_utils.cpp
index cc2ee47..eb5ffff 100644
--- a/src/bigquery_utils.cpp
+++ b/src/bigquery_utils.cpp
@@ -110,7 +110,8 @@ namespace duckdb {
 };
 
 std::string GetAccessToken(const string &service_account_json) {
-	google::cloud::StatusOr<std::__1::shared_ptr<google::cloud::storage::oauth2::Credentials>>  credentials;
+	google::cloud::StatusOr<std::shared_ptr<google::cloud::storage::oauth2::Credentials>> credentials;
+
 	if(service_account_json.empty()) {
 		credentials = gcpoauth2::GoogleDefaultCredentials();
 	} else {
diff --git a/vcpkg.json b/vcpkg.json
index de84aa8..3fdef39 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -6,7 +6,7 @@
     {
       "name": "google-cloud-cpp",
       "default-features": false,
-      "features": ["bigquery", "grpc-common", "storage"]
+      "features": ["bigquery", "storage"]
     },
     "cpprestsdk",
     "nlohmann-json",