diff --git a/src/com/zdemo/AbstractConsumer.java b/src/com/zdemo/AbstractConsumer.java
index 8815875..b89acc5 100644
--- a/src/com/zdemo/AbstractConsumer.java
+++ b/src/com/zdemo/AbstractConsumer.java
@@ -5,6 +5,7 @@ import com.google.gson.reflect.TypeToken;
 import com.zdemo.zhub.Rpc;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -32,8 +33,10 @@ public abstract class AbstractConsumer implements IConsumer {
         if (!eventMap.isEmpty()) {
             return eventMap.keySet();
         }
+        HashSet<String> set = new HashSet<>();
+        set.add("-");
 
-        return Set.of("-");
+        return set;
     }
 
     protected void accept(String topic, String value) {
diff --git a/src/com/zdemo/EventType.java b/src/com/zdemo/EventType.java
index cd3e971..a97ea08 100644
--- a/src/com/zdemo/EventType.java
+++ b/src/com/zdemo/EventType.java
@@ -10,7 +10,7 @@ public class EventType<T> {
     public final TypeToken<T> typeToken;
     private final Consumer<T> consumer;
 
-    private final static TypeToken<String> stringToken = new TypeToken<>() {
+    private final static TypeToken<String> stringToken = new TypeToken<String>() {
     };
 
     private EventType(String topic, TypeToken<T> typeToken, Consumer<T> consumer) {
diff --git a/src/com/zdemo/IType.java b/src/com/zdemo/IType.java
index 6cc3628..f9830a5 100644
--- a/src/com/zdemo/IType.java
+++ b/src/com/zdemo/IType.java
@@ -7,15 +7,15 @@ import java.util.Map;
 
 public interface IType {
 
-    TypeToken<String> STRING = new TypeToken<>() {
+    TypeToken<String> STRING = new TypeToken<String>() {
     };
 
-    TypeToken<Integer> INT = new TypeToken<>() {
+    TypeToken<Integer> INT = new TypeToken<Integer>() {
     };
 
-    TypeToken<Map<String, String>> MAP = new TypeToken<>() {
+    TypeToken<Map<String, String>> MAP = new TypeToken<Map<String, String>>() {
     };
 
-    TypeToken<List<Map<String, String>>> LMAP = new TypeToken<>() {
+    TypeToken<List<Map<String, String>>> LMAP = new TypeToken<List<Map<String, String>>>() {
     };
 }
diff --git a/src/com/zdemo/zhub/ZHubClient.java b/src/com/zdemo/zhub/ZHubClient.java
index e36b85b..8b44c93 100644
--- a/src/com/zdemo/zhub/ZHubClient.java
+++ b/src/com/zdemo/zhub/ZHubClient.java
@@ -420,11 +420,21 @@ public class ZHubClient extends AbstractConsumer implements IConsumer, IProducer
         }
 
         switch (endchar) {
-            case "M" -> delay *= (1000 * 60 * 60 * 24 * 30);
-            case "d" -> delay *= (1000 * 60 * 60 * 24);
-            case "H" -> delay *= (1000 * 60 * 60);
-            case "m" -> delay *= (1000 * 60);
-            case "s" -> delay *= 1000;
+            case "M":
+                delay *= (1000 * 60 * 60 * 24 * 30);
+                break;
+            case "d":
+                delay *= (1000 * 60 * 60 * 24);
+                break;
+            case "H":
+                delay *= (1000 * 60 * 60);
+                break;
+            case "m":
+                delay *= (1000 * 60);
+                break;
+            case "s":
+                delay *= 1000;
+                break;
         }
 
         delay(topic, v, delay);