diff --git a/build.gradle b/build.gradle
index 92c9bc7cd045cac59f12d0c8eb0562366449fdfb..560fe8042a631eed7cd39e731c22ebea3556dfd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ android {
     }**/
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 24
         targetSdkVersion 31
     }
 
@@ -42,17 +42,17 @@ android {
 }
 
 dependencies {
-    api libs.guardian_jtorctl
+    api orbotlibs.guardian_jtorctl
     implementation(
-            libs.android_shell,
-            libs.androidx_core,
-            libs.androidx_localbroadcast,
-            libs.ipt_proxy,
-            libs.guardian_geoip,
-            libs.guardian_jsocks,
-            libs.portmapper,
-            libs.tor_android,
-            libs.pcap_core,
-            libs.pcap_factory
+            orbotlibs.android_shell,
+            orbotlibs.androidx_core,
+            orbotlibs.androidx_localbroadcast,
+            orbotlibs.ipt_proxy,
+            orbotlibs.guardian_geoip,
+            orbotlibs.guardian_jsocks,
+            orbotlibs.portmapper,
+            orbotlibs.tor_android,
+            orbotlibs.pcap_core,
+            orbotlibs.pcap_factory
     )
 }
diff --git a/src/main/java/org/torproject/android/service/OrbotService.java b/src/main/java/org/torproject/android/service/OrbotService.java
index fb160a843719532fdacb378971fe8bf5d26f623f..26bd1332caa305fe025886f27b095943c508a219 100644
--- a/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/src/main/java/org/torproject/android/service/OrbotService.java
@@ -33,6 +33,7 @@ import android.widget.Toast;
 import net.freehaven.tor.control.TorControlCommands;
 import net.freehaven.tor.control.TorControlConnection;
 
+import org.pcap4j.packet.DnsPacket;
 import org.torproject.android.service.util.CustomTorResourceInstaller;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.util.Utils;
@@ -61,6 +62,7 @@ import java.util.StringTokenizer;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.function.Function;
 
 import IPtProxy.IPtProxy;
 import androidx.annotation.ChecksSdkIntAtLeast;
@@ -73,6 +75,8 @@ public class OrbotService extends VpnService implements OrbotConstants {
 
     public final static String BINARY_TOR_VERSION = TorService.VERSION_NAME;
 
+    public static Function<DnsPacket, DnsPacket> shouldBlock = null;
+
     static final int NOTIFY_ID = 1;
     private static final int ERROR_NOTIFY_ID = 3;
     private static final Uri V3_ONION_SERVICES_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.v3onionservice/v3");
diff --git a/src/main/java/org/torproject/android/service/vpn/DNSResolver.java b/src/main/java/org/torproject/android/service/vpn/DNSResolver.java
index 6478b2882e1bd63ddbf0767f830fdccb60f636e3..8ceb4a724f49347ba4fb75684b6696998d6830b9 100644
--- a/src/main/java/org/torproject/android/service/vpn/DNSResolver.java
+++ b/src/main/java/org/torproject/android/service/vpn/DNSResolver.java
@@ -1,5 +1,11 @@
 package org.torproject.android.service.vpn;
 
+import android.util.Log;
+
+import org.pcap4j.packet.DnsPacket;
+import org.pcap4j.packet.IllegalRawDataException;
+import org.torproject.android.service.OrbotService;
+
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
@@ -14,11 +20,19 @@ public class DNSResolver {
         mPort = localPort;
     }
 
-    public byte[] processDNS(byte[] payload) throws IOException {
+    public DnsPacket processDNS(DnsPacket dnsRequest) throws IOException {
 
         if (mLocalhost == null)
             mLocalhost = InetAddress.getLocalHost();
 
+        if (OrbotService.shouldBlock != null) {
+            DnsPacket blockedResponse = OrbotService.shouldBlock.apply(dnsRequest);
+            if (blockedResponse != null) {
+                return blockedResponse;
+            }
+        }
+
+        byte[] payload = dnsRequest.getRawData();
         DatagramPacket packet = new DatagramPacket(
                 payload, payload.length, mLocalhost, mPort
         );
@@ -30,7 +44,15 @@ public class DNSResolver {
         packet = new DatagramPacket(buf, buf.length);
         datagramSocket.receive(packet);
 
-        return packet.getData();
+        byte[] dnsResp = packet.getData();
+        DnsPacket dnsResponse = null;
+        if (dnsResp != null) {
+            try {
+                dnsResponse = DnsPacket.newPacket(dnsResp, 0, dnsResp.length);
+            } catch (IllegalRawDataException e) {
+                Log.e("DNSResolver", "Can't parse DNS response", e);
+            }
+        }
+        return dnsResponse;
     }
-
 }
diff --git a/src/main/java/org/torproject/android/service/vpn/RequestPacketHandler.java b/src/main/java/org/torproject/android/service/vpn/RequestPacketHandler.java
index 95b7b5808432ded88ae312744988c423c226e469..d733bb44a40002d6da7badfbd4685b490295405c 100644
--- a/src/main/java/org/torproject/android/service/vpn/RequestPacketHandler.java
+++ b/src/main/java/org/torproject/android/service/vpn/RequestPacketHandler.java
@@ -29,14 +29,11 @@ public class RequestPacketHandler implements Runnable {
     public void run() {
             try {
                 UdpPacket udpPacket = (UdpPacket) packet.getPayload();
+                DnsPacket dnsRequest = (DnsPacket) udpPacket.getPayload();
 
-                byte[] dnsResp = mDnsResolver.processDNS(udpPacket.getPayload().getRawData());
-
-                if (dnsResp != null) {
-
-                     DnsPacket dnsRequest = (DnsPacket) udpPacket.getPayload();
-                     DnsPacket dnsResponse = DnsPacket.newPacket(dnsResp, 0, dnsResp.length);
+                DnsPacket dnsResponse = mDnsResolver.processDNS(dnsRequest);
 
+                if (dnsResponse != null) {
                      DnsPacket.Builder dnsBuilder = new DnsPacket.Builder();
                      dnsBuilder.questions(dnsRequest.getHeader().getQuestions());
                      dnsBuilder.id(dnsRequest.getHeader().getId());