diff --git a/Apps/AdvanceBlockingApp/App.cs b/Apps/AdvanceBlockingApp/App.cs
index 382a5ba9..24a0303d 100644
--- a/Apps/AdvanceBlockingApp/App.cs
+++ b/Apps/AdvanceBlockingApp/App.cs
@@ -37,7 +37,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace AdvanceBlocking
 {
-    public sealed class App : IDnsAuthoritativeRequestHandler
+    public sealed class App : IDnsApplication, IDnsAuthoritativeRequestHandler
     {
         #region variables
 
diff --git a/Apps/DropRequestsApp/App.cs b/Apps/DropRequestsApp/App.cs
index 4b1b80df..c09664d3 100644
--- a/Apps/DropRequestsApp/App.cs
+++ b/Apps/DropRequestsApp/App.cs
@@ -28,7 +28,7 @@ using TechnitiumLibrary.Net.Dns;
 
 namespace DropRequests
 {
-    public class App : IDnsRequestController
+    public class App : IDnsApplication, IDnsRequestController
     {
         #region variables
 
diff --git a/Apps/FailoverApp/Address.cs b/Apps/FailoverApp/Address.cs
index 0e08499d..5311f4c6 100644
--- a/Apps/FailoverApp/Address.cs
+++ b/Apps/FailoverApp/Address.cs
@@ -37,7 +37,7 @@ namespace Failover
         Secondary = 2
     }
 
-    public class Address : IDnsAppRecordRequestHandler
+    public class Address : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/FailoverApp/CNAME.cs b/Apps/FailoverApp/CNAME.cs
index 87fd4bf3..934cc01b 100644
--- a/Apps/FailoverApp/CNAME.cs
+++ b/Apps/FailoverApp/CNAME.cs
@@ -28,7 +28,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace Failover
 {
-    public class CNAME : IDnsAppRecordRequestHandler
+    public class CNAME : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/GeoContinentApp/Address.cs b/Apps/GeoContinentApp/Address.cs
index 42a26aaa..a2e1c544 100644
--- a/Apps/GeoContinentApp/Address.cs
+++ b/Apps/GeoContinentApp/Address.cs
@@ -30,7 +30,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace GeoContinent
 {
-    public sealed class Address : IDnsAppRecordRequestHandler
+    public sealed class Address : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/GeoContinentApp/CNAME.cs b/Apps/GeoContinentApp/CNAME.cs
index 33bc17ff..cfbd7d34 100644
--- a/Apps/GeoContinentApp/CNAME.cs
+++ b/Apps/GeoContinentApp/CNAME.cs
@@ -29,7 +29,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace GeoContinent
 {
-    public sealed class CNAME : IDnsAppRecordRequestHandler
+    public sealed class CNAME : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/GeoCountryApp/Address.cs b/Apps/GeoCountryApp/Address.cs
index ef8a56f4..0d8ef0f1 100644
--- a/Apps/GeoCountryApp/Address.cs
+++ b/Apps/GeoCountryApp/Address.cs
@@ -30,7 +30,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace GeoCountry
 {
-    public sealed class Address : IDnsAppRecordRequestHandler
+    public sealed class Address : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/GeoCountryApp/CNAME.cs b/Apps/GeoCountryApp/CNAME.cs
index 9728a826..b0b4201e 100644
--- a/Apps/GeoCountryApp/CNAME.cs
+++ b/Apps/GeoCountryApp/CNAME.cs
@@ -29,7 +29,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace GeoCountry
 {
-    public sealed class CNAME : IDnsAppRecordRequestHandler
+    public sealed class CNAME : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/GeoDistanceApp/Address.cs b/Apps/GeoDistanceApp/Address.cs
index 5568d95f..1187a215 100644
--- a/Apps/GeoDistanceApp/Address.cs
+++ b/Apps/GeoDistanceApp/Address.cs
@@ -32,7 +32,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace GeoDistance
 {
-    public sealed class Address : IDnsAppRecordRequestHandler
+    public sealed class Address : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/GeoDistanceApp/CNAME.cs b/Apps/GeoDistanceApp/CNAME.cs
index d09ce216..46c14e48 100644
--- a/Apps/GeoDistanceApp/CNAME.cs
+++ b/Apps/GeoDistanceApp/CNAME.cs
@@ -30,7 +30,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace GeoDistance
 {
-    public sealed class CNAME : IDnsAppRecordRequestHandler
+    public sealed class CNAME : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region variables
 
diff --git a/Apps/NxDomainApp/App.cs b/Apps/NxDomainApp/App.cs
index cb46ee3a..151e8a97 100644
--- a/Apps/NxDomainApp/App.cs
+++ b/Apps/NxDomainApp/App.cs
@@ -27,7 +27,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace NxDomain
 {
-    public class App : IDnsAuthoritativeRequestHandler
+    public class App : IDnsApplication, IDnsAuthoritativeRequestHandler
     {
         #region variables
 
diff --git a/Apps/QueryLogsSqliteApp/App.cs b/Apps/QueryLogsSqliteApp/App.cs
index e6bb87b9..df53d774 100644
--- a/Apps/QueryLogsSqliteApp/App.cs
+++ b/Apps/QueryLogsSqliteApp/App.cs
@@ -31,7 +31,7 @@ using TechnitiumLibrary.Net.Dns;
 
 namespace QueryLogsSqlite
 {
-    public class App : IDnsLogger
+    public class App : IDnsApplication, IDnsQueryLogger
     {
         #region variables
 
diff --git a/Apps/SplitHorizonApp/SimpleAddress.cs b/Apps/SplitHorizonApp/SimpleAddress.cs
index fb308c06..1d67d491 100644
--- a/Apps/SplitHorizonApp/SimpleAddress.cs
+++ b/Apps/SplitHorizonApp/SimpleAddress.cs
@@ -30,7 +30,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace SplitHorizon
 {
-    public class SimpleAddress : IDnsAppRecordRequestHandler
+    public class SimpleAddress : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region IDisposable
 
diff --git a/Apps/SplitHorizonApp/SimpleCNAME.cs b/Apps/SplitHorizonApp/SimpleCNAME.cs
index 39707e3b..635ad41e 100644
--- a/Apps/SplitHorizonApp/SimpleCNAME.cs
+++ b/Apps/SplitHorizonApp/SimpleCNAME.cs
@@ -29,7 +29,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace SplitHorizon
 {
-    public class SimpleCNAME : IDnsAppRecordRequestHandler
+    public class SimpleCNAME : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region IDisposable
 
diff --git a/Apps/WhatIsMyDnsApp/App.cs b/Apps/WhatIsMyDnsApp/App.cs
index 037321c3..558f8b96 100644
--- a/Apps/WhatIsMyDnsApp/App.cs
+++ b/Apps/WhatIsMyDnsApp/App.cs
@@ -26,7 +26,7 @@ using TechnitiumLibrary.Net.Dns.ResourceRecords;
 
 namespace WhatIsMyDns
 {
-    public class App : IDnsAppRecordRequestHandler
+    public class App : IDnsApplication, IDnsAppRecordRequestHandler
     {
         #region IDisposable