<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/protobuf-java-2.2.0.jar</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -30,7 +30,6 @@
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/commons-io-1.4.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/commons-lang-2.4.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/jopt-simple-3.1.jar&quot;/&gt;
-	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/protobuf-java-2.1.0.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/commons-collections-3.2.1.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/jdom-1.1.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/servlet-api-2.5.jar&quot;/&gt;
@@ -40,5 +39,6 @@
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/jline-0.9.94.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/commons-pool-1.5.2.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/je-3.3.87.jar&quot;/&gt;
+	&lt;classpathentry kind=&quot;lib&quot; path=&quot;lib/protobuf-java-2.2.0.jar&quot;/&gt;
 	&lt;classpathentry kind=&quot;output&quot; path=&quot;classes&quot;/&gt;
 &lt;/classpath&gt;</diff>
      <filename>.classpath</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-#Tue Mar 10 08:40:10 GMT 2009
+#Fri Sep 18 15:20:52 BST 2009
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -8,6 +8,8 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
 org.eclipse.jdt.core.codeComplete.localSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve</diff>
      <filename>.settings/org.eclipse.jdt.core.prefs</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,7 @@ public final class VProto {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
-  public static enum RequestType
+  public enum RequestType
       implements com.google.protobuf.ProtocolMessageEnum {
     GET(0, 0),
     GET_ALL(1, 1),
@@ -28,6 +28,18 @@ public final class VProto {
       }
     }
     
+    public static com.google.protobuf.Internal.EnumLiteMap&lt;RequestType&gt;
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static com.google.protobuf.Internal.EnumLiteMap&lt;RequestType&gt;
+        internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap&lt;RequestType&gt;() {
+            public RequestType findValueByNumber(int number) {
+              return RequestType.valueOf(number)
+    ;        }
+          };
+    
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
       return getDescriptor().getValues().get(index);
@@ -83,7 +95,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_ClockEntry_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_ClockEntry_fieldAccessorTable;
@@ -103,14 +114,12 @@ public final class VProto {
     public boolean hasVersion() { return hasVersion; }
     public long getVersion() { return version_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasNodeId) return false;
       if (!hasVersion) return false;
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasNodeId()) {
@@ -123,7 +132,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -149,7 +157,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.ClockEntry parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -160,7 +168,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.ClockEntry parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -171,7 +179,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.ClockEntry parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -182,7 +190,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.ClockEntry parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -194,43 +202,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.ClockEntry parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.ClockEntry prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.ClockEntry result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.ClockEntry.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.ClockEntry result = new voldemort.client.protocol.pb.VProto.ClockEntry();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.ClockEntry();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.ClockEntry internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.ClockEntry();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.ClockEntry.getDescriptor();
@@ -240,10 +254,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.ClockEntry.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.ClockEntry build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -251,7 +267,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.ClockEntry buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -260,13 +276,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.ClockEntry buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.ClockEntry returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.ClockEntry) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.ClockEntry)other);
@@ -288,18 +304,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -371,6 +378,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class VectorClock extends
@@ -392,7 +403,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_VectorClock_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_VectorClock_fieldAccessorTable;
@@ -417,7 +427,6 @@ public final class VProto {
     public boolean hasTimestamp() { return hasTimestamp; }
     public long getTimestamp() { return timestamp_; }
     
-    @Override
     public final boolean isInitialized() {
       for (voldemort.client.protocol.pb.VProto.ClockEntry element : getEntriesList()) {
         if (!element.isInitialized()) return false;
@@ -425,7 +434,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (voldemort.client.protocol.pb.VProto.ClockEntry element : getEntriesList()) {
@@ -438,7 +446,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -464,7 +471,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VectorClock parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -475,7 +482,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VectorClock parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -486,7 +493,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VectorClock parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -497,7 +504,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VectorClock parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -509,43 +516,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VectorClock parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.VectorClock prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.VectorClock result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.VectorClock.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.VectorClock result = new voldemort.client.protocol.pb.VProto.VectorClock();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.VectorClock();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.VectorClock internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.VectorClock();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.VectorClock.getDescriptor();
@@ -555,10 +568,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.VectorClock.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.VectorClock build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -566,7 +581,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.VectorClock buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -575,7 +590,8 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.VectorClock buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         if (result.entries_ != java.util.Collections.EMPTY_LIST) {
           result.entries_ =
             java.util.Collections.unmodifiableList(result.entries_);
@@ -585,7 +601,6 @@ public final class VProto {
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.VectorClock) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.VectorClock)other);
@@ -610,18 +625,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -728,6 +734,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class Versioned extends
@@ -749,7 +759,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_Versioned_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_Versioned_fieldAccessorTable;
@@ -769,7 +778,6 @@ public final class VProto {
     public boolean hasVersion() { return hasVersion; }
     public voldemort.client.protocol.pb.VProto.VectorClock getVersion() { return version_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasValue) return false;
       if (!hasVersion) return false;
@@ -777,7 +785,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasValue()) {
@@ -790,7 +797,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -816,7 +822,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Versioned parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -827,7 +833,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Versioned parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -838,7 +844,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Versioned parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -849,7 +855,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Versioned parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -861,43 +867,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Versioned parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.Versioned prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.Versioned result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.Versioned.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.Versioned result = new voldemort.client.protocol.pb.VProto.Versioned();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.Versioned();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.Versioned internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.Versioned();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.Versioned.getDescriptor();
@@ -907,10 +919,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.Versioned.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.Versioned build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -918,7 +932,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.Versioned buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -927,13 +941,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.Versioned buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.Versioned returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.Versioned) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.Versioned)other);
@@ -955,18 +969,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -1020,7 +1025,7 @@ public final class VProto {
       }
       public Builder clearValue() {
         result.hasValue = false;
-        result.value_ = com.google.protobuf.ByteString.EMPTY;
+        result.value_ = getDefaultInstance().getValue();
         return this;
       }
       
@@ -1065,6 +1070,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class Error extends
@@ -1086,7 +1095,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_Error_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_Error_fieldAccessorTable;
@@ -1106,14 +1114,12 @@ public final class VProto {
     public boolean hasErrorMessage() { return hasErrorMessage; }
     public java.lang.String getErrorMessage() { return errorMessage_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasErrorCode) return false;
       if (!hasErrorMessage) return false;
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasErrorCode()) {
@@ -1126,7 +1132,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -1152,7 +1157,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Error parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -1163,7 +1168,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Error parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -1174,7 +1179,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Error parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -1185,7 +1190,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Error parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -1197,43 +1202,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.Error parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.Error prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.Error result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.Error.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.Error result = new voldemort.client.protocol.pb.VProto.Error();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.Error();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.Error internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.Error();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.Error.getDescriptor();
@@ -1243,10 +1254,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.Error.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.Error build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -1254,7 +1267,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.Error buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -1263,13 +1276,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.Error buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.Error returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.Error) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.Error)other);
@@ -1291,18 +1304,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -1369,7 +1373,7 @@ public final class VProto {
       }
       public Builder clearErrorMessage() {
         result.hasErrorMessage = false;
-        result.errorMessage_ = &quot;&quot;;
+        result.errorMessage_ = getDefaultInstance().getErrorMessage();
         return this;
       }
     }
