diff --git a/api/src/main/java/io/cloudevents/format/BinaryMarshaller.java b/api/src/main/java/io/cloudevents/format/BinaryMarshaller.java
index 709b900b..0f4132ad 100644
--- a/api/src/main/java/io/cloudevents/format/BinaryMarshaller.java
+++ b/api/src/main/java/io/cloudevents/format/BinaryMarshaller.java
@@ -1,10 +1,24 @@
+/**
+ * Copyright 2019 The CloudEvents Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package io.cloudevents.format;
 
 import java.net.URI;
+import java.util.Collection;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 import io.cloudevents.Attributes;
 import io.cloudevents.CloudEvent;
@@ -13,8 +27,9 @@ import io.cloudevents.extensions.ExtensionFormat;
 import io.cloudevents.fun.AttributeMarshaller;
 import io.cloudevents.fun.BinaryFormatHeaderMapper;
 import io.cloudevents.fun.DataMarshaller;
+import io.cloudevents.fun.ExtensionFormatAccessor;
 import io.cloudevents.fun.ExtensionMarshaller;
-import io.cloudevents.fun.FormatBuilder;
+import io.cloudevents.fun.WireBuilder;
 import io.cloudevents.json.Json;
 import io.cloudevents.v02.Accessor;
 import io.cloudevents.v02.AttributesImpl;
@@ -27,131 +42,216 @@ import io.cloudevents.v02.http.BinaryFormatHeaderMapperImpl;
  * @author fabiojose
  *
  */
