diff --git a/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java b/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java
index 189cfae0fe2a981ae82fd32b5c1bfed10a5fe034..df9621c1d8fc91817eedb394f24f6281fa7df287 100644
--- a/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java
+++ b/src/main/java/no/nibio/vips/ipmdecisions/DataTransformer.java
@@ -26,7 +26,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 import net.ipmdecisions.model.entity.LocationResult;
 import net.ipmdecisions.model.entity.ModelOutput;
 import net.ipmdecisions.weather.entity.LocationWeatherData;
diff --git a/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java b/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java
index 67b01eb43a5286909da73dba20c16d48ef235ddb..ab91109bd9c2bf2e12b0167830420145bc025f17 100644
--- a/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java
+++ b/src/main/java/no/nibio/vips/ipmdecisions/IPMDecisionsWeatherUtil.java
@@ -36,9 +36,13 @@ public class IPMDecisionsWeatherUtil {
     );
     
     private final Map<Integer, String> IPMToVIPS = Map.of(
+            1001,WeatherElements.TEMPERATURE_MEAN, // TM (Actually TT...)
             1002,WeatherElements.TEMPERATURE_MEAN, // TM
             2001, WeatherElements.PRECIPITATION, // RR
+            3001, WeatherElements.RELATIVE_HUMIDITY_MEAN, // UU/UM
             3002, WeatherElements.RELATIVE_HUMIDITY_MEAN, // UM
+            4002, WeatherElements.WIND_SPEED_2M, // FM2/FF2
+            4003, WeatherElements.WIND_SPEED_2M, // FM2/FF2
             5001, WeatherElements.GLOBAL_RADIATION, // Q0
             3101, WeatherElements.LEAF_WETNESS_DURATION // BT
     );