protobufjs 3.6.0 → 3.8.2

package/docs/ProtoBuf.js.html

@@ -22,6 +22,7 @@
     
 
 
+
     
     <section>
         <article>
@@ -65,7 +66,7 @@
          * @const
          * @expose
          */
-        ProtoBuf.VERSION = "3.6.0";
+        ProtoBuf.VERSION = "3.8.2";
 
         /**
          * Wire types.
@@ -261,138 +262,138 @@
          */
         ProtoBuf.populateAccessors = true;
 
-        /**
-         * @alias ProtoBuf.Util
-         * @expose
-         */
-        ProtoBuf.Util = (function() {
-            "use strict";
-
-            // Object.create polyfill
-            // ref: https://developer.mozilla.org/de/docs/JavaScript/Reference/Global_Objects/Object/create
-            if (!Object.create)
-                /** @expose */
-                Object.create = function (o) {
-                    if (arguments.length > 1)
-                        throw Error('Object.create polyfill only accepts the first parameter.');
-                    function F() {}
-                    F.prototype = o;
-                    return new F();
-                };
-
-            /**
-             * ProtoBuf utilities.
-             * @exports ProtoBuf.Util
-             * @namespace
-             */
-            var Util = {};
-
-            /**
-             * Flag if running in node (fs is available) or not.
-             * @type {boolean}
-             * @const
-             * @expose
-             */
-            Util.IS_NODE = false;
-            try {
-                // There is no reliable way to detect node.js as an environment, so our
-                // best bet is to feature-detect what we actually need.
-                Util.IS_NODE =
-                    typeof require === 'function' &amp;&amp;
-                    typeof require("fs").readFileSync === 'function' &amp;&amp;
-                    typeof require("path").resolve === 'function';
-            } catch (e) {}
-
-            /**
-             * Constructs a XMLHttpRequest object.
-             * @return {XMLHttpRequest}
-             * @throws {Error} If XMLHttpRequest is not supported
-             * @expose
-             */
-            Util.XHR = function() {
-                // No dependencies please, ref: http://www.quirksmode.org/js/xmlhttp.html
-                var XMLHttpFactories = [
-                    function () {return new XMLHttpRequest()},
-                    function () {return new ActiveXObject("Msxml2.XMLHTTP")},
-                    function () {return new ActiveXObject("Msxml3.XMLHTTP")},
-                    function () {return new ActiveXObject("Microsoft.XMLHTTP")}
-                ];
-                /** @type {?XMLHttpRequest} */
-                var xhr = null;
-                for (var i=0;i&lt;XMLHttpFactories.length;i++) {
-                    try { xhr = XMLHttpFactories[i](); }
-                    catch (e) { continue; }
-                    break;
-                }
-                if (!xhr)
-                    throw Error("XMLHttpRequest is not supported");
-                return xhr;
-            };
-
-            /**
-             * Fetches a resource.
-             * @param {string} path Resource path
-             * @param {function(?string)=} callback Callback receiving the resource's contents. If omitted the resource will
-             *   be fetched synchronously. If the request failed, contents will be null.
-             * @return {?string|undefined} Resource contents if callback is omitted (null if the request failed), else undefined.
-             * @expose
-             */
-            Util.fetch = function(path, callback) {
-                if (callback &amp;&amp; typeof callback != 'function')
-                    callback = null;
-                if (Util.IS_NODE) {
-                    if (callback) {
-                        require("fs").readFile(path, function(err, data) {
-                            if (err)
-                                callback(null);
-                            else
-                                callback(""+data);
-                        });
-                    } else
-                        try {
-                            return require("fs").readFileSync(path);
-                        } catch (e) {
-                            return null;
-                        }
-                } else {
-                    var xhr = Util.XHR();
-                    xhr.open('GET', path, callback ? true : false);
-                    // xhr.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
-                    xhr.setRequestHeader('Accept', 'text/plain');
-                    if (typeof xhr.overrideMimeType === 'function') xhr.overrideMimeType('text/plain');
-                    if (callback) {
-                        xhr.onreadystatechange = function() {
-                            if (xhr.readyState != 4) return;
-                            if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 &amp;&amp; typeof xhr.responseText === 'string'))
-                                callback(xhr.responseText);
-                            else
-                                callback(null);
-                        };
-                        if (xhr.readyState == 4)
-                            return;
-                        xhr.send(null);
-                    } else {
-                        xhr.send(null);
-                        if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 &amp;&amp; typeof xhr.responseText === 'string'))
-                            return xhr.responseText;
-                        return null;
-                    }
-                }
-            };
-
-            /**
-             * Tests if an object is an array.
-             * @function
-             * @param {*} obj Object to test
-             * @returns {boolean} true if it is an array, else false
-             * @expose
-             */
-            Util.isArray = Array.isArray || function(obj) {
-                return Object.prototype.toString.call(obj) === "[object Array]";
-            };
-
-            return Util;
-        })();
+        /**
+         * @alias ProtoBuf.Util
+         * @expose
+         */
+        ProtoBuf.Util = (function() {
+            "use strict";
+
+            // Object.create polyfill
+            // ref: https://developer.mozilla.org/de/docs/JavaScript/Reference/Global_Objects/Object/create
+            if (!Object.create)
+                /** @expose */
+                Object.create = function (o) {
+                    if (arguments.length > 1)
+                        throw Error('Object.create polyfill only accepts the first parameter.');
+                    function F() {}
+                    F.prototype = o;
+                    return new F();
+                };
+
+            /**
+             * ProtoBuf utilities.
+             * @exports ProtoBuf.Util
+             * @namespace
+             */
+            var Util = {};
+
+            /**
+             * Flag if running in node (fs is available) or not.
+             * @type {boolean}
+             * @const
+             * @expose
+             */
+            Util.IS_NODE = false;
+            try {
+                // There is no reliable way to detect node.js as an environment, so our
+                // best bet is to feature-detect what we actually need.
+                Util.IS_NODE =
+                    typeof require === 'function' &amp;&amp;
+                    typeof require("fs").readFileSync === 'function' &amp;&amp;
+                    typeof require("path").resolve === 'function';
+            } catch (e) {}
+
+            /**
+             * Constructs a XMLHttpRequest object.
+             * @return {XMLHttpRequest}
+             * @throws {Error} If XMLHttpRequest is not supported
+             * @expose
+             */
+            Util.XHR = function() {
+                // No dependencies please, ref: http://www.quirksmode.org/js/xmlhttp.html
+                var XMLHttpFactories = [
+                    function () {return new XMLHttpRequest()},
+                    function () {return new ActiveXObject("Msxml2.XMLHTTP")},
+                    function () {return new ActiveXObject("Msxml3.XMLHTTP")},
+                    function () {return new ActiveXObject("Microsoft.XMLHTTP")}
+                ];
+                /** @type {?XMLHttpRequest} */
+                var xhr = null;
+                for (var i=0;i&lt;XMLHttpFactories.length;i++) {
+                    try { xhr = XMLHttpFactories[i](); }
+                    catch (e) { continue; }
+                    break;
+                }
+                if (!xhr)
+                    throw Error("XMLHttpRequest is not supported");
+                return xhr;
+            };
+
+            /**
+             * Fetches a resource.
+             * @param {string} path Resource path
+             * @param {function(?string)=} callback Callback receiving the resource's contents. If omitted the resource will
+             *   be fetched synchronously. If the request failed, contents will be null.
+             * @return {?string|undefined} Resource contents if callback is omitted (null if the request failed), else undefined.
+             * @expose
+             */
+            Util.fetch = function(path, callback) {
+                if (callback &amp;&amp; typeof callback != 'function')
+                    callback = null;
+                if (Util.IS_NODE) {
+                    if (callback) {
+                        require("fs").readFile(path, function(err, data) {
+                            if (err)
+                                callback(null);
+                            else
+                                callback(""+data);
+                        });
+                    } else
+                        try {
+                            return require("fs").readFileSync(path);
+                        } catch (e) {
+                            return null;
+                        }
+                } else {
+                    var xhr = Util.XHR();
+                    xhr.open('GET', path, callback ? true : false);
+                    // xhr.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
+                    xhr.setRequestHeader('Accept', 'text/plain');
+                    if (typeof xhr.overrideMimeType === 'function') xhr.overrideMimeType('text/plain');
+                    if (callback) {
+                        xhr.onreadystatechange = function() {
+                            if (xhr.readyState != 4) return;
+                            if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 &amp;&amp; typeof xhr.responseText === 'string'))
+                                callback(xhr.responseText);
+                            else
+                                callback(null);
+                        };
+                        if (xhr.readyState == 4)
+                            return;
+                        xhr.send(null);
+                    } else {
+                        xhr.send(null);
+                        if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 &amp;&amp; typeof xhr.responseText === 'string'))
+                            return xhr.responseText;
+                        return null;
+                    }
+                }
+            };
+
+            /**
+             * Tests if an object is an array.
+             * @function
+             * @param {*} obj Object to test
+             * @returns {boolean} true if it is an array, else false
+             * @expose
+             */
+            Util.isArray = Array.isArray || function(obj) {
+                return Object.prototype.toString.call(obj) === "[object Array]";
+            };
+
+            return Util;
+        })();
 
         /**
          * Language expressions.
@@ -429,7 +430,7 @@
             ID: /^(?:[1-9][0-9]*|0|0x[0-9a-fA-F]+|0[0-7]+)$/,
             NEGID: /^\-?(?:[1-9][0-9]*|0|0x[0-9a-fA-F]+|0[0-7]+)$/,
             WHITESPACE: /\s/,
-            STRING: /['"]([^'"\\]*(\\.[^"\\]*)*)['"]/g,
+            STRING: /(?:"([^"\\]*(?:\\.[^"\\]*)*)")|(?:'([^'\\]*(?:\\.[^'\\]*)*)')/g,
             BOOL: /^(?:true|false)$/i
         };
 
@@ -450,7 +451,7 @@
             /**
              * Constructs a new Tokenizer.
              * @exports ProtoBuf.DotProto.Tokenizer
-             * @class proto tokenizer
+             * @class prototype tokenizer
              * @param {string} proto Proto to tokenize
              * @constructor
              */
@@ -499,22 +500,28 @@
                 this.stringEndsWith = Lang.STRINGCLOSE;
             };
 
+            /**
+             * @alias ProtoBuf.DotProto.Tokenizer.prototype
+             * @inner
+             */
+            var TokenizerPrototype = Tokenizer.prototype;
+
             /**
              * Reads a string beginning at the current index.
              * @return {string} The string
              * @throws {Error} If it's not a valid string
              * @private
              */
-            Tokenizer.prototype._readString = function() {
+            TokenizerPrototype._readString = function() {
                 Lang.STRING.lastIndex = this.index-1; // Include the open quote
                 var match;
                 if ((match = Lang.STRING.exec(this.source)) !== null) {
-                    var s = match[1];
+                    var s = typeof match[1] !== 'undefined' ? match[1] : match[2];
                     this.index = Lang.STRING.lastIndex;
                     this.stack.push(this.stringEndsWith);
                     return s;
                 }
-                throw Error("Illegal string value at line "+this.line+", index "+this.index);
+                throw Error("Unterminated string at line "+this.line+", index "+this.index);
             };
 
             /**
@@ -523,7 +530,7 @@
              * @throws {Error} If it's not a valid proto file
              * @expose
              */
-            Tokenizer.prototype.next = function() {
+            TokenizerPrototype.next = function() {
                 if (this.stack.length > 0)
                     return this.stack.shift();
                 if (this.index >= this.source.length)
@@ -566,7 +573,7 @@
                             this.index++;
                             repeat = true;
                         } else
-                            throw Error("Invalid comment at line "+this.line+": /"+this.source.charAt(this.index)+" ('/' or '*' expected)");
+                            throw Error("Unterminated comment at line "+this.line+": /"+this.source.charAt(this.index));
                     }
                 } while (repeat);
                 if (this.index === this.source.length) return null;
@@ -597,7 +604,7 @@
              * @throws {Error} If it's not a valid proto file
              * @expose
              */
