diff --git a/src/Ratchet/WebSocket/BinaryMessageInterface.php b/src/Ratchet/WebSocket/BinaryMessageInterface.php
deleted file mode 100644
index e5dc022..0000000
--- a/src/Ratchet/WebSocket/BinaryMessageInterface.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-namespace Ratchet\WebSocket;
-use Ratchet\MessageInterface;
-use Ratchet\ConnectionInterface;
-
-interface BinaryMessageInterface extends MessageInterface {
-    public function onMessage(ConnectionInterface $conn, $msg, $isBinary = false);
-}
diff --git a/src/Ratchet/WebSocket/MessageCallableInterface.php b/src/Ratchet/WebSocket/MessageCallableInterface.php
new file mode 100644
index 0000000..b5c094e
--- /dev/null
+++ b/src/Ratchet/WebSocket/MessageCallableInterface.php
@@ -0,0 +1,8 @@
+<?php
+namespace Ratchet\WebSocket;
+use Ratchet\ConnectionInterface;
+use Ratchet\RFC6455\Messaging\MessageInterface;
+
+interface MessageCallableInterface {
+    public function onMessage(ConnectionInterface $conn, MessageInterface $msg);
+}
diff --git a/src/Ratchet/WebSocket/MessageComponentInterface.php b/src/Ratchet/WebSocket/MessageComponentInterface.php
new file mode 100644
index 0000000..fccd4e6
--- /dev/null
+++ b/src/Ratchet/WebSocket/MessageComponentInterface.php
@@ -0,0 +1,6 @@
+<?php
+namespace Ratchet\WebSocket;
+use Ratchet\ComponentInterface;
+
+interface MessageComponentInterface extends ComponentInterface, MessageCallableInterface {
+}
diff --git a/src/Ratchet/WebSocket/WsServer.php b/src/Ratchet/WebSocket/WsServer.php
index 0bcb50a..95c1acd 100644
--- a/src/Ratchet/WebSocket/WsServer.php
+++ b/src/Ratchet/WebSocket/WsServer.php
@@ -1,7 +1,8 @@
 <?php
 namespace Ratchet\WebSocket;
-use Ratchet\MessageComponentInterface;
+use Ratchet\ComponentInterface;
 use Ratchet\ConnectionInterface;
+use Ratchet\MessageComponentInterface as DataComponentInterface;
 use Ratchet\Http\HttpServerInterface;
 use Ratchet\Http\CloseResponseTrait;
 use Psr\Http\Message\RequestInterface;
@@ -26,7 +27,7 @@ class WsServer implements HttpServerInterface {
 
     /**
      * Decorated component
-     * @var \Ratchet\MessageComponentInterface
+     * @var \Ratchet\ComponentInterface
      */
     private $delegate;
 
@@ -56,10 +57,27 @@ class WsServer implements HttpServerInterface {
     private $pongReceiver;
 
     /**
-     * @param \Ratchet\MessageComponentInterface $component Your application to run with WebSockets
-     *                                                      If you want to enable sub-protocols have your component implement WsServerInterface as well
+     * @var \Closure
      */
-    public function __construct(MessageComponentInterface $component) {
+    private $msgCb;
+
+    /**
+     * @param \Ratchet\WebSocket\MessageComponentInterface|\Ratchet\MessageComponentInterface $component Your application to run with WebSockets
+     * @note If you want to enable sub-protocols have your component implement WsServerInterface as well
+     */
+    public function __construct(ComponentInterface $component) {
+        if ($component instanceof MessageComponentInterface) {
+            $this->msgCb = function(ConnectionInterface $conn, MessageInterface $msg) {
+                $this->delegate->onMessage($conn, $msg);
+            };
+        } elseif ($component instanceof DataComponentInterface) {
+            $this->msgCb = function(ConnectionInterface $conn, MessageInterface $msg) {
+                $this->delegate->onMessage($conn, $msg->getPayload());
+            };
+        } else {
+            throw new \UnexpectedValueException('Expected instance of \Ratchet\WebSocket\MessageComponentInterface or \Ratchet\MessageComponentInterface');
+        }
+
         $this->delegate    = $component;
         $this->connections = new \SplObjectStorage;
 
@@ -106,7 +124,8 @@ class WsServer implements HttpServerInterface {
         $streamer = new MessageBuffer(
             $this->closeFrameChecker,
             function(MessageInterface $msg) use ($wsConn) {
-                $this->delegate->onMessage($wsConn, $msg->getPayload(), $msg->isBinary());
+                $cb = $this->msgCb;
+                $cb($wsConn, $msg);
             },
             function(FrameInterface $frame) use ($wsConn) {
                 $this->onControlFrame($frame, $wsConn);
diff --git a/tests/autobahn/bin/fuzzingserver.php b/tests/autobahn/bin/fuzzingserver.php
index 4b0fb84..5dcbf66 100644
--- a/tests/autobahn/bin/fuzzingserver.php
+++ b/tests/autobahn/bin/fuzzingserver.php
@@ -1,10 +1,20 @@
 <?php
+use Ratchet\ConnectionInterface;
 
     require dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
 
-class BinaryEcho extends \Ratchet\Server\EchoServer implements \Ratchet\WebSocket\BinaryMessageInterface {
-    public function onMessage(\Ratchet\ConnectionInterface $from, $msg, $isBinary = false) {
-        $from->send($msg, $isBinary);
+class BinaryEcho implements \Ratchet\WebSocket\MessageComponentInterface {
+    public function onMessage(ConnectionInterface $from, \Ratchet\RFC6455\Messaging\MessageInterface $msg) {
+        $from->send($msg);
+    }
+
+    public function onOpen(ConnectionInterface $conn) {
+    }
+
+    public function onClose(ConnectionInterface $conn) {
+    }
+
+    public function onError(ConnectionInterface $conn, \Exception $e) {
     }
 }