@@ -1377,6 +1381,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class KeyedVersions extends
@@ -1398,7 +1406,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_KeyedVersions_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_KeyedVersions_fieldAccessorTable;
@@ -1423,7 +1430,6 @@ public final class VProto {
       return versions_.get(index);
     }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasKey) return false;
       for (voldemort.client.protocol.pb.VProto.Versioned element : getVersionsList()) {
@@ -1432,7 +1438,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasKey()) {
@@ -1445,7 +1450,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -1471,7 +1475,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.KeyedVersions parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -1482,7 +1486,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.KeyedVersions parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -1493,7 +1497,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.KeyedVersions parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -1504,7 +1508,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.KeyedVersions parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -1516,43 +1520,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.KeyedVersions parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.KeyedVersions prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.KeyedVersions result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.KeyedVersions.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.KeyedVersions result = new voldemort.client.protocol.pb.VProto.KeyedVersions();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.KeyedVersions();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.KeyedVersions internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.KeyedVersions();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.KeyedVersions.getDescriptor();
@@ -1562,10 +1572,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.KeyedVersions.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.KeyedVersions build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -1573,7 +1585,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.KeyedVersions buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -1582,7 +1594,8 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.KeyedVersions buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         if (result.versions_ != java.util.Collections.EMPTY_LIST) {
           result.versions_ =
             java.util.Collections.unmodifiableList(result.versions_);
@@ -1592,7 +1605,6 @@ public final class VProto {
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.KeyedVersions) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.KeyedVersions)other);
@@ -1617,18 +1629,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -1679,7 +1682,7 @@ public final class VProto {
       }
       public Builder clearKey() {
         result.hasKey = false;
-        result.key_ = com.google.protobuf.ByteString.EMPTY;
+        result.key_ = getDefaultInstance().getKey();
         return this;
       }
       