-            Tokenizer.prototype.peek = function() {
+            TokenizerPrototype.peek = function() {
                 if (this.stack.length === 0) {
                     var token = this.next();
                     if (token === null)
@@ -612,7 +619,7 @@
              * @return {string} String representation as of "Tokenizer(index/length)"
              * @expose
              */
-            Tokenizer.prototype.toString = function() {
+            TokenizerPrototype.toString = function() {
                 return "Tokenizer("+this.index+"/"+this.source.length+" at line "+this.line+")";
             };
 
@@ -625,7 +632,7 @@
             /**
              * Constructs a new Parser.
              * @exports ProtoBuf.DotProto.Parser
-             * @class proto parser
+             * @class prototype parser
              * @param {string} proto Protocol source
              * @constructor
              */
@@ -639,13 +646,19 @@
                 this.tn = new Tokenizer(proto);
             };
 
+            /**
+             * @alias ProtoBuf.DotProto.Parser.prototype
+             * @inner
+             */
+            var ParserPrototype = Parser.prototype;
+
             /**
              * Runs the parser.
              * @return {{package: string|null, messages: Array.&lt;object>, enums: Array.&lt;object>, imports: Array.&lt;string>, options: object&lt;string,*>}}
              * @throws {Error} If the source cannot be parsed
              * @expose
              */
-            Parser.prototype.parse = function() {
+            ParserPrototype.parse = function() {
                 var topLevel = {
                     "name": "[ROOT]", // temporary
                     "package": null,
@@ -660,12 +673,12 @@
                     switch (token) {
                         case 'package':
                             if (!head || topLevel["package"] !== null)
-                                throw Error("Illegal package at line "+this.tn.line);
+                                throw Error("Unexpected package at line "+this.tn.line);
                             topLevel["package"] = this._parsePackage(token);
                             break;
                         case 'import':
                             if (!head)
-                                throw Error("Illegal import at line "+this.tn.line);
+                                throw Error("Unexpected import at line "+this.tn.line);
                             topLevel.imports.push(this._parseImport(token));
                             break;
                         case 'message':
@@ -678,7 +691,7 @@
                             break;
                         case 'option':
                             if (!head)
-                                throw Error("Illegal option at line "+this.tn.line);
+                                throw Error("Unexpected option at line "+this.tn.line);
                             this._parseOption(topLevel, token);
                             break;
                         case 'service':
@@ -691,7 +704,7 @@
                             this._parseIgnoredStatement(topLevel, token);
                             break;
                         default:
-                            throw Error("Illegal token at line "+this.tn.line+": "+token);
+                            throw Error("Unexpected token at line "+this.tn.line+": "+token);
                     }
                 }
                 delete topLevel["name"];
@@ -705,7 +718,7 @@
              * @throws {Error} If the number value is invalid
              * @private
              */
-            Parser.prototype._parseNumber = function(val) {
+            ParserPrototype._parseNumber = function(val) {
                 var sign = 1;
                 if (val.charAt(0) == '-')
                     sign = -1,
@@ -723,18 +736,17 @@
 
             /**
              * Parses a (possibly multiline) string.
-             * @param {string} context Context description
              * @returns {string}
              * @private
              */
-            Parser.prototype._parseString = function(context) {
+            ParserPrototype._parseString = function() {
                 var value = "", token;
                 do {
                     token = this.tn.next(); // Known to be = this.tn.stringEndsWith
                     value += this.tn.next();
                     token = this.tn.next();
                     if (token !== this.tn.stringEndsWith)
-                        throw Error("Illegal end of string in "+context+" at line "+this.tn.line+": "+token+" ('"+this.tn.stringEndsWith+"' expected)");
+                        throw Error("Illegal end of string at line "+this.tn.line+": "+token);
                     token = this.tn.peek();
                 } while (token === Lang.STRINGOPEN || token === Lang.STRINGOPEN_SQ);
                 return value;
@@ -748,7 +760,7 @@
              * @throws {Error} If the ID value is invalid
              * @private
              */
-            Parser.prototype._parseId = function(val, neg) {
+            ParserPrototype._parseId = function(val, neg) {
                 var id = -1;
                 var sign = 1;
                 if (val.charAt(0) == '-')
@@ -761,10 +773,10 @@
                 else if (Lang.NUMBER_OCT.test(val))
                     id = parseInt(val.substring(1), 8);
                 else
-                    throw Error("Illegal ID at line "+this.tn.line+": "+(sign &lt; 0 ? '-' : '')+val);
+                    throw Error("Illegal id at line "+this.tn.line+": "+(sign &lt; 0 ? '-' : '')+val);
                 id = (sign*id)|0; // Force to 32bit
                 if (!neg &amp;&amp; id &lt; 0)
-                    throw Error("Illegal ID at line "+this.tn.line+": "+(sign &lt; 0 ? '-' : '')+val);
+                    throw Error("Illegal id at line "+this.tn.line+": "+(sign &lt; 0 ? '-' : '')+val);
                 return id;
             };
 
@@ -775,14 +787,14 @@
              * @throws {Error} If the package definition cannot be parsed
              * @private
              */
-            Parser.prototype._parsePackage = function(token) {
+            ParserPrototype._parsePackage = function(token) {
                 token = this.tn.next();
                 if (!Lang.TYPEREF.test(token))
-                    throw Error("Illegal package at line "+this.tn.line+": "+token);
+                    throw Error("Illegal package name at line "+this.tn.line+": "+token);
                 var pkg = token;
                 token = this.tn.next();
                 if (token != Lang.END)
-                    throw Error("Illegal end of package at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+                    throw Error("Illegal end of package at line "+this.tn.line+": "+token);
                 return pkg;
             };
 
@@ -793,17 +805,17 @@
              * @throws {Error} If the import definition cannot be parsed
              * @private
              */
-            Parser.prototype._parseImport = function(token) {
+            ParserPrototype._parseImport = function(token) {
                 token = this.tn.peek();
                 if (token === "public")
                     this.tn.next(),
                     token = this.tn.peek();
                 if (token !== Lang.STRINGOPEN &amp;&amp; token !== Lang.STRINGOPEN_SQ)
-                    throw Error("Illegal import at line "+this.tn.line+": "+token+" ('"+Lang.STRINGOPEN+"' or '"+Lang.STRINGOPEN_SQ+"' expected)");
-                var imported = this._parseString("root");
+                    throw Error("Illegal start of import at line "+this.tn.line+": "+token);
+                var imported = this._parseString();
                 token = this.tn.next();
                 if (token !== Lang.END)
-                    throw Error("Illegal import at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+                    throw Error("Illegal end of import at line "+this.tn.line+": "+token);
                 return imported;
             };
 
@@ -814,7 +826,7 @@
              * @throws {Error} If the option cannot be parsed
              * @private
              */
-            Parser.prototype._parseOption = function(parent, token) {
+            ParserPrototype._parseOption = function(parent, token) {
                 token = this.tn.next();
                 var custom = false;
                 if (token == Lang.COPTOPEN)
@@ -823,12 +835,12 @@
                 if (!Lang.TYPEREF.test(token))
                     // we can allow options of the form google.protobuf.* since they will just get ignored anyways
                     if (!/google\.protobuf\./.test(token))
-                        throw Error("Illegal option in message "+parent.name+" at line "+this.tn.line+": "+token);
+                        throw Error("Illegal option name in message "+parent.name+" at line "+this.tn.line+": "+token);
                 var name = token;
                 token = this.tn.next();
                 if (custom) { // (my_method_option).foo, (my_method_option), some_method_option, (foo.my_option).bar
                     if (token !== Lang.COPTCLOSE)
-                        throw Error("Illegal option in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTCLOSE+"' expected)");
+                        throw Error("Illegal end in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token);
                     name = '('+name+')';
                     token = this.tn.next();
                     if (Lang.FQTYPEREF.test(token))
@@ -836,11 +848,11 @@
                         token = this.tn.next();
                 }
                 if (token !== Lang.EQUAL)
-                    throw Error("Illegal option operator in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+                    throw Error("Illegal operator in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token);
                 var value;
                 token = this.tn.peek();
                 if (token === Lang.STRINGOPEN || token === Lang.STRINGOPEN_SQ)
-                    value = this._parseString("message "+parent.name+", option "+name);
+                    value = this._parseString();
                 else {
                     this.tn.next();
                     if (Lang.NUMBER.test(token))
@@ -854,7 +866,7 @@
                 }
                 token = this.tn.next();
                 if (token !== Lang.END)
-                    throw Error("Illegal end of option in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+                    throw Error("Illegal end of option in message "+parent.name+", option "+name+" at line "+this.tn.line+": "+token);
                 parent["options"][name] = value;
             };
 
@@ -865,12 +877,12 @@
              * @throws {Error} If the directive cannot be parsed
              * @private
              */
-            Parser.prototype._parseIgnoredStatement = function(parent, keyword) {
+            ParserPrototype._parseIgnoredStatement = function(parent, keyword) {
                 var token;
                 do {
                     token = this.tn.next();
                     if (token === null)
-                        throw Error("Unexpected EOF in "+parent.name+", "+keyword+" (ignored) at line "+this.tn.line);
+                        throw Error("Unexpected EOF in "+parent.name+", "+keyword+" at line "+this.tn.line);
                     if (token === Lang.END)
                         break;
                 } while (true);
@@ -883,7 +895,7 @@
              * @throws {Error} If the service cannot be parsed
              * @private
              */
-            Parser.prototype._parseService = function(parent, token) {
+            ParserPrototype._parseService = function(parent, token) {
                 token = this.tn.next();
                 if (!Lang.NAME.test(token))
                     throw Error("Illegal service name at line "+this.tn.line+": "+token);
@@ -895,7 +907,7 @@
                 };
                 token = this.tn.next();
                 if (token !== Lang.OPEN)
-                    throw Error("Illegal OPEN after service "+name+" at line "+this.tn.line+": "+token+" ('"+Lang.OPEN+"' expected)");
+                    throw Error("Illegal start of service "+name+" at line "+this.tn.line+": "+token);
                 do {
                     token = this.tn.next();
                     if (token === "option")
@@ -903,7 +915,7 @@
                     else if (token === 'rpc')
                         this._parseServiceRPC(svc, token);
                     else if (token !== Lang.CLOSE)
-                        throw Error("Illegal type for service "+name+" at line "+this.tn.line+": "+token);
+                        throw Error("Illegal type of service "+name+" at line "+this.tn.line+": "+token);
                 } while (token !== Lang.CLOSE);
                 parent["services"].push(svc);
             };
@@ -914,11 +926,11 @@
              * @param {string} token Initial token
              * @private
              */
-            Parser.prototype._parseServiceRPC = function(svc, token) {
+            ParserPrototype._parseServiceRPC = function(svc, token) {
                 var type = token;
                 token = this.tn.next();
                 if (!Lang.NAME.test(token))
-                    throw Error("Illegal RPC method name in service "+svc["name"]+" at line "+this.tn.line+": "+token);
+                    throw Error("Illegal method name in service "+svc["name"]+" at line "+this.tn.line+": "+token);
                 var name = token;
                 var method = {
                     "request": null,
@@ -927,25 +939,25 @@
                 };
                 token = this.tn.next();
                 if (token !== Lang.COPTOPEN)
-                    throw Error("Illegal start of request type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTOPEN+"' expected)");
+                    throw Error("Illegal start of request type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 if (!Lang.TYPEREF.test(token))
-                    throw Error("Illegal request type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
+                    throw Error("Illegal request type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 method["request"] = token;
                 token = this.tn.next();
                 if (token != Lang.COPTCLOSE)
-                    throw Error("Illegal end of request type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTCLOSE+"' expected)");
+                    throw Error("Illegal end of request type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 if (token.toLowerCase() !== "returns")
-                    throw Error("Illegal request/response delimiter in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('returns' expected)");
+                    throw Error("Illegal delimiter in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 if (token != Lang.COPTOPEN)
-                    throw Error("Illegal start of response type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTOPEN+"' expected)");
+                    throw Error("Illegal start of response type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 method["response"] = token;
                 token = this.tn.next();
                 if (token !== Lang.COPTCLOSE)
-                    throw Error("Illegal end of response type in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.COPTCLOSE+"' expected)");
+                    throw Error("Illegal end of response type in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 if (token === Lang.OPEN) {
                     do {
@@ -953,12 +965,12 @@
                         if (token === 'option')
                             this._parseOption(method, token); // &lt;- will fail for the custom-options example
                         else if (token !== Lang.CLOSE)
-                            throw Error("Illegal start of option in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('option' expected)");
+                            throw Error("Illegal start of option inservice "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                     } while (token !== Lang.CLOSE);
                     if (this.tn.peek() === Lang.END)
                         this.tn.next();
                 } else if (token !== Lang.END)
-                    throw Error("Illegal method delimiter in RPC service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' or '"+Lang.OPEN+"' expected)");
+                    throw Error("Illegal delimiter in service "+svc["name"]+"#"+name+" at line "+this.tn.line+": "+token);
                 if (typeof svc[type] === 'undefined')
                     svc[type] = {};
                 svc[type][name] = method;
@@ -973,7 +985,7 @@
              * @throws {Error} If the message cannot be parsed
              * @private
              */
-            Parser.prototype._parseMessage = function(parent, fld, token) {
+            ParserPrototype._parseMessage = function(parent, fld, token) {
                 /** @dict */
                 var msg = {}; // Note: At some point we might want to exclude the parser, so we need a dict.
                 var isGroup = token === "group";
@@ -984,7 +996,7 @@
                 if (isGroup) {
                     token = this.tn.next();
                     if (token !== Lang.EQUAL)
-                        throw Error("Illegal id assignment after group "+msg.name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+                        throw Error("Illegal id assignment after group "+msg.name+" at line "+this.tn.line+": "+token);
                     token = this.tn.next();
                     try {
                         fld["id"] = this._parseId(token);
@@ -997,12 +1009,13 @@
                 msg["enums"] = [];
                 msg["messages"] = [];
                 msg["options"] = {};
+                msg["oneofs"] = {};
                 token = this.tn.next();
                 if (token === Lang.OPTOPEN &amp;&amp; fld)
                     this._parseFieldOptions(msg, fld, token),
                     token = this.tn.next();
                 if (token !== Lang.OPEN)
-                    throw Error("Illegal OPEN after "+(isGroup ? "group" : "message")+" "+msg.name+" at line "+this.tn.line+": "+token+" ('"+Lang.OPEN+"' expected)");
+                    throw Error("Illegal start of "+(isGroup ? "group" : "message")+" "+msg.name+" at line "+this.tn.line+": "+token);
                 // msg["extensions"] = undefined
                 do {
                     token = this.tn.next();
@@ -1013,6 +1026,8 @@
                         break;
                     } else if (Lang.RULE.test(token))
                         this._parseMessageField(msg, token);
+                    else if (token === "oneof")
+                        this._parseMessageOneOf(msg, token);
                     else if (token === "enum")
                         this._parseEnum(msg, token);
                     else if (token === "message")
@@ -1024,7 +1039,7 @@
                     else if (token === "extend")
                         this._parseExtend(msg, token);
                     else
-                        throw Error("Illegal token in message "+msg.name+" at line "+this.tn.line+": "+token+" (type or '"+Lang.CLOSE+"' expected)");
+                        throw Error("Illegal token in message "+msg.name+" at line "+this.tn.line+": "+token);
                 } while (true);
                 parent["messages"].push(msg);
                 return msg;
@@ -1034,10 +1049,11 @@
              * Parses a message field.
              * @param {Object} msg Message definition
              * @param {string} token Initial token
+             * @returns {!Object} Field descriptor
              * @throws {Error} If the message field cannot be parsed
              * @private
              */
-            Parser.prototype._parseMessageField = function(msg, token) {
+            ParserPrototype._parseMessageField = function(msg, token) {
                 /** @dict */
                 var fld = {}, grp = null;
                 fld["rule"] = token;
@@ -1066,21 +1082,48 @@
                     fld["name"] = token;
                     token = this.tn.next();
                     if (token !== Lang.EQUAL)
-                        throw Error("Illegal field id assignment in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+                        throw Error("Illegal token in field "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                     token = this.tn.next();
                     try {
                         fld["id"] = this._parseId(token);
                     } catch (e) {
-                        throw Error("Illegal field id value in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
+                        throw Error("Illegal field id in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                     }
                     token = this.tn.next();
                     if (token === Lang.OPTOPEN)
                         this._parseFieldOptions(msg, fld, token),
                         token = this.tn.next();
                     if (token !== Lang.END)
-                        throw Error("Illegal field delimiter in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+                        throw Error("Illegal delimiter in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                 }
                 msg["fields"].push(fld);
+                return fld;
+            };
+
+            /**
+             * Parses a message oneof.
+             * @param {Object} msg Message definition
+             * @param {string} token Initial token
+             * @throws {Error} If the message oneof cannot be parsed
+             * @private
+             */
+            ParserPrototype._parseMessageOneOf = function(msg, token) {
+                token = this.tn.next();
+                if (!Lang.NAME.test(token))
+                    throw Error("Illegal oneof name in message "+msg.name+" at line "+this.tn.line+": "+token);
+                var name = token,
+                    fld;
+                var fields = [];
+                token = this.tn.next();
+                if (token !== Lang.OPEN)
+                    throw Error("Illegal start of oneof "+name+" at line "+this.tn.line+": "+token);
+                while (this.tn.peek() !== Lang.CLOSE) {
+                    fld = this._parseMessageField(msg, "optional");
+                    fld["oneof"] = name;
+                    fields.push(fld["id"]);
+                }
+                this.tn.next();
+                msg["oneofs"][name] = fields;
             };
 
             /**
@@ -1091,7 +1134,7 @@
              * @throws {Error} If the message field options cannot be parsed
              * @private
              */
-            Parser.prototype._parseFieldOptions = function(msg, fld, token) {
+            ParserPrototype._parseFieldOptions = function(msg, fld, token) {
                 var first = true;
                 do {
                     token = this.tn.next();
@@ -1099,7 +1142,7 @@
                         break;
                     else if (token === Lang.OPTEND) {
                         if (first)
-                            throw Error("Illegal start of message field options in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
+                            throw Error("Illegal start of options in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                         token = this.tn.next();
                     }
                     this._parseFieldOption(msg, fld, token);
@@ -1115,18 +1158,18 @@
              * @throws {Error} If the mesage field option cannot be parsed
              * @private
              */
-            Parser.prototype._parseFieldOption = function(msg, fld, token) {
+            ParserPrototype._parseFieldOption = function(msg, fld, token) {
                 var custom = false;
                 if (token === Lang.COPTOPEN)
                     token = this.tn.next(),
                     custom = true;
                 if (!Lang.TYPEREF.test(token))
-                    throw Error("Illegal field option in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
+                    throw Error("Illegal field option in "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                 var name = token;
                 token = this.tn.next();
                 if (custom) {
                     if (token !== Lang.COPTCLOSE)
-                        throw Error("Illegal custom field option name delimiter in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" (')' expected)");
+                        throw Error("Illegal delimiter in "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                     name = '('+name+')';
                     token = this.tn.next();
                     if (Lang.FQTYPEREF.test(token))
@@ -1134,11 +1177,11 @@
                         token = this.tn.next();
                 }
                 if (token !== Lang.EQUAL)
-                    throw Error("Illegal field option operation in message "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token+" ('=' expected)");
+                    throw Error("Illegal token in "+msg.name+"#"+fld.name+" at line "+this.tn.line+": "+token);
                 var value;
                 token = this.tn.peek();
                 if (token === Lang.STRINGOPEN || token === Lang.STRINGOPEN_SQ) {
-                    value = this._parseString("message "+msg.name+"#"+fld.name);
+                    value = this._parseString();
                 } else if (Lang.NUMBER.test(token, true))
                     value = this._parseNumber(this.tn.next(), true);
                 else if (Lang.BOOL.test(token))
@@ -1146,7 +1189,7 @@
                 else if (Lang.TYPEREF.test(token))
                     value = this.tn.next(); // TODO: Resolve?
                 else
-                    throw Error("Illegal field option value in message "+msg.name+"#"+fld.name+", option "+name+" at line "+this.tn.line+": "+token);
+                    throw Error("Illegal value in message "+msg.name+"#"+fld.name+", option "+name+" at line "+this.tn.line+": "+token);
                 fld["options"][name] = value;
             };
 
@@ -1157,7 +1200,7 @@
              * @throws {Error} If the enum cannot be parsed
              * @private
              */
-            Parser.prototype._parseEnum = function(msg, token) {
+            ParserPrototype._parseEnum = function(msg, token) {
                 /** @dict */
                 var enm = {};
                 token = this.tn.next();
@@ -1166,7 +1209,7 @@
                 enm["name"] = token;
                 token = this.tn.next();
                 if (token !== Lang.OPEN)
-                    throw Error("Illegal OPEN after enum "+enm.name+" at line "+this.tn.line+": "+token);
+                    throw Error("Illegal start of enum "+enm.name+" at line "+this.tn.line+": "+token);
                 enm["values"] = [];
                 enm["options"] = {};
                 do {
@@ -1181,7 +1224,7 @@
                         this._parseOption(enm, token);
                     else {
                         if (!Lang.NAME.test(token))
-                            throw Error("Illegal enum value name in enum "+enm.name+" at line "+this.tn.line+": "+token);
+                            throw Error("Illegal name in enum "+enm.name+" at line "+this.tn.line+": "+token);
                         this._parseEnumValue(enm, token);
                     }
                 } while (true);
@@ -1195,18 +1238,18 @@
              * @throws {Error} If the enum value cannot be parsed
              * @private
              */
-            Parser.prototype._parseEnumValue = function(enm, token) {
+            ParserPrototype._parseEnumValue = function(enm, token) {
                 /** @dict */
                 var val = {};
                 val["name"] = token;
                 token = this.tn.next();
                 if (token !== Lang.EQUAL)
-                    throw Error("Illegal enum value operator in enum "+enm.name+" at line "+this.tn.line+": "+token+" ('"+Lang.EQUAL+"' expected)");
+                    throw Error("Illegal token in enum "+enm.name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 try {
                     val["id"] = this._parseId(token, true);
                 } catch (e) {
-                    throw Error("Illegal enum value id in enum "+enm.name+" at line "+this.tn.line+": "+token);
+                    throw Error("Illegal id in enum "+enm.name+" at line "+this.tn.line+": "+token);
                 }
                 enm["values"].push(val);
                 token = this.tn.next();
@@ -1216,7 +1259,7 @@
                     token = this.tn.next();
                 }
                 if (token !== Lang.END)
-                    throw Error("Illegal enum value delimiter in enum "+enm.name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+                    throw Error("Illegal delimiter in enum "+enm.name+" at line "+this.tn.line+": "+token);
             };
 
             /**
@@ -1226,7 +1269,7 @@
              * @throws {Error} If the extensions statement cannot be parsed
              * @private
              */
-            Parser.prototype._parseExtensions = function(msg, token) {
+            ParserPrototype._parseExtensions = function(msg, token) {
                 /** @type {Array.&lt;number>} */
                 var range = [];
                 token = this.tn.next();
@@ -1238,7 +1281,7 @@
                     range.push(this._parseNumber(token));
                 token = this.tn.next();
                 if (token !== 'to')
-                    throw Error("Illegal extensions delimiter in message "+msg.name+" at line "+this.tn.line+" ('to' expected)");
+                    throw Error("Illegal extensions delimiter in message "+msg.name+" at line "+this.tn.line+": "+token);
                 token = this.tn.next();
                 if (token === "min")
                     range.push(ProtoBuf.ID_MIN);
@@ -1248,7 +1291,7 @@
                     range.push(this._parseNumber(token));
                 token = this.tn.next();
                 if (token !== Lang.END)
-                    throw Error("Illegal extension delimiter in message "+msg.name+" at line "+this.tn.line+": "+token+" ('"+Lang.END+"' expected)");
+                    throw Error("Illegal extensions delimiter in message "+msg.name+" at line "+this.tn.line+": "+token);
                 return range;
             };
 
@@ -1259,17 +1302,17 @@
              * @throws {Error} If the extend block cannot be parsed
              * @private
              */
-            Parser.prototype._parseExtend = function(parent, token) {
+            ParserPrototype._parseExtend = function(parent, token) {
                 token = this.tn.next();
                 if (!Lang.TYPEREF.test(token))
-                    throw Error("Illegal extended message name at line "+this.tn.line+": "+token);
+                    throw Error("Illegal message name at line "+this.tn.line+": "+token);
                 /** @dict */
                 var ext = {};
                 ext["ref"] = token;
                 ext["fields"] = [];
                 token = this.tn.next();
                 if (token !== Lang.OPEN)
-                    throw Error("Illegal OPEN in extend "+ext.name+" at line "+this.tn.line+": "+token+" ('"+Lang.OPEN+"' expected)");
+                    throw Error("Illegal start of extend "+ext.name+" at line "+this.tn.line+": "+token);
                 do {
                     token = this.tn.next();
                     if (token === Lang.CLOSE) {
@@ -1280,7 +1323,7 @@
                     } else if (Lang.RULE.test(token))
                         this._parseMessageField(ext, token);
                     else
-                        throw Error("Illegal token in extend "+ext.name+" at line "+this.tn.line+": "+token+" (rule or '"+Lang.CLOSE+"' expected)");
+                        throw Error("Illegal token in extend "+ext.name+" at line "+this.tn.line+": "+token);
                 } while (true);
                 parent["messages"].push(ext);
                 return ext;
@@ -1290,7 +1333,7 @@
              * Returns a string representation of this object.
              * @returns {string} String representation as of "Parser"
              */
-            Parser.prototype.toString = function() {
+            ParserPrototype.toString = function() {
                 return "Parser";
             };
 
@@ -1323,14 +1366,22 @@
              * @exports ProtoBuf.Reflect.T
              * @constructor
              * @abstract
-             * @param {ProtoBuf.Reflect.T} parent Parent object
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {?ProtoBuf.Reflect.T} parent Parent object
              * @param {string} name Object name
              */
-            var T = function(parent, name) {
+            var T = function(builder, parent, name) {
+
+                /**
+                 * Builder reference.
+                 * @type {!ProtoBuf.Builder}
+                 * @expose
+                 */
+                this.builder = builder;
 
                 /**
                  * Parent object.
-                 * @type {ProtoBuf.Reflect.T|null}
+                 * @type {?ProtoBuf.Reflect.T}
                  * @expose
                  */
                 this.parent = parent;
@@ -1350,12 +1401,18 @@
                 this.className;
             };
 
+            /**
+             * @alias ProtoBuf.Reflect.T.prototype
+             * @inner
+             */
+            var TPrototype = T.prototype;
+
             /**
              * Returns the fully qualified name of this object.
              * @returns {string} Fully qualified name as of ".PATH.TO.THIS"
              * @expose
              */
-            T.prototype.fqn = function() {
+            TPrototype.fqn = function() {
                 var name = this.name,
                     ptr = this;
                 do {
@@ -1373,7 +1430,7 @@
              * @return String representation
              * @expose
              */
-            T.prototype.toString = function(includeClass) {
+            TPrototype.toString = function(includeClass) {
                 return (includeClass ? this.className + " " : "") + this.fqn();
             };
 
@@ -1382,7 +1439,7 @@
              * @throws {Error} If this type cannot be built directly
              * @expose
              */
-            T.prototype.build = function() {
+            TPrototype.build = function() {
                 throw Error(this.toString(true)+" cannot be built directly");
             };
 
@@ -1395,14 +1452,15 @@
             /**
              * Constructs a new Namespace.
              * @exports ProtoBuf.Reflect.Namespace
-             * @param {ProtoBuf.Reflect.Namespace|null} parent Namespace parent
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {?ProtoBuf.Reflect.Namespace} parent Namespace parent
              * @param {string} name Namespace name
-             * @param {Object.&lt;string,*>} options Namespace options
+             * @param {Object.&lt;string,*>=} options Namespace options
              * @constructor
              * @extends ProtoBuf.Reflect.T
              */
-            var Namespace = function(parent, name, options) {
-                T.call(this, parent, name);
+            var Namespace = function(builder, parent, name, options) {
+                T.call(this, builder, parent, name);
 
                 /**
                  * @override
@@ -1411,19 +1469,22 @@
 
                 /**
                  * Children inside the namespace.
-                 * @type {Array.&lt;ProtoBuf.Reflect.T>}
+                 * @type {!Array.&lt;ProtoBuf.Reflect.T>}
                  */
                 this.children = [];
 
                 /**
                  * Options.
-                 * @type {Object.&lt;string, *>}
+                 * @type {!Object.&lt;string, *>}
                  */
                 this.options = options || {};
             };
 
-            // Extends T
-            Namespace.prototype = Object.create(T.prototype);
+            /**
+             * @alias ProtoBuf.Reflect.Namespace.prototype
+             * @inner
+             */
+            var NamespacePrototype = Namespace.prototype = Object.create(T.prototype);
 
             /**
              * Returns an array of the namespace's children.
@@ -1431,7 +1492,7 @@
              * @return {Array.&lt;ProtoBuf.Reflect.T>}
              * @expose
              */
-            Namespace.prototype.getChildren = function(type) {
+            NamespacePrototype.getChildren = function(type) {
                 type = type || null;
                 if (type == null)
                     return this.children.slice();
@@ -1448,7 +1509,7 @@
              * @throws {Error} If the child cannot be added (duplicate)
              * @expose
              */
-            Namespace.prototype.addChild = function(child) {
+            NamespacePrototype.addChild = function(child) {
                 var other;
                 if (other = this.getChild(child.name)) {
                     // Try to revert camelcase transformation on collision
@@ -1468,7 +1529,7 @@
              * @return {?ProtoBuf.Reflect.T} The child or null if not found
              * @expose
              */
-            Namespace.prototype.getChild = function(nameOrId) {
+            NamespacePrototype.getChild = function(nameOrId) {
                 var key = typeof nameOrId === 'number' ? 'id' : 'name';
                 for (var i=0, k=this.children.length; i&lt;k; ++i)
                     if (this.children[i][key] === nameOrId)
@@ -1483,7 +1544,7 @@
              * @return {?ProtoBuf.Reflect.Namespace} The resolved type or null if not found
              * @expose
              */
-            Namespace.prototype.resolve = function(qn, excludeFields) {
+            NamespacePrototype.resolve = function(qn, excludeFields) {
                 var part = qn.split("."),
                     ptr = this,
                     i = 0;
@@ -1517,7 +1578,7 @@
              * @return {Object.&lt;string,Function|Object>} Runtime namespace
              * @expose
              */
-            Namespace.prototype.build = function() {
+            NamespacePrototype.build = function() {
                 /** @dict */
                 var ns = {};
                 var children = this.children;
@@ -1535,7 +1596,7 @@
              * Builds the namespace's '$options' property.
              * @return {Object.&lt;string,*>}
              */
-            Namespace.prototype.buildOpt = function() {
+            NamespacePrototype.buildOpt = function() {
                 var opt = {},
                     keys = Object.keys(this.options);
                 for (var i=0, k=keys.length; i&lt;k; ++i) {
@@ -1556,7 +1617,7 @@
              * @param {string=} name Returns the option value if specified, otherwise all options are returned.
              * @return {*|Object.&lt;string,*>}null} Option value or NULL if there is no such option
              */
-            Namespace.prototype.getOption = function(name) {
+            NamespacePrototype.getOption = function(name) {
                 if (typeof name === 'undefined')
                     return this.options;
                 return typeof this.options[name] !== 'undefined' ? this.options[name] : null;
@@ -1571,15 +1632,16 @@
             /**
              * Constructs a new Message.
              * @exports ProtoBuf.Reflect.Message
-             * @param {ProtoBuf.Reflect.Namespace} parent Parent message or namespace
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {!ProtoBuf.Reflect.Namespace} parent Parent message or namespace
              * @param {string} name Message name
-             * @param {Object.&lt;string,*>} options Message options
+             * @param {Object.&lt;string,*>=} options Message options
              * @param {boolean=} isGroup `true` if this is a legacy group
              * @constructor
              * @extends ProtoBuf.Reflect.Namespace
              */
-            var Message = function(parent, name, options, isGroup) {
-                Namespace.call(this, parent, name, options);
+            var Message = function(builder, parent, name, options, isGroup) {
+                Namespace.call(this, builder, parent, name, options);
 
                 /**
                  * @override
@@ -1622,10 +1684,20 @@
                  * @private
                  */
                 this._fieldsById = null;
+
+                /**
+                 * Cached fields by name.
+                 * @type {?Object.&lt;string,!ProtoBuf.Reflect.Message.Field>}
+                 * @private
+                 */
+                this._fieldsByName = null;
             };
 
-            // Extends Namespace
-            Message.prototype = Object.create(Namespace.prototype);
+            /**
+             * @alias ProtoBuf.Reflect.Message.prototype
+             * @inner
+             */
+            var MessagePrototype = Message.prototype = Object.create(Namespace.prototype);
 
             /**
              * Builds the message and returns the runtime counterpart, which is a fully functional class.
@@ -1635,14 +1707,15 @@
              * @throws {Error} If the message cannot be built
              * @expose
              */
-            Message.prototype.build = function(rebuild) {
+            MessagePrototype.build = function(rebuild) {
                 if (this.clazz &amp;&amp; !rebuild)
                     return this.clazz;
 
                 // Create the runtime Message class in its own scope
                 var clazz = (function(ProtoBuf, T) {
 
-                    var fields = T.getChildren(ProtoBuf.Reflect.Message.Field);
+                    var fields = T.getChildren(ProtoBuf.Reflect.Message.Field),
+                        oneofs = T.getChildren(ProtoBuf.Reflect.Message.OneOf);
 
                     /**
                      * Constructs a new runtime Message.
@@ -1656,9 +1729,13 @@
                     var Message = function(values, var_args) {
                         ProtoBuf.Builder.Message.call(this);
 
-                        // Create fields on the object itself and set default values
-                        for (var i=0, k=fields.length, field; i&lt;k; ++i) {
-                            this[(field = fields[i]).name] = field.repeated ? [] : null;
+                        // Create virtual oneof properties
+                        for (var i=0, k=oneofs.length; i&lt;k; ++i)
+                            this[oneofs[i].name] = null;
+                        // Create fields and set default values
+                        for (i=0, k=fields.length; i&lt;k; ++i) {
+                            var field = fields[i];
+                            this[field.name] = field.repeated ? [] : null;
                             if (field.required &amp;&amp; field.defaultValue !== null)
                                 this[field.name] = field.defaultValue;
                         }
@@ -1674,21 +1751,17 @@
                                 var keys = Object.keys(values);
                                 for (i=0, k=keys.length; i&lt;k; ++i)
                                     this.$set(keys[i], values[keys[i]]); // May throw
-                            } else // set field values from arguments, in declaration order
+                            } else // Set field values from arguments, in declaration order
                                 for (i=0, k=arguments.length; i&lt;k; ++i)
                                     this.$set(fields[i].name, arguments[i]); // May throw
                         }
                     };
 
                     /**
-                     * The message's reflection type.
-                     * @name ProtoBuf.Builder.Message#$type
-                     * @type {!ProtoBuf.Reflect.Message}
-                     * @expose
+                     * @alias ProtoBuf.Builder.Message.prototype
+                     * @inner
                      */
-
-                    // Extends ProtoBuf.Builder.Message
-                    Message.prototype = Object.create(ProtoBuf.Builder.Message.prototype);
+                    var MessagePrototype = Message.prototype = Object.create(ProtoBuf.Builder.Message.prototype);
 
                     /**
                      * Adds a value to a repeated field.
@@ -1700,14 +1773,16 @@
                      * @throws {Error} If the value cannot be added
                      * @expose
                      */
-                    Message.prototype.add = function(key, value, noAssert) {
-                        var field = T.getChild(key);
-                        if (!field)
-                            throw Error(this+"#"+key+" is undefined");
-                        if (!(field instanceof ProtoBuf.Reflect.Message.Field))
-                            throw Error(this+"#"+key+" is not a field: "+field.toString(true)); // May throw if it's an enum or embedded message
-                        if (!field.repeated)
-                            throw Error(this+"#"+key+" is not a repeated field");
+                    MessagePrototype.add = function(key, value, noAssert) {
+                        var field = T._fieldsByName[key];
+                        if (!noAssert) {
+                            if (!field)
+                                throw Error(this+"#"+key+" is undefined");
+                            if (!(field instanceof ProtoBuf.Reflect.Message.Field))
+                                throw Error(this+"#"+key+" is not a field: "+field.toString(true)); // May throw if it's an enum or embedded message
+                            if (!field.repeated)
+                                throw Error(this+"#"+key+" is not a repeated field");
+                        }
                         if (this[field.name] === null)
                             this[field.name] = [];
                         this[field.name].push(noAssert ? value : field.verifyValue(value, true));
@@ -1723,7 +1798,7 @@
                      * @throws {Error} If the value cannot be added
                      * @expose
                      */
-                    Message.prototype.$add = Message.prototype.add;
+                    MessagePrototype.$add = MessagePrototype.add;
 
                     /**
                      * Sets a field's value.
@@ -1736,23 +1811,31 @@
                      * @throws {Error} If the value cannot be set
                      * @expose
                      */
-                    Message.prototype.set = function(key, value, noAssert) {
+                    MessagePrototype.set = function(key, value, noAssert) {
                         if (key &amp;&amp; typeof key === 'object') {
                             for (var i in key)
                                 if (key.hasOwnProperty(i))
                                     this.$set(i, key[i], noAssert);
                             return this;
                         }
-                        if (noAssert) {
-                            this[key] = value;
-                            return this;
+                        var field = T._fieldsByName[key];
+                        if (!noAssert) {
+                            if (!field)
+                                throw Error(this+"#"+key+" is not a field: undefined");
+                            if (!(field instanceof ProtoBuf.Reflect.Message.Field))
+                                throw Error(this+"#"+key+" is not a field: "+field.toString(true));
+                            this[field.name] = (value = field.verifyValue(value)); // May throw
+                        } else {
+                            this[field.name] = value;
+                        }
+                        if (field.oneof) {
+                            if (value !== null) {
+                                if (this[field.oneof.name] !== null)
+                                    this[this[field.oneof.name]] = null; // Unset the previous (field name is the oneof field's value)
+                                this[field.oneof.name] = field.name;
+                            } else if (field.oneof.name === key)
+                                this[field.oneof.name] = null;
                         }
-                        var field = T.getChild(key);
-                        if (!field)
-                            throw Error(this+"#"+key+" is not a field: undefined");
-                        if (!(field instanceof ProtoBuf.Reflect.Message.Field))
-                            throw Error(this+"#"+key+" is not a field: "+field.toString(true));
-                        this[field.name] = field.verifyValue(value); // May throw
                         return this;
                     };
 
@@ -1762,26 +1845,26 @@
                      * @function
                      * @param {string} key Key
                      * @param {*} value Value to set
-                     * @param {boolean=} noAssert Whether to assert the value or not (asserts by default)
+                     * @param {boolean=} noAssert Whether to not assert the value, defaults to `false`
                      * @throws {Error} If the value cannot be set
                      * @expose
                      */
-                    Message.prototype.$set = Message.prototype.set;
+                    MessagePrototype.$set = MessagePrototype.set;
 
                     /**
                      * Gets a field's value.
                      * @name ProtoBuf.Builder.Message#get
                      * @function
                      * @param {string} key Key
-                     * @param {boolean=} noAssert Whether to no assert for an actual field, defaults to `false`
+                     * @param {boolean=} noAssert Whether to not assert for an actual field, defaults to `false`
                      * @return {*} Value
                      * @throws {Error} If there is no such field
                      * @expose
                      */
-                    Message.prototype.get = function(key, noAssert) {
+                    MessagePrototype.get = function(key, noAssert) {
                         if (noAssert)
                             return this[key];
-                        var field = T.getChild(key);
+                        var field = T._fieldsByName[key];
                         if (!field || !(field instanceof ProtoBuf.Reflect.Message.Field))
                             throw Error(this+"#"+key+" is not a field: undefined");
                         if (!(field instanceof ProtoBuf.Reflect.Message.Field))
@@ -1798,7 +1881,7 @@
                      * @throws {Error} If there is no such field
                      * @expose
                      */
-                    Message.prototype.$get = Message.prototype.get;
+                    MessagePrototype.$get = MessagePrototype.get;
 
                     // Getters and setters
 
@@ -1808,72 +1891,91 @@
                         if (field instanceof ProtoBuf.Reflect.Message.ExtensionField)
                             continue;
 
-                        if (ProtoBuf.populateAccessors)
+                        if (T.builder.options['populateAccessors'])
                             (function(field) {
                                 // set/get[SomeValue]
                                 var Name = field.originalName.replace(/(_[a-zA-Z])/g, function(match) {
                                     return match.toUpperCase().replace('_','');
                                 });
-                                Name = Name.substring(0,1).toUpperCase()+Name.substring(1);
+                                Name = Name.substring(0,1).toUpperCase() + Name.substring(1);
 
-                                // set/get_[some_value]
+                                // set/get_[some_value] FIXME: Do we really need these?
                                 var name = field.originalName.replace(/([A-Z])/g, function(match) {
                                     return "_"+match;
                                 });
 
+                                /**
+                                 * The current field's unbound setter function.
+                                 * @function
+                                 * @param {*} value
+                                 * @param {boolean=} noAssert
+                                 * @returns {!ProtoBuf.Builder.Message}
+                                 * @inner
+                                 */
+                                var setter = function(value, noAssert) {
+                                    this[field.name] = noAssert ? value : field.verifyValue(value);
+                                    return this;
+                                };
+
+                                /**
+                                 * The current field's unbound getter function.
+                                 * @function
+                                 * @returns {*}
+                                 * @inner
+                                 */
+                                var getter = function() {
+                                    return this[field.name];
+                                };
+
                                 /**
                                  * Sets a value. This method is present for each field, but only if there is no name conflict with
-                                 * another field.
+                                 *  another field.
                                  * @name ProtoBuf.Builder.Message#set[SomeField]
                                  * @function
                                  * @param {*} value Value to set
+                                 * @param {boolean=} noAssert Whether to not assert the value, defaults to `false`
+                                 * @returns {!ProtoBuf.Builder.Message} this
                                  * @abstract
                                  * @throws {Error} If the value cannot be set
                                  */
                                 if (T.getChild("set"+Name) === null)
-                                    Message.prototype["set"+Name] = function(value) {
-                                        this.$set(field.name, value);
-                                    };
+                                    MessagePrototype["set"+Name] = setter;
 
                                 /**
                                  * Sets a value. This method is present for each field, but only if there is no name conflict with
-                                 * another field.
+                                 *  another field.
                                  * @name ProtoBuf.Builder.Message#set_[some_field]
                                  * @function
                                  * @param {*} value Value to set
+                                 * @param {boolean=} noAssert Whether to not assert the value, defaults to `false`
+                                 * @returns {!ProtoBuf.Builder.Message} this
                                  * @abstract
                                  * @throws {Error} If the value cannot be set
                                  */
                                 if (T.getChild("set_"+name) === null)
-                                    Message.prototype["set_"+name] = function(value) {
-                                        this.$set(field.name, value);
-                                    };
+                                    MessagePrototype["set_"+name] = setter;
 
                                 /**
                                  * Gets a value. This method is present for each field, but only if there is no name conflict with
-                                 * another field.
+                                 *  another field.
                                  * @name ProtoBuf.Builder.Message#get[SomeField]
                                  * @function
                                  * @abstract
                                  * @return {*} The value
                                  */
                                 if (T.getChild("get"+Name) === null)
-                                    Message.prototype["get"+Name] = function() {
-                                        return this.$get(field.name); // Does not throw, field exists
-                                    };
+                                    MessagePrototype["get"+Name] = getter;
 
                                 /**
                                  * Gets a value. This method is present for each field, but only if there is no name conflict with
-                                 * another field.
+                                 *  another field.
                                  * @name ProtoBuf.Builder.Message#get_[some_field]
                                  * @function
                                  * @return {*} The value
                                  * @abstract
                                  */
                                 if (T.getChild("get_"+name) === null)
-                                    Message.prototype["get_"+name] = function() {
-                                        return this.$get(field.name); // Does not throw, field exists
-                                    };
+                                    MessagePrototype["get_"+name] = getter;
 
                             })(field);
                     }
@@ -1894,7 +1996,7 @@
                      * @see ProtoBuf.Builder.Message#encodeHex
                      * @see ProtoBuf.Builder.Message#encodeAB
                      */
-                    Message.prototype.encode = function(buffer, noVerify) {
+                    MessagePrototype.encode = function(buffer, noVerify) {
                         if (typeof buffer === 'boolean')
                             noVerify = buffer,
                             buffer = undefined;
@@ -1920,7 +2022,7 @@
                      * @throws {Error} If the message cannot be calculated or if required fields are missing.
                      * @expose
                      */
-                    Message.prototype.calculate = function() {
+                    MessagePrototype.calculate = function() {
                         return T.calculate(this);
                     };
 
@@ -1934,7 +2036,7 @@
                      *  returns the encoded ByteBuffer in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.encodeDelimited = function(buffer) {
+                    MessagePrototype.encodeDelimited = function(buffer) {
                         var isNew = false;
                         if (!buffer)
                             buffer = new ByteBuffer(),
@@ -1955,7 +2057,7 @@
                      *  returns the encoded ArrayBuffer in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.encodeAB = function() {
+                    MessagePrototype.encodeAB = function() {
                         try {
                             return this.encode().toArrayBuffer();
                         } catch (e) {
@@ -1973,7 +2075,7 @@
                      *  returns the encoded ArrayBuffer in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.toArrayBuffer = Message.prototype.encodeAB;
+                    MessagePrototype.toArrayBuffer = MessagePrototype.encodeAB;
 
                     /**
                      * Directly encodes the message to a node Buffer.
@@ -1984,7 +2086,7 @@
                      *  missing. The later still returns the encoded node Buffer in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.encodeNB = function() {
+                    MessagePrototype.encodeNB = function() {
                         try {
                             return this.encode().toBuffer();
                         } catch (e) {
@@ -2002,7 +2104,7 @@
                      *  returns the encoded node Buffer in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.toBuffer = Message.prototype.encodeNB;
+                    MessagePrototype.toBuffer = MessagePrototype.encodeNB;
 
                     /**
                      * Directly encodes the message to a base64 encoded string.
@@ -2013,7 +2115,7 @@
                      *  still returns the encoded base64 string in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.encode64 = function() {
+                    MessagePrototype.encode64 = function() {
                         try {
                             return this.encode().toBase64();
                         } catch (e) {
@@ -2031,7 +2133,7 @@
                      *  returns the encoded base64 string in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.toBase64 = Message.prototype.encode64;
+                    MessagePrototype.toBase64 = MessagePrototype.encode64;
 
                     /**
                      * Directly encodes the message to a hex encoded string.
@@ -2042,7 +2144,7 @@
                      *  still returns the encoded hex string in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.encodeHex = function() {
+                    MessagePrototype.encodeHex = function() {
                         try {
                             return this.encode().toHex();
                         } catch (e) {
@@ -2060,38 +2162,38 @@
                      *  returns the encoded hex string in the `encoded` property on the error.
                      * @expose
                      */
-                    Message.prototype.toHex = Message.prototype.encodeHex;
+                    MessagePrototype.toHex = MessagePrototype.encodeHex;
 
                     /**
                      * Clones a message object to a raw object.
                      * @param {*} obj Object to clone
-                     * @param {boolean} includeBuffers Whether to include native buffer data or not
+                     * @param {boolean} includeBinaryAsBase64 Whether to include binary data as base64 strings or not
                      * @returns {*} Cloned object
                      * @inner
                      */
-                    function cloneRaw(obj, includeBuffers) {
+                    function cloneRaw(obj, includeBinaryAsBase64) {
                         var clone = {};
                         for (var i in obj)
                             if (obj.hasOwnProperty(i)) {
                                 if (obj[i] === null || typeof obj[i] !== 'object')
                                     clone[i] = obj[i];
                                 else if (obj[i] instanceof ByteBuffer) {
-                                    if (includeBuffers)
-                                        clone[i] = obj.toBuffer();
+                                    if (includeBinaryAsBase64)
+                                        clone[i] = obj[i].toBase64();
                                 } else // is a non-null object
-                                    clone[i] = cloneRaw(obj[i], includeBuffers);
+                                    clone[i] = cloneRaw(obj[i], includeBinaryAsBase64);
                             }
                         return clone;
                     }
 
                     /**
                      * Returns the message's raw payload.
-                     * @param {boolean=} includeBuffers Whether to include native buffer data or not, defaults to `false`
+                     * @param {boolean=} includeBinaryAsBase64 Whether to include binary data as base64 strings or not, defaults to `false`
                      * @returns {Object.&lt;string,*>} Raw payload
                      * @expose
                      */
-                    Message.prototype.toRaw = function(includeBuffers) {
-                        return cloneRaw(this, !!includeBuffers);
+                    MessagePrototype.toRaw = function(includeBinaryAsBase64) {
+                        return cloneRaw(this, !!includeBinaryAsBase64);
                     };
 
                     /**
@@ -2192,7 +2294,7 @@
                      * @return {string} String representation as of ".Fully.Qualified.MessageName"
                      * @expose
                      */
-                    Message.prototype.toString = function() {
+                    MessagePrototype.toString = function() {
                         return T.toString();
                     };
 
@@ -2216,7 +2318,7 @@
 
                     if (Object.defineProperty)
                         Object.defineProperty(Message, '$options', { "value": T.buildOpt() }),
-                        Object.defineProperty(Message.prototype, "$type", {
+                        Object.defineProperty(MessagePrototype, "$type", {
                             get: function() { return T; }
                         });
 
@@ -2226,20 +2328,20 @@
 
                 // Static enums and prototyped sub-messages / cached collections
                 this._fields = [];
-                this._fieldsById = [];
+                this._fieldsById = {};
+                this._fieldsByName = {};
                 for (var i=0, k=this.children.length, child; i&lt;k; i++) {
                     child = this.children[i];
                     if (child instanceof Enum)
-                        clazz[child['name']] = child.build();
+                        clazz[child.name] = child.build();
                     else if (child instanceof Message)
-                        clazz[child['name']] = child.build();
+                        clazz[child.name] = child.build();
                     else if (child instanceof Message.Field)
                         child.build(),
                         this._fields.push(child),
-                        this._fieldsById[child.id] = child;
-                    else if (child instanceof Extension) {
-                        // Ignore
-                    } else
+                        this._fieldsById[child.id] = child,
+                        this._fieldsByName[child.name] = child;
+                    else if (!(child instanceof Message.OneOf) &amp;&amp; !(child instanceof Extension)) // Not built
                         throw Error("Illegal reflect child of "+this.toString(true)+": "+children[i].toString(true));
                 }
 
@@ -2255,11 +2357,11 @@
              * @throws {Error} If required fields are missing or the message cannot be encoded for another reason
              * @expose
              */
-            Message.prototype.encode = function(message, buffer, noVerify) {
+            MessagePrototype.encode = function(message, buffer, noVerify) {
                 var fieldMissing = null,
                     field;
                 for (var i=0, k=this._fields.length, val; i&lt;k; ++i) {
-                    field = this.children[i];
+                    field = this._fields[i];
                     val = message[field.name];
                     if (field.required &amp;&amp; val === null) {
                         if (fieldMissing === null)
@@ -2282,7 +2384,7 @@
              * @throws {Error} If required fields are missing or the message cannot be calculated for another reason
              * @expose
              */
-            Message.prototype.calculate = function(message) {
+            MessagePrototype.calculate = function(message) {
                 for (var n=0, i=0, k=this._fields.length, field, val; i&lt;k; ++i) {
                     field = this._fields[i];
                     val = message[field.name];
@@ -2344,7 +2446,7 @@
              * @throws {Error} If the message cannot be decoded
              * @expose
              */
-            Message.prototype.decode = function(buffer, length, expectedGroupEndId) {
+            MessagePrototype.decode = function(buffer, length, expectedGroupEndId) {
                 length = typeof length === 'number' ? length : -1;
                 var start = buffer.offset,
                     msg = new (this.clazz)(),
@@ -2384,8 +2486,14 @@
                     }
                     if (field.repeated &amp;&amp; !field.options["packed"])
                         msg[field.name].push(field.decode(wireType, buffer));
-                    else
+                    else {
                         msg[field.name] = field.decode(wireType, buffer);
+                        if (field.oneof) {
+                            if (this[field.oneof.name] !== null)
+                                this[this[field.oneof.name]] = null;
+                            msg[field.oneof.name] = field.name;
+                        }
+                    }
                 }
 
                 // Check if all required fields are present and set default values for optional fields that are not
@@ -2411,17 +2519,19 @@
             /**
              * Constructs a new Message Field.
              * @exports ProtoBuf.Reflect.Message.Field
-             * @param {ProtoBuf.Reflect.Message} message Message reference
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {!ProtoBuf.Reflect.Message} message Message reference
              * @param {string} rule Rule, one of requried, optional, repeated
              * @param {string} type Data type, e.g. int32
              * @param {string} name Field name
              * @param {number} id Unique field id
              * @param {Object.&lt;string,*>=} options Options
+             * @param {!ProtoBuf.Reflect.Message.OneOf=} oneof Enclosing OneOf
              * @constructor
              * @extends ProtoBuf.Reflect.T
              */
-            var Field = function(message, rule, type, name, id, options) {
-                T.call(this, message, name);
+            var Field = function(builder, message, rule, type, name, id, options, oneof) {
+                T.call(this, builder, message, name);
 
                 /**
                  * @override
@@ -2478,6 +2588,13 @@
                  */
                 this.defaultValue = null;
 
+                /**
+                 * Enclosing OneOf.
+                 * @type {?ProtoBuf.Reflect.Message.OneOf}
+                 * @expose
+                 */
+                this.oneof = oneof || null;
+
                 /**
                  * Original field name.
                  * @type {string}
@@ -2486,22 +2603,34 @@
                 this.originalName = this.name; // Used to revert camelcase transformation on naming collisions
 
                 // Convert field names to camel case notation if the override is set
-                if (ProtoBuf.convertFieldsToCamelCase &amp;&amp; !(this instanceof Message.ExtensionField)) {
-                    this.name = this.name.replace(/_([a-zA-Z])/g, function($0, $1) {
-                        return $1.toUpperCase();
-                    });
-                }
+                if (this.builder.options['convertFieldsToCamelCase'] &amp;&amp; !(this instanceof Message.ExtensionField))
+                    this.name = Field._toCamelCase(this.name);
             };
 
-            // Extends T
-            Field.prototype = Object.create(T.prototype);
+            /**
+             * Converts a field name to camel case.
+             * @param {string} name Likely underscore notated name
+             * @returns {string} Camel case notated name
+             * @private
+             */
+            Field._toCamelCase = function(name) {
+                return name.replace(/_([a-zA-Z])/g, function($0, $1) {
+                    return $1.toUpperCase();
+                });
+            };
+
+            /**
+             * @alias ProtoBuf.Reflect.Message.Field.prototype
+             * @inner
+             */
+            var FieldPrototype = Field.prototype = Object.create(T.prototype);
 
             /**
              * Builds the field.
              * @override
              * @expose
              */
-            Field.prototype.build = function() {
+            FieldPrototype.build = function() {
                 this.defaultValue = typeof this.options['default'] !== 'undefined'
                     ? this.verifyValue(this.options['default']) : null;
             };
@@ -2534,7 +2663,7 @@
              * @throws {Error} If the value cannot be set for this field
              * @expose
              */
-            Field.prototype.verifyValue = function(value, skipRepeated) {
+            FieldPrototype.verifyValue = function(value, skipRepeated) {
                 skipRepeated = skipRepeated || false;
                 var fail = function(val, msg) {
                     throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
@@ -2622,20 +2751,18 @@
 
                     // Length-delimited bytes
                     case ProtoBuf.TYPES["bytes"]:
-                        return value &amp;&amp; value instanceof ByteBuffer
-                            ? value
-                            : ByteBuffer.wrap(value);
+                        if (ByteBuffer.isByteBuffer(value))
+                            return value;
+                        return ByteBuffer.wrap(value, "base64");
 
                     // Constant enum value
                     case ProtoBuf.TYPES["enum"]: {
                         var values = this.resolvedType.getChildren(Enum.Value);
-                        for (i=0; i&lt;values.length; i++) {
-                            if (values[i].name == value) {
+                        for (i=0; i&lt;values.length; i++)
+                            if (values[i].name == value)
                                 return values[i].id;
-                            } else if (values[i].id == value) {
+                            else if (values[i].id == value)
                                 return values[i].id;
-                            }
-                        }
                         fail(value, "not a valid enum value");
                     }
                     // Embedded message
@@ -2670,7 +2797,7 @@
              * @throws {Error} If the field cannot be encoded
              * @expose
              */
-            Field.prototype.encode = function(value, buffer) {
+            FieldPrototype.encode = function(value, buffer) {
                 if (this.type === null || typeof this.type !== 'object')
                     throw Error("[INTERNAL] Unresolved type in "+this.toString(true)+": "+this.type);
                 if (value === null || (this.repeated &amp;&amp; value.length == 0))
@@ -2722,7 +2849,7 @@
              * @throws {Error} If the value cannot be encoded
              * @expose
              */
-            Field.prototype.encodeValue = function(value, buffer) {
+            FieldPrototype.encodeValue = function(value, buffer) {
                 if (value === null) return buffer; // Nothing to encode
                 // Tag has already been written
 
@@ -2843,7 +2970,7 @@
              * @returns {number} Byte length
              * @expose
              */
-            Field.prototype.calculate = function(value) {
+            FieldPrototype.calculate = function(value) {
                 value = this.verifyValue(value); // May throw
                 if (this.type === null || typeof this.type !== 'object')
                     throw Error("[INTERNAL] Unresolved type in "+this.toString(true)+": "+this.type);
@@ -2882,7 +3009,7 @@
              * @throws {Error} If the value cannot be calculated
              * @expose
              */
-            Field.prototype.calculateValue = function(value) {
+            FieldPrototype.calculateValue = function(value) {
                 if (value === null) return 0; // Nothing to encode
                 // Tag has already been written
                 var n;
@@ -2938,7 +3065,7 @@
              * @throws {Error} If the field cannot be decoded
              * @expose
              */
-            Field.prototype.decode = function(wireType, buffer, skipRepeated) {
+            FieldPrototype.decode = function(wireType, buffer, skipRepeated) {
                 var value, nBytes;
                 if (wireType != this.type.wireType &amp;&amp; (skipRepeated || (wireType != ProtoBuf.WIRE_TYPES.LDELIM || !this.repeated)))
                     throw Error("Illegal wire type for field "+this.toString(true)+": "+wireType+" ("+this.type.wireType+" expected)");
@@ -3038,7 +3165,7 @@
 
                 // We should never end here
                 throw Error("[INTERNAL] Illegal wire type for "+this.toString(true)+": "+wireType);
-            }
+            };
 
             /**
              * @alias ProtoBuf.Reflect.Message.Field
@@ -3049,7 +3176,8 @@
             /**
              * Constructs a new Message ExtensionField.
              * @exports ProtoBuf.Reflect.Message.ExtensionField
-             * @param {ProtoBuf.Reflect.Message} message Message reference
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {!ProtoBuf.Reflect.Message} message Message reference
              * @param {string} rule Rule, one of requried, optional, repeated
              * @param {string} type Data type, e.g. int32
              * @param {string} name Field name
@@ -3058,8 +3186,8 @@
              * @constructor
              * @extends ProtoBuf.Reflect.Message.Field
              */
-            var ExtensionField = function(message, rule, type, name, id, options) {
-                Field.call(this, message, rule, type, name, id, options);
+            var ExtensionField = function(builder, message, rule, type, name, id, options) {
+                Field.call(this, builder, message, rule, type, name, id, options);
 
                 /**
                  * Extension reference.
@@ -3078,17 +3206,44 @@
              */
             Reflect.Message.ExtensionField = ExtensionField;
 
+            /**
+             * Constructs a new Message OneOf.
+             * @exports ProtoBuf.Reflect.Message.OneOf
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {!ProtoBuf.Reflect.Message} message Message reference
+             * @param {string} name OneOf name
+             * @constructor
+             * @extends ProtoBuf.Reflect.T
+             */
+            var OneOf = function(builder, message, name) {
+                T.call(this, builder, message, name);
+
+                /**
+                 * Enclosed fields.
+                 * @type {!Array.&lt;!ProtoBuf.Reflect.Message.Field>}
+                 * @expose
+                 */
+                this.fields = [];
+            };
+
+            /**
+             * @alias ProtoBuf.Reflect.Message.OneOf
+             * @expose
+             */
+            Reflect.Message.OneOf = OneOf;
+
             /**
              * Constructs a new Enum.
              * @exports ProtoBuf.Reflect.Enum
+             * @param {!ProtoBuf.Builder} builder Builder reference
              * @param {!ProtoBuf.Reflect.T} parent Parent Reflect object
              * @param {string} name Enum name
              * @param {Object.&lt;string,*>=} options Enum options
              * @constructor
              * @extends ProtoBuf.Reflect.Namespace
              */
-            var Enum = function(parent, name, options) {
-                Namespace.call(this, parent, name, options);
+            var Enum = function(builder, parent, name, options) {
+                Namespace.call(this, builder, parent, name, options);
 
                 /**
                  * @override
@@ -3103,15 +3258,18 @@
                 this.object = null;
             };
 
-            // Extends Namespace
-            Enum.prototype = Object.create(Namespace.prototype);
+            /**
+             * @alias ProtoBuf.Reflect.Enum.prototype
+             * @inner
+             */
+            var EnumPrototype = Enum.prototype = Object.create(Namespace.prototype);
 
             /**
              * Builds this enum and returns the runtime counterpart.
              * @return {Object&lt;string,*>}
              * @expose
              */
-            Enum.prototype.build = function() {
+            EnumPrototype.build = function() {
                 var enm = {},
                     values = this.getChildren(Enum.Value);
                 for (var i=0, k=values.length; i&lt;k; ++i)
@@ -3130,14 +3288,15 @@
             /**
              * Constructs a new Enum Value.
              * @exports ProtoBuf.Reflect.Enum.Value
+             * @param {!ProtoBuf.Builder} builder Builder reference
              * @param {!ProtoBuf.Reflect.Enum} enm Enum reference
              * @param {string} name Field name
              * @param {number} id Unique field id
              * @constructor
              * @extends ProtoBuf.Reflect.T
              */
-            var Value = function(enm, name, id) {
-                T.call(this, enm, name);
+            var Value = function(builder, enm, name, id) {
+                T.call(this, builder, enm, name);
 
                 /**
                  * @override
@@ -3165,12 +3324,13 @@
              * An extension (field).
              * @exports ProtoBuf.Reflect.Extension
              * @constructor
-             * @param {ProtoBuf.Reflect.T} parent Parent object
+             * @param {!ProtoBuf.Builder} builder Builder reference
+             * @param {!ProtoBuf.Reflect.T} parent Parent object
              * @param {string} name Object name
              * @param {!ProtoBuf.Reflect.Message.Field} field Extension field
              */
-            var Extension = function(parent, name, field) {
-                T.call(this, parent, name);
+            var Extension = function(builder, parent, name, field) {
+                T.call(this, builder, parent, name);
 
                 /**
                  * Extended message field.
@@ -3192,14 +3352,15 @@
             /**
              * Constructs a new Service.
              * @exports ProtoBuf.Reflect.Service
+             * @param {!ProtoBuf.Builder} builder Builder reference
              * @param {!ProtoBuf.Reflect.Namespace} root Root
              * @param {string} name Service name
              * @param {Object.&lt;string,*>=} options Options
              * @constructor
              * @extends ProtoBuf.Reflect.Namespace
              */
-            var Service = function(root, name, options) {
-                Namespace.call(this, root, name, options);
+            var Service = function(builder, root, name, options) {
+                Namespace.call(this, builder, root, name, options);
 
                 /**
                  * @override
@@ -3213,8 +3374,11 @@
                 this.clazz = null;
             };
 
-            // Extends Namespace
-            Service.prototype = Object.create(Namespace.prototype);
+            /**
+             * @alias ProtoBuf.Reflect.Service.prototype
+             * @inner
+             */
+            var ServicePrototype = Service.prototype = Object.create(Namespace.prototype);
 
             /**
              * Builds the service and returns the runtime counterpart, which is a fully functional class.
@@ -3224,7 +3388,7 @@
              * @throws {Error} If the message cannot be built
              * @expose
              */
-            Service.prototype.build = function(rebuild) {
+            ServicePrototype.build = function(rebuild) {
                 if (this.clazz &amp;&amp; !rebuild)
                     return this.clazz;
 
@@ -3256,12 +3420,15 @@
                         };
                     };
 
-                    // Extends ProtoBuf.Builder.Service
-                    Service.prototype = Object.create(ProtoBuf.Builder.Service.prototype);
+                    /**
+                     * @alias ProtoBuf.Builder.Service.prototype
+                     * @inner
+                     */
+                    var ServicePrototype = Service.prototype = Object.create(ProtoBuf.Builder.Service.prototype);
 
                     if (Object.defineProperty)
                         Object.defineProperty(Service, "$options", { "value": T.buildOpt() }),
-                        Object.defineProperty(Service.prototype, "$options", { "value": Service["$options"] });
+                        Object.defineProperty(ServicePrototype, "$options", { "value": Service["$options"] });
 
                     /**
                      * Asynchronously performs an RPC call using the given RPC implementation.
@@ -3289,7 +3456,7 @@
                         (function(method) {
 
                             // service#Method(message, callback)
-                            Service.prototype[method.name] = function(req, callback) {
+                            ServicePrototype[method.name] = function(req, callback) {
                                 try {
                                     if (!req || !(req instanceof method.resolvedRequestType.clazz)) {
                                         setTimeout(callback.bind(this, Error("Illegal request type provided to service method "+T.name+"#"+method.name)), 0);
@@ -3319,7 +3486,7 @@
 
                             if (Object.defineProperty)
                                 Object.defineProperty(Service[method.name], "$options", { "value": method.buildOpt() }),
-                                Object.defineProperty(Service.prototype[method.name], "$options", { "value": Service[method.name]["$options"] });
+                                Object.defineProperty(ServicePrototype[method.name], "$options", { "value": Service[method.name]["$options"] });
                         })(rpc[i]);
                     }
 
@@ -3337,14 +3504,15 @@
             /**
              * Abstract service method.
              * @exports ProtoBuf.Reflect.Service.Method
+             * @param {!ProtoBuf.Builder} builder Builder reference
              * @param {!ProtoBuf.Reflect.Service} svc Service
              * @param {string} name Method name
              * @param {Object.&lt;string,*>=} options Options
              * @constructor
              * @extends ProtoBuf.Reflect.T
              */
-            var Method = function(svc, name, options) {
-                T.call(this, svc, name);
+            var Method = function(builder, svc, name, options) {
+                T.call(this, builder, svc, name);
 
                 /**
                  * @override
@@ -3359,8 +3527,11 @@
                 this.options = options || {};
             };
 
-            // Extends T
-            Method.prototype = Object.create(T.prototype);
+            /**
+             * @alias ProtoBuf.Reflect.Service.Method.prototype
+             * @inner
+             */
+            var MethodPrototype = Method.prototype = Object.create(T.prototype);
 
             /**
              * Builds the method's '$options' property.
@@ -3368,7 +3539,7 @@
              * @function
              * @return {Object.&lt;string,*>}
              */
-            Method.prototype.buildOpt = Namespace.prototype.buildOpt;
+            MethodPrototype.buildOpt = NamespacePrototype.buildOpt;
 
             /**
              * @alias ProtoBuf.Reflect.Service.Method
@@ -3379,6 +3550,7 @@
             /**
              * RPC service method.
              * @exports ProtoBuf.Reflect.Service.RPCMethod
+             * @param {!ProtoBuf.Builder} builder Builder reference
              * @param {!ProtoBuf.Reflect.Service} svc Service
              * @param {string} name Method name
              * @param {string} request Request message name
@@ -3387,8 +3559,8 @@
              * @constructor
              * @extends ProtoBuf.Reflect.Service.Method
              */
-            var RPCMethod = function(svc, name, request, response, options) {
-                Method.call(this, svc, name, options);
+            var RPCMethod = function(builder, svc, name, request, response, options) {
+                Method.call(this, builder, svc, name, options);
 
                 /**
                  * @override
@@ -3434,6 +3606,7 @@
             Reflect.Service.RPCMethod = RPCMethod;
 
             return Reflect;
+
         })(ProtoBuf);
 
         /**
@@ -3447,16 +3620,17 @@
              * Constructs a new Builder.
              * @exports ProtoBuf.Builder
              * @class Provides the functionality to build protocol messages.
+             * @param {Object.&lt;string,*>=} options Options
              * @constructor
              */
-            var Builder = function() {
+            var Builder = function(options) {
 
                 /**
                  * Namespace.
                  * @type {ProtoBuf.Reflect.Namespace}
                  * @expose
                  */
-                this.ns = new Reflect.Namespace(null, ""); // Global namespace
+                this.ns = new Reflect.Namespace(this, null, ""); // Global namespace
 
                 /**
                  * Namespace pointer.
@@ -3492,13 +3666,26 @@
                  * @expose
                  */
                 this.importRoot = null;
+
+                /**
+                 * Options.
+                 * @type {!Object.&lt;string, *>}
+                 * @expose
+                 */
+                this.options = options || {};
             };
 
+            /**
+             * @alias ProtoBuf.Builder.prototype
+             * @inner
+             */
+            var BuilderPrototype = Builder.prototype;
+
             /**
              * Resets the pointer to the root namespace.
              * @expose
              */
-            Builder.prototype.reset = function() {
+            BuilderPrototype.reset = function() {
                 this.ptr = this.ns;
             };
 
@@ -3510,7 +3697,7 @@
              * @throws {Error} If the package name is invalid
              * @expose
              */
-            Builder.prototype.define = function(pkg, options) {
+            BuilderPrototype.define = function(pkg, options) {
                 if (typeof pkg !== 'string' || !Lang.TYPEREF.test(pkg))
                     throw Error("Illegal package: "+pkg);
                 var part = pkg.split("."), i;
@@ -3519,7 +3706,7 @@
                         throw Error("Illegal package: "+part[i]);
                 for (i=0; i&lt;part.length; i++) {
                     if (this.ptr.getChild(part[i]) === null) // Keep existing namespace
-                        this.ptr.addChild(new Reflect.Namespace(this.ptr, part[i], options));
+                        this.ptr.addChild(new Reflect.Namespace(this, this.ptr, part[i], options));
                     this.ptr = this.ptr.getChild(part[i]);
                 }
                 return this;
@@ -3633,7 +3820,7 @@
              * @throws {Error} If a message definition is invalid
              * @expose
              */
-            Builder.prototype.create = function(defs) {
+            BuilderPrototype.create = function(defs) {
                 if (!defs)
                     return this; // Nothing to create
                 if (!ProtoBuf.Util.isArray(defs))
@@ -3642,35 +3829,51 @@
                     return this;
 
                 // It's quite hard to keep track of scopes and memory here, so let's do this iteratively.
-                var stack = [], def, obj, subObj, i, j;
+                var stack = [];
                 stack.push(defs); // One level [a, b, c]
                 while (stack.length > 0) {
                     defs = stack.pop();
                     if (ProtoBuf.Util.isArray(defs)) { // Stack always contains entire namespaces
                         while (defs.length > 0) {
-                            def = defs.shift(); // Namespace always contains an array of messages, enums and services
+                            var def = defs.shift(); // Namespace always contains an array of messages, enums and services
                             if (Builder.isValidMessage(def)) {
-                                obj = new Reflect.Message(this.ptr, def["name"], def["options"], def["isGroup"]);
+                                var obj = new Reflect.Message(this, this.ptr, def["name"], def["options"], def["isGroup"]);
+                                // Create OneOfs
+                                var oneofs = {};
+                                if (def["oneofs"]) {
+                                    var keys = Object.keys(def["oneofs"]);
+                                    for (var i=0, k=keys.length; i&lt;k; ++i)
+                                        obj.addChild(oneofs[keys[i]] = new Reflect.Message.OneOf(this, obj, keys[i]));
+                                }
                                 // Create fields
                                 if (def["fields"] &amp;&amp; def["fields"].length > 0) {
-                                    for (i=0; i&lt;def["fields"].length; i++) { // i=Fields
-                                        if (obj.getChild(def['fields'][i]['id']) !== null)
-                                            throw Error("Duplicate field id in message "+obj.name+": "+def['fields'][i]['id']);
-                                        if (def["fields"][i]["options"]) {
-                                            subObj = Object.keys(def["fields"][i]["options"]);
-                                            for (j=0; j&lt;subObj.length; j++) { // j=Option names
-                                                if (typeof subObj[j] !== 'string')
-                                                    throw Error("Illegal field option name in message "+obj.name+"#"+def["fields"][i]["name"]+": "+subObj[j]);
-                                                if (typeof def["fields"][i]["options"][subObj[j]] !== 'string' &amp;&amp; typeof def["fields"][i]["options"][subObj[j]] !== 'number' &amp;&amp; typeof def["fields"][i]["options"][subObj[j]] !== 'boolean')
-                                                    throw Error("Illegal field option value in message "+obj.name+"#"+def["fields"][i]["name"]+"#"+subObj[j]+": "+def["fields"][i]["options"][subObj[j]]);
+                                    for (i=0, k=def["fields"].length; i&lt;k; ++i) { // i:k=Fields
+                                        var fld = def['fields'][i];
+                                        if (obj.getChild(fld['id']) !== null)
+                                            throw Error("Duplicate field id in message "+obj.name+": "+fld['id']);
+                                        if (fld["options"]) {
+                                            var opts = Object.keys(fld["options"]);
+                                            for (var j= 0,l=opts.length; j&lt;l; ++j) { // j:l=Option names
+                                                if (typeof opts[j] !== 'string')
+                                                    throw Error("Illegal field option name in message "+obj.name+"#"+fld["name"]+": "+opts[j]);
+                                                if (typeof fld["options"][opts[j]] !== 'string' &amp;&amp; typeof fld["options"][opts[j]] !== 'number' &amp;&amp; typeof fld["options"][opts[j]] !== 'boolean')
+                                                    throw Error("Illegal field option value in message "+obj.name+"#"+fld["name"]+"#"+opts[j]+": "+fld["options"][opts[j]]);
                                             }
-                                            subObj = null;
                                         }
-                                        obj.addChild(new Reflect.Message.Field(obj, def["fields"][i]["rule"], def["fields"][i]["type"], def["fields"][i]["name"], def["fields"][i]["id"], def["fields"][i]["options"]));
+                                        var oneof = null;
+                                        if (typeof fld["oneof"] === 'string') {
+                                            oneof = oneofs[fld["oneof"]];
+                                            if (typeof oneof === 'undefined')
+                                                throw Error("Illegal oneof in message "+obj.name+"#"+fld["name"]+": "+fld["oneof"]);
+                                        }
+                                        fld = new Reflect.Message.Field(this, obj, fld["rule"], fld["type"], fld["name"], fld["id"], fld["options"], oneof);
+                                        if (oneof)
+                                            oneof.fields.push(fld);
+                                        obj.addChild(fld);
                                     }
                                 }
                                 // Push enums and messages to stack
-                                subObj = [];
+                                var subObj = [];
                                 if (typeof def["enums"] !== 'undefined' &amp;&amp; def['enums'].length > 0)
                                     for (i=0; i&lt;def["enums"].length; i++)
                                         subObj.push(def["enums"][i]);
@@ -3697,16 +3900,16 @@
                                 subObj = null;
                                 obj = null;
                             } else if (Builder.isValidEnum(def)) {
-                                obj = new Reflect.Enum(this.ptr, def["name"], def["options"]);
+                                obj = new Reflect.Enum(this, this.ptr, def["name"], def["options"]);
                                 for (i=0; i&lt;def["values"].length; i++)
-                                    obj.addChild(new Reflect.Enum.Value(obj, def["values"][i]["name"], def["values"][i]["id"]));
+                                    obj.addChild(new Reflect.Enum.Value(this, obj, def["values"][i]["name"], def["values"][i]["id"]));
                                 this.ptr.addChild(obj);
                                 obj = null;
                             } else if (Builder.isValidService(def)) {
-                                obj = new Reflect.Service(this.ptr, def["name"], def["options"]);
+                                obj = new Reflect.Service(this, this.ptr, def["name"], def["options"]);
                                 for (i in def["rpc"])
                                     if (def["rpc"].hasOwnProperty(i))
-                                        obj.addChild(new Reflect.Service.RPCMethod(obj, i, def["rpc"][i]["request"], def["rpc"][i]["response"], def["rpc"][i]["options"]));
+                                        obj.addChild(new Reflect.Service.RPCMethod(this, obj, i, def["rpc"][i]["request"], def["rpc"][i]["response"], def["rpc"][i]["options"]));
                                 this.ptr.addChild(obj);
                                 obj = null;
                             } else if (Builder.isValidExtend(def)) {
@@ -3717,10 +3920,16 @@
                                             throw Error("Duplicate extended field id in message "+obj.name+": "+def['fields'][i]['id']);
                                         if (def['fields'][i]['id'] &lt; obj.extensions[0] || def['fields'][i]['id'] > obj.extensions[1])
                                             throw Error("Illegal extended field id in message "+obj.name+": "+def['fields'][i]['id']+" ("+obj.extensions.join(' to ')+" expected)");
+                                        // Convert extension field names to camel case notation if the override is set
+                                        var name = def["fields"][i]["name"];
+                                        if (this.options['convertFieldsToCamelCase'])
+                                            name = Reflect.Message.Field._toCamelCase(def["fields"][i]["name"]);
                                         // see #161: Extensions use their fully qualified name as their runtime key and...
-                                        var fld = new Reflect.Message.ExtensionField(obj, def["fields"][i]["rule"], def["fields"][i]["type"], this.ptr.fqn()+'.'+def["fields"][i]["name"], def["fields"][i]["id"], def["fields"][i]["options"]);
-                                        // ...are added on top of the current namespace as an extension which is used for resolving their type later on
-                                        var ext = new Reflect.Extension(this.ptr, def["fields"][i]["name"], fld);
+                                        fld = new Reflect.Message.ExtensionField(this, obj, def["fields"][i]["rule"], def["fields"][i]["type"], this.ptr.fqn()+'.'+name, def["fields"][i]["id"], def["fields"][i]["options"]);
+                                        // ...are added on top of the current namespace as an extension which is used for
+                                        // resolving their type later on (the extension always keeps the original name to
+                                        // prevent naming collisions)
+                                        var ext = new Reflect.Extension(this, this.ptr, def["fields"][i]["name"], fld);
                                         fld.extension = ext;
                                         this.ptr.addChild(ext);
                                         obj.addChild(fld);
@@ -3750,7 +3959,7 @@
              * @throws {Error} If the definition or file cannot be imported
              * @expose
              */
-            Builder.prototype["import"] = function(json, filename) {
+            BuilderPrototype["import"] = function(json, filename) {
                 if (typeof filename === 'string') {
                     if (ProtoBuf.Util.IS_NODE)
                         filename = require("path")['resolve'](filename);
@@ -3884,7 +4093,7 @@
              * @throws {Error} If a type cannot be resolved
              * @expose
              */
-            Builder.prototype.resolveAll = function() {
+            BuilderPrototype.resolveAll = function() {
                 // Resolve all reflected objects
                 var res;
                 if (this.ptr == null || typeof this.ptr.type === 'object')
@@ -3927,9 +4136,7 @@
                         // Should not happen as nothing else is implemented
                         throw Error("Illegal service type in "+this.ptr.toString(true));
                     }
-                } else if (this.ptr instanceof ProtoBuf.Reflect.Extension) {
-                    // There are no runtime counterparts to extensions
-                } else
+                } else if (!(this.ptr instanceof ProtoBuf.Reflect.Message.OneOf) &amp;&amp; !(this.ptr instanceof ProtoBuf.Reflect.Extension))
                     throw Error("Illegal object in namespace: "+typeof(this.ptr)+":"+this.ptr);
                 this.reset();
             };
@@ -3942,7 +4149,7 @@
              * @throws {Error} If a type could not be resolved
              * @expose
              */
-            Builder.prototype.build = function(path) {
+            BuilderPrototype.build = function(path) {
                 this.reset();
                 if (!this.resolved)
                     this.resolveAll(),
@@ -3971,7 +4178,7 @@
              * @param {string=} path Specifies what to return. If omitted, the entire namespace wiil be returned.
              * @return {ProtoBuf.Reflect.T} Reflection descriptor or `null` if not found
              */
-            Builder.prototype.lookup = function(path) {
+            BuilderPrototype.lookup = function(path) {
                 return path ? this.ns.resolve(path) : this.ns;
             };
 
@@ -3980,7 +4187,7 @@
              * @return {string} String representation as of "Builder"
              * @expose
              */
-            Builder.prototype.toString = function() {
+            BuilderPrototype.toString = function() {
                 return "Builder";
             };
 
@@ -4004,10 +4211,9 @@
          * @expose
          */
         ProtoBuf.loadProto = function(proto, builder, filename) {
-            if (typeof builder === 'string' || (builder &amp;&amp; typeof builder["file"] === 'string' &amp;&amp; typeof builder["root"] === 'string')) {
-                filename = builder;
-                builder = null;
-            }
+            if (typeof builder === 'string' || (builder &amp;&amp; typeof builder["file"] === 'string' &amp;&amp; typeof builder["root"] === 'string'))
+                filename = builder,
+                builder = undefined;
             return ProtoBuf.loadJson((new ProtoBuf.DotProto.Parser(proto)).parse(), builder, filename);
         };
 
@@ -4074,18 +4280,18 @@
 
 
         /**
-         * Constructs a new Builder with the specified package defined.
-         * @param {string=} pkg Package name as fully qualified name, e.g. "My.Game". If no package is specified, the
-         * builder will only contain a global namespace.
-         * @param {Object.&lt;string,*>=} options Top level options
-         * @return {ProtoBuf.Builder} New Builder
+         * Constructs a new empty Builder.
+         * @param {Object.&lt;string,*>=} options Builder options, defaults to global options set on ProtoBuf
+         * @return {!ProtoBuf.Builder} Builder
          * @expose
          */
-        ProtoBuf.newBuilder = function(pkg, options) {
-            var builder = new ProtoBuf.Builder();
-            if (typeof pkg !== 'undefined' &amp;&amp; pkg !== null)
-                builder.define(pkg, options);
-            return builder;
+        ProtoBuf.newBuilder = function(options) {
+            options = options || {};
+            if (typeof options['convertFieldsToCamelCase'] === 'undefined')
+                options['convertFieldsToCamelCase'] = ProtoBuf.convertFieldsToCamelCase;
+            if (typeof options['populateAccessors'] === 'undefined')
+                options['populateAccessors'] = ProtoBuf.populateAccessors;
+            return new ProtoBuf.Builder(options);
         };
 
         /**
@@ -4107,7 +4313,6 @@
                 json = JSON.parse(json);
             builder["import"](json, filename);
             builder.resolveAll();
-            builder.build();
             return builder;
         };
 
@@ -4148,8 +4353,8 @@
         return ProtoBuf;
     }
 
-    /* CommonJS */ if (typeof module !== 'undefined' &amp;&amp; module["exports"])
-        module["exports"] = init(require("bytebuffer"));
+    /* CommonJS */ if (typeof require === 'function' &amp;&amp; typeof module === 'object' &amp;&amp; module &amp;&amp; typeof exports === 'object' &amp;&amp; exports)
+        module['exports'] = init(require("bytebuffer"));
     /* AMD */ else if (typeof define === 'function' &amp;&amp; define["amd"])
         define(["ByteBuffer"], init);
     /* Global */ else
@@ -4166,13 +4371,13 @@
 </div>
 
 <nav>
-    <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="ProtoBuf.Builder.html">Builder</a></li><li><a href="ProtoBuf.Builder.Message.html">Message</a></li><li><a href="ProtoBuf.Builder.Service.html">Service</a></li><li><a href="ProtoBuf.DotProto.Parser.html">Parser</a></li><li><a href="ProtoBuf.DotProto.Tokenizer.html">Tokenizer</a></li><li><a href="ProtoBuf.Reflect.Enum.html">Enum</a></li><li><a href="ProtoBuf.Reflect.Enum.Value.html">Value</a></li><li><a href="ProtoBuf.Reflect.Extension.html">Extension</a></li><li><a href="ProtoBuf.Reflect.Message.html">Message</a></li><li><a href="ProtoBuf.Reflect.Message.ExtensionField.html">ExtensionField</a></li><li><a href="ProtoBuf.Reflect.Message.Field.html">Field</a></li><li><a href="ProtoBuf.Reflect.Namespace.html">Namespace</a></li><li><a href="ProtoBuf.Reflect.Service.html">Service</a></li><li><a href="ProtoBuf.Reflect.Service.Method.html">Method</a></li><li><a href="ProtoBuf.Reflect.Service.RPCMethod.html">RPCMethod</a></li><li><a href="ProtoBuf.Reflect.T.html">T</a></li></ul><h3>Namespaces</h3><ul><li><a href="ProtoBuf.html">ProtoBuf</a></li><li><a href="ProtoBuf.DotProto.html">DotProto</a></li><li><a href="ProtoBuf.Reflect.html">Reflect</a></li><li><a href="ProtoBuf.Util.html">Util</a></li></ul>
+    <h2><a href="index.html">Index</a></h2><h3>Classes</h3><ul><li><a href="ProtoBuf.Builder.html">Builder</a></li><li><a href="ProtoBuf.Builder.Message.html">Message</a></li><li><a href="ProtoBuf.Builder.Service.html">Service</a></li><li><a href="ProtoBuf.DotProto.Parser.html">Parser</a></li><li><a href="ProtoBuf.DotProto.Tokenizer.html">Tokenizer</a></li><li><a href="ProtoBuf.Reflect.Enum.html">Enum</a></li><li><a href="ProtoBuf.Reflect.Enum.Value.html">Value</a></li><li><a href="ProtoBuf.Reflect.Extension.html">Extension</a></li><li><a href="ProtoBuf.Reflect.Message.html">Message</a></li><li><a href="ProtoBuf.Reflect.Message.ExtensionField.html">ExtensionField</a></li><li><a href="ProtoBuf.Reflect.Message.Field.html">Field</a></li><li><a href="ProtoBuf.Reflect.Message.OneOf.html">OneOf</a></li><li><a href="ProtoBuf.Reflect.Namespace.html">Namespace</a></li><li><a href="ProtoBuf.Reflect.Service.html">Service</a></li><li><a href="ProtoBuf.Reflect.Service.Method.html">Method</a></li><li><a href="ProtoBuf.Reflect.Service.RPCMethod.html">RPCMethod</a></li><li><a href="ProtoBuf.Reflect.T.html">T</a></li></ul><h3>Namespaces</h3><ul><li><a href="ProtoBuf.html">ProtoBuf</a></li><li><a href="ProtoBuf.DotProto.html">DotProto</a></li><li><a href="ProtoBuf.Reflect.html">Reflect</a></li><li><a href="ProtoBuf.Util.html">Util</a></li></ul>
 </nav>
 
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Tue Aug 26 2014 22:15:41 GMT+0200 (Mitteleuropäische Sommerzeit)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha10</a> on Mon Nov 24 2014 18:08:26 GMT+0100 (Mitteleuropäische Zeit)
 </footer>
 
 <script> prettyPrint(); </script>