From 22e8f9a6bce529e3be067d19cc74b8eb36c84dd8 Mon Sep 17 00:00:00 2001
From: Michael Rans <rans@email.com>
Date: Fri, 6 Jan 2017 13:29:33 +0100
Subject: [PATCH] Version 0.70 - Make configuration and ckan object module
 level

---
 .idea/workspace.xml                | 781 +++++++++++++++--------------
 README.md                          |  34 +-
 hdx/__init__.py                    |   2 +
 hdx/configuration.py               |  51 ++
 hdx/data/dataset.py                |  32 +-
 hdx/data/galleryitem.py            |  13 +-
 hdx/data/hdxobject.py              |  33 +-
 hdx/data/resource.py               |  20 +-
 hdx/facades/scraperwiki.py         |   8 +-
 hdx/facades/simple.py              |   8 +-
 hdx/version.txt                    |   2 +-
 tests/hdx/data/test_dataset.py     |  70 +--
 tests/hdx/data/test_galleryitem.py |  30 +-
 tests/hdx/data/test_resource.py    |  46 +-
 tests/hdx/facades/__init__.py      |   8 +-
 tests/hdx/test_configuration.py    |  26 +-
 16 files changed, 603 insertions(+), 561 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4d11e8e9..08a16697 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,23 @@
     <option name="CUSTOM_SCOPE_NAME" value="Project and Libraries" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="78dced69-aba6-482d-97c8-9f71833379e5" name="Default" comment="Version 0.70 - Yet another fix">
+    <list default="true" id="78dced69-aba6-482d-97c8-9f71833379e5" name="Default" comment="Version 0.70 - Make configuration and ckan object module level">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/__init__.py" afterPath="$PROJECT_DIR$/hdx/__init__.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/configuration.py" afterPath="$PROJECT_DIR$/hdx/configuration.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/data/dataset.py" afterPath="$PROJECT_DIR$/hdx/data/dataset.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/data/galleryitem.py" afterPath="$PROJECT_DIR$/hdx/data/galleryitem.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/data/hdxobject.py" afterPath="$PROJECT_DIR$/hdx/data/hdxobject.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/data/resource.py" afterPath="$PROJECT_DIR$/hdx/data/resource.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/facades/scraperwiki.py" afterPath="$PROJECT_DIR$/hdx/facades/scraperwiki.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/facades/simple.py" afterPath="$PROJECT_DIR$/hdx/facades/simple.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hdx/version.txt" afterPath="$PROJECT_DIR$/hdx/version.txt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/hdx/data/test_dataset.py" afterPath="$PROJECT_DIR$/tests/hdx/data/test_dataset.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py" afterPath="$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/hdx/data/test_resource.py" afterPath="$PROJECT_DIR$/tests/hdx/data/test_resource.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/hdx/facades/__init__.py" afterPath="$PROJECT_DIR$/tests/hdx/facades/__init__.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/hdx/test_configuration.py" afterPath="$PROJECT_DIR$/tests/hdx/test_configuration.py" />
     </list>
     <ignored path="hdx-python-api.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -21,16 +35,16 @@
   <component name="CoverageDataManager">
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_loader_py.coverage" NAME="py.test in test_loader.py Coverage Results" MODIFIED="1478596651650" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_TestResource_and_test_search_in_hdx.coverage" NAME="py.test in TestResource and test_search_in_hdx Coverage Results" MODIFIED="1476080312164" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/hdx-python-api$Generate_Documentation.coverage" NAME="Generate Documentation Coverage Results" MODIFIED="1483514782236" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/documentation" />
+    <SUITE FILE_PATH="coverage/hdx-python-api$Generate_Documentation.coverage" NAME="Generate Documentation Coverage Results" MODIFIED="1483540727361" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/documentation" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_logging_py.coverage" NAME="py.test in test_logging.py Coverage Results" MODIFIED="1467379999387" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_configuration_py.coverage" NAME="py.test in test_configuration.py Coverage Results" MODIFIED="1470050996687" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
-    <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_galleryitem_py.coverage" NAME="py.test in test_galleryitem.py Coverage Results" MODIFIED="1483435798156" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_galleryitem_py.coverage" NAME="py.test in test_galleryitem.py Coverage Results" MODIFIED="1483704846027" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_dataset_py.coverage" NAME="py.test in test_dataset.py Coverage Results" MODIFIED="1483526733056" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_TestResource_and_test_datastore.coverage" NAME="py.test in TestResource and test_datastore Coverage Results" MODIFIED="1476341972650" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_resource_py__1_.coverage" NAME="py.test in test_resource.py (1) Coverage Results" MODIFIED="1473937381813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_location_py.coverage" NAME="py.test in test_location.py Coverage Results" MODIFIED="1478867853612" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_dictionary_py.coverage" NAME="py.test in test_dictionary.py Coverage Results" MODIFIED="1466061591836" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/hdx-python-api$All_Tests.coverage" NAME="All Tests Coverage Results" MODIFIED="1483540487735" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/hdx-python-api$All_Tests.coverage" NAME="All Tests Coverage Results" MODIFIED="1483704943544" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_simple_py.coverage" NAME="py.test in test_simple.py Coverage Results" MODIFIED="1466429076178" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_downloader_py.coverage" NAME="py.test in test_downloader.py Coverage Results" MODIFIED="1479726680108" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
     <SUITE FILE_PATH="coverage/hdx-python-api$py_test_in_test_resource_py.coverage" NAME="py.test in test_resource.py Coverage Results" MODIFIED="1483435943874" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
@@ -48,21 +62,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="resource.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hdx/data/resource.py">
+      <file leaf-file-name="test_galleryitem.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="335">
-              <caret line="151" column="22" lean-forward="false" selection-start-line="151" selection-start-column="22" selection-end-line="151" selection-end-column="22" />
+            <state relative-caret-position="416">
+              <caret line="165" column="35" lean-forward="false" selection-start-line="165" selection-start-column="35" selection-end-line="165" selection-end-column="35" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="requirements.txt" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <file leaf-file-name="test_dataset.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_dataset.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="90" lean-forward="false" selection-start-line="0" selection-start-column="90" selection-end-line="0" selection-end-column="90" />
+            <state relative-caret-position="450">
+              <caret line="370" column="35" lean-forward="false" selection-start-line="370" selection-start-column="35" selection-end-line="370" selection-end-column="35" />
               <folding />
             </state>
           </provider>
@@ -71,28 +85,28 @@
       <file leaf-file-name="setup.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/setup.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="756">
+            <state relative-caret-position="679">
               <caret line="46" column="101" lean-forward="false" selection-start-line="46" selection-start-column="101" selection-end-line="46" selection-end-column="101" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="test_dataset.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_dataset.py">
+      <file leaf-file-name="test_resource.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_resource.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="569">
-              <caret line="510" column="40" lean-forward="false" selection-start-line="510" selection-start-column="40" selection-end-line="510" selection-end-column="40" />
+            <state relative-caret-position="504">
+              <caret line="323" column="35" lean-forward="false" selection-start-line="323" selection-start-column="35" selection-end-line="323" selection-end-column="35" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="downloader.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hdx/utilities/downloader.py">
+      <file leaf-file-name="test_scraperwiki.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/hdx/facades/test_scraperwiki.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="6" column="1" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="21" />
+            <state relative-caret-position="396">
+              <caret line="26" column="4" lean-forward="false" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
               <folding />
             </state>
           </provider>
@@ -101,94 +115,91 @@
       <file leaf-file-name="dataset.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/hdx/data/dataset.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="538">
-              <caret line="466" column="0" lean-forward="false" selection-start-line="466" selection-start-column="0" selection-end-line="466" selection-end-column="0" />
+            <state relative-caret-position="265">
+              <caret line="326" column="23" lean-forward="false" selection-start-line="326" selection-start-column="23" selection-end-line="326" selection-end-column="23" />
               <folding>
-                <marker date="1483538428445" expanded="true" signature="660:2195" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="1850:1878" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="1897:1935" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="2233:2235" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="2662:2673" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="3295:3297" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="3789:3791" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="4000:4004" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="4861:4871" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="5360:5364" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="5808:5810" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="6003:6005" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="6180:6182" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="6985:6995" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="7485:7489" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="7953:7955" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="8162:8219" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="8626:8684" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="9110:9136" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="9705:9707" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="10442:10446" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="11525:11546" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="15239:15277" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="16243:16245" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="18308:18310" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="18505:18526" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="21286:21317" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="22052:22068" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="22562:22564" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="23018:23039" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="23736:23754" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="24066:24083" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="25069:25073" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="25541:25543" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="26024:26028" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="26537:26539" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="26844:26848" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="27245:27255" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="27490:27492" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="27869:27873" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="28658:28668" ph="..." />
-                <marker date="1483538428445" expanded="true" signature="29139:29143" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="660:2093" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="1779:1791" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="1810:1848" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="2131:2133" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="2560:2571" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="3193:3195" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="3687:3689" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="3898:3902" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="4739:4749" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="5238:5242" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="5686:5688" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="5881:5883" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="6058:6060" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="6843:6853" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="7343:7347" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="7811:7813" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="8020:8077" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="8484:8542" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="8954:8964" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="9459:9461" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="10196:10200" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="18068:18070" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="18251:18256" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="20913:20928" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="21587:21603" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="22097:22099" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="22553:22574" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="23271:23289" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="23601:23618" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="24604:24608" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="25076:25078" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="25559:25563" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="26072:26074" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="26379:26383" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="26780:26790" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="27025:27027" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="27404:27408" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="28193:28203" ph="..." />
+                <marker date="1483705758771" expanded="true" signature="28674:28678" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="hdxobject.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/hdx/data/hdxobject.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="258" column="0" lean-forward="false" selection-start-line="258" selection-start-column="0" selection-end-line="258" selection-end-column="0" />
-              <folding />
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/README.md">
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+            <state split_layout="SPLIT">
+              <first_editor relative-caret-position="198">
+                <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="28" />
+                <folding />
+              </first_editor>
+              <second_editor />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="remoteckan.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../VirtualEnvs/hdx-python-api/lib/python3.5/site-packages/ckanapi/remoteckan.py">
+      <file leaf-file-name="version.txt" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/hdx/version.txt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="84" column="0" lean-forward="false" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+            <state relative-caret-position="0">
+              <caret line="0" column="3" lean-forward="false" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="918">
-                <caret line="51" column="94" lean-forward="false" selection-start-line="51" selection-start-column="94" selection-end-line="51" selection-end-column="94" />
-                <folding />
-              </first_editor>
-              <second_editor />
+      <file leaf-file-name="configuration.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/hdx/configuration.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="198">
+              <caret line="160" column="12" lean-forward="false" selection-start-line="160" selection-start-column="12" selection-end-line="160" selection-end-column="12" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="test_resource.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_resource.py">
+      <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/tests/hdx/facades/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="188" column="0" lean-forward="false" selection-start-line="184" selection-start-column="0" selection-end-line="188" selection-end-column="0" />
+            <state relative-caret-position="198">
+              <caret line="11" column="51" lean-forward="false" selection-start-line="11" selection-start-column="51" selection-end-line="11" selection-end-column="51" />
               <folding />
             </state>
           </provider>
