diff --git a/java/compat_impl/edge/pom.xml b/java/compat_impl/edge/pom.xml
index 98c03baf..9f2389b4 100644
--- a/java/compat_impl/edge/pom.xml
+++ b/java/compat_impl/edge/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/java/compat_impl/host/pom.xml b/java/compat_impl/host/pom.xml
index 9b89c868..c551af64 100644
--- a/java/compat_impl/host/pom.xml
+++ b/java/compat_impl/host/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/device_timestamp/pom.xml b/java/examples/device_timestamp/pom.xml
index 9596505f..a43d0b67 100644
--- a/java/examples/device_timestamp/pom.xml
+++ b/java/examples/device_timestamp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/edge_node_control/pom.xml b/java/examples/edge_node_control/pom.xml
index a48b8e6d..1c9c5f68 100644
--- a/java/examples/edge_node_control/pom.xml
+++ b/java/examples/edge_node_control/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/host_file/pom.xml b/java/examples/host_file/pom.xml
index 68d8666e..705a0798 100644
--- a/java/examples/host_file/pom.xml
+++ b/java/examples/host_file/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/listener/pom.xml b/java/examples/listener/pom.xml
index 7b80fe58..2423b2fa 100644
--- a/java/examples/listener/pom.xml
+++ b/java/examples/listener/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index ab2b0ea3..58611fca 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.eclipse.tahu</groupId>
   <artifactId>tahu-examples</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.7</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>
diff --git a/java/examples/raspberry_pi/pom.xml b/java/examples/raspberry_pi/pom.xml
index d30b5a69..ef46886a 100644
--- a/java/examples/raspberry_pi/pom.xml
+++ b/java/examples/raspberry_pi/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/records/pom.xml b/java/examples/records/pom.xml
index 09b3ff77..f96d6345 100644
--- a/java/examples/records/pom.xml
+++ b/java/examples/records/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/simple/pom.xml b/java/examples/simple/pom.xml
index ad92bf36..b7994503 100644
--- a/java/examples/simple/pom.xml
+++ b/java/examples/simple/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/examples/udt/pom.xml b/java/examples/udt/pom.xml
index 7162483c..82bc6776 100644
--- a/java/examples/udt/pom.xml
+++ b/java/examples/udt/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu-examples</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/java/lib/core/pom.xml b/java/lib/core/pom.xml
index 9e35082d..be49f688 100644
--- a/java/lib/core/pom.xml
+++ b/java/lib/core/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/java/lib/edge/pom.xml b/java/lib/edge/pom.xml
index dc03ad67..76625599 100644
--- a/java/lib/edge/pom.xml
+++ b/java/lib/edge/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java b/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java
index 02480a41..9cc83a68 100644
--- a/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java
+++ b/java/lib/edge/src/main/java/org/eclipse/tahu/edge/EdgeNodeMetricMaps.java
@@ -122,12 +122,10 @@ public boolean aliasExists(EdgeNodeDescriptor edgeNodeDescriptor, SparkplugDescr
 
 	public MetricDataTypeMap getMetricDataTypeMap(EdgeNodeDescriptor edgeNodeDescriptor,
 			SparkplugDescriptor sparkplugDescriptor) {
-		Map<SparkplugDescriptor, MetricMap> edgeNodeMetricMaps = allEdgeNodeMetricMaps.get(edgeNodeDescriptor);
-		if (edgeNodeMetricMaps != null && edgeNodeMetricMaps.get(sparkplugDescriptor) != null) {
-			return edgeNodeMetricMaps.get(sparkplugDescriptor).getMetricDataTypeMap();
-		} else {
-			return null;
-		}
+		Map<SparkplugDescriptor, MetricMap> edgeNodeMetricMaps =
+				allEdgeNodeMetricMaps.computeIfAbsent(edgeNodeDescriptor, (k) -> new ConcurrentHashMap<>());
+		edgeNodeMetricMaps.computeIfAbsent(sparkplugDescriptor, (k) -> new MetricMap());
+		return edgeNodeMetricMaps.get(sparkplugDescriptor).getMetricDataTypeMap();
 	}
 
 	public MetricDataType getDataType(EdgeNodeDescriptor edgeNodeDescriptor, SparkplugDescriptor sparkplugDescriptor,
diff --git a/java/lib/host/pom.xml b/java/lib/host/pom.xml
index b6f775d3..fdc26182 100644
--- a/java/lib/host/pom.xml
+++ b/java/lib/host/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse.tahu</groupId>
     <artifactId>tahu</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
diff --git a/java/pom.xml b/java/pom.xml
index cda51ca3..3222019a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>org.eclipse.tahu</groupId>
   <artifactId>tahu</artifactId>
-  <version>1.0.6</version>
+  <version>1.0.7</version>
   <packaging>pom</packaging>
 
   <name>Eclipse Tahu</name>