diff --git a/serial/serial.c b/serial/serial.c
index ced1fb4..5427cc8 100644
--- a/serial/serial.c
+++ b/serial/serial.c
@@ -25,10 +25,10 @@ enum b_status b_serial_ctx_create(struct b_serial_ctx **out)
 
 	memset(ctx, 0x0, sizeof *ctx);
 
-	enum b_status status = b_stream_pipeline_create(2048, &ctx->ctx_pipeline);
-	if (!B_OK(status)) {
+	ctx->ctx_streambuf = b_stream_buffer_create_dynamic(2048);
+	if (!ctx->ctx_streambuf) {
 		free(ctx);
-		return status;
+		return B_ERR_NO_MEMORY;
 	}
 
 	*out = ctx;
@@ -37,7 +37,7 @@ enum b_status b_serial_ctx_create(struct b_serial_ctx **out)
 
 enum b_status b_serial_ctx_destroy(struct b_serial_ctx *ctx)
 {
-	b_stream_pipeline_destroy(ctx->ctx_pipeline);
+	b_stream_buffer_unref(ctx->ctx_streambuf);
 	free(ctx);
 	return B_SUCCESS;
 }
@@ -53,7 +53,7 @@ static const struct b_serial_format_ops *get_formatter(enum b_serial_format fmt)
 
 enum b_status b_serial_ctx_serialise(
 	struct b_serial_ctx *ctx, enum b_serial_format fmt, b_object *src,
-	struct b_stream *dest, enum b_serial_flags flags)
+	b_stream *dest, enum b_serial_flags flags)
 {
 	const struct b_serial_format_ops *ops = get_formatter(fmt);
 	if (!ops) {
@@ -68,8 +68,8 @@ enum b_status b_serial_ctx_serialise(
 }
 
 enum b_status b_serial_ctx_deserialise(
-	struct b_serial_ctx *ctx, enum b_serial_format fmt,
-	struct b_stream *src, b_object **dest, enum b_serial_flags flags)
+	struct b_serial_ctx *ctx, enum b_serial_format fmt, b_stream *src,
+	b_object **dest, enum b_serial_flags flags)
 {
 	const struct b_serial_format_ops *ops = get_formatter(fmt);
 	if (!ops) {
diff --git a/serial/serial.h b/serial/serial.h
index 84f69ff..377de71 100644
--- a/serial/serial.h
+++ b/serial/serial.h
@@ -2,19 +2,19 @@
 #define _SERIAL_SERIAL_H_
 
 #include <blue/core/object.h>
+#include <blue/core/stream.h>
 #include <blue/serial.h>
 #include <stdint.h>
 
 struct b_serial_ctx {
-	struct b_stream_pipeline *ctx_pipeline;
+	b_stream_buffer *ctx_streambuf;
 };
 
 struct b_serial_format_ops {
 	enum b_status (*fmt_serialise)(
-		struct b_serial_ctx *, b_object *, struct b_stream *,
-		enum b_serial_flags);
+		struct b_serial_ctx *, b_object *, b_stream *, enum b_serial_flags);
 	enum b_status (*fmt_deserialise)(
-		struct b_serial_ctx *, struct b_stream *, b_object **,
+		struct b_serial_ctx *, b_stream *, b_object **,
 		enum b_serial_flags);
 };