diff --git a/domain/energy/pom.xml b/domain/energy/pom.xml
index 4ad99ffa..dc18b5a9 100644
--- a/domain/energy/pom.xml
+++ b/domain/energy/pom.xml
@@ -28,11 +28,10 @@
             <groupId>tech.units</groupId>
             <artifactId>indriya</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>tech.uom.domain</groupId>
+            <artifactId>uom-energy-quantity</artifactId>
+            <version>${domain.version}</version>
         </dependency>
     </dependencies>
 	<build>
diff --git a/domain/energy/src/main/java/tech/uom/demo/energy/CO2CarDemo.java b/domain/energy/src/main/java/tech/uom/demo/energy/CO2CarDemo.java
index f602ff15..4d08f492 100644
--- a/domain/energy/src/main/java/tech/uom/demo/energy/CO2CarDemo.java
+++ b/domain/energy/src/main/java/tech/uom/demo/energy/CO2CarDemo.java
@@ -1,6 +1,6 @@
 /*
  *  Units of Measurement Demos for Java
- *  Copyright (c) 2005-2019, Werner Keil and others.
+ *  Copyright (c) 2005-2020, Werner Keil and others.
  *
  * All rights reserved.
  *
@@ -35,15 +35,15 @@
 
 import tech.units.indriya.format.SimpleUnitFormat;
 import tech.units.indriya.quantity.Quantities;
-import tech.uom.demo.energy.quantity.CarbonFootprint;
-import tech.uom.demo.energy.quantity.FuelConsumption;
+import tech.uom.domain.energy.quantity.CarbonFootprint;
+import tech.uom.domain.energy.quantity.FuelConsumption;
 import tech.uom.lib.common.function.DoubleFactorSupplier;
 
 /**
  * Carbon Footprint calculator for cars
  * @author Werner
  * @see <a href="https://spritrechner.biz/co2-rechner-fuer-autos.html">CO2-Rechner für Autos (DE)</a>
- * @version 1.5
+ * @version 1.6
  */
 public class CO2CarDemo {
 	
diff --git a/domain/pom.xml b/domain/pom.xml
index 9e56dfae..28c00c9c 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -13,6 +13,10 @@
 	   <description>Domain Specific Demos of the Units of Measurement API</description>
     <groupId>tech.uom.demo.domain</groupId>
     
+    <properties>
+        <domain.version>2.0</domain.version>
+    </properties>
+    
 	<modules>
         <module>health</module>
         <module>energy</module>