@@ -206,17 +217,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>ignore</find>
-      <find>gallery_da</find>
-      <find>6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d</find>
-      <find>TEST1</find>
-      <find>deepcop</find>
-      <find>_dataset_c</find>
-      <find>check_required_fields</find>
-      <find>gallery_data</find>
-      <find>init_ga</find>
-      <find>check_r</find>
-      <find>chec</find>
       <find>create</find>
       <find>gallery</find>
       <find>GalleryItem</find>
@@ -225,7 +225,6 @@
       <find>add_res</find>
       <find>add_upd</find>
       <find>update_datast</find>
-      <find>read_fro</find>
       <find>_underlying_object</find>
       <find>resources_data</find>
       <find>update_in</find>
@@ -234,8 +233,20 @@
       <find>copy</find>
       <find>file_to</find>
       <find>del</find>
-      <find>del</find>
       <find>Resource</find>
+      <find>create_data</find>
+      <find>read_fro</find>
+      <find>configurati</find>
+      <find>search_in_hdx(configuration,</find>
+      <find>read_from_hdx(configuration,</find>
+      <find>GalleryItem(configuration,</find>
+      <find>Resource(configuration,</find>
+      <find>Dataset(configuration)</find>
+      <find>Resource(configuration)</find>
+      <find>self.configuration</find>
+      <find>GalleryItem(configuration)</find>
+      <find>undo</find>
+      <find>configuration</find>
     </findStrings>
     <replaceStrings>
       <replace>requests.sessions.Session, '</replace>
@@ -250,6 +261,14 @@
       <replace>Resource</replace>
       <replace>resource</replace>
       <replace>resource['name']</replace>
+      <replace>search_in_hdx(</replace>
+      <replace>read_from_hdx(</replace>
+      <replace>GalleryItem(</replace>
+      <replace>Resource(</replace>
+      <replace>Dataset()</replace>
+      <replace>Configuration.get()</replace>
+      <replace>GalleryItem()</replace>
+      <replace>Resource()</replace>
     </replaceStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -264,9 +283,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/hdx/logging_configuration.yml" />
-        <option value="$PROJECT_DIR$/tests/fixtures/config/logging_config.yml" />
-        <option value="$PROJECT_DIR$/tests/hdx/test_logging.py" />
         <option value="$PROJECT_DIR$/tests/fixtures/config/hdx_config.yml" />
         <option value="$PROJECT_DIR$/tests/fixtures/config/hdx_config.json" />
         <option value="$PROJECT_DIR$/tests/fixtures/config/project_configuration.yml" />
@@ -292,29 +308,32 @@
         <option value="$PROJECT_DIR$/hdx/utilities/__init__.py" />
         <option value="$PROJECT_DIR$/hdx/utilities/continent.py" />
         <option value="$PROJECT_DIR$/hdx/utilities/country.py" />
-        <option value="$PROJECT_DIR$/hdx/facades/simple.py" />
-        <option value="$PROJECT_DIR$/hdx/facades/scraperwiki.py" />
         <option value="$PROJECT_DIR$/hdx/utilities/loader.py" />
         <option value="$PROJECT_DIR$/hdx/logging.py" />
         <option value="$PROJECT_DIR$/hdx/utilities/geolocation.py" />
         <option value="$PROJECT_DIR$/tests/hdx/utilities/test_location.py" />
         <option value="$PROJECT_DIR$/hdx/utilities/location.py" />
         <option value="$PROJECT_DIR$/tests/hdx/utilities/test_downloader.py" />
-        <option value="$PROJECT_DIR$/hdx/configuration.py" />
-        <option value="$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py" />
         <option value="$PROJECT_DIR$/hdx/utilities/downloader.py" />
-        <option value="$PROJECT_DIR$/hdx/data/galleryitem.py" />
         <option value="$PROJECT_DIR$/hdx/hdx_configuration.yml" />
-        <option value="$PROJECT_DIR$/tests/hdx/test_configuration.py" />
-        <option value="$PROJECT_DIR$/hdx/version.txt" />
-        <option value="$PROJECT_DIR$/tests/hdx/data/test_resource.py" />
-        <option value="$PROJECT_DIR$/README.md" />
         <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/requirements.txt" />
-        <option value="$PROJECT_DIR$/hdx/data/hdxobject.py" />
-        <option value="$PROJECT_DIR$/hdx/data/resource.py" />
+        <option value="$PROJECT_DIR$/hdx/data/__init__.py" />
+        <option value="$PROJECT_DIR$/hdx/__init__.py" />
+        <option value="$PROJECT_DIR$/hdx/facades/scraperwiki.py" />
+        <option value="$PROJECT_DIR$/hdx/facades/simple.py" />
+        <option value="$PROJECT_DIR$/hdx/data/galleryitem.py" />
         <option value="$PROJECT_DIR$/hdx/data/dataset.py" />
+        <option value="$PROJECT_DIR$/hdx/data/resource.py" />
+        <option value="$PROJECT_DIR$/hdx/data/hdxobject.py" />
+        <option value="$PROJECT_DIR$/tests/hdx/facades/__init__.py" />
+        <option value="$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py" />
         <option value="$PROJECT_DIR$/tests/hdx/data/test_dataset.py" />
+        <option value="$PROJECT_DIR$/tests/hdx/data/test_resource.py" />
+        <option value="$PROJECT_DIR$/tests/hdx/test_configuration.py" />
+        <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/hdx/configuration.py" />
+        <option value="$PROJECT_DIR$/hdx/version.txt" />
       </list>
     </option>
   </component>
@@ -325,6 +344,7 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
+    <option name="y" value="-1" />
     <option name="width" value="2560" />
     <option name="height" value="1413" />
   </component>
@@ -346,7 +366,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -391,6 +411,28 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hdx-python-api" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hdx-python-api" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="tests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="hdx" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="facades" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="hdx-python-api" />
@@ -523,7 +565,7 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -1083,13 +1125,6 @@
       <option name="presentableId" value="Default" />
       <updated>1464695506411</updated>
     </task>
-    <task id="LOCAL-00171" summary="Update README">
-      <created>1479208161443</created>
-      <option name="number" value="00171" />
-      <option name="presentableId" value="LOCAL-00171" />
-      <option name="project" value="LOCAL" />
-      <updated>1479208161443</updated>
-    </task>
     <task id="LOCAL-00172" summary="Add read only option to configuration">
       <created>1480595248793</created>
       <option name="number" value="00172" />
@@ -1426,67 +1461,74 @@
       <option name="project" value="LOCAL" />
       <updated>1483538430182</updated>
     </task>
-    <option name="localTasksCounter" value="220" />
+    <task id="LOCAL-00220" summary="Version 0.70 - Increase coverage">
+      <created>1483540512157</created>
+      <option name="number" value="00220" />
+      <option name="presentableId" value="LOCAL-00220" />
+      <option name="project" value="LOCAL" />
+      <updated>1483540512157</updated>
+    </task>
+    <option name="localTasksCounter" value="221" />
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="All_Tests - 2017.01.04 at 14h 39m 00s.xml">
+    <history-entry file="All_Tests - 2017.01.06 at 13h 14m 52s.xml">
       <configuration name="All Tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 02m 23s.xml">
+    <history-entry file="All_Tests - 2017.01.06 at 13h 15m 47s.xml">
       <configuration name="All Tests" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 21m 31s.xml">
-      <configuration name="All Tests" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 11h 17m 23s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 28m 57s.xml">
-      <configuration name="All Tests" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 09m 20s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 31m 34s.xml">
-      <configuration name="All Tests" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 11m 05s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 33m 56s.xml">
-      <configuration name="All Tests" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 11m 35s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 34m 27s.xml">
-      <configuration name="All Tests" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 12m 33s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="All_Tests - 2017.01.04 at 15h 34m 51s.xml">
-      <configuration name="All Tests" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 12m 40s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="py_test_in_test_dataset_py - 2017.01.04 at 11h 29m 15s.xml">
-      <configuration name="py.test in test_dataset.py" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 13m 39s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
-    <history-entry file="py_test_in_test_dataset_py - 2017.01.04 at 11h 45m 33s.xml">
-      <configuration name="py.test in test_dataset.py" configurationId="tests" />
+    <history-entry file="py_test_in_test_galleryitem_py - 2017.01.06 at 13h 14m 06s.xml">
+      <configuration name="py.test in test_galleryitem.py" configurationId="tests" />
     </history-entry>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="2560" height="1413" extended-state="0" />
+    <frame x="0" y="-1" width="2560" height="1413" extended-state="6" />
     <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3272293" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41503525" sideWeight="0.6313694" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32654658" sideWeight="0.49203822" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3257635" sideWeight="0.5398089" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3673313" sideWeight="0.49044585" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3535276" sideWeight="0.45859873" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.41503525" sideWeight="0.3686306" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24984066" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41503525" sideWeight="0.36265925" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32838982" sideWeight="0.49412394" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24960192" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32654658" sideWeight="0.46019107" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24984066" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40030676" sideWeight="0.41799363" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40015662" sideWeight="0.41321656" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32668713" sideWeight="0.4936306" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24838293" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="99" y="100" width="1402" height="675" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3986577" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27760416" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27746814" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.49583334" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32668713" sideWeight="0.46178344" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
@@ -1550,8 +1592,6 @@
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_CODE_CLEANUP_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="Update date format in doc" />
-    <MESSAGE value="Add some common frequency synonyms" />
     <MESSAGE value="Fix README" />
     <MESSAGE value="Use name not id for groups (location)" />
     <MESSAGE value="Update README" />
@@ -1575,7 +1615,9 @@
     <MESSAGE value="Version 0.70 - Fix filestore upload" />
     <MESSAGE value="Version 0.70 - Remove warning" />
     <MESSAGE value="Version 0.70 - Yet another fix" />
-    <option name="LAST_COMMIT_MESSAGE" value="Version 0.70 - Yet another fix" />
+    <MESSAGE value="Version 0.70 - Increase coverage" />
+    <MESSAGE value="Version 0.70 - Make configuration and ckan object module level" />
+    <option name="LAST_COMMIT_MESSAGE" value="Version 0.70 - Make configuration and ckan object module level" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
@@ -1589,7 +1631,7 @@
           </properties>
         </breakpoint>
       </default-breakpoints>
-      <option name="time" value="194" />
+      <option name="time" value="200" />
     </breakpoint-manager>
     <watches-manager>
       <configuration name="Python Console Debugger">
@@ -1598,117 +1640,6 @@
     </watches-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file:///usr/lib/python3.5/json/__init__.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5562">
-          <caret line="309" column="0" lean-forward="false" selection-start-line="309" selection-start-column="0" selection-end-line="309" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/configuration.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2070">
-          <caret line="123" column="0" lean-forward="false" selection-start-line="123" selection-start-column="0" selection-end-line="123" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="10" column="1" lean-forward="true" selection-start-line="10" selection-start-column="1" selection-end-line="10" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/facades/simple.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="26" column="30" lean-forward="true" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/facades/scraperwiki.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/data/hdxobject.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/data/dataset.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="846">
-          <caret line="60" column="5" lean-forward="false" selection-start-line="60" selection-start-column="5" selection-end-line="60" selection-end-column="5" />
-          <folding>
-            <marker date="1483538428445" expanded="true" signature="660:2195" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="1850:1878" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="1897:1935" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="2233:2235" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="2662:2673" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="3295:3297" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="3789:3791" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="4000:4004" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="4861:4871" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="5360:5364" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="5808:5810" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="6003:6005" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="6180:6182" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="6985:6995" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="7485:7489" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="7953:7955" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="8162:8219" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="8626:8684" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="9110:9136" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="9705:9707" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="10442:10446" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="11525:11546" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="15239:15277" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="16243:16245" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="18308:18310" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="18505:18526" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="21286:21317" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="22052:22068" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="22562:22564" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="23018:23039" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="23736:23754" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="24066:24083" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="25069:25073" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="25541:25543" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="26024:26028" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="26537:26539" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="26844:26848" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="27245:27255" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="27490:27492" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="27869:27873" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="28658:28668" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="29139:29143" ph="..." />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/setup.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="468">
-          <caret line="30" column="9" lean-forward="false" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="6174">
-            <caret line="343" column="0" lean-forward="false" selection-start-line="343" selection-start-column="0" selection-end-line="343" selection-end-column="0" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/hdx/utilities/downloader.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="936">
@@ -1797,20 +1728,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/facades/simple.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="26" column="30" lean-forward="false" selection-start-line="26" selection-start-column="30" selection-end-line="26" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/facades/scraperwiki.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.coveragerc">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1853,13 +1770,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="220" column="0" lean-forward="false" selection-start-line="220" selection-start-column="0" selection-end-line="220" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/hdx/hdx_datasource_topline.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1881,10 +1791,81 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/hdx/test_configuration.py">
+    <entry file="file://$PROJECT_DIR$/pytest.ini">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="676">
-          <caret line="299" column="0" lean-forward="false" selection-start-line="299" selection-start-column="0" selection-end-line="299" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="450">
+          <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="90" lean-forward="false" selection-start-line="0" selection-start-column="90" selection-end-line="0" selection-end-column="90" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/utilities/downloader.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="6" column="1" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/data/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/logging.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="18">
+          <caret line="1" column="10" lean-forward="false" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/facades/scraperwiki.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="502">
+          <caret line="33" column="44" lean-forward="false" selection-start-line="33" selection-start-column="44" selection-end-line="33" selection-end-column="44" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/facades/simple.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="522">
+          <caret line="29" column="40" lean-forward="false" selection-start-line="29" selection-start-column="40" selection-end-line="29" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/data/resource.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="20" column="0" lean-forward="true" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1892,175 +1873,201 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="178">
           <caret line="148" column="0" lean-forward="false" selection-start-line="148" selection-start-column="0" selection-end-line="148" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/data/galleryitem.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="464">
+          <caret line="109" column="0" lean-forward="false" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../VirtualEnvs/hdx-python-api/lib/python3.5/site-packages/_pytest/vendored_packages/pluggy.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="250">
-          <caret line="613" column="0" lean-forward="false" selection-start-line="613" selection-start-column="0" selection-end-line="613" selection-end-column="0" />
+        <state relative-caret-position="244">
+          <caret line="744" column="0" lean-forward="false" selection-start-line="744" selection-start-column="0" selection-end-line="744" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/configuration.py">
+    <entry file="file://$PROJECT_DIR$/../VirtualEnvs/hdx-python-api/lib/python3.5/site-packages/_pytest/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="128" column="0" lean-forward="false" selection-start-line="128" selection-start-column="0" selection-end-line="128" selection-end-column="0" />
+        <state relative-caret-position="244">
+          <caret line="124" column="0" lean-forward="false" selection-start-line="124" selection-start-column="0" selection-end-line="124" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/data/galleryitem.py">
+    <entry file="file://$PROJECT_DIR$/../VirtualEnvs/hdx-python-api/lib/python3.5/site-packages/_pytest/runner.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1350">
-          <caret line="80" column="53" lean-forward="false" selection-start-line="80" selection-start-column="36" selection-end-line="80" selection-end-column="53" />
+        <state relative-caret-position="244">
+          <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/version.txt">
+    <entry file="file://$PROJECT_DIR$/../VirtualEnvs/hdx-python-api/lib/python3.5/site-packages/ckanapi/remoteckan.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="4" lean-forward="false" selection-start-line="0" selection-start-column="4" selection-end-line="0" selection-end-column="4" />
+        <state relative-caret-position="172">
+          <caret line="85" column="0" lean-forward="false" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pytest.ini">
+    <entry file="file://$PROJECT_DIR$/hdx/data/hdxobject.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="259">
+          <caret line="249" column="0" lean-forward="false" selection-start-line="249" selection-start-column="0" selection-end-line="249" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/test_logging.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="918">
-            <caret line="51" column="94" lean-forward="false" selection-start-line="51" selection-start-column="94" selection-end-line="51" selection-end-column="94" />
-            <folding />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/tests/hdx/test_configuration.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="265">
+          <caret line="59" column="51" lean-forward="false" selection-start-line="59" selection-start-column="51" selection-end-line="59" selection-end-column="51" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/facades/test_simple.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="90" lean-forward="false" selection-start-line="0" selection-start-column="90" selection-end-line="0" selection-end-column="90" />
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/setup.py">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/facades/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="756">
-          <caret line="46" column="101" lean-forward="false" selection-start-line="46" selection-start-column="101" selection-end-line="46" selection-end-column="101" />
+        <state relative-caret-position="198">
+          <caret line="11" column="51" lean-forward="false" selection-start-line="11" selection-start-column="51" selection-end-line="11" selection-end-column="51" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/data/resource.py">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/facades/test_scraperwiki.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="335">
-          <caret line="151" column="22" lean-forward="false" selection-start-line="151" selection-start-column="22" selection-end-line="151" selection-end-column="22" />
+        <state relative-caret-position="396">
+          <caret line="26" column="4" lean-forward="false" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/data/dataset.py">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_galleryitem.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="538">
-          <caret line="466" column="0" lean-forward="false" selection-start-line="466" selection-start-column="0" selection-end-line="466" selection-end-column="0" />
-          <folding>
-            <marker date="1483538428445" expanded="true" signature="660:2195" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="1850:1878" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="1897:1935" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="2233:2235" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="2662:2673" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="3295:3297" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="3789:3791" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="4000:4004" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="4861:4871" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="5360:5364" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="5808:5810" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="6003:6005" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="6180:6182" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="6985:6995" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="7485:7489" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="7953:7955" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="8162:8219" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="8626:8684" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="9110:9136" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="9705:9707" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="10442:10446" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="11525:11546" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="15239:15277" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="16243:16245" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="18308:18310" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="18505:18526" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="21286:21317" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="22052:22068" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="22562:22564" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="23018:23039" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="23736:23754" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="24066:24083" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="25069:25073" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="25541:25543" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="26024:26028" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="26537:26539" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="26844:26848" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="27245:27255" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="27490:27492" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="27869:27873" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="28658:28668" ph="..." />
-            <marker date="1483538428445" expanded="true" signature="29139:29143" ph="..." />
-          </folding>
+        <state relative-caret-position="416">
+          <caret line="165" column="35" lean-forward="false" selection-start-line="165" selection-start-column="35" selection-end-line="165" selection-end-column="35" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/utilities/downloader.py">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_dataset.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="1" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="21" />
+        <state relative-caret-position="450">
+          <caret line="370" column="35" lean-forward="false" selection-start-line="370" selection-start-column="35" selection-end-line="370" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/hdx/data/hdxobject.py">
+    <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_resource.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="258" column="0" lean-forward="false" selection-start-line="258" selection-start-column="0" selection-end-line="258" selection-end-column="0" />
+        <state relative-caret-position="504">
+          <caret line="323" column="35" lean-forward="false" selection-start-line="323" selection-start-column="35" selection-end-line="323" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../VirtualEnvs/hdx-python-api/lib/python3.5/site-packages/ckanapi/remoteckan.py">
+    <entry file="file://$PROJECT_DIR$/hdx/data/dataset.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="265">
+          <caret line="326" column="23" lean-forward="false" selection-start-line="326" selection-start-column="23" selection-end-line="326" selection-end-column="23" />
+          <folding>
+            <marker date="1483705758771" expanded="true" signature="660:2093" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="1779:1791" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="1810:1848" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="2131:2133" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="2560:2571" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="3193:3195" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="3687:3689" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="3898:3902" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="4739:4749" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="5238:5242" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="5686:5688" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="5881:5883" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="6058:6060" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="6843:6853" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="7343:7347" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="7811:7813" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="8020:8077" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="8484:8542" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="8954:8964" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="9459:9461" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="10196:10200" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="18068:18070" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="18251:18256" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="20913:20928" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="21587:21603" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="22097:22099" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="22553:22574" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="23271:23289" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="23601:23618" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="24604:24608" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="25076:25078" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="25559:25563" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="26072:26074" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="26379:26383" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="26780:26790" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="27025:27027" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="27404:27408" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="28193:28203" ph="..." />
+            <marker date="1483705758771" expanded="true" signature="28674:28678" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="84" column="0" lean-forward="false" selection-start-line="84" selection-start-column="0" selection-end-line="84" selection-end-column="0" />
+        <state relative-caret-position="679">
+          <caret line="46" column="101" lean-forward="false" selection-start-line="46" selection-start-column="101" selection-end-line="46" selection-end-column="101" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_resource.py">
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="198">
+            <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="15" selection-end-line="11" selection-end-column="28" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/hdx/configuration.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="188" column="0" lean-forward="false" selection-start-line="184" selection-start-column="0" selection-end-line="188" selection-end-column="0" />
+        <state relative-caret-position="198">
+          <caret line="160" column="12" lean-forward="false" selection-start-line="160" selection-start-column="12" selection-end-line="160" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/hdx/data/test_dataset.py">
+    <entry file="file://$PROJECT_DIR$/hdx/version.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="569">
-          <caret line="510" column="40" lean-forward="false" selection-start-line="510" selection-start-column="40" selection-end-line="510" selection-end-column="40" />
+        <state relative-caret-position="0">
+          <caret line="0" column="3" lean-forward="false" selection-start-line="0" selection-start-column="3" selection-end-line="0" selection-end-column="3" />
           <folding />
         </state>
       </provider>
diff --git a/README.md b/README.md
index cbd940d7..70d938a0 100644
--- a/README.md
+++ b/README.md
@@ -99,13 +99,13 @@ Replace `VERSION` with the latest tag available from [https://github.com/OCHA-DA
 
     If you only want to read data:
 
-        configuration = Configuration(hdx_site='test', hdx_read_only=True, project_config_dict={})
+        Configuration.create(hdx_site='test', hdx_read_only=True, project_config_dict={})
     If you want to write data and you have an API key stored in a file `.hdxkey` in the current user's home directory:
 
-        configuration = Configuration(hdx_site='test', project_config_dict={})
+        Configuration.create(hdx_site='test', project_config_dict={})
 9. Read this dataset [ACLED Conflict Data for Africa (Realtime - 2016)](https://test-data.humdata.org/dataset/acled-conflict-data-for-africa-realtime-2016#) from HDX and view the date of the dataset:
 
-        dataset = Dataset.read_from_hdx(configuration, 'acled-conflict-data-for-africa-realtime-2016')
+        dataset = Dataset.read_from_hdx('acled-conflict-data-for-africa-realtime-2016')
         print(dataset.get_dataset_date())
 10. If you have an API key, as a test, change the dataset date:
 
@@ -118,7 +118,7 @@ Replace `VERSION` with the latest tag available from [https://github.com/OCHA-DA
         dataset.update_in_hdx()
 12. You can search for datasets on HDX and get their resources:
 
-        datasets = Dataset.search_in_hdx(configuration, 'ACLED', rows=10)
+        datasets = Dataset.search_in_hdx('ACLED', rows=10)
         print(datasets)
         resources = Dataset.get_all_resources(datasets)
         print(resources)
@@ -147,14 +147,12 @@ You will most likely just need the simple facade. If you are in the HDX team, yo
 
     from hdx.facades.simple import facade
 
-    def main(configuration):  
+    def main():  
         ***YOUR CODE HERE***
 
     if __name__ == '__main__':  
         facade(main)
 
-The configuration is passed to your main function in the `configuration` argument above.
-
 
 ### Customising the Configuration
 
@@ -169,11 +167,11 @@ If you did not need a project configuration, you could simply provide an empty d
 
     facade(main, project_config_dict = {})
 
-If you do not use the facade, you can use the `Configuration` class directly, passing in appropriate keyword arguments ie.
+If you do not use the facade, you can use the `create` method of the `Configuration` class directly, passing in appropriate keyword arguments ie.
 
     from hdx.configuration import Configuration  
     ...  
-    cfg = Configuration(KEYWORD ARGUMENTS)
+    Configuration.create(KEYWORD ARGUMENTS)
 
 `KEYWORD ARGUMENTS` can be:
 
@@ -243,23 +241,23 @@ Then use the logger like this:
 
 ### Operations on HDX Objects
 
-You can read an existing HDX object with the static `read_from_hdx` method which takes a configuration and an identifier parameter and returns the an object of the appropriate HDX object type eg. `Dataset` or `None` depending upon whether the object was read eg.
+You can read an existing HDX object with the static `read_from_hdx` method which takes an identifier parameter and returns the an object of the appropriate HDX object type eg. `Dataset` or `None` depending upon whether the object was read eg.
 
-    dataset = Dataset.read_from_hdx(configuration, 'DATASET_ID_OR_NAME')
+    dataset = Dataset.read_from_hdx('DATASET_ID_OR_NAME')
 
-You can search for datasets and resources in HDX using the `search_in_hdx` method which takes a configuration and a query parameter and returns the a list of objects of the appropriate HDX object type eg. `list[Dataset]` eg.
+You can search for datasets and resources in HDX using the `search_in_hdx` method which takes a query parameter and returns the a list of objects of the appropriate HDX object type eg. `list[Dataset]` eg.
 
-    datasets = Dataset.search_in_hdx(configuration, 'QUERY', **kwargs)
+    datasets = Dataset.search_in_hdx('QUERY', **kwargs)
 
 The query parameter takes a different format depending upon whether it is for a [dataset](http://docs.ckan.org/en/ckan-2.3.4/api/index.html#ckan.logic.action.get.package_search) or a [resource](http://docs.ckan.org/en/ckan-2.3.4/api/index.html#ckan.logic.action.get.resource_search). The resource level search is limited to fields in the resource, so in most cases, it is preferable to search for datasets and then get their resources.
 
 Various additional arguments (`**kwargs`) can be supplied. These are detailed in the API documentation. The rows parameter for datasets (limit for resources) is the maximum number of matches returned and is by default 10.
 
-You can create an HDX Object, such as a dataset, resource or gallery item by calling the constructor with a configuration, which is required, and an optional dictionary containing metadata. For example:
+You can create an HDX Object, such as a dataset, resource or gallery item by calling the constructor with an optional dictionary containing metadata. For example:
 
     from hdx.data.dataset import Dataset
 
-    dataset = Dataset(configuration, {  
+    dataset = Dataset({  
         'name': slugified_name,  
         'title': title
     })
@@ -486,10 +484,10 @@ Next create a file called `run.py` and copy into it the code below.
     logger = logging.getLogger(__name__)
 
 
-    def main(configuration: dict):
+    def main():
         '''Generate dataset and create it in HDX'''
 
-        dataset = generate_dataset(configuration)
+        dataset = generate_dataset()
         dataset.create_in_hdx()
 
     if __name__ == '__main__':
@@ -511,7 +509,7 @@ Create a file `my_code.py` and copy into it the code below:
     logger = logging.getLogger(__name__)
 
 
-    def generate_dataset(configuration):
+    def generate_dataset():
         '''Create a dataset
         '''
         logger.debug('Generating dataset!')
diff --git a/hdx/__init__.py b/hdx/__init__.py
index e69de29b..daa74da5 100644
--- a/hdx/__init__.py
+++ b/hdx/__init__.py
@@ -0,0 +1,2 @@
+configuration = None
+remoteckan = None
diff --git a/hdx/configuration.py b/hdx/configuration.py
index 65e7a239..48b8bc17 100644
--- a/hdx/configuration.py
+++ b/hdx/configuration.py
@@ -7,6 +7,9 @@
 from os.path import expanduser, join
 from typing import Optional
 
+import ckanapi
+
+import hdx
 from hdx.utilities.dictionary import merge_two_dictionaries
 from hdx.utilities.loader import load_yaml, load_json
 from hdx.utilities.path import script_dir_plus_file
@@ -151,3 +154,51 @@ def load_api_key(path: str) -> str:
             raise (ValueError('HDX api key is empty!'))
         logger.info('Loaded HDX api key from: %s' % path)
         return apikey
+
+    @staticmethod
+    def read() -> 'Configuration':
+        """
+        Read the HDX configuration
+
+        Returns:
+            Configuration: The HDX configuration
+
+        """
+        if hdx.configuration is None:
+            raise ConfigurationError('There is no HDX configuration! Use Configuration.create(**kwargs)')
+        return hdx.configuration
+
+    @staticmethod
+    def remoteckan() -> ckanapi.RemoteCKAN:
+        """
+        Return the remote CKAN object (see ckanapi library)
+
+        Returns:
+            ckanapi.RemoteCKAN: The remote CKAN object
+
+        """
+        if hdx.remoteckan is None:
+            if hdx.configuration is None:
+                raise ConfigurationError('There is no HDX configuration! Use Configuration.create(**kwargs)')
+            raise ConfigurationError('There is no remote CKAN set up! Use Configuration.create(**kwargs)')
+        return hdx.remoteckan
+
+    @staticmethod
+    def create(**kwargs) -> 'Configuration':
+        """
+        Create
+
+        Args:
+            path (str): Path to HDX key
+
+        Returns:
+            str: HDX api key
+
+        """
+        hdx.configuration = Configuration(**kwargs)
+        version_file = open(script_dir_plus_file('version.txt', Configuration))
+        version = version_file.read().strip()
+        hdx.remoteckan = ckanapi.RemoteCKAN(hdx.configuration.get_hdx_site_url(),
+                                            apikey=hdx.configuration.get_api_key(),
+                                            user_agent='HDXPythonLibrary/%s' % version)
+        return hdx.configuration
diff --git a/hdx/data/dataset.py b/hdx/data/dataset.py
index 769f637b..e9992926 100644
--- a/hdx/data/dataset.py
+++ b/hdx/data/dataset.py
@@ -26,7 +26,6 @@ class Dataset(HDXObject):
     """Dataset class enabling operations on datasets and associated resources and gallery items.
 
     Args:
-        configuration (Configuration): HDX Configuration
         initial_data (Optional[dict]): Initial dataset metadata dictionary. Defaults to None.
         include_gallery (Optional[bool]): Whether to include gallery items in dataset. Defaults to True.
     """
@@ -60,11 +59,11 @@ class Dataset(HDXObject):
         'yearly': '365'
     }
 
-    def __init__(self, configuration: Configuration, initial_data: Optional[dict] = None,
+    def __init__(self, initial_data: Optional[dict] = None,
                  include_gallery: Optional[bool] = True):
         if not initial_data:
             initial_data = dict()
-        super(Dataset, self).__init__(configuration, initial_data)
+        super(Dataset, self).__init__(initial_data)
         self.include_gallery = include_gallery
         self.init_resources()
         self.init_gallery()
@@ -135,7 +134,7 @@ def add_update_resource(self, resource: Any) -> None:
             None
         """
         if isinstance(resource, dict):
-            resource = Resource(self.configuration, resource)
+            resource = Resource(resource)
         if isinstance(resource, Resource):
             if 'package_id' in resource:
                 raise HDXError("Resource %s being added already has a dataset id!" % (resource['name']))
@@ -200,7 +199,7 @@ def add_update_galleryitem(self, galleryitem) -> None:
 
         """
         if isinstance(galleryitem, dict):
-            galleryitem = GalleryItem(self.configuration, galleryitem)
+            galleryitem = GalleryItem(galleryitem)
         if isinstance(galleryitem, GalleryItem):
             if 'dataset_id' in galleryitem:
                 raise HDXError("Gallery item %s being added already has a dataset id!" % (galleryitem['name']))
@@ -272,18 +271,17 @@ def update_from_json(self, path: Optional[str] = join('config', 'hdx_dataset_sta
         self.separate_gallery()
 
     @staticmethod
-    def read_from_hdx(configuration: Configuration, identifier: str) -> Optional['Dataset']:
+    def read_from_hdx(identifier: str) -> Optional['Dataset']:
         """Reads the dataset given by identifier from HDX and returns Dataset object
 
         Args:
-            configuration (Configuration): HDX Configuration
             identifier (str): Identifier of dataset
 
         Returns:
             Optional[Dataset]: Dataset object if successful read, None if not
         """
 
-        dataset = Dataset(configuration)
+        dataset = Dataset()
         result = dataset._dataset_load_from_hdx(identifier)
         if result:
             return dataset
@@ -326,7 +324,7 @@ def check_required_fields(self, ignore_dataset_id=False) -> None:
         Returns:
             None
         """
-        for field in self.configuration['dataset']['required_fields']:
+        for field in Configuration.read()['dataset']['required_fields']:
             if field not in self.data:
                 raise HDXError("Field %s is missing in dataset!" % field)
 
@@ -388,7 +386,7 @@ def _dataset_merge_hdx_update(self, update_resources: bool, update_gallery: bool
         if self.include_gallery and update_gallery and old_gallery:
             self.old_data['gallery'] = self._copy_hdxobjects(self.gallery, GalleryItem)
             galleryitem_titles = set()
-            galleryitem_dataset_id = self.configuration['galleryitem']['dataset_id']
+            galleryitem_dataset_id = Configuration.read()['galleryitem']['dataset_id']
             for i, galleryitem in enumerate(self.gallery):
                 galleryitem_title = galleryitem['title']
                 galleryitem_titles.add(galleryitem_title)
@@ -469,7 +467,7 @@ def create_in_hdx(self) -> None:
 
         if self.include_gallery:
             self.old_data['gallery'] = self._copy_hdxobjects(self.gallery, GalleryItem)
-            galleryitem_dataset_id = self.configuration['galleryitem']['dataset_id']
+            galleryitem_dataset_id = Configuration.read()['galleryitem']['dataset_id']
             for i, galleryitem in enumerate(self.gallery):
                 galleryitem[galleryitem_dataset_id] = self.data['id']
                 galleryitem.check_required_fields()
@@ -484,12 +482,11 @@ def delete_from_hdx(self) -> None:
         self._delete_from_hdx('dataset', 'id')
 
     @staticmethod
-    def search_in_hdx(configuration: Configuration, query: str, include_gallery: Optional[bool] = True, **kwargs) -> \
+    def search_in_hdx(query: str, include_gallery: Optional[bool] = True, **kwargs) -> \
             List['Dataset']:
         """Searches for datasets in HDX
 
         Args:
-            configuration (Configuration): HDX Configuration
             query (str): Query (in Solr format). Defaults to '*:*'.
             include_gallery (Optional[bool]): Whether to include gallery items in dataset. Defaults to True.
             **kwargs: See below
@@ -508,7 +505,7 @@ def search_in_hdx(configuration: Configuration, query: str, include_gallery: Opt
         """
 
         all_datasets = list()
-        dataset = Dataset(configuration)
+        dataset = Dataset()
         total_rows = kwargs.get('rows', sys.maxsize)
         start = kwargs.get('start', 0)
         for page in range(total_rows // 1000 + 1):
@@ -524,7 +521,7 @@ def search_in_hdx(configuration: Configuration, query: str, include_gallery: Opt
                 if count:
                     no_results = len(result['results'])
                     for datasetdict in result['results']:
-                        dataset = Dataset(configuration, include_gallery=include_gallery)
+                        dataset = Dataset(include_gallery=include_gallery)
                         dataset.old_data = dict()
                         dataset.data = datasetdict
                         dataset._dataset_create_resources_gallery()
@@ -539,12 +536,11 @@ def search_in_hdx(configuration: Configuration, query: str, include_gallery: Opt
         return all_datasets
 
     @staticmethod
-    def get_all_datasets(configuration: Configuration, include_gallery: Optional[bool] = True, **kwargs) -> List[
+    def get_all_datasets(include_gallery: Optional[bool] = True, **kwargs) -> List[
         'Dataset']:
         """Get all datasets in HDX
 
         Args:
-            configuration (Configuration): HDX Configuration
             include_gallery (Optional[bool]): Whether to include gallery items in dataset. Defaults to True.
             **kwargs: See below
             rows (int): Number of rows to return. Defaults to all datasets (sys.maxsize).
@@ -553,7 +549,7 @@ def get_all_datasets(configuration: Configuration, include_gallery: Optional[boo
         Returns:
             List[Dataset]: List of all datasets in HDX
         """
-        return Dataset.search_in_hdx(configuration, '', include_gallery, **kwargs)
+        return Dataset.search_in_hdx('', include_gallery, **kwargs)
 
     @staticmethod
     def get_all_resources(datasets: List['Dataset']) -> List['Resource']:
diff --git a/hdx/data/galleryitem.py b/hdx/data/galleryitem.py
index 14352f6e..ee8751be 100644
--- a/hdx/data/galleryitem.py
+++ b/hdx/data/galleryitem.py
@@ -15,13 +15,13 @@ class GalleryItem(HDXObject):
     """GalleryItem class containing all logic for creating, checking, and updating gallery items.
 
     Args:
-        configuration (Configuration): HDX Configuration
         initial_data (Optional[dict]): Initial gallery item metadata dictionary. Defaults to None.
     """
-    def __init__(self, configuration: Configuration, initial_data: Optional[dict] = None):
+
+    def __init__(self, initial_data: Optional[dict] = None):
         if not initial_data:
             initial_data = dict()
-        super(GalleryItem, self).__init__(configuration, initial_data)
+        super(GalleryItem, self).__init__(initial_data)
 
     @staticmethod
     def actions() -> dict:
@@ -61,18 +61,17 @@ def update_from_json(self, path: str = join('config', 'hdx_galleryitem_static.js
         super(GalleryItem, self).update_from_json(path)
 
     @staticmethod
-    def read_from_hdx(configuration: Configuration, identifier: str) -> Optional['GalleryItem']:
+    def read_from_hdx(identifier: str) -> Optional['GalleryItem']:
         """Reads the gallery item given by identifier from HDX and returns GalleryItem object
 
         Args:
-            configuration (Configuration): HDX Configuration
             identifier (str): Identifier of gallery item
 
         Returns:
             Optional[GalleryItem]: GalleryItem object if successful read, None if not
         """
 
-        galleryitem = GalleryItem(configuration)
+        galleryitem = GalleryItem()
         result = galleryitem._load_from_hdx('galleryitem', identifier)
         if result:
             return galleryitem
@@ -90,7 +89,7 @@ def check_required_fields(self, ignore_dataset_id=False) -> None:
             None
         """
         if ignore_dataset_id:
-            ignore_fields = [self.configuration['galleryitem']['dataset_id']]
+            ignore_fields = [Configuration.read()['galleryitem']['dataset_id']]
         else:
             ignore_fields = list()
         self._check_required_fields('galleryitem', ignore_fields)
diff --git a/hdx/data/hdxobject.py b/hdx/data/hdxobject.py
index 95e732a8..ac24fc2c 100644
--- a/hdx/data/hdxobject.py
+++ b/hdx/data/hdxobject.py
@@ -7,16 +7,13 @@
 import copy
 import logging
 from collections import UserDict
-from os.path import join
 from typing import Optional, List, Tuple, TypeVar, Union
 
-import ckanapi
 from ckanapi.errors import NotFound
 
 from hdx.configuration import Configuration
 from hdx.utilities.dictionary import merge_two_dictionaries
 from hdx.utilities.loader import load_yaml_into_existing_dict, load_json_into_existing_dict
-from hdx.utilities.path import script_dir_plus_file
 
 logger = logging.getLogger(__name__)
 
@@ -32,7 +29,6 @@ class HDXObject(UserDict):
     New HDX objects should extend this in similar fashion to Resource for example.
 
     Args:
-        configuration (Configuration): HDX Configuration
         initial_data (dict): Initial metadata dictionary
     """
     __metaclass__ = abc.ABCMeta
@@ -47,15 +43,9 @@ def actions() -> dict:
         """
         pass
 
-    def __init__(self, configuration: Configuration, initial_data: dict):
+    def __init__(self, initial_data: dict):
         super(HDXObject, self).__init__(initial_data)
-        self.configuration = configuration
         self.old_data = None
-        version_file = open(script_dir_plus_file(join('..', 'version.txt'), HDXObject))
-        version = version_file.read().strip()
-        self.hdxpostsite = ckanapi.RemoteCKAN(configuration.get_hdx_site_url(),
-                                              apikey=configuration.get_api_key(),
-                                              user_agent='HDXPythonLibrary/%s' % version)
 
     def get_old_data_dict(self) -> None:
         """Get previous internal dictionary
@@ -109,8 +99,9 @@ def _read_from_hdx(self, object_type: str, value: str, fieldname: str = 'id',
         data = {fieldname: value}
         data.update(kwargs)
         try:
-            result = self.hdxpostsite.call_action(action, data,
-                                                  requests_kwargs={'auth': self.configuration._get_credentials()})
+            result = Configuration.remoteckan().call_action(action, data,
+                                                            requests_kwargs={
+                                                                'auth': Configuration.read()._get_credentials()})
             return True, result
         except NotFound:
             return False, "%s=%s: not found!" % (fieldname, value)
@@ -137,11 +128,10 @@ def _load_from_hdx(self, object_type: str, id_field: str) -> bool:
 
     @staticmethod
     @abc.abstractmethod
-    def read_from_hdx(configuration: Configuration, id_field: str) -> Optional[HDXObjectUpperBound]:
+    def read_from_hdx(id_field: str) -> Optional[HDXObjectUpperBound]:
         """Abstract method to read the HDX object given by identifier from HDX and return it
 
         Args:
-            configuration (Configuration): HDX Configuration
             id_field (str): HDX object identifier
 
         Returns:
@@ -192,7 +182,7 @@ def _check_required_fields(self, object_type: str, ignore_fields: List[str]) ->
         Returns:
             None
         """
-        for field in self.configuration['%s' % object_type]['required_fields']:
+        for field in Configuration.read()['%s' % object_type]['required_fields']:
             if field not in self.data and field not in ignore_fields:
                 raise HDXError("Field %s is missing in %s!" % (field, object_type))
 
@@ -208,7 +198,7 @@ def _merge_hdx_update(self, object_type: str, id_field_name: str, file_to_upload
             None
         """
         merge_two_dictionaries(self.data, self.old_data)
-        ignore_dataset_id = self.configuration['%s' % object_type].get('ignore_dataset_id_on_update', False)
+        ignore_dataset_id = Configuration.read()['%s' % object_type].get('ignore_dataset_id_on_update', False)
         self.check_required_fields(ignore_dataset_id=ignore_dataset_id)
         self._save_to_hdx('update', id_field_name, file_to_upload)
 
@@ -255,8 +245,9 @@ def _write_to_hdx(self, action: str, data: dict, id_field_name: str, file_to_upl
                 files = [('upload', file)]
             else:
                 files = None
-            return self.hdxpostsite.call_action(self.actions()[action], data, files=files,
-                                                requests_kwargs={'auth': self.configuration._get_credentials()})
+            return Configuration.remoteckan().call_action(self.actions()[action], data, files=files,
+                                                          requests_kwargs={
+                                                              'auth': Configuration.read()._get_credentials()})
         except Exception as e:
             raise HDXError('Failed when trying to %s %s! (POST)' % (action, self.data[id_field_name])) from e
         finally:
@@ -381,7 +372,7 @@ def _copy_hdxobjects(self, hdxobjects: List[HDXObjectUpperBound], hdxobjectclass
         newhdxobjects = list()
         for hdxobject in hdxobjects:
             newhdxobjectdata = copy.deepcopy(hdxobject.data)
-            newhdxobject = hdxobjectclass(self.configuration, newhdxobjectdata)
+            newhdxobject = hdxobjectclass(newhdxobjectdata)
             if attribute_to_copy:
                 value = getattr(hdxobject, attribute_to_copy)
                 setattr(newhdxobject, attribute_to_copy, value)
@@ -416,5 +407,5 @@ def _separate_hdxobjects(self, hdxobjects: List[HDXObjectUpperBound], hdxobjects
                         break
             for new_hdxobject in new_hdxobjects:
                 if not new_hdxobject[id_field] in hdxobject_names:
-                    hdxobjects.append(hdxobjectclass(self.configuration, new_hdxobject))
+                    hdxobjects.append(hdxobjectclass(new_hdxobject))
             del self.data[hdxobjects_name]
diff --git a/hdx/data/resource.py b/hdx/data/resource.py
index eed28a29..359331ec 100644
--- a/hdx/data/resource.py
+++ b/hdx/data/resource.py
@@ -20,13 +20,13 @@ class Resource(HDXObject):
     """Resource class containing all logic for creating, checking, and updating resources.
 
     Args:
-        configuration (Configuration): HDX Configuration
         initial_data (Optional[dict]): Initial resource metadata dictionary. Defaults to None.
     """
-    def __init__(self, configuration: Configuration, initial_data: Optional[dict] = None):
+
+    def __init__(self, initial_data: Optional[dict] = None):
         if not initial_data:
             initial_data = dict()
-        super(Resource, self).__init__(configuration, initial_data)
+        super(Resource, self).__init__(initial_data)
         self.file_to_upload = None
 
     @staticmethod
@@ -71,18 +71,17 @@ def update_from_json(self, path: str = join('config', 'hdx_resource_static.json'
         super(Resource, self).update_from_json(path)
 
     @staticmethod
-    def read_from_hdx(configuration: Configuration, identifier: str) -> Optional['Resource']:
+    def read_from_hdx(identifier: str) -> Optional['Resource']:
         """Reads the resource given by identifier from HDX and returns Resource object
 
         Args:
-            configuration (Configuration): HDX Configuration
             identifier (str): Identifier of resource
 
         Returns:
             Optional[Resource]: Resource object if successful read, None if not
         """
 
-        resource = Resource(configuration)
+        resource = Resource()
         result = resource._load_from_hdx('resource', identifier)
         if result:
             return resource
@@ -137,7 +136,7 @@ def check_required_fields(self, ignore_dataset_id=False) -> None:
             if 'tracking_summary' in self.data:
                 del self.data['tracking_summary']
         if ignore_dataset_id:
-            ignore_fields = [self.configuration['resource']['dataset_id']]
+            ignore_fields = [Configuration.read()['resource']['dataset_id']]
         else:
             ignore_fields = list()
 
@@ -168,11 +167,10 @@ def delete_from_hdx(self) -> None:
         self._delete_from_hdx('resource', 'id')
 
     @staticmethod
-    def search_in_hdx(configuration: Configuration, query: str, **kwargs) -> List['Resource']:
+    def search_in_hdx(query: str, **kwargs) -> List['Resource']:
         """Searches for resources in HDX. NOTE: Does not search dataset metadata!
 
         Args:
-            configuration (Configuration): HDX Configuration
             query (str): Query
             **kwargs: See below
             order_by (str): A field on the Resource model that orders the results
@@ -183,13 +181,13 @@ def search_in_hdx(configuration: Configuration, query: str, **kwargs) -> List['R
         """
 
         resources = []
-        resource = Resource(configuration)
+        resource = Resource()
         success, result = resource._read_from_hdx('resource', query, 'query', Resource.actions()['search'])
         if result:
             count = result.get('count', None)
             if count:
                 for resourcedict in result['results']:
-                    resource = Resource(configuration, resourcedict)
+                    resource = Resource(resourcedict)
                     resources.append(resource)
         else:
             logger.debug(result)
diff --git a/hdx/facades/scraperwiki.py b/hdx/facades/scraperwiki.py
index 15827e5a..05e8634b 100644
--- a/hdx/facades/scraperwiki.py
+++ b/hdx/facades/scraperwiki.py
@@ -15,11 +15,11 @@
 setup_logging(**logging_kwargs)
 
 
-def facade(projectmainfn: Callable[[Configuration], None], **kwargs) -> bool:
+def facade(projectmainfn: Callable[[None], None], **kwargs) -> bool:
     """Facade that handles ScraperWiki and calls project main function
 
     Args:
-        projectmainfn ((configuration) -> None): main function of project
+        projectmainfn ((None) -> None): main function of project
         **kwargs: configuration parameters to pass to HDX Configuration class
 
     Returns:
@@ -30,12 +30,12 @@ def facade(projectmainfn: Callable[[Configuration], None], **kwargs) -> bool:
         #
         # Setting up configuration
         #
-        configuration = Configuration(**kwargs)
+        configuration = Configuration.create(**kwargs)
 
         logger.info('--------------------------------------------------')
         logger.info('> HDX Site: %s' % configuration.get_hdx_site_url())
 
-        projectmainfn(configuration)
+        projectmainfn()
 
     except Exception as e:
         logger.critical(e, exc_info=True)
diff --git a/hdx/facades/simple.py b/hdx/facades/simple.py
index 30ebb253..456a66c6 100644
--- a/hdx/facades/simple.py
+++ b/hdx/facades/simple.py
@@ -12,11 +12,11 @@
 setup_logging(**logging_kwargs)
 
 
-def facade(projectmainfn: Callable[[Configuration], None], **kwargs) -> None:
+def facade(projectmainfn: Callable[[None], None], **kwargs) -> None:
     """Facade to simplify project setup that calls project main function
 
     Args:
-        projectmainfn ((configuration) -> None): main function of project
+        projectmainfn ((None) -> None): main function of project
         **kwargs: configuration parameters to pass to HDX Configuration class
 
     Returns:
@@ -26,9 +26,9 @@ def facade(projectmainfn: Callable[[Configuration], None], **kwargs) -> None:
     #
     # Setting up configuration
     #
-    configuration = Configuration(**kwargs)
+    configuration = Configuration.create(**kwargs)
 
     logger.info('--------------------------------------------------')
     logger.info('> HDX Site: %s' % configuration.get_hdx_site_url())
 
-    projectmainfn(configuration)
+    projectmainfn()
diff --git a/hdx/version.txt b/hdx/version.txt
index 3c3fca5c..69dda945 100644
--- a/hdx/version.txt
+++ b/hdx/version.txt
@@ -1 +1 @@
-0.70
\ No newline at end of file
+0.80
\ No newline at end of file
diff --git a/tests/hdx/data/test_dataset.py b/tests/hdx/data/test_dataset.py
index 197ef39d..4e0941dd 100644
--- a/tests/hdx/data/test_dataset.py
+++ b/tests/hdx/data/test_dataset.py
@@ -368,26 +368,26 @@ def post(url, data, headers, files, allow_redirects, auth):
 
         monkeypatch.setattr(requests, 'Session', MockSession)
 
-    @pytest.fixture(scope='class')
+    @pytest.fixture(scope='function')
     def configuration(self):
         hdx_key_file = join('fixtures', '.hdxkey')
         project_config_yaml = join('fixtures', 'config', 'project_configuration.yml')
-        return Configuration(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
+        Configuration.create(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
 
     def test_read_from_hdx(self, configuration, read):
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         assert dataset['id'] == '6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d'
         assert dataset['name'] == 'MyDataset1'
         assert dataset['dataset_date'] == '06/04/2016'
         assert len(dataset.resources) == 2
         assert len(dataset.gallery) == 1
-        dataset = Dataset.read_from_hdx(configuration, 'TEST2')
+        dataset = Dataset.read_from_hdx('TEST2')
         assert dataset is None
-        dataset = Dataset.read_from_hdx(configuration, 'TEST3')
+        dataset = Dataset.read_from_hdx('TEST3')
         assert dataset is None
 
     def test_create_in_hdx(self, configuration, post_create):
-        dataset = Dataset(configuration)
+        dataset = Dataset()
         with pytest.raises(HDXError):
             dataset.create_in_hdx()
         dataset['id'] = 'TEST1'
@@ -396,19 +396,19 @@ def test_create_in_hdx(self, configuration, post_create):
             dataset.create_in_hdx()
 
         dataset_data = copy.deepcopy(TestDataset.dataset_data)
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         dataset.create_in_hdx()
         assert dataset['id'] == '6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d'
         assert len(dataset.resources) == 2
         assert len(dataset.gallery) == 0
 
         dataset_data['name'] = 'MyDataset2'
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         with pytest.raises(HDXError):
             dataset.create_in_hdx()
 
         dataset_data['name'] = 'MyDataset3'
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         with pytest.raises(HDXError):
             dataset.create_in_hdx()
 
@@ -416,9 +416,9 @@ def test_create_in_hdx(self, configuration, post_create):
         gallery_data = copy.deepcopy(TestDataset.gallery_data)
         dataset_data['gallery'] = gallery_data
         with pytest.raises(HDXError):
-            dataset = Dataset(configuration, dataset_data)
+            dataset = Dataset(dataset_data)
         del dataset_data['gallery']
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         del gallery_data[0]['id']
         dataset.add_update_gallery(gallery_data)
         dataset.create_in_hdx()
@@ -430,9 +430,9 @@ def test_create_in_hdx(self, configuration, post_create):
         resources_data = copy.deepcopy(TestDataset.resources_data)
         dataset_data['resources'] = resources_data
         with pytest.raises(HDXError):
-            dataset = Dataset(configuration, dataset_data)
+            dataset = Dataset(dataset_data)
         del dataset_data['resources']
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         del resources_data[0]['id']
         del resources_data[1]['id']
         dataset.add_update_resources(resources_data)
@@ -441,8 +441,8 @@ def test_create_in_hdx(self, configuration, post_create):
         assert len(dataset.resources) == 2
         assert len(dataset.gallery) == 0
         dataset_data = copy.deepcopy(TestDataset.dataset_data)
-        dataset = Dataset(configuration, dataset_data)
-        resource = Resource(configuration, resources_data[0])
+        dataset = Dataset(dataset_data)
+        resource = Resource(resources_data[0])
         file = tempfile.NamedTemporaryFile(delete=False)
         resource.set_file_to_upload(file.name)
         dataset.add_update_resource(resource)
@@ -452,7 +452,7 @@ def test_create_in_hdx(self, configuration, post_create):
         assert len(dataset.gallery) == 0
 
     def test_update_in_hdx(self, configuration, post_update):
-        dataset = Dataset(configuration)
+        dataset = Dataset()
         dataset['id'] = 'NOTEXIST'
         with pytest.raises(HDXError):
             dataset.update_in_hdx()
@@ -460,7 +460,7 @@ def test_update_in_hdx(self, configuration, post_update):
         with pytest.raises(HDXError):
             dataset.update_in_hdx()
 
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         assert dataset['id'] == '6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d'
         assert dataset['dataset_date'] == '06/04/2016'
 
@@ -483,7 +483,7 @@ def test_update_in_hdx(self, configuration, post_update):
         gallery_data = copy.deepcopy(TestDataset.gallery_data)
         dataset_data['name'] = 'MyDataset1'
         dataset_data['id'] = 'TEST1'
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         dataset.add_update_gallery(gallery_data)
         dataset.create_in_hdx()
         assert dataset['id'] == 'TEST1'
@@ -493,16 +493,16 @@ def test_update_in_hdx(self, configuration, post_update):
         dataset.update_in_hdx()
         assert len(dataset.resources) == 2
         assert len(dataset.gallery) == 1
-        dataset = Dataset.read_from_hdx(configuration, 'TEST4')
+        dataset = Dataset.read_from_hdx('TEST4')
         del gallery_data[0]['id']
         dataset.add_update_gallery(gallery_data)
         dataset['id'] = 'TEST4'
         dataset.update_in_hdx()
         assert len(dataset.resources) == 2
         assert len(dataset.gallery) == 1
-        dataset = Dataset.read_from_hdx(configuration, 'TEST4')
+        dataset = Dataset.read_from_hdx('TEST4')
         resources_data = copy.deepcopy(TestDataset.resources_data)
-        resource = Resource(configuration, resources_data[0])
+        resource = Resource(resources_data[0])
         file = tempfile.NamedTemporaryFile(delete=False)
         resource.set_file_to_upload(file.name)
         dataset.add_update_resource(resource)
@@ -512,7 +512,7 @@ def test_update_in_hdx(self, configuration, post_update):
         assert len(dataset.gallery) == 0
 
     def test_delete_from_hdx(self, configuration, post_delete):
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         dataset.delete_from_hdx()
         del dataset['id']
         with pytest.raises(HDXError):
@@ -520,7 +520,7 @@ def test_delete_from_hdx(self, configuration, post_delete):
 
     def test_update_yaml(self, configuration, static_yaml):
         dataset_data = copy.deepcopy(TestDataset.dataset_data)
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         assert dataset['name'] == 'MyDataset1'
         assert dataset['author'] == 'AN Other'
         dataset.update_from_yaml(static_yaml)
@@ -541,7 +541,7 @@ def test_update_yaml(self, configuration, static_yaml):
 
     def test_update_json(self, configuration, static_json):
         dataset_data = copy.deepcopy(TestDataset.dataset_data)
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         assert dataset['name'] == 'MyDataset1'
         assert dataset['author'] == 'AN Other'
         dataset.update_from_json(static_json)
@@ -564,7 +564,7 @@ def test_update_json(self, configuration, static_json):
     def test_add_update_delete_resources(self, configuration, post_delete):
         dataset_data = copy.deepcopy(TestDataset.dataset_data)
         resources_data = copy.deepcopy(TestDataset.resources_data)
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         dataset.add_update_resources(resources_data)
         assert len(dataset.resources) == 2
         dataset.delete_resource('NOTEXIST')
@@ -572,7 +572,7 @@ def test_add_update_delete_resources(self, configuration, post_delete):
         dataset.delete_resource('de6549d8-268b-4dfe-adaf-a4ae5c8510d5')
         assert len(dataset.resources) == 1
         resources_data = copy.deepcopy(TestDataset.resources_data)
-        resource = Resource(configuration, resources_data[0])
+        resource = Resource(resources_data[0])
         resource.set_file_to_upload('lala')
         dataset.add_update_resource(resource)
         assert dataset.resources[1].get_file_to_upload() == 'lala'
@@ -580,7 +580,7 @@ def test_add_update_delete_resources(self, configuration, post_delete):
     def test_add_update_delete_gallery(self, configuration, post_delete):
         dataset_data = copy.deepcopy(TestDataset.dataset_data)
         gallery_data = copy.deepcopy(TestDataset.gallery_data)
-        dataset = Dataset(configuration, dataset_data)
+        dataset = Dataset(dataset_data)
         dataset.add_update_gallery(gallery_data)
         assert len(dataset.gallery) == 1
         dataset.delete_galleryitem('NOTEXIST')
@@ -588,24 +588,24 @@ def test_add_update_delete_gallery(self, configuration, post_delete):
         assert len(dataset.gallery) == 0
 
     def test_search_in_hdx(self, configuration, search):
-        datasets = Dataset.search_in_hdx(configuration, 'ACLED')
+        datasets = Dataset.search_in_hdx('ACLED')
         assert len(datasets) == 10
-        datasets = Dataset.search_in_hdx(configuration, 'ajyhgr')
+        datasets = Dataset.search_in_hdx('ajyhgr')
         assert len(datasets) == 0
         with pytest.raises(HDXError):
-            Dataset.search_in_hdx(configuration, '"')
+            Dataset.search_in_hdx('"')
 
     def test_get_all_datasets(self, configuration, search):
         datasets = Dataset.get_all_datasets(configuration)
         assert len(datasets) == 10
 
     def test_get_all_resources(self, configuration, search):
-        datasets = Dataset.search_in_hdx(configuration, 'ACLED')
+        datasets = Dataset.search_in_hdx('ACLED')
         resources = Dataset.get_all_resources(datasets)
         assert len(resources) == 3
 
     def test_get_set_dataset_date(self, configuration, read):
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         assert dataset['dataset_date'] == '06/04/2016'
         assert dataset.get_dataset_date_as_datetime() == datetime.datetime(2016, 6, 4, 0, 0)
         assert dataset.get_dataset_date() == '2016-06-04'
@@ -650,7 +650,7 @@ def test_transform_update_frequency(self):
         assert Dataset.transform_update_frequency('LALA') is None
 
     def test_get_set_expected_update_frequency(self, configuration, read):
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         assert dataset['data_update_frequency'] == '7'
         assert dataset.get_expected_update_frequency() == 'Every week'
         dataset.set_expected_update_frequency('every two weeks')
@@ -668,7 +668,7 @@ def test_get_set_expected_update_frequency(self, configuration, read):
         assert dataset.get_expected_update_frequency() is None
 
     def test_get_add_tags(self, configuration, read):
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         assert dataset['tags'] == resulttags
         assert dataset.get_tags() == ['conflict', 'political violence']
         dataset.add_tag('LALA')
@@ -690,7 +690,7 @@ def test_get_add_tags(self, configuration, read):
         assert dataset.get_tags() == ['LALA']
 
     def test_get_add_location(self, configuration, read):
-        dataset = Dataset.read_from_hdx(configuration, 'TEST1')
+        dataset = Dataset.read_from_hdx('TEST1')
         assert dataset['groups'] == resultgroups
         assert dataset.get_location() == ['Algeria', 'Zimbabwe']
         dataset.add_country_location('sdn')
diff --git a/tests/hdx/data/test_galleryitem.py b/tests/hdx/data/test_galleryitem.py
index 371d9e45..b1e2497b 100644
--- a/tests/hdx/data/test_galleryitem.py
+++ b/tests/hdx/data/test_galleryitem.py
@@ -163,23 +163,23 @@ def post(url, data, headers, files, allow_redirects, auth):
 
         monkeypatch.setattr(requests, 'Session', MockSession)
 
-    @pytest.fixture(scope='class')
+    @pytest.fixture(scope='function')
     def configuration(self):
         hdx_key_file = join('fixtures', '.hdxkey')
         project_config_yaml = join('fixtures', 'config', 'project_configuration.yml')
-        return Configuration(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
+        Configuration.create(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
 
     def test_read_from_hdx(self, configuration, read):
-        galleryitem = GalleryItem.read_from_hdx(configuration, 'TEST1')
+        galleryitem = GalleryItem.read_from_hdx('TEST1')
         assert galleryitem['id'] == '2f90d964-f980-4513-ad1b-5df6b2d044ff'
         assert galleryitem['title'] == 'MyGalleryItem1'
-        galleryitem = GalleryItem.read_from_hdx(configuration, 'TEST2')
+        galleryitem = GalleryItem.read_from_hdx('TEST2')
         assert galleryitem is None
-        galleryitem = GalleryItem.read_from_hdx(configuration, 'TEST3')
+        galleryitem = GalleryItem.read_from_hdx('TEST3')
         assert galleryitem is None
 
     def test_create_in_hdx(self, configuration, post_create):
-        galleryitem = GalleryItem(configuration)
+        galleryitem = GalleryItem()
         with pytest.raises(HDXError):
             galleryitem.create_in_hdx()
         galleryitem['id'] = 'TEST1'
@@ -188,22 +188,22 @@ def test_create_in_hdx(self, configuration, post_create):
             galleryitem.create_in_hdx()
 
         galleryitem_data = copy.deepcopy(TestGalleryItem.galleryitem_data)
-        galleryitem = GalleryItem(configuration, galleryitem_data)
+        galleryitem = GalleryItem(galleryitem_data)
         galleryitem.create_in_hdx()
         assert galleryitem['id'] == '2f90d964-f980-4513-ad1b-5df6b2d044ff'
 
         galleryitem_data['title'] = 'MyGalleryItem2'
-        galleryitem = GalleryItem(configuration, galleryitem_data)
+        galleryitem = GalleryItem(galleryitem_data)
         with pytest.raises(HDXError):
             galleryitem.create_in_hdx()
 
         galleryitem_data['title'] = 'MyGalleryItem3'
-        galleryitem = GalleryItem(configuration, galleryitem_data)
+        galleryitem = GalleryItem(galleryitem_data)
         with pytest.raises(HDXError):
             galleryitem.create_in_hdx()
 
     def test_update_in_hdx(self, configuration, post_update):
-        galleryitem = GalleryItem(configuration)
+        galleryitem = GalleryItem()
         galleryitem['id'] = 'NOTEXIST'
         with pytest.raises(HDXError):
             galleryitem.update_in_hdx()
@@ -211,7 +211,7 @@ def test_update_in_hdx(self, configuration, post_update):
         with pytest.raises(HDXError):
             galleryitem.update_in_hdx()
 
-        galleryitem = GalleryItem.read_from_hdx(configuration, 'TEST1')
+        galleryitem = GalleryItem.read_from_hdx('TEST1')
         assert galleryitem['id'] == '2f90d964-f980-4513-ad1b-5df6b2d044ff'
         assert galleryitem['type'] == 'visualization'
 
@@ -233,13 +233,13 @@ def test_update_in_hdx(self, configuration, post_update):
         galleryitem_data = copy.deepcopy(TestGalleryItem.galleryitem_data)
         galleryitem_data['title'] = 'MyGalleryItem1'
         galleryitem_data['id'] = 'TEST1'
-        galleryitem = GalleryItem(configuration, galleryitem_data)
+        galleryitem = GalleryItem(galleryitem_data)
         galleryitem.create_in_hdx()
         assert galleryitem['id'] == 'TEST1'
         assert galleryitem['type'] == 'visualization'
 
     def test_delete_from_hdx(self, configuration, post_delete):
-        galleryitem = GalleryItem.read_from_hdx(configuration, 'TEST1')
+        galleryitem = GalleryItem.read_from_hdx('TEST1')
         galleryitem.delete_from_hdx()
         del galleryitem['id']
         with pytest.raises(HDXError):
@@ -247,7 +247,7 @@ def test_delete_from_hdx(self, configuration, post_delete):
 
     def test_update_yaml(self, configuration, static_yaml):
         galleryitem_data = copy.deepcopy(TestGalleryItem.galleryitem_data)
-        galleryitem = GalleryItem(configuration, galleryitem_data)
+        galleryitem = GalleryItem(galleryitem_data)
         assert galleryitem['title'] == 'MyGalleryItem1'
         assert galleryitem['type'] == 'visualization'
         galleryitem.update_from_yaml(static_yaml)
@@ -256,7 +256,7 @@ def test_update_yaml(self, configuration, static_yaml):
 
     def test_update_json(self, configuration, static_json):
         galleryitem_data = copy.deepcopy(TestGalleryItem.galleryitem_data)
-        galleryitem = GalleryItem(configuration, galleryitem_data)
+        galleryitem = GalleryItem(galleryitem_data)
         assert galleryitem['title'] == 'MyGalleryItem1'
         assert galleryitem['type'] == 'visualization'
         galleryitem.update_from_json(static_json)
diff --git a/tests/hdx/data/test_resource.py b/tests/hdx/data/test_resource.py
index d02d5820..701e9775 100644
--- a/tests/hdx/data/test_resource.py
+++ b/tests/hdx/data/test_resource.py
@@ -321,24 +321,24 @@ def post(url, data, headers, files, allow_redirects, auth):
 
         monkeypatch.setattr(requests, 'Session', MockSession)
 
-    @pytest.fixture(scope='class')
+    @pytest.fixture(scope='function')
     def configuration(self):
         hdx_key_file = join('fixtures', '.hdxkey')
         project_config_yaml = join('fixtures', 'config', 'project_configuration.yml')
-        return Configuration(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
+        Configuration.create(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
 
     def test_read_from_hdx(self, configuration, read):
-        resource = Resource.read_from_hdx(configuration, 'TEST1')
+        resource = Resource.read_from_hdx('TEST1')
         assert resource['id'] == 'de6549d8-268b-4dfe-adaf-a4ae5c8510d5'
         assert resource['name'] == 'MyResource1'
         assert resource['package_id'] == '6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d'
-        resource = Resource.read_from_hdx(configuration, 'TEST2')
+        resource = Resource.read_from_hdx('TEST2')
         assert resource is None
-        resource = Resource.read_from_hdx(configuration, 'TEST3')
+        resource = Resource.read_from_hdx('TEST3')
         assert resource is None
 
     def test_create_in_hdx(self, configuration, post_create):
-        resource = Resource(configuration)
+        resource = Resource()
         with pytest.raises(HDXError):
             resource.create_in_hdx()
         resource['id'] = 'TEST1'
@@ -347,7 +347,7 @@ def test_create_in_hdx(self, configuration, post_create):
             resource.create_in_hdx()
 
         resource_data = copy.deepcopy(TestResource.resource_data)
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         resource.create_in_hdx()
         assert resource['id'] == 'de6549d8-268b-4dfe-adaf-a4ae5c8510d5'
         assert resource['url_type'] == 'api'
@@ -356,7 +356,7 @@ def test_create_in_hdx(self, configuration, post_create):
                    'url'] == 'https://raw.githubusercontent.com/OCHA-DAP/hdx-python-api/master/tests/fixtures/test_data.csv'
 
         resource_data = copy.deepcopy(TestResource.resource_data)
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         resource.set_file_to_upload('fixtures/test_data.csv')
         assert resource.get_file_to_upload() == 'fixtures/test_data.csv'
         resource.create_in_hdx()
@@ -366,17 +366,17 @@ def test_create_in_hdx(self, configuration, post_create):
                    'url'] == 'http://test-data.humdata.org/dataset/6f36a41c-f126-4b18-aaaf-6c2ddfbc5d4d/resource/de6549d8-268b-4dfe-adaf-a4ae5c8510d5/download/test_data.csv'
 
         resource_data['name'] = 'MyResource2'
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         with pytest.raises(HDXError):
             resource.create_in_hdx()
 
         resource_data['name'] = 'MyResource3'
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         with pytest.raises(HDXError):
             resource.create_in_hdx()
 
     def test_update_in_hdx(self, configuration, post_update):
-        resource = Resource(configuration)
+        resource = Resource()
         resource['id'] = 'NOTEXIST'
         with pytest.raises(HDXError):
             resource.update_in_hdx()
@@ -384,7 +384,7 @@ def test_update_in_hdx(self, configuration, post_update):
         with pytest.raises(HDXError):
             resource.update_in_hdx()
 
-        resource = Resource.read_from_hdx(configuration, 'TEST1')
+        resource = Resource.read_from_hdx('TEST1')
         assert resource['id'] == 'de6549d8-268b-4dfe-adaf-a4ae5c8510d5'
         assert resource['format'] == 'XLSX'
 
@@ -417,13 +417,13 @@ def test_update_in_hdx(self, configuration, post_update):
         resource_data = copy.deepcopy(TestResource.resource_data)
         resource_data['name'] = 'MyResource1'
         resource_data['id'] = 'TEST1'
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         resource.create_in_hdx()
         assert resource['id'] == 'TEST1'
         assert resource['format'] == 'xlsx'
 
     def test_delete_from_hdx(self, configuration, post_delete):
-        resource = Resource.read_from_hdx(configuration, 'TEST1')
+        resource = Resource.read_from_hdx('TEST1')
         resource.delete_from_hdx()
         del resource['id']
         with pytest.raises(HDXError):
@@ -431,7 +431,7 @@ def test_delete_from_hdx(self, configuration, post_delete):
 
     def test_update_yaml(self, configuration, static_yaml):
         resource_data = copy.deepcopy(TestResource.resource_data)
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         assert resource['name'] == 'MyResource1'
         assert resource['format'] == 'xlsx'
         resource.update_from_yaml(static_yaml)
@@ -440,7 +440,7 @@ def test_update_yaml(self, configuration, static_yaml):
 
     def test_update_json(self, configuration, static_json):
         resource_data = copy.deepcopy(TestResource.resource_data)
-        resource = Resource(configuration, resource_data)
+        resource = Resource(resource_data)
         assert resource['name'] == 'MyResource1'
         assert resource['format'] == 'xlsx'
         resource.update_from_json(static_json)
@@ -448,16 +448,16 @@ def test_update_json(self, configuration, static_json):
         assert resource['format'] == 'zipped csv'
 
     def test_search_in_hdx(self, configuration, search):
-        resources = Resource.search_in_hdx(configuration, 'name:ACLED')
+        resources = Resource.search_in_hdx('name:ACLED')
         assert len(resources) == 4
-        resources = Resource.search_in_hdx(configuration, 'name:ajyhgr')
+        resources = Resource.search_in_hdx('name:ajyhgr')
         assert len(resources) == 0
         with pytest.raises(HDXError):
-            Resource.search_in_hdx(configuration, 'fail')
+            Resource.search_in_hdx('fail')
 
     def test_download(self, configuration, read, monkeypatch):
-        resource = Resource.read_from_hdx(configuration, 'TEST1')
-        resource2 = Resource.read_from_hdx(configuration, 'TEST4')
+        resource = Resource.read_from_hdx('TEST1')
+        resource2 = Resource.read_from_hdx('TEST4')
         monkeypatch.undo()
         url, path = resource.download()
         unlink(path)
@@ -469,8 +469,8 @@ def test_download(self, configuration, read, monkeypatch):
             resource2.download()
 
     def test_datastore(self, configuration, post_datastore, topline_yaml, topline_json, monkeypatch):
-        resource = Resource.read_from_hdx(configuration, 'TEST1')
-        resource2 = Resource.read_from_hdx(configuration, 'TEST5')
+        resource = Resource.read_from_hdx('TEST1')
+        resource2 = Resource.read_from_hdx('TEST5')
         monkeypatch.undo()
         resource.create_datastore(delete_first=0)
         resource.create_datastore(delete_first=1)
diff --git a/tests/hdx/facades/__init__.py b/tests/hdx/facades/__init__.py
index 7ac05aaa..c099eb7e 100644
--- a/tests/hdx/facades/__init__.py
+++ b/tests/hdx/facades/__init__.py
@@ -8,10 +8,10 @@ class TestResult:
 testresult = TestResult()
 
 
-def my_testfn(configuration: Configuration):
-    testresult.actual_result = configuration.get_hdx_site_url()
+def my_testfn():
+    testresult.actual_result = Configuration.read().get_hdx_site_url()
 
 
-def my_excfn(configuration: Configuration):
-    testresult.actual_result = configuration.get_hdx_site_url()
+def my_excfn():
+    testresult.actual_result = Configuration.read().get_hdx_site_url()
     raise ValueError('Some failure!')
diff --git a/tests/hdx/test_configuration.py b/tests/hdx/test_configuration.py
index bbf5f0c7..78cda52d 100644
--- a/tests/hdx/test_configuration.py
+++ b/tests/hdx/test_configuration.py
@@ -57,8 +57,8 @@ def test_init(self, hdx_key_file, project_config_json, project_config_yaml):
                           project_config_json=project_config_json)
 
     def test_hdx_configuration_dict(self, hdx_key_file, project_config_yaml):
-        actual_configuration = Configuration(hdx_site='prod', hdx_key_file=hdx_key_file,
-                                             hdx_config_dict={
+        actual_configuration = Configuration.create(hdx_site='prod', hdx_key_file=hdx_key_file,
+                                                    hdx_config_dict={
                                                  'hdx_prod_site': {
                                                      'url': 'https://data.humdata.org/',
                                                      'username': None,
@@ -66,7 +66,7 @@ def test_hdx_configuration_dict(self, hdx_key_file, project_config_yaml):
                                                  },
                                                  'XYZ': {'567': 987}
                                              },
-                                             project_config_yaml=project_config_yaml)
+                                                    project_config_yaml=project_config_yaml)
         expected_configuration = {
             'api_key': '12345',
             'param_1': 'ABC',
@@ -81,8 +81,8 @@ def test_hdx_configuration_dict(self, hdx_key_file, project_config_yaml):
 
     def test_hdx_configuration_json(self, hdx_key_file, project_config_yaml):
         hdx_config_json = join('fixtures', 'config', 'hdx_config.json')
-        actual_configuration = Configuration(hdx_key_file=hdx_key_file, hdx_config_json=hdx_config_json,
-                                             project_config_yaml=project_config_yaml)
+        actual_configuration = Configuration.create(hdx_key_file=hdx_key_file, hdx_config_json=hdx_config_json,
+                                                    project_config_yaml=project_config_yaml)
         expected_configuration = {
             'api_key': '12345',
             'param_1': 'ABC',
@@ -111,8 +111,8 @@ def test_hdx_configuration_json(self, hdx_key_file, project_config_yaml):
 
     def test_hdx_configuration_yaml(self, hdx_key_file, project_config_yaml):
         hdx_configuration_yaml = join('fixtures', 'config', 'hdx_config.yml')
-        actual_configuration = Configuration(hdx_key_file=hdx_key_file, hdx_config_yaml=hdx_configuration_yaml,
-                                             project_config_yaml=project_config_yaml)
+        actual_configuration = Configuration.create(hdx_key_file=hdx_key_file, hdx_config_yaml=hdx_configuration_yaml,
+                                                    project_config_yaml=project_config_yaml)
         expected_configuration = {
             'api_key': '12345',
             'param_1': 'ABC',
@@ -142,7 +142,7 @@ def test_hdx_configuration_yaml(self, hdx_key_file, project_config_yaml):
         assert actual_configuration == expected_configuration
 
     def test_project_configuration_dict(self, hdx_key_file):
-        actual_configuration = Configuration(hdx_key_file=hdx_key_file, project_config_dict={'abc': '123'})
+        actual_configuration = Configuration.create(hdx_key_file=hdx_key_file, project_config_dict={'abc': '123'})
         expected_configuration = {
             'api_key': '12345',
             'hdx_prod_site': {
@@ -195,7 +195,7 @@ def test_project_configuration_dict(self, hdx_key_file):
         assert actual_configuration == expected_configuration
 
     def test_project_configuration_json(self, hdx_key_file, project_config_json):
-        actual_configuration = Configuration(hdx_key_file=hdx_key_file, project_config_json=project_config_json)
+        actual_configuration = Configuration.create(hdx_key_file=hdx_key_file, project_config_json=project_config_json)
         expected_configuration = {
             'api_key': '12345',
             'hdx_prod_site': {
@@ -248,7 +248,7 @@ def test_project_configuration_json(self, hdx_key_file, project_config_json):
         assert actual_configuration == expected_configuration
 
     def test_project_configuration_yaml(self, hdx_key_file, project_config_yaml):
-        actual_configuration = Configuration(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
+        actual_configuration = Configuration.create(hdx_key_file=hdx_key_file, project_config_yaml=project_config_yaml)
         expected_configuration = {
             'api_key': '12345',
             'param_1': 'ABC',
@@ -301,9 +301,9 @@ def test_project_configuration_yaml(self, hdx_key_file, project_config_yaml):
         assert actual_configuration == expected_configuration
 
     def test_get_hdx_key_site(self, hdx_key_file, project_config_yaml):
-        actual_configuration = Configuration(hdx_site='prod', hdx_key_file=hdx_key_file,
-                                             hdx_config_dict={},
-                                             project_config_yaml=project_config_yaml)
+        actual_configuration = Configuration.create(hdx_site='prod', hdx_key_file=hdx_key_file,
+                                                    hdx_config_dict={},
+                                                    project_config_yaml=project_config_yaml)
         assert actual_configuration.get_api_key() == '12345'
         assert actual_configuration.get_hdx_site_url() == 'https://data.humdata.org/'
         assert actual_configuration._get_credentials() == ('', '')