diff --git a/Gemfile b/Gemfile
index 16b8678b0..c7006f14d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,7 @@ gem "erubis"
 gem "dm-migrations"
 gem "msfrpc-client"
 gem "rubydns"
+gem "sourcify"
 
 # notifications
 gem "twitter"
diff --git a/core/loader.rb b/core/loader.rb
index 01e284326..936745e04 100644
--- a/core/loader.rb
+++ b/core/loader.rb
@@ -16,6 +16,7 @@ require 'base64'
 require 'xmlrpc/client'
 require 'openssl'
 require 'rubydns'
+require 'sourcify'
 
 # @note Include the filters
 require 'core/filters'
diff --git a/extensions/dns/dns.rb b/extensions/dns/dns.rb
index 9832961f2..4ff25a638 100644
--- a/extensions/dns/dns.rb
+++ b/extensions/dns/dns.rb
@@ -28,7 +28,6 @@ module DNS
         RubyDNS::run_server(:listen => [[:udp, address, port]]) do
           server = self
           BeEF::Extension::DNS::DNS.instance.instance_eval { @server = server }
-          BeEF::Extension::DNS::DNS.instance.load_rules
 
           # Pass unmatched queries upstream to root nameservers
           otherwise do |transaction|
diff --git a/extensions/dns/model.rb b/extensions/dns/model.rb
index 4c171e483..41068c4da 100644
--- a/extensions/dns/model.rb
+++ b/extensions/dns/model.rb
@@ -11,11 +11,11 @@ module Models
 
     include DataMapper::Resource
 
-    property :name,  String
-    property :type,  String
-    property :value, String
+    storage_names[:default] = 'extensions_dns'
 
-    property :id, Serial, :key => true
+    property :id, Serial
+    property :pattern, Object
+    property :block, Text
 
   end
 
diff --git a/extensions/dns/ruby/rubydns.rb b/extensions/dns/ruby/rubydns.rb
index b7a4bdf4c..25109dd36 100644
--- a/extensions/dns/ruby/rubydns.rb
+++ b/extensions/dns/ruby/rubydns.rb
@@ -3,10 +3,6 @@
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
-
-require 'rubygems'
-require 'rubydns'
-
 module RubyDNS
 
   # Behaves exactly the same, except without any logger output
@@ -26,6 +22,7 @@ module RubyDNS
         end
       end
 
+      server.load_rules
       server.fire(:start)
     end
 
@@ -51,12 +48,41 @@ module RubyDNS
 
     # Now uses an 'id' parameter to uniquely identify rules
     def match(id, *pattern, block)
-      @rules << Rule.new(id, pattern, block)
+      catch :match do
+        # Check if rule is already present
+        BeEF::Core::Models::DNS.each { |rule| throw :match if rule.id == id }
+
+        @rules << Rule.new(id, pattern, block)
+
+        # Add new rule to database
+        BeEF::Core::Models::DNS.create(
+          :id => id,
+          :pattern => pattern,
+          :block => block.to_source
+        )
+      end
     end
 
     # New method that removes a rule given its id
     def remove_rule(id)
       @rules.delete_if { |rule| rule.id == id }
+
+      begin
+        BeEF::Core::Models::DNS.get!(id).destroy
+      rescue DataMapper::ObjectNotFoundError => e
+        @logger.error(e.message)
+      end
+    end
+
+    # New method that loads all rules from the database at server startup
+    def load_rules
+      BeEF::Core::Models::DNS.each do |rule|
+        id = rule.id
+        pattern = rule.pattern
+        block = eval rule.block
+
+        @rules << Rule.new(id, pattern, block)
+      end
     end
 
   end
@@ -72,9 +98,9 @@ module RubyDNS
         raise ArgumentError, "Could not instantiate resource #{resource_class}!"
       end
 			
-      @server.logger.debug "Resource class: #{resource_class.inspect}"
+      @server.logger.debug("Resource class: #{resource_class.inspect}")
       resource = resource_class.new(*data)
-      @server.logger.debug "Resource: #{resource.inspect}"
+      @server.logger.debug("Resource: #{resource.inspect}")
 			
       append!(resource, options)
     end