Merge branch 'master' into release-0.2, kamon-play still need fixes.

Conflicts:
	kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
	kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala
	kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
	kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
	kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
	kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
	kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
	kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
	project/Dependencies.scala

28 files changed, 353 insertions, 10416 deletions

diff --git a/kamon-core/src/main/java/akka/remote/WireFormats.java b/kamon-core/src/main/java/akka/remote/WireFormats.java
deleted file mode 100644
index 32dcb256..00000000
--- a/kamon-core/src/main/java/akka/remote/WireFormats.java
+++ /dev/null
@@ -1,7535 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: WireFormats.proto
-
-package akka.remote;
-
-public final class WireFormats {
-  private WireFormats() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-  }
-  public enum CommandType
-      implements com.google.protobuf.ProtocolMessageEnum {
-    ASSOCIATE(0, 1),
-    DISASSOCIATE(1, 2),
-    HEARTBEAT(2, 3),
-    DISASSOCIATE_SHUTTING_DOWN(3, 4),
-    DISASSOCIATE_QUARANTINED(4, 5),
-    ;
-    
-    public static final int ASSOCIATE_VALUE = 1;
-    public static final int DISASSOCIATE_VALUE = 2;
-    public static final int HEARTBEAT_VALUE = 3;
-    public static final int DISASSOCIATE_SHUTTING_DOWN_VALUE = 4;
-    public static final int DISASSOCIATE_QUARANTINED_VALUE = 5;
-    
-    
-    public final int getNumber() { return value; }
-    
-    public static CommandType valueOf(int value) {
-      switch (value) {
-        case 1: return ASSOCIATE;
-        case 2: return DISASSOCIATE;
-        case 3: return HEARTBEAT;
-        case 4: return DISASSOCIATE_SHUTTING_DOWN;
-        case 5: return DISASSOCIATE_QUARANTINED;
-        default: return null;
-      }
-    }
-    
-    public static com.google.protobuf.Internal.EnumLiteMap<CommandType>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static com.google.protobuf.Internal.EnumLiteMap<CommandType>
-        internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<CommandType>() {
-            public CommandType findValueByNumber(int number) {
-              return CommandType.valueOf(number);
-            }
-          };
-    
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(index);
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.getDescriptor().getEnumTypes().get(0);
-    }
-    
-    private static final CommandType[] VALUES = {
-      ASSOCIATE, DISASSOCIATE, HEARTBEAT, DISASSOCIATE_SHUTTING_DOWN, DISASSOCIATE_QUARANTINED, 
-    };
-    
-    public static CommandType valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      return VALUES[desc.getIndex()];
-    }
-    
-    private final int index;
-    private final int value;
-    
-    private CommandType(int index, int value) {
-      this.index = index;
-      this.value = value;
-    }
-    
-    // @@protoc_insertion_point(enum_scope:CommandType)
-  }
-  
-  public interface AckAndEnvelopeContainerOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // optional .AcknowledgementInfo ack = 1;
-    boolean hasAck();
-    akka.remote.WireFormats.AcknowledgementInfo getAck();
-    akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder();
-    
-    // optional .RemoteEnvelope envelope = 2;
-    boolean hasEnvelope();
-    akka.remote.WireFormats.RemoteEnvelope getEnvelope();
-    akka.remote.WireFormats.RemoteEnvelopeOrBuilder getEnvelopeOrBuilder();
-  }
-  public static final class AckAndEnvelopeContainer extends
-      com.google.protobuf.GeneratedMessage
-      implements AckAndEnvelopeContainerOrBuilder {
-    // Use AckAndEnvelopeContainer.newBuilder() to construct.
-    private AckAndEnvelopeContainer(Builder builder) {
-      super(builder);
-    }
-    private AckAndEnvelopeContainer(boolean noInit) {}
-    
-    private static final AckAndEnvelopeContainer defaultInstance;
-    public static AckAndEnvelopeContainer getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AckAndEnvelopeContainer getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_AckAndEnvelopeContainer_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_AckAndEnvelopeContainer_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // optional .AcknowledgementInfo ack = 1;
-    public static final int ACK_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.AcknowledgementInfo ack_;
-    public boolean hasAck() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.AcknowledgementInfo getAck() {
-      return ack_;
-    }
-    public akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() {
-      return ack_;
-    }
-    
-    // optional .RemoteEnvelope envelope = 2;
-    public static final int ENVELOPE_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.RemoteEnvelope envelope_;
-    public boolean hasEnvelope() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.WireFormats.RemoteEnvelope getEnvelope() {
-      return envelope_;
-    }
-    public akka.remote.WireFormats.RemoteEnvelopeOrBuilder getEnvelopeOrBuilder() {
-      return envelope_;
-    }
-    
-    private void initFields() {
-      ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-      envelope_ = akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (hasAck()) {
-        if (!getAck().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasEnvelope()) {
-        if (!getEnvelope().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, ack_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, envelope_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, ack_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, envelope_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AckAndEnvelopeContainer parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.AckAndEnvelopeContainer prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.AckAndEnvelopeContainerOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_AckAndEnvelopeContainer_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_AckAndEnvelopeContainer_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.AckAndEnvelopeContainer.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getAckFieldBuilder();
-          getEnvelopeFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (ackBuilder_ == null) {
-          ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-        } else {
-          ackBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (envelopeBuilder_ == null) {
-          envelope_ = akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance();
-        } else {
-          envelopeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.AckAndEnvelopeContainer.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.AckAndEnvelopeContainer getDefaultInstanceForType() {
-        return akka.remote.WireFormats.AckAndEnvelopeContainer.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.AckAndEnvelopeContainer build() {
-        akka.remote.WireFormats.AckAndEnvelopeContainer result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.AckAndEnvelopeContainer buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.AckAndEnvelopeContainer result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.AckAndEnvelopeContainer buildPartial() {
-        akka.remote.WireFormats.AckAndEnvelopeContainer result = new akka.remote.WireFormats.AckAndEnvelopeContainer(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (ackBuilder_ == null) {
-          result.ack_ = ack_;
-        } else {
-          result.ack_ = ackBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (envelopeBuilder_ == null) {
-          result.envelope_ = envelope_;
-        } else {
-          result.envelope_ = envelopeBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.AckAndEnvelopeContainer) {
-          return mergeFrom((akka.remote.WireFormats.AckAndEnvelopeContainer)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.AckAndEnvelopeContainer other) {
-        if (other == akka.remote.WireFormats.AckAndEnvelopeContainer.getDefaultInstance()) return this;
-        if (other.hasAck()) {
-          mergeAck(other.getAck());
-        }
-        if (other.hasEnvelope()) {
-          mergeEnvelope(other.getEnvelope());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (hasAck()) {
-          if (!getAck().isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasEnvelope()) {
-          if (!getEnvelope().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              akka.remote.WireFormats.AcknowledgementInfo.Builder subBuilder = akka.remote.WireFormats.AcknowledgementInfo.newBuilder();
-              if (hasAck()) {
-                subBuilder.mergeFrom(getAck());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setAck(subBuilder.buildPartial());
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.RemoteEnvelope.Builder subBuilder = akka.remote.WireFormats.RemoteEnvelope.newBuilder();
-              if (hasEnvelope()) {
-                subBuilder.mergeFrom(getEnvelope());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setEnvelope(subBuilder.buildPartial());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // optional .AcknowledgementInfo ack = 1;
-      private akka.remote.WireFormats.AcknowledgementInfo ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder> ackBuilder_;
-      public boolean hasAck() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.AcknowledgementInfo getAck() {
-        if (ackBuilder_ == null) {
-          return ack_;
-        } else {
-          return ackBuilder_.getMessage();
-        }
-      }
-      public Builder setAck(akka.remote.WireFormats.AcknowledgementInfo value) {
-        if (ackBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ack_ = value;
-          onChanged();
-        } else {
-          ackBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setAck(
-          akka.remote.WireFormats.AcknowledgementInfo.Builder builderForValue) {
-        if (ackBuilder_ == null) {
-          ack_ = builderForValue.build();
-          onChanged();
-        } else {
-          ackBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeAck(akka.remote.WireFormats.AcknowledgementInfo value) {
-        if (ackBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              ack_ != akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance()) {
-            ack_ =
-              akka.remote.WireFormats.AcknowledgementInfo.newBuilder(ack_).mergeFrom(value).buildPartial();
-          } else {
-            ack_ = value;
-          }
-          onChanged();
-        } else {
-          ackBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearAck() {
-        if (ackBuilder_ == null) {
-          ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-          onChanged();
-        } else {
-          ackBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.AcknowledgementInfo.Builder getAckBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getAckFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() {
-        if (ackBuilder_ != null) {
-          return ackBuilder_.getMessageOrBuilder();
-        } else {
-          return ack_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder> 
-          getAckFieldBuilder() {
-        if (ackBuilder_ == null) {
-          ackBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder>(
-                  ack_,
-                  getParentForChildren(),
-                  isClean());
-          ack_ = null;
-        }
-        return ackBuilder_;
-      }
-      
-      // optional .RemoteEnvelope envelope = 2;
-      private akka.remote.WireFormats.RemoteEnvelope envelope_ = akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.RemoteEnvelope, akka.remote.WireFormats.RemoteEnvelope.Builder, akka.remote.WireFormats.RemoteEnvelopeOrBuilder> envelopeBuilder_;
-      public boolean hasEnvelope() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.WireFormats.RemoteEnvelope getEnvelope() {
-        if (envelopeBuilder_ == null) {
-          return envelope_;
-        } else {
-          return envelopeBuilder_.getMessage();
-        }
-      }
-      public Builder setEnvelope(akka.remote.WireFormats.RemoteEnvelope value) {
-        if (envelopeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          envelope_ = value;
-          onChanged();
-        } else {
-          envelopeBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setEnvelope(
-          akka.remote.WireFormats.RemoteEnvelope.Builder builderForValue) {
-        if (envelopeBuilder_ == null) {
-          envelope_ = builderForValue.build();
-          onChanged();
-        } else {
-          envelopeBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeEnvelope(akka.remote.WireFormats.RemoteEnvelope value) {
-        if (envelopeBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              envelope_ != akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance()) {
-            envelope_ =
-              akka.remote.WireFormats.RemoteEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
-          } else {
-            envelope_ = value;
-          }
-          onChanged();
-        } else {
-          envelopeBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearEnvelope() {
-        if (envelopeBuilder_ == null) {
-          envelope_ = akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance();
-          onChanged();
-        } else {
-          envelopeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.WireFormats.RemoteEnvelope.Builder getEnvelopeBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getEnvelopeFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.RemoteEnvelopeOrBuilder getEnvelopeOrBuilder() {
-        if (envelopeBuilder_ != null) {
-          return envelopeBuilder_.getMessageOrBuilder();
-        } else {
-          return envelope_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.RemoteEnvelope, akka.remote.WireFormats.RemoteEnvelope.Builder, akka.remote.WireFormats.RemoteEnvelopeOrBuilder> 
-          getEnvelopeFieldBuilder() {
-        if (envelopeBuilder_ == null) {
-          envelopeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.RemoteEnvelope, akka.remote.WireFormats.RemoteEnvelope.Builder, akka.remote.WireFormats.RemoteEnvelopeOrBuilder>(
-                  envelope_,
-                  getParentForChildren(),
-                  isClean());
-          envelope_ = null;
-        }
-        return envelopeBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AckAndEnvelopeContainer)
-    }
-    
-    static {
-      defaultInstance = new AckAndEnvelopeContainer(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AckAndEnvelopeContainer)
-  }
-  
-  public interface RemoteEnvelopeOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required .ActorRefData recipient = 1;
-    boolean hasRecipient();
-    akka.remote.WireFormats.ActorRefData getRecipient();
-    akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder();
-    
-    // required .SerializedMessage message = 2;
-    boolean hasMessage();
-    akka.remote.WireFormats.SerializedMessage getMessage();
-    akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder();
-    
-    // optional .ActorRefData sender = 4;
-    boolean hasSender();
-    akka.remote.WireFormats.ActorRefData getSender();
-    akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder();
-    
-    // optional fixed64 seq = 5;
-    boolean hasSeq();
-    long getSeq();
-  }
-  public static final class RemoteEnvelope extends
-      com.google.protobuf.GeneratedMessage
-      implements RemoteEnvelopeOrBuilder {
-    // Use RemoteEnvelope.newBuilder() to construct.
-    private RemoteEnvelope(Builder builder) {
-      super(builder);
-    }
-    private RemoteEnvelope(boolean noInit) {}
-    
-    private static final RemoteEnvelope defaultInstance;
-    public static RemoteEnvelope getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public RemoteEnvelope getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_RemoteEnvelope_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_RemoteEnvelope_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required .ActorRefData recipient = 1;
-    public static final int RECIPIENT_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.ActorRefData recipient_;
-    public boolean hasRecipient() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.ActorRefData getRecipient() {
-      return recipient_;
-    }
-    public akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() {
-      return recipient_;
-    }
-    
-    // required .SerializedMessage message = 2;
-    public static final int MESSAGE_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.SerializedMessage message_;
-    public boolean hasMessage() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.WireFormats.SerializedMessage getMessage() {
-      return message_;
-    }
-    public akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() {
-      return message_;
-    }
-    
-    // optional .ActorRefData sender = 4;
-    public static final int SENDER_FIELD_NUMBER = 4;
-    private akka.remote.WireFormats.ActorRefData sender_;
-    public boolean hasSender() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public akka.remote.WireFormats.ActorRefData getSender() {
-      return sender_;
-    }
-    public akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() {
-      return sender_;
-    }
-    
-    // optional fixed64 seq = 5;
-    public static final int SEQ_FIELD_NUMBER = 5;
-    private long seq_;
-    public boolean hasSeq() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    public long getSeq() {
-      return seq_;
-    }
-    
-    private void initFields() {
-      recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-      sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      seq_ = 0L;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasRecipient()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasMessage()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getRecipient().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getMessage().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (hasSender()) {
-        if (!getSender().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, recipient_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, message_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(4, sender_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeFixed64(5, seq_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, recipient_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, message_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, sender_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFixed64Size(5, seq_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.RemoteEnvelope parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.RemoteEnvelope prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.RemoteEnvelopeOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_RemoteEnvelope_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_RemoteEnvelope_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.RemoteEnvelope.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getRecipientFieldBuilder();
-          getMessageFieldBuilder();
-          getSenderFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (recipientBuilder_ == null) {
-          recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-        } else {
-          recipientBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (messageBuilder_ == null) {
-          message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-        } else {
-          messageBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (senderBuilder_ == null) {
-          sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-        } else {
-          senderBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        seq_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.RemoteEnvelope.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.RemoteEnvelope getDefaultInstanceForType() {
-        return akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.RemoteEnvelope build() {
-        akka.remote.WireFormats.RemoteEnvelope result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.RemoteEnvelope buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.RemoteEnvelope result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.RemoteEnvelope buildPartial() {
-        akka.remote.WireFormats.RemoteEnvelope result = new akka.remote.WireFormats.RemoteEnvelope(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (recipientBuilder_ == null) {
-          result.recipient_ = recipient_;
-        } else {
-          result.recipient_ = recipientBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (messageBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = messageBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        if (senderBuilder_ == null) {
-          result.sender_ = sender_;
-        } else {
-          result.sender_ = senderBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.seq_ = seq_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.RemoteEnvelope) {
-          return mergeFrom((akka.remote.WireFormats.RemoteEnvelope)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.RemoteEnvelope other) {
-        if (other == akka.remote.WireFormats.RemoteEnvelope.getDefaultInstance()) return this;
-        if (other.hasRecipient()) {
-          mergeRecipient(other.getRecipient());
-        }
-        if (other.hasMessage()) {
-          mergeMessage(other.getMessage());
-        }
-        if (other.hasSender()) {
-          mergeSender(other.getSender());
-        }
-        if (other.hasSeq()) {
-          setSeq(other.getSeq());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasRecipient()) {
-          
-          return false;
-        }
-        if (!hasMessage()) {
-          
-          return false;
-        }
-        if (!getRecipient().isInitialized()) {
-          
-          return false;
-        }
-        if (!getMessage().isInitialized()) {
-          
-          return false;
-        }
-        if (hasSender()) {
-          if (!getSender().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder();
-              if (hasRecipient()) {
-                subBuilder.mergeFrom(getRecipient());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setRecipient(subBuilder.buildPartial());
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.SerializedMessage.Builder subBuilder = akka.remote.WireFormats.SerializedMessage.newBuilder();
-              if (hasMessage()) {
-                subBuilder.mergeFrom(getMessage());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setMessage(subBuilder.buildPartial());
-              break;
-            }
-            case 34: {
-              akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder();
-              if (hasSender()) {
-                subBuilder.mergeFrom(getSender());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setSender(subBuilder.buildPartial());
-              break;
-            }
-            case 41: {
-              bitField0_ |= 0x00000008;
-              seq_ = input.readFixed64();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required .ActorRefData recipient = 1;
-      private akka.remote.WireFormats.ActorRefData recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> recipientBuilder_;
-      public boolean hasRecipient() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.ActorRefData getRecipient() {
-        if (recipientBuilder_ == null) {
-          return recipient_;
-        } else {
-          return recipientBuilder_.getMessage();
-        }
-      }
-      public Builder setRecipient(akka.remote.WireFormats.ActorRefData value) {
-        if (recipientBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          recipient_ = value;
-          onChanged();
-        } else {
-          recipientBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setRecipient(
-          akka.remote.WireFormats.ActorRefData.Builder builderForValue) {
-        if (recipientBuilder_ == null) {
-          recipient_ = builderForValue.build();
-          onChanged();
-        } else {
-          recipientBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeRecipient(akka.remote.WireFormats.ActorRefData value) {
-        if (recipientBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              recipient_ != akka.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            recipient_ =
-              akka.remote.WireFormats.ActorRefData.newBuilder(recipient_).mergeFrom(value).buildPartial();
-          } else {
-            recipient_ = value;
-          }
-          onChanged();
-        } else {
-          recipientBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearRecipient() {
-        if (recipientBuilder_ == null) {
-          recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-          onChanged();
-        } else {
-          recipientBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.ActorRefData.Builder getRecipientBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getRecipientFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() {
-        if (recipientBuilder_ != null) {
-          return recipientBuilder_.getMessageOrBuilder();
-        } else {
-          return recipient_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> 
-          getRecipientFieldBuilder() {
-        if (recipientBuilder_ == null) {
-          recipientBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder>(
-                  recipient_,
-                  getParentForChildren(),
-                  isClean());
-          recipient_ = null;
-        }
-        return recipientBuilder_;
-      }
-      
-      // required .SerializedMessage message = 2;
-      private akka.remote.WireFormats.SerializedMessage message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder> messageBuilder_;
-      public boolean hasMessage() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.WireFormats.SerializedMessage getMessage() {
-        if (messageBuilder_ == null) {
-          return message_;
-        } else {
-          return messageBuilder_.getMessage();
-        }
-      }
-      public Builder setMessage(akka.remote.WireFormats.SerializedMessage value) {
-        if (messageBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          message_ = value;
-          onChanged();
-        } else {
-          messageBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setMessage(
-          akka.remote.WireFormats.SerializedMessage.Builder builderForValue) {
-        if (messageBuilder_ == null) {
-          message_ = builderForValue.build();
-          onChanged();
-        } else {
-          messageBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeMessage(akka.remote.WireFormats.SerializedMessage value) {
-        if (messageBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              message_ != akka.remote.WireFormats.SerializedMessage.getDefaultInstance()) {
-            message_ =
-              akka.remote.WireFormats.SerializedMessage.newBuilder(message_).mergeFrom(value).buildPartial();
-          } else {
-            message_ = value;
-          }
-          onChanged();
-        } else {
-          messageBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.WireFormats.SerializedMessage.Builder getMessageBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getMessageFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() {
-        if (messageBuilder_ != null) {
-          return messageBuilder_.getMessageOrBuilder();
-        } else {
-          return message_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder> 
-          getMessageFieldBuilder() {
-        if (messageBuilder_ == null) {
-          messageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder>(
-                  message_,
-                  getParentForChildren(),
-                  isClean());
-          message_ = null;
-        }
-        return messageBuilder_;
-      }
-      
-      // optional .ActorRefData sender = 4;
-      private akka.remote.WireFormats.ActorRefData sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> senderBuilder_;
-      public boolean hasSender() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public akka.remote.WireFormats.ActorRefData getSender() {
-        if (senderBuilder_ == null) {
-          return sender_;
-        } else {
-          return senderBuilder_.getMessage();
-        }
-      }
-      public Builder setSender(akka.remote.WireFormats.ActorRefData value) {
-        if (senderBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          sender_ = value;
-          onChanged();
-        } else {
-          senderBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      public Builder setSender(
-          akka.remote.WireFormats.ActorRefData.Builder builderForValue) {
-        if (senderBuilder_ == null) {
-          sender_ = builderForValue.build();
-          onChanged();
-        } else {
-          senderBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      public Builder mergeSender(akka.remote.WireFormats.ActorRefData value) {
-        if (senderBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              sender_ != akka.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            sender_ =
-              akka.remote.WireFormats.ActorRefData.newBuilder(sender_).mergeFrom(value).buildPartial();
-          } else {
-            sender_ = value;
-          }
-          onChanged();
-        } else {
-          senderBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      public Builder clearSender() {
-        if (senderBuilder_ == null) {
-          sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-          onChanged();
-        } else {
-          senderBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-      public akka.remote.WireFormats.ActorRefData.Builder getSenderBuilder() {
-        bitField0_ |= 0x00000004;
-        onChanged();
-        return getSenderFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() {
-        if (senderBuilder_ != null) {
-          return senderBuilder_.getMessageOrBuilder();
-        } else {
-          return sender_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> 
-          getSenderFieldBuilder() {
-        if (senderBuilder_ == null) {
-          senderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder>(
-                  sender_,
-                  getParentForChildren(),
-                  isClean());
-          sender_ = null;
-        }
-        return senderBuilder_;
-      }
-      
-      // optional fixed64 seq = 5;
-      private long seq_ ;
-      public boolean hasSeq() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      public long getSeq() {
-        return seq_;
-      }
-      public Builder setSeq(long value) {
-        bitField0_ |= 0x00000008;
-        seq_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearSeq() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        seq_ = 0L;
-        onChanged();
-        return this;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:RemoteEnvelope)
-    }
-    
-    static {
-      defaultInstance = new RemoteEnvelope(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:RemoteEnvelope)
-  }
-  
-  public interface AcknowledgementInfoOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required fixed64 cumulativeAck = 1;
-    boolean hasCumulativeAck();
-    long getCumulativeAck();
-    
-    // repeated fixed64 nacks = 2;
-    java.util.List<java.lang.Long> getNacksList();
-    int getNacksCount();
-    long getNacks(int index);
-  }
-  public static final class AcknowledgementInfo extends
-      com.google.protobuf.GeneratedMessage
-      implements AcknowledgementInfoOrBuilder {
-    // Use AcknowledgementInfo.newBuilder() to construct.
-    private AcknowledgementInfo(Builder builder) {
-      super(builder);
-    }
-    private AcknowledgementInfo(boolean noInit) {}
-    
-    private static final AcknowledgementInfo defaultInstance;
-    public static AcknowledgementInfo getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AcknowledgementInfo getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_AcknowledgementInfo_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_AcknowledgementInfo_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required fixed64 cumulativeAck = 1;
-    public static final int CUMULATIVEACK_FIELD_NUMBER = 1;
-    private long cumulativeAck_;
-    public boolean hasCumulativeAck() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public long getCumulativeAck() {
-      return cumulativeAck_;
-    }
-    
-    // repeated fixed64 nacks = 2;
-    public static final int NACKS_FIELD_NUMBER = 2;
-    private java.util.List<java.lang.Long> nacks_;
-    public java.util.List<java.lang.Long>
-        getNacksList() {
-      return nacks_;
-    }
-    public int getNacksCount() {
-      return nacks_.size();
-    }
-    public long getNacks(int index) {
-      return nacks_.get(index);
-    }
-    
-    private void initFields() {
-      cumulativeAck_ = 0L;
-      nacks_ = java.util.Collections.emptyList();;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasCumulativeAck()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeFixed64(1, cumulativeAck_);
-      }
-      for (int i = 0; i < nacks_.size(); i++) {
-        output.writeFixed64(2, nacks_.get(i));
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFixed64Size(1, cumulativeAck_);
-      }
-      {
-        int dataSize = 0;
-        dataSize = 8 * getNacksList().size();
-        size += dataSize;
-        size += 1 * getNacksList().size();
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AcknowledgementInfo parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.AcknowledgementInfo prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.AcknowledgementInfoOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_AcknowledgementInfo_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_AcknowledgementInfo_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.AcknowledgementInfo.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        cumulativeAck_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        nacks_ = java.util.Collections.emptyList();;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.AcknowledgementInfo.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.AcknowledgementInfo getDefaultInstanceForType() {
-        return akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.AcknowledgementInfo build() {
-        akka.remote.WireFormats.AcknowledgementInfo result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.AcknowledgementInfo buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.AcknowledgementInfo result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.AcknowledgementInfo buildPartial() {
-        akka.remote.WireFormats.AcknowledgementInfo result = new akka.remote.WireFormats.AcknowledgementInfo(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.cumulativeAck_ = cumulativeAck_;
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          nacks_ = java.util.Collections.unmodifiableList(nacks_);
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.nacks_ = nacks_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.AcknowledgementInfo) {
-          return mergeFrom((akka.remote.WireFormats.AcknowledgementInfo)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.AcknowledgementInfo other) {
-        if (other == akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance()) return this;
-        if (other.hasCumulativeAck()) {
-          setCumulativeAck(other.getCumulativeAck());
-        }
-        if (!other.nacks_.isEmpty()) {
-          if (nacks_.isEmpty()) {
-            nacks_ = other.nacks_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureNacksIsMutable();
-            nacks_.addAll(other.nacks_);
-          }
-          onChanged();
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasCumulativeAck()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 9: {
-              bitField0_ |= 0x00000001;
-              cumulativeAck_ = input.readFixed64();
-              break;
-            }
-            case 17: {
-              ensureNacksIsMutable();
-              nacks_.add(input.readFixed64());
-              break;
-            }
-            case 18: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              while (input.getBytesUntilLimit() > 0) {
-                addNacks(input.readFixed64());
-              }
-              input.popLimit(limit);
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required fixed64 cumulativeAck = 1;
-      private long cumulativeAck_ ;
-      public boolean hasCumulativeAck() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public long getCumulativeAck() {
-        return cumulativeAck_;
-      }
-      public Builder setCumulativeAck(long value) {
-        bitField0_ |= 0x00000001;
-        cumulativeAck_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearCumulativeAck() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        cumulativeAck_ = 0L;
-        onChanged();
-        return this;
-      }
-      
-      // repeated fixed64 nacks = 2;
-      private java.util.List<java.lang.Long> nacks_ = java.util.Collections.emptyList();;
-      private void ensureNacksIsMutable() {
-        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          nacks_ = new java.util.ArrayList<java.lang.Long>(nacks_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      public java.util.List<java.lang.Long>
-          getNacksList() {
-        return java.util.Collections.unmodifiableList(nacks_);
-      }
-      public int getNacksCount() {
-        return nacks_.size();
-      }
-      public long getNacks(int index) {
-        return nacks_.get(index);
-      }
-      public Builder setNacks(
-          int index, long value) {
-        ensureNacksIsMutable();
-        nacks_.set(index, value);
-        onChanged();
-        return this;
-      }
-      public Builder addNacks(long value) {
-        ensureNacksIsMutable();
-        nacks_.add(value);
-        onChanged();
-        return this;
-      }
-      public Builder addAllNacks(
-          java.lang.Iterable<? extends java.lang.Long> values) {
-        ensureNacksIsMutable();
-        super.addAll(values, nacks_);
-        onChanged();
-        return this;
-      }
-      public Builder clearNacks() {
-        nacks_ = java.util.Collections.emptyList();;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AcknowledgementInfo)
-    }
-    
-    static {
-      defaultInstance = new AcknowledgementInfo(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AcknowledgementInfo)
-  }
-  
-  public interface ActorRefDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required string path = 1;
-    boolean hasPath();
-    String getPath();
-  }
-  public static final class ActorRefData extends
-      com.google.protobuf.GeneratedMessage
-      implements ActorRefDataOrBuilder {
-    // Use ActorRefData.newBuilder() to construct.
-    private ActorRefData(Builder builder) {
-      super(builder);
-    }
-    private ActorRefData(boolean noInit) {}
-    
-    private static final ActorRefData defaultInstance;
-    public static ActorRefData getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public ActorRefData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_ActorRefData_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_ActorRefData_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required string path = 1;
-    public static final int PATH_FIELD_NUMBER = 1;
-    private java.lang.Object path_;
-    public boolean hasPath() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public String getPath() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          path_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getPathBytes() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        path_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    private void initFields() {
-      path_ = "";
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasPath()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getPathBytes());
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getPathBytes());
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.ActorRefData parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.ActorRefData parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.ActorRefData parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.ActorRefData prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.ActorRefDataOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_ActorRefData_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_ActorRefData_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.ActorRefData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.ActorRefData.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.ActorRefData getDefaultInstanceForType() {
-        return akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.ActorRefData build() {
-        akka.remote.WireFormats.ActorRefData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.ActorRefData buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.ActorRefData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.ActorRefData buildPartial() {
-        akka.remote.WireFormats.ActorRefData result = new akka.remote.WireFormats.ActorRefData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.path_ = path_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.ActorRefData) {
-          return mergeFrom((akka.remote.WireFormats.ActorRefData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.ActorRefData other) {
-        if (other == akka.remote.WireFormats.ActorRefData.getDefaultInstance()) return this;
-        if (other.hasPath()) {
-          setPath(other.getPath());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasPath()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              path_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required string path = 1;
-      private java.lang.Object path_ = "";
-      public boolean hasPath() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public String getPath() {
-        java.lang.Object ref = path_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          path_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setPath(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        path_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        path_ = getDefaultInstance().getPath();
-        onChanged();
-        return this;
-      }
-      void setPath(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
-        path_ = value;
-        onChanged();
-      }
-      
-      // @@protoc_insertion_point(builder_scope:ActorRefData)
-    }
-    
-    static {
-      defaultInstance = new ActorRefData(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:ActorRefData)
-  }
-  
-  public interface SerializedMessageOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required bytes message = 1;
-    boolean hasMessage();
-    com.google.protobuf.ByteString getMessage();
-    
-    // required int32 serializerId = 2;
-    boolean hasSerializerId();
-    int getSerializerId();
-    
-    // optional bytes messageManifest = 3;
-    boolean hasMessageManifest();
-    com.google.protobuf.ByteString getMessageManifest();
-  }
-  public static final class SerializedMessage extends
-      com.google.protobuf.GeneratedMessage
-      implements SerializedMessageOrBuilder {
-    // Use SerializedMessage.newBuilder() to construct.
-    private SerializedMessage(Builder builder) {
-      super(builder);
-    }
-    private SerializedMessage(boolean noInit) {}
-    
-    private static final SerializedMessage defaultInstance;
-    public static SerializedMessage getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public SerializedMessage getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_SerializedMessage_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_SerializedMessage_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required bytes message = 1;
-    public static final int MESSAGE_FIELD_NUMBER = 1;
-    private com.google.protobuf.ByteString message_;
-    public boolean hasMessage() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public com.google.protobuf.ByteString getMessage() {
-      return message_;
-    }
-    
-    // required int32 serializerId = 2;
-    public static final int SERIALIZERID_FIELD_NUMBER = 2;
-    private int serializerId_;
-    public boolean hasSerializerId() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public int getSerializerId() {
-      return serializerId_;
-    }
-    
-    // optional bytes messageManifest = 3;
-    public static final int MESSAGEMANIFEST_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString messageManifest_;
-    public boolean hasMessageManifest() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public com.google.protobuf.ByteString getMessageManifest() {
-      return messageManifest_;
-    }
-    
-    private void initFields() {
-      message_ = com.google.protobuf.ByteString.EMPTY;
-      serializerId_ = 0;
-      messageManifest_ = com.google.protobuf.ByteString.EMPTY;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasMessage()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasSerializerId()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, message_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeInt32(2, serializerId_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, messageManifest_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, message_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, serializerId_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, messageManifest_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.SerializedMessage parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.SerializedMessage prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.SerializedMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_SerializedMessage_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_SerializedMessage_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.SerializedMessage.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        message_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        serializerId_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        messageManifest_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.SerializedMessage.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.SerializedMessage getDefaultInstanceForType() {
-        return akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.SerializedMessage build() {
-        akka.remote.WireFormats.SerializedMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.SerializedMessage buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.SerializedMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.SerializedMessage buildPartial() {
-        akka.remote.WireFormats.SerializedMessage result = new akka.remote.WireFormats.SerializedMessage(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.message_ = message_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.serializerId_ = serializerId_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.messageManifest_ = messageManifest_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.SerializedMessage) {
-          return mergeFrom((akka.remote.WireFormats.SerializedMessage)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.SerializedMessage other) {
-        if (other == akka.remote.WireFormats.SerializedMessage.getDefaultInstance()) return this;
-        if (other.hasMessage()) {
-          setMessage(other.getMessage());
-        }
-        if (other.hasSerializerId()) {
-          setSerializerId(other.getSerializerId());
-        }
-        if (other.hasMessageManifest()) {
-          setMessageManifest(other.getMessageManifest());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasMessage()) {
-          
-          return false;
-        }
-        if (!hasSerializerId()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              message_ = input.readBytes();
-              break;
-            }
-            case 16: {
-              bitField0_ |= 0x00000002;
-              serializerId_ = input.readInt32();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              messageManifest_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required bytes message = 1;
-      private com.google.protobuf.ByteString message_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasMessage() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public com.google.protobuf.ByteString getMessage() {
-        return message_;
-      }
-      public Builder setMessage(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        message_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearMessage() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        message_ = getDefaultInstance().getMessage();
-        onChanged();
-        return this;
-      }
-      
-      // required int32 serializerId = 2;
-      private int serializerId_ ;
-      public boolean hasSerializerId() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public int getSerializerId() {
-        return serializerId_;
-      }
-      public Builder setSerializerId(int value) {
-        bitField0_ |= 0x00000002;
-        serializerId_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearSerializerId() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        serializerId_ = 0;
-        onChanged();
-        return this;
-      }
-      
-      // optional bytes messageManifest = 3;
-      private com.google.protobuf.ByteString messageManifest_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasMessageManifest() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public com.google.protobuf.ByteString getMessageManifest() {
-        return messageManifest_;
-      }
-      public Builder setMessageManifest(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        messageManifest_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearMessageManifest() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        messageManifest_ = getDefaultInstance().getMessageManifest();
-        onChanged();
-        return this;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:SerializedMessage)
-    }
-    
-    static {
-      defaultInstance = new SerializedMessage(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:SerializedMessage)
-  }
-  
-  public interface DaemonMsgCreateDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required .PropsData props = 1;
-    boolean hasProps();
-    akka.remote.WireFormats.PropsData getProps();
-    akka.remote.WireFormats.PropsDataOrBuilder getPropsOrBuilder();
-    
-    // required .DeployData deploy = 2;
-    boolean hasDeploy();
-    akka.remote.WireFormats.DeployData getDeploy();
-    akka.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder();
-    
-    // required string path = 3;
-    boolean hasPath();
-    String getPath();
-    
-    // required .ActorRefData supervisor = 4;
-    boolean hasSupervisor();
-    akka.remote.WireFormats.ActorRefData getSupervisor();
-    akka.remote.WireFormats.ActorRefDataOrBuilder getSupervisorOrBuilder();
-  }
-  public static final class DaemonMsgCreateData extends
-      com.google.protobuf.GeneratedMessage
-      implements DaemonMsgCreateDataOrBuilder {
-    // Use DaemonMsgCreateData.newBuilder() to construct.
-    private DaemonMsgCreateData(Builder builder) {
-      super(builder);
-    }
-    private DaemonMsgCreateData(boolean noInit) {}
-    
-    private static final DaemonMsgCreateData defaultInstance;
-    public static DaemonMsgCreateData getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public DaemonMsgCreateData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_DaemonMsgCreateData_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_DaemonMsgCreateData_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required .PropsData props = 1;
-    public static final int PROPS_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.PropsData props_;
-    public boolean hasProps() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.PropsData getProps() {
-      return props_;
-    }
-    public akka.remote.WireFormats.PropsDataOrBuilder getPropsOrBuilder() {
-      return props_;
-    }
-    
-    // required .DeployData deploy = 2;
-    public static final int DEPLOY_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.DeployData deploy_;
-    public boolean hasDeploy() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.WireFormats.DeployData getDeploy() {
-      return deploy_;
-    }
-    public akka.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder() {
-      return deploy_;
-    }
-    
-    // required string path = 3;
-    public static final int PATH_FIELD_NUMBER = 3;
-    private java.lang.Object path_;
-    public boolean hasPath() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public String getPath() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          path_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getPathBytes() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        path_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // required .ActorRefData supervisor = 4;
-    public static final int SUPERVISOR_FIELD_NUMBER = 4;
-    private akka.remote.WireFormats.ActorRefData supervisor_;
-    public boolean hasSupervisor() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    public akka.remote.WireFormats.ActorRefData getSupervisor() {
-      return supervisor_;
-    }
-    public akka.remote.WireFormats.ActorRefDataOrBuilder getSupervisorOrBuilder() {
-      return supervisor_;
-    }
-    
-    private void initFields() {
-      props_ = akka.remote.WireFormats.PropsData.getDefaultInstance();
-      deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-      path_ = "";
-      supervisor_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasProps()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasDeploy()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasPath()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasSupervisor()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getProps().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getDeploy().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getSupervisor().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, props_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, deploy_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, getPathBytes());
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeMessage(4, supervisor_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, props_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, deploy_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, getPathBytes());
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, supervisor_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.DaemonMsgCreateData parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.DaemonMsgCreateData prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.DaemonMsgCreateDataOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_DaemonMsgCreateData_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_DaemonMsgCreateData_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.DaemonMsgCreateData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getPropsFieldBuilder();
-          getDeployFieldBuilder();
-          getSupervisorFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (propsBuilder_ == null) {
-          props_ = akka.remote.WireFormats.PropsData.getDefaultInstance();
-        } else {
-          propsBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (deployBuilder_ == null) {
-          deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-        } else {
-          deployBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
-        if (supervisorBuilder_ == null) {
-          supervisor_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-        } else {
-          supervisorBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.DaemonMsgCreateData.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.DaemonMsgCreateData getDefaultInstanceForType() {
-        return akka.remote.WireFormats.DaemonMsgCreateData.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.DaemonMsgCreateData build() {
-        akka.remote.WireFormats.DaemonMsgCreateData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.DaemonMsgCreateData buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.DaemonMsgCreateData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.DaemonMsgCreateData buildPartial() {
-        akka.remote.WireFormats.DaemonMsgCreateData result = new akka.remote.WireFormats.DaemonMsgCreateData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (propsBuilder_ == null) {
-          result.props_ = props_;
-        } else {
-          result.props_ = propsBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (deployBuilder_ == null) {
-          result.deploy_ = deploy_;
-        } else {
-          result.deploy_ = deployBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.path_ = path_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        if (supervisorBuilder_ == null) {
-          result.supervisor_ = supervisor_;
-        } else {
-          result.supervisor_ = supervisorBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.DaemonMsgCreateData) {
-          return mergeFrom((akka.remote.WireFormats.DaemonMsgCreateData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.DaemonMsgCreateData other) {
-        if (other == akka.remote.WireFormats.DaemonMsgCreateData.getDefaultInstance()) return this;
-        if (other.hasProps()) {
-          mergeProps(other.getProps());
-        }
-        if (other.hasDeploy()) {
-          mergeDeploy(other.getDeploy());
-        }
-        if (other.hasPath()) {
-          setPath(other.getPath());
-        }
-        if (other.hasSupervisor()) {
-          mergeSupervisor(other.getSupervisor());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasProps()) {
-          
-          return false;
-        }
-        if (!hasDeploy()) {
-          
-          return false;
-        }
-        if (!hasPath()) {
-          
-          return false;
-        }
-        if (!hasSupervisor()) {
-          
-          return false;
-        }
-        if (!getProps().isInitialized()) {
-          
-          return false;
-        }
-        if (!getDeploy().isInitialized()) {
-          
-          return false;
-        }
-        if (!getSupervisor().isInitialized()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              akka.remote.WireFormats.PropsData.Builder subBuilder = akka.remote.WireFormats.PropsData.newBuilder();
-              if (hasProps()) {
-                subBuilder.mergeFrom(getProps());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setProps(subBuilder.buildPartial());
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.DeployData.Builder subBuilder = akka.remote.WireFormats.DeployData.newBuilder();
-              if (hasDeploy()) {
-                subBuilder.mergeFrom(getDeploy());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setDeploy(subBuilder.buildPartial());
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              path_ = input.readBytes();
-              break;
-            }
-            case 34: {
-              akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder();
-              if (hasSupervisor()) {
-                subBuilder.mergeFrom(getSupervisor());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setSupervisor(subBuilder.buildPartial());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required .PropsData props = 1;
-      private akka.remote.WireFormats.PropsData props_ = akka.remote.WireFormats.PropsData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.PropsData, akka.remote.WireFormats.PropsData.Builder, akka.remote.WireFormats.PropsDataOrBuilder> propsBuilder_;
-      public boolean hasProps() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.PropsData getProps() {
-        if (propsBuilder_ == null) {
-          return props_;
-        } else {
-          return propsBuilder_.getMessage();
-        }
-      }
-      public Builder setProps(akka.remote.WireFormats.PropsData value) {
-        if (propsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          props_ = value;
-          onChanged();
-        } else {
-          propsBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setProps(
-          akka.remote.WireFormats.PropsData.Builder builderForValue) {
-        if (propsBuilder_ == null) {
-          props_ = builderForValue.build();
-          onChanged();
-        } else {
-          propsBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeProps(akka.remote.WireFormats.PropsData value) {
-        if (propsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              props_ != akka.remote.WireFormats.PropsData.getDefaultInstance()) {
-            props_ =
-              akka.remote.WireFormats.PropsData.newBuilder(props_).mergeFrom(value).buildPartial();
-          } else {
-            props_ = value;
-          }
-          onChanged();
-        } else {
-          propsBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearProps() {
-        if (propsBuilder_ == null) {
-          props_ = akka.remote.WireFormats.PropsData.getDefaultInstance();
-          onChanged();
-        } else {
-          propsBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.PropsData.Builder getPropsBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getPropsFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.PropsDataOrBuilder getPropsOrBuilder() {
-        if (propsBuilder_ != null) {
-          return propsBuilder_.getMessageOrBuilder();
-        } else {
-          return props_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.PropsData, akka.remote.WireFormats.PropsData.Builder, akka.remote.WireFormats.PropsDataOrBuilder> 
-          getPropsFieldBuilder() {
-        if (propsBuilder_ == null) {
-          propsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.PropsData, akka.remote.WireFormats.PropsData.Builder, akka.remote.WireFormats.PropsDataOrBuilder>(
-                  props_,
-                  getParentForChildren(),
-                  isClean());
-          props_ = null;
-        }
-        return propsBuilder_;
-      }
-      
-      // required .DeployData deploy = 2;
-      private akka.remote.WireFormats.DeployData deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.DeployData, akka.remote.WireFormats.DeployData.Builder, akka.remote.WireFormats.DeployDataOrBuilder> deployBuilder_;
-      public boolean hasDeploy() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.WireFormats.DeployData getDeploy() {
-        if (deployBuilder_ == null) {
-          return deploy_;
-        } else {
-          return deployBuilder_.getMessage();
-        }
-      }
-      public Builder setDeploy(akka.remote.WireFormats.DeployData value) {
-        if (deployBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          deploy_ = value;
-          onChanged();
-        } else {
-          deployBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setDeploy(
-          akka.remote.WireFormats.DeployData.Builder builderForValue) {
-        if (deployBuilder_ == null) {
-          deploy_ = builderForValue.build();
-          onChanged();
-        } else {
-          deployBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeDeploy(akka.remote.WireFormats.DeployData value) {
-        if (deployBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              deploy_ != akka.remote.WireFormats.DeployData.getDefaultInstance()) {
-            deploy_ =
-              akka.remote.WireFormats.DeployData.newBuilder(deploy_).mergeFrom(value).buildPartial();
-          } else {
-            deploy_ = value;
-          }
-          onChanged();
-        } else {
-          deployBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearDeploy() {
-        if (deployBuilder_ == null) {
-          deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-          onChanged();
-        } else {
-          deployBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.WireFormats.DeployData.Builder getDeployBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getDeployFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder() {
-        if (deployBuilder_ != null) {
-          return deployBuilder_.getMessageOrBuilder();
-        } else {
-          return deploy_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.DeployData, akka.remote.WireFormats.DeployData.Builder, akka.remote.WireFormats.DeployDataOrBuilder> 
-          getDeployFieldBuilder() {
-        if (deployBuilder_ == null) {
-          deployBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.DeployData, akka.remote.WireFormats.DeployData.Builder, akka.remote.WireFormats.DeployDataOrBuilder>(
-                  deploy_,
-                  getParentForChildren(),
-                  isClean());
-          deploy_ = null;
-        }
-        return deployBuilder_;
-      }
-      
-      // required string path = 3;
-      private java.lang.Object path_ = "";
-      public boolean hasPath() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public String getPath() {
-        java.lang.Object ref = path_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          path_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setPath(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        path_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        path_ = getDefaultInstance().getPath();
-        onChanged();
-        return this;
-      }
-      void setPath(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000004;
-        path_ = value;
-        onChanged();
-      }
-      
-      // required .ActorRefData supervisor = 4;
-      private akka.remote.WireFormats.ActorRefData supervisor_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> supervisorBuilder_;
-      public boolean hasSupervisor() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      public akka.remote.WireFormats.ActorRefData getSupervisor() {
-        if (supervisorBuilder_ == null) {
-          return supervisor_;
-        } else {
-          return supervisorBuilder_.getMessage();
-        }
-      }
-      public Builder setSupervisor(akka.remote.WireFormats.ActorRefData value) {
-        if (supervisorBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          supervisor_ = value;
-          onChanged();
-        } else {
-          supervisorBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000008;
-        return this;
-      }
-      public Builder setSupervisor(
-          akka.remote.WireFormats.ActorRefData.Builder builderForValue) {
-        if (supervisorBuilder_ == null) {
-          supervisor_ = builderForValue.build();
-          onChanged();
-        } else {
-          supervisorBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000008;
-        return this;
-      }
-      public Builder mergeSupervisor(akka.remote.WireFormats.ActorRefData value) {
-        if (supervisorBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              supervisor_ != akka.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            supervisor_ =
-              akka.remote.WireFormats.ActorRefData.newBuilder(supervisor_).mergeFrom(value).buildPartial();
-          } else {
-            supervisor_ = value;
-          }
-          onChanged();
-        } else {
-          supervisorBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000008;
-        return this;
-      }
-      public Builder clearSupervisor() {
-        if (supervisorBuilder_ == null) {
-          supervisor_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-          onChanged();
-        } else {
-          supervisorBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      public akka.remote.WireFormats.ActorRefData.Builder getSupervisorBuilder() {
-        bitField0_ |= 0x00000008;
-        onChanged();
-        return getSupervisorFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.ActorRefDataOrBuilder getSupervisorOrBuilder() {
-        if (supervisorBuilder_ != null) {
-          return supervisorBuilder_.getMessageOrBuilder();
-        } else {
-          return supervisor_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> 
-          getSupervisorFieldBuilder() {
-        if (supervisorBuilder_ == null) {
-          supervisorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder>(
-                  supervisor_,
-                  getParentForChildren(),
-                  isClean());
-          supervisor_ = null;
-        }
-        return supervisorBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:DaemonMsgCreateData)
-    }
-    
-    static {
-      defaultInstance = new DaemonMsgCreateData(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:DaemonMsgCreateData)
-  }
-  
-  public interface PropsDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required .DeployData deploy = 2;
-    boolean hasDeploy();
-    akka.remote.WireFormats.DeployData getDeploy();
-    akka.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder();
-    
-    // required string clazz = 3;
-    boolean hasClazz();
-    String getClazz();
-    
-    // repeated bytes args = 4;
-    java.util.List<com.google.protobuf.ByteString> getArgsList();
-    int getArgsCount();
-    com.google.protobuf.ByteString getArgs(int index);
-    
-    // repeated string classes = 5;
-    java.util.List<String> getClassesList();
-    int getClassesCount();
-    String getClasses(int index);
-  }
-  public static final class PropsData extends
-      com.google.protobuf.GeneratedMessage
-      implements PropsDataOrBuilder {
-    // Use PropsData.newBuilder() to construct.
-    private PropsData(Builder builder) {
-      super(builder);
-    }
-    private PropsData(boolean noInit) {}
-    
-    private static final PropsData defaultInstance;
-    public static PropsData getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public PropsData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_PropsData_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_PropsData_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required .DeployData deploy = 2;
-    public static final int DEPLOY_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.DeployData deploy_;
-    public boolean hasDeploy() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.DeployData getDeploy() {
-      return deploy_;
-    }
-    public akka.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder() {
-      return deploy_;
-    }
-    
-    // required string clazz = 3;
-    public static final int CLAZZ_FIELD_NUMBER = 3;
-    private java.lang.Object clazz_;
-    public boolean hasClazz() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public String getClazz() {
-      java.lang.Object ref = clazz_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          clazz_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getClazzBytes() {
-      java.lang.Object ref = clazz_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        clazz_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // repeated bytes args = 4;
-    public static final int ARGS_FIELD_NUMBER = 4;
-    private java.util.List<com.google.protobuf.ByteString> args_;
-    public java.util.List<com.google.protobuf.ByteString>
-        getArgsList() {
-      return args_;
-    }
-    public int getArgsCount() {
-      return args_.size();
-    }
-    public com.google.protobuf.ByteString getArgs(int index) {
-      return args_.get(index);
-    }
-    
-    // repeated string classes = 5;
-    public static final int CLASSES_FIELD_NUMBER = 5;
-    private com.google.protobuf.LazyStringList classes_;
-    public java.util.List<String>
-        getClassesList() {
-      return classes_;
-    }
-    public int getClassesCount() {
-      return classes_.size();
-    }
-    public String getClasses(int index) {
-      return classes_.get(index);
-    }
-    
-    private void initFields() {
-      deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-      clazz_ = "";
-      args_ = java.util.Collections.emptyList();;
-      classes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasDeploy()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasClazz()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getDeploy().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(2, deploy_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(3, getClazzBytes());
-      }
-      for (int i = 0; i < args_.size(); i++) {
-        output.writeBytes(4, args_.get(i));
-      }
-      for (int i = 0; i < classes_.size(); i++) {
-        output.writeBytes(5, classes_.getByteString(i));
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, deploy_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, getClazzBytes());
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < args_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(args_.get(i));
-        }
-        size += dataSize;
-        size += 1 * getArgsList().size();
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < classes_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(classes_.getByteString(i));
-        }
-        size += dataSize;
-        size += 1 * getClassesList().size();
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.PropsData parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.PropsData parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.PropsData parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.PropsData prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.PropsDataOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_PropsData_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_PropsData_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.PropsData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getDeployFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (deployBuilder_ == null) {
-          deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-        } else {
-          deployBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        clazz_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        args_ = java.util.Collections.emptyList();;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        classes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.PropsData.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.PropsData getDefaultInstanceForType() {
-        return akka.remote.WireFormats.PropsData.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.PropsData build() {
-        akka.remote.WireFormats.PropsData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.PropsData buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.PropsData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.PropsData buildPartial() {
-        akka.remote.WireFormats.PropsData result = new akka.remote.WireFormats.PropsData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (deployBuilder_ == null) {
-          result.deploy_ = deploy_;
-        } else {
-          result.deploy_ = deployBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.clazz_ = clazz_;
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          args_ = java.util.Collections.unmodifiableList(args_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.args_ = args_;
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          classes_ = new com.google.protobuf.UnmodifiableLazyStringList(
-              classes_);
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.classes_ = classes_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.PropsData) {
-          return mergeFrom((akka.remote.WireFormats.PropsData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.PropsData other) {
-        if (other == akka.remote.WireFormats.PropsData.getDefaultInstance()) return this;
-        if (other.hasDeploy()) {
-          mergeDeploy(other.getDeploy());
-        }
-        if (other.hasClazz()) {
-          setClazz(other.getClazz());
-        }
-        if (!other.args_.isEmpty()) {
-          if (args_.isEmpty()) {
-            args_ = other.args_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureArgsIsMutable();
-            args_.addAll(other.args_);
-          }
-          onChanged();
-        }
-        if (!other.classes_.isEmpty()) {
-          if (classes_.isEmpty()) {
-            classes_ = other.classes_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureClassesIsMutable();
-            classes_.addAll(other.classes_);
-          }
-          onChanged();
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasDeploy()) {
-          
-          return false;
-        }
-        if (!hasClazz()) {
-          
-          return false;
-        }
-        if (!getDeploy().isInitialized()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.DeployData.Builder subBuilder = akka.remote.WireFormats.DeployData.newBuilder();
-              if (hasDeploy()) {
-                subBuilder.mergeFrom(getDeploy());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setDeploy(subBuilder.buildPartial());
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000002;
-              clazz_ = input.readBytes();
-              break;
-            }
-            case 34: {
-              ensureArgsIsMutable();
-              args_.add(input.readBytes());
-              break;
-            }
-            case 42: {
-              ensureClassesIsMutable();
-              classes_.add(input.readBytes());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required .DeployData deploy = 2;
-      private akka.remote.WireFormats.DeployData deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.DeployData, akka.remote.WireFormats.DeployData.Builder, akka.remote.WireFormats.DeployDataOrBuilder> deployBuilder_;
-      public boolean hasDeploy() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.DeployData getDeploy() {
-        if (deployBuilder_ == null) {
-          return deploy_;
-        } else {
-          return deployBuilder_.getMessage();
-        }
-      }
-      public Builder setDeploy(akka.remote.WireFormats.DeployData value) {
-        if (deployBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          deploy_ = value;
-          onChanged();
-        } else {
-          deployBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setDeploy(
-          akka.remote.WireFormats.DeployData.Builder builderForValue) {
-        if (deployBuilder_ == null) {
-          deploy_ = builderForValue.build();
-          onChanged();
-        } else {
-          deployBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeDeploy(akka.remote.WireFormats.DeployData value) {
-        if (deployBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              deploy_ != akka.remote.WireFormats.DeployData.getDefaultInstance()) {
-            deploy_ =
-              akka.remote.WireFormats.DeployData.newBuilder(deploy_).mergeFrom(value).buildPartial();
-          } else {
-            deploy_ = value;
-          }
-          onChanged();
-        } else {
-          deployBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearDeploy() {
-        if (deployBuilder_ == null) {
-          deploy_ = akka.remote.WireFormats.DeployData.getDefaultInstance();
-          onChanged();
-        } else {
-          deployBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.DeployData.Builder getDeployBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getDeployFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.DeployDataOrBuilder getDeployOrBuilder() {
-        if (deployBuilder_ != null) {
-          return deployBuilder_.getMessageOrBuilder();
-        } else {
-          return deploy_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.DeployData, akka.remote.WireFormats.DeployData.Builder, akka.remote.WireFormats.DeployDataOrBuilder> 
-          getDeployFieldBuilder() {
-        if (deployBuilder_ == null) {
-          deployBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.DeployData, akka.remote.WireFormats.DeployData.Builder, akka.remote.WireFormats.DeployDataOrBuilder>(
-                  deploy_,
-                  getParentForChildren(),
-                  isClean());
-          deploy_ = null;
-        }
-        return deployBuilder_;
-      }
-      
-      // required string clazz = 3;
-      private java.lang.Object clazz_ = "";
-      public boolean hasClazz() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public String getClazz() {
-        java.lang.Object ref = clazz_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          clazz_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setClazz(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        clazz_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearClazz() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        clazz_ = getDefaultInstance().getClazz();
-        onChanged();
-        return this;
-      }
-      void setClazz(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000002;
-        clazz_ = value;
-        onChanged();
-      }
-      
-      // repeated bytes args = 4;
-      private java.util.List<com.google.protobuf.ByteString> args_ = java.util.Collections.emptyList();;
-      private void ensureArgsIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          args_ = new java.util.ArrayList<com.google.protobuf.ByteString>(args_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      public java.util.List<com.google.protobuf.ByteString>
-          getArgsList() {
-        return java.util.Collections.unmodifiableList(args_);
-      }
-      public int getArgsCount() {
-        return args_.size();
-      }
-      public com.google.protobuf.ByteString getArgs(int index) {
-        return args_.get(index);
-      }
-      public Builder setArgs(
-          int index, com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureArgsIsMutable();
-        args_.set(index, value);
-        onChanged();
-        return this;
-      }
-      public Builder addArgs(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureArgsIsMutable();
-        args_.add(value);
-        onChanged();
-        return this;
-      }
-      public Builder addAllArgs(
-          java.lang.Iterable<? extends com.google.protobuf.ByteString> values) {
-        ensureArgsIsMutable();
-        super.addAll(values, args_);
-        onChanged();
-        return this;
-      }
-      public Builder clearArgs() {
-        args_ = java.util.Collections.emptyList();;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-      
-      // repeated string classes = 5;
-      private com.google.protobuf.LazyStringList classes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureClassesIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          classes_ = new com.google.protobuf.LazyStringArrayList(classes_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-      public java.util.List<String>
-          getClassesList() {
-        return java.util.Collections.unmodifiableList(classes_);
-      }
-      public int getClassesCount() {
-        return classes_.size();
-      }
-      public String getClasses(int index) {
-        return classes_.get(index);
-      }
-      public Builder setClasses(
-          int index, String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureClassesIsMutable();
-        classes_.set(index, value);
-        onChanged();
-        return this;
-      }
-      public Builder addClasses(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureClassesIsMutable();
-        classes_.add(value);
-        onChanged();
-        return this;
-      }
-      public Builder addAllClasses(
-          java.lang.Iterable<String> values) {
-        ensureClassesIsMutable();
-        super.addAll(values, classes_);
-        onChanged();
-        return this;
-      }
-      public Builder clearClasses() {
-        classes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-      void addClasses(com.google.protobuf.ByteString value) {
-        ensureClassesIsMutable();
-        classes_.add(value);
-        onChanged();
-      }
-      
-      // @@protoc_insertion_point(builder_scope:PropsData)
-    }
-    
-    static {
-      defaultInstance = new PropsData(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:PropsData)
-  }
-  
-  public interface DeployDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required string path = 1;
-    boolean hasPath();
-    String getPath();
-    
-    // optional bytes config = 2;
-    boolean hasConfig();
-    com.google.protobuf.ByteString getConfig();
-    
-    // optional bytes routerConfig = 3;
-    boolean hasRouterConfig();
-    com.google.protobuf.ByteString getRouterConfig();
-    
-    // optional bytes scope = 4;
-    boolean hasScope();
-    com.google.protobuf.ByteString getScope();
-    
-    // optional string dispatcher = 5;
-    boolean hasDispatcher();
-    String getDispatcher();
-  }
-  public static final class DeployData extends
-      com.google.protobuf.GeneratedMessage
-      implements DeployDataOrBuilder {
-    // Use DeployData.newBuilder() to construct.
-    private DeployData(Builder builder) {
-      super(builder);
-    }
-    private DeployData(boolean noInit) {}
-    
-    private static final DeployData defaultInstance;
-    public static DeployData getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public DeployData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_DeployData_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_DeployData_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required string path = 1;
-    public static final int PATH_FIELD_NUMBER = 1;
-    private java.lang.Object path_;
-    public boolean hasPath() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public String getPath() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          path_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getPathBytes() {
-      java.lang.Object ref = path_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        path_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // optional bytes config = 2;
-    public static final int CONFIG_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString config_;
-    public boolean hasConfig() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public com.google.protobuf.ByteString getConfig() {
-      return config_;
-    }
-    
-    // optional bytes routerConfig = 3;
-    public static final int ROUTERCONFIG_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString routerConfig_;
-    public boolean hasRouterConfig() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public com.google.protobuf.ByteString getRouterConfig() {
-      return routerConfig_;
-    }
-    
-    // optional bytes scope = 4;
-    public static final int SCOPE_FIELD_NUMBER = 4;
-    private com.google.protobuf.ByteString scope_;
-    public boolean hasScope() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    public com.google.protobuf.ByteString getScope() {
-      return scope_;
-    }
-    
-    // optional string dispatcher = 5;
-    public static final int DISPATCHER_FIELD_NUMBER = 5;
-    private java.lang.Object dispatcher_;
-    public boolean hasDispatcher() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
-    public String getDispatcher() {
-      java.lang.Object ref = dispatcher_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          dispatcher_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getDispatcherBytes() {
-      java.lang.Object ref = dispatcher_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        dispatcher_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    private void initFields() {
-      path_ = "";
-      config_ = com.google.protobuf.ByteString.EMPTY;
-      routerConfig_ = com.google.protobuf.ByteString.EMPTY;
-      scope_ = com.google.protobuf.ByteString.EMPTY;
-      dispatcher_ = "";
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasPath()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getPathBytes());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, config_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, routerConfig_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeBytes(4, scope_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeBytes(5, getDispatcherBytes());
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getPathBytes());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, config_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, routerConfig_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(4, scope_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(5, getDispatcherBytes());
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.DeployData parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.DeployData parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.DeployData parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.DeployData prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.DeployDataOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_DeployData_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_DeployData_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.DeployData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        path_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        config_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        routerConfig_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        scope_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        dispatcher_ = "";
-        bitField0_ = (bitField0_ & ~0x00000010);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.DeployData.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.DeployData getDefaultInstanceForType() {
-        return akka.remote.WireFormats.DeployData.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.DeployData build() {
-        akka.remote.WireFormats.DeployData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.DeployData buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.DeployData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.DeployData buildPartial() {
-        akka.remote.WireFormats.DeployData result = new akka.remote.WireFormats.DeployData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.path_ = path_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.config_ = config_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.routerConfig_ = routerConfig_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.scope_ = scope_;
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        result.dispatcher_ = dispatcher_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.DeployData) {
-          return mergeFrom((akka.remote.WireFormats.DeployData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.DeployData other) {
-        if (other == akka.remote.WireFormats.DeployData.getDefaultInstance()) return this;
-        if (other.hasPath()) {
-          setPath(other.getPath());
-        }
-        if (other.hasConfig()) {
-          setConfig(other.getConfig());
-        }
-        if (other.hasRouterConfig()) {
-          setRouterConfig(other.getRouterConfig());
-        }
-        if (other.hasScope()) {
-          setScope(other.getScope());
-        }
-        if (other.hasDispatcher()) {
-          setDispatcher(other.getDispatcher());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasPath()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              path_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              config_ = input.readBytes();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              routerConfig_ = input.readBytes();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000008;
-              scope_ = input.readBytes();
-              break;
-            }
-            case 42: {
-              bitField0_ |= 0x00000010;
-              dispatcher_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required string path = 1;
-      private java.lang.Object path_ = "";
-      public boolean hasPath() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public String getPath() {
-        java.lang.Object ref = path_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          path_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setPath(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        path_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearPath() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        path_ = getDefaultInstance().getPath();
-        onChanged();
-        return this;
-      }
-      void setPath(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
-        path_ = value;
-        onChanged();
-      }
-      
-      // optional bytes config = 2;
-      private com.google.protobuf.ByteString config_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasConfig() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public com.google.protobuf.ByteString getConfig() {
-        return config_;
-      }
-      public Builder setConfig(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        config_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearConfig() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        config_ = getDefaultInstance().getConfig();
-        onChanged();
-        return this;
-      }
-      
-      // optional bytes routerConfig = 3;
-      private com.google.protobuf.ByteString routerConfig_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasRouterConfig() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public com.google.protobuf.ByteString getRouterConfig() {
-        return routerConfig_;
-      }
-      public Builder setRouterConfig(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        routerConfig_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearRouterConfig() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        routerConfig_ = getDefaultInstance().getRouterConfig();
-        onChanged();
-        return this;
-      }
-      
-      // optional bytes scope = 4;
-      private com.google.protobuf.ByteString scope_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasScope() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      public com.google.protobuf.ByteString getScope() {
-        return scope_;
-      }
-      public Builder setScope(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
-        scope_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearScope() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        scope_ = getDefaultInstance().getScope();
-        onChanged();
-        return this;
-      }
-      
-      // optional string dispatcher = 5;
-      private java.lang.Object dispatcher_ = "";
-      public boolean hasDispatcher() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
-      }
-      public String getDispatcher() {
-        java.lang.Object ref = dispatcher_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          dispatcher_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setDispatcher(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000010;
-        dispatcher_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearDispatcher() {
-        bitField0_ = (bitField0_ & ~0x00000010);
-        dispatcher_ = getDefaultInstance().getDispatcher();
-        onChanged();
-        return this;
-      }
-      void setDispatcher(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000010;
-        dispatcher_ = value;
-        onChanged();
-      }
-      
-      // @@protoc_insertion_point(builder_scope:DeployData)
-    }
-    
-    static {
-      defaultInstance = new DeployData(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:DeployData)
-  }
-  
-  public interface AkkaProtocolMessageOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // optional bytes payload = 1;
-    boolean hasPayload();
-    com.google.protobuf.ByteString getPayload();
-    
-    // optional .AkkaControlMessage instruction = 2;
-    boolean hasInstruction();
-    akka.remote.WireFormats.AkkaControlMessage getInstruction();
-    akka.remote.WireFormats.AkkaControlMessageOrBuilder getInstructionOrBuilder();
-  }
-  public static final class AkkaProtocolMessage extends
-      com.google.protobuf.GeneratedMessage
-      implements AkkaProtocolMessageOrBuilder {
-    // Use AkkaProtocolMessage.newBuilder() to construct.
-    private AkkaProtocolMessage(Builder builder) {
-      super(builder);
-    }
-    private AkkaProtocolMessage(boolean noInit) {}
-    
-    private static final AkkaProtocolMessage defaultInstance;
-    public static AkkaProtocolMessage getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AkkaProtocolMessage getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_AkkaProtocolMessage_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_AkkaProtocolMessage_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // optional bytes payload = 1;
-    public static final int PAYLOAD_FIELD_NUMBER = 1;
-    private com.google.protobuf.ByteString payload_;
-    public boolean hasPayload() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public com.google.protobuf.ByteString getPayload() {
-      return payload_;
-    }
-    
-    // optional .AkkaControlMessage instruction = 2;
-    public static final int INSTRUCTION_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.AkkaControlMessage instruction_;
-    public boolean hasInstruction() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.WireFormats.AkkaControlMessage getInstruction() {
-      return instruction_;
-    }
-    public akka.remote.WireFormats.AkkaControlMessageOrBuilder getInstructionOrBuilder() {
-      return instruction_;
-    }
-    
-    private void initFields() {
-      payload_ = com.google.protobuf.ByteString.EMPTY;
-      instruction_ = akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (hasInstruction()) {
-        if (!getInstruction().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, payload_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, instruction_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, payload_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, instruction_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaProtocolMessage parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.AkkaProtocolMessage prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.AkkaProtocolMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_AkkaProtocolMessage_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_AkkaProtocolMessage_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.AkkaProtocolMessage.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getInstructionFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        payload_ = com.google.protobuf.ByteString.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (instructionBuilder_ == null) {
-          instruction_ = akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance();
-        } else {
-          instructionBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.AkkaProtocolMessage.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.AkkaProtocolMessage getDefaultInstanceForType() {
-        return akka.remote.WireFormats.AkkaProtocolMessage.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.AkkaProtocolMessage build() {
-        akka.remote.WireFormats.AkkaProtocolMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.AkkaProtocolMessage buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.AkkaProtocolMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.AkkaProtocolMessage buildPartial() {
-        akka.remote.WireFormats.AkkaProtocolMessage result = new akka.remote.WireFormats.AkkaProtocolMessage(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.payload_ = payload_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (instructionBuilder_ == null) {
-          result.instruction_ = instruction_;
-        } else {
-          result.instruction_ = instructionBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.AkkaProtocolMessage) {
-          return mergeFrom((akka.remote.WireFormats.AkkaProtocolMessage)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.AkkaProtocolMessage other) {
-        if (other == akka.remote.WireFormats.AkkaProtocolMessage.getDefaultInstance()) return this;
-        if (other.hasPayload()) {
-          setPayload(other.getPayload());
-        }
-        if (other.hasInstruction()) {
-          mergeInstruction(other.getInstruction());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (hasInstruction()) {
-          if (!getInstruction().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              payload_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.AkkaControlMessage.Builder subBuilder = akka.remote.WireFormats.AkkaControlMessage.newBuilder();
-              if (hasInstruction()) {
-                subBuilder.mergeFrom(getInstruction());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setInstruction(subBuilder.buildPartial());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // optional bytes payload = 1;
-      private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
-      public boolean hasPayload() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public com.google.protobuf.ByteString getPayload() {
-        return payload_;
-      }
-      public Builder setPayload(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        payload_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearPayload() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        payload_ = getDefaultInstance().getPayload();
-        onChanged();
-        return this;
-      }
-      
-      // optional .AkkaControlMessage instruction = 2;
-      private akka.remote.WireFormats.AkkaControlMessage instruction_ = akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AkkaControlMessage, akka.remote.WireFormats.AkkaControlMessage.Builder, akka.remote.WireFormats.AkkaControlMessageOrBuilder> instructionBuilder_;
-      public boolean hasInstruction() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.WireFormats.AkkaControlMessage getInstruction() {
-        if (instructionBuilder_ == null) {
-          return instruction_;
-        } else {
-          return instructionBuilder_.getMessage();
-        }
-      }
-      public Builder setInstruction(akka.remote.WireFormats.AkkaControlMessage value) {
-        if (instructionBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          instruction_ = value;
-          onChanged();
-        } else {
-          instructionBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setInstruction(
-          akka.remote.WireFormats.AkkaControlMessage.Builder builderForValue) {
-        if (instructionBuilder_ == null) {
-          instruction_ = builderForValue.build();
-          onChanged();
-        } else {
-          instructionBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeInstruction(akka.remote.WireFormats.AkkaControlMessage value) {
-        if (instructionBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              instruction_ != akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance()) {
-            instruction_ =
-              akka.remote.WireFormats.AkkaControlMessage.newBuilder(instruction_).mergeFrom(value).buildPartial();
-          } else {
-            instruction_ = value;
-          }
-          onChanged();
-        } else {
-          instructionBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearInstruction() {
-        if (instructionBuilder_ == null) {
-          instruction_ = akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance();
-          onChanged();
-        } else {
-          instructionBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.WireFormats.AkkaControlMessage.Builder getInstructionBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getInstructionFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.AkkaControlMessageOrBuilder getInstructionOrBuilder() {
-        if (instructionBuilder_ != null) {
-          return instructionBuilder_.getMessageOrBuilder();
-        } else {
-          return instruction_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AkkaControlMessage, akka.remote.WireFormats.AkkaControlMessage.Builder, akka.remote.WireFormats.AkkaControlMessageOrBuilder> 
-          getInstructionFieldBuilder() {
-        if (instructionBuilder_ == null) {
-          instructionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.AkkaControlMessage, akka.remote.WireFormats.AkkaControlMessage.Builder, akka.remote.WireFormats.AkkaControlMessageOrBuilder>(
-                  instruction_,
-                  getParentForChildren(),
-                  isClean());
-          instruction_ = null;
-        }
-        return instructionBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AkkaProtocolMessage)
-    }
-    
-    static {
-      defaultInstance = new AkkaProtocolMessage(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AkkaProtocolMessage)
-  }
-  
-  public interface AkkaControlMessageOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required .CommandType commandType = 1;
-    boolean hasCommandType();
-    akka.remote.WireFormats.CommandType getCommandType();
-    
-    // optional .AkkaHandshakeInfo handshakeInfo = 2;
-    boolean hasHandshakeInfo();
-    akka.remote.WireFormats.AkkaHandshakeInfo getHandshakeInfo();
-    akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder getHandshakeInfoOrBuilder();
-  }
-  public static final class AkkaControlMessage extends
-      com.google.protobuf.GeneratedMessage
-      implements AkkaControlMessageOrBuilder {
-    // Use AkkaControlMessage.newBuilder() to construct.
-    private AkkaControlMessage(Builder builder) {
-      super(builder);
-    }
-    private AkkaControlMessage(boolean noInit) {}
-    
-    private static final AkkaControlMessage defaultInstance;
-    public static AkkaControlMessage getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AkkaControlMessage getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_AkkaControlMessage_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_AkkaControlMessage_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required .CommandType commandType = 1;
-    public static final int COMMANDTYPE_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.CommandType commandType_;
-    public boolean hasCommandType() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.CommandType getCommandType() {
-      return commandType_;
-    }
-    
-    // optional .AkkaHandshakeInfo handshakeInfo = 2;
-    public static final int HANDSHAKEINFO_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.AkkaHandshakeInfo handshakeInfo_;
-    public boolean hasHandshakeInfo() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.WireFormats.AkkaHandshakeInfo getHandshakeInfo() {
-      return handshakeInfo_;
-    }
-    public akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder getHandshakeInfoOrBuilder() {
-      return handshakeInfo_;
-    }
-    
-    private void initFields() {
-      commandType_ = akka.remote.WireFormats.CommandType.ASSOCIATE;
-      handshakeInfo_ = akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasCommandType()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (hasHandshakeInfo()) {
-        if (!getHandshakeInfo().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeEnum(1, commandType_.getNumber());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, handshakeInfo_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, commandType_.getNumber());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, handshakeInfo_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaControlMessage parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.AkkaControlMessage prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.AkkaControlMessageOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_AkkaControlMessage_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_AkkaControlMessage_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.AkkaControlMessage.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getHandshakeInfoFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        commandType_ = akka.remote.WireFormats.CommandType.ASSOCIATE;
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (handshakeInfoBuilder_ == null) {
-          handshakeInfo_ = akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance();
-        } else {
-          handshakeInfoBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.AkkaControlMessage.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.AkkaControlMessage getDefaultInstanceForType() {
-        return akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.AkkaControlMessage build() {
-        akka.remote.WireFormats.AkkaControlMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.AkkaControlMessage buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.AkkaControlMessage result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.AkkaControlMessage buildPartial() {
-        akka.remote.WireFormats.AkkaControlMessage result = new akka.remote.WireFormats.AkkaControlMessage(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.commandType_ = commandType_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (handshakeInfoBuilder_ == null) {
-          result.handshakeInfo_ = handshakeInfo_;
-        } else {
-          result.handshakeInfo_ = handshakeInfoBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.AkkaControlMessage) {
-          return mergeFrom((akka.remote.WireFormats.AkkaControlMessage)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.AkkaControlMessage other) {
-        if (other == akka.remote.WireFormats.AkkaControlMessage.getDefaultInstance()) return this;
-        if (other.hasCommandType()) {
-          setCommandType(other.getCommandType());
-        }
-        if (other.hasHandshakeInfo()) {
-          mergeHandshakeInfo(other.getHandshakeInfo());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasCommandType()) {
-          
-          return false;
-        }
-        if (hasHandshakeInfo()) {
-          if (!getHandshakeInfo().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 8: {
-              int rawValue = input.readEnum();
-              akka.remote.WireFormats.CommandType value = akka.remote.WireFormats.CommandType.valueOf(rawValue);
-              if (value == null) {
-                unknownFields.mergeVarintField(1, rawValue);
-              } else {
-                bitField0_ |= 0x00000001;
-                commandType_ = value;
-              }
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.AkkaHandshakeInfo.Builder subBuilder = akka.remote.WireFormats.AkkaHandshakeInfo.newBuilder();
-              if (hasHandshakeInfo()) {
-                subBuilder.mergeFrom(getHandshakeInfo());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setHandshakeInfo(subBuilder.buildPartial());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required .CommandType commandType = 1;
-      private akka.remote.WireFormats.CommandType commandType_ = akka.remote.WireFormats.CommandType.ASSOCIATE;
-      public boolean hasCommandType() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.CommandType getCommandType() {
-        return commandType_;
-      }
-      public Builder setCommandType(akka.remote.WireFormats.CommandType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        bitField0_ |= 0x00000001;
-        commandType_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearCommandType() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        commandType_ = akka.remote.WireFormats.CommandType.ASSOCIATE;
-        onChanged();
-        return this;
-      }
-      
-      // optional .AkkaHandshakeInfo handshakeInfo = 2;
-      private akka.remote.WireFormats.AkkaHandshakeInfo handshakeInfo_ = akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AkkaHandshakeInfo, akka.remote.WireFormats.AkkaHandshakeInfo.Builder, akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder> handshakeInfoBuilder_;
-      public boolean hasHandshakeInfo() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.WireFormats.AkkaHandshakeInfo getHandshakeInfo() {
-        if (handshakeInfoBuilder_ == null) {
-          return handshakeInfo_;
-        } else {
-          return handshakeInfoBuilder_.getMessage();
-        }
-      }
-      public Builder setHandshakeInfo(akka.remote.WireFormats.AkkaHandshakeInfo value) {
-        if (handshakeInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          handshakeInfo_ = value;
-          onChanged();
-        } else {
-          handshakeInfoBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setHandshakeInfo(
-          akka.remote.WireFormats.AkkaHandshakeInfo.Builder builderForValue) {
-        if (handshakeInfoBuilder_ == null) {
-          handshakeInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          handshakeInfoBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeHandshakeInfo(akka.remote.WireFormats.AkkaHandshakeInfo value) {
-        if (handshakeInfoBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              handshakeInfo_ != akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance()) {
-            handshakeInfo_ =
-              akka.remote.WireFormats.AkkaHandshakeInfo.newBuilder(handshakeInfo_).mergeFrom(value).buildPartial();
-          } else {
-            handshakeInfo_ = value;
-          }
-          onChanged();
-        } else {
-          handshakeInfoBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearHandshakeInfo() {
-        if (handshakeInfoBuilder_ == null) {
-          handshakeInfo_ = akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance();
-          onChanged();
-        } else {
-          handshakeInfoBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.WireFormats.AkkaHandshakeInfo.Builder getHandshakeInfoBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getHandshakeInfoFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder getHandshakeInfoOrBuilder() {
-        if (handshakeInfoBuilder_ != null) {
-          return handshakeInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return handshakeInfo_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AkkaHandshakeInfo, akka.remote.WireFormats.AkkaHandshakeInfo.Builder, akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder> 
-          getHandshakeInfoFieldBuilder() {
-        if (handshakeInfoBuilder_ == null) {
-          handshakeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.AkkaHandshakeInfo, akka.remote.WireFormats.AkkaHandshakeInfo.Builder, akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder>(
-                  handshakeInfo_,
-                  getParentForChildren(),
-                  isClean());
-          handshakeInfo_ = null;
-        }
-        return handshakeInfoBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AkkaControlMessage)
-    }
-    
-    static {
-      defaultInstance = new AkkaControlMessage(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AkkaControlMessage)
-  }
-  
-  public interface AkkaHandshakeInfoOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required .AddressData origin = 1;
-    boolean hasOrigin();
-    akka.remote.WireFormats.AddressData getOrigin();
-    akka.remote.WireFormats.AddressDataOrBuilder getOriginOrBuilder();
-    
-    // required fixed64 uid = 2;
-    boolean hasUid();
-    long getUid();
-    
-    // optional string cookie = 3;
-    boolean hasCookie();
-    String getCookie();
-  }
-  public static final class AkkaHandshakeInfo extends
-      com.google.protobuf.GeneratedMessage
-      implements AkkaHandshakeInfoOrBuilder {
-    // Use AkkaHandshakeInfo.newBuilder() to construct.
-    private AkkaHandshakeInfo(Builder builder) {
-      super(builder);
-    }
-    private AkkaHandshakeInfo(boolean noInit) {}
-    
-    private static final AkkaHandshakeInfo defaultInstance;
-    public static AkkaHandshakeInfo getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AkkaHandshakeInfo getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_AkkaHandshakeInfo_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_AkkaHandshakeInfo_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required .AddressData origin = 1;
-    public static final int ORIGIN_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.AddressData origin_;
-    public boolean hasOrigin() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.AddressData getOrigin() {
-      return origin_;
-    }
-    public akka.remote.WireFormats.AddressDataOrBuilder getOriginOrBuilder() {
-      return origin_;
-    }
-    
-    // required fixed64 uid = 2;
-    public static final int UID_FIELD_NUMBER = 2;
-    private long uid_;
-    public boolean hasUid() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public long getUid() {
-      return uid_;
-    }
-    
-    // optional string cookie = 3;
-    public static final int COOKIE_FIELD_NUMBER = 3;
-    private java.lang.Object cookie_;
-    public boolean hasCookie() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public String getCookie() {
-      java.lang.Object ref = cookie_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          cookie_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getCookieBytes() {
-      java.lang.Object ref = cookie_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        cookie_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    private void initFields() {
-      origin_ = akka.remote.WireFormats.AddressData.getDefaultInstance();
-      uid_ = 0L;
-      cookie_ = "";
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasOrigin()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasUid()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getOrigin().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, origin_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeFixed64(2, uid_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBytes(3, getCookieBytes());
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, origin_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFixed64Size(2, uid_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, getCookieBytes());
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AkkaHandshakeInfo parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.AkkaHandshakeInfo prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.AkkaHandshakeInfoOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_AkkaHandshakeInfo_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_AkkaHandshakeInfo_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.AkkaHandshakeInfo.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getOriginFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (originBuilder_ == null) {
-          origin_ = akka.remote.WireFormats.AddressData.getDefaultInstance();
-        } else {
-          originBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        uid_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        cookie_ = "";
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.AkkaHandshakeInfo.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.AkkaHandshakeInfo getDefaultInstanceForType() {
-        return akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.AkkaHandshakeInfo build() {
-        akka.remote.WireFormats.AkkaHandshakeInfo result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.AkkaHandshakeInfo buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.AkkaHandshakeInfo result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.AkkaHandshakeInfo buildPartial() {
-        akka.remote.WireFormats.AkkaHandshakeInfo result = new akka.remote.WireFormats.AkkaHandshakeInfo(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (originBuilder_ == null) {
-          result.origin_ = origin_;
-        } else {
-          result.origin_ = originBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.uid_ = uid_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.cookie_ = cookie_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.AkkaHandshakeInfo) {
-          return mergeFrom((akka.remote.WireFormats.AkkaHandshakeInfo)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.AkkaHandshakeInfo other) {
-        if (other == akka.remote.WireFormats.AkkaHandshakeInfo.getDefaultInstance()) return this;
-        if (other.hasOrigin()) {
-          mergeOrigin(other.getOrigin());
-        }
-        if (other.hasUid()) {
-          setUid(other.getUid());
-        }
-        if (other.hasCookie()) {
-          setCookie(other.getCookie());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasOrigin()) {
-          
-          return false;
-        }
-        if (!hasUid()) {
-          
-          return false;
-        }
-        if (!getOrigin().isInitialized()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              akka.remote.WireFormats.AddressData.Builder subBuilder = akka.remote.WireFormats.AddressData.newBuilder();
-              if (hasOrigin()) {
-                subBuilder.mergeFrom(getOrigin());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setOrigin(subBuilder.buildPartial());
-              break;
-            }
-            case 17: {
-              bitField0_ |= 0x00000002;
-              uid_ = input.readFixed64();
-              break;
-            }
-            case 26: {
-              bitField0_ |= 0x00000004;
-              cookie_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required .AddressData origin = 1;
-      private akka.remote.WireFormats.AddressData origin_ = akka.remote.WireFormats.AddressData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AddressData, akka.remote.WireFormats.AddressData.Builder, akka.remote.WireFormats.AddressDataOrBuilder> originBuilder_;
-      public boolean hasOrigin() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.AddressData getOrigin() {
-        if (originBuilder_ == null) {
-          return origin_;
-        } else {
-          return originBuilder_.getMessage();
-        }
-      }
-      public Builder setOrigin(akka.remote.WireFormats.AddressData value) {
-        if (originBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          origin_ = value;
-          onChanged();
-        } else {
-          originBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setOrigin(
-          akka.remote.WireFormats.AddressData.Builder builderForValue) {
-        if (originBuilder_ == null) {
-          origin_ = builderForValue.build();
-          onChanged();
-        } else {
-          originBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeOrigin(akka.remote.WireFormats.AddressData value) {
-        if (originBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              origin_ != akka.remote.WireFormats.AddressData.getDefaultInstance()) {
-            origin_ =
-              akka.remote.WireFormats.AddressData.newBuilder(origin_).mergeFrom(value).buildPartial();
-          } else {
-            origin_ = value;
-          }
-          onChanged();
-        } else {
-          originBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearOrigin() {
-        if (originBuilder_ == null) {
-          origin_ = akka.remote.WireFormats.AddressData.getDefaultInstance();
-          onChanged();
-        } else {
-          originBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.AddressData.Builder getOriginBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getOriginFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.AddressDataOrBuilder getOriginOrBuilder() {
-        if (originBuilder_ != null) {
-          return originBuilder_.getMessageOrBuilder();
-        } else {
-          return origin_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AddressData, akka.remote.WireFormats.AddressData.Builder, akka.remote.WireFormats.AddressDataOrBuilder> 
-          getOriginFieldBuilder() {
-        if (originBuilder_ == null) {
-          originBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.AddressData, akka.remote.WireFormats.AddressData.Builder, akka.remote.WireFormats.AddressDataOrBuilder>(
-                  origin_,
-                  getParentForChildren(),
-                  isClean());
-          origin_ = null;
-        }
-        return originBuilder_;
-      }
-      
-      // required fixed64 uid = 2;
-      private long uid_ ;
-      public boolean hasUid() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public long getUid() {
-        return uid_;
-      }
-      public Builder setUid(long value) {
-        bitField0_ |= 0x00000002;
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearUid() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        uid_ = 0L;
-        onChanged();
-        return this;
-      }
-      
-      // optional string cookie = 3;
-      private java.lang.Object cookie_ = "";
-      public boolean hasCookie() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public String getCookie() {
-        java.lang.Object ref = cookie_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          cookie_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setCookie(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000004;
-        cookie_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearCookie() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        cookie_ = getDefaultInstance().getCookie();
-        onChanged();
-        return this;
-      }
-      void setCookie(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000004;
-        cookie_ = value;
-        onChanged();
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AkkaHandshakeInfo)
-    }
-    
-    static {
-      defaultInstance = new AkkaHandshakeInfo(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AkkaHandshakeInfo)
-  }
-  
-  public interface AddressDataOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required string system = 1;
-    boolean hasSystem();
-    String getSystem();
-    
-    // required string hostname = 2;
-    boolean hasHostname();
-    String getHostname();
-    
-    // required uint32 port = 3;
-    boolean hasPort();
-    int getPort();
-    
-    // optional string protocol = 4;
-    boolean hasProtocol();
-    String getProtocol();
-  }
-  public static final class AddressData extends
-      com.google.protobuf.GeneratedMessage
-      implements AddressDataOrBuilder {
-    // Use AddressData.newBuilder() to construct.
-    private AddressData(Builder builder) {
-      super(builder);
-    }
-    private AddressData(boolean noInit) {}
-    
-    private static final AddressData defaultInstance;
-    public static AddressData getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AddressData getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.WireFormats.internal_static_AddressData_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.WireFormats.internal_static_AddressData_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required string system = 1;
-    public static final int SYSTEM_FIELD_NUMBER = 1;
-    private java.lang.Object system_;
-    public boolean hasSystem() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public String getSystem() {
-      java.lang.Object ref = system_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          system_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getSystemBytes() {
-      java.lang.Object ref = system_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        system_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // required string hostname = 2;
-    public static final int HOSTNAME_FIELD_NUMBER = 2;
-    private java.lang.Object hostname_;
-    public boolean hasHostname() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public String getHostname() {
-      java.lang.Object ref = hostname_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          hostname_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getHostnameBytes() {
-      java.lang.Object ref = hostname_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        hostname_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // required uint32 port = 3;
-    public static final int PORT_FIELD_NUMBER = 3;
-    private int port_;
-    public boolean hasPort() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public int getPort() {
-      return port_;
-    }
-    
-    // optional string protocol = 4;
-    public static final int PROTOCOL_FIELD_NUMBER = 4;
-    private java.lang.Object protocol_;
-    public boolean hasProtocol() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    public String getProtocol() {
-      java.lang.Object ref = protocol_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          protocol_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getProtocolBytes() {
-      java.lang.Object ref = protocol_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        protocol_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    private void initFields() {
-      system_ = "";
-      hostname_ = "";
-      port_ = 0;
-      protocol_ = "";
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasSystem()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasHostname()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasPort()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getSystemBytes());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getHostnameBytes());
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeUInt32(3, port_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeBytes(4, getProtocolBytes());
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getSystemBytes());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getHostnameBytes());
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, port_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(4, getProtocolBytes());
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.WireFormats.AddressData parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AddressData parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.WireFormats.AddressData parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.WireFormats.AddressData prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.WireFormats.AddressDataOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.WireFormats.internal_static_AddressData_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.WireFormats.internal_static_AddressData_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.WireFormats.AddressData.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        system_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        hostname_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        port_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        protocol_ = "";
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.WireFormats.AddressData.getDescriptor();
-      }
-      
-      public akka.remote.WireFormats.AddressData getDefaultInstanceForType() {
-        return akka.remote.WireFormats.AddressData.getDefaultInstance();
-      }
-      
-      public akka.remote.WireFormats.AddressData build() {
-        akka.remote.WireFormats.AddressData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.WireFormats.AddressData buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.WireFormats.AddressData result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.WireFormats.AddressData buildPartial() {
-        akka.remote.WireFormats.AddressData result = new akka.remote.WireFormats.AddressData(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.system_ = system_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.hostname_ = hostname_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.port_ = port_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.protocol_ = protocol_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.WireFormats.AddressData) {
-          return mergeFrom((akka.remote.WireFormats.AddressData)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.WireFormats.AddressData other) {
-        if (other == akka.remote.WireFormats.AddressData.getDefaultInstance()) return this;
-        if (other.hasSystem()) {
-          setSystem(other.getSystem());
-        }
-        if (other.hasHostname()) {
-          setHostname(other.getHostname());
-        }
-        if (other.hasPort()) {
-          setPort(other.getPort());
-        }
-        if (other.hasProtocol()) {
-          setProtocol(other.getProtocol());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasSystem()) {
-          
-          return false;
-        }
-        if (!hasHostname()) {
-          
-          return false;
-        }
-        if (!hasPort()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              system_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              hostname_ = input.readBytes();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              port_ = input.readUInt32();
-              break;
-            }
-            case 34: {
-              bitField0_ |= 0x00000008;
-              protocol_ = input.readBytes();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required string system = 1;
-      private java.lang.Object system_ = "";
-      public boolean hasSystem() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public String getSystem() {
-        java.lang.Object ref = system_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          system_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setSystem(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        system_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearSystem() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        system_ = getDefaultInstance().getSystem();
-        onChanged();
-        return this;
-      }
-      void setSystem(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
-        system_ = value;
-        onChanged();
-      }
-      
-      // required string hostname = 2;
-      private java.lang.Object hostname_ = "";
-      public boolean hasHostname() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public String getHostname() {
-        java.lang.Object ref = hostname_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          hostname_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setHostname(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        hostname_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearHostname() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        hostname_ = getDefaultInstance().getHostname();
-        onChanged();
-        return this;
-      }
-      void setHostname(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000002;
-        hostname_ = value;
-        onChanged();
-      }
-      
-      // required uint32 port = 3;
-      private int port_ ;
-      public boolean hasPort() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public int getPort() {
-        return port_;
-      }
-      public Builder setPort(int value) {
-        bitField0_ |= 0x00000004;
-        port_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearPort() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        port_ = 0;
-        onChanged();
-        return this;
-      }
-      
-      // optional string protocol = 4;
-      private java.lang.Object protocol_ = "";
-      public boolean hasProtocol() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      public String getProtocol() {
-        java.lang.Object ref = protocol_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          protocol_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setProtocol(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000008;
-        protocol_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearProtocol() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        protocol_ = getDefaultInstance().getProtocol();
-        onChanged();
-        return this;
-      }
-      void setProtocol(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000008;
-        protocol_ = value;
-        onChanged();
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AddressData)
-    }
-    
-    static {
-      defaultInstance = new AddressData(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AddressData)
-  }
-  
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AckAndEnvelopeContainer_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AckAndEnvelopeContainer_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RemoteEnvelope_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RemoteEnvelope_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AcknowledgementInfo_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AcknowledgementInfo_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_ActorRefData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_ActorRefData_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_SerializedMessage_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_SerializedMessage_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DaemonMsgCreateData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DaemonMsgCreateData_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_PropsData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_PropsData_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_DeployData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_DeployData_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AkkaProtocolMessage_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AkkaProtocolMessage_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AkkaControlMessage_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AkkaControlMessage_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AkkaHandshakeInfo_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AkkaHandshakeInfo_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AddressData_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AddressData_fieldAccessorTable;
-  
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\021WireFormats.proto\"_\n\027AckAndEnvelopeCon" +
-      "tainer\022!\n\003ack\030\001 \001(\0132\024.AcknowledgementInf" +
-      "o\022!\n\010envelope\030\002 \001(\0132\017.RemoteEnvelope\"\203\001\n" +
-      "\016RemoteEnvelope\022 \n\trecipient\030\001 \002(\0132\r.Act" +
-      "orRefData\022#\n\007message\030\002 \002(\0132\022.SerializedM" +
-      "essage\022\035\n\006sender\030\004 \001(\0132\r.ActorRefData\022\013\n" +
-      "\003seq\030\005 \001(\006\";\n\023AcknowledgementInfo\022\025\n\rcum" +
-      "ulativeAck\030\001 \002(\006\022\r\n\005nacks\030\002 \003(\006\"\034\n\014Actor" +
-      "RefData\022\014\n\004path\030\001 \002(\t\"S\n\021SerializedMessa" +
-      "ge\022\017\n\007message\030\001 \002(\014\022\024\n\014serializerId\030\002 \002(",
-      "\005\022\027\n\017messageManifest\030\003 \001(\014\"~\n\023DaemonMsgC" +
-      "reateData\022\031\n\005props\030\001 \002(\0132\n.PropsData\022\033\n\006" +
-      "deploy\030\002 \002(\0132\013.DeployData\022\014\n\004path\030\003 \002(\t\022" +
-      "!\n\nsupervisor\030\004 \002(\0132\r.ActorRefData\"V\n\tPr" +
-      "opsData\022\033\n\006deploy\030\002 \002(\0132\013.DeployData\022\r\n\005" +
-      "clazz\030\003 \002(\t\022\014\n\004args\030\004 \003(\014\022\017\n\007classes\030\005 \003" +
-      "(\t\"c\n\nDeployData\022\014\n\004path\030\001 \002(\t\022\016\n\006config" +
-      "\030\002 \001(\014\022\024\n\014routerConfig\030\003 \001(\014\022\r\n\005scope\030\004 " +
-      "\001(\014\022\022\n\ndispatcher\030\005 \001(\t\"P\n\023AkkaProtocolM" +
-      "essage\022\017\n\007payload\030\001 \001(\014\022(\n\013instruction\030\002",
-      " \001(\0132\023.AkkaControlMessage\"b\n\022AkkaControl" +
-      "Message\022!\n\013commandType\030\001 \002(\0162\014.CommandTy" +
-      "pe\022)\n\rhandshakeInfo\030\002 \001(\0132\022.AkkaHandshak" +
-      "eInfo\"N\n\021AkkaHandshakeInfo\022\034\n\006origin\030\001 \002" +
-      "(\0132\014.AddressData\022\013\n\003uid\030\002 \002(\006\022\016\n\006cookie\030" +
-      "\003 \001(\t\"O\n\013AddressData\022\016\n\006system\030\001 \002(\t\022\020\n\010" +
-      "hostname\030\002 \002(\t\022\014\n\004port\030\003 \002(\r\022\020\n\010protocol" +
-      "\030\004 \001(\t*{\n\013CommandType\022\r\n\tASSOCIATE\020\001\022\020\n\014" +
-      "DISASSOCIATE\020\002\022\r\n\tHEARTBEAT\020\003\022\036\n\032DISASSO" +
-      "CIATE_SHUTTING_DOWN\020\004\022\034\n\030DISASSOCIATE_QU",
-      "ARANTINED\020\005B\017\n\013akka.remoteH\001"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_AckAndEnvelopeContainer_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_AckAndEnvelopeContainer_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AckAndEnvelopeContainer_descriptor,
-              new java.lang.String[] { "Ack", "Envelope", },
-              akka.remote.WireFormats.AckAndEnvelopeContainer.class,
-              akka.remote.WireFormats.AckAndEnvelopeContainer.Builder.class);
-          internal_static_RemoteEnvelope_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_RemoteEnvelope_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RemoteEnvelope_descriptor,
-              new java.lang.String[] { "Recipient", "Message", "Sender", "Seq", },
-              akka.remote.WireFormats.RemoteEnvelope.class,
-              akka.remote.WireFormats.RemoteEnvelope.Builder.class);
-          internal_static_AcknowledgementInfo_descriptor =
-            getDescriptor().getMessageTypes().get(2);
-          internal_static_AcknowledgementInfo_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AcknowledgementInfo_descriptor,
-              new java.lang.String[] { "CumulativeAck", "Nacks", },
-              akka.remote.WireFormats.AcknowledgementInfo.class,
-              akka.remote.WireFormats.AcknowledgementInfo.Builder.class);
-          internal_static_ActorRefData_descriptor =
-            getDescriptor().getMessageTypes().get(3);
-          internal_static_ActorRefData_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_ActorRefData_descriptor,
-              new java.lang.String[] { "Path", },
-              akka.remote.WireFormats.ActorRefData.class,
-              akka.remote.WireFormats.ActorRefData.Builder.class);
-          internal_static_SerializedMessage_descriptor =
-            getDescriptor().getMessageTypes().get(4);
-          internal_static_SerializedMessage_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_SerializedMessage_descriptor,
-              new java.lang.String[] { "Message", "SerializerId", "MessageManifest", },
-              akka.remote.WireFormats.SerializedMessage.class,
-              akka.remote.WireFormats.SerializedMessage.Builder.class);
-          internal_static_DaemonMsgCreateData_descriptor =
-            getDescriptor().getMessageTypes().get(5);
-          internal_static_DaemonMsgCreateData_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DaemonMsgCreateData_descriptor,
-              new java.lang.String[] { "Props", "Deploy", "Path", "Supervisor", },
-              akka.remote.WireFormats.DaemonMsgCreateData.class,
-              akka.remote.WireFormats.DaemonMsgCreateData.Builder.class);
-          internal_static_PropsData_descriptor =
-            getDescriptor().getMessageTypes().get(6);
-          internal_static_PropsData_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_PropsData_descriptor,
-              new java.lang.String[] { "Deploy", "Clazz", "Args", "Classes", },
-              akka.remote.WireFormats.PropsData.class,
-              akka.remote.WireFormats.PropsData.Builder.class);
-          internal_static_DeployData_descriptor =
-            getDescriptor().getMessageTypes().get(7);
-          internal_static_DeployData_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_DeployData_descriptor,
-              new java.lang.String[] { "Path", "Config", "RouterConfig", "Scope", "Dispatcher", },
-              akka.remote.WireFormats.DeployData.class,
-              akka.remote.WireFormats.DeployData.Builder.class);
-          internal_static_AkkaProtocolMessage_descriptor =
-            getDescriptor().getMessageTypes().get(8);
-          internal_static_AkkaProtocolMessage_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AkkaProtocolMessage_descriptor,
-              new java.lang.String[] { "Payload", "Instruction", },
-              akka.remote.WireFormats.AkkaProtocolMessage.class,
-              akka.remote.WireFormats.AkkaProtocolMessage.Builder.class);
-          internal_static_AkkaControlMessage_descriptor =
-            getDescriptor().getMessageTypes().get(9);
-          internal_static_AkkaControlMessage_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AkkaControlMessage_descriptor,
-              new java.lang.String[] { "CommandType", "HandshakeInfo", },
-              akka.remote.WireFormats.AkkaControlMessage.class,
-              akka.remote.WireFormats.AkkaControlMessage.Builder.class);
-          internal_static_AkkaHandshakeInfo_descriptor =
-            getDescriptor().getMessageTypes().get(10);
-          internal_static_AkkaHandshakeInfo_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AkkaHandshakeInfo_descriptor,
-              new java.lang.String[] { "Origin", "Uid", "Cookie", },
-              akka.remote.WireFormats.AkkaHandshakeInfo.class,
-              akka.remote.WireFormats.AkkaHandshakeInfo.Builder.class);
-          internal_static_AddressData_descriptor =
-            getDescriptor().getMessageTypes().get(11);
-          internal_static_AddressData_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AddressData_descriptor,
-              new java.lang.String[] { "System", "Hostname", "Port", "Protocol", },
-              akka.remote.WireFormats.AddressData.class,
-              akka.remote.WireFormats.AddressData.Builder.class);
-          return null;
-        }
-      };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-  }
-  
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/kamon-core/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java b/kamon-core/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java
deleted file mode 100644
index 36a01f25..00000000
--- a/kamon-core/src/main/java/akka/remote/instrumentation/TraceContextAwareWireFormats.java
+++ /dev/null
@@ -1,2261 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: TraceContextAwareWireFormats.proto
-
-package akka.remote.instrumentation;
-
-public final class TraceContextAwareWireFormats {
-  private TraceContextAwareWireFormats() {}
-  public static void registerAllExtensions(
-      com.google.protobuf.ExtensionRegistry registry) {
-  }
-  public interface AckAndTraceContextAwareEnvelopeContainerOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // optional .AcknowledgementInfo ack = 1;
-    boolean hasAck();
-    akka.remote.WireFormats.AcknowledgementInfo getAck();
-    akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder();
-    
-    // optional .TraceContextAwareRemoteEnvelope envelope = 2;
-    boolean hasEnvelope();
-    akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getEnvelope();
-    akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder getEnvelopeOrBuilder();
-  }
-  public static final class AckAndTraceContextAwareEnvelopeContainer extends
-      com.google.protobuf.GeneratedMessage
-      implements AckAndTraceContextAwareEnvelopeContainerOrBuilder {
-    // Use AckAndTraceContextAwareEnvelopeContainer.newBuilder() to construct.
-    private AckAndTraceContextAwareEnvelopeContainer(Builder builder) {
-      super(builder);
-    }
-    private AckAndTraceContextAwareEnvelopeContainer(boolean noInit) {}
-    
-    private static final AckAndTraceContextAwareEnvelopeContainer defaultInstance;
-    public static AckAndTraceContextAwareEnvelopeContainer getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public AckAndTraceContextAwareEnvelopeContainer getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // optional .AcknowledgementInfo ack = 1;
-    public static final int ACK_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.AcknowledgementInfo ack_;
-    public boolean hasAck() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.AcknowledgementInfo getAck() {
-      return ack_;
-    }
-    public akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() {
-      return ack_;
-    }
-    
-    // optional .TraceContextAwareRemoteEnvelope envelope = 2;
-    public static final int ENVELOPE_FIELD_NUMBER = 2;
-    private akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope envelope_;
-    public boolean hasEnvelope() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getEnvelope() {
-      return envelope_;
-    }
-    public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder getEnvelopeOrBuilder() {
-      return envelope_;
-    }
-    
-    private void initFields() {
-      ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-      envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (hasAck()) {
-        if (!getAck().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasEnvelope()) {
-        if (!getEnvelope().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, ack_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, envelope_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, ack_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, envelope_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainerOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getAckFieldBuilder();
-          getEnvelopeFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (ackBuilder_ == null) {
-          ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-        } else {
-          ackBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (envelopeBuilder_ == null) {
-          envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance();
-        } else {
-          envelopeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.getDescriptor();
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer getDefaultInstanceForType() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.getDefaultInstance();
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer build() {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer buildPartial() {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer result = new akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (ackBuilder_ == null) {
-          result.ack_ = ack_;
-        } else {
-          result.ack_ = ackBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (envelopeBuilder_ == null) {
-          result.envelope_ = envelope_;
-        } else {
-          result.envelope_ = envelopeBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer) {
-          return mergeFrom((akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer other) {
-        if (other == akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.getDefaultInstance()) return this;
-        if (other.hasAck()) {
-          mergeAck(other.getAck());
-        }
-        if (other.hasEnvelope()) {
-          mergeEnvelope(other.getEnvelope());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (hasAck()) {
-          if (!getAck().isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasEnvelope()) {
-          if (!getEnvelope().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              akka.remote.WireFormats.AcknowledgementInfo.Builder subBuilder = akka.remote.WireFormats.AcknowledgementInfo.newBuilder();
-              if (hasAck()) {
-                subBuilder.mergeFrom(getAck());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setAck(subBuilder.buildPartial());
-              break;
-            }
-            case 18: {
-              akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder subBuilder = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.newBuilder();
-              if (hasEnvelope()) {
-                subBuilder.mergeFrom(getEnvelope());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setEnvelope(subBuilder.buildPartial());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // optional .AcknowledgementInfo ack = 1;
-      private akka.remote.WireFormats.AcknowledgementInfo ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder> ackBuilder_;
-      public boolean hasAck() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.AcknowledgementInfo getAck() {
-        if (ackBuilder_ == null) {
-          return ack_;
-        } else {
-          return ackBuilder_.getMessage();
-        }
-      }
-      public Builder setAck(akka.remote.WireFormats.AcknowledgementInfo value) {
-        if (ackBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ack_ = value;
-          onChanged();
-        } else {
-          ackBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setAck(
-          akka.remote.WireFormats.AcknowledgementInfo.Builder builderForValue) {
-        if (ackBuilder_ == null) {
-          ack_ = builderForValue.build();
-          onChanged();
-        } else {
-          ackBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeAck(akka.remote.WireFormats.AcknowledgementInfo value) {
-        if (ackBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              ack_ != akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance()) {
-            ack_ =
-              akka.remote.WireFormats.AcknowledgementInfo.newBuilder(ack_).mergeFrom(value).buildPartial();
-          } else {
-            ack_ = value;
-          }
-          onChanged();
-        } else {
-          ackBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearAck() {
-        if (ackBuilder_ == null) {
-          ack_ = akka.remote.WireFormats.AcknowledgementInfo.getDefaultInstance();
-          onChanged();
-        } else {
-          ackBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.AcknowledgementInfo.Builder getAckBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getAckFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.AcknowledgementInfoOrBuilder getAckOrBuilder() {
-        if (ackBuilder_ != null) {
-          return ackBuilder_.getMessageOrBuilder();
-        } else {
-          return ack_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder> 
-          getAckFieldBuilder() {
-        if (ackBuilder_ == null) {
-          ackBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.AcknowledgementInfo, akka.remote.WireFormats.AcknowledgementInfo.Builder, akka.remote.WireFormats.AcknowledgementInfoOrBuilder>(
-                  ack_,
-                  getParentForChildren(),
-                  isClean());
-          ack_ = null;
-        }
-        return ackBuilder_;
-      }
-      
-      // optional .TraceContextAwareRemoteEnvelope envelope = 2;
-      private akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder> envelopeBuilder_;
-      public boolean hasEnvelope() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getEnvelope() {
-        if (envelopeBuilder_ == null) {
-          return envelope_;
-        } else {
-          return envelopeBuilder_.getMessage();
-        }
-      }
-      public Builder setEnvelope(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope value) {
-        if (envelopeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          envelope_ = value;
-          onChanged();
-        } else {
-          envelopeBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setEnvelope(
-          akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder builderForValue) {
-        if (envelopeBuilder_ == null) {
-          envelope_ = builderForValue.build();
-          onChanged();
-        } else {
-          envelopeBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeEnvelope(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope value) {
-        if (envelopeBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              envelope_ != akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance()) {
-            envelope_ =
-              akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.newBuilder(envelope_).mergeFrom(value).buildPartial();
-          } else {
-            envelope_ = value;
-          }
-          onChanged();
-        } else {
-          envelopeBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearEnvelope() {
-        if (envelopeBuilder_ == null) {
-          envelope_ = akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance();
-          onChanged();
-        } else {
-          envelopeBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder getEnvelopeBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getEnvelopeFieldBuilder().getBuilder();
-      }
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder getEnvelopeOrBuilder() {
-        if (envelopeBuilder_ != null) {
-          return envelopeBuilder_.getMessageOrBuilder();
-        } else {
-          return envelope_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder> 
-          getEnvelopeFieldBuilder() {
-        if (envelopeBuilder_ == null) {
-          envelopeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder>(
-                  envelope_,
-                  getParentForChildren(),
-                  isClean());
-          envelope_ = null;
-        }
-        return envelopeBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:AckAndTraceContextAwareEnvelopeContainer)
-    }
-    
-    static {
-      defaultInstance = new AckAndTraceContextAwareEnvelopeContainer(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:AckAndTraceContextAwareEnvelopeContainer)
-  }
-  
-  public interface TraceContextAwareRemoteEnvelopeOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required .ActorRefData recipient = 1;
-    boolean hasRecipient();
-    akka.remote.WireFormats.ActorRefData getRecipient();
-    akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder();
-    
-    // required .SerializedMessage message = 2;
-    boolean hasMessage();
-    akka.remote.WireFormats.SerializedMessage getMessage();
-    akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder();
-    
-    // optional .ActorRefData sender = 4;
-    boolean hasSender();
-    akka.remote.WireFormats.ActorRefData getSender();
-    akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder();
-    
-    // optional fixed64 seq = 5;
-    boolean hasSeq();
-    long getSeq();
-    
-    // optional .RemoteTraceContext traceContext = 15;
-    boolean hasTraceContext();
-    akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getTraceContext();
-    akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder getTraceContextOrBuilder();
-  }
-  public static final class TraceContextAwareRemoteEnvelope extends
-      com.google.protobuf.GeneratedMessage
-      implements TraceContextAwareRemoteEnvelopeOrBuilder {
-    // Use TraceContextAwareRemoteEnvelope.newBuilder() to construct.
-    private TraceContextAwareRemoteEnvelope(Builder builder) {
-      super(builder);
-    }
-    private TraceContextAwareRemoteEnvelope(boolean noInit) {}
-    
-    private static final TraceContextAwareRemoteEnvelope defaultInstance;
-    public static TraceContextAwareRemoteEnvelope getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public TraceContextAwareRemoteEnvelope getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required .ActorRefData recipient = 1;
-    public static final int RECIPIENT_FIELD_NUMBER = 1;
-    private akka.remote.WireFormats.ActorRefData recipient_;
-    public boolean hasRecipient() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public akka.remote.WireFormats.ActorRefData getRecipient() {
-      return recipient_;
-    }
-    public akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() {
-      return recipient_;
-    }
-    
-    // required .SerializedMessage message = 2;
-    public static final int MESSAGE_FIELD_NUMBER = 2;
-    private akka.remote.WireFormats.SerializedMessage message_;
-    public boolean hasMessage() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public akka.remote.WireFormats.SerializedMessage getMessage() {
-      return message_;
-    }
-    public akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() {
-      return message_;
-    }
-    
-    // optional .ActorRefData sender = 4;
-    public static final int SENDER_FIELD_NUMBER = 4;
-    private akka.remote.WireFormats.ActorRefData sender_;
-    public boolean hasSender() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public akka.remote.WireFormats.ActorRefData getSender() {
-      return sender_;
-    }
-    public akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() {
-      return sender_;
-    }
-    
-    // optional fixed64 seq = 5;
-    public static final int SEQ_FIELD_NUMBER = 5;
-    private long seq_;
-    public boolean hasSeq() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    public long getSeq() {
-      return seq_;
-    }
-    
-    // optional .RemoteTraceContext traceContext = 15;
-    public static final int TRACECONTEXT_FIELD_NUMBER = 15;
-    private akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext traceContext_;
-    public boolean hasTraceContext() {
-      return ((bitField0_ & 0x00000010) == 0x00000010);
-    }
-    public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getTraceContext() {
-      return traceContext_;
-    }
-    public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder getTraceContextOrBuilder() {
-      return traceContext_;
-    }
-    
-    private void initFields() {
-      recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-      sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      seq_ = 0L;
-      traceContext_ = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasRecipient()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasMessage()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getRecipient().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!getMessage().isInitialized()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (hasSender()) {
-        if (!getSender().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      if (hasTraceContext()) {
-        if (!getTraceContext().isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeMessage(1, recipient_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeMessage(2, message_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeMessage(4, sender_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeFixed64(5, seq_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        output.writeMessage(15, traceContext_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, recipient_);
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, message_);
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, sender_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFixed64Size(5, seq_);
-      }
-      if (((bitField0_ & 0x00000010) == 0x00000010)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, traceContext_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelopeOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getRecipientFieldBuilder();
-          getMessageFieldBuilder();
-          getSenderFieldBuilder();
-          getTraceContextFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        if (recipientBuilder_ == null) {
-          recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-        } else {
-          recipientBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        if (messageBuilder_ == null) {
-          message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-        } else {
-          messageBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (senderBuilder_ == null) {
-          sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-        } else {
-          senderBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        seq_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        if (traceContextBuilder_ == null) {
-          traceContext_ = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance();
-        } else {
-          traceContextBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDescriptor();
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope getDefaultInstanceForType() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance();
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope build() {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope buildPartial() {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope result = new akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        if (recipientBuilder_ == null) {
-          result.recipient_ = recipient_;
-        } else {
-          result.recipient_ = recipientBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        if (messageBuilder_ == null) {
-          result.message_ = message_;
-        } else {
-          result.message_ = messageBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        if (senderBuilder_ == null) {
-          result.sender_ = sender_;
-        } else {
-          result.sender_ = senderBuilder_.build();
-        }
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.seq_ = seq_;
-        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
-          to_bitField0_ |= 0x00000010;
-        }
-        if (traceContextBuilder_ == null) {
-          result.traceContext_ = traceContext_;
-        } else {
-          result.traceContext_ = traceContextBuilder_.build();
-        }
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope) {
-          return mergeFrom((akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope other) {
-        if (other == akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.getDefaultInstance()) return this;
-        if (other.hasRecipient()) {
-          mergeRecipient(other.getRecipient());
-        }
-        if (other.hasMessage()) {
-          mergeMessage(other.getMessage());
-        }
-        if (other.hasSender()) {
-          mergeSender(other.getSender());
-        }
-        if (other.hasSeq()) {
-          setSeq(other.getSeq());
-        }
-        if (other.hasTraceContext()) {
-          mergeTraceContext(other.getTraceContext());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasRecipient()) {
-          
-          return false;
-        }
-        if (!hasMessage()) {
-          
-          return false;
-        }
-        if (!getRecipient().isInitialized()) {
-          
-          return false;
-        }
-        if (!getMessage().isInitialized()) {
-          
-          return false;
-        }
-        if (hasSender()) {
-          if (!getSender().isInitialized()) {
-            
-            return false;
-          }
-        }
-        if (hasTraceContext()) {
-          if (!getTraceContext().isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder();
-              if (hasRecipient()) {
-                subBuilder.mergeFrom(getRecipient());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setRecipient(subBuilder.buildPartial());
-              break;
-            }
-            case 18: {
-              akka.remote.WireFormats.SerializedMessage.Builder subBuilder = akka.remote.WireFormats.SerializedMessage.newBuilder();
-              if (hasMessage()) {
-                subBuilder.mergeFrom(getMessage());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setMessage(subBuilder.buildPartial());
-              break;
-            }
-            case 34: {
-              akka.remote.WireFormats.ActorRefData.Builder subBuilder = akka.remote.WireFormats.ActorRefData.newBuilder();
-              if (hasSender()) {
-                subBuilder.mergeFrom(getSender());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setSender(subBuilder.buildPartial());
-              break;
-            }
-            case 41: {
-              bitField0_ |= 0x00000008;
-              seq_ = input.readFixed64();
-              break;
-            }
-            case 122: {
-              akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder subBuilder = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.newBuilder();
-              if (hasTraceContext()) {
-                subBuilder.mergeFrom(getTraceContext());
-              }
-              input.readMessage(subBuilder, extensionRegistry);
-              setTraceContext(subBuilder.buildPartial());
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required .ActorRefData recipient = 1;
-      private akka.remote.WireFormats.ActorRefData recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> recipientBuilder_;
-      public boolean hasRecipient() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public akka.remote.WireFormats.ActorRefData getRecipient() {
-        if (recipientBuilder_ == null) {
-          return recipient_;
-        } else {
-          return recipientBuilder_.getMessage();
-        }
-      }
-      public Builder setRecipient(akka.remote.WireFormats.ActorRefData value) {
-        if (recipientBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          recipient_ = value;
-          onChanged();
-        } else {
-          recipientBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder setRecipient(
-          akka.remote.WireFormats.ActorRefData.Builder builderForValue) {
-        if (recipientBuilder_ == null) {
-          recipient_ = builderForValue.build();
-          onChanged();
-        } else {
-          recipientBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder mergeRecipient(akka.remote.WireFormats.ActorRefData value) {
-        if (recipientBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              recipient_ != akka.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            recipient_ =
-              akka.remote.WireFormats.ActorRefData.newBuilder(recipient_).mergeFrom(value).buildPartial();
-          } else {
-            recipient_ = value;
-          }
-          onChanged();
-        } else {
-          recipientBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000001;
-        return this;
-      }
-      public Builder clearRecipient() {
-        if (recipientBuilder_ == null) {
-          recipient_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-          onChanged();
-        } else {
-          recipientBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
-        return this;
-      }
-      public akka.remote.WireFormats.ActorRefData.Builder getRecipientBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
-        return getRecipientFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.ActorRefDataOrBuilder getRecipientOrBuilder() {
-        if (recipientBuilder_ != null) {
-          return recipientBuilder_.getMessageOrBuilder();
-        } else {
-          return recipient_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> 
-          getRecipientFieldBuilder() {
-        if (recipientBuilder_ == null) {
-          recipientBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder>(
-                  recipient_,
-                  getParentForChildren(),
-                  isClean());
-          recipient_ = null;
-        }
-        return recipientBuilder_;
-      }
-      
-      // required .SerializedMessage message = 2;
-      private akka.remote.WireFormats.SerializedMessage message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder> messageBuilder_;
-      public boolean hasMessage() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public akka.remote.WireFormats.SerializedMessage getMessage() {
-        if (messageBuilder_ == null) {
-          return message_;
-        } else {
-          return messageBuilder_.getMessage();
-        }
-      }
-      public Builder setMessage(akka.remote.WireFormats.SerializedMessage value) {
-        if (messageBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          message_ = value;
-          onChanged();
-        } else {
-          messageBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder setMessage(
-          akka.remote.WireFormats.SerializedMessage.Builder builderForValue) {
-        if (messageBuilder_ == null) {
-          message_ = builderForValue.build();
-          onChanged();
-        } else {
-          messageBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder mergeMessage(akka.remote.WireFormats.SerializedMessage value) {
-        if (messageBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              message_ != akka.remote.WireFormats.SerializedMessage.getDefaultInstance()) {
-            message_ =
-              akka.remote.WireFormats.SerializedMessage.newBuilder(message_).mergeFrom(value).buildPartial();
-          } else {
-            message_ = value;
-          }
-          onChanged();
-        } else {
-          messageBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000002;
-        return this;
-      }
-      public Builder clearMessage() {
-        if (messageBuilder_ == null) {
-          message_ = akka.remote.WireFormats.SerializedMessage.getDefaultInstance();
-          onChanged();
-        } else {
-          messageBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000002);
-        return this;
-      }
-      public akka.remote.WireFormats.SerializedMessage.Builder getMessageBuilder() {
-        bitField0_ |= 0x00000002;
-        onChanged();
-        return getMessageFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.SerializedMessageOrBuilder getMessageOrBuilder() {
-        if (messageBuilder_ != null) {
-          return messageBuilder_.getMessageOrBuilder();
-        } else {
-          return message_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder> 
-          getMessageFieldBuilder() {
-        if (messageBuilder_ == null) {
-          messageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.SerializedMessage, akka.remote.WireFormats.SerializedMessage.Builder, akka.remote.WireFormats.SerializedMessageOrBuilder>(
-                  message_,
-                  getParentForChildren(),
-                  isClean());
-          message_ = null;
-        }
-        return messageBuilder_;
-      }
-      
-      // optional .ActorRefData sender = 4;
-      private akka.remote.WireFormats.ActorRefData sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> senderBuilder_;
-      public boolean hasSender() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public akka.remote.WireFormats.ActorRefData getSender() {
-        if (senderBuilder_ == null) {
-          return sender_;
-        } else {
-          return senderBuilder_.getMessage();
-        }
-      }
-      public Builder setSender(akka.remote.WireFormats.ActorRefData value) {
-        if (senderBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          sender_ = value;
-          onChanged();
-        } else {
-          senderBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      public Builder setSender(
-          akka.remote.WireFormats.ActorRefData.Builder builderForValue) {
-        if (senderBuilder_ == null) {
-          sender_ = builderForValue.build();
-          onChanged();
-        } else {
-          senderBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      public Builder mergeSender(akka.remote.WireFormats.ActorRefData value) {
-        if (senderBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              sender_ != akka.remote.WireFormats.ActorRefData.getDefaultInstance()) {
-            sender_ =
-              akka.remote.WireFormats.ActorRefData.newBuilder(sender_).mergeFrom(value).buildPartial();
-          } else {
-            sender_ = value;
-          }
-          onChanged();
-        } else {
-          senderBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000004;
-        return this;
-      }
-      public Builder clearSender() {
-        if (senderBuilder_ == null) {
-          sender_ = akka.remote.WireFormats.ActorRefData.getDefaultInstance();
-          onChanged();
-        } else {
-          senderBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-      public akka.remote.WireFormats.ActorRefData.Builder getSenderBuilder() {
-        bitField0_ |= 0x00000004;
-        onChanged();
-        return getSenderFieldBuilder().getBuilder();
-      }
-      public akka.remote.WireFormats.ActorRefDataOrBuilder getSenderOrBuilder() {
-        if (senderBuilder_ != null) {
-          return senderBuilder_.getMessageOrBuilder();
-        } else {
-          return sender_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder> 
-          getSenderFieldBuilder() {
-        if (senderBuilder_ == null) {
-          senderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.WireFormats.ActorRefData, akka.remote.WireFormats.ActorRefData.Builder, akka.remote.WireFormats.ActorRefDataOrBuilder>(
-                  sender_,
-                  getParentForChildren(),
-                  isClean());
-          sender_ = null;
-        }
-        return senderBuilder_;
-      }
-      
-      // optional fixed64 seq = 5;
-      private long seq_ ;
-      public boolean hasSeq() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      public long getSeq() {
-        return seq_;
-      }
-      public Builder setSeq(long value) {
-        bitField0_ |= 0x00000008;
-        seq_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearSeq() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        seq_ = 0L;
-        onChanged();
-        return this;
-      }
-      
-      // optional .RemoteTraceContext traceContext = 15;
-      private akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext traceContext_ = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder> traceContextBuilder_;
-      public boolean hasTraceContext() {
-        return ((bitField0_ & 0x00000010) == 0x00000010);
-      }
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getTraceContext() {
-        if (traceContextBuilder_ == null) {
-          return traceContext_;
-        } else {
-          return traceContextBuilder_.getMessage();
-        }
-      }
-      public Builder setTraceContext(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext value) {
-        if (traceContextBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          traceContext_ = value;
-          onChanged();
-        } else {
-          traceContextBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      public Builder setTraceContext(
-          akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder builderForValue) {
-        if (traceContextBuilder_ == null) {
-          traceContext_ = builderForValue.build();
-          onChanged();
-        } else {
-          traceContextBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      public Builder mergeTraceContext(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext value) {
-        if (traceContextBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              traceContext_ != akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance()) {
-            traceContext_ =
-              akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.newBuilder(traceContext_).mergeFrom(value).buildPartial();
-          } else {
-            traceContext_ = value;
-          }
-          onChanged();
-        } else {
-          traceContextBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00000010;
-        return this;
-      }
-      public Builder clearTraceContext() {
-        if (traceContextBuilder_ == null) {
-          traceContext_ = akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance();
-          onChanged();
-        } else {
-          traceContextBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000010);
-        return this;
-      }
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder getTraceContextBuilder() {
-        bitField0_ |= 0x00000010;
-        onChanged();
-        return getTraceContextFieldBuilder().getBuilder();
-      }
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder getTraceContextOrBuilder() {
-        if (traceContextBuilder_ != null) {
-          return traceContextBuilder_.getMessageOrBuilder();
-        } else {
-          return traceContext_;
-        }
-      }
-      private com.google.protobuf.SingleFieldBuilder<
-          akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder> 
-          getTraceContextFieldBuilder() {
-        if (traceContextBuilder_ == null) {
-          traceContextBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder, akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder>(
-                  traceContext_,
-                  getParentForChildren(),
-                  isClean());
-          traceContext_ = null;
-        }
-        return traceContextBuilder_;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:TraceContextAwareRemoteEnvelope)
-    }
-    
-    static {
-      defaultInstance = new TraceContextAwareRemoteEnvelope(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:TraceContextAwareRemoteEnvelope)
-  }
-  
-  public interface RemoteTraceContextOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
-    
-    // required string traceName = 1;
-    boolean hasTraceName();
-    String getTraceName();
-    
-    // required string traceToken = 2;
-    boolean hasTraceToken();
-    String getTraceToken();
-    
-    // required bool isOpen = 3;
-    boolean hasIsOpen();
-    boolean getIsOpen();
-    
-    // required fixed64 startMilliTime = 4;
-    boolean hasStartMilliTime();
-    long getStartMilliTime();
-  }
-  public static final class RemoteTraceContext extends
-      com.google.protobuf.GeneratedMessage
-      implements RemoteTraceContextOrBuilder {
-    // Use RemoteTraceContext.newBuilder() to construct.
-    private RemoteTraceContext(Builder builder) {
-      super(builder);
-    }
-    private RemoteTraceContext(boolean noInit) {}
-    
-    private static final RemoteTraceContext defaultInstance;
-    public static RemoteTraceContext getDefaultInstance() {
-      return defaultInstance;
-    }
-    
-    public RemoteTraceContext getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-    
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_descriptor;
-    }
-    
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_fieldAccessorTable;
-    }
-    
-    private int bitField0_;
-    // required string traceName = 1;
-    public static final int TRACENAME_FIELD_NUMBER = 1;
-    private java.lang.Object traceName_;
-    public boolean hasTraceName() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    public String getTraceName() {
-      java.lang.Object ref = traceName_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          traceName_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getTraceNameBytes() {
-      java.lang.Object ref = traceName_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        traceName_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // required string traceToken = 2;
-    public static final int TRACETOKEN_FIELD_NUMBER = 2;
-    private java.lang.Object traceToken_;
-    public boolean hasTraceToken() {
-      return ((bitField0_ & 0x00000002) == 0x00000002);
-    }
-    public String getTraceToken() {
-      java.lang.Object ref = traceToken_;
-      if (ref instanceof String) {
-        return (String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = 
-            (com.google.protobuf.ByteString) ref;
-        String s = bs.toStringUtf8();
-        if (com.google.protobuf.Internal.isValidUtf8(bs)) {
-          traceToken_ = s;
-        }
-        return s;
-      }
-    }
-    private com.google.protobuf.ByteString getTraceTokenBytes() {
-      java.lang.Object ref = traceToken_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8((String) ref);
-        traceToken_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    
-    // required bool isOpen = 3;
-    public static final int ISOPEN_FIELD_NUMBER = 3;
-    private boolean isOpen_;
-    public boolean hasIsOpen() {
-      return ((bitField0_ & 0x00000004) == 0x00000004);
-    }
-    public boolean getIsOpen() {
-      return isOpen_;
-    }
-    
-    // required fixed64 startMilliTime = 4;
-    public static final int STARTMILLITIME_FIELD_NUMBER = 4;
-    private long startMilliTime_;
-    public boolean hasStartMilliTime() {
-      return ((bitField0_ & 0x00000008) == 0x00000008);
-    }
-    public long getStartMilliTime() {
-      return startMilliTime_;
-    }
-    
-    private void initFields() {
-      traceName_ = "";
-      traceToken_ = "";
-      isOpen_ = false;
-      startMilliTime_ = 0L;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
-      
-      if (!hasTraceName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasTraceToken()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasIsOpen()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      if (!hasStartMilliTime()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getTraceNameBytes());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        output.writeBytes(2, getTraceTokenBytes());
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        output.writeBool(3, isOpen_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        output.writeFixed64(4, startMilliTime_);
-      }
-      getUnknownFields().writeTo(output);
-    }
-    
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-    
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, getTraceNameBytes());
-      }
-      if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, getTraceTokenBytes());
-      }
-      if (((bitField0_ & 0x00000004) == 0x00000004)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isOpen_);
-      }
-      if (((bitField0_ & 0x00000008) == 0x00000008)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFixed64Size(4, startMilliTime_);
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-    
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-    
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(
-        byte[] data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return newBuilder().mergeFrom(data, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseDelimitedFrom(
-        java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      Builder builder = newBuilder();
-      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
-        return builder.buildParsed();
-      } else {
-        return null;
-      }
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(
-        com.google.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input).buildParsed();
-    }
-    public static akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return newBuilder().mergeFrom(input, extensionRegistry)
-               .buildParsed();
-    }
-    
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-    
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContextOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_descriptor;
-      }
-      
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.internal_static_RemoteTraceContext_fieldAccessorTable;
-      }
-      
-      // Construct using akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-      
-      private Builder(BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-      
-      public Builder clear() {
-        super.clear();
-        traceName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        traceToken_ = "";
-        bitField0_ = (bitField0_ & ~0x00000002);
-        isOpen_ = false;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        startMilliTime_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        return this;
-      }
-      
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-      
-      public com.google.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDescriptor();
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext getDefaultInstanceForType() {
-        return akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance();
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext build() {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-      
-      private akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext buildParsed()
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(
-            result).asInvalidProtocolBufferException();
-        }
-        return result;
-      }
-      
-      public akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext buildPartial() {
-        akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext result = new akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.traceName_ = traceName_;
-        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
-          to_bitField0_ |= 0x00000002;
-        }
-        result.traceToken_ = traceToken_;
-        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
-          to_bitField0_ |= 0x00000004;
-        }
-        result.isOpen_ = isOpen_;
-        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
-          to_bitField0_ |= 0x00000008;
-        }
-        result.startMilliTime_ = startMilliTime_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-      
-      public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext) {
-          return mergeFrom((akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-      
-      public Builder mergeFrom(akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext other) {
-        if (other == akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.getDefaultInstance()) return this;
-        if (other.hasTraceName()) {
-          setTraceName(other.getTraceName());
-        }
-        if (other.hasTraceToken()) {
-          setTraceToken(other.getTraceToken());
-        }
-        if (other.hasIsOpen()) {
-          setIsOpen(other.getIsOpen());
-        }
-        if (other.hasStartMilliTime()) {
-          setStartMilliTime(other.getStartMilliTime());
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-      
-      public final boolean isInitialized() {
-        if (!hasTraceName()) {
-          
-          return false;
-        }
-        if (!hasTraceToken()) {
-          
-          return false;
-        }
-        if (!hasIsOpen()) {
-          
-          return false;
-        }
-        if (!hasStartMilliTime()) {
-          
-          return false;
-        }
-        return true;
-      }
-      
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-          com.google.protobuf.UnknownFieldSet.newBuilder(
-            this.getUnknownFields());
-        while (true) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              this.setUnknownFields(unknownFields.build());
-              onChanged();
-              return this;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                this.setUnknownFields(unknownFields.build());
-                onChanged();
-                return this;
-              }
-              break;
-            }
-            case 10: {
-              bitField0_ |= 0x00000001;
-              traceName_ = input.readBytes();
-              break;
-            }
-            case 18: {
-              bitField0_ |= 0x00000002;
-              traceToken_ = input.readBytes();
-              break;
-            }
-            case 24: {
-              bitField0_ |= 0x00000004;
-              isOpen_ = input.readBool();
-              break;
-            }
-            case 33: {
-              bitField0_ |= 0x00000008;
-              startMilliTime_ = input.readFixed64();
-              break;
-            }
-          }
-        }
-      }
-      
-      private int bitField0_;
-      
-      // required string traceName = 1;
-      private java.lang.Object traceName_ = "";
-      public boolean hasTraceName() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      public String getTraceName() {
-        java.lang.Object ref = traceName_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          traceName_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setTraceName(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        traceName_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearTraceName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        traceName_ = getDefaultInstance().getTraceName();
-        onChanged();
-        return this;
-      }
-      void setTraceName(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000001;
-        traceName_ = value;
-        onChanged();
-      }
-      
-      // required string traceToken = 2;
-      private java.lang.Object traceToken_ = "";
-      public boolean hasTraceToken() {
-        return ((bitField0_ & 0x00000002) == 0x00000002);
-      }
-      public String getTraceToken() {
-        java.lang.Object ref = traceToken_;
-        if (!(ref instanceof String)) {
-          String s = ((com.google.protobuf.ByteString) ref).toStringUtf8();
-          traceToken_ = s;
-          return s;
-        } else {
-          return (String) ref;
-        }
-      }
-      public Builder setTraceToken(String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000002;
-        traceToken_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearTraceToken() {
-        bitField0_ = (bitField0_ & ~0x00000002);
-        traceToken_ = getDefaultInstance().getTraceToken();
-        onChanged();
-        return this;
-      }
-      void setTraceToken(com.google.protobuf.ByteString value) {
-        bitField0_ |= 0x00000002;
-        traceToken_ = value;
-        onChanged();
-      }
-      
-      // required bool isOpen = 3;
-      private boolean isOpen_ ;
-      public boolean hasIsOpen() {
-        return ((bitField0_ & 0x00000004) == 0x00000004);
-      }
-      public boolean getIsOpen() {
-        return isOpen_;
-      }
-      public Builder setIsOpen(boolean value) {
-        bitField0_ |= 0x00000004;
-        isOpen_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearIsOpen() {
-        bitField0_ = (bitField0_ & ~0x00000004);
-        isOpen_ = false;
-        onChanged();
-        return this;
-      }
-      
-      // required fixed64 startMilliTime = 4;
-      private long startMilliTime_ ;
-      public boolean hasStartMilliTime() {
-        return ((bitField0_ & 0x00000008) == 0x00000008);
-      }
-      public long getStartMilliTime() {
-        return startMilliTime_;
-      }
-      public Builder setStartMilliTime(long value) {
-        bitField0_ |= 0x00000008;
-        startMilliTime_ = value;
-        onChanged();
-        return this;
-      }
-      public Builder clearStartMilliTime() {
-        bitField0_ = (bitField0_ & ~0x00000008);
-        startMilliTime_ = 0L;
-        onChanged();
-        return this;
-      }
-      
-      // @@protoc_insertion_point(builder_scope:RemoteTraceContext)
-    }
-    
-    static {
-      defaultInstance = new RemoteTraceContext(true);
-      defaultInstance.initFields();
-    }
-    
-    // @@protoc_insertion_point(class_scope:RemoteTraceContext)
-  }
-  
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_TraceContextAwareRemoteEnvelope_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
-    internal_static_RemoteTraceContext_descriptor;
-  private static
-    com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_RemoteTraceContext_fieldAccessorTable;
-  
-  public static com.google.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static com.google.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\"TraceContextAwareWireFormats.proto\032\021Wi" +
-      "reFormats.proto\"\201\001\n(AckAndTraceContextAw" +
-      "areEnvelopeContainer\022!\n\003ack\030\001 \001(\0132\024.Ackn" +
-      "owledgementInfo\0222\n\010envelope\030\002 \001(\0132 .Trac" +
-      "eContextAwareRemoteEnvelope\"\277\001\n\037TraceCon" +
-      "textAwareRemoteEnvelope\022 \n\trecipient\030\001 \002" +
-      "(\0132\r.ActorRefData\022#\n\007message\030\002 \002(\0132\022.Ser" +
-      "ializedMessage\022\035\n\006sender\030\004 \001(\0132\r.ActorRe" +
-      "fData\022\013\n\003seq\030\005 \001(\006\022)\n\014traceContext\030\017 \001(\013" +
-      "2\023.RemoteTraceContext\"c\n\022RemoteTraceCont",
-      "ext\022\021\n\ttraceName\030\001 \002(\t\022\022\n\ntraceToken\030\002 \002" +
-      "(\t\022\016\n\006isOpen\030\003 \002(\010\022\026\n\016startMilliTime\030\004 \002" +
-      "(\006B\037\n\033akka.remote.instrumentationH\001"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_AckAndTraceContextAwareEnvelopeContainer_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_AckAndTraceContextAwareEnvelopeContainer_descriptor,
-              new java.lang.String[] { "Ack", "Envelope", },
-              akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.class,
-              akka.remote.instrumentation.TraceContextAwareWireFormats.AckAndTraceContextAwareEnvelopeContainer.Builder.class);
-          internal_static_TraceContextAwareRemoteEnvelope_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_TraceContextAwareRemoteEnvelope_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_TraceContextAwareRemoteEnvelope_descriptor,
-              new java.lang.String[] { "Recipient", "Message", "Sender", "Seq", "TraceContext", },
-              akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.class,
-              akka.remote.instrumentation.TraceContextAwareWireFormats.TraceContextAwareRemoteEnvelope.Builder.class);
-          internal_static_RemoteTraceContext_descriptor =
-            getDescriptor().getMessageTypes().get(2);
-          internal_static_RemoteTraceContext_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_RemoteTraceContext_descriptor,
-              new java.lang.String[] { "TraceName", "TraceToken", "IsOpen", "StartMilliTime", },
-              akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.class,
-              akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext.Builder.class);
-          return null;
-        }
-      };
-    com.google.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new com.google.protobuf.Descriptors.FileDescriptor[] {
-          akka.remote.WireFormats.getDescriptor(),
-        }, assigner);
-  }
-  
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml
index a272320f..3a029ace 100644
--- a/kamon-core/src/main/resources/META-INF/aop.xml
+++ b/kamon-core/src/main/resources/META-INF/aop.xml
@@ -14,9 +14,6 @@
     <aspect name="akka.instrumentation.ActorCellInstrumentation"/>
     <aspect name="akka.instrumentation.ActorLoggingInstrumentation"/>
 
-    <!-- Remoting and Cluster -->
-    <aspect name="akka.remote.instrumentation.RemotingInstrumentation"/>
-
     <!-- Dispatchers -->
     <aspect name="akka.instrumentation.DispatcherInstrumentation"/>
     <aspect name="akka.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/>
@@ -29,7 +26,7 @@
     <aspect name="akka.instrumentation.AskPatternInstrumentation"/>
   </aspects>
 
-  <weaver options="-XmessageHandlerClass:kamon.weaver.logging.KamonWeaverMessageHandler">
+  <weaver>
     <include within="scala.concurrent..*"/>
     <include within="scalaz.concurrent..*"/>
     <include within="akka..*"/>
@@ -38,6 +35,8 @@
 
     <!-- For some weird reason ByteString produces a java.lang.VerifyError after going through the weaver. -->
     <exclude within="akka.util.ByteString"/>
+    <!-- Exclude CallingThreadDispatcher, is only for test purposes -->
+    <exclude within="akka.testkit.CallingThreadDispatcher"/>
   </weaver>
 
 </aspectj>
\ No newline at end of file
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
index ace05e87..12e21bd7 100644
--- a/kamon-core/src/main/resources/reference.conf
+++ b/kamon-core/src/main/resources/reference.conf
@@ -132,18 +132,4 @@ kamon {
     # the future was created.
     ask-pattern-tracing = off
   }
-
-  weaver {
-
-    # AspectJ options supported by LTW
-    # showWeaveInfo: show informational messages whenever the weaver touches a class file.
-    # verbose: show informational messages about the weaving process.
-    # debug: show a messages for each class passed to the weaver indicating whether it was woven, excluded or ignored.
-    # showWarn: show warning messages about the weaving process.
-
-    showWeaveInfo = off
-    verbose = off
-    debug = off
-    showWarn = off
-  }
 }
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala b/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala
index c0994f2c..b7050c59 100644
--- a/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala
+++ b/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala
@@ -1,18 +1,19 @@
-/* ===================================================
- * Copyright © 2013 the kamon project <http://kamon.io/>
+/*
+ * =========================================================================================
+ * Copyright © 2013-2014 the kamon project <http://kamon.io/>
  *
- * 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
+ * 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
+ *   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.
- * ========================================================== */
+ * 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 kamon
 
 import akka.actor.{ Extension, ActorSystem, ExtensionId }
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index 24bbb5f0..dfebd3a5 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -1,30 +1,23 @@
-/* ===================================================
- * Copyright © 2013 the kamon project <http://kamon.io/>
+/* =========================================================================================
+ * Copyright © 2013-2014 the kamon project <http://kamon.io/>
  *
- * 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
+ * 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
+ *   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.
- * ========================================================== */
+ * 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 kamon
 
 import akka.actor._
-import akka.event.Logging.Error
 
 object Kamon {
-  trait Extension extends akka.actor.Extension {
-    def publishErrorMessage(system: ActorSystem, msg: String, cause: Throwable): Unit = {
-      system.eventStream.publish(new Error(cause, "", classOf[Extension], msg))
-    }
-  }
-
+  trait Extension extends akka.actor.Extension
   def apply[T <: Extension](key: ExtensionId[T])(implicit system: ActorSystem): T = key(system)
 }
 
diff --git a/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala b/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala
index 3773e7d8..dfa4bcb8 100644
--- a/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala
@@ -82,11 +82,16 @@ object HttpServerMetrics extends MetricGroupIdentity {
     }
   }
 
-  val Factory = new MetricGroupFactory {
-    type GroupRecorder = HttpServerMetricsRecorder
+  val Factory = HttpServerMetricGroupFactory
+}
 
-    def create(config: Config, system: ActorSystem): HttpServerMetricsRecorder =
-      new HttpServerMetricsRecorder()
-  }
+case object HttpServerMetricGroupFactory extends MetricGroupFactory {
+
+  import HttpServerMetrics._
+
+  type GroupRecorder = HttpServerMetricsRecorder
+
+  def create(config: Config, system: ActorSystem): HttpServerMetricsRecorder =
+    new HttpServerMetricsRecorder()
 
 }
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
index bc22032e..90928ba0 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
@@ -59,7 +59,7 @@ class ActorCellInstrumentation {
   def aroundBehaviourInvoke(pjp: ProceedingJoinPoint, cell: ActorCell, envelope: Envelope): Any = {
     val cellWithMetrics = cell.asInstanceOf[ActorCellMetrics]
     val timestampBeforeProcessing = System.nanoTime()
-    val contextAndTimestamp = envelope.asInstanceOf[TraceContextAware]
+    val contextAndTimestamp = envelope.asInstanceOf[TimestampedTraceContextAware]
 
     try {
       TraceRecorder.withInlineTraceContextReplacement(contextAndTimestamp.traceContext) {
@@ -154,13 +154,13 @@ class ActorCellMetricsIntoActorCellMixin {
 class TraceContextIntoEnvelopeMixin {
 
   @DeclareMixin("akka.dispatch.Envelope")
-  def mixinTraceContextAwareToEnvelope: TraceContextAware = TraceContextAware.default
+  def mixinTraceContextAwareToEnvelope: TimestampedTraceContextAware = TimestampedTraceContextAware.default
 
   @Pointcut("execution(akka.dispatch.Envelope.new(..)) && this(ctx)")
-  def envelopeCreation(ctx: TraceContextAware): Unit = {}
+  def envelopeCreation(ctx: TimestampedTraceContextAware): Unit = {}
 
   @After("envelopeCreation(ctx)")
-  def afterEnvelopeCreation(ctx: TraceContextAware): Unit = {
+  def afterEnvelopeCreation(ctx: TimestampedTraceContextAware): Unit = {
     // Necessary to force the initialization of ContextAware at the moment of creation.
     ctx.traceContext
   }
@@ -168,9 +168,9 @@ class TraceContextIntoEnvelopeMixin {
 
 object ActorCellInstrumentation {
   implicit class PimpedActorCellMetrics(cell: ActorCellMetrics) {
-    def onRoutedActorCell(block: ActorCellMetrics ⇒ Unit): Unit = {
-      if (cell.isInstanceOf[RoutedActorCell])
-        block(cell)
+    def onRoutedActorCell(block: ActorCellMetrics ⇒ Unit) = cell match {
+      case routedActorCell: RoutedActorCell ⇒ block(cell)
+      case everythingElse                   ⇒
     }
   }
 }
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala
index db366e8c..8b3af3d6 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala
@@ -105,7 +105,7 @@ class DispatcherInstrumentation {
 @Aspect
 class DispatcherMetricCollectionInfoIntoDispatcherMixin {
 
-  @DeclareMixin("akka.dispatch.Dispatcher")
+  @DeclareMixin("akka.dispatch.MessageDispatcher")
   def mixinDispatcherMetricsToMessageDispatcher: DispatcherMetricCollectionInfo = new DispatcherMetricCollectionInfo {}
 
   @DeclareMixin("akka.dispatch.Dispatchers")
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala
deleted file mode 100644
index 341b0ee7..00000000
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala
+++ /dev/null
@@ -1,91 +0,0 @@
-package akka.remote.instrumentation
-
-import akka.actor.{ ActorRef, Address }
-import akka.dispatch.sysmsg.SystemMessage
-import akka.remote.instrumentation.TraceContextAwareWireFormats.{ TraceContextAwareRemoteEnvelope, RemoteTraceContext, AckAndTraceContextAwareEnvelopeContainer }
-import akka.remote.transport.AkkaPduCodec.Message
-import akka.remote.{ RemoteActorRefProvider, Ack, SeqNo }
-import akka.remote.WireFormats._
-import akka.util.ByteString
-import kamon.trace.{ TraceContextAware, TraceRecorder }
-import org.aspectj.lang.ProceedingJoinPoint
-import org.aspectj.lang.annotation._
-
-@Aspect
-class RemotingInstrumentation {
-
-  @Pointcut("execution(* akka.remote.transport.AkkaPduProtobufCodec$.constructMessage(..)) && args(localAddress, recipient, serializedMessage, senderOption, seqOption, ackOption)")
-  def constructAkkaPduMessage(localAddress: Address, recipient: ActorRef, serializedMessage: SerializedMessage,
-    senderOption: Option[ActorRef], seqOption: Option[SeqNo], ackOption: Option[Ack]): Unit = {}
-
-  @Around("constructAkkaPduMessage(localAddress, recipient, serializedMessage, senderOption, seqOption, ackOption)")
-  def aroundSerializeRemoteMessage(pjp: ProceedingJoinPoint, localAddress: Address, recipient: ActorRef,
-    serializedMessage: SerializedMessage, senderOption: Option[ActorRef], seqOption: Option[SeqNo], ackOption: Option[Ack]): AnyRef = {
-
-    val ackAndEnvelopeBuilder = AckAndTraceContextAwareEnvelopeContainer.newBuilder
-    val envelopeBuilder = TraceContextAwareRemoteEnvelope.newBuilder
-
-    envelopeBuilder.setRecipient(serializeActorRef(recipient.path.address, recipient))
-    senderOption foreach { ref ⇒ envelopeBuilder.setSender(serializeActorRef(localAddress, ref)) }
-    seqOption foreach { seq ⇒ envelopeBuilder.setSeq(seq.rawValue) }
-    ackOption foreach { ack ⇒ ackAndEnvelopeBuilder.setAck(ackBuilder(ack)) }
-    envelopeBuilder.setMessage(serializedMessage)
-
-    // Attach the TraceContext info, if available.
-    TraceRecorder.currentContext.foreach { context ⇒
-      envelopeBuilder.setTraceContext(RemoteTraceContext.newBuilder()
-        .setTraceName(context.name)
-        .setTraceToken(context.token)
-        .setIsOpen(context.isOpen)
-        .setStartMilliTime(context.startMilliTime)
-        .build())
-    }
-
-    ackAndEnvelopeBuilder.setEnvelope(envelopeBuilder)
-    ByteString.ByteString1C(ackAndEnvelopeBuilder.build.toByteArray) //Reuse Byte Array (naughty!)
-  }
-
-  // Copied from akka.remote.transport.AkkaPduProtobufCodec because of private access.
-  private def ackBuilder(ack: Ack): AcknowledgementInfo.Builder = {
-    val ackBuilder = AcknowledgementInfo.newBuilder()
-    ackBuilder.setCumulativeAck(ack.cumulativeAck.rawValue)
-    ack.nacks foreach { nack ⇒ ackBuilder.addNacks(nack.rawValue) }
-    ackBuilder
-  }
-
-  // Copied from akka.remote.transport.AkkaPduProtobufCodec because of private access.
-  private def serializeActorRef(defaultAddress: Address, ref: ActorRef): ActorRefData = {
-    ActorRefData.newBuilder.setPath(
-      if (ref.path.address.host.isDefined) ref.path.toSerializationFormat else ref.path.toSerializationFormatWithAddress(defaultAddress)).build()
-  }
-
-  // Copied from akka.remote.transport.AkkaPduProtobufCodec because of private access.
-  private def serializeAddress(address: Address): AddressData = address match {
-    case Address(protocol, system, Some(host), Some(port)) ⇒
-      AddressData.newBuilder
-        .setHostname(host)
-        .setPort(port)
-        .setSystem(system)
-        .setProtocol(protocol)
-        .build()
-    case _ ⇒ throw new IllegalArgumentException(s"Address [${address}] could not be serialized: host or port missing.")
-  }
-
-  @Pointcut("execution(* akka.remote.transport.AkkaPduProtobufCodec$.decodeMessage(..)) && args(bs, provider, localAddress)") // && args(raw, provider, localAddress)")
-  def decodeRemoteMessage(bs: ByteString, provider: RemoteActorRefProvider, localAddress: Address): Unit = {} //(raw: ByteString, provider: RemoteActorRefProvider, localAddress: Address): Unit = {}
-
-  @Around("decodeRemoteMessage(bs, provider, localAddress)")
-  def aroundDecodeRemoteMessage(pjp: ProceedingJoinPoint, bs: ByteString, provider: RemoteActorRefProvider, localAddress: Address): AnyRef = {
-    val ackAndEnvelope = AckAndTraceContextAwareEnvelopeContainer.parseFrom(bs.toArray)
-
-    if (ackAndEnvelope.hasEnvelope && ackAndEnvelope.getEnvelope.hasTraceContext) {
-      val traceContext = ackAndEnvelope.getEnvelope.getTraceContext
-      val system = provider.guardian.underlying.system
-      val tc = TraceRecorder.joinRemoteTraceContext(traceContext, system)
-
-      TraceRecorder.setContext(Some(tc))
-    }
-
-    pjp.proceed()
-  }
-}
diff --git a/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala b/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala
index bb412f79..d2cb4e38 100644
--- a/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala
@@ -69,21 +69,25 @@ object ActorMetrics extends MetricGroupCategory {
       (Errors -> errors))
   }
 
-  val Factory = new MetricGroupFactory {
-    type GroupRecorder = ActorMetricsRecorder
+  val Factory = ActorMetricGroupFactory
+}
 
-    def create(config: Config, system: ActorSystem): ActorMetricsRecorder = {
-      val settings = config.getConfig("precision.actor")
+case object ActorMetricGroupFactory extends MetricGroupFactory {
+  import ActorMetrics._
 
-      val processingTimeConfig = settings.getConfig("processing-time")
-      val timeInMailboxConfig = settings.getConfig("time-in-mailbox")
-      val mailboxSizeConfig = settings.getConfig("mailbox-size")
+  type GroupRecorder = ActorMetricsRecorder
 
-      new ActorMetricsRecorder(
-        Histogram.fromConfig(processingTimeConfig),
-        Histogram.fromConfig(timeInMailboxConfig),
-        MinMaxCounter.fromConfig(mailboxSizeConfig, system),
-        Counter())
-    }
+  def create(config: Config, system: ActorSystem): ActorMetricsRecorder = {
+    val settings = config.getConfig("precision.actor")
+
+    val processingTimeConfig = settings.getConfig("processing-time")
+    val timeInMailboxConfig = settings.getConfig("time-in-mailbox")
+    val mailboxSizeConfig = settings.getConfig("mailbox-size")
+
+    new ActorMetricsRecorder(
+      Histogram.fromConfig(processingTimeConfig),
+      Histogram.fromConfig(timeInMailboxConfig),
+      MinMaxCounter.fromConfig(mailboxSizeConfig, system),
+      Counter())
   }
 }
diff --git a/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala b/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala
index fbce783c..126f6333 100644
--- a/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala
@@ -66,23 +66,28 @@ object DispatcherMetrics extends MetricGroupCategory {
       (PoolSize -> poolSize))
   }
 
-  val Factory = new MetricGroupFactory {
-    type GroupRecorder = DispatcherMetricRecorder
-
-    def create(config: Config, system: ActorSystem): DispatcherMetricRecorder = {
-      val settings = config.getConfig("precision.dispatcher")
-
-      val maximumPoolSizeConfig = settings.getConfig("maximum-pool-size")
-      val runningThreadCountConfig = settings.getConfig("running-thread-count")
-      val queueTaskCountConfig = settings.getConfig("queued-task-count")
-      val poolSizeConfig = settings.getConfig("pool-size")
-
-      new DispatcherMetricRecorder(
-        Histogram.fromConfig(maximumPoolSizeConfig),
-        Histogram.fromConfig(runningThreadCountConfig),
-        Histogram.fromConfig(queueTaskCountConfig),
-        Histogram.fromConfig(poolSizeConfig))
-    }
-  }
+  val Factory = DispatcherMetricGroupFactory
 }
 
+case object DispatcherMetricGroupFactory extends MetricGroupFactory {
+
+  import DispatcherMetrics._
+
+  type GroupRecorder = DispatcherMetricRecorder
+
+  def create(config: Config, system: ActorSystem): DispatcherMetricRecorder = {
+    val settings = config.getConfig("precision.dispatcher")
+
+    val maximumPoolSizeConfig = settings.getConfig("maximum-pool-size")
+    val runningThreadCountConfig = settings.getConfig("running-thread-count")
+    val queueTaskCountConfig = settings.getConfig("queued-task-count")
+    val poolSizeConfig = settings.getConfig("pool-size")
+
+    new DispatcherMetricRecorder(
+      Histogram.fromConfig(maximumPoolSizeConfig),
+      Histogram.fromConfig(runningThreadCountConfig),
+      Histogram.fromConfig(queueTaskCountConfig),
+      Histogram.fromConfig(poolSizeConfig))
+  }
+
+}
diff --git a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala
index 9660b6ff..ddfef416 100644
--- a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala
@@ -58,19 +58,25 @@ object RouterMetrics extends MetricGroupCategory {
       Errors -> errors)
   }
 
-  val Factory = new MetricGroupFactory {
-    type GroupRecorder = RouterMetricsRecorder
+  val Factory = RouterMetricGroupFactory
+}
 
-    def create(config: Config, system: ActorSystem): RouterMetricsRecorder = {
-      val settings = config.getConfig("precision.router")
+case object RouterMetricGroupFactory extends MetricGroupFactory {
 
-      val processingTimeConfig = settings.getConfig("processing-time")
-      val timeInMailboxConfig = settings.getConfig("time-in-mailbox")
+  import RouterMetrics._
 
-      new RouterMetricsRecorder(
-        Histogram.fromConfig(processingTimeConfig),
-        Histogram.fromConfig(timeInMailboxConfig),
-        Counter())
-    }
+  type GroupRecorder = RouterMetricsRecorder
+
+  def create(config: Config, system: ActorSystem): RouterMetricsRecorder = {
+    val settings = config.getConfig("precision.router")
+
+    val processingTimeConfig = settings.getConfig("processing-time")
+    val timeInMailboxConfig = settings.getConfig("time-in-mailbox")
+
+    new RouterMetricsRecorder(
+      Histogram.fromConfig(processingTimeConfig),
+      Histogram.fromConfig(timeInMailboxConfig),
+      Counter())
   }
 }
+
diff --git a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala
index c506fe81..7246ccb5 100644
--- a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala
@@ -30,12 +30,11 @@ object TraceMetrics extends MetricGroupCategory {
   val name = "trace"
 
   case object ElapsedTime extends MetricIdentity { val name = "elapsed-time" }
-  case class HttpClientRequest(name: String) extends MetricIdentity
 
   case class TraceMetricRecorder(elapsedTime: Histogram, private val segmentRecorderFactory: () ⇒ Histogram)
       extends MetricGroupRecorder {
 
-    private val segments = TrieMap[MetricIdentity, Histogram]()
+    val segments = TrieMap[MetricIdentity, Histogram]()
 
     def segmentRecorder(segmentIdentity: MetricIdentity): Histogram =
       segments.getOrElseUpdate(segmentIdentity, segmentRecorderFactory.apply())
@@ -59,19 +58,24 @@ object TraceMetrics extends MetricGroupCategory {
     def metrics: Map[MetricIdentity, MetricSnapshot] = segments + (ElapsedTime -> elapsedTime)
   }
 
-  val Factory = new MetricGroupFactory {
-    type GroupRecorder = TraceMetricRecorder
+  val Factory = TraceMetricGroupFactory
 
-    def create(config: Config, system: ActorSystem): TraceMetricRecorder = {
+}
 
-      val settings = config.getConfig("precision.trace")
-      val elapsedTimeConfig = settings.getConfig("elapsed-time")
-      val segmentConfig = settings.getConfig("segment")
+case object TraceMetricGroupFactory extends MetricGroupFactory {
 
-      new TraceMetricRecorder(
-        Histogram.fromConfig(elapsedTimeConfig, Scale.Nano),
-        () ⇒ Histogram.fromConfig(segmentConfig, Scale.Nano))
-    }
-  }
+  import TraceMetrics._
 
-}
+  type GroupRecorder = TraceMetricRecorder
+
+  def create(config: Config, system: ActorSystem): TraceMetricRecorder = {
+
+    val settings = config.getConfig("precision.trace")
+    val elapsedTimeConfig = settings.getConfig("elapsed-time")
+    val segmentConfig = settings.getConfig("segment")
+
+    new TraceMetricRecorder(
+      Histogram.fromConfig(elapsedTimeConfig, Scale.Nano),
+      () ⇒ Histogram.fromConfig(segmentConfig, Scale.Nano))
+  }
+}
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala
index 67db5d93..bed75fc8 100644
--- a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala
+++ b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala
@@ -75,6 +75,8 @@ object Histogram {
     def numberOfMeasurements: Long
     def min: Long
     def max: Long
+    def sum: Long
+    def percentile(percentile: Double): Long
     def recordsIterator: Iterator[Record]
     def merge(that: Histogram.Snapshot, context: CollectionContext): Histogram.Snapshot
   }
@@ -83,6 +85,8 @@ object Histogram {
     def empty(targetScale: Scale) = new Snapshot {
       override def min: Long = 0L
       override def max: Long = 0L
+      override def sum: Long = 0L
+      override def percentile(percentile: Double): Long = 0L
       override def recordsIterator: Iterator[Record] = Iterator.empty
       override def merge(that: Snapshot, context: CollectionContext): Snapshot = that
       override def scale: Scale = targetScale
@@ -156,11 +160,27 @@ class HdrHistogram(lowestTrackableValue: Long, highestTrackableValue: Long, sign
 
 }
 
-class CompactHdrSnapshot(val scale: Scale, val numberOfMeasurements: Long, compactRecords: Array[Long], unitMagnitude: Int,
+case class CompactHdrSnapshot(val scale: Scale, val numberOfMeasurements: Long, compactRecords: Array[Long], unitMagnitude: Int,
     subBucketHalfCount: Int, subBucketHalfCountMagnitude: Int) extends Histogram.Snapshot {
 
   def min: Long = if (compactRecords.length == 0) 0 else levelFromCompactRecord(compactRecords(0))
   def max: Long = if (compactRecords.length == 0) 0 else levelFromCompactRecord(compactRecords(compactRecords.length - 1))
+  def sum: Long = recordsIterator.foldLeft(0L)((a, r) ⇒ a + (r.count * r.level))
+
+  def percentile(p: Double): Long = {
+    val records = recordsIterator
+    val threshold = numberOfMeasurements * (p / 100D)
+    var countToCurrentLevel = 0L
+    var percentileLevel = 0L
+
+    while (countToCurrentLevel < threshold && records.hasNext) {
+      val record = records.next()
+      countToCurrentLevel += record.count
+      percentileLevel = record.level
+    }
+
+    percentileLevel
+  }
 
   def merge(that: Histogram.Snapshot, context: CollectionContext): Histogram.Snapshot = {
     if (that.isEmpty) this else if (this.isEmpty) that else {
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
index 6ea30511..c4c28a68 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala
@@ -23,38 +23,130 @@ import kamon.Kamon
 import kamon.metric._
 import java.util.concurrent.ConcurrentLinkedQueue
 import kamon.trace.TraceContextAware.DefaultTraceContextAware
-import kamon.trace.TraceContext.SegmentIdentity
 import kamon.metric.TraceMetrics.TraceMetricRecorder
 
-trait TraceContext {
+import scala.annotation.tailrec
+
+sealed trait TraceContext {
   def name: String
   def token: String
-  def system: ActorSystem
   def rename(name: String): Unit
-  def levelOfDetail: TracingLevelOfDetail
-  def startSegment(identity: SegmentIdentity, metadata: Map[String, String]): SegmentCompletionHandle
-  def finish(metadata: Map[String, String])
+  def finish(): Unit
   def origin: TraceContextOrigin
-  def startMilliTime: Long
   def isOpen: Boolean
+  def isEmpty: Boolean
+  def nonEmpty: Boolean = !isEmpty
+  def startSegment(segmentName: String, label: String): Segment
+  def nanoTimestamp: Long
+}
 
-  private[kamon] val traceLocalStorage: TraceLocalStorage = new TraceLocalStorage
+sealed trait Segment {
+  def name: String
+  def rename(newName: String): Unit
+  def label: String
+  def finish(): Unit
+  def isEmpty: Boolean
 }
 
-object TraceContext {
-  type SegmentIdentity = MetricIdentity
+case object EmptyTraceContext extends TraceContext {
+  def name: String = "empty-trace"
+  def token: String = ""
+  def rename(name: String): Unit = {}
+  def finish(): Unit = {}
+  def origin: TraceContextOrigin = TraceContextOrigin.Local
+  def isOpen: Boolean = false
+  def isEmpty: Boolean = true
+  def startSegment(segmentName: String, label: String): Segment = EmptySegment
+  def nanoTimestamp: Long = 0L
+
+  case object EmptySegment extends Segment {
+    val name: String = "empty-segment"
+    val label: String = "empty-label"
+    def isEmpty: Boolean = true
+    def rename(newName: String): Unit = {}
+    def finish: Unit = {}
+  }
 }
 
-trait SegmentCompletionHandle {
-  def finish(metadata: Map[String, String] = Map.empty)
+class DefaultTraceContext(traceName: String, val token: String, izOpen: Boolean, val levelOfDetail: LevelOfDetail,
+    val origin: TraceContextOrigin, nanoTimeztamp: Long, val system: ActorSystem) extends TraceContext {
+
+  val isEmpty: Boolean = false
+  @volatile private var _name = traceName
+  @volatile private var _isOpen = izOpen
+
+  private val _nanoTimestamp = nanoTimeztamp
+  private val finishedSegments = new ConcurrentLinkedQueue[SegmentData]()
+  private val metricsExtension = Kamon(Metrics)(system)
+  private[kamon] val traceLocalStorage: TraceLocalStorage = new TraceLocalStorage
+
+  def name: String = _name
+  def rename(newName: String): Unit =
+    if (isOpen) _name = newName // TODO: log a warning about renaming a closed trace.
+
+  def isOpen: Boolean = _isOpen
+  def nanoTimestamp: Long = _nanoTimestamp
+
+  def finish(): Unit = {
+    _isOpen = false
+    val elapsedNanoTime = System.nanoTime() - _nanoTimestamp
+    val metricRecorder = metricsExtension.register(TraceMetrics(name), TraceMetrics.Factory)
+
+    metricRecorder.map { traceMetrics ⇒
+      traceMetrics.elapsedTime.record(elapsedNanoTime)
+      drainFinishedSegments(traceMetrics)
+    }
+  }
+
+  def startSegment(segmentName: String, segmentLabel: String): Segment = new DefaultSegment(segmentName, segmentLabel)
+
+  @tailrec private def drainFinishedSegments(metricRecorder: TraceMetricRecorder): Unit = {
+    val segment = finishedSegments.poll()
+    if (segment != null) {
+      metricRecorder.segmentRecorder(segment.identity).record(segment.duration)
+      drainFinishedSegments(metricRecorder)
+    }
+  }
+
+  private def finishSegment(segmentName: String, label: String, duration: Long): Unit = {
+    finishedSegments.add(SegmentData(SegmentMetricIdentity(segmentName, label), duration))
+
+    if (!_isOpen) {
+      metricsExtension.register(TraceMetrics(name), TraceMetrics.Factory).map { traceMetrics ⇒
+        drainFinishedSegments(traceMetrics)
+      }
+    }
+  }
+
+  class DefaultSegment(segmentName: String, val label: String) extends Segment {
+    private val _segmentStartNanoTime = System.nanoTime()
+    @volatile private var _segmentName = segmentName
+    @volatile private var _isOpen = true
+
+    def name: String = _segmentName
+    def rename(newName: String): Unit = _segmentName = newName
+    def isEmpty: Boolean = false
+
+    def finish: Unit = {
+      val segmentFinishNanoTime = System.nanoTime()
+      finishSegment(name, label, (segmentFinishNanoTime - _segmentStartNanoTime))
+    }
+  }
 }
 
-case class SegmentData(identity: MetricIdentity, duration: Long, metadata: Map[String, String])
+case class SegmentMetricIdentity(name: String, label: String) extends MetricIdentity
+case class SegmentData(identity: SegmentMetricIdentity, duration: Long)
 
-sealed trait TracingLevelOfDetail
-case object OnlyMetrics extends TracingLevelOfDetail
-case object SimpleTrace extends TracingLevelOfDetail
-case object FullTrace extends TracingLevelOfDetail
+object SegmentMetricIdentityLabel {
+  val HttpClient = "http-client"
+}
+
+sealed trait LevelOfDetail
+object LevelOfDetail {
+  case object OnlyMetrics extends LevelOfDetail
+  case object SimpleTrace extends LevelOfDetail
+  case object FullTrace extends LevelOfDetail
+}
 
 sealed trait TraceContextOrigin
 object TraceContextOrigin {
@@ -63,15 +155,13 @@ object TraceContextOrigin {
 }
 
 trait TraceContextAware extends Serializable {
-  def captureNanoTime: Long
-  def traceContext: Option[TraceContext]
+  def traceContext: TraceContext
 }
 
 object TraceContextAware {
   def default: TraceContextAware = new DefaultTraceContextAware
 
   class DefaultTraceContextAware extends TraceContextAware {
-    @transient val captureNanoTime = System.nanoTime()
     @transient val traceContext = TraceRecorder.currentContext
 
     //
@@ -88,81 +178,21 @@ object TraceContextAware {
   }
 }
 
-trait SegmentCompletionHandleAware extends TraceContextAware {
-  @volatile var segmentCompletionHandle: Option[SegmentCompletionHandle] = None
-}
-
-object SegmentCompletionHandleAware {
-  def default: SegmentCompletionHandleAware = new DefaultSegmentCompletionHandleAware
-
-  class DefaultSegmentCompletionHandleAware extends DefaultTraceContextAware with SegmentCompletionHandleAware {}
+trait TimestampedTraceContextAware extends TraceContextAware {
+  def captureNanoTime: Long
 }
 
-class SimpleMetricCollectionContext(traceName: String, val token: String, metadata: Map[String, String],
-    val origin: TraceContextOrigin, val system: ActorSystem, val startMilliTime: Long = System.currentTimeMillis,
-    izOpen: Boolean = true) extends TraceContext {
-
-  @volatile private var _name = traceName
-  @volatile private var _isOpen = izOpen
-
-  val levelOfDetail = OnlyMetrics
-  val startNanoTime = System.nanoTime()
-  val finishedSegments = new ConcurrentLinkedQueue[SegmentData]()
-  val metricsExtension = Kamon(Metrics)(system)
-
-  def name: String = _name
-
-  def rename(newName: String): Unit = _name = newName
-
-  def isOpen(): Boolean = _isOpen
-
-  def finish(metadata: Map[String, String]): Unit = {
-    _isOpen = false
-
-    val elapsedNanoTime =
-      if (origin == TraceContextOrigin.Local)
-        // Everything is local, nanoTime is still the best resolution we can use.
-        System.nanoTime() - startNanoTime
-      else
-        // For a remote TraceContext we can only rely on the startMilliTime and we need to scale it to nanoseconds
-        // to be consistent with unit used for all latency measurements.
-        (System.currentTimeMillis() - startMilliTime) * 1000000L
-
-    val metricRecorder = metricsExtension.register(TraceMetrics(name), TraceMetrics.Factory)
-
-    metricRecorder.map { traceMetrics ⇒
-      traceMetrics.elapsedTime.record(elapsedNanoTime)
-      drainFinishedSegments(traceMetrics)
-    }
-  }
-
-  private def drainFinishedSegments(metricRecorder: TraceMetricRecorder): Unit = {
-    while (!finishedSegments.isEmpty) {
-      val segmentData = finishedSegments.poll()
-      metricRecorder.segmentRecorder(segmentData.identity).record(segmentData.duration)
-    }
-  }
-
-  private def finishSegment(identity: MetricIdentity, duration: Long, metadata: Map[String, String]): Unit = {
-    finishedSegments.add(SegmentData(identity, duration, metadata))
-
-    if (!_isOpen) {
-      metricsExtension.register(TraceMetrics(name), TraceMetrics.Factory).map { traceMetrics ⇒
-        drainFinishedSegments(traceMetrics)
-      }
-    }
+object TimestampedTraceContextAware {
+  def default: TimestampedTraceContextAware = new DefaultTraceContextAware with TimestampedTraceContextAware {
+    @transient val captureNanoTime = System.nanoTime()
   }
+}
 
-  def startSegment(identity: SegmentIdentity, metadata: Map[String, String]): SegmentCompletionHandle =
-    new SimpleMetricCollectionCompletionHandle(identity, metadata)
-
-  class SimpleMetricCollectionCompletionHandle(identity: MetricIdentity, startMetadata: Map[String, String]) extends SegmentCompletionHandle {
-    val segmentStartNanoTime = System.nanoTime()
-
-    def finish(metadata: Map[String, String] = Map.empty): Unit = {
-      val segmentFinishNanoTime = System.nanoTime()
-      finishSegment(identity, (segmentFinishNanoTime - segmentStartNanoTime), startMetadata ++ metadata)
-    }
-  }
+trait SegmentAware {
+  @volatile var segment: Segment = EmptyTraceContext.EmptySegment
 }
 
+object SegmentAware {
+  def default: SegmentAware = new DefaultSegmentAware
+  class DefaultSegmentAware extends DefaultTraceContextAware with SegmentAware {}
+}
\ No newline at end of file
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceLocal.scala b/kamon-core/src/main/scala/kamon/trace/TraceLocal.scala
index 3ff074b6..0766af74 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceLocal.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceLocal.scala
@@ -24,18 +24,20 @@ object TraceLocal {
     type ValueType
   }
 
-  def store(key: TraceLocalKey)(value: key.ValueType): Unit =
-    TraceRecorder.currentContext.map(_.traceLocalStorage.store(key)(value))
-
-  def retrieve(key: TraceLocalKey): Option[key.ValueType] =
-    TraceRecorder.currentContext.flatMap(_.traceLocalStorage.retrieve(key))
+  def store(key: TraceLocalKey)(value: key.ValueType): Unit = TraceRecorder.currentContext match {
+    case ctx: DefaultTraceContext ⇒ ctx.traceLocalStorage.store(key)(value)
+    case EmptyTraceContext        ⇒ // Can't store in the empty context.
+  }
 
+  def retrieve(key: TraceLocalKey): Option[key.ValueType] = TraceRecorder.currentContext match {
+    case ctx: DefaultTraceContext ⇒ ctx.traceLocalStorage.retrieve(key)
+    case EmptyTraceContext        ⇒ None // Can't retrieve anything from the empty context.
+  }
 }
 
 class TraceLocalStorage {
   val underlyingStorage = TrieMap[TraceLocal.TraceLocalKey, Any]()
 
   def store(key: TraceLocalKey)(value: key.ValueType): Unit = underlyingStorage.put(key, value)
-
   def retrieve(key: TraceLocalKey): Option[key.ValueType] = underlyingStorage.get(key).map(_.asInstanceOf[key.ValueType])
 }
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala b/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala
index bc7a0db2..8da187cb 100644
--- a/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala
+++ b/kamon-core/src/main/scala/kamon/trace/TraceRecorder.scala
@@ -16,8 +16,6 @@
 
 package kamon.trace
 
-import akka.remote.instrumentation.TraceContextAwareWireFormats.RemoteTraceContext
-
 import scala.language.experimental.macros
 import java.util.concurrent.atomic.AtomicLong
 import kamon.macros.InlineTraceContextMacro
@@ -25,74 +23,70 @@ import kamon.macros.InlineTraceContextMacro
 import scala.util.Try
 import java.net.InetAddress
 import akka.actor.ActorSystem
-import kamon.trace.TraceContext.SegmentIdentity
 
 object TraceRecorder {
-  private val traceContextStorage = new ThreadLocal[Option[TraceContext]] {
-    override def initialValue(): Option[TraceContext] = None
+  private val traceContextStorage = new ThreadLocal[TraceContext] {
+    override def initialValue(): TraceContext = EmptyTraceContext
   }
 
   private val tokenCounter = new AtomicLong
   private val hostnamePrefix = Try(InetAddress.getLocalHost.getHostName).getOrElse("unknown-localhost")
 
-  def newToken = "%s-%s".format(hostnamePrefix, tokenCounter.incrementAndGet())
-
-  private def newTraceContext(name: String, token: Option[String], metadata: Map[String, String],
-    system: ActorSystem): TraceContext = {
+  def newToken: String = hostnamePrefix + "-" + String.valueOf(tokenCounter.incrementAndGet())
 
-    // In the future this should select between implementations.
-    val finalToken = token.getOrElse(newToken)
-    new SimpleMetricCollectionContext(name, finalToken, metadata, TraceContextOrigin.Local, system)
+  private def newTraceContext(name: String, token: Option[String], system: ActorSystem): TraceContext = {
+    new DefaultTraceContext(
+      name,
+      token.getOrElse(newToken),
+      izOpen = true,
+      LevelOfDetail.OnlyMetrics,
+      TraceContextOrigin.Local,
+      nanoTimeztamp = System.nanoTime,
+      system)
   }
 
-  def joinRemoteTraceContext(remoteTraceContext: RemoteTraceContext, system: ActorSystem): TraceContext = {
-    new SimpleMetricCollectionContext(
-      remoteTraceContext.getTraceName(),
-      remoteTraceContext.getTraceToken(),
-      Map.empty,
+  def joinRemoteTraceContext(traceName: String, traceToken: String, startMilliTime: Long, isOpen: Boolean, system: ActorSystem): TraceContext = {
+    val equivalentNanotime = System.nanoTime() - ((System.currentTimeMillis() - startMilliTime) * 1000000)
+    new DefaultTraceContext(
+      traceName,
+      traceToken,
+      isOpen,
+      LevelOfDetail.OnlyMetrics,
       TraceContextOrigin.Remote,
-      system,
-      remoteTraceContext.getStartMilliTime(),
-      remoteTraceContext.getIsOpen())
+      equivalentNanotime,
+      system)
   }
 
-  def forkTraceContext(context: TraceContext, newName: String): TraceContext = {
-    new SimpleMetricCollectionContext(
-      newName,
-      context.token,
-      Map.empty,
-      TraceContextOrigin.Local,
-      context.system)
-  }
+  def setContext(context: TraceContext): Unit = traceContextStorage.set(context)
 
-  def setContext(context: Option[TraceContext]): Unit = traceContextStorage.set(context)
+  def clearContext: Unit = traceContextStorage.set(EmptyTraceContext)
 
-  def clearContext: Unit = traceContextStorage.set(None)
+  def currentContext: TraceContext = traceContextStorage.get()
 
-  def currentContext: Option[TraceContext] = traceContextStorage.get()
-
-  def start(name: String, token: Option[String] = None, metadata: Map[String, String] = Map.empty)(implicit system: ActorSystem) = {
-    val ctx = newTraceContext(name, token, metadata, system)
-    traceContextStorage.set(Some(ctx))
+  def start(name: String, token: Option[String] = None)(implicit system: ActorSystem) = {
+    val ctx = newTraceContext(name, token, system)
+    traceContextStorage.set(ctx)
   }
 
-  def startSegment(identity: SegmentIdentity, metadata: Map[String, String] = Map.empty): Option[SegmentCompletionHandle] =
-    currentContext.map(_.startSegment(identity, metadata))
-
-  def rename(name: String): Unit = currentContext.map(_.rename(name))
+  def rename(name: String): Unit = currentContext.rename(name)
 
-  def withNewTraceContext[T](name: String, token: Option[String] = None, metadata: Map[String, String] = Map.empty)(thunk: ⇒ T)(implicit system: ActorSystem): T =
-    withTraceContext(Some(newTraceContext(name, token, metadata, system)))(thunk)
+  def withNewTraceContext[T](name: String, token: Option[String] = None)(thunk: ⇒ T)(implicit system: ActorSystem): T =
+    withTraceContext(newTraceContext(name, token, system))(thunk)
 
-  def withTraceContext[T](context: Option[TraceContext])(thunk: ⇒ T): T = {
+  def withTraceContext[T](context: TraceContext)(thunk: ⇒ T): T = {
     val oldContext = currentContext
     setContext(context)
 
     try thunk finally setContext(oldContext)
   }
 
-  def withInlineTraceContextReplacement[T](traceCtx: Option[TraceContext])(thunk: ⇒ T): T = macro InlineTraceContextMacro.withInlineTraceContextImpl[T, Option[TraceContext]]
+  def withTraceContextAndSystem[T](thunk: (TraceContext, ActorSystem) ⇒ T): Option[T] = currentContext match {
+    case ctx: DefaultTraceContext ⇒ Some(thunk(ctx, ctx.system))
+    case EmptyTraceContext        ⇒ None
+  }
+
+  def withInlineTraceContextReplacement[T](traceCtx: TraceContext)(thunk: ⇒ T): T = macro InlineTraceContextMacro.withInlineTraceContextImpl[T, TraceContext]
 
-  def finish(metadata: Map[String, String] = Map.empty): Unit = currentContext.map(_.finish(metadata))
+  def finish(): Unit = currentContext.finish()
 
 }
diff --git a/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala b/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala
index 4b7dbb28..f052f009 100644
--- a/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala
+++ b/kamon-core/src/main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala
@@ -20,5 +20,11 @@ import ch.qos.logback.classic.spi.ILoggingEvent
 import kamon.trace.TraceRecorder
 
 class LogbackTraceTokenConverter extends ClassicConverter {
-  def convert(event: ILoggingEvent): String = TraceRecorder.currentContext.map(_.token).getOrElse("undefined")
+  def convert(event: ILoggingEvent): String = {
+    val ctx = TraceRecorder.currentContext
+    if (ctx.isEmpty)
+      "undefined"
+    else
+      ctx.token
+  }
 }
diff --git a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala b/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala
deleted file mode 100644
index 12f7f549..00000000
--- a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * =========================================================================================
- * Copyright © 2013-2014 the kamon project <http://kamon.io/>
- *
- * 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 kamon.weaver.logging
-
-import org.aspectj.bridge.{ IMessage, IMessageHandler }
-import com.typesafe.config.ConfigFactory
-import java.util.logging.Logger
-
-/**
- *  Implementation of AspectJ's IMessageHandler interface that routes AspectJ weaving messages and controls them through kamon configuration.
- */
-class KamonWeaverMessageHandler extends IMessageHandler {
-  import IMessage._
-
-  private val log = Logger.getLogger("AspectJ Weaver")
-  private val conf = ConfigFactory.load().getConfig("kamon.weaver")
-
-  private val isVerbose = conf.getBoolean("verbose")
-  private val isDebug = conf.getBoolean("debug")
-  private val showWeaveInfo = conf.getBoolean("showWeaveInfo")
-  private val showWarn = conf.getBoolean("showWarn")
-
-  def handleMessage(message: IMessage) = message.getKind match {
-    case WEAVEINFO if showWeaveInfo ⇒ showMessage(message)
-    case DEBUG if isDebug           ⇒ showMessage(message)
-    case WARNING if showWarn        ⇒ showMessage(message)
-    case DEBUG if isDebug           ⇒ showMessage(message)
-    case INFO if isVerbose          ⇒ showMessage(message)
-    case ERROR                      ⇒ showErrorMessage(message)
-    case _                          ⇒ false
-  }
-
-  def isIgnoring(kind: IMessage.Kind): Boolean = false // We want to see everything.
-  def dontIgnore(kind: IMessage.Kind) = {}
-  def ignore(kind: IMessage.Kind) = {}
-
-  private def showMessage(msg: IMessage): Boolean = {
-    log.info(msg.getMessage)
-    true
-  }
-
-  private def showErrorMessage(msg: IMessage): Boolean = {
-    log.severe(msg.getMessage)
-    true
-  }
-}
-
diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala
index 47867c55..d79ccbe0 100644
--- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala
+++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentationSpec.scala
@@ -3,7 +3,7 @@ package kamon.instrumentation.akka
 import akka.actor.SupervisorStrategy.{ Escalate, Restart, Resume, Stop }
 import akka.actor._
 import akka.testkit.{ ImplicitSender, TestKit }
-import kamon.trace.TraceRecorder
+import kamon.trace.{ EmptyTraceContext, TraceRecorder }
 import org.scalatest.WordSpecLike
 
 import scala.concurrent.duration._
@@ -59,7 +59,7 @@ class ActorSystemMessageInstrumentationSpec extends TestKit(ActorSystem("actor-s
 
         // Ensure we didn't tie the actor with the context
         supervisor ! "context"
-        expectMsg(None)
+        expectMsg(EmptyTraceContext)
       }
 
       "the actor is restarted" in {
@@ -76,7 +76,7 @@ class ActorSystemMessageInstrumentationSpec extends TestKit(ActorSystem("actor-s
 
         // Ensure we didn't tie the actor with the context
         supervisor ! "context"
-        expectMsg(None)
+        expectMsg(EmptyTraceContext)
       }
 
       "the actor is stopped" in {
@@ -142,7 +142,7 @@ class ActorSystemMessageInstrumentationSpec extends TestKit(ActorSystem("actor-s
 
     class Child extends Actor {
       def receive = {
-        case "fail"    ⇒ 1 / 0
+        case "fail"    ⇒ throw new ArithmeticException("Division by zero.")
         case "context" ⇒ sender ! TraceRecorder.currentContext
       }
 
diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/AskPatternInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/AskPatternInstrumentationSpec.scala
index d914ffe8..17312ba3 100644
--- a/kamon-core/src/test/scala/kamon/instrumentation/akka/AskPatternInstrumentationSpec.scala
+++ b/kamon-core/src/test/scala/kamon/instrumentation/akka/AskPatternInstrumentationSpec.scala
@@ -54,7 +54,6 @@ class AskPatternInstrumentationSpec extends TestKitBase with WordSpecLike with M
       }
       val capturedCtx = warn.asInstanceOf[TraceContextAware].traceContext
 
-      capturedCtx should be('defined)
       capturedCtx should equal(testTraceContext)
     }
   }
diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala
deleted file mode 100644
index bc25e2d4..00000000
--- a/kamon-core/src/test/scala/kamon/instrumentation/akka/RemotingInstrumentationSpec.scala
+++ /dev/null
@@ -1,171 +0,0 @@
-package kamon.instrumentation.akka
-
-import akka.actor.SupervisorStrategy.Resume
-import akka.actor._
-import akka.remote.RemoteScope
-import akka.routing.RoundRobinRouter
-import akka.testkit.{ ImplicitSender, TestKitBase }
-import akka.util.Timeout
-import com.typesafe.config.ConfigFactory
-import kamon.trace.TraceRecorder
-import org.scalatest.{ Matchers, WordSpecLike }
-import akka.pattern.{ ask, pipe }
-import scala.concurrent.duration._
-import scala.util.control.NonFatal
-
-class RemotingInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers {
-  implicit def self = testActor
-
-  implicit lazy val system: ActorSystem = ActorSystem("remoting-spec-local-system", ConfigFactory.parseString(
-    """
-      |akka {
-      |  actor {
-      |    provider = "akka.remote.RemoteActorRefProvider"
-      |  }
-      |  remote {
-      |    enabled-transports = ["akka.remote.netty.tcp"]
-      |    netty.tcp {
-      |      hostname = "127.0.0.1"
-      |      port = 2552
-      |    }
-      |  }
-      |}
-    """.stripMargin))
-
-  val remoteSystem: ActorSystem = ActorSystem("remoting-spec-remote-system", ConfigFactory.parseString(
-    """
-      |akka {
-      |  actor {
-      |    provider = "akka.remote.RemoteActorRefProvider"
-      |  }
-      |  remote {
-      |    enabled-transports = ["akka.remote.netty.tcp"]
-      |    netty.tcp {
-      |      hostname = "127.0.0.1"
-      |      port = 2553
-      |    }
-      |  }
-      |}
-    """.stripMargin))
-
-  val RemoteSystemAddress = AddressFromURIString("akka.tcp://remoting-spec-remote-system@127.0.0.1:2553")
-
-  "The Remoting instrumentation" should {
-    "propagate the TraceContext when creating a new remote actor" in {
-      TraceRecorder.withNewTraceContext("deploy-remote-actor", Some("deploy-remote-actor-1")) {
-        system.actorOf(TraceTokenReplier.remoteProps(Some(testActor), RemoteSystemAddress), "remote-deploy-fixture")
-      }
-
-      expectMsg("name=deploy-remote-actor|token=deploy-remote-actor-1|isOpen=true")
-    }
-
-    "propagate the TraceContext when sending a message to a remotely deployed actor" in {
-      val remoteRef = system.actorOf(TraceTokenReplier.remoteProps(None, RemoteSystemAddress), "remote-message-fixture")
-
-      TraceRecorder.withNewTraceContext("message-remote-actor", Some("message-remote-actor-1")) {
-        remoteRef ! "reply-trace-token"
-      }
-
-      expectMsg("name=message-remote-actor|token=message-remote-actor-1|isOpen=true")
-    }
-
-    "propagate the TraceContext when pipe or ask a message to a remotely deployed actor" in {
-      implicit val ec = system.dispatcher
-      implicit val askTimeout = Timeout(10 seconds)
-      val remoteRef = system.actorOf(TraceTokenReplier.remoteProps(None, RemoteSystemAddress), "remote-ask-and-pipe-fixture")
-
-      TraceRecorder.withNewTraceContext("ask-and-pipe-remote-actor", Some("ask-and-pipe-remote-actor-1")) {
-        (remoteRef ? "reply-trace-token") pipeTo (testActor)
-      }
-
-      expectMsg("name=ask-and-pipe-remote-actor|token=ask-and-pipe-remote-actor-1|isOpen=true")
-    }
-
-    "propagate the TraceContext when sending a message to an ActorSelection" in {
-      remoteSystem.actorOf(TraceTokenReplier.props(None), "actor-selection-target-a")
-      remoteSystem.actorOf(TraceTokenReplier.props(None), "actor-selection-target-b")
-      val selection = system.actorSelection(RemoteSystemAddress + "/user/actor-selection-target-*")
-
-      TraceRecorder.withNewTraceContext("message-remote-actor-selection", Some("message-remote-actor-selection-1")) {
-        selection ! "reply-trace-token"
-      }
-
-      // one for each selected actor
-      expectMsg("name=message-remote-actor-selection|token=message-remote-actor-selection-1|isOpen=true")
-      expectMsg("name=message-remote-actor-selection|token=message-remote-actor-selection-1|isOpen=true")
-    }
-
-    "propagate the TraceContext a remotely supervised child fails" in {
-      val supervisor = system.actorOf(Props(new SupervisorOfRemote(testActor, RemoteSystemAddress)))
-
-      TraceRecorder.withNewTraceContext("remote-supervision", Some("remote-supervision-1")) {
-        supervisor ! "fail"
-      }
-
-      expectMsg("name=remote-supervision|token=remote-supervision-1|isOpen=true")
-    }
-
-    "propagate the TraceContext when sending messages to remote routees of a router" in {
-      remoteSystem.actorOf(TraceTokenReplier.props(None), "remote-routee")
-      val routees = Vector[String](RemoteSystemAddress + "/user/remote-routee")
-      val router = system.actorOf(Props.empty.withRouter(RoundRobinRouter(routees = routees)))
-
-      TraceRecorder.withNewTraceContext("remote-routee", Some("remote-routee-1")) {
-        router ! "reply-trace-token"
-      }
-
-      expectMsg("name=remote-routee|token=remote-routee-1|isOpen=true")
-    }
-  }
-
-}
-
-class TraceTokenReplier(creationTraceContextListener: Option[ActorRef]) extends Actor with ActorLogging {
-  creationTraceContextListener map { recipient ⇒
-    recipient ! currentTraceContextInfo
-  }
-
-  def receive = {
-    case "fail" ⇒
-      1 / 0
-    case "reply-trace-token" ⇒
-      log.info("Sending back the TT: " + TraceRecorder.currentContext.map(_.token).getOrElse("unavailable"))
-      sender ! currentTraceContextInfo
-  }
-
-  def currentTraceContextInfo: String = {
-    TraceRecorder.currentContext.map { context ⇒
-      s"name=${context.name}|token=${context.token}|isOpen=${context.isOpen}"
-    }.getOrElse("unavailable")
-  }
-}
-
-object TraceTokenReplier {
-  def props(creationTraceContextListener: Option[ActorRef]): Props =
-    Props(new TraceTokenReplier(creationTraceContextListener))
-
-  def remoteProps(creationTraceContextListener: Option[ActorRef], remoteAddress: Address): Props = {
-    Props(new TraceTokenReplier(creationTraceContextListener))
-      .withDeploy(Deploy(scope = RemoteScope(remoteAddress)))
-  }
-}
-
-class SupervisorOfRemote(traceContextListener: ActorRef, remoteAddress: Address) extends Actor {
-  val supervisedChild = context.actorOf(TraceTokenReplier.remoteProps(None, remoteAddress), "remotely-supervised-child")
-
-  def receive = {
-    case "fail" ⇒ supervisedChild ! "fail"
-  }
-
-  override def supervisorStrategy: SupervisorStrategy = OneForOneStrategy() {
-    case NonFatal(throwable) ⇒
-      traceContextListener ! currentTraceContextInfo
-      Resume
-  }
-
-  def currentTraceContextInfo: String = {
-    TraceRecorder.currentContext.map { context ⇒
-      s"name=${context.name}|token=${context.token}|isOpen=${context.isOpen}"
-    }.getOrElse("unavailable")
-  }
-}
diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala
index 21e0bbba..006366ba 100644
--- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala
@@ -192,7 +192,7 @@ class ActorMetricsSpec extends TestKitBase with WordSpecLike with Matchers {
 class ActorMetricsTestActor extends Actor {
   def receive = {
     case Discard ⇒
-    case Fail    ⇒ 1 / 0
+    case Fail    ⇒ throw new ArithmeticException("Division by zero.")
     case Ping    ⇒ sender ! Pong
     case TrackTimings(sendTimestamp, sleep) ⇒ {
       val dequeueTimestamp = System.nanoTime()
diff --git a/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala
index 8b33d216..6585a618 100644
--- a/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala
@@ -30,9 +30,7 @@ import org.scalatest.{ Matchers, WordSpecLike }
 
 import scala.concurrent.duration._
 
-class RouterMetricsSpec extends TestKitBase with WordSpecLike with Matchers {
-  implicit def self = testActor
-
+class RouterMetricsSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender {
   implicit lazy val system: ActorSystem = ActorSystem("router-metrics-spec", ConfigFactory.parseString(
     """
       |kamon.metrics {
@@ -132,15 +130,13 @@ class RouterMetricsSpec extends TestKitBase with WordSpecLike with Matchers {
 
     def createTestRouter(name: String): ActorRef = system.actorOf(Props[RouterMetricsTestActor]
       .withRouter(RoundRobinRouter(nrOfInstances = 5)), name)
-
-    def takeSnapshotOf(amr: RouterMetricsRecorder): RouterMetricSnapshot = amr.collect(collectionContext)
   }
 }
 
 class RouterMetricsTestActor extends Actor {
   def receive = {
     case Discard ⇒
-    case Fail    ⇒ 1 / 0
+    case Fail    ⇒ throw new ArithmeticException("Division by zero.")
     case Ping    ⇒ sender ! Pong
     case RouterTrackTimings(sendTimestamp, sleep) ⇒ {
       val dequeueTimestamp = System.nanoTime()
diff --git a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala
index 23977971..7468f59c 100644
--- a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala
@@ -5,8 +5,7 @@ import akka.testkit.{ ImplicitSender, TestKitBase }
 import com.typesafe.config.ConfigFactory
 import kamon.Kamon
 import kamon.metric.TraceMetrics.TraceMetricsSnapshot
-import kamon.trace.TraceContext.SegmentIdentity
-import kamon.trace.TraceRecorder
+import kamon.trace.{ SegmentMetricIdentity, TraceRecorder }
 import org.scalatest.{ Matchers, WordSpecLike }
 
 class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers {
@@ -55,39 +54,37 @@ class TraceMetricsSpec extends TestKitBase with WordSpecLike with Matchers {
 
     "record the elapsed time for segments that occur inside a given trace" in {
       TraceRecorder.withNewTraceContext("trace-with-segments") {
-        val segmentHandle = TraceRecorder.startSegment(TraceMetricsTestSegment("test-segment"))
-        segmentHandle.get.finish()
+        val segment = TraceRecorder.currentContext.startSegment("test-segment", "test-label")
+        segment.finish()
         TraceRecorder.finish()
       }
 
       val snapshot = takeSnapshotOf("trace-with-segments")
       snapshot.elapsedTime.numberOfMeasurements should be(1)
       snapshot.segments.size should be(1)
-      snapshot.segments(TraceMetricsTestSegment("test-segment")).numberOfMeasurements should be(1)
+      snapshot.segments(SegmentMetricIdentity("test-segment", "test-label")).numberOfMeasurements should be(1)
     }
 
     "record the elapsed time for segments that finish after their correspondent trace has finished" in {
-      val segmentHandle = TraceRecorder.withNewTraceContext("closing-segment-after-trace") {
-        val sh = TraceRecorder.startSegment(TraceMetricsTestSegment("test-segment"))
+      val segment = TraceRecorder.withNewTraceContext("closing-segment-after-trace") {
+        val s = TraceRecorder.currentContext.startSegment("test-segment", "test-label")
         TraceRecorder.finish()
-        sh
+        s
       }
 
       val beforeFinishSegmentSnapshot = takeSnapshotOf("closing-segment-after-trace")
       beforeFinishSegmentSnapshot.elapsedTime.numberOfMeasurements should be(1)
       beforeFinishSegmentSnapshot.segments.size should be(0)
 
-      segmentHandle.get.finish()
+      segment.finish()
 
       val afterFinishSegmentSnapshot = takeSnapshotOf("closing-segment-after-trace")
       afterFinishSegmentSnapshot.elapsedTime.numberOfMeasurements should be(0)
       afterFinishSegmentSnapshot.segments.size should be(1)
-      afterFinishSegmentSnapshot.segments(TraceMetricsTestSegment("test-segment")).numberOfMeasurements should be(1)
+      afterFinishSegmentSnapshot.segments(SegmentMetricIdentity("test-segment", "test-label")).numberOfMeasurements should be(1)
     }
   }
 
-  case class TraceMetricsTestSegment(name: String) extends SegmentIdentity
-
   def takeSnapshotOf(traceName: String): TraceMetricsSnapshot = {
     val recorder = Kamon(Metrics).register(TraceMetrics(traceName), TraceMetrics.Factory)
     val collectionContext = Kamon(Metrics).buildDefaultCollectionContext
diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
index cefdf0f4..c3060d4a 100644
--- a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala
@@ -57,7 +57,7 @@ class HistogramSpec extends WordSpec with Matchers {
     }
 
     "produce a snapshot" which {
-      "supports min, max and numberOfMeasurements operations" in new HistogramFixture {
+      "supports min, max, percentile, sum and numberOfMeasurements operations" in new HistogramFixture {
         histogram.record(100)
         histogram.record(200, count = 200)
         histogram.record(300)
@@ -67,7 +67,12 @@ class HistogramSpec extends WordSpec with Matchers {
 
         snapshot.min should equal(100L +- 1L)
         snapshot.max should equal(900L +- 9L)
+        snapshot.percentile(50.0D) should be(200)
+        snapshot.percentile(99.5D) should be(300)
+        snapshot.percentile(99.9D) should be(900)
+        snapshot.sum should be(41300)
         snapshot.numberOfMeasurements should be(203)
+
       }
 
       "can be merged with another snapshot" in new MultipleHistogramFixture {
diff --git a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala
index d073f68e..206fbd4e 100644
--- a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala
+++ b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala
@@ -3,7 +3,6 @@ package kamon.trace
 import akka.actor.ActorSystem
 import akka.testkit.TestKitBase
 import com.typesafe.config.ConfigFactory
-import kamon.trace.TraceContext.SegmentIdentity
 import org.scalatest.{ Matchers, WordSpecLike }
 
 class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Matchers {
@@ -39,7 +38,7 @@ class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Ma
     "allow starting a trace within a specified block of code, and only within that block of code" in {
       val createdContext = TraceRecorder.withNewTraceContext("start-context") {
         TraceRecorder.currentContext should not be empty
-        TraceRecorder.currentContext.get
+        TraceRecorder.currentContext
       }
 
       TraceRecorder.currentContext shouldBe empty
@@ -49,7 +48,7 @@ class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Ma
     "allow starting a trace within a specified block of code, providing a trace-token and only within that block of code" in {
       val createdContext = TraceRecorder.withNewTraceContext("start-context-with-token", Some("token-1")) {
         TraceRecorder.currentContext should not be empty
-        TraceRecorder.currentContext.get
+        TraceRecorder.currentContext
       }
 
       TraceRecorder.currentContext shouldBe empty
@@ -71,7 +70,7 @@ class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Ma
     "allow renaming a trace" in {
       val createdContext = TraceRecorder.withNewTraceContext("trace-before-rename") {
         TraceRecorder.rename("renamed-trace")
-        TraceRecorder.currentContext.get
+        TraceRecorder.currentContext
       }
 
       TraceRecorder.currentContext shouldBe empty
@@ -80,17 +79,22 @@ class TraceContextManipulationSpec extends TestKitBase with WordSpecLike with Ma
 
     "allow creating a segment within a trace" in {
       val createdContext = TraceRecorder.withNewTraceContext("trace-with-segments") {
-        val segmentHandle = TraceRecorder.startSegment(TraceManipulationTestSegment("segment-1"))
-
-        TraceRecorder.currentContext.get
+        val segment = TraceRecorder.currentContext.startSegment("segment-1", "segment-1-label")
+        TraceRecorder.currentContext
       }
 
       TraceRecorder.currentContext shouldBe empty
       createdContext.name shouldBe ("trace-with-segments")
-
     }
-  }
 
-  case class TraceManipulationTestSegment(name: String) extends SegmentIdentity
+    "allow renaming a segment" in {
+      TraceRecorder.withNewTraceContext("trace-with-renamed-segment") {
+        val segment = TraceRecorder.currentContext.startSegment("original-segment-name", "segment-label")
+        segment.name should be("original-segment-name")
 
+        segment.rename("new-segment-name")
+        segment.name should be("new-segment-name")
+      }
+    }
+  }
 }