diff --git a/reflection/generate_code.bat b/reflection/generate_code.bat
index e299325..7b0f4d8 100644
--- a/reflection/generate_code.bat
+++ b/reflection/generate_code.bat
@@ -15,4 +15,4 @@
 set buildtype=Release
 if "%1"=="-b" set buildtype=%2
 
-..\%buildtype%\flatc.exe --cpp --no-prefix -o ../include/flatbuffers reflection.fbs || exit /b 1
+..\%buildtype%\flatc.exe --cpp --cpp-std c++0x --no-prefix -o ../include/flatbuffers reflection.fbs || exit /b 1
diff --git a/reflection/generate_code.sh b/reflection/generate_code.sh
index f186b73..694baa2 100755
--- a/reflection/generate_code.sh
+++ b/reflection/generate_code.sh
@@ -15,4 +15,17 @@
 # limitations under the License.
 set -e
 
-../flatc -c --no-prefix -o ../include/flatbuffers reflection.fbs
+tempDir="../include/flatbuffers/.tmp"
+originalFile="../include/flatbuffers/reflection_generated.h"
+newFile="$tempDir/reflection_generated.h"
+
+../flatc -c --cpp-std c++0x --no-prefix -o $tempDir reflection.fbs
+
+if [ -f "$newFile" ]; then
+  if ! cmp -s "$originalFile" "$newFile"; then
+    mv $newFile $originalFile
+  else
+    rm $newFile
+  fi
+  rmdir $tempDir
+fi
diff --git a/reflection/reflection.fbs b/reflection/reflection.fbs
index 8fed025..d9e2dc4 100644
--- a/reflection/reflection.fbs
+++ b/reflection/reflection.fbs
@@ -24,12 +24,15 @@
     Vector,
     Obj,     // Used for tables & structs.
     Union,
-    Array
+    Array,
+
+    // Add any new type above this value.
+    MaxBaseType
 }
 
 table Type {
     base_type:BaseType;
-    element:BaseType = None;  // Only if base_type == Vector 
+    element:BaseType = None;  // Only if base_type == Vector
                               // or base_type == Array.
     index:int = -1;  // If base_type == Object, index into "objects" below.
                      // If base_type == Union, UnionType, or integral derived
@@ -71,6 +74,7 @@
     key:bool = false;
     attributes:[KeyValue];
     documentation:[string];
+    optional:bool = false;
 }
 
 table Object {  // Used for both tables and structs.