diff --git a/.gitignore b/.gitignore
index 9df49ec3..943f039c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -350,3 +350,8 @@ healthchecksdb
 
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
+
+compile_commands.json
+
+# Cmake
+CMakeUserPresets.json
diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 00000000..d20dc261
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,45 @@
+{
+  "version": 2,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 20,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "default",
+      "displayName": "Default Config",
+      "description": "Default build using Ninja generator",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/build/default",
+      "cacheVariables": {
+        "FIRST_CACHE_VARIABLE": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "SECOND_CACHE_VARIABLE": "ON"
+      }
+    },
+    {
+      "name": "ninja-multi",
+      "inherits": "default",
+      "displayName": "Ninja Multi-Config",
+      "description": "Default build using Ninja Multi-Config generator",
+      "generator": "Ninja Multi-Config"
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "configurePreset": "default"
+    }
+  ],
+  "testPresets": [
+    {
+      "name": "default",
+      "configurePreset": "default",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": true}
+    }
+  ]
+}
diff --git a/src/nonstd/optional.hpp b/src/nonstd/optional.hpp
index 7290d4a4..007bab95 100644
--- a/src/nonstd/optional.hpp
+++ b/src/nonstd/optional.hpp
@@ -53,6 +53,12 @@
 
 // Control presence of exception handling (try and auto discover):
 
+// TinyUSDZ mod. Force disable exception.
+#if defined( optional_CONFIG_NO_EXCEPTIONS )
+#undef optional_CONFIG_NO_EXCEPTIONS
+#define optional_CONFIG_NO_EXCEPTIONS 1
+#endif
+
 #ifndef optional_CONFIG_NO_EXCEPTIONS
 # if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)
 #  define optional_CONFIG_NO_EXCEPTIONS  0
diff --git a/src/primvar.hh b/src/primvar.hh
index 8d1a7240..02c9d0b1 100644
--- a/src/primvar.hh
+++ b/src/primvar.hh
@@ -22,19 +22,6 @@
 #endif
 
 // TODO(syoyo): Use C++17 std::optional, std::string_view when compiled with C++-17 compiler
-
-// clang and gcc
-#if defined(__EXCEPTIONS) || defined(__cpp_exceptions)
-#define nsel_CONFIG_NO_EXCEPTIONS 0
-#define nssv_CONFIG_NO_EXCEPTIONS 0
-#else
-// -fno-exceptions
-#ifndef nsel_CONFIG_NO_EXCEPTIONS
-#define nsel_CONFIG_NO_EXCEPTIONS 1
-#endif
-
-#define nssv_CONFIG_NO_EXCEPTIONS 1
-#endif
 #include "nonstd/optional.hpp"
 
 #ifdef __clang__
diff --git a/src/tydra/README.md b/src/tydra/README.md
index 4c0013dd..35914c01 100644
--- a/src/tydra/README.md
+++ b/src/tydra/README.md
@@ -7,7 +7,7 @@ Instead, we'd like to propose Tydra, a three-headed monster(Please imagine Gidor
 
 Currently Tydra is considering following three usecases in mind:
 
-- Runtime publishment(e.g. to glTF), DCC conversion, data exchange.
+- Runtime publishment(e.g. to glTF), DCC conversion and exchange for realtime graphics(AR, VR, MR, games, etc).
 - Scene conversion to GL/Vulkan renderer(e.g. WebGL rendering)
 - Scene conversion to Ray tracing renderer(e.g. Vulkan/OptiX ray tracing)
   See `../../examples/sdlviewer/` for SW raytracing example.