diff --git a/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java b/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java
index eccd1a1..387e3b0 100644
--- a/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java
@@ -2,7 +2,10 @@ package nl.lengrand.cellar;
 
 import nl.lengrand.cellar.faunadb.SensorApi;
 
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 public class CellarMonitor {
 
diff --git a/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitoring.java b/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitoring.java
new file mode 100644
index 0000000..f9aaffd
--- /dev/null
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitoring.java
@@ -0,0 +1,13 @@
+package nl.lengrand.cellar;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class CellarMonitoring {
+
+    public void start(){
+        System.out.println("Monitoring enabled by config. Starting up");
+        CellarMonitor monitor = new CellarMonitor();
+        monitor.startMonitoring();
+    }
+}
diff --git a/cellar-app/src/main/java/nl/lengrand/cellar/Main.java b/cellar-app/src/main/java/nl/lengrand/cellar/Main.java
index 1a7d51f..68a0721 100644
--- a/cellar-app/src/main/java/nl/lengrand/cellar/Main.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/Main.java
@@ -1,34 +1,21 @@
 package nl.lengrand.cellar;
 
 import io.helidon.microprofile.server.Server;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import java.io.IOException;
 
 public class Main {
 
-    @ConfigProperty(name = "monitoring.enabled", defaultValue = "true")
-    private static boolean monitoringEnabled;
-
     private Main() { }
 
     public static void main(final String[] args) throws IOException {
         Server server = startServer();
 
-        if(monitoringEnabled) {
-            System.out.println("Monitoring enabled by config. Starting up");
-            startMonitoring();
-        }
-        else System.out.println("Monitoring disabled by config");
-
+        CellarMonitoring monitoring = new CellarMonitoring();
+        monitoring.start();
     }
 
     static Server startServer() {
         return Server.create().start();
     }
-
-    static void startMonitoring(){
-        CellarMonitor monitor = new CellarMonitor();
-        monitor.startMonitoring();
-    }
 }