diff --git a/sandwich.virgis b/sandwich.virgis
index a2039dc..3cf691f 100644
--- a/sandwich.virgis
+++ b/sandwich.virgis
@@ -1,7 +1,6 @@
 {
   "recordsets": [
     {
-      "datatype": "MapBox",
       "properties": {
         "mapscale": 15,
         "map_size": 10,
@@ -53,10 +52,11 @@
           1.0
         ]
       },
-      "source": ""
+      "source": "",
+      "datatype": "MapBox",
+      "data-type-value": 0
     },
     {
-      "datatype": "Vector",
       "properties": {
         "mapscale": 0,
         "map_size": 0,
@@ -208,10 +208,11 @@
           1.0
         ]
       },
-      "source": "../test_data/all_points.geojson"
+      "source": "../test_data/all_points.geojson",
+      "datatype": "Vector",
+      "data-type-value": 1
     },
     {
-      "datatype": "Vector",
       "properties": {
         "mapscale": 0,
         "map_size": 0,
@@ -358,10 +359,11 @@
           1.0
         ]
       },
-      "source": "../test_data/polys.geojson"
+      "source": "../test_data/polys.geojson",
+      "datatype": "Vector",
+      "data-type-value": 1
     },
     {
-      "datatype": "Vector",
       "properties": {
         "mapscale": 0,
         "map_size": 0,
@@ -513,7 +515,9 @@
           1.0
         ]
       },
-      "source": "../test_data/lines.geojson"
+      "source": "../test_data/lines.geojson",
+      "datatype": "Vector",
+      "data-type-value": 1
     }
   ],
   "version": "Runette:2.0.0",