@@ -1738,6 +1741,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class GetRequest extends
@@ -1759,7 +1766,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetRequest_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetRequest_fieldAccessorTable;
@@ -1772,12 +1778,10 @@ public final class VProto {
     public boolean hasKey() { return hasKey; }
     public com.google.protobuf.ByteString getKey() { return key_; }
     
-    @Override
     public final boolean isInitialized() {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasKey()) {
@@ -1787,7 +1791,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -1809,7 +1812,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetRequest parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -1820,7 +1823,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetRequest parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -1831,7 +1834,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetRequest parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -1842,7 +1845,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetRequest parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -1854,43 +1857,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.GetRequest prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.GetRequest result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.GetRequest.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.GetRequest result = new voldemort.client.protocol.pb.VProto.GetRequest();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.GetRequest();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.GetRequest internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.GetRequest();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.GetRequest.getDescriptor();
@@ -1900,10 +1909,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.GetRequest.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.GetRequest build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -1911,7 +1922,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.GetRequest buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -1920,13 +1931,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.GetRequest buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.GetRequest returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.GetRequest) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.GetRequest)other);
@@ -1945,18 +1956,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -2001,7 +2003,7 @@ public final class VProto {
       }
       public Builder clearKey() {
         result.hasKey = false;
-        result.key_ = com.google.protobuf.ByteString.EMPTY;
+        result.key_ = getDefaultInstance().getKey();
         return this;
       }
     }