-public class BinaryMarshaller<P, T, A extends Attributes> {
-	
-	public static <P, T, A extends Attributes> EventStep<P, T, A> builder() {
-		return new Builder<>();
-	}
+public final class BinaryMarshaller {
+	private BinaryMarshaller() {}
 
-	public static interface EventStep<P, T, A extends Attributes> {
-		AttributeMarshalStep<P, T, A> 
-			withEvent(Supplier<CloudEvent<A, T>> event);
+	/**
+	 * Gets a new builder instance
+	 * @param <A> The attributes type
+	 * @param <T> The 'data' type
+	 * @param <P> The payload type
+	 * @return
+	 */
+	public static <A extends Attributes, T, P> 
+		AttributeMarshalStep<A, T, P> builder() {
+		
+		return new Builder<A, T, P>();
 	}
 	
-	public static interface AttributeMarshalStep<P, T, A extends Attributes> {
-		ExtensionsStep<P, T, A> attributes(AttributeMarshaller<A> marshaller);
+	public static interface AttributeMarshalStep<A extends Attributes, T, P> {
+		/**
+		 * Marshals the {@link Attributes} instance into a 
+		 * {@code Map<String, String>}
+		 * @param marshaller
+		 * @return
+		 */
+		ExtensionsAccessorStep<A, T, P> map(AttributeMarshaller<A> marshaller);
 	}
 	
-	public static interface ExtensionsStep<P, T, A extends Attributes> {
-		HeaderMapStep<P, T, A> extensions(ExtensionMarshaller marshaller);
+	public static interface ExtensionsAccessorStep<A extends Attributes, T, P> {
+		
+		/**
+		 * To get access of internal collection of {@link ExtensionFormat}
+		 * @param accessor
+		 * @return
+		 */
+		ExtensionsStep<A, T, P> map(ExtensionFormatAccessor<A, T> accessor);
+		
 	}
 	
-	public static interface HeaderMapStep<P, T, A extends Attributes> {
-		PayloadStep<P, T, A> headers(BinaryFormatHeaderMapper mapper);
+	public static interface ExtensionsStep<A extends Attributes, T, P> {
+		/**
+		 * Marshals the collection of {@link ExtensionFormat} into a
+		 * {@code Map<String, String>}
+		 * @param marshaller
+		 * @return
+		 */
+		HeaderMapStep<A, T, P> map(ExtensionMarshaller marshaller);
 	}
 	
-	public static interface PayloadStep<P, T, A extends Attributes> {
-		Build<P, T, A> payload(DataMarshaller<P, T> marshaller);
+	public static interface HeaderMapStep<A extends Attributes, T, P> {
+		/**
+		 * Marshals the map of attributes and extensions into a map of headers
+		 * @param mapper
+		 * @return
+		 */
+		PayloadStep<A, T, P> map(BinaryFormatHeaderMapper mapper);
 	}
 	
-	public static interface Build<P, T, A extends Attributes> {
-		Format<P> build(FormatBuilder<P> builder);
+	public static interface PayloadStep<A extends Attributes, T, P> {
+		/**
+		 * Marshals the 'data' into payload
+		 * @param marshaller
+		 * @return
+		 */
+		BuilderStep<A, T, P> map(DataMarshaller<P, T> marshaller);
 	}
 	
-	public static class Builder<P, T, A extends Attributes> implements 
-		EventStep<P, T, A>, AttributeMarshalStep<P, T, A>,
-		ExtensionsStep<P, T, A>, HeaderMapStep<P, T, A>,
-		PayloadStep<P, T, A>, Build<P, T, A> {
-		
-		private CloudEvent<A, T> event;
-		
-		private Map<String, String> attributesMap;
-		
-		private Map<String, Object> headers;
-		
-		private P payload;
-		
-		private Map<String, String> extensionsMap;
+	public static interface BuilderStep<A extends Attributes, T, P> {
+		/**
+		 * Builds the {@link Wire} to use for wire transfer
+		 * @param builder
+		 * @return
+		 */
+		EventStep<A, T, P> builder(WireBuilder<P> builder);
+	}
+	
+	public static interface EventStep<A extends Attributes, T, P> {
+		/**
+		 * Takes the {@link CloudEvent} instance to marshal
+		 * @param event
+		 * @return
+		 */
+		Marshaller<P> withEvent(Supplier<CloudEvent<A, T>> event);
+	}
+	
+	public static interface Marshaller<P> {
+		/**
+		 * Builds an instance of {@link Wire}, doing all the computation at
+		 * this method call.
+		 * @return
+		 */
+		Wire<P> marshal();
+	}
+	
+	private static final class Builder<A extends Attributes, T, P> implements 
+		AttributeMarshalStep<A, T, P>,
+		ExtensionsAccessorStep<A, T, P>,
+		ExtensionsStep<A, T, P>,
+		PayloadStep<A, T, P>,
+		HeaderMapStep<A, T, P>,
+		BuilderStep<A, T, P>,
+		EventStep<A, T, P>,
+		Marshaller<P> {
 		
+		private AttributeMarshaller<A> attributeMarshaller;
+		private ExtensionFormatAccessor<A, T> extensionsAccessor;
+		private ExtensionMarshaller extensionMarshaller;
+		private BinaryFormatHeaderMapper headerMapper;
+		private DataMarshaller<P, T> dataMarshaller;
+		private WireBuilder<P> wireBuilder;
+		private Supplier<CloudEvent<A, T>> eventSupplier;
+
 		@Override
-		public AttributeMarshalStep<P, T, A> 
-				withEvent(Supplier<CloudEvent<A, T>> event) {
-			this.event = event.get();
+		public ExtensionsAccessorStep<A, T, P> map(AttributeMarshaller<A> marshaller) {
+			this.attributeMarshaller = marshaller;
 			return this;
 		}
 		
 		@Override
-		public ExtensionsStep<P, T, A> attributes(AttributeMarshaller<A> marshaller) {
-			this.attributesMap = marshaller.marshal(event.getAttributes());
-			return this;
-		}
-		
-		@Override
-		public HeaderMapStep<P, T, A> extensions(ExtensionMarshaller marshaller) {
-			this.extensionsMap = marshaller.marshal(Accessor.extensionsOf(event));
+		public ExtensionsStep<A, T, P> map(ExtensionFormatAccessor<A, T> accessor) {
+			this.extensionsAccessor = accessor;
 			return this;
 		}
 
 		@Override
-		public PayloadStep<P, T, A> headers(BinaryFormatHeaderMapper mapper) {
-			this.headers = mapper.map(attributesMap, extensionsMap);
+		public HeaderMapStep<A, T, P> map(ExtensionMarshaller marshaller) {
+			this.extensionMarshaller = marshaller;
+			return this;
+		}
+		
+		@Override
+		public PayloadStep<A, T, P> map(BinaryFormatHeaderMapper mapper) {
+			this.headerMapper = mapper;
+			return this;
+		}	
+		
+		@Override
+		public BuilderStep<A, T, P> map(DataMarshaller<P, T> marshaller) {
+			this.dataMarshaller = marshaller;
+			return this;
+		}
+		
+		@Override
+		public EventStep<A, T, P> builder(WireBuilder<P> builder) {
+			this.wireBuilder = builder;
 			return this;
 		}
 
 		@Override
-		public Build<P, T, A> payload(DataMarshaller<P, T> marshaller) {
-			event.getData().ifPresent((data) -> {
-				try {
-					payload = marshaller.marshal(data, headers);
-				}catch(Exception e) {
-					throw new RuntimeException(e.getMessage(), e);
-				}
-			});
+		public Marshaller<P> withEvent(Supplier<CloudEvent<A, T>> event) {
+			this.eventSupplier = event;
 			return this;
 		}
 
 		@Override
-		public Format<P> build(FormatBuilder<P> builder) {
-			return builder.build(payload, headers);
+		public Wire<P> marshal() {
+			CloudEvent<A, T> event = eventSupplier.get();
+			
+			Map<String, String> attributesMap = 
+					attributeMarshaller.marshal(event.getAttributes());
+			
+			Collection<ExtensionFormat> extensionsFormat = 
+					extensionsAccessor.extensionsOf(event);
+			
+			Map<String, String> extensionsMap = 
+					extensionMarshaller.marshal(extensionsFormat);
+			
+			Map<String, Object> headers = 
+					headerMapper.map(attributesMap, extensionsMap);
+			
+			P payload = null;
+			if(event.getData().isPresent()) {
+				payload = dataMarshaller.marshal(event.getData().get(),
+						headers);
+			}
+			
+			return wireBuilder.build(payload, headers);
 		}
 	}
 	
 	public static void main(String[] args) {
-		
-		final DistributedTracingExtension dt = new DistributedTracingExtension();
+		final DistributedTracingExtension dt = 
+				new DistributedTracingExtension();
 		dt.setTraceparent("0");
 		dt.setTracestate("congo=4");
 		
-		final ExtensionFormat tracing = new DistributedTracingExtension.Format(dt);
-
+		final ExtensionFormat tracing = 
+				new DistributedTracingExtension.Format(dt);
+		
 		final CloudEventImpl<String> ce = 
-			CloudEventBuilder.<String>builder()
-				.withId("x10")
-				.withSource(URI.create("/source"))
-				.withType("event-type")
-				.withSchemaurl(URI.create("/schema"))
-				.withContenttype("text/plain")
-				.withExtension(tracing)
-				.withData("my-data")
-				.build();
+				CloudEventBuilder.<String>builder()
+					.withId("x10")
+					.withSource(URI.create("/source"))
+					.withType("event-type")
+					.withSchemaurl(URI.create("/schema"))
+					.withContenttype("text/plain")
+					.withData("my-data")
+					.withExtension(tracing)
+					.build();
 		
-		Format<String> format =	
-		BinaryMarshaller.<String, String, AttributesImpl>builder()
+		Wire<String> wire = 
+		BinaryMarshaller.<AttributesImpl, String, String>builder()
+			.map(AttributesImpl::marshal)
+			.map(Accessor::extensionsOf) 
+			.map(ExtensionFormat::marshal)
+			.map(BinaryFormatHeaderMapperImpl::map)
+			.map(Json.marshaller()::marshal)
+			.builder(Wire<String>::new)
 			.withEvent(() -> ce)
-			.attributes(AttributesImpl.marshaller()::marshal)
-			.extensions((extensions) -> {
-				return extensions.stream()
-					.map(ExtensionFormat::transport)
-					.flatMap(t -> t.entrySet().stream())
-					.collect(Collectors.toMap(Entry::getKey, Entry::getValue));
-			})
-			.headers(BinaryFormatHeaderMapperImpl.mapper()::map)
-			.payload(Json.marshaller()::marshal)
-			.build((payload, headers) -> {
-				return new Format<>(payload, headers);
-			});
+			.marshal();
 		
-		System.out.println(format.getPayload());
-		System.out.print(format.getHeaders());
+		System.out.println(wire.getPayload());
+		System.out.println(wire.getHeaders());
 	}
 }