diff --git a/.github/workflows/ci_pr_tests.yml b/.github/workflows/ci_pr_tests.yml
index 8b8484a..062dd5b 100644
--- a/.github/workflows/ci_pr_tests.yml
+++ b/.github/workflows/ci_pr_tests.yml
@@ -14,7 +14,7 @@ jobs:
   test:
     strategy:
       matrix:
-        pg: [15]
+        pg: [13, 14, 15, 16, 17]
     name: 🐘 Tests - PG ${{ matrix.pg }}
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -24,9 +24,10 @@ jobs:
         run: pg-start ${{ matrix.pg }}
       - name: Check out the repo - PG ${{ matrix.pg }}
         uses: actions/checkout@v4
-      - name: 🧪 Test on PG ${{ matrix.pg }}
+      - name: 🧪 Test - PG ${{ matrix.pg }}
         run: pgrx-build-test
       - name: 📎 Clippy - PG ${{ matrix.pg }}
+        if: ${{ matrix.pg == '17' }}
         run: cargo clippy --color always -- --deny warnings --allow unexpected-cfgs
   format:
     name: 🕵️ Format
diff --git a/Cargo.toml b/Cargo.toml
index 17099a6..1a3507f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,16 +11,20 @@ name = "pgrx_embed_pg_no_seqscan"
 path = "./src/bin/pgrx_embed.rs"
 
 [features]
-default = ["pg15"]
+default = ["pg17"]
+pg13 = ["pgrx/pg13", "pgrx-tests/pg13" ]
+pg14 = ["pgrx/pg14", "pgrx-tests/pg14" ]
 pg15 = ["pgrx/pg15", "pgrx-tests/pg15" ]
+pg16 = ["pgrx/pg16", "pgrx-tests/pg16" ]
+pg17 = ["pgrx/pg17", "pgrx-tests/pg17" ]
 pg_test = []
 
 [dependencies]
-pgrx = "=0.12.9"
+pgrx = "=0.14.3"
 regex = "1.11.1"
 
 [dev-dependencies]
-pgrx-tests = "=0.12.9"
+pgrx-tests = "=0.14.3"
 
 [profile.dev]
 panic = "unwind"
@@ -32,4 +36,4 @@ lto = "fat"
 codegen-units = 1
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(pgrx_embed)'] }
\ No newline at end of file
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(pgrx_embed)'] }
diff --git a/src/hooks.rs b/src/hooks.rs
index 88c955d..c949da6 100644
--- a/src/hooks.rs
+++ b/src/hooks.rs
@@ -139,7 +139,11 @@ Query: {}
         }
 
         let seq_scan: &mut SeqScan = &mut *(node as *mut SeqScan);
+        #[cfg(not(any(feature = "pg13", feature = "pg14")))]
         let table_oid = scanned_table(seq_scan.scan.scanrelid, rtables).unwrap();
+        #[cfg(any(feature = "pg13", feature = "pg14"))]
+        let table_oid = scanned_table(seq_scan.scanrelid, rtables).unwrap();
+
         if self.is_sequence(table_oid) {
             return;
         }
@@ -244,8 +248,13 @@ impl PgHooks for NoSeqscanHooks {
                 CmdType::CMD_SELECT
                 | CmdType::CMD_UPDATE
                 | CmdType::CMD_INSERT
-                | CmdType::CMD_DELETE
-                | CmdType::CMD_MERGE => {
+                | CmdType::CMD_DELETE => {
+                    if !is_explain_stmt && !self.is_ignored_user(unsafe { current_username() }) {
+                        self.check_query(&query_desc);
+                    }
+                }
+                #[cfg(not(any(feature = "pg13", feature = "pg14")))]
+                CmdType::CMD_MERGE => {
                     if !is_explain_stmt && !self.is_ignored_user(unsafe { current_username() }) {
                         self.check_query(&query_desc);
                     }
diff --git a/src/lib.rs b/src/lib.rs
index a6faa11..343cd48 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@ use pgrx::prelude::*;
 ::pgrx::pg_module_magic!();
 
 #[pg_guard]
-pub extern "C" fn _PG_init() {
+pub extern "C-unwind" fn _PG_init() {
     unsafe { hooks::init_hooks() };
     guc::register_gucs();
 }