diff --git a/lib/metasploit/framework/data_service/proxy/payload_data_proxy.rb b/lib/metasploit/framework/data_service/proxy/payload_data_proxy.rb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/metasploit/framework/data_service/remote/http/remote_proxy_data_service.rb b/lib/metasploit/framework/data_service/remote/http/remote_proxy_data_service.rb
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/msf/core/db_manager/payload.rb b/lib/msf/core/db_manager/payload.rb
index cd2ea3b543..8ecbc1a7f0 100644
--- a/lib/msf/core/db_manager/payload.rb
+++ b/lib/msf/core/db_manager/payload.rb
@@ -1,15 +1,35 @@
 module Msf::DBManager::Payload
 
   def create_payload(opts)
-    'MOCK: Payload created!'
+    Mdm::Payload.create(opts)
   end
 
   def get_payload(opts)
-    'MOCK: Payload retrieved!'
+    if opts.kind_of? Mdm::Payload
+      return opts
+    else
+      uuid = opts[:uuid] || return
+    end
+    ::ActiveRecord::Base.connection_pool.with_connection do
+      return Mdm::Payload.find_by(uuid: uuid)
+    end
+  end
+
+  def find_or_create_payload(opts)
+    payload = get_payload(opts.clone)
+    return payload unless payload.nil?
+
+    create_payload(opts)
   end
 
   def update_payload(opts)
-    'MOCK: Payload updated!'
+    ::ActiveRecord::Base.connection_pool.with_connection do
+      wspace = Msf::Util::DBManager.process_opts_workspace(opts, framework, false)
+      opts[:workspace] = wspace if wspace
+
+      id = opts.delete(:id)
+      Mdm::Payload.update(id, opts)
+    end
   end
 
   def delete_payload(opts)
diff --git a/lib/msf/core/payload/uuid/options.rb b/lib/msf/core/payload/uuid/options.rb
index 07eadfdeec..9210e28a83 100644
--- a/lib/msf/core/payload/uuid/options.rb
+++ b/lib/msf/core/payload/uuid/options.rb
@@ -88,11 +88,12 @@ module Msf::Payload::UUID::Options
     return unless datastore['PayloadUUIDTracking']
 
     uuid_info = info.merge({
+      uuid:  uuid.puid_hex,
       arch: uuid.arch,
       platform: uuid.platform,
       timestamp: uuid.timestamp,
-      payload: self.fullname,
-      datastore: self.datastore
+      # payload: self.fullname,
+      # datastore: self.datastore
     })
 
     if datastore['PayloadUUIDSeed'].to_s.length > 0
@@ -103,17 +104,17 @@ module Msf::Payload::UUID::Options
       uuid_info[:name] = datastore['PayloadUUIDName']
     end
 
-    framework.uuid_db[uuid.puid_hex] = uuid_info
+    framework.db.create_payload(uuid_info)
   end
 
   # Store a UUID URL in the JSON database if tracking is enabled
   def record_payload_uuid_url(uuid, url)
     return unless datastore['PayloadUUIDTracking']
-    uuid_info = framework.uuid_db[uuid.puid_hex]
-    uuid_info['urls'] ||= []
-    uuid_info['urls'] << url
-    uuid_info['urls'].uniq!
-    framework.uuid_db[uuid.puid_hex] = uuid_info
+    payload = framework.db.get_payload({:uuid => uuid.puid_hex})
+    urls = payload.urls.nil? ? [] : payload.urls
+    urls << url
+    urls.uniq!
+    framework.db.update_payload({id: payload.id, urls: urls})
   end
 
 end