diff --git a/teapot.virgis b/teapot.virgis
index 69c188f..87849af 100644
--- a/teapot.virgis
+++ b/teapot.virgis
@@ -1,244 +1,250 @@
 {
-    "recordsets": [
-      {
-        "datatype": "CSV",
-        "source": "../test_data/teapot.csv",
-        "properties": {
-          "dem": null,
-          "header-string": null,
-          "filter": null,
-          "bbox": null,
-          "mapscale": 0,
-          "map_size": 0,
-          "image_folder": null,
-          "bh-data": {
-            "x-field": null,
-            "y-field": null,
-            "z-field": null,
-            "id-field": null,
-            "inc-field": null,
-            "azi-field": null,
-            "from-field": null,
-            "to-field": null,
-            "data-field": null,
-            "data-source": null,
-            "log-id-field": null,
-            "legend": null,
-            "eoh-field": null
-          },
-          "hide-sublayers": null
+  "recordsets": [
+    {
+      "properties": {
+        "mapscale": 0,
+        "map_size": 0,
+        "image_folder": null,
+        "bh-data": {
+          "x-field": null,
+          "y-field": null,
+          "z-field": null,
+          "id-field": null,
+          "inc-field": null,
+          "azi-field": null,
+          "from-field": null,
+          "to-field": null,
+          "data-field": null,
+          "data-source": null,
+          "log-id-field": null,
+          "legend": null,
+          "eoh-field": null
         },
-        "proj4": "",
-        "units": {},
-        "data_units": [
-          {
-            "name": "Teapot",
-            "transform": {
-              "translate": [
-                0.0,
-                0.0,
-                0.0
-              ],
-              "rotate": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-              ],
-              "scale": [
-                1.0,
-                1.0,
-                1.0
-              ]
-            },
-            "representation": "Points",
-            "source_table": null,
-            "x_range": "X",
-            "z_range": "Y",
-            "y_range": "Z",
-            "label_range": null,
-            "units": {
-              "point": {
-                  "texture-image": "",
-                  "color": [
-                    0.2125,
-                    0.1,
-                    1.0,
-                    1.0
-                  ],
-                  "transform": {
-                    "translate": [
-                      0.0,
-                      0.0,
-                      0.0
-                    ],
-                    "rotate": [
-                      0.0,
-                      0.0,
-                      0.0,
-                      1.0
-                    ],
-                    "scale": [
-                      0.1,
-                      0.1,
-                      0.1
-                    ]
-                  },
-                  "label": "",
-                  "shape": "Spheroid",
-                  "color-mode": "SinglebandGrey",
-                  "colorinterp": {}
-                }
-            }
-          }
-        ],
-        "id": "001",
-        "display-name": "Teapot Data",
-        "position": null,
-        "transform": {
-          "translate": [
-            0.0,
-            0.0,
-            0.0
-          ],
-          "rotate": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-          ],
-          "scale": [
-            1.0,
-            1.0,
-            1.0
-          ]
-        }
+        "hide-sublayers": null,
+        "dem": null,
+        "header-string": null,
+        "filter": null,
+        "bbox": null
       },
-      {
-      "datatype": "CSV",
-        "source": "../test_data/paraboloid.csv",
-        "properties": {
-          "dem": null,
-          "header-string": null,
-          "filter": null,
-          "bbox": null,
-          "mapscale": 0,
-          "map_size": 0,
-          "image_folder": null,
-          "bh-data": {
-            "x-field": null,
-            "y-field": null,
-            "z-field": null,
-            "id-field": null,
-            "inc-field": null,
-            "azi-field": null,
-            "from-field": null,
-            "to-field": null,
-            "data-field": null,
-            "data-source": null,
-            "log-id-field": null,
-            "legend": null,
-            "eoh-field": null
-          },
-          "hide-sublayers": null
-        },
-        "proj4": "",
-        "units": {},
-        "data_units": [
-           {
-            "name": "Paraboloid",
-            "transform": {
-              "translate": [
-                0.0,
-                0.0,
-                0.0
-              ],
-              "rotate": [
-                0.0,
-                0.0,
-                0.0,
-                1.0
-              ],
-              "scale": [
-                1.0,
+      "proj4": "",
+      "units": {},
+      "data_units": [
+        {
+          "units": {
+            "point": {
+              "texture-image": "",
+              "color": [
+                0.2125,
+                0.1,
                 1.0,
                 1.0
-              ]
-            },
-            "representation": "Manifold",
-            "source_table": null,
-            "x_range": "X",
-            "z_range": "Y",
-            "y_range": "Z",
-            "label_range": null,
-            "units": {
-              "body": {
-                  "texture-image": "",
-                  "color": [
-                    0.2125,
-                    0.1,
-                    1.0,
-                    1.0
-                  ],
-                  "transform": {
-                    "translate": [
-                      0.0,
-                      0.0,
-                      0.0
-                    ],
-                    "rotate": [
-                      0.0,
-                      0.0,
-                      0.0,
-                      1.0
-                    ],
-                    "scale": [
-                      0.1,
-                      0.1,
-                      0.1
-                    ]
-                  },
-                  "label": "",
-                  "shape": "Spheroid",
-                  "color-mode": "SinglebandGrey",
-                  "colorinterp": {}
-                }
+              ],
+              "transform": {
+                "translate": [
+                  0.0,
+                  0.0,
+                  0.0
+                ],
+                "rotate": [
+                  0.0,
+                  0.0,
+                  0.0,
+                  1.0
+                ],
+                "scale": [
+                  0.1,
+                  0.1,
+                  0.1
+                ]
+              },
+              "label": "",
+              "shape": "Spheroid",
+              "color-mode": "SinglebandGrey",
+              "color-map": null,
+              "colorinterp": {}
             }
-          }
-        ],
-        "id": "001",
-        "display-name": "Teapot Data",
-        "position": null,
-        "transform": {
-          "translate": [
-            0.0,
-            0.0,
-            0.0
-          ],
-          "rotate": [
-            0.0,
-            0.0,
-            0.0,
-            1.0
-          ],
-          "scale": [
-            1.0,
-            1.0,
-            1.0
-          ]
+          },
+          "name": "Teapot",
+          "transform": {
+            "translate": [
+              0.0,
+              0.0,
+              0.0
+            ],
+            "rotate": [
+              0.0,
+              0.0,
+              0.0,
+              1.0
+            ],
+            "scale": [
+              1.0,
+              1.0,
+              1.0
+            ]
+          },
+          "representation": "Points",
+          "source_table": null,
+          "x_range": "X",
+          "y_range": "Y",
+          "z_range": "Z",
+          "label_range": null,
+          "axis_order": "ENU"
         }
-      }
-    ],
-    "version": "Runette:2.0.0",
-    "name": "Teapot",
-    "origin": {
-      "type": "Point",
-      "coordinates": [
-        0.0,
-        0.0
-      ]
+      ],
+      "id": "001",
+      "display-name": "Teapot Data",
+      "position": null,
+      "transform": {
+        "translate": [
+          0.0,
+          0.0,
+          0.0
+        ],
+        "rotate": [
+          0.0,
+          0.0,
+          0.0,
+          1.0
+        ],
+        "scale": [
+          1.0,
+          1.0,
+          1.0
+        ]
+      },
+      "source": "../test_data/teapot.csv",
+      "datatype": "CSV",
+      "data-type-value": 14
     },
-    "default_proj": "EPSG:4326",
-    "map_scale": 1.0,
-    "guid": "5fd207c7-550c-43e9-b8b9-9233a8f0187d"
-  }
\ No newline at end of file
+    {
+      "properties": {
+        "mapscale": 0,
+        "map_size": 0,
+        "image_folder": null,
+        "bh-data": {
+          "x-field": null,
+          "y-field": null,
+          "z-field": null,
+          "id-field": null,
+          "inc-field": null,
+          "azi-field": null,
+          "from-field": null,
+          "to-field": null,
+          "data-field": null,
+          "data-source": null,
+          "log-id-field": null,
+          "legend": null,
+          "eoh-field": null
+        },
+        "hide-sublayers": null,
+        "dem": null,
+        "header-string": null,
+        "filter": null,
+        "bbox": null
+      },
+      "proj4": "",
+      "units": {},
+      "data_units": [
+        {
+          "units": {
+            "body": {
+              "texture-image": "",
+              "color": [
+                0.09803921,
+                1.0,
+                0.4269887,
+                1.0
+              ],
+              "transform": {
+                "translate": [
+                  0.0,
+                  0.0,
+                  0.0
+                ],
+                "rotate": [
+                  0.0,
+                  0.0,
+                  0.0,
+                  1.0
+                ],
+                "scale": [
+                  0.1,
+                  0.1,
+                  0.1
+                ]
+              },
+              "label": "",
+              "shape": "Spheroid",
+              "color-mode": "SinglebandGrey",
+              "color-map": null,
+              "colorinterp": {}
+            }
+          },
+          "name": "Paraboloid",
+          "transform": {
+            "translate": [
+              0.0,
+              0.0,
+              0.0
+            ],
+            "rotate": [
+              0.0,
+              0.0,
+              0.0,
+              1.0
+            ],
+            "scale": [
+              1.0,
+              1.0,
+              1.0
+            ]
+          },
+          "representation": "Manifold",
+          "source_table": null,
+          "x_range": "X",
+          "y_range": "Y",
+          "z_range": "Z",
+          "label_range": null,
+          "axis_order": "ENU"
+        }
+      ],
+      "id": "001",
+      "display-name": "Teapot Data",
+      "position": null,
+      "transform": {
+        "translate": [
+          0.0,
+          0.0,
+          0.0
+        ],
+        "rotate": [
+          0.0,
+          0.0,
+          0.0,
+          1.0
+        ],
+        "scale": [
+          1.0,
+          1.0,
+          1.0
+        ]
+      },
+      "source": "../test_data/paraboloid.csv",
+      "datatype": "CSV",
+      "data-type-value": 14
+    }
+  ],
+  "version": "Runette:2.0.0",
+  "name": "Teapot",
+  "origin": {
+    "type": "Point",
+    "coordinates": [
+      0.0,
+      0.0
+    ]
+  },
+  "default_proj": "EPSG:4326",
+  "map_scale": 1.0,
+  "guid": "5fd207c7-550c-43e9-b8b9-9233a8f0187d"
+}
\ No newline at end of file