diff --git a/source/forstio/io_wrapper.h b/source/forstio/io_wrapper.h
index a6b4d16..66588fb 100644
--- a/source/forstio/io_wrapper.h
+++ b/source/forstio/io_wrapper.h
@@ -1,25 +1,27 @@
 #pragma once
 
 #include "async.h"
+#include "message.h"
 #include "io.h"
 
 namespace saw {
 
-template <typename Codec, typename Incoming, typename Outgoing>
+template <typename Codec, typename Incoming, typename Outgoing, class InContainer = MessageContainer<Incoming>, class OutContainer = MessageContainer<Outgoing>>
 class StreamingIoPeer {
 private:
 	Codec codec;
 
 	Own<AsyncIoStream> io_stream;
 
-	Own<ConveyorFeeder<Incoming>> incoming_feeder = nullptr;
-
+	Own<ConveyorFeeder<HeapMessageRoot<Incoming, InContainer>>> incoming_feeder = nullptr;
 public:
 	StreamingIoPeer(Own<AsyncIoStream> stream);
 
-	void send(Outgoing outgoing, Own<MessageBuilder> builder);
+	void send(HeapMessageRoot<Outgoing, OutContainer> builder);
 
-	Conveyor<Incoming> startReadPump();
+	Conveyor<HeapMessageRootIncoming> startReadPump();
 };
 
-} // namespace saw
\ No newline at end of file
+
+
+} // namespace saw
diff --git a/tools/message_analyzer/SConscript b/tools/message_analyzer/SConscript
new file mode 100644
index 0000000..e69de29