diff --git a/src/main/java/com/application/DB/Constants.java b/src/main/java/com/application/DB/Constants.java
index b2f5926f17177cd6541a05c39dd4df3029c1f172..0f56afce2094bc7b3ee8341d9d94544eaf51abf0 100644
--- a/src/main/java/com/application/DB/Constants.java
+++ b/src/main/java/com/application/DB/Constants.java
@@ -2,6 +2,8 @@ package com.application.DB;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * This class contains constants to be used related to database activities
diff --git a/src/main/java/com/application/DB/DB.java b/src/main/java/com/application/DB/DB.java
index f0d3e4eea06e27efc4fdaf9a34013bfa30cecea9..70adc812f4a4acb8b49cb7591cd8b0b2337013b9 100644
--- a/src/main/java/com/application/DB/DB.java
+++ b/src/main/java/com/application/DB/DB.java
@@ -161,11 +161,11 @@ public class DB {
 
 
 
-        Map<String, String> results;
+        Map<Integer, Map<String, Number>> results;
         while(true){
             System.out.printf("\nExtra parameters:\n %s\n\n",extraInputParameter);
             // Retrieves the dates
-            results =  getZeroPointDate(extraInputParameter);
+            results =  getKwh(getZeroPointDate(extraInputParameter));
 
             // Checks if any dates where found, if not parameters are removed until dates are found
             if(results.size()<NUMBER_OF_PERIODS){
@@ -177,7 +177,7 @@ public class DB {
                     System.out.println("Tree species is removed");
                 } else if(extraInputParameter.contains(dimensions)) {
                     extraInputParameter = extraInputParameter.replace(dimensions,"");
-                    System.out.println("Height is removed");
+                    System.out.println("Dimensions is removed");
                 } else if(extraInputParameter.contains(moistureGoal)) {
                     extraInputParameter = extraInputParameter.replace(moistureGoal,"");
                     System.out.println("Moisture goal is removed");
@@ -185,7 +185,7 @@ public class DB {
             }
             else break;
         }
-        return getKwh(results);
+        return results;
     }
 
 
diff --git a/target/classes/com/application/Main.class b/target/classes/com/application/Main.class
index 1dcf1e91cb8fc136fad037b6b65ee7ce6f1528ab..b75fd902a89b66c4ea42cc02d24828f3f32a6494 100644
Binary files a/target/classes/com/application/Main.class and b/target/classes/com/application/Main.class differ