diff --git a/docs/api.rst b/docs/api.rst
index c7fc255..1ad067f 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -53,6 +53,8 @@ You can use them like that:
    :members:
 .. autoclass:: i2plib.StreamConnection
    :members:
+.. autoclass:: i2plib.StreamAcceptor
+   :members:
 
 Utilities
 ---------
diff --git a/i2plib/aiosam.py b/i2plib/aiosam.py
index 3a484f4..2d145f1 100644
--- a/i2plib/aiosam.py
+++ b/i2plib/aiosam.py
@@ -212,23 +212,10 @@ class StreamConnection:
     async def __aenter__(self):
         self.reader, self.writer = await stream_connect(self.session_name, 
                 self.destination, sam_address=self.sam_address, loop=self.loop)
+        self.read = self.reader.read
+        self.write = self.writer.write
         return self
 
-    async def read(self, length):
-        """Read data from socket
-
-        :param length: buffer length
-        :return: data
-        """
-        return await self.reader.read(length)
-
-    def write(self, data):
-        """Write data to socket
-
-        :param data: data
-        """
-        self.writer.write(data)
-
     async def __aexit__(self, exc_type, exc, tb):
         ### TODO handle exceptions
         self.writer.close()
@@ -250,23 +237,10 @@ class StreamAcceptor:
     async def __aenter__(self):
         self.reader, self.writer = await stream_accept(self.session_name, 
                         sam_address=self.sam_address, loop=self.loop)
+        self.read = self.reader.read
+        self.write = self.writer.write
         return self
 
-    async def read(self, length):
-        """Read data from socket
-
-        :param length: buffer length
-        :return: data
-        """
-        return await self.reader.read(length)
-
-    def write(self, data):
-        """Write data to socket
-
-        :param data: data
-        """
-        self.writer.write(data)
-
     async def __aexit__(self, exc_type, exc, tb):
         ### TODO handle exceptions
         self.writer.close()