@@ -2009,6 +2011,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class GetResponse extends
@@ -2030,7 +2036,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetResponse_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetResponse_fieldAccessorTable;
@@ -2055,7 +2060,6 @@ public final class VProto {
     public boolean hasError() { return hasError; }
     public voldemort.client.protocol.pb.VProto.Error getError() { return error_; }
     
-    @Override
     public final boolean isInitialized() {
       for (voldemort.client.protocol.pb.VProto.Versioned element : getVersionedList()) {
         if (!element.isInitialized()) return false;
@@ -2066,7 +2070,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (voldemort.client.protocol.pb.VProto.Versioned element : getVersionedList()) {
@@ -2079,7 +2082,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -2105,7 +2107,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetResponse parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -2116,7 +2118,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetResponse parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -2127,7 +2129,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetResponse parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -2138,7 +2140,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetResponse parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -2150,43 +2152,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.GetResponse prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.GetResponse result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.GetResponse.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.GetResponse result = new voldemort.client.protocol.pb.VProto.GetResponse();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.GetResponse();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.GetResponse internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.GetResponse();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.GetResponse.getDescriptor();
@@ -2196,10 +2204,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.GetResponse.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.GetResponse build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -2207,7 +2217,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.GetResponse buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -2216,7 +2226,8 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.GetResponse buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         if (result.versioned_ != java.util.Collections.EMPTY_LIST) {
           result.versioned_ =
             java.util.Collections.unmodifiableList(result.versioned_);
@@ -2226,7 +2237,6 @@ public final class VProto {
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.GetResponse) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.GetResponse)other);
@@ -2251,18 +2261,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -2393,6 +2394,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class GetAllRequest extends
@@ -2414,7 +2419,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetAllRequest_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetAllRequest_fieldAccessorTable;
@@ -2432,12 +2436,10 @@ public final class VProto {
       return keys_.get(index);
     }
     
-    @Override
     public final boolean isInitialized() {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (com.google.protobuf.ByteString element : getKeysList()) {
@@ -2447,7 +2449,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -2474,7 +2475,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllRequest parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -2485,7 +2486,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllRequest parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -2496,7 +2497,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllRequest parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -2507,7 +2508,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllRequest parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -2519,43 +2520,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.GetAllRequest prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.GetAllRequest result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.GetAllRequest.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.GetAllRequest result = new voldemort.client.protocol.pb.VProto.GetAllRequest();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.GetAllRequest();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.GetAllRequest internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.GetAllRequest();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.GetAllRequest.getDescriptor();
@@ -2565,10 +2572,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.GetAllRequest.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.GetAllRequest build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -2576,7 +2585,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.GetAllRequest buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -2585,7 +2594,8 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.GetAllRequest buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         if (result.keys_ != java.util.Collections.EMPTY_LIST) {
           result.keys_ =
             java.util.Collections.unmodifiableList(result.keys_);
@@ -2595,7 +2605,6 @@ public final class VProto {
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.GetAllRequest) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.GetAllRequest)other);
@@ -2617,18 +2626,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -2700,6 +2700,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class GetAllResponse extends
@@ -2721,7 +2725,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetAllResponse_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_GetAllResponse_fieldAccessorTable;
@@ -2746,7 +2749,6 @@ public final class VProto {
     public boolean hasError() { return hasError; }
     public voldemort.client.protocol.pb.VProto.Error getError() { return error_; }
     
-    @Override
     public final boolean isInitialized() {
       for (voldemort.client.protocol.pb.VProto.KeyedVersions element : getValuesList()) {
         if (!element.isInitialized()) return false;
@@ -2757,7 +2759,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (voldemort.client.protocol.pb.VProto.KeyedVersions element : getValuesList()) {
@@ -2770,7 +2771,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -2796,7 +2796,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllResponse parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -2807,7 +2807,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllResponse parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -2818,7 +2818,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllResponse parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -2829,7 +2829,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllResponse parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -2841,43 +2841,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.GetAllResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.GetAllResponse prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.GetAllResponse result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.GetAllResponse.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.GetAllResponse result = new voldemort.client.protocol.pb.VProto.GetAllResponse();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.GetAllResponse();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.GetAllResponse internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.GetAllResponse();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.GetAllResponse.getDescriptor();
@@ -2887,10 +2893,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.GetAllResponse.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.GetAllResponse build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -2898,7 +2906,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.GetAllResponse buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -2907,7 +2915,8 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.GetAllResponse buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         if (result.values_ != java.util.Collections.EMPTY_LIST) {
           result.values_ =
             java.util.Collections.unmodifiableList(result.values_);
@@ -2917,7 +2926,6 @@ public final class VProto {
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.GetAllResponse) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.GetAllResponse)other);
@@ -2942,18 +2950,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -3084,6 +3083,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class PutRequest extends
@@ -3105,7 +3108,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_PutRequest_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_PutRequest_fieldAccessorTable;
@@ -3125,7 +3127,6 @@ public final class VProto {
     public boolean hasVersioned() { return hasVersioned; }
     public voldemort.client.protocol.pb.VProto.Versioned getVersioned() { return versioned_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasKey) return false;
       if (!hasVersioned) return false;
@@ -3133,7 +3134,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasKey()) {
@@ -3146,7 +3146,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -3172,7 +3171,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutRequest parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -3183,7 +3182,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutRequest parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -3194,7 +3193,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutRequest parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -3205,7 +3204,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutRequest parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -3217,43 +3216,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.PutRequest prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.PutRequest result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.PutRequest.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.PutRequest result = new voldemort.client.protocol.pb.VProto.PutRequest();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.PutRequest();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.PutRequest internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.PutRequest();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.PutRequest.getDescriptor();
@@ -3263,10 +3268,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.PutRequest.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.PutRequest build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -3274,7 +3281,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.PutRequest buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -3283,13 +3290,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.PutRequest buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.PutRequest returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.PutRequest) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.PutRequest)other);
@@ -3311,18 +3318,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -3376,7 +3374,7 @@ public final class VProto {
       }
       public Builder clearKey() {
         result.hasKey = false;
-        result.key_ = com.google.protobuf.ByteString.EMPTY;
+        result.key_ = getDefaultInstance().getKey();
         return this;
       }
       
@@ -3421,6 +3419,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class PutResponse extends
@@ -3442,7 +3444,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_PutResponse_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_PutResponse_fieldAccessorTable;
@@ -3455,7 +3456,6 @@ public final class VProto {
     public boolean hasError() { return hasError; }
     public voldemort.client.protocol.pb.VProto.Error getError() { return error_; }
     
-    @Override
     public final boolean isInitialized() {
       if (hasError()) {
         if (!getError().isInitialized()) return false;
@@ -3463,7 +3463,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasError()) {
@@ -3473,7 +3472,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -3495,7 +3493,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutResponse parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -3506,7 +3504,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutResponse parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -3517,7 +3515,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutResponse parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -3528,7 +3526,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutResponse parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -3540,43 +3538,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.PutResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.PutResponse prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.PutResponse result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.PutResponse.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.PutResponse result = new voldemort.client.protocol.pb.VProto.PutResponse();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.PutResponse();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.PutResponse internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.PutResponse();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.PutResponse.getDescriptor();
@@ -3586,10 +3590,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.PutResponse.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.PutResponse build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -3597,7 +3603,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.PutResponse buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -3606,13 +3612,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.PutResponse buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.PutResponse returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.PutResponse) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.PutResponse)other);
@@ -3631,18 +3637,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -3716,6 +3713,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class DeleteRequest extends
@@ -3737,7 +3738,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_DeleteRequest_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_DeleteRequest_fieldAccessorTable;
@@ -3757,7 +3757,6 @@ public final class VProto {
     public boolean hasVersion() { return hasVersion; }
     public voldemort.client.protocol.pb.VProto.VectorClock getVersion() { return version_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasKey) return false;
       if (!hasVersion) return false;
@@ -3765,7 +3764,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasKey()) {
@@ -3778,7 +3776,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -3804,7 +3801,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteRequest parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -3815,7 +3812,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteRequest parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -3826,7 +3823,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteRequest parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -3837,7 +3834,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteRequest parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -3849,43 +3846,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.DeleteRequest prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.DeleteRequest result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.DeleteRequest.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.DeleteRequest result = new voldemort.client.protocol.pb.VProto.DeleteRequest();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.DeleteRequest();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.DeleteRequest internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.DeleteRequest();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.DeleteRequest.getDescriptor();
@@ -3895,10 +3898,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.DeleteRequest.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.DeleteRequest build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -3906,7 +3911,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.DeleteRequest buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -3915,13 +3920,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.DeleteRequest buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.DeleteRequest returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.DeleteRequest) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.DeleteRequest)other);
@@ -3943,18 +3948,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -4008,7 +4004,7 @@ public final class VProto {
       }
       public Builder clearKey() {
         result.hasKey = false;
-        result.key_ = com.google.protobuf.ByteString.EMPTY;
+        result.key_ = getDefaultInstance().getKey();
         return this;
       }
       
@@ -4053,6 +4049,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class DeleteResponse extends
@@ -4074,7 +4074,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_DeleteResponse_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_DeleteResponse_fieldAccessorTable;
@@ -4094,7 +4093,6 @@ public final class VProto {
     public boolean hasError() { return hasError; }
     public voldemort.client.protocol.pb.VProto.Error getError() { return error_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasSuccess) return false;
       if (hasError()) {
@@ -4103,7 +4101,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasSuccess()) {
@@ -4116,7 +4113,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -4142,7 +4138,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteResponse parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -4153,7 +4149,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteResponse parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -4164,7 +4160,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteResponse parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -4175,7 +4171,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteResponse parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -4187,43 +4183,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.DeleteResponse parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.DeleteResponse prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.DeleteResponse result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.DeleteResponse.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.DeleteResponse result = new voldemort.client.protocol.pb.VProto.DeleteResponse();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.DeleteResponse();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.DeleteResponse internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.DeleteResponse();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.DeleteResponse.getDescriptor();
@@ -4233,10 +4235,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.DeleteResponse.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.DeleteResponse build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -4244,7 +4248,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.DeleteResponse buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -4253,13 +4257,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.DeleteResponse buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.DeleteResponse returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.DeleteResponse) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.DeleteResponse)other);
@@ -4281,18 +4285,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -4388,6 +4383,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   public static final class VoldemortRequest extends
@@ -4409,7 +4408,6 @@ public final class VProto {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_VoldemortRequest_descriptor;
     }
     
-    @Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return voldemort.client.protocol.pb.VProto.internal_static_voldemort_VoldemortRequest_fieldAccessorTable;
@@ -4464,7 +4462,6 @@ public final class VProto {
     public boolean hasDelete() { return hasDelete; }
     public voldemort.client.protocol.pb.VProto.DeleteRequest getDelete() { return delete_; }
     
-    @Override
     public final boolean isInitialized() {
       if (!hasType) return false;
       if (!hasShouldRoute) return false;
@@ -4478,7 +4475,6 @@ public final class VProto {
       return true;
     }
     
-    @Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (hasType()) {
@@ -4506,7 +4502,6 @@ public final class VProto {
     }
     
     private int memoizedSerializedSize = -1;
-    @Override
     public int getSerializedSize() {
       int size = memoizedSerializedSize;
       if (size != -1) return size;
@@ -4552,7 +4547,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VoldemortRequest parseFrom(
         com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -4563,7 +4558,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VoldemortRequest parseFrom(
         byte[] data,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
@@ -4574,7 +4569,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VoldemortRequest parseFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
@@ -4585,7 +4580,7 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VoldemortRequest parseDelimitedFrom(
         java.io.InputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeDelimitedFrom(input, extensionRegistry)
                .buildParsed();
@@ -4597,43 +4592,49 @@ public final class VProto {
     }
     public static voldemort.client.protocol.pb.VProto.VoldemortRequest parseFrom(
         com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistry extensionRegistry)
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
     
-    public static Builder newBuilder() { return new Builder(); }
-    public Builder newBuilderForType() { return new Builder(); }
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder(voldemort.client.protocol.pb.VProto.VoldemortRequest prototype) {
-      return new Builder().mergeFrom(prototype);
+      return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder&lt;Builder&gt; {
+      private voldemort.client.protocol.pb.VProto.VoldemortRequest result;
+      
       // Construct using voldemort.client.protocol.pb.VProto.VoldemortRequest.newBuilder()
       private Builder() {}
       
-      voldemort.client.protocol.pb.VProto.VoldemortRequest result = new voldemort.client.protocol.pb.VProto.VoldemortRequest();
+      private static Builder create() {
+        Builder builder = new Builder();
+        builder.result = new voldemort.client.protocol.pb.VProto.VoldemortRequest();
+        return builder;
+      }
       
-      @Override
       protected voldemort.client.protocol.pb.VProto.VoldemortRequest internalGetResult() {
         return result;
       }
       
-      @Override
       public Builder clear() {
+        if (result == null) {
+          throw new IllegalStateException(
+            &quot;Cannot call clear() after build().&quot;);
+        }
         result = new voldemort.client.protocol.pb.VProto.VoldemortRequest();
         return this;
       }
       
-      @Override
       public Builder clone() {
-        return new Builder().mergeFrom(result);
+        return create().mergeFrom(result);
       }
       
-      @Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return voldemort.client.protocol.pb.VProto.VoldemortRequest.getDescriptor();
@@ -4643,10 +4644,12 @@ public final class VProto {
         return voldemort.client.protocol.pb.VProto.VoldemortRequest.getDefaultInstance();
       }
       
+      public boolean isInitialized() {
+        return result.isInitialized();
+      }
       public voldemort.client.protocol.pb.VProto.VoldemortRequest build() {
         if (result != null &amp;&amp; !isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
-            result);
+          throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
@@ -4654,7 +4657,7 @@ public final class VProto {
       private voldemort.client.protocol.pb.VProto.VoldemortRequest buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
-          throw new com.google.protobuf.UninitializedMessageException(
+          throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
         }
         return buildPartial();
@@ -4663,13 +4666,13 @@ public final class VProto {
       public voldemort.client.protocol.pb.VProto.VoldemortRequest buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
-            &quot;build() has already been called on this Builder.&quot;);  }
+            &quot;build() has already been called on this Builder.&quot;);
+        }
         voldemort.client.protocol.pb.VProto.VoldemortRequest returnMe = result;
         result = null;
         return returnMe;
       }
       
-      @Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof voldemort.client.protocol.pb.VProto.VoldemortRequest) {
           return mergeFrom((voldemort.client.protocol.pb.VProto.VoldemortRequest)other);
@@ -4706,18 +4709,9 @@ public final class VProto {
         return this;
       }
       
-      @Override
-      public Builder mergeFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return mergeFrom(input,
-          com.google.protobuf.ExtensionRegistry.getEmptyRegistry());
-      }
-      
-      @Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistry extensionRegistry)
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder(
@@ -4851,7 +4845,7 @@ public final class VProto {
       }
       public Builder clearStore() {
         result.hasStore = false;
-        result.store_ = &quot;&quot;;
+        result.store_ = getDefaultInstance().getStore();
         return this;
       }
       
@@ -5007,6 +5001,10 @@ public final class VProto {
     static {
       voldemort.client.protocol.pb.VProto.getDescriptor();
     }
+    
+    static {
+      voldemort.client.protocol.pb.VProto.internalForceInit();
+    }
   }
   
   private static com.google.protobuf.Descriptors.Descriptor
@@ -5087,7 +5085,7 @@ public final class VProto {
   private static com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
-    java.lang.String descriptorData =
+    java.lang.String[] descriptorData = {
       &quot;\n\026voldemort-client.proto\022\tvoldemort\&quot;.\n\nC&quot; +
       &quot;lockEntry\022\017\n\007node_id\030\001 \002(\005\022\017\n\007version\030\002 &quot; +
       &quot;\002(\003\&quot;H\n\013VectorClock\022&amp;\n\007entries\030\001 \003(\0132\025.vo&quot; +
@@ -5097,7 +5095,7 @@ public final class VProto {
       &quot;rror_code\030\001 \002(\005\022\025\n\rerror_message\030\002 \002(\t\&quot;D&quot; +
       &quot;\n\rKeyedVersions\022\013\n\003key\030\001 \002(\014\022&amp;\n\010versions&quot; +
       &quot;\030\002 \003(\0132\024.voldemort.Versioned\&quot;\031\n\nGetReque&quot; +
-      &quot;st\022\013\n\003key\030\001 \001(\014\&quot;W\n\013GetResponse\022\'\n\tversio&quot; +
+      &quot;st\022\013\n\003key\030\001 \001(\014\&quot;W\n\013GetResponse\022\'\n\tversio&quot;,
       &quot;ned\030\001 \003(\0132\024.voldemort.Versioned\022\037\n\005error&quot; +
       &quot;\030\002 \001(\0132\020.voldemort.Error\&quot;\035\n\rGetAllReques&quot; +
       &quot;t\022\014\n\004keys\030\001 \003(\014\&quot;[\n\016GetAllResponse\022(\n\006val&quot; +
@@ -5107,7 +5105,7 @@ public final class VProto {
       &quot;demort.Versioned\&quot;.\n\013PutResponse\022\037\n\005error&quot; +
       &quot;\030\001 \001(\0132\020.voldemort.Error\&quot;E\n\rDeleteReques&quot; +
       &quot;t\022\013\n\003key\030\001 \002(\014\022\'\n\007version\030\002 \002(\0132\026.voldem&quot; +
-      &quot;ort.VectorClock\&quot;B\n\016DeleteResponse\022\017\n\007suc&quot; +
+      &quot;ort.VectorClock\&quot;B\n\016DeleteResponse\022\017\n\007suc&quot;,
       &quot;cess\030\001 \002(\010\022\037\n\005error\030\002 \001(\0132\020.voldemort.Er&quot; +
       &quot;ror\&quot;\200\002\n\020VoldemortRequest\022$\n\004type\030\001 \002(\0162\026&quot; +
       &quot;.voldemort.RequestType\022\033\n\014should_route\030\002&quot; +
@@ -5117,8 +5115,9 @@ public final class VProto {
       &quot;voldemort.PutRequest\022(\n\006delete\030\007 \001(\0132\030.v&quot; +
       &quot;oldemort.DeleteRequest*8\n\013RequestType\022\007\n&quot; +
       &quot;\003GET\020\000\022\013\n\007GET_ALL\020\001\022\007\n\003PUT\020\002\022\n\n\006DELETE\020\003&quot; +
-      &quot;B(\n\034voldemort.client.protocol.pbB\006VProto&quot; +
-      &quot;H\001&quot;;
+      &quot;B(\n\034voldemort.client.protocol.pbB\006VProto&quot;,
+      &quot;H\001&quot;
+    };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
         public com.google.protobuf.ExtensionRegistry assignDescriptors(
@@ -5244,4 +5243,6 @@ public final class VProto {
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
   }
+  
+  public static void internalForceInit() {}
 }</diff>
      <filename>src/java/voldemort/client/protocol/pb/VProto.java</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>lib/protobuf-java-2.1.0.jar</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>96e1e5ec8b7d4ea6c5a1da9cee3d878d3ea8b47b</id>
    </parent>
  </parents>
  <author>
    <name>Ismael Juma</name>
    <email>ismael@juma.me.uk</email>
  </author>
  <url>http://github.com/voldemort/voldemort/commit/5cd3c08b1b4e4dc773d39d803c0bfc0ab204098e</url>
  <id>5cd3c08b1b4e4dc773d39d803c0bfc0ab204098e</id>
  <committed-date>2009-09-18T07:37:50-07:00</committed-date>
  <authored-date>2009-09-18T07:37:50-07:00</authored-date>
  <message>Implement Issue 155: Upgrade to protobuf 2.2.0.</message>
  <tree>89325fd74aa8739e2c81208d4ae31f568c5a755b</tree>
  <committer>
    <name>Ismael Juma</name>
    <email>ismael@juma.me.uk</email>
  </committer>
</commit>
