diff --git a/stream.prs b/stream.prs
new file mode 100644
index 0000000..918c8f9
--- /dev/null
+++ b/stream.prs
@@ -0,0 +1,43 @@
+version 1 .
+embeddedType EntityRef.Ref .
+
+StreamConnection = <stream-connection @source #!Source @sink #!Sink @spec any>.
+
+; Assertion
+StreamListener = <stream-listener @spec any @handle #!ConnectionHandler>.
+
+; Assertion
+StreamConnect = <stream-connect @spec any @handle #!ConnectionHandler>.
+
+; Assertion
+ConnectionHandler =
+  / @connected <stream-connected @source #!Source @sink #!Sink>
+  / @rejected <stream-rejected @message string>
+.
+
+; Assertion
+StreamError = <error @message string>.
+
+Source =
+  ; Assertions:
+  / <sink @controller #!Sink>
+  / StreamError
+
+  ; Messages:
+  / <credit @amount CreditAmount @mode Mode>
+.
+
+Sink =
+  ; Assertions:
+  / <source @controller #!Source>
+  / StreamError
+
+  ; Messages:
+  / <data @payload any @mode Mode>
+  / <eof>
+.
+
+CreditAmount = @count int / @unbounded =unbounded .
+
+Mode = =bytes / @lines LineMode / <packet @size int> / <object @description any>.
+LineMode = =lf / =crlf .
diff --git a/tcp.prs b/tcp.prs
index 9239133..7a6d5e1 100644
--- a/tcp.prs
+++ b/tcp.prs
@@ -1,25 +1,7 @@
 version 1 .
 embeddedType EntityRef.Ref .
 
-Connection = <connection @handle #!ActiveSocket @spec any>.
-ConnectionPeer = <connection-peer @handle #!ActiveSocket @spec any>.
+TcpRemote = <tcp-remote @host string @port int>.
+TcpLocal = <tcp-local @host string @port int>.
 
-TcpRemote = <remote @host string @port int>.
-TcpLocal = <local @host string @port int>.
-
-ActiveSocket =
-  / <controller @controller #!Sink>
-  / <close @message string>
-  / Socket
-.
-
-Socket =
-  / <credit @amount CreditAmount @mode Mode>
-  / <data @payload bytes @mode Mode>
-  / <eof>
-.
-
-CreditAmount = @count int / @unbounded =unbounded .
-
-Mode = =bytes / @lines LineMode / <packet @size int>.
-LineMode = =lf / =crlf .
+TcpPeerInfo = <tcp-peer @handle #!any @local TcpLocal @remote TcpRemote>.