diff --git a/src/Haboli/Euphoria/Client.hs b/src/Haboli/Euphoria/Client.hs
index 4cc99c1..ab22ec5 100644
--- a/src/Haboli/Euphoria/Client.hs
+++ b/src/Haboli/Euphoria/Client.hs
@@ -271,9 +271,18 @@ data Event
 --TODO: Add all the events
 instance FromJSON Event where
   parseJSON v = foldr (<|>) mempty
-    [ EventJoin <$> parseJSON v
+    [ EventBounce <$> parseJSON v
+    , EventDisconnect <$> parseJSON v
+    , EventHello <$> parseJSON v
+    , EventJoin <$> parseJSON v
+    , EventLogin <$> parseJSON v
+    , EventLogout <$> parseJSON v
+    , EventNetwork <$> parseJSON v
+    , EventNick <$> parseJSON v
+    , EventEditMessage <$> parseJSON v
     , EventPart <$> parseJSON v
     , EventPing <$> parseJSON v
+    , EventPmInitiate <$> parseJSON v
     , EventSend <$> parseJSON v
     , EventSnapshot <$> parseJSON v
     ]