--- a/australian_federal_government_contract_spending.json
+++ b/australian_federal_government_contract_spending.json
@@ -1,122 +1,151 @@
 {
   "dataset": {
+    "description": "Australian Federal Government Contract Spending\r\n\r\nCreative Commons - Attribution 3.0 Australia (CC BY 3.0) http://data.gov.au/dataset/austender-contract-notice-export/", 
+    "default_time": "2010", 
+    "html_url": "http://openspending.org/australian_federal_government_contract_spending", 
+    "currency": "AUD", 
+    "serp_title": null, 
+    "schema_version": null, 
+    "badges": [], 
+    "category": "spending", 
+    "name": "australian_federal_government_contract_spending", 
+    "serp_teaser": null, 
+    "label": "Australian Federal Government Contract Spending", 
     "languages": [
       "en"
     ], 
-    "currency": "AUD", 
-    "name": "australian_federal_government_contract_spending", 
-    "territories": [], 
-    "default_time": null, 
-    "description": "Spending by Australian Federal Government agencies on goods and services from 2007 onwards.", 
-    "schema_version": "2011-12-07", 
-    "label": "Australian Federal Government Contract Spending"
+    "territories": [
+      "AU"
+    ], 
+    "timestamps": {
+      "last_modified": "2013-09-27T10:10:35.125004", 
+      "created": "2013-01-27T02:47:33.250045"
+    }
   }, 
   "mapping": {
     "category": {
-      "description": "Contract Goods/Services Category", 
-      "datatype": "string", 
-      "label": "category", 
-      "column": "cat1", 
-      "type": "attribute", 
+      "description": null, 
+      "label": "Category", 
+      "facet": true, 
+      "attributes": {
+        "name": {
+          "column": "category", 
+          "datatype": "id", 
+          "default_value": ""
+        }, 
+        "label": {
+          "column": "category", 
+          "datatype": "string", 
+          "default_value": ""
+        }
+      }, 
+      "type": "compound", 
       "dimension": "category"
     }, 
     "sourceurl": {
-      "description": "Source Document URL", 
-      "datatype": "string", 
-      "label": "sourceurl", 
+      "default_value": "", 
+      "description": null, 
+      "datatype": "url", 
+      "label": "Sourceurl", 
       "column": "sourceurl", 
       "type": "attribute", 
       "dimension": "sourceurl"
     }, 
-    "from": {
+    "description": {
+      "default_value": "", 
+      "description": null, 
+      "datatype": "string", 
+      "label": "Description", 
+      "column": "description", 
+      "type": "attribute", 
+      "dimension": "description"
+    }, 
+    "govagency": {
+      "description": null, 
+      "label": "Government Agency", 
+      "facet": true, 
       "attributes": {
         "name": {
           "column": "agencyABN", 
           "datatype": "id", 
-          "type": "id", 
-          "description": null
+          "default_value": ""
         }, 
         "label": {
           "column": "agencyName", 
           "datatype": "string", 
-          "type": "attribute", 
-          "description": null
+          "default_value": ""
         }
       }, 
-      "label": "Government Agency", 
       "type": "compound", 
-      "dimension": "from", 
-      "description": "Government Agency"
+      "dimension": "govagency"
     }, 
-    "description": {
-      "description": null, 
-      "datatype": "string", 
-      "label": "description", 
-      "column": "description", 
-      "type": "attribute", 
-      "dimension": "description"
-    }, 
-    "publishdate": {
+    "contractEnd": {
+      "default_value": "", 
       "description": null, 
       "format": null, 
+      "column": "contractEnd", 
+      "label": "ContractEnd", 
       "datatype": "date", 
-      "label": "publishDate", 
-      "column": "publishDate", 
       "type": "date", 
-      "dimension": "publishdate"
-    }, 
-    "to": {
-      "attributes": {
-        "name": {
-          "column": "supplierid", 
-          "datatype": "id", 
-          "type": "id"
-        }, 
-        "label": {
-          "column": "supplierName", 
-          "datatype": "string", 
-          "type": "attribute"
-        }
-      }, 
-      "label": "Supplier Name", 
-      "type": "compound", 
-      "dimension": "to", 
-      "description": "Government Supplier"
+      "dimension": "contractEnd"
     }, 
     "amount": {
-      "description": "The total value of the contract including all variations/amendments/extensions", 
+      "default_value": "", 
+      "description": null, 
       "datatype": "float", 
-      "label": "value", 
+      "label": "Amount", 
       "column": "value", 
       "type": "measure", 
       "dimension": "amount"
     }, 
+    "contractStart": {
+      "default_value": "", 
+      "description": null, 
+      "format": null, 
+      "column": "contractStart", 
+      "label": "ContractStart", 
+      "datatype": "date", 
+      "type": "date", 
+      "dimension": "contractStart"
+    }, 
     "cnid": {
-      "description": "Contract Notice ID", 
+      "default_value": "", 
+      "description": null, 
       "datatype": "string", 
-      "label": "CNID", 
+      "label": "Contract Notice ID", 
       "column": "CNID", 
       "key": true, 
       "type": "attribute", 
       "dimension": "cnid"
     }, 
-    "contractend": {
-      "description": "End of the contract period (goods or services being received)", 
+    "time": {
+      "default_value": "", 
+      "description": null, 
       "format": null, 
+      "column": "publishDate", 
+      "label": "Time", 
       "datatype": "date", 
-      "label": "contractEnd", 
-      "column": "contractEnd", 
-      "type": "date", 
-      "dimension": "contractend"
-    }, 
-    "time": {
-      "description": "Start of the contract period (goods or services being received)", 
-      "format": null, 
-      "datatype": "date", 
-      "label": "contractStart", 
-      "column": "contractStart", 
       "type": "date", 
       "dimension": "time"
+    }, 
+    "supplier": {
+      "description": null, 
+      "label": "Supplier", 
+      "facet": true, 
+      "attributes": {
+        "name": {
+          "column": "supplierid", 
+          "datatype": "id", 
+          "default_value": ""
+        }, 
+        "label": {
+          "column": "supplierName", 
+          "datatype": "string", 
+          "default_value": ""
+        }
+      }, 
+      "type": "compound", 
+      "dimension": "supplier"
     }
   }, 
   "views": [
@@ -132,7 +161,7 @@
       "name": "by_supplier", 
       "label": "Breakdown by Supplier", 
       "cuts": {}, 
-      "drilldown": "to", 
+      "drilldown": "supplier", 
       "entity": "dataset", 
       "dimension": "dataset"
     }, 
@@ -140,7 +169,7 @@
       "name": "by_agency", 
       "label": "Breakdown by Agency", 
       "cuts": {}, 
-      "drilldown": "from", 
+      "drilldown": "govagency", 
       "entity": "dataset", 
       "dimension": "dataset"
     }, 
@@ -148,17 +177,17 @@
       "name": "default", 
       "label": "Agency spending breakdown by supplier", 
       "cuts": {}, 
-      "drilldown": "to", 
+      "drilldown": "supplier", 
       "entity": "dimension", 
-      "dimension": "from"
+      "dimension": "govagency"
     }, 
     {
       "name": "default", 
       "label": "Supplier contracts breakdown by procuring agency", 
       "cuts": {}, 
-      "drilldown": "from", 
+      "drilldown": "govagency", 
       "entity": "dimension", 
-      "dimension": "to"
+      "dimension": "supplier"
     }
   ]
 }