1 files changed, 21 insertions, 29 deletions

diff --git a/dodai/config/__init__.py b/dodai/config/__init__.py
index 9eac0da..b976dca 100644
--- a/dodai/config/__init__.py
+++ b/dodai/config/__init__.py
@@ -16,7 +16,6 @@
 # along with Dodai.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
 class Config(object):
 
     def __call__(self):
@@ -26,38 +25,31 @@ class Config(object):
                 setattr(obj, key, val)
         return obj
 
-    def set(self, key, val):
-        if not hasattr(self, 'vars'):
-            self.vars = {}
-        self.vars[key] = val
+    def __getattr__(self, key):
 
-    def options(self):
-        if not hasattr(self, '_options'):
+        if 'files' == key:
+            from dodai.config.files import ConfigFiles
+            self.files = ConfigFiles()
+            return self.files
+        elif 'options' == key:
             from dodai.config.option import ConfigOption
-            self._options = ConfigOption()
-        return self._options
-
-    def files(self):
-        if not hasattr(self, '_files'):
-            from dodai.config.file import ConfigFile
-            self._files = ConfigFile()
-        return self._files
-
-    def logs(self):
-        if not hasattr(self, '_logs'):
+            self.options = ConfigOption()
+            return self.options
+        elif 'logs' == key:
             from dodai.config.log import ConfigLog
-            self._logs = ConfigLog()
-        return self._logs
-
-    def dbs(self):
-        if not hasattr(self, '_dbs'):
-            from dodai.config.db import ConfigDb
-            self._dbs = ConfigDb()
-        return self._dbs
-
-
-
+            self.logs = ConfigLog()
+            return self.logs
+        elif 'databases' == key:
+            from dodai.config.databases import ConfigDatabases
+            self.databases = ConfigDatabases()
+            return self.databases
+        else:
+            raise KeyError(key)
 
+    def set(self, key, val):
+        if not hasattr(self, 'vars'):
+            self.vars = {}
+        self.vars[key] = val
 
 
 class ConfigResults(object):