diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index f7107b2b3..4f59ce7c1 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -41,29 +41,69 @@ import deluge.common
 import deluge.component as component
 from deluge.configmanager import ConfigManager
 from deluge.log import LOG as log
-from deluge.core.preferencesmanager import DEFAULT_PREFS
+
 import deluge.xmlrpclib
 
 TORRENT_STATE = deluge.common.TORRENT_STATE
 
-OPTIONS = {
-    "max_download_speed": DEFAULT_PREFS["max_download_speed_per_torrent"],
-    "max_upload_speed": DEFAULT_PREFS["max_upload_speed_per_torrent"],
-    "max_connections": DEFAULT_PREFS["max_connections_per_torrent"],
-    "max_upload_slots": DEFAULT_PREFS["max_upload_slots_per_torrent"],
-    "prioritize_first_last_pieces": DEFAULT_PREFS["prioritize_first_last_pieces"],
-    "auto_managed": DEFAULT_PREFS["auto_managed"],
-    "stop_at_ratio": DEFAULT_PREFS["stop_seed_at_ratio"],
-    "stop_ratio": DEFAULT_PREFS["stop_seed_ratio"],
-    "remove_at_ratio": DEFAULT_PREFS["remove_seed_at_ratio"],
-    "move_completed": DEFAULT_PREFS["move_completed"],
-    "move_completed_path": DEFAULT_PREFS["move_completed_path"],
-    "file_priorities": [],
-    "compact_allocation": DEFAULT_PREFS["compact_allocation"],
-    "download_location": DEFAULT_PREFS["download_location"],
-    "add_paused": DEFAULT_PREFS["add_paused"]
-}
+class TorrentOptions(dict):
+    def __init__(self):
+        self.config = ConfigManager("core.conf")
+        self.default_keys = {
+            "max_download_speed": "max_download_speed_per_torrent",
+            "max_upload_speed": "max_upload_speed_per_torrent",
+            "max_connections": "max_connections_per_torrent",
+            "max_upload_slots": "max_upload_slots_per_torrent",
+            "prioritize_first_last_pieces": "prioritize_first_last_pieces",
+            "auto_managed": "auto_managed",
+            "stop_at_ratio": "stop_seed_at_ratio",
+            "stop_ratio": "stop_seed_ratio",
+            "remove_at_ratio": "remove_seed_at_ratio",
+            "move_completed": "move_completed",
+            "move_completed_path": "move_completed_path",
+            "file_priorities": [],
+            "compact_allocation": "compact_allocation",
+            "download_location": "download_location",
+            "add_paused": "add_paused"
+        }
+        
+    def items(self):
+        i = super(TorrentOptions, self).items()
+        for k in self.default_keys:
+            if k not in super(TorrentOptions, self).keys():
+                i.append((k, self.__getitem__(k)))
 
+        return i
+    
+    def keys(self):
+        k = super(TorrentOptions, self).keys()
+        for key in self.default_keys.keys():
+            if key not in k:
+                k.append(key)
+        return k
+    
+    def iteritems(self):
+        return self.items().itermitems()
+    
+    def has_key(self, key):
+        if super(TorrentOptions, self).has_key(key):
+            return True
+        elif self.default_keys.has_key(key):
+            return True
+        return False
+                            
+    def __setitem__(self, key, value):
+        super(TorrentOptions, self).__setitem__(key, value)
+    
+    def __getitem__(self, key):
+        if super(TorrentOptions, self).has_key(key):
+            return super(TorrentOptions, self).__getitem__(key)
+        else:
+            if self.default_keys[key]:
+                return self.config[self.default_keys[key]]
+            else:
+                return self.default_keys[key]
+        
 class Torrent:
     """Torrent holds information about torrents added to the libtorrent session.
     """
@@ -104,7 +144,7 @@ class Torrent:
         self.total_uploaded = 0
 
         # Set the default options
-        self.options = OPTIONS.copy()
+        self.options = TorrentOptions()
         self.options.update(options)
         
         # We need to keep track if the torrent is finished in the state to prevent
@@ -170,7 +210,8 @@ class Torrent:
     
     def get_options(self):
         return self.options
-        
+
+    
     def set_max_connections(self, max_connections):
         self.options["max_connections"] = int(max_connections)
         self.handle.set_max_connections(max_connections)
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index 15791ec1a..41ae4dd1e 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -46,7 +46,7 @@ import deluge.common
 import deluge.component as component
 from deluge.configmanager import ConfigManager
 from deluge.core.torrent import Torrent
-from deluge.core.torrent import OPTIONS
+from deluge.core.torrent import TorrentOptions
 import deluge.core.oldstateupgrader
 
 from deluge.log import LOG as log
@@ -271,7 +271,7 @@ class TorrentManager(component.Component):
             # from the state object.
 
             # Populate the options dict from state
-            options = OPTIONS.copy()
+            options = TorrentOptions()
             options["max_connections"] = state.max_connections
             options["max_upload_slots"] = state.max_upload_slots
             options["max_upload_speed"] = state.max_upload_speed
@@ -295,9 +295,9 @@ class TorrentManager(component.Component):
             # We have a torrent_info object so we're not loading from state.
             # Check if options is None and load defaults
             if options == None:
-                options = OPTIONS.copy()
+                options = TorrentOptions()
             else:
-                o = OPTIONS.copy()
+                o = TorrentOptions()
                 o.update(options)
                 options = o