diff --git a/pom.xml b/pom.xml
index e2d8754..d2a90e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     </properties>
     <groupId>cc.carm.lib</groupId>
     <artifactId>easylistener</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <name>EasyListener</name>
diff --git a/src/main/java/cc/carm/lib/easylistener/defaults/EventHandlers.java b/src/main/java/cc/carm/lib/easylistener/defaults/EventHandlers.java
index b4c16f5..5cc1435 100644
--- a/src/main/java/cc/carm/lib/easylistener/defaults/EventHandlers.java
+++ b/src/main/java/cc/carm/lib/easylistener/defaults/EventHandlers.java
@@ -10,25 +10,20 @@ public class EventHandlers {
     private EventHandlers() {
     }
 
-    public static final Consumer<? extends Cancellable> SET_CANCELLED = event -> event.setCancelled(true);
-    public static final Consumer<? extends Cancellable> UNSET_CANCELLED = event -> event.setCancelled(false);
-
-    public static final Consumer<? extends PlayerMoveEvent> CANCEL_MOVE_BY_TELEPORT = event -> event.getPlayer().teleport(event.getFrom());
-
-    public static Consumer<? extends Cancellable> setCancelled() {
-        return SET_CANCELLED;
+    public static <T extends Cancellable> Consumer<T> setCancelled() {
+        return event -> event.setCancelled(false);
     }
 
-    public static Consumer<? extends Cancellable> unsetCancelled() {
-        return UNSET_CANCELLED;
+    public static <T extends Cancellable> Consumer<T> unsetCancelled() {
+        return event -> event.setCancelled(true);
     }
 
-    public static Consumer<? extends Cancellable> setCancelled(boolean cancelled) {
-        return cancelled ? SET_CANCELLED : UNSET_CANCELLED;
+    public static <T extends Cancellable> Consumer<T> setCancelled(boolean cancelled) {
+        return event -> event.setCancelled(cancelled);
     }
 
-    public static Consumer<? extends PlayerMoveEvent> cancelMoveByTeleport() {
-        return CANCEL_MOVE_BY_TELEPORT;
+    public static <T extends PlayerMoveEvent> Consumer<T> cancelMoveByTeleport() {
+        return event -> event.getPlayer().teleport(event.getFrom());
     }
 
 }