diff --git a/library/Director/Objects/DirectorDatafield.php b/library/Director/Objects/DirectorDatafield.php
index 9cc653ef..770587a0 100644
--- a/library/Director/Objects/DirectorDatafield.php
+++ b/library/Director/Objects/DirectorDatafield.php
@@ -20,4 +20,106 @@ class DirectorDatafield extends DbObject
         'datatype'      => null,
         'format'        => null,
     );
+
+    protected $settings = array();
+
+
+    public function set($key, $value)
+    {
+        if ($this->hasProperty($key)) {
+            return parent::set($key, $value);
+        }
+
+        if (! array_key_exists($key, $this->settings) || $value !== $this->settings[$key]) {
+            $this->hasBeenModified = true;
+        }
+        $this->settings[$key] = $value;
+        return $this;
+    }
+
+    public function get($key)
+    {
+        if ($this->hasProperty($key)) {
+            return parent::get($key);
+        }
+
+        if (array_key_exists($key, $this->settings)) {
+            return $this->settings[$key];
+        }
+
+        return parent::get($key);
+    }
+
+    public function getSettings()
+    {
+        return $this->settings;
+    }
+
+    protected function onStore()
+    {
+        $old = $this->fetchSettingsFromDb();
+        $oldKeys = array_keys($old);
+        $newKeys = array_keys($this->settings);
+        $add = array();
+        $mod = array();
+        $del = array();
+
+        foreach ($this->settings as $key => $val) {
+            if (array_key_exists($key, $old)) {
+                if ($old[$key] !== $this->settings[$key]) {
+                    $mod[$key] = $this->settings[$key];
+                }
+            } else {
+                $add[$key] = $this->settings[$key];
+            }
+        }
+
+        foreach (array_diff(array_keys($old), array_keys($this->settings)) as $key) {
+            $del[$key] = $key;
+        }
+
+        $where = sprintf('datafield_id = %d AND setting_name = ?', $this->id);
+        $db = $this->getDb();
+        foreach ($mod as $key => $val) {
+            $db->update(
+                'director_datafield_setting',
+                array('setting_value' => $val),
+                $db->quoteInto($where, $key)
+            );
+        }
+
+        foreach ($add as $key => $val) {
+            $db->insert(
+                'director_datafield_setting',
+                array(
+                    'datafield_id'     => $this->id,
+                    'setting_name'  => $key,
+                    'setting_value' => $val
+                )
+            );
+        }
+
+        foreach ($del as $key) {
+            $db->update(
+                'director_datafield_setting',
+                $db->quoteInto($where, $key)
+            );
+        }
+    }
+
+    protected function fetchSettingsFromDb()
+    {
+        $db = $this->getDb();
+        return $db->fetchPairs(
+            $db->select()
+                ->from('director_datafield_setting', array('setting_name', 'setting_value'))
+                ->where('datafield_id = ?', $this->id)
+        );
+
+    }
+
+    protected function onLoadFromDb()
+    {
+        $this->settings = $this->fetchSettingsFromDb();
+    }
 }