diff --git a/AE/CMakeLists.txt b/AE/CMakeLists.txt
index c05a373f..69b03dba 100644
--- a/AE/CMakeLists.txt
+++ b/AE/CMakeLists.txt
@@ -2,9 +2,26 @@
 
 cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
 
+# CMAKE_BUILD_TYPE is not defined if used IDE
+if (DEFINED CMAKE_BUILD_TYPE)
+    if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug")   OR
+        (${CMAKE_BUILD_TYPE} STREQUAL "Develop") OR
+        (${CMAKE_BUILD_TYPE} STREQUAL "Profile") OR
+        (${CMAKE_BUILD_TYPE} STREQUAL "Release") )
+        # ok
+    else()
+        message( STATUS "override unsupported CMAKE_BUILD_TYPE '${CMAKE_BUILD_TYPE}' by 'Release', see CMAKE_CONFIGURATION_TYPES in 'compilers.cmake'" )
+        set( CMAKE_BUILD_TYPE "Release" CACHE INTERNAL "" FORCE )
+    endif()
+endif()
+
+#----------------------------------------------------------
+
 project( "AE"
-         VERSION 23.10.199   # year, month, version
-         LANGUAGES C CXX )
+         VERSION 23.12.214  # year, month, version
+         LANGUAGES C CXX
+         DESCRIPTION "async game engine"
+        )
 if (APPLE)
     enable_language(OBJC)
 endif()
diff --git a/AE/android/.gitignore b/AE/android/.gitignore
index 2ff1daf9..598240fe 100644
--- a/AE/android/.gitignore
+++ b/AE/android/.gitignore
@@ -4,4 +4,3 @@
 /local.properties
 /build
 /captures
-/keystore
diff --git a/AE/android/build.gradle b/AE/android/build.gradle
index 019d0b1b..bb62a26b 100644
--- a/AE/android/build.gradle
+++ b/AE/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.1.4'
     }
 }
 
diff --git a/AE/android/demo/build.gradle b/AE/android/demo/build.gradle
index fb687d90..287bd6ac 100644
--- a/AE/android/demo/build.gradle
+++ b/AE/android/demo/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,14 +11,14 @@ android {
     defaultConfig {
         applicationId 		'AE.Demo'
         minSdkVersion 		24 // for vulkan
-        targetSdkVersion 	33
+        targetSdkVersion 	34
 		
         ndk {
             abiFilters "arm64-v8a", "armeabi-v7a" //, "x86", "x86_64"
         }
         externalNativeBuild {
             cmake {
-                arguments '-DANDROID_STL=c++_static',
+                arguments '-DANDROID_STL=c++_static',  // see https://developer.android.com/ndk/guides/cpp-support#static_runtimes
 						  '-DANDROID_ARM_NEON=ON',
 						  '-DAE_ENABLE_VULKAN=ON'
             }
@@ -30,6 +30,7 @@ android {
             //debuggable true // to enable logcat in release
             minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
 
diff --git a/AE/android/demo/src/main/AndroidManifest.xml b/AE/android/demo/src/main/AndroidManifest.xml
index e5720991..c06e753c 100644
--- a/AE/android/demo/src/main/AndroidManifest.xml
+++ b/AE/android/demo/src/main/AndroidManifest.xml
@@ -5,37 +5,34 @@
   <!-- min Vulkan API version: 1.0.82 -->
   <uses-feature android:name="android.hardware.vulkan.version" android:version="0x400052" android:required="false" />
 
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="true" />
   <uses-permission android:name="android.permission.INTERNET" android:required="true" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true" />
 
   <application
-      android:name=".DemoApplication"
-      android:allowBackup="false"
-      android:fullBackupContent="false"
-      android:label="AE Demo"
-      android:hardwareAccelerated="true"
-      android:isGame="true">
+	  android:name=".DemoApplication"
+	  android:label="AE Demo"
+	  android:hardwareAccelerated="true"
+	  android:isGame="true">
 
-    <activity
-        android:name=".DemoActivity"
-        android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
-        android:launchMode="singleTask"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-        android:resizeableActivity="true"
-        android:screenOrientation="userLandscape"
-        android:windowSoftInputMode="adjustPan"
-        android:exported="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-        
+	<activity
+		android:name=".DemoActivity"
+		android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+		android:launchMode="singleTask"
+		android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
+		android:resizeableActivity="true"
+		android:screenOrientation="userLandscape"
+		android:windowSoftInputMode="adjustPan"
+		android:exported="true">
+	  <intent-filter>
+		<action android:name="android.intent.action.MAIN" />
+		<category android:name="android.intent.category.LAUNCHER" />
+		
 		<!-- for profiling -->
 		<action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
-        <action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
-        <action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
-      </intent-filter>
-    </activity>
+		<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
+		<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
+	  </intent-filter>
+	</activity>
 
   </application>
 </manifest>
diff --git a/AE/android/demo/src/main/java/AE/demo/DemoActivity.java b/AE/android/demo/src/main/java/AE/demo/DemoActivity.java
index 8e5e3c8f..3b327acc 100644
--- a/AE/android/demo/src/main/java/AE/demo/DemoActivity.java
+++ b/AE/android/demo/src/main/java/AE/demo/DemoActivity.java
@@ -39,4 +39,9 @@ public final class DemoActivity
         Log.i(TAG, "onStop");
         super.onStop();
     }
+
+    @Override public void onBackPressed() {
+        super.onBackPressed();
+        this.finish();
+    }
 }
diff --git a/AE/android/engine/build.gradle b/AE/android/engine/build.gradle
index 1efaaff7..9c1cc539 100644
--- a/AE/android/engine/build.gradle
+++ b/AE/android/engine/build.gradle
@@ -1,17 +1,18 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 		24 // 24+ for vulkan
-        targetSdkVersion 	33
+        targetSdkVersion 	34
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -20,7 +21,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.10.1'
+    implementation 'androidx.core:core:1.12.0'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/AE/android/engine/src/main/java/AE/engine/BaseActivity.java b/AE/android/engine/src/main/java/AE/engine/BaseActivity.java
index cc170472..6998379f 100644
--- a/AE/android/engine/src/main/java/AE/engine/BaseActivity.java
+++ b/AE/android/engine/src/main/java/AE/engine/BaseActivity.java
@@ -38,7 +38,7 @@ public class BaseActivity
                     View.OnTouchListener,
                     SensorEventListener
 {
-    public static final String  TAG = "AE";
+    public static final String  TAG = "<<<< AE >>>>";
 
     private int                 _wndID      = 0;
 
@@ -291,7 +291,7 @@ public void Close ()
 //-----------------------------------------------------------------------------
 // native
 
-    private static native int  native_OnCreate (Object wnd);
+    private static native int   native_OnCreate (Object wnd);
     private static native void  native_OnDestroy (int id);
     private static native void  native_OnStart (int id);
     private static native void  native_OnStop (int id);
@@ -299,7 +299,7 @@ public void Close ()
     private static native void  native_OnEnterBackground (int id);
     private static native void  native_SurfaceChanged (int id, Object surface);
     private static native void  native_SurfaceDestroyed (int id);
-    private static native int  native_Update (int id);
+    private static native int   native_Update (int id);
     private static native void  native_OnKey (int id, int keycode, int action, int repeatCount);
     private static native void  native_OnTouch (int id, int action, int index, int count, float[] data);
     private static native void  native_OnOrientationChanged (int id, int newOrientation);
diff --git a/AE/android/engine/src/main/java/AE/engine/BaseApplication.java b/AE/android/engine/src/main/java/AE/engine/BaseApplication.java
index 5e098ab0..84704b86 100644
--- a/AE/android/engine/src/main/java/AE/engine/BaseApplication.java
+++ b/AE/android/engine/src/main/java/AE/engine/BaseApplication.java
@@ -43,14 +43,12 @@ private void _SendDirectories ()
         File    internalCache   = getCacheDir();
         File    externalPath    = getExternalFilesDir(null);
         File    externalCache   = getExternalCacheDir();
-        File    externalStorage = Environment.getExternalStorageDirectory();
 
         native_SetDirectories(
             (internalPath    == null ? "" : internalPath.getAbsolutePath()   ),
             (internalCache   == null ? "" : internalCache.getAbsolutePath()  ),
             (externalPath    == null ? "" : externalPath.getAbsolutePath()   ),
-            (externalCache   == null ? "" : externalCache.getAbsolutePath()  ),
-            (externalStorage == null ? "" : externalStorage.getAbsolutePath()) );
+            (externalCache   == null ? "" : externalCache.getAbsolutePath()  ));
     }
 
     private void  _SendSystemInfo ()
@@ -111,7 +109,7 @@ public final boolean  IsNetworkConnected ()
 // native
 
     private static native void  native_OnCreate (Object app, Object assetMngr);
-    private static native void  native_SetDirectories (String internal, String internalCache, String external, String externalCache, String externalStorage);
+    private static native void  native_SetDirectories (String internal, String internalCache, String external, String externalCache);
     private static native void  native_SetSystemInfo (String iso3Lang0, String iso3Lang1);
     private static native void  native_SetDisplayInfo (int width, int height, float xdpi, float ydpi, int orientation);
 }
diff --git a/AE/android/test/build.gradle b/AE/android/test/build.gradle
index cbaee62b..3aba35e8 100644
--- a/AE/android/test/build.gradle
+++ b/AE/android/test/build.gradle
@@ -1,19 +1,19 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     defaultConfig {
         applicationId 		'AE.Test'
         minSdkVersion 		24 // for vulkan
-        targetSdkVersion 	33
+        targetSdkVersion 	34
 		
         ndk {
             abiFilters "arm64-v8a", "armeabi-v7a" //, "x86", "x86_64"
         }
         externalNativeBuild {
             cmake {
-                arguments '-DANDROID_STL=c++_static',
+                arguments '-DANDROID_STL=c++_static',  // see https://developer.android.com/ndk/guides/cpp-support#static_runtimes
 						  '-DANDROID_ARM_NEON=ON',
 						  '-DAE_ENABLE_VULKAN=ON'
             }
@@ -22,9 +22,10 @@ android {
 	
     buildTypes {
         release {
-            //debuggable true // to enable logcat in release
+            debuggable true // to enable logcat in release
             minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
 
@@ -36,6 +37,11 @@ android {
             path '../../CMakeLists.txt'
         }
     }
+    sourceSets {
+        main {
+            assets.srcDirs = ['../../../AE-Temp/engine/graphics/vk']
+        }
+    }
     packagingOptions {
         jniLibs {
             excludes += ['lib/**/*.so']
diff --git a/AE/android/test/src/main/AndroidManifest.xml b/AE/android/test/src/main/AndroidManifest.xml
index bd107caf..1370cfc5 100644
--- a/AE/android/test/src/main/AndroidManifest.xml
+++ b/AE/android/test/src/main/AndroidManifest.xml
@@ -5,37 +5,34 @@
   <!-- min Vulkan API version: 1.0.82 -->
   <uses-feature android:name="android.hardware.vulkan.version" android:version="0x400052" android:required="false" />
 
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:required="true" />
   <uses-permission android:name="android.permission.INTERNET" android:required="true" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" android:required="true" />
 
   <application
-      android:name=".TestApplication"
-      android:allowBackup="false"
-      android:fullBackupContent="false"
-      android:label="AE tests"
-      android:hardwareAccelerated="true"
-      android:isGame="true">
+	  android:name=".TestApplication"
+	  android:label="AE tests"
+	  android:hardwareAccelerated="true"
+	  android:isGame="true">
 
-    <activity
-        android:name=".TestActivity"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-        android:launchMode="singleTask"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
-        android:resizeableActivity="true"
-        android:screenOrientation="userLandscape"
-        android:windowSoftInputMode="adjustPan"
-        android:exported="true">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-        
+	<activity
+		android:name=".TestActivity"
+		android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+		android:launchMode="singleTask"
+		android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
+		android:resizeableActivity="true"
+		android:screenOrientation="userLandscape"
+		android:windowSoftInputMode="adjustPan"
+		android:exported="true">
+	  <intent-filter>
+		<action android:name="android.intent.action.MAIN" />
+		<category android:name="android.intent.category.LAUNCHER" />
+		
 		<!-- for profiling -->
 		<action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
-        <action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
-        <action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
-      </intent-filter>
-    </activity>
+		<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED" />
+		<action android:name="android.app.action.ACTION_DEVICE_ADMIN_DISABLED" />
+	  </intent-filter>
+	</activity>
 
   </application>
 </manifest>
diff --git a/AE/build_scripts/android/_build-debug.bat b/AE/build_scripts/android/_build-debug.bat
index 6292e022..92f2f953 100644
--- a/AE/build_scripts/android/_build-debug.bat
+++ b/AE/build_scripts/android/_build-debug.bat
@@ -1,12 +1,5 @@
 cd ../../android
-rmdir /Q /S ".gradle"
-rmdir /Q /S ".idea"
-rmdir /Q /S "build"
-rmdir /Q /S "engine/build"
-rmdir /Q /S "test/.cxx"
-rmdir /Q /S "test/build"
-rmdir /Q /S "demo/.cxx"
-rmdir /Q /S "demo/build"
 
-gradlew buildCMakeDebug[arm64-v8a]
+gradlew assembleDebug
+::gradlew buildCMakeDebug[arm64-v8a]
 ::gradlew buildCMakeDebug[armeabi-v7a]
diff --git a/AE/build_scripts/android/_build-release.bat b/AE/build_scripts/android/_build-release.bat
new file mode 100644
index 00000000..318403d4
--- /dev/null
+++ b/AE/build_scripts/android/_build-release.bat
@@ -0,0 +1,5 @@
+cd ../../android
+
+gradlew assembleRelease
+::gradlew buildCMakeRelWithDebInfo[arm64-v8a]
+::gradlew buildCMakeRelWithDebInfo[armeabi-v7a]
diff --git a/AE/build_scripts/android/build-debug.bat b/AE/build_scripts/android/build-debug.bat
index 58d66c68..8915b659 100644
--- a/AE/build_scripts/android/build-debug.bat
+++ b/AE/build_scripts/android/build-debug.bat
@@ -1 +1 @@
-"_build-debug.bat" && pause
+"cleanup.bat" && "_build-debug.bat" && pause
diff --git a/AE/build_scripts/android/build-release.bat b/AE/build_scripts/android/build-release.bat
new file mode 100644
index 00000000..605a3817
--- /dev/null
+++ b/AE/build_scripts/android/build-release.bat
@@ -0,0 +1 @@
+"cleanup.bat" && "_build-release.bat" && pause
diff --git a/AE/build_scripts/android/cleanup.bat b/AE/build_scripts/android/cleanup.bat
index 7c8c150f..d6c30883 100644
--- a/AE/build_scripts/android/cleanup.bat
+++ b/AE/build_scripts/android/cleanup.bat
@@ -11,3 +11,5 @@ rmdir /Q /S "engine\build"
 
 rmdir /Q /S "test\.cxx"
 rmdir /Q /S "test\build"
+
+cd ../build_scripts/android
diff --git a/AE/build_scripts/android/copy-graphics-test-result.bat b/AE/build_scripts/android/copy-graphics-test-result.bat
new file mode 100644
index 00000000..29544709
--- /dev/null
+++ b/AE/build_scripts/android/copy-graphics-test-result.bat
@@ -0,0 +1,3 @@
+adb pull "sdcard/Android/data/AE.Test/cache/tests_graphics_vulkan_refdump/Mali-G57 MC2" "C:\Projects\AllinOne\AE\engine\tests\graphics\Vulkan\ref"
+adb pull "sdcard/Android/data/AE.Test/cache/tests_graphics_vulkan_refimg/Mali-G57 MC2" "C:\Projects\AllinOne\AE-Data\tests\graphics\vulkan"
+pause
diff --git a/AE/build_scripts/clone_3party.bat b/AE/build_scripts/clone_3party.bat
index 9a469ff4..2929adf6 100644
--- a/AE/build_scripts/clone_3party.bat
+++ b/AE/build_scripts/clone_3party.bat
@@ -63,6 +63,9 @@ git clone --bare "https://github.com/google/hardware-perfcounter.git" "hardware-
 rmdir /Q /S "hardware-perfcounter-envytools"
 git clone --bare "https://github.com/freedreno/envytools.git" "hardware-perfcounter-envytools"
 
+rmdir /Q /S "xxHash"
+git clone --bare "https://github.com/Cyan4973/xxHash.git" "xxHash"
+
 rmdir /Q /S "Abseil"
 git clone --bare "https://github.com/abseil/abseil-cpp.git" "Abseil"
 
diff --git a/AE/build_scripts/mac_arm64/init-vk.sh b/AE/build_scripts/mac_arm64/init-vk.sh
new file mode 100644
index 00000000..ee03762a
--- /dev/null
+++ b/AE/build_scripts/mac_arm64/init-vk.sh
@@ -0,0 +1,9 @@
+cd ../../..
+rm -rf _build_arm64
+
+mkdir _build_arm64
+cd _build_arm64
+cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 -DAE_ENABLE_VULKAN=ON "../AE"
+
+read -p "open project?"
+open ./AE.xcodeproj
diff --git a/AE/build_scripts/mac_arm64/init.sh b/AE/build_scripts/mac_arm64/init.sh
index 68b616c7..c6b38dd1 100644
--- a/AE/build_scripts/mac_arm64/init.sh
+++ b/AE/build_scripts/mac_arm64/init.sh
@@ -3,4 +3,7 @@ rm -rf _build_arm64
 
 mkdir _build_arm64
 cd _build_arm64
-cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 "../AE"
+cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=arm64 -DAE_ENABLE_METAL=ON "../AE"
+
+read -p "open project?"
+open ./AE.xcodeproj
diff --git a/AE/build_scripts/mac_x64/init-vk.sh b/AE/build_scripts/mac_x64/init-vk.sh
new file mode 100644
index 00000000..4780a3c8
--- /dev/null
+++ b/AE/build_scripts/mac_x64/init-vk.sh
@@ -0,0 +1,11 @@
+# warning: on ARM CPU use 'init_on_arm.sh'
+
+cd ../../..
+rm -rf _build_x64_vk
+
+mkdir _build_x64_vk
+cd _build_x64_vk
+cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DAE_SIMD_SSE=20 -DAE_ENABLE_VULKAN=ON "../AE"
+
+read -p "open project?"
+open ./AE.xcodeproj
diff --git a/AE/build_scripts/mac_x64/init.sh b/AE/build_scripts/mac_x64/init.sh
index f201d357..fb89e7fe 100644
--- a/AE/build_scripts/mac_x64/init.sh
+++ b/AE/build_scripts/mac_x64/init.sh
@@ -6,3 +6,6 @@ rm -rf _build_x64
 mkdir _build_x64
 cd _build_x64
 cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DAE_SIMD_AVX=2 "../AE"
+
+read -p "open project?"
+open ./AE.xcodeproj
diff --git a/AE/build_scripts/mac_x64/init_on_arm-vk.sh b/AE/build_scripts/mac_x64/init_on_arm-vk.sh
new file mode 100644
index 00000000..f28d75a5
--- /dev/null
+++ b/AE/build_scripts/mac_x64/init_on_arm-vk.sh
@@ -0,0 +1,15 @@
+# how to compile on ARM64
+# https://stackoverflow.com/questions/67386941/using-x86-libraries-and-openmp-on-macos-arm64-architecture/67418208#67418208
+
+export CC=/usr/local/opt/llvm/bin/clang
+export CXX=/usr/local/opt/llvm/bin/clang++
+
+cd ../../..
+rm -rf _build_x64_vk
+
+mkdir _build_x64_vk
+cd _build_x64_vk
+arch -x86_64 /usr/local/bin/cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DAE_SIMD_SSE=20 -DAE_ENABLE_VULKAN=ON "../AE"
+
+read -p "open project?"
+open ./AE.xcodeproj
diff --git a/AE/build_scripts/mac_x64/init_on_arm.sh b/AE/build_scripts/mac_x64/init_on_arm.sh
index 1754c794..9af5678a 100644
--- a/AE/build_scripts/mac_x64/init_on_arm.sh
+++ b/AE/build_scripts/mac_x64/init_on_arm.sh
@@ -10,3 +10,6 @@ rm -rf _build_x64
 mkdir _build_x64
 cd _build_x64
 arch -x86_64 /usr/local/bin/cmake -G "Xcode" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DAE_SIMD_SSE=20 "../AE"
+
+read -p "open project?"
+open ./AE.xcodeproj
diff --git a/AE/docs/CMakeLists.txt b/AE/docs/CMakeLists.txt
new file mode 100644
index 00000000..8a6d8ad7
--- /dev/null
+++ b/AE/docs/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+file( GLOB_RECURSE DOCS "*.*" )
+add_library( "Docs" STATIC EXCLUDE_FROM_ALL ${DOCS} "../engine/Changelog.md" "../Readme.md" )
+set_target_properties( "Docs" PROPERTIES LINKER_LANGUAGE CXX )
+set_property( TARGET "Docs" PROPERTY FOLDER "Engine" )
+source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${DOCS} )
+source_group( "engine" FILES "../engine/Changelog.md" )
diff --git a/AE/docs/EngineDocs.md b/AE/docs/EngineDocs.md
new file mode 100644
index 00000000..f7923403
--- /dev/null
+++ b/AE/docs/EngineDocs.md
@@ -0,0 +1,18 @@
+
+* [Build instructions](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Build.md)
+* [Licensing information](https://github.com/azhirnov/as-en/blob/dev/AE/LICENSE)
+* [Engine Concept](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Concept.md)
+* Graphics: [DeviceProperties](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/DeviceProperties.md)
+* Graphics: [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/FeatureSet.md)
+* Low-level Graphics features: [Vulkan](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/VulkanFeatures.md), [Metal](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/MetalFeatures.md)
+* [Graphics Resources](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/GraphicsResources.md)
+* [Supported platforms](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Platforms.md)
+* [Profiling](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Profiling.md)
+* [Resource Compilation](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/ResourceCompilation.md)
+
+## rus
+
+* [Планировщик асинхронных задач](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/TaskScheduler-ru.md)
+* [Планировщик графических задач](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/RenderTaskScheduler-ru.md)
+* [Рендер граф](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/RenderGraph-ru.md)
+* [Файловая система](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/VirtualFileSystem-ru.md)
diff --git a/AE/docs/Papers.md b/AE/docs/Papers.md
new file mode 100644
index 00000000..fc5099b3
--- /dev/null
+++ b/AE/docs/Papers.md
@@ -0,0 +1,9 @@
+
+* [HDR Display](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/HDR_Display.md)
+
+## rus
+
+* [HDR дисплеи](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/HDR_Display-ru.md)
+* [Асинхронное программирование](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/AsyncProgramming-ru.md)
+* [Заметки по архитектуре](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/ArchitectureNotes-ru.md)
+* [Сферический куб](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/SphericalCube-ru.md)
diff --git a/AE/docs/Tools.md b/AE/docs/Tools.md
new file mode 100644
index 00000000..13ebbf58
--- /dev/null
+++ b/AE/docs/Tools.md
@@ -0,0 +1,7 @@
+
+* [Lock-Free Algorithms Sandbox](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/lfas/Readme.md)
+* [GLSL-Trace](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/res_pack/shader_trace/Readme.md)
+* [Detect Image Z-Curve](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/vulkan_image_zcurve/Readme.md)
+* [Vulkan Header Generator](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/vulkan_header_gen/Readme.md)
+* [Vulkan Synchronizations Logger](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/vulkan_sync_log/Readme.md)
+* [FeatureSet Generator](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/feature_set_gen/Readme.md)
diff --git a/AE/engine/docs/Build.md b/AE/docs/engine/Build.md
similarity index 89%
rename from AE/engine/docs/Build.md
rename to AE/docs/engine/Build.md
index b47b3959..7498a602 100644
--- a/AE/engine/docs/Build.md
+++ b/AE/docs/engine/Build.md
@@ -55,11 +55,11 @@ From [stackoverflow](https://stackoverflow.com/questions/67386941/using-x86-libr
 
 ```
 # launch x86_64 shell
-arch -x86_64 zsh  
-# install x86_64 variant of brew 
+arch -x86_64 zsh
+# install x86_64 variant of brew
 arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 # install x86_64 variant of clang
-arch -x86_64 /usr/local/bin/brew install llvm 
+arch -x86_64 /usr/local/bin/brew install llvm
 # compile using x86_64 variant of clang
 /usr/local/opt/llvm/bin/clang++ -arch x86_64 omp_ex.cpp
 ```
@@ -89,7 +89,7 @@ Projects which is require precompiled resources has cmake targets with `.PackRes
 You should run it first to compile resources.
 
 From console: `cmake --build . --config <config> --target <project>.PackRes`.<br/>
-From IDE: build target `<project>.PackRes`. 
+From IDE: build target `<project>.PackRes`.
 
 Compiled resources will be stored in `AE/../AE-Temp` folder. They can be used on all platforms.
 
@@ -97,10 +97,12 @@ Compiled resources will be stored in `AE/../AE-Temp` folder. They can be used on
 ## Update file paths (optional)
 
 Visual Studio and some other IDEs and programs (Notepad++) allows to open file in URL format like a `file://absolute/path/to/a/file.txt`, but it requires absolute paths. Source code may contain links to other source files or docs which is written as URLs.<br/>
-Use IDE or another tool to replace path `[](https://github.com/azhirnov/as-en/blob/dev/AE/...)` to an absolute path like a `file://C:/Projects/AE/...`.
+Use IDE or another tool to replace path `[](https://github.com/azhirnov/as-en/blob/dev/AE/)` to an absolute path like a `file://C:/Projects/AE/`.
 
 
-## Setup IDE (optional)
+## Setup IDE and environment (optional)
+
+Associate file extensions `.as`, `.glsl` with Visual Studio, Notepad++ or other IDE or text editor. This text editor will be used to open files by links like `file://path`.
 
 ### Visual Studio
 
diff --git a/AE/engine/docs/Concept.md b/AE/docs/engine/Concept.md
similarity index 98%
rename from AE/engine/docs/Concept.md
rename to AE/docs/engine/Concept.md
index 3a7c02af..5e68a136 100644
--- a/AE/engine/docs/Concept.md
+++ b/AE/docs/engine/Concept.md
@@ -3,7 +3,7 @@
 
 Most of opensource frameworks have problems:
 * Vulkan backend is copy-pasted from vulkan tutorials and, as a result, has poor performance.
-* Vulkan backend has synchronization problems (*use vkconfig with synchronization validation preset to see them*). 
+* Vulkan backend has synchronization problems (*use vkconfig with synchronization validation preset to see them*).
 * Vulkan backend has many memory allocations, many unnecessary stalls, uses VMA without understanding how it implemented internally.
 * Vulkan backend has small number of compatibility checks. Without validation layers Vulkan driver can create resource which description is not supported by hardware, driver will crash somewhen later. [Vulkan Profiles](https://github.com/KhronosGroup/Vulkan-Profiles) is just a first step to get guarantees that all used features are supported, but it doesn't cover limits which is not in Vulkan properties.
 * Vulkan backend doesn't support queue ownership transfer for resources, this may cause performance problems on some GPUs.
diff --git a/AE/engine/docs/DeviceProperties.md b/AE/docs/engine/DeviceProperties.md
similarity index 98%
rename from AE/engine/docs/DeviceProperties.md
rename to AE/docs/engine/DeviceProperties.md
index ca385985..c75ae283 100644
--- a/AE/engine/docs/DeviceProperties.md
+++ b/AE/docs/engine/DeviceProperties.md
@@ -1,6 +1,6 @@
 Source: [DeviceProperties.h](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/graphics/Public/DeviceProperties.h)
- 
-Use **DeviceProperties** from `DeviceProperties const&  RenderTaskScheduler().GetDeviceProperties();` to get runtime limits for the current GPU.
+
+Use **DeviceProperties** from `DeviceProperties const&  GraphicsScheduler().GetDeviceProperties();` to get runtime limits for the current GPU.
 
 Use **DeviceLimits** from `static constexpr DeviceProperties  DeviceLimits;` to get compile time limits which is compatible with most GPUs.
 
@@ -32,7 +32,7 @@ __Mali GPU__: from [ARM blog](https://community.arm.com/arm-community-blogs/b/gr
 this is not documented in Vulkan API and should be manually updated.*"</br>
 __Vulkan__: *not defined*</br>
 __Metal__:  *not defined*
-	
+
 * `minVertexBufferOffsetAlign`</br>
 __Vulkan__: from [specs](https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#fxvertex-input-address-calculation): "*If format is a packed format, attribAddress must be a multiple of the size in bytes of the whole attribute data type as described in Packed Formats. Otherwise, attribAddress must be a multiple of the size in bytes of the component type indicated by format.*"</br>
 __Metal__:  from [specs](https://developer.apple.com/documentation/metal/mtlvertexattributedescriptor/1515785-offset?language=objc): "*must be a multiple of 4 bytes*"
diff --git a/AE/engine/docs/FeatureSet.md b/AE/docs/engine/FeatureSet.md
similarity index 98%
rename from AE/engine/docs/FeatureSet.md
rename to AE/docs/engine/FeatureSet.md
index 4486ddc2..d6e76a1f 100644
--- a/AE/engine/docs/FeatureSet.md
+++ b/AE/docs/engine/FeatureSet.md
@@ -5,7 +5,7 @@ This is some kind of [Vulkan Profiles](https://github.com/KhronosGroup/Vulkan-Pr
 Use [FeatureSetGen](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/feature_set_gen/Readme.md) application to generate feature sets from Vulkan device info JSON and from Metal feature set table.<br/>
 Predefined FeatureSet's located in the [feature_set folder](https://github.com/azhirnov/as-en/blob/dev/AE/engine/shared_data/feature_set), use them to get GPU limits and features in resource compilation stage.
 
-Use `FeatureSet const&  RenderTaskScheduler().GetFeatureSet()` to get cross-platform limits and features of the current GPU in runtime.
+Use `FeatureSet const&  GraphicsScheduler().GetFeatureSet()` to get cross-platform limits and features of the current GPU in runtime.
 
 ## Render States
 
@@ -275,7 +275,7 @@ Same as `VkPhysicalDevicePortabilitySubsetFeaturesKHR::tessellationPointMode`.
 * maxTotalTileMemory
 * maxVertAmplification
 
-### Compute shader 
+### Compute shader
 
 * __computeShader__<br/>
 Vulkan: always supported.<br/>
diff --git a/AE/engine/docs/GraphicsResources.md b/AE/docs/engine/GraphicsResources.md
similarity index 100%
rename from AE/engine/docs/GraphicsResources.md
rename to AE/docs/engine/GraphicsResources.md
diff --git a/AE/engine/docs/MetalFeatures.md b/AE/docs/engine/MetalFeatures.md
similarity index 93%
rename from AE/engine/docs/MetalFeatures.md
rename to AE/docs/engine/MetalFeatures.md
index f1bdf9f7..92c27129 100644
--- a/AE/engine/docs/MetalFeatures.md
+++ b/AE/docs/engine/MetalFeatures.md
@@ -6,3 +6,4 @@ Supported features:
 - [x] Push constant emulation
 - [x] GPU address
 - [x] Metal 3
+- [x] Async draw
diff --git a/AE/engine/docs/Platforms.md b/AE/docs/engine/Platforms.md
similarity index 87%
rename from AE/engine/docs/Platforms.md
rename to AE/docs/engine/Platforms.md
index bd387fca..e995efd0 100644
--- a/AE/engine/docs/Platforms.md
+++ b/AE/docs/engine/Platforms.md
@@ -8,7 +8,7 @@ Supported platforms
 - [x] Vulkan (by default requires timeline semaphore)
 - [x] Vulkan (without timeline semaphore, compile with `-DAE_VK_TIMELINE_SEMAPHORE=OFF`)
 - [ ] Internal resources
-- [x] Architecture: x64 
+- [x] Architecture: x64
 - [ ] Architecture: ARMv8
 - [ ] Input: gamepad
 - [x] HDR display (Win10+)
@@ -22,7 +22,7 @@ Supported platforms
 - [ ] Flatpack
 - [x] GCC12
 - [x] Clang15
-- [x] Architecture: x64 
+- [x] Architecture: x64
 - [ ] Architecture: ARMv8
 - [ ] HDR display
 
@@ -43,11 +43,14 @@ Supported platforms
 
 ## MacOS
 
-- [x] Metal API 2+
+- [x] Metal API 2.x
+- [x] Metal API 3.x
 - [ ] Async file read/write
 - [x] Offline resource packing (x64 only)
 - [ ] Scripting (ARM64)
-- [ ] HDR display
+- [x] HDR display (Vulkan)
+- [ ] HDR display (Metal)
+- [x] MoltenVk
 
 
 ## iOS
diff --git a/AE/engine/docs/Profiling.md b/AE/docs/engine/Profiling.md
similarity index 99%
rename from AE/engine/docs/Profiling.md
rename to AE/docs/engine/Profiling.md
index 70cd70d0..70e93713 100644
--- a/AE/engine/docs/Profiling.md
+++ b/AE/docs/engine/Profiling.md
@@ -110,11 +110,11 @@ no source
  * Don't use for profiling!
  * [RenderDocApi](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/graphics/Vulkan/Utils/RenderDocApi.h) class for interaction
  * `IBaseContext::DebugMarker()`, `IBaseContext::PushDebugGroup()`, `IBaseContext::PopDebugGroup()` methods for interaction
- 
+
 #### Intel VTune / AMD uProf
 
  * CPU profiling
- * CPU cache profiling 
+ * CPU cache profiling
 
 #### Visual Studio
 
diff --git a/AE/engine/docs/ru/RenderGraph.md b/AE/docs/engine/RenderGraph-ru.md
similarity index 93%
rename from AE/engine/docs/ru/RenderGraph.md
rename to AE/docs/engine/RenderGraph-ru.md
index 955f1767..f888e4f3 100644
--- a/AE/engine/docs/ru/RenderGraph.md
+++ b/AE/docs/engine/RenderGraph-ru.md
@@ -33,7 +33,12 @@ __Синхронизации между очередями.__<br/>
 Для каждого рендер таска также можно указать начальное и конечное состояние ресурса, это позволит оптимизировать синхронизации между тасками.
 
 ```cpp
-AsyncTask begin = rg.BeginFrame();
+// Ожидаем когда кадр -1 отправится на GPU и когда кадр -2 завершит выполнение на GPU.
+// Пока идет ожидание внутри выполняются задачи из переданого списка очередей.
+rg.WaitNextFrame(...);
+
+// начинаем новый кадр
+rg.BeginFrame();
 
 // создаем батч, в нем будем использовать 'image' для чтения в фрагментном шейдере
 auto batch_gfx = rg.CmdBatch( EQueueType::Graphics, {"graphics batch"} )
@@ -47,7 +52,7 @@ auto batch_ac = rg.CmdBatch( EQueueType::AsyncCompute, {"compute batch"} )
 
 // при вызове 'UseResource()' неявно устанавливается зависимость 'batch_gfx -> batch_ac'
 
-AsyncTask gfx_task  = batch_gfx.Task<GraphicsTask>( Tuple{...}, {"graphics task"}      ).SubmitBatch().Run( Tuple{begin} );
+AsyncTask gfx_task  = batch_gfx.Task<GraphicsTask>( Tuple{...}, {"graphics task"}      ).SubmitBatch().Run();
 AsyncTask comp_task = batch_ac .Task<ComputeTask >( Tuple{...}, {"async compute task"} ).SubmitBatch().Run( Tuple{gfx_task} );
 
 // 'SubmitBatch()' помечает задачу как последнюю, тогда вызов 'RenderTask::Execute(cmdbuf)' также добавит батч в очередь на отправку на ГП (submit),
@@ -73,7 +78,7 @@ AsyncTask end = rg.EndFrame( Tuple{ gfx_task, comp_task });
 
 ## Проверка на корректность синхронизаций
 
-Для этого в движке есть логирование команд (проект `VulkanSyncLog`), который выдает читаемый лог вызовов Vulkan комманд и его результат не меняется в зависимости от запусков, что позволяет следить за изменениями.
+Для этого в движке есть логирование команд (проект `VulkanSyncLog`), который выдает читаемый лог вызовов Vulkan команд и его результат не меняется в зависимости от запусков, что позволяет следить за изменениями.
 Но все синхронизации придется один раз вручную проверить на корректность.<br/>
 [Пример лога](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tests/graphics/Vulkan/ref/NVIDIA%20GeForce%20RTX%202080/Test_AsyncCompute2.txt)
 
diff --git a/AE/engine/docs/ru/RenderTaskScheduler.md b/AE/docs/engine/RenderTaskScheduler-ru.md
similarity index 92%
rename from AE/engine/docs/ru/RenderTaskScheduler.md
rename to AE/docs/engine/RenderTaskScheduler-ru.md
index 24afbf00..db0bb9b3 100644
--- a/AE/engine/docs/ru/RenderTaskScheduler.md
+++ b/AE/docs/engine/RenderTaskScheduler-ru.md
@@ -21,7 +21,9 @@
 ## Планировщик графических задач (RenderTaskScheduler)
 
 #### Начало кадра
-Метод `BeginFrame()` создает задачу, которая ожидает завершения кадра минус N, при двойной буферизации N=1, при тройной N=2.
+Метода `WaitNextFrame()` ожидает пока предыдущий кадр отправится на выполнение и кадр минус N завершит выполнение на ГП, при двойной буферизации N=1, при тройной N=2. Пока идет ожидание внутри выполняются другие задачи. При ошибке или слишком долгом ожидании метод вернет `false`.
+
+Метод `BeginFrame()` начинает новый кадр, сбрасывает покадровый аллокатор, сбрасывает счетчики, создает задачу на отложенное удаление графических ресурсов и тд.
 
 Для каждого кадра передаются параметры в `BeginFrameConfig`, где можно установить лимиты на использование промежуточной памяти.
 (TODO: ссылка на управление памятью)
@@ -55,7 +57,7 @@
 Запись команда в Vulkan И Metal имеют отличия - в Metal используются энкодеры, они нужны для лучшего распараллеливания команд и сортировки их встроенным рендер графом.
 Переключение между graphics и compute дорогое, также и graphics и transfer, поэтому подход из Metal заставляет писать более оптимизированный код за счет своей архитектуры.
 
-На Vulkan каждый контекст имеет свой набор этапов (pipeline stages), для лучшей производительности внутри контекста нужно минимизировать синхронизации. 
+На Vulkan каждый контекст имеет свой набор этапов (pipeline stages), для лучшей производительности внутри контекста нужно минимизировать синхронизации.
 
 Вместо энкодеров в движке используются контексты: Draw, Graphics, Transfer, ASBuild, RayTracing и тд.
 
diff --git a/AE/engine/docs/ResourceCompilation.md b/AE/docs/engine/ResourceCompilation.md
similarity index 99%
rename from AE/engine/docs/ResourceCompilation.md
rename to AE/docs/engine/ResourceCompilation.md
index 295b4db7..b21a840b 100644
--- a/AE/engine/docs/ResourceCompilation.md
+++ b/AE/docs/engine/ResourceCompilation.md
@@ -3,8 +3,8 @@
 Engine specific:
 * All shaders must be precompiled and validated.
 * Engine uses only binary data, scripts and configs are allowed only at the resource compilation stage.
-* All graphics resources must have at least one [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/FeatureSet.md), which is used for validation.
-* Engine guarantees that if a resource is compiled with FeatureSet and this FeatureSet is supported by the GPU then the resource is compatible with the GPU. 
+* All graphics resources must have at least one [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/FeatureSet.md), which is used for validation.
+* Engine guarantees that if a resource is compiled with FeatureSet and this FeatureSet is supported by the GPU then the resource is compatible with the GPU.
 
 
 # Pipeline Compiler
@@ -155,7 +155,7 @@ In scrips use:
 ```cpp
 GlobalConfig cfg;
 cfg.SetPreprocessor( EShaderPreprocessor::AEStyle );
-``` 
+```
 
 New scalar types: bool, byte, ubyte, short, ushort, int, uint, long, ulong, float, double, half.<br/>
 New vector types: same as scalar with 2, 3, 4 suffix, example: uint3.<br/>
diff --git a/AE/engine/docs/ru/TaskScheduler.md b/AE/docs/engine/TaskScheduler-ru.md
similarity index 65%
rename from AE/engine/docs/ru/TaskScheduler.md
rename to AE/docs/engine/TaskScheduler-ru.md
index 7faf7c35..9638d6e2 100644
--- a/AE/engine/docs/ru/TaskScheduler.md
+++ b/AE/docs/engine/TaskScheduler-ru.md
@@ -56,7 +56,7 @@ ETaskQueue  co_await Coro_TaskQueue
 	- Доступ к файлам.
 	- Работа с сетью.
  * __FileIO__ - не является очередью, нужен для передачи управления в ОС, чтобы обработать завершенные асинхронные команды чтения/записи в файл.
- 
+
 Исходник: [EThread.h](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/threading/TaskSystem/EThread.h)
 
 
@@ -92,9 +92,55 @@ ETaskQueue  co_await Coro_TaskQueue
 
 ## Управление потоками (ThreadManager)
 
-Создает потоки, привязывает их к ядрам ЦП и к очередям в планировщике задач.
+Встроенная в движок реализация потоков для обработки задач, пользователи могут сделать свою реализацию `IThread` и добавить ее в планировщик (`TaskScheduler::AddThread`).
+
+Стандартная реализация потоков принимает список типов очередей, поток будет выполнять задачи только из этого списка и в том порядке, в котором они расположены в списке.
+Например поток с `EThreadArray{ ETaskQueue::PerFrame, ETaskQueue::Renderer }` будет выполнять `PerFrame` задачи с большим приоритетом.
 
+ThreadManager также распределяет потоки по ядрам ЦП.
 Если ЦП содержит энергоэффективные ядра, то потоки с `Background, FileIO` будут привязаны к этим ядрам, а потоки с `Main, PerFrame, Renderer` будут привязаны к производительным ядрам ЦП.
+Параметр `bindThreadToPhysicalCore` определяет будет ли привязка к физическим ядрам или к логическим (2 потока на ядро), потоки с `Background, FileIO` всегда привязываются к логическим ядрам, так как могут дольше простаивать.
+
+Потоки сами решают когда засыпать, если нет задач на выполнение. В стандартной реализации потоки постепенно увеличивают время сна, если задачи не поступают.
 
 Исходник: [ThreadManager.h](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/threading/TaskSystem/ThreadManager.h)
 
+
+## Примитивы синхронизации
+
+Блокирующие примитивы синхронизации не должны использоваться, за исключением коротких блокировок.
+
+### AsyncMutex
+
+Используется по аналогии с `Mutex`, но эксклюзивная блокировка достигается за счет зависимостей между задачами.
+Недостатки:<br/>
+* Разблокируется только после выполнения всего метода `IAsyncTask::Run()`.
+* Планировщик потоков решает когда запустить следующую задачу, поэтому между ними может быть большой интервал бездействия.
+
+Исходник: [AsyncMutex.h](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/threading/TaskSystem/AsyncMutex.h)
+
+
+## Производительность
+
+Производительность планировщика зависит от скорости добавления и поиска задачи в очереди.
+Очередь работает без блокировок (lock-free), используется несколько внутренних очередей и распределение поиска по ним в зависимости от потока (EThreadSeed).
+
+Производительность не зависит от количества потоков, алгоритм отлично масштабируется и выдает стабильный результат на слабых мобилках и на мощных ПК.
+
+**Пример худшего случая 1**<br/>
+Всего задач: 350k<br/>
+Максимальное количество задач в очереди: 25k<br/>
+Время выполнения задачи: 7мкс<br/>
+Потеря времени в планировщике: 30%
+
+**Пример худшего случая 2**<br/>
+Всего задач: 350k<br/>
+Максимальное количество задач в очереди: 32k<br/>
+Время выполнения задачи: 22мкс<br/>
+Потеря времени в планировщике: 12%
+
+**Пример хорошего случая**<br/>
+Всего задач: 350k<br/>
+Максимальное количество задач в очереди: 32k<br/>
+Время выполнения задачи: 110мкс<br/>
+Потеря времени в планировщике: 2.7%
diff --git a/AE/engine/docs/ru/VirtualFileSystem.md b/AE/docs/engine/VirtualFileSystem-ru.md
similarity index 88%
rename from AE/engine/docs/ru/VirtualFileSystem.md
rename to AE/docs/engine/VirtualFileSystem-ru.md
index 1f2ab89e..25ea30ad 100644
--- a/AE/engine/docs/ru/VirtualFileSystem.md
+++ b/AE/docs/engine/VirtualFileSystem-ru.md
@@ -26,6 +26,9 @@
 
 Используется хэш от строки, чтобы не было динамических выделений памяти.
 
+Уникальность хэша гарантированна для архива.<br/>
+Остальные типы хранилищ проверяют уникальность хэша только в режиме отладки.
+
 
 ## Файловая система (VirtualFileSystem)
 
diff --git a/AE/engine/docs/VulkanFeatures.md b/AE/docs/engine/VulkanFeatures.md
similarity index 63%
rename from AE/engine/docs/VulkanFeatures.md
rename to AE/docs/engine/VulkanFeatures.md
index 9fcecdf6..e46b5c79 100644
--- a/AE/engine/docs/VulkanFeatures.md
+++ b/AE/docs/engine/VulkanFeatures.md
@@ -1,6 +1,6 @@
 Source folder: [Vulkan backend](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/graphics/Vulkan/)
 
-Supported extensions:
+**Supported extensions:**
 - [x] VK_EXT_swapchain_colorspace
 - [x] VK_EXT_validation_features
 - [x] VK_KHR_descriptor_update_template
@@ -34,41 +34,15 @@ Supported extensions:
 - [x] VK_EXT_texture_compression_astc_hdr
 - [x] VK_EXT_texel_buffer_alignment
 - [x] VK_KHR_portability_subset
-- [x] VK_ARM_shader_core_builtins
 - [x] VK_AMD_shader_core_properties, VK_AMD_shader_core_properties2
 - [x] VK_KHR_video_queue
 - [x] VK_KHR_video_encode_queue
 - [x] VK_KHR_video_decode_queue
-- [ ] VK_KHR_video_decode_h264
-- [ ] VK_KHR_video_decode_h265
-- [ ] VK_EXT_video_encode_h264
-- [ ] VK_EXT_video_encode_h265
-- [ ] VK_KHR_multiview
-- [ ] VK_KHR_uniform_buffer_standard_layout
-- [ ] VK_KHR_format_feature_flags2
-- [ ] VK_EXT_inline_uniform_block
-- [ ] VK_EXT_subgroup_size_control
-- [ ] VK_EXT_depth_range_unrestricted
-- [ ] VK_EXT_pageable_device_local_memory
-- [ ] VK_EXT_sample_locations
-- [ ] VK_EXT_rasterization_order_attachment_access
-- [ ] VK_KHR_performance_query
-- [ ] VK_EXT_device_memory_report
-- [ ] VK_KHR_pipeline_library
-- [ ] VK_EXT_astc_decode_mode
-- [ ] VK_EXT_image_compression_control, VK_EXT_image_compression_control_swapchain
-- [ ] VK_NV_shader_image_footprint
-- [ ] VK_NV_device_generated_commands
-- [ ] VK_ARM_rasterization_order_attachment_access
-- [ ] VK_KHR_incremental_present
-- [ ] VK_KHR_present_id
-- [ ] VK_KHR_present_wait
-- [ ] VK_EXT_full_screen_exclusive
-- [ ] VK_EXT_host_image_copy
-- [ ] VK_KHR_maintenance5
+- [x] VK_KHR_pipeline_executable_properties
 
-Supported shader extensions:
-- [ ] VK_NV_cooperative_matrix, GL_NV_cooperative_matrix, GL_NV_integer_cooperative_matrix - removed
+
+
+**Supported shader extensions:**
 - [x] VK_KHR_shader_clock, GL_EXT_shader_realtime_clock, GL_ARB_shader_clock
 - [x] GL_EXT_control_flow_attributes
 - [x] GL_EXT_debug_printf
@@ -91,30 +65,24 @@ Supported shader extensions:
 - [x] VK_EXT_shader_viewport_index_layer, GL_ARB_shader_viewport_layer_array
 - [x] GL_ARB_sparse_texture_clamp
 - [x] VK_NV_shader_sm_builtins, GL_NV_shader_sm_builtins
-- [x] GL_ARM_shader_core_builtins
+- [x] VK_ARM_shader_core_builtins, GL_ARM_shader_core_builtins
 - [x] GL_EXT_nonuniform_qualifier
 - [x] VK_KHR_vulkan_memory_model, GL_KHR_memory_scope_semantics
-- [x] GL_EXT_demote_to_helper_invocation
+- [x] VK_EXT_shader_demote_to_helper_invocation, GL_EXT_demote_to_helper_invocation
 - [x] GL_EXT_fragment_shading_rate
 - [x] VK_EXT_fragment_shader_interlock, GL_ARB_fragment_shader_interlock
 - [x] VK_KHR_shader_draw_parameters, GL_ARB_shader_draw_parameters
 - [x] VK_KHR_fragment_shader_barycentric, GL_EXT_fragment_shader_barycentric
-- [x] VK_KHR_cooperative_matrix, GL_KHR_cooperative_matrix
-- [ ] GL_EXT_multiview
-- [ ] GL_EXT_null_initializer
-- [ ] VK_KHR_zero_initialize_workgroup_memory
-- [ ] VK_EXT_scalar_block_layout, GL_EXT_scalar_block_layout
-- [ ] VK_HUAWEI_subpass_shading, GL_HUAWEI_subpass_shading ???
-- [ ] VK_KHR_shader_terminate_invocation
-- [ ] VK_KHR_workgroup_memory_explicit_layout
-- [ ] VK_EXT_shader_image_atomic_int64
-- [ ] VK_HUAWEI_cluster_culling_shader, GL_HUAWEI_cluster_culling_shader
+- [x] VK_KHR_cooperative_matrix, GL_KHR_cooperative_matrix (deprecated: VK_NV_cooperative_matrix, GL_NV_cooperative_matrix, GL_NV_integer_cooperative_matrix)
+- [x] VK_KHR_shader_subgroup_uniform_control_flow, GL_EXT_subgroupuniform_qualifier
+
 
-Features:
+**Features:**
 - [x] Async compute and transfer queues
 - [x] Async queues with concurrent sharing mode
-- [x] Async queues with exclusive sharing mode 
+- [x] Async queues with exclusive sharing mode
 - [x] Push constants (compatible with Metal)
 - [x] Custom allocator for GPU memory
 - [x] Shader subgroup
+- [x] Secondary command buffers (async draw)
 
diff --git a/AE/engine/docs/img/ARM-HWCounters.jpg b/AE/docs/engine/img/ARM-HWCounters.jpg
similarity index 100%
rename from AE/engine/docs/img/ARM-HWCounters.jpg
rename to AE/docs/engine/img/ARM-HWCounters.jpg
diff --git a/AE/engine/docs/img/GraphicsProfiler.jpg b/AE/docs/engine/img/GraphicsProfiler.jpg
similarity index 100%
rename from AE/engine/docs/img/GraphicsProfiler.jpg
rename to AE/docs/engine/img/GraphicsProfiler.jpg
diff --git a/AE/engine/docs/ru/img/RenderTaskScheduler-1.png b/AE/docs/engine/img/RenderTaskScheduler-1.png
similarity index 100%
rename from AE/engine/docs/ru/img/RenderTaskScheduler-1.png
rename to AE/docs/engine/img/RenderTaskScheduler-1.png
diff --git a/AE/engine/docs/ru/img/RenderTaskScheduler-2.png b/AE/docs/engine/img/RenderTaskScheduler-2.png
similarity index 100%
rename from AE/engine/docs/ru/img/RenderTaskScheduler-2.png
rename to AE/docs/engine/img/RenderTaskScheduler-2.png
diff --git a/AE/engine/docs/img/ShaderProfilerHeatmap.jpg b/AE/docs/engine/img/ShaderProfilerHeatmap.jpg
similarity index 100%
rename from AE/engine/docs/img/ShaderProfilerHeatmap.jpg
rename to AE/docs/engine/img/ShaderProfilerHeatmap.jpg
diff --git a/AE/engine/docs/img/TaskProfiler.jpg b/AE/docs/engine/img/TaskProfiler.jpg
similarity index 100%
rename from AE/engine/docs/img/TaskProfiler.jpg
rename to AE/docs/engine/img/TaskProfiler.jpg
diff --git a/AE/docs/papers/ArchitectureNotes-ru.md b/AE/docs/papers/ArchitectureNotes-ru.md
new file mode 100644
index 00000000..889230fd
--- /dev/null
+++ b/AE/docs/papers/ArchitectureNotes-ru.md
@@ -0,0 +1,75 @@
+Заметки по планированию архитектуры.
+
+## ООП
+
+В больших классах частая проблема - множество методов, которые имеют доступ ко всем полям класса.<br/>
+В чем тут проблема:
+* Читаемость - непонятно что где меняется.
+* Синхронизация - если поля класса защищены разными примитивами синхронизации, то очень сложно отследить где что используется и была ли синхронизация перед использованием.
+
+Возможные решения:
+1. Использовать статические функции. У них остается доступ к приватным типам класса, но нет доступа к полям, для этого их нужно явно передавать, что сразу же улучшает читаемость кода.
+2. Константные методы. Они могут читать все поля, но меняют только те, что передаются в виде параметров.
+3. Приватные классы. В них хранятся только нужные данные и только их логика, но это работает только в редких случаях, так как часто данные нужны везде.
+
+```cpp
+class Obj
+{
+  ReadOnly r;
+  Mutable  m;
+
+  static void  StaticFn (const ReadOnly &, Mutable &);
+  void  ConstMethod (Mutable &) const;
+};
+```
+
+## Синхронизации
+
+Если в классе используется mutex или другой примитив синхронизации, то он должен использоваться для всех полей, кроме константных. Иначе это выглядит как ошибка, когда часть методов не используют синхронизацию.
+
+Вместо нескольких примитивов синхронизации внутри одного класса лучше использовать [Synchronized](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/threading/Primitives/Synchronized.h) тип.
+
+
+## Асинхронная архитектура
+
+Главное - алгоритмы и архитектура должны изначально разрабатываться под асинхронность.
+
+### Алгоритмы выполняются частями
+
+Например загрузка данных с диска на видеокарту.<br/>
+Скорость чтения с диска HDD: ~100Мб/с, SSD: ~500Мб/с, скорость передачи данных по PCI-E: Gen3 x16: 15.75 GB/s, Gen4 x16: 31.5 GB/s.
+Если данные занимают несколько Гб, то мы не можем загрузить все с диска в ОЗУ и затем уже передать на видеокарту, это отберет слишком много памяти у других операций. Тогда нужно использовать фиксированный объем ОЗУ, чтобы читать часть с диска, загружать ее на видеокарту и запускать заново. При этом другие операции могут занимать всю фиксированную часть ОЗУ, поэтому наш алгоритм должен сначала пытаться захватить нужный блок памяти.
+Чтобы не блокировать шину PCI-E передачей больших объемов данных, требуется передавать их малыми частями каждый кадр. Также захватывается блок видимой для видеокарты ОЗУ, в нее копируется (ОЗУ -> ОЗУ), потом на видеокарте идет копирование из видимой ОЗУ в память видеокарты.<br/>
+Поэтому асинхронный алгоритм сильно отличается от синхронного, но правильно написанный алгоритм позволяет распараллелить работу, тогда как синхронный алгоритм упрется в объем ОЗУ, пропускную способность диска или шины PCI-E.
+
+**Требуется следить за выделением памяти.**<br/>
+Всегда может возникнуть ситуация, когда один алгоритм запущен множество раз параллельно и требуется выделить слишком много памяти.
+
+
+## Исключения
+
+Текущая реализация C++ не позволяет писать безопасный код с использованием исключений.
+
+Проблемы:
+* Приходится вручную отслеживать какая функция бросает исключения. Компилятор выдает ошибку, если функция с `noexcept` бросает исключение, которое не перехватывается, но это работает только на явный вызов `throw` внутри функции, а используемые функции могут кидать исключения и компилятор никак это не проверяет. Пока не будет предупреждений на использование не-`noexcept` функций внутри `noexcept` функций исключения будут опасны.
+* Концепция исключений предполагает, что после бросания исключений объект возвращается в первоначальное состояние, никаких частичных изменений, либо все, либо ничего, это часто требует выделение дополнительной памяти.
+* Бросание исключений в конструкторах, особенно в move-конструкторах, приводит к выделению дополнительной памяти, как описано выше.
+* В ObjC бросание исключения внутри `autoreleasepool` приводит к утечке памяти.
+* Сложно писать код, который требует соблюдения правил и компилятор в этом никак не помогает, поэтому поддержка исключений усложняет код и увеличивает время разработки.
+
+Преимущества:
+* Хорошо подходят для функций, вызываемых из скриптов, тогда в случае бросания исключения скрипт завершается и выдает ошибку из исключения.
+* Неплохо подходит для десериализации, где из-за порчи данных может произойти попытка выделения большого объема памяти.
+
+В большинстве случаев удобнее использовать коды ошибок и атрибут `[[nodiscard]]`, что не позволит пользователю проигнорировать возвращаемое значение.
+
+
+## Коды ошибок
+
+Обычно достаточно возвращать `bool` - успешно отработала функция или нет. Ошибки должны обрабатываться внутри функции, а пользователь может передать флаги и функторы (std::function), которые будут вызваны для обработки или исправления ошибки.
+
+Почему плохо возвращать `enum` с кодами ошибок - на каждый вызов функции от пользователя требуется обработать все возможные коды, это сильно увеличивает объем кода, это требует заново читать документацию и тд, тогда как чаще всего пользователю нужно получить ответ успешно ли отработала функция или нет.
+
+Как возвращать данные и код ошибки:
+* Как `out` аргументы функции. Обязательные аргументы передаются по ссылке, опциональные - по указателю.<br/>Это требует от пользователя передавать все аргументы, а внутри функции требуется проверять на `null` опциональные параметры. Все это не очень оптимально как для производительности так и для написания кода.
+* Вместе с кодом ошибки. Для этого можно использовать `pair`, `tuple`, `optional<>` и тд.<br/> При этом `pair/tuple` требуют чтобы все возвращаемые данные были валидны, так как данные могут быть прочитаны без проверки кода ошибки. А `optional` и аналоги не дают доступ к данным до проверки ошибки.
diff --git a/AE/engine/docs/ru/AsyncProgramming.md b/AE/docs/papers/AsyncProgramming-ru.md
similarity index 97%
rename from AE/engine/docs/ru/AsyncProgramming.md
rename to AE/docs/papers/AsyncProgramming-ru.md
index 771be1ae..e5b8637b 100644
--- a/AE/engine/docs/ru/AsyncProgramming.md
+++ b/AE/docs/papers/AsyncProgramming-ru.md
@@ -1,5 +1,5 @@
-Сборник нюансов по асинхронному программированию.
-
+Сборник нюансов по асинхронному программированию.<br/>
+Про асинхронную архитектуру написано отдельно [тут](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/ArchitectureNotes-ru.md).
 
 ## Атомарные операции (atomics)
 
diff --git a/AE/engine/docs/ru/HDR_Display.md b/AE/docs/papers/HDR_Display-ru.md
similarity index 100%
rename from AE/engine/docs/ru/HDR_Display.md
rename to AE/docs/papers/HDR_Display-ru.md
diff --git a/AE/engine/docs/HDR_Display.md b/AE/docs/papers/HDR_Display.md
similarity index 100%
rename from AE/engine/docs/HDR_Display.md
rename to AE/docs/papers/HDR_Display.md
diff --git a/AE/docs/papers/SphericalCube-ru.md b/AE/docs/papers/SphericalCube-ru.md
new file mode 100644
index 00000000..36d461ae
--- /dev/null
+++ b/AE/docs/papers/SphericalCube-ru.md
@@ -0,0 +1,63 @@
+**Сферический куб**
+
+## Где используется
+
+* Рисование планет.
+* Вывод кубических текстур (skybox) и видео 360/VR.
+
+
+## Виды проекций
+
+В статье [Cube-to-sphere Projections for Procedural Texturing and Beyond](https://www.jcgt.org/published/0007/02/01/paper.pdf) исследованы различные виды проекций:
+
+![](img/SC_Proj.png)
+
+На картинке цветом обозначена площадь треугольника, более равномерный цвет характеризует равномерную площадь треугольников на сфере.<br/>
+[Исходник теста](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-1.as).
+
+Проекции 5th Poly и COBE в шейдере дают наименьшую точность расчетов. В тесте берется развертка сферы и применяются обратная и прямая проекции, сравниваются вектора и выводится погрешность.<br/>
+[Исходник теста](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/CubeMapTest-1.as).
+
+
+## Проекция текстуры
+
+![](img/SC_TexProj.png)
+
+В tangential проекции текстурные координаты такие же как в identity, но за счет трансформации вершин текстура накладывается более равномерно.<br/>
+Если использовать координаты вершин как текстурные координаты, то искажения текстуры соответствуют identity проекции.
+
+При применении проекции, кроме identity, текстурные координаты перестают соответствовать 3D вектору, тогда при записи в текстуру требуется применять проекцию.<br/>
+Для всех проекций UV координаты грани куба перестают быть прямоугольными, то есть все формы искажаются.<br/>
+UV куба дает распределение,  близкое к равномерному. При этом чем лучше проекция, тем равномернее результат.<br/>
+[Исходник теста](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-2.as).
+
+
+## Топология
+
+![](img/SC_Topology.png)
+
+Обычная сетка после проецирования дает сильно искаженные треугольники, поэтому сетка должна быть симметричной относительно центра грани.
+
+
+## Проекция из 3D
+
+### Искажения
+
+![](img/SC_Distortion.png)
+
+Пример проекции сферы (круга) на сферический куб, ближе к грани куба начинаются небольшие искажения, для круга это не критично.<br/>
+Проекция прямоугольника на сферический куб не имеет искажений только в центре грани куба, на краях начинаются искажения, но радиус вписанной окружности не меняется.<br/>
+[Исходник теста](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-3.as)
+
+
+### Погрешность интерполяции
+
+![](img/SC_ProjError.png)
+
+Тест показывает погрешность, когда проекция применяется для вершин, а между ними происходит линейная интерполяция. За счет расхождения между проекцией и интерполяцией появляется ошибка. На картинке размер ошибки показан белым цветом, красный - когда ошибка более 1 после масштабирования.
+
+Улучшить точность можно повторив линейную интерполяцию между контрольными точками. На картинке это вариант справа.
+
+Исходники:<br/>
+[коррекция в вычислительном шейдере](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-4.as).<br/>
+[коррекция во фрагментном шейдере](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-5.as).
diff --git a/AE/engine/docs/ru/img/HDR-monitor.jpg b/AE/docs/papers/img/HDR-monitor.jpg
similarity index 100%
rename from AE/engine/docs/ru/img/HDR-monitor.jpg
rename to AE/docs/papers/img/HDR-monitor.jpg
diff --git a/AE/engine/docs/ru/img/HDR-smartphone.jpg b/AE/docs/papers/img/HDR-smartphone.jpg
similarity index 100%
rename from AE/engine/docs/ru/img/HDR-smartphone.jpg
rename to AE/docs/papers/img/HDR-smartphone.jpg
diff --git a/AE/docs/papers/img/SC_Distortion.png b/AE/docs/papers/img/SC_Distortion.png
new file mode 100644
index 00000000..e6af786e
Binary files /dev/null and b/AE/docs/papers/img/SC_Distortion.png differ
diff --git a/AE/docs/papers/img/SC_Proj.png b/AE/docs/papers/img/SC_Proj.png
new file mode 100644
index 00000000..dc881666
Binary files /dev/null and b/AE/docs/papers/img/SC_Proj.png differ
diff --git a/AE/docs/papers/img/SC_ProjError.png b/AE/docs/papers/img/SC_ProjError.png
new file mode 100644
index 00000000..d38c95aa
Binary files /dev/null and b/AE/docs/papers/img/SC_ProjError.png differ
diff --git a/AE/docs/papers/img/SC_TexProj.png b/AE/docs/papers/img/SC_TexProj.png
new file mode 100644
index 00000000..703a2a32
Binary files /dev/null and b/AE/docs/papers/img/SC_TexProj.png differ
diff --git a/AE/docs/papers/img/SC_Topology.png b/AE/docs/papers/img/SC_Topology.png
new file mode 100644
index 00000000..fc60e489
Binary files /dev/null and b/AE/docs/papers/img/SC_Topology.png differ
diff --git a/AE/engine/CMakeLists.txt b/AE/engine/CMakeLists.txt
index 5226be04..146f5a20 100644
--- a/AE/engine/CMakeLists.txt
+++ b/AE/engine/CMakeLists.txt
@@ -48,7 +48,6 @@ if (DEFINED ENGINE_LIBS_PATH)
     set( PREBUILD_CPP_FILE "${DUMMY_CPP_FILE}" )
 endif()
 
-add_subdirectory( "docs" )
 add_subdirectory( "src" )
 add_subdirectory( "tools" )
 
diff --git a/AE/engine/Changelog.md b/AE/engine/Changelog.md
index 12b188b1..4c40506a 100644
--- a/AE/engine/Changelog.md
+++ b/AE/engine/Changelog.md
@@ -1,4 +1,29 @@
 
+## 23.12.214
+
+- Graphics: remote graphics server
+- CMake: added AE_ENABLE_EXCEPTIONS to switch on/off exceptions and RTTI
+- CMake: added AE_ENABLE_LOGS
+- Graphics: added VK_KHR_pipeline_executable_properties
+- Graphics: added MoltenVk (MacOS)
+- Graphics: BeginFrame() refactoring, now it completes synchronously
+- Android: bugfix, run unit and performance tests
+- Threading: progressive sleep if no tasks to process
+- Networking: AsyncConnect() for TcpSocket
+
+
+## 23.11.207
+
+- Networking: TCP channel
+- Networking: IPv6 support
+- LfIndexedPool2 replaced by LfIndexedPool3
+- Removed: LfIndexedPool2, LfFixedBlockAllocator
+- Rename LfIndexedPool3 -> LfIndexedPool, LfFixedBlockAllocator2 -> LfFixedBlockAllocator
+- Added: ChunkList, MemChunkList, LfChunkList
+- VFS: network storage client/server
+- VFS: network storage server application
+
+
 ## 23.10.199
 
 - CMake: remove AE_NO_EXCEPTIONS
diff --git a/AE/engine/cmake/compiler_tests.cmake b/AE/engine/cmake/compiler_tests.cmake
index 70f1f27e..fa4c2f6d 100644
--- a/AE/engine/cmake/compiler_tests.cmake
+++ b/AE/engine/cmake/compiler_tests.cmake
@@ -20,7 +20,7 @@ message( STATUS "Run compiler tests with flags: ${CMAKE_REQUIRED_FLAGS}" )
 set( AE_COMPILER_DEFINITIONS "" )
 
 #------------------------------------------------------------------------------
-set( STD_FILESYSTEM_SUPPORTED_SRC 
+set( STD_FILESYSTEM_SUPPORTED_SRC
     "#include <filesystem>
     int main () {
         (void)(std::filesystem::current_path());
@@ -52,7 +52,7 @@ else()
 endif()
 
 #------------------------------------------------------------------------------
-set( STD_CACHELINESIZE_SUPPORTED_SRC 
+set( STD_CACHELINESIZE_SUPPORTED_SRC
     "#include <new>
     static constexpr size_t Align = std::hardware_destructive_interference_size;
     int main () {
@@ -87,12 +87,12 @@ if (STD_CACHELINESIZE_SUPPORTED)
 elseif (APPLE)
     string( TOUPPER ${CMAKE_SYSTEM_PROCESSOR} PLATFORM_NAME )
     if (${PLATFORM_NAME} STREQUAL "X86_64")
-        set( AE_COMPILER_DEFINITIONS "${AE_COMPILER_DEFINITIONS}" "AE_CACHE_LINE=64" )
+        set( AE_COMPILER_DEFINITIONS "${AE_COMPILER_DEFINITIONS}" "AE_CACHE_LINE=std::size_t{64}" )
     else()
-        set( AE_COMPILER_DEFINITIONS "${AE_COMPILER_DEFINITIONS}" "AE_CACHE_LINE=128" )
+        set( AE_COMPILER_DEFINITIONS "${AE_COMPILER_DEFINITIONS}" "AE_CACHE_LINE=std::size_t{128}" )
     endif()
 else ()
-    set( AE_COMPILER_DEFINITIONS "${AE_COMPILER_DEFINITIONS}" "AE_CACHE_LINE=64" ) # TODO: check
+    set( AE_COMPILER_DEFINITIONS "${AE_COMPILER_DEFINITIONS}" "AE_CACHE_LINE=std::size_t{64}" ) # TODO: check
 endif()
 
 #------------------------------------------------------------------------------
@@ -160,7 +160,7 @@ if (NOT (HAS_HASHFN_HashArrayRepresentation OR HAS_HASHFN_Murmur2OrCityhash OR H
 endif()
 
 #==============================================================================
-set( CPP_COROUTINE_SUPPORTED_SRC 
+set( CPP_COROUTINE_SUPPORTED_SRC
     "#include <coroutine>
     #ifndef __cpp_impl_coroutine
     #   error coroutines are not supported by compiler
diff --git a/AE/engine/cmake/compilers.cmake b/AE/engine/cmake/compilers.cmake
index de2f86ec..1d7e7a2b 100644
--- a/AE/engine/cmake/compilers.cmake
+++ b/AE/engine/cmake/compilers.cmake
@@ -12,9 +12,14 @@
 cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
 
 # options:
-#   AE_ENABLE_COMPILER_WARNINGS     BOOL :  TRUE - for engine,      FALSE - for external projects
+#   AE_ENABLE_COMPILER_WARNINGS     BOOL :      TRUE - for engine,  FALSE - for external projects
 #   AE_USE_SANITIZER                BOOL
-#   AE_DISABLE_THREADS              BOOL :  for emscripten
+#   AE_DISABLE_THREADS              BOOL :      for emscripten
+#   AE_ENABLE_EXCEPTIONS            BOOL :      TRUE - enable,      FALSE - disable exception and RTTI
+#   AE_ENABLE_LOGS                  BOOL
+#   AE_SIMD_AVX                     STRING :    0, 1, 2, 3(AVX512)
+#   AE_SIMD_SSE                     STRING :    0, 20, 30, 31, 41, 42
+#   AE_SIMD_AES                     STRING :    0, 1
 
 
 # detect target platform
@@ -101,7 +106,14 @@ set( "AE_CPU_ARCH_${TARGET_CPU_ARCH}" ON CACHE INTERNAL "" FORCE )
 # default compiler flags
 set( PROJECTS_SHARED_DEFINES
      "AE_${TARGET_PLATFORM}" "AE_PLATFORM_NAME=\"${CMAKE_SYSTEM_NAME}\"" "AE_PLATFORM_BITS=${PLATFORM_BITS}"
-     "AE_CPU_ARCH_${TARGET_CPU_ARCH}" "AE_CPU_ARCH_NAME=\"${TARGET_CPU_ARCH}\"" "AE_ENABLE_RTTI" )
+     "AE_CPU_ARCH_${TARGET_CPU_ARCH}" "AE_CPU_ARCH_NAME=\"${TARGET_CPU_ARCH}\"" )
+
+if (${AE_ENABLE_EXCEPTIONS})
+    set( PROJECTS_SHARED_DEFINES ${PROJECTS_SHARED_DEFINES} "AE_ENABLE_RTTI" "AE_ENABLE_EXCEPTIONS" )
+endif()
+if (${AE_ENABLE_LOGS})
+    set( PROJECTS_SHARED_DEFINES ${PROJECTS_SHARED_DEFINES} "AE_ENABLE_LOGS" )
+endif()
 
 set( CMAKE_CONFIGURATION_TYPES Release Profile Develop Debug )
 set( CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Configurations" FORCE )
@@ -200,28 +212,41 @@ if ( COMPILER_MSVC )
         message( FATAL_ERROR "multiple compiler types detected, previous: '${DETECTED_COMPILER}'" )
     endif()
     set( DETECTED_COMPILER "COMPILER_MSVC" )
-    set( CURRENT_C_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
-    set( CURRENT_CXX_FLAGS ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE )
-    set( CURRENT_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} CACHE STRING "" FORCE )
-    set( CURRENT_STATIC_LINKER_FLAGS ${CMAKE_STATIC_LINKER_FLAGS} CACHE STRING "" FORCE )
-    set( CURRENT_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} CACHE STRING "" FORCE )
 
-    #[[ disable c++ exceptions
-    if (${AE_NO_EXCEPTIONS})
+    set( TEMP_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
+    string( REPLACE "/GR-"                  " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/GR"                   " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" ) # RTTI
+    string( REPLACE "/EHa-"                 " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/EHa"                  " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" ) # catches both structured (asynchronous) and standard C++ (synchronous) exceptions
+    string( REPLACE "/EHsc-"                " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/EHsc"                 " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" ) # functions declared as extern "C" never throw a C++ exception.
+    string( REPLACE "/EHc-"                 " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/EHc"                  " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" ) # ignored without /EHs
+    string( REPLACE "/EHs-"                 " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/EHs"                  " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" ) # catches only standard C++ exceptions, functions declared as extern "C" may throw a C++ exception.
+    string( REPLACE "/EHr-"                 " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/EHr"                  " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" ) # forcing compiler to generate runtime checks for unhandled exceptions that escape a noexcept function
+    string( REPLACE "/D_HAS_EXCEPTIONS=0"   " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "/D_HAS_EXCEPTIONS=1"   " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+    string( REPLACE "   "                   " " TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS}" )
+
+    if (${AE_ENABLE_EXCEPTIONS})
+        set( TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS} /D_HAS_EXCEPTIONS=1 /EHsc /GR" )
+    else ()
+        # disable c++ exceptions
         # _HAS_EXCEPTIONS=0 means 'there are no exceptions' and that the standard library can assume no exceptions.
         # The standard library team does not test any _HAS_EXCEPTIONS=0 configuration.
-        string( REPLACE " /EHa"                 " " CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS}" )
-        string( REPLACE " /EHsc"                " " CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS}" )
-        string( REPLACE " /EHs"                 " " CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS}" )
-        string( REPLACE " /EHr"                 " " CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS}" )
-        string( REPLACE " /D_HAS_EXCEPTIONS=0"  " " CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS}" )
-        string( REPLACE " /D_HAS_EXCEPTIONS=1"  " " CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS}" )
-        set( CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS} /D_HAS_EXCEPTIONS=0 /EHsc" )
-    else ()
-        set( CURRENT_CXX_FLAGS "${CURRENT_CXX_FLAGS} /D_HAS_EXCEPTIONS=1 /EHsc" )
-    endif()]]
+        set( TEMP_CXX_FLAGS "${TEMP_CXX_FLAGS} /D_HAS_EXCEPTIONS=0 /EHs- /GR-" )  # /EHc- /EHr- are not needed
+    endif()
     #--------------------------------------------
 
+    set( CURRENT_C_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE )
+    set( CURRENT_CXX_FLAGS "${TEMP_CXX_FLAGS}" CACHE STRING "" FORCE )
+    set( CMAKE_CXX_FLAGS "${TEMP_CXX_FLAGS}" CACHE STRING "" FORCE )
+    set( CURRENT_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} CACHE STRING "" FORCE )
+    set( CURRENT_STATIC_LINKER_FLAGS ${CMAKE_STATIC_LINKER_FLAGS} CACHE STRING "" FORCE )
+    set( CURRENT_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} CACHE STRING "" FORCE )
+
     set( CONFIGURATION_DEPENDENT_PATH ON CACHE INTERNAL "" FORCE )
 
     #--------------------------------------------
@@ -283,8 +308,6 @@ if ( COMPILER_MSVC )
         list( APPEND MSVC_SHARED_OPTS_DBG /w14100 )
     endif()
 
-    set( CMAKE_CXX_FLAGS "${CURRENT_CXX_FLAGS}" CACHE STRING "" FORCE )
-
     # Release
     set( CMAKE_C_FLAGS_RELEASE "${CURRENT_C_FLAGS} /D_NDEBUG /DNDEBUG /MT /Ox /MP " CACHE STRING "" FORCE )
     set( CMAKE_CXX_FLAGS_RELEASE "${CURRENT_CXX_FLAGS} /D_NDEBUG /DNDEBUG /MT /Ox /MP " CACHE STRING "" FORCE )
@@ -299,7 +322,7 @@ if ( COMPILER_MSVC )
     set( CMAKE_EXE_LINKER_FLAGS_PROFILE "${CURRENT_EXE_LINKER_FLAGS} /DEBUG /PROFILE " CACHE STRING "" FORCE )
     set( CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CURRENT_STATIC_LINKER_FLAGS} /DEBUG /PROFILE " CACHE STRING "" FORCE )
     set( CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CURRENT_SHARED_LINKER_FLAGS} /DEBUG /PROFILE " CACHE STRING "" FORCE )
-    set( PROJECTS_SHARED_CXX_FLAGS_PROFILE ${MSVC_SHARED_OPTS_DBG} /Ob2 /Oi /Ot /Oy /GT /GL /GF /GS- /Ox /analyze- /Zi /GR CACHE INTERNAL "" FORCE )
+    set( PROJECTS_SHARED_CXX_FLAGS_PROFILE ${MSVC_SHARED_OPTS_DBG} /Ob2 /Oi /Ot /Oy /GT /GL /GF /GS- /Ox /analyze- /Zi CACHE INTERNAL "" FORCE )
     set( PROJECTS_SHARED_LINKER_FLAGS_PROFILE " /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUG /PROFILE" CACHE INTERNAL "" FORCE )
     # Develop
     set( CMAKE_C_FLAGS_DEVELOP "${CURRENT_C_FLAGS} /D_NDEBUG /DNDEBUG /D_ITERATOR_DEBUG_LEVEL=0 /MT /Od /MP " CACHE STRING "" FORCE )
@@ -307,7 +330,7 @@ if ( COMPILER_MSVC )
     set( CMAKE_EXE_LINKER_FLAGS_DEVELOP "${CURRENT_EXE_LINKER_FLAGS} /DEBUG " CACHE STRING "" FORCE )
     set( CMAKE_STATIC_LINKER_FLAGS_DEVELOP "${CURRENT_STATIC_LINKER_FLAGS} /DEBUG " CACHE STRING "" FORCE )
     set( CMAKE_SHARED_LINKER_FLAGS_DEVELOP "${CURRENT_SHARED_LINKER_FLAGS} /DEBUG " CACHE STRING "" FORCE )
-    set( PROJECTS_SHARED_CXX_FLAGS_DEVELOP ${MSVC_SHARED_OPTS_DBG} /Ob2 /Oi /Ot /Oy /GT /GL /GF /GS- /Od /analyze- /Zi /GR CACHE INTERNAL "" FORCE )
+    set( PROJECTS_SHARED_CXX_FLAGS_DEVELOP ${MSVC_SHARED_OPTS_DBG} /Ob2 /Oi /Ot /Oy /GT /GL /GF /GS- /Od /analyze- /Zi CACHE INTERNAL "" FORCE )
     set( PROJECTS_SHARED_LINKER_FLAGS_DEVELOP " /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUG" CACHE INTERNAL "" FORCE )
     # Debug
     set( CMAKE_C_FLAGS_DEBUG "${CURRENT_C_FLAGS} /D_DEBUG /D_ITERATOR_DEBUG_LEVEL=${AE_ITERATOR_DEBUG_LEVEL} /MTd /Od /MP " CACHE STRING "" FORCE )
@@ -315,7 +338,7 @@ if ( COMPILER_MSVC )
     set( CMAKE_EXE_LINKER_FLAGS_DEBUG "${CURRENT_EXE_LINKER_FLAGS} /DEBUG:FULL " CACHE STRING "" FORCE )
     set( CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CURRENT_STATIC_LINKER_FLAGS} /DEBUG:FULL " CACHE STRING "" FORCE )
     set( CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CURRENT_SHARED_LINKER_FLAGS} /DEBUG:FULL " CACHE STRING "" FORCE )
-    set( PROJECTS_SHARED_CXX_FLAGS_DEBUG ${MSVC_SHARED_OPTS_DBG} /sdl /Od /Ob0 /Oy- /GF- /GS /GR /analyze- /Zi /RTC1 CACHE INTERNAL "" FORCE )
+    set( PROJECTS_SHARED_CXX_FLAGS_DEBUG ${MSVC_SHARED_OPTS_DBG} /sdl /Od /Ob0 /Oy- /GF- /GS /analyze- /Zi /RTC1 CACHE INTERNAL "" FORCE )
     set( PROJECTS_SHARED_LINKER_FLAGS_DEBUG " /OPT:REF /OPT:ICF /INCREMENTAL:NO /DEBUG:FULL" CACHE INTERNAL "" FORCE )
 endif()
 
@@ -324,15 +347,23 @@ endif()
 # GCC/Clang shared settings
 #==================================================================================================
 set( GCC_CLANG_SHARED_GLOBAL_WARNING_LIST "-Wno-unused -Wno-switch -Wno-undef -Wno-comment" )
-set( GCC_CLANG_SHARED_LOCAL_WARNING_LIST  -Wdouble-promotion -Wchar-subscripts -Wformat -Wmain -Wmissing-braces -Werror=uninitialized -Wmissing-include-dirs -Wunknown-pragmas -Wpragmas -Wstrict-overflow -Wstrict-aliasing -Wendif-labels -Wpointer-arith -Wwrite-strings -Wconversion-null -Wenum-compare -Wsign-compare -Wno-unused -Wsizeof-pointer-memaccess -Wno-zero-as-null-pointer-constant -Wundef -Werror=init-self -Werror=parentheses -Werror=return-type -Werror=array-bounds -Werror=div-by-zero -Werror=missing-field-initializers -Werror=cast-qual -Werror=cast-align -Wno-switch -Werror=invalid-pch -Werror=defaulted-function-deleted )
+set( GCC_CLANG_SHARED_LOCAL_WARNING_LIST  -Wdouble-promotion -Wchar-subscripts -Wformat -Wmain -Wmissing-braces -Werror=uninitialized -Wmissing-include-dirs -Wunknown-pragmas -Wpragmas -Wstrict-overflow -Wstrict-aliasing -Wendif-labels -Wpointer-arith -Wwrite-strings -Wconversion-null -Wenum-compare -Wsign-compare -Wno-unused -Wsizeof-pointer-memaccess -Wno-zero-as-null-pointer-constant -Wundef -Werror=init-self -Werror=parentheses -Werror=return-type -Werror=array-bounds -Werror=div-by-zero -Werror=missing-field-initializers -Werror=cast-qual -Werror=cast-align -Wno-switch -Werror=invalid-pch -Werror=defaulted-function-deleted -Werror=format-security )
 
-#if (${AE_NO_EXCEPTIONS})
-#   set( GCC_CLANG_SHARED_GLOBAL_WARNING_LIST "${GCC_CLANG_SHARED_GLOBAL_WARNING_LIST} -fno-exceptions" )
-#   set( GCC_CLANG_SHARED_LOCAL_WARNING_LIST  ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST} -fno-exceptions )
-#else()
-    set( GCC_CLANG_SHARED_GLOBAL_WARNING_LIST "${GCC_CLANG_SHARED_GLOBAL_WARNING_LIST} -fexceptions" )
-    set( GCC_CLANG_SHARED_LOCAL_WARNING_LIST  ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST} -fexceptions )
-#endif()
+if (${AE_ENABLE_EXCEPTIONS})
+    set( GCC_CLANG_SHARED_GLOBAL_WARNING_LIST "${GCC_CLANG_SHARED_GLOBAL_WARNING_LIST} -frtti -fexceptions" )
+    set( GCC_CLANG_SHARED_LOCAL_WARNING_LIST  ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST}   -frtti -fexceptions )
+else()
+    # TODO: -fno-unwind-tables -fno-asynchronous-unwind-tables
+    set( GCC_CLANG_SHARED_GLOBAL_WARNING_LIST "${GCC_CLANG_SHARED_GLOBAL_WARNING_LIST} -fno-rtti -fno-exceptions" )
+    set( GCC_CLANG_SHARED_LOCAL_WARNING_LIST  ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST}   -fno-rtti -fno-exceptions )
+endif()
+
+# TODO:
+#   -ffast-math
+#   -ffp-contract=fast
+#   -fvisibility-inlines-hidden -fvisibility=hidden
+#   -ffunction-sections -fdata-sections
+#   -no-canonical-prefixes
 
 
 #==================================================================================================
@@ -352,7 +383,7 @@ if ( COMPILER_GCC )
     #--------------------------------------------
     set( CONFIGURATION_DEPENDENT_PATH OFF CACHE INTERNAL "" FORCE )
 
-    # -Wno-shadow -Wno-enum-compare -Wno-narrowing -Wno-attributes 
+    # -Wno-shadow -Wno-enum-compare -Wno-narrowing -Wno-attributes
     set( GCC_SHARED_OPTS         ${COMPILER_FLAGS} -Wmaybe-uninitialized -Wfree-nonheap-object -Wcast-align -Wlogical-op -Waddress -Wno-non-template-friend -Werror=return-local-addr -Werror=placement-new -Werror=sign-compare -Werror=literal-suffix -Werror=shadow=local -Werror=delete-incomplete -Werror=odr -Werror=subobject-linkage -Werror=multichar -Winvalid-offsetof ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST} )
     set( PROJECTS_SHARED_DEFINES ${PROJECTS_SHARED_DEFINES} "AE_COMPILER_GCC" )
 
@@ -399,9 +430,8 @@ endif()
 # Clang shared settings
 # https://clang.llvm.org/docs/DiagnosticsReference.html
 #==================================================================================================
-set( CLANG_SHARED_GLOBAL_WARNING_LIST "${GCC_CLANG_SHARED_GLOBAL_WARNING_LIST} -Wnarrowing -stdlib=libc++" ) # -Wno-deprecated-builtins 
-set( CLANG_SHARED_LOCAL_WARNING_LIST  ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST} -Wnarrowing -Wlogical-op-parentheses -frtti -Wunused -Werror=conditional-uninitialized -Wloop-analysis -Wincrement-bool -Wno-undefined-inline -Wc++14-extensions -Wc++17-extensions -Wno-comment -Wunused-private-field -Werror=return-stack-address -Werror=address -Werror=unsupported-friend -Werror=unknown-warning-option -Werror=user-defined-literals -Werror=instantiation-after-specialization -Werror=keyword-macro -Werror=large-by-value-copy -Werror=method-signatures -Werror=self-assign -Werror=self-move -Werror=infinite-recursion -Werror=pessimizing-move -Werror=dangling-else -Werror=return-std-move -Werror=deprecated-increment-bool -Werror=abstract-final-class -Wno-ambiguous-reversed-operator -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-const-variable -Wno-unused-local-typedef -Wdelete-non-virtual-dtor -Wrange-loop-analysis -Wundefined-bool-conversion -Winconsistent-missing-override -Wincrement-bool -Wunused-lambda-capture -fno-short-enums -Werror=implicit-exception-spec-mismatch -Werror=range-loop-bind-reference )
-
+set( CLANG_SHARED_GLOBAL_WARNING_LIST "${GCC_CLANG_SHARED_GLOBAL_WARNING_LIST} -Wnarrowing -stdlib=libc++" ) # -Wno-deprecated-builtins
+set( CLANG_SHARED_LOCAL_WARNING_LIST  ${GCC_CLANG_SHARED_LOCAL_WARNING_LIST} -Wnarrowing -Wlogical-op-parentheses  -Wunused -Werror=conditional-uninitialized -Wloop-analysis -Wincrement-bool -Wno-undefined-inline -Wc++14-extensions -Wc++17-extensions -Wno-comment -Wunused-private-field -Werror=return-stack-address -Werror=address -Werror=unsupported-friend -Werror=unknown-warning-option -Werror=user-defined-literals -Werror=instantiation-after-specialization -Werror=keyword-macro -Werror=large-by-value-copy -Werror=method-signatures -Werror=self-assign -Werror=self-move -Werror=infinite-recursion -Werror=pessimizing-move -Werror=dangling-else -Werror=return-std-move -Werror=deprecated-increment-bool -Werror=abstract-final-class -Wno-ambiguous-reversed-operator -Wno-unneeded-internal-declaration -Wno-unused-function -Wno-unused-const-variable -Wno-unused-local-typedef -Wdelete-non-virtual-dtor -Wrange-loop-analysis -Wundefined-bool-conversion -Winconsistent-missing-override -Wincrement-bool -Wunused-lambda-capture -fno-short-enums -Werror=implicit-exception-spec-mismatch -Werror=range-loop-bind-reference )
 
 #==================================================================================================
 # Clang Compilation settings
@@ -645,7 +675,7 @@ if ( COMPILER_CLANG_ANDROID )
     set( CONFIGURATION_DEPENDENT_PATH OFF CACHE INTERNAL "" FORCE )
     #--------------------------------------------
 
-    set( CLANG_SHARED_OPTS ${COMPILER_FLAGS} ${CLANG_SHARED_LOCAL_WARNING_LIST} -fstack-protector-strong -fPIC )
+    set( CLANG_SHARED_OPTS ${COMPILER_FLAGS} ${CLANG_SHARED_LOCAL_WARNING_LIST} -fstack-protector-strong -fPIC -fcoroutines-ts )
     # -mfloat-abi=hard
 
     set( PROJECTS_SHARED_DEFINES ${PROJECTS_SHARED_DEFINES} "AE_COMPILER_CLANG" )
diff --git a/AE/engine/cmake/config.cmake b/AE/engine/cmake/config.cmake
index 93fb20fb..a5fd28b5 100644
--- a/AE/engine/cmake/config.cmake
+++ b/AE/engine/cmake/config.cmake
@@ -8,7 +8,10 @@ set( AE_ENABLE_MEMLEAK_CHECKS ON CACHE BOOL "enable memory leak checks" )
 set( AE_USE_SANITIZER           OFF CACHE BOOL "enable (address/...) sanitizer" )
 set( AE_CI_BUILD_NO_GRAPHICS    OFF CACHE BOOL "CI settings (without graphics)" )
 set( AE_CI_BUILD                OFF CACHE BOOL "CI settings" )
-mark_as_advanced( AE_NO_EXCEPTIONS AE_CI_BUILD_NO_GRAPHICS AE_CI_BUILD )
+set( AE_ENABLE_EXCEPTIONS       ON  CACHE BOOL "enable exception and RTTI" )
+set( AE_ENABLE_LOGS             ON  CACHE BOOL "enable logging, disable to remove a lot of strings" )
+
+mark_as_advanced( AE_CI_BUILD_NO_GRAPHICS AE_CI_BUILD AE_ENABLE_LOGS )
 
 #----------------------------------------------------------
 # internal constants
diff --git a/AE/engine/deprecated/threading/LfFixedBlockAllocator1.h b/AE/engine/deprecated/threading/LfFixedBlockAllocator1.h
new file mode 100644
index 00000000..69c7ede0
--- /dev/null
+++ b/AE/engine/deprecated/threading/LfFixedBlockAllocator1.h
@@ -0,0 +1,139 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifndef AE_LFAS_ENABLED
+# include "threading/Primitives/SpinLock.h"
+# include "threading/Primitives/SyncEvent.h"
+#endif
+
+#ifdef AE_DEBUG
+#   define AE_LFFIXEDBLOCKALLOC_DEBUG   1
+#else
+#   define AE_LFFIXEDBLOCKALLOC_DEBUG   0
+#endif
+
+namespace AE::Threading
+{
+
+    //
+    // Lock-free Fixed block Allocator
+    //
+
+    template <usize ChunkSize_v = 64*64,
+              usize MaxChunks_v = 1024,
+              typename BlockAllocatorType   = UntypedAllocator,
+              typename GeneralAllocatorType = UntypedAllocator
+             >
+    class LfFixedBlockAllocator1 final : public IAllocatorTS
+    {
+        StaticAssert( ChunkSize_v > 0 );
+        StaticAssert( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
+        StaticAssert( ChunkSize_v <= 64*64 );
+        StaticAssert( MaxChunks_v > 0 );
+        StaticAssert( IsPowerOfTwo( ChunkSize_v )); // must be power of 2 to increase performance
+        StaticAssert( BlockAllocatorType::IsThreadSafe );
+        StaticAssert( GeneralAllocatorType::IsThreadSafe );
+
+    // types
+    public:
+        using Self              = LfFixedBlockAllocator1< ChunkSize_v, MaxChunks_v, BlockAllocatorType, GeneralAllocatorType >;
+        using BlockAllocator_t  = BlockAllocatorType;
+        using GenAllocator_t    = GeneralAllocatorType;
+        using Ptr_t             = RstPtr<void>;
+
+    private:
+        static constexpr uint   ChunkSize       = ChunkSize_v;
+        static constexpr uint   MaxChunks       = MaxChunks_v;
+        static constexpr uint   LowLevel_Count  = (ChunkSize <= 32 ? 32 : 64);
+        static constexpr uint   HiLevel_Count   = Max( 1u, (ChunkSize + LowLevel_Count - 1) / LowLevel_Count );
+
+        using LowLevelBits_t    = Conditional< (LowLevel_Count <= 32), uint, ulong >;
+        using LowLevels_t       = StaticArray< Atomic< LowLevelBits_t >, HiLevel_Count >;
+        using HiLevelBits_t     = Conditional< (HiLevel_Count <= 32), uint, ulong >;
+
+        StaticAssert( HiLevel_Count <= 64 );
+
+        struct alignas(AE_CACHE_LINE) ChunkInfo
+        {
+            Atomic< HiLevelBits_t > hiLevel;        // 0 - is unassigned bit, 1 - assigned bit
+            SpinLockRelaxed         hiLevelGuard;   // only for 'hiLevel' modification
+
+            LowLevels_t             lowLevel;       // 0 - is unassigned bit, 1 - assigned bit
+            Atomic< void * >        memBlock;
+
+            #if AE_LFFIXEDBLOCKALLOC_DEBUG
+            Atomic< SourceLoc *>    dbgInfo;
+            SyncEvent               dbgInfoEvent {SyncEvent::EFlags::ManualReset};
+            #endif
+        };
+
+        using ChunkInfos_t  = StaticArray< ChunkInfo, MaxChunks >;
+
+        static constexpr HiLevelBits_t  MaxHighLevel        = ToBitMask<HiLevelBits_t>( HiLevel_Count );
+        static constexpr HiLevelBits_t  InitialHighLevel    = ~MaxHighLevel;
+        static constexpr uint           HighWaitCount       = 2;
+        static constexpr usize          ThreadToChunkMask   = MaxChunks < 5 ? 0 : 15;
+
+
+    // variables
+    private:
+        ChunkInfos_t        _chunkInfo;
+        const POTBytes      _blockSize;
+        const POTBytes      _blockAlign;
+
+        NO_UNIQUE_ADDRESS BlockAllocator_t  _blockAlloc;
+        NO_UNIQUE_ADDRESS GenAllocator_t    _genAlloc;
+
+        Atomic<ulong>       _dbgCounter     {0};
+        Atomic<ulong>       _dbgLockCounter {0};
+
+
+    // methods
+    public:
+        LfFixedBlockAllocator1  (Bytes blockSize,
+                                Bytes blockAlign,
+                                const BlockAllocator_t& blockAlloc  = Default,
+                                const GenAllocator_t&   genAlloc    = Default) __NE___;
+
+        ~LfFixedBlockAllocator1 ()                              __NE___ { Release( True{"checkMemLeak"} ); }
+
+            void        Release (Bool checkMemLeak)             __NE___;
+
+
+
+        ND_ Ptr_t       AllocBlock ()                           __NE___ { return AllocBlock( Default ); }
+        ND_ Ptr_t       AllocBlock (const SourceLoc &loc)       __NE___;
+            bool        DeallocBlock (void *)                   __NE___;
+
+        ND_ Bytes       BlockSize ()                            C_NE___ { return Bytes{ _blockSize }; }
+        ND_ Bytes       BlockAlign ()                           C_NE___ { return Bytes{ _blockAlign }; }
+        ND_ POTBytes    BlockSizePOT ()                         C_NE___ { return _blockSize; }
+        ND_ POTBytes    BlockAlignPOT ()                        C_NE___ { return _blockAlign; }
+
+        ND_ Bytes       LargeBlockSize ()                       C_NE___ { return BlockSize() * ChunkSize; }
+        ND_ Bytes       MaxMemorySize ()                        C_NE___ { return LargeBlockSize() * MaxChunks; }
+        ND_ usize       MaxBlockCount ()                        C_NE___ { return MaxChunks * ChunkSize; }
+        ND_ Bytes       AllocatedSize ()                        C_NE___;
+
+
+        // IAllocator //
+        ND_ void*       Allocate (const SizeAndAlign sa)        __NE_OV;
+            void        Deallocate (void*, const SizeAndAlign)  __NE_OV;
+            void        Deallocate (void* ptr)                  __NE_OV { CHECK( DeallocBlock( ptr )); }
+
+            using IAllocator::Allocate;
+            using IAllocator::Deallocate;
+
+    private:
+        ND_ Ptr_t       _Alloc (uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___;
+
+        ND_ static constexpr Bytes  _DbgInfoSize () __NE___ { return SizeOf<SourceLoc> * ChunkSize; }
+        ND_ static constexpr Bytes  _DbgInfoAlign ()__NE___ { return AlignOf<SourceLoc>; }
+    };
+
+
+} // AE::Threading
+
+#include "LfFixedBlockAllocator1.inl.h"
+#undef AE_LFFIXEDBLOCKALLOC_DEBUG
diff --git a/AE/engine/src/threading/Memory/LfFixedBlockAllocator3.inl.h b/AE/engine/deprecated/threading/LfFixedBlockAllocator1.inl.h
similarity index 67%
rename from AE/engine/src/threading/Memory/LfFixedBlockAllocator3.inl.h
rename to AE/engine/deprecated/threading/LfFixedBlockAllocator1.inl.h
index 7ce39ed0..289f788d 100644
--- a/AE/engine/src/threading/Memory/LfFixedBlockAllocator3.inl.h
+++ b/AE/engine/deprecated/threading/LfFixedBlockAllocator1.inl.h
@@ -9,10 +9,10 @@ namespace AE::Threading
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    LfFixedBlockAllocator3<CS,MC,BA,GA>::LfFixedBlockAllocator3 (Bytes blockSize,
-                                                                 Bytes blockAlign,
-                                                                 const BlockAllocator_t&    blockAlloc,
-                                                                 const GenAllocator_t&      genAlloc) __NE___ :
+    LfFixedBlockAllocator1<CS,MC,BA,GA>::LfFixedBlockAllocator1  (Bytes blockSize,
+                                                                Bytes blockAlign,
+                                                                const BlockAllocator_t& blockAlloc,
+                                                                const GenAllocator_t&   genAlloc) __NE___ :
         _blockSize{ blockSize },
         _blockAlign{ blockAlign },
         _blockAlloc{ blockAlloc },
@@ -21,33 +21,23 @@ namespace AE::Threading
         ASSERT( BlockSize() == blockSize );
         ASSERT( BlockAlign() == blockAlign );
 
-        StaticArray< TopLevelBits_t, TopLevel_Count >   top_bits = {};
-
-        for (usize i = 0; i < _bottomChunks.size(); ++i)
+        for (usize i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk   = _bottomChunks[i];
-            auto&   top     = top_bits[ i / CT_SizeOfInBits<TopLevelBits_t> ];
+            auto&   chunk = _chunkInfo[i];
 
             for (usize j = 0; j < HiLevel_Count; ++j)
             {
                 chunk.lowLevel[j].store( 0 );
             }
 
-            chunk.hiLevel.store( InitialHighLevel );    // set 0 bit for working range, 1 bit for unused bits
+            chunk.hiLevel.store( InitialHighLevel );    // set 0 bits for working range, 1 bit for unused bits
             chunk.memBlock.store( null );
 
-            top |= TopLevelBits_t{1} << (i % CT_SizeOfInBits<TopLevelBits_t>);
-
             #if AE_LFFIXEDBLOCKALLOC_DEBUG
             chunk.dbgInfo.store( null );
             #endif
         }
 
-        for (usize i = 0; i < _topChunks.size(); ++i)
-        {
-            _topChunks[i].assigned.store( ~top_bits[i] );   // set 0 bit for working range, 1 bit for unused bits
-        }
-
         MemoryBarrier( EMemoryOrder::Release );
     }
 
@@ -59,15 +49,14 @@ namespace AE::Threading
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    void  LfFixedBlockAllocator3<CS,MC,BA,GA>::Release (bool checkMemLeak) __NE___
+    void  LfFixedBlockAllocator1<CS,MC,BA,GA>::Release (Bool checkMemLeak) __NE___
     {
         MemoryBarrier( EMemoryOrder::Acquire );
 
         for (usize i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk       = _bottomChunks[i];
-            void*   ptr         = chunk.memBlock.exchange( null );
-            auto&   top_chunk   = _topChunks[ i / CT_SizeOfInBits<TopLevelBits_t> ];
+            auto&   chunk   = _chunkInfo[i];
+            void*   ptr     = chunk.memBlock.exchange( null );
 
             if ( ptr != null )
                 _blockAlloc.Deallocate( ptr, SizeAndAlign{ LargeBlockSize(), BlockAlign() });
@@ -77,14 +66,8 @@ namespace AE::Threading
             HiLevelBits_t   old_hi_level = chunk.hiLevel.exchange( InitialHighLevel );
 
             if ( checkMemLeak )
-            {
                 CHECK( old_hi_level == InitialHighLevel );  // some blocks is still allocated
 
-                TopLevelBits_t  top_bits    = top_chunk.assigned.load();
-                TopLevelBits_t  top_lvl_bit = TopLevelBits_t{1} << (i % CT_SizeOfInBits<TopLevelBits_t>);
-                CHECK( not (top_bits & top_lvl_bit) );
-            }
-
             #if AE_LFFIXEDBLOCKALLOC_DEBUG
             SourceLoc*  dbg_info = chunk.dbgInfo.exchange( null );
             #endif
@@ -109,8 +92,9 @@ namespace AE::Threading
 
                             AE_LOGI( "Leaked memory block: "s << ToString( BlockSize() ), dbg.file, dbg.line );
 
-                            old_low_level   &= (LowLevelBits_t{1} << low_idx);  // 1 -> 0
-                            low_idx         = BitScanForward( old_low_level );  // first 1 bit
+                            old_low_level &= (LowLevelBits_t{1} << low_idx);    // 1 -> 0
+
+                            low_idx = BitScanForward( old_low_level );  // first 1 bit
                         }
                     }
                     #endif
@@ -134,12 +118,12 @@ namespace AE::Threading
 
 /*
 =================================================
-    Alloc
+    AllocBlock
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    typename LfFixedBlockAllocator3<CS,MC,BA,GA>::Ptr_t
-        LfFixedBlockAllocator3<CS,MC,BA,GA>::Alloc (const SourceLoc &loc) __NE___
+    typename LfFixedBlockAllocator1<CS,MC,BA,GA>::Ptr_t
+        LfFixedBlockAllocator1<CS,MC,BA,GA>::AllocBlock (const SourceLoc &loc) __NE___
     {
         struct Dbg
         {
@@ -157,22 +141,32 @@ namespace AE::Threading
             }
         } dbg{ *this };
 
-        for (usize i = 0; i < _topChunks.size(); ++i, ++dbg.counter)
+        for (uint i = ThreadUtils::GetIntID() & ThreadToChunkMask;
+            i < MaxChunks; i += (ThreadToChunkMask >> 1))
         {
-            auto&           top_chunk   = _topChunks[i];
-            TopLevelBits_t  available   = ~top_chunk.assigned.load();   // 1 - unassigned
-            int             idx         = BitScanForward( available );  // first 1 bit
+            auto&   chunk = _chunkInfo[i];
 
-            for (; idx >= 0; ++dbg.counter)
-            {
-                Ptr_t   ptr = _Alloc( uint(idx + i * CT_SizeOfInBits<TopLevelBits_t>), loc, INOUT dbg.counter, INOUT dbg.locks );
+            if ( chunk.hiLevel.load() == UMax )
+                continue;
 
-                if_likely( ptr != null )
-                    return ptr;
+            Ptr_t   ptr = _Alloc( i, loc, INOUT dbg.counter, INOUT dbg.locks );
 
-                available   &= ~(TopLevelBits_t{1} << idx);     // 1 -> 0
-                idx         = BitScanForward( available );      // first 1 bit
-            }
+            if_likely( ptr != null )
+                return ptr;
+        }
+
+        // TODO
+        for (uint i = 0; i < MaxChunks; ++i)
+        {
+            auto&   chunk = _chunkInfo[i];
+
+            if ( chunk.hiLevel.load() == UMax )
+                continue;
+
+            Ptr_t   ptr = _Alloc( i, loc, INOUT dbg.counter, INOUT dbg.locks );
+
+            if_likely( ptr != null )
+                return ptr;
         }
 
         return null;
@@ -184,14 +178,18 @@ namespace AE::Threading
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    typename LfFixedBlockAllocator3<CS,MC,BA,GA>::Ptr_t
-        LfFixedBlockAllocator3<CS,MC,BA,GA>::_Alloc (const uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___
+    typename LfFixedBlockAllocator1<CS,MC,BA,GA>::Ptr_t
+        LfFixedBlockAllocator1<CS,MC,BA,GA>::_Alloc (const uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___
     {
-        BottomChunk&    chunk   = _bottomChunks[ chunkIndex ];
-        auto*           ptr     = chunk.memBlock.load( EMemoryOrder::Acquire );
+        Unused( loc );
+
+        ChunkInfo&  chunk   = _chunkInfo[ chunkIndex ];
+        void*       ptr     = chunk.memBlock.load( EMemoryOrder::Acquire );
+        ++dbgCounter;
 
         #if AE_LFFIXEDBLOCKALLOC_DEBUG
         SourceLoc*  dbg_info = chunk.dbgInfo.load( EMemoryOrder::Acquire );
+        ++dbgCounter;
         #endif
 
         // allocate new block
@@ -257,7 +255,7 @@ namespace AE::Threading
         // find available index in high level
         for (uint j = 0; j < HighWaitCount; ++j, ++dbgCounter)
         {
-            HiLevelBits_t   hi_available    = ~chunk.hiLevel.load();            // 1 - unassigned
+            HiLevelBits_t   hi_available    = ~chunk.hiLevel.load();            // 1 - unassigned bit
             int             hi_lvl_idx      = BitScanForward( hi_available );   // first 1 bit
 
             for (; hi_lvl_idx >= 0; ++dbgCounter)
@@ -266,47 +264,28 @@ namespace AE::Threading
 
                 // find available index in low level
                 auto&           level           = chunk.lowLevel[ hi_lvl_idx ];
-                LowLevelBits_t  low_available   = level.load();                     // 0 - unassigned
+                LowLevelBits_t  low_available   = level.load();                     // 0 - unassigned bit
                 int             low_lvl_idx     = BitScanForward( ~low_available ); // first 0 bit
 
                 for (; low_lvl_idx >= 0; ++dbgCounter)
                 {
                     const LowLevelBits_t    low_lvl_bit = (LowLevelBits_t{1} << low_lvl_idx);
 
-                    if ( level.CAS( INOUT low_available, low_available | low_lvl_bit )) // 0 -> 1
+                    if ( level.CAS( INOUT low_available, low_available | low_lvl_bit ))     // 0 -> 1
                     {
                         // update high level
                         if_unlikely( low_available == ~low_lvl_bit )
                         {
-                            bool    update_top  = false;
-                            {
-                                EXLOCK( chunk.hiLevelGuard );
-                                ++lockCounter;
+                            EXLOCK( chunk.hiLevelGuard );
+                            ++lockCounter;
 
-                                // low level value may be changed at any time so check it inside spinlock
-                                if ( level.load() == UMax )
-                                {
-                                    const auto  hi_lvl_bit  = (HiLevelBits_t{1} << hi_lvl_idx);
-
-                                    update_top = (chunk.hiLevel.Or( hi_lvl_bit ) == MaxHighLevel);  // 0 -> 1
-                                    ++dbgCounter;
-                                }
-                            }
-
-                            if_unlikely( update_top )
+                            // low level value may be changed at any time so check it inside spinlock
+                            if ( level.load() == UMax )
                             {
-                                auto&   top_chunk = _topChunks[ chunkIndex / CT_SizeOfInBits<TopLevelBits_t> ];
-
-                                EXLOCK( top_chunk.assignedGuard );
-                                ++lockCounter;
-
-                                if ( chunk.hiLevel.load() == MaxHighLevel )
-                                {
-                                    const auto  top_lvl_bit = TopLevelBits_t{1} << (chunkIndex % CT_SizeOfInBits<TopLevelBits_t>);
+                                const auto  hi_lvl_bit = (HiLevelBits_t{1} << hi_lvl_idx);
 
-                                    top_chunk.assigned.fetch_or( top_lvl_bit ); // 0 -> 1
-                                    ++dbgCounter;
-                                }
+                                chunk.hiLevel.fetch_or( hi_lvl_bit );   // 0 -> 1
+                                ++dbgCounter;
                             }
                         }
 
@@ -320,7 +299,6 @@ namespace AE::Threading
                             MemoryBarrier( EMemoryOrder::Release );
                         }
                         #endif
-                        Unused( loc );
 
                         void*   result = ptr + BlockSize() * idx_in_chunk;
 
@@ -345,17 +323,17 @@ namespace AE::Threading
 
 /*
 =================================================
-    Dealloc
+    DeallocBlock
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    bool  LfFixedBlockAllocator3<CS,MC,BA,GA>::Dealloc (void* ptr) __NE___
+    bool  LfFixedBlockAllocator1<CS,MC,BA,GA>::DeallocBlock (void* ptr) __NE___
     {
         const Bytes block_size  = LargeBlockSize();
 
         for (uint i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk   = _bottomChunks[i];
+            auto&   chunk   = _chunkInfo[i];
             void*   mem     = chunk.memBlock.load();
 
             if ( ptr < mem or ptr >= mem + block_size )
@@ -384,31 +362,14 @@ namespace AE::Threading
             // update high level bits
             if_unlikely( old_bits == UMax )
             {
-                bool    update_top  = false;
-                {
-                    EXLOCK( chunk.hiLevelGuard );
-
-                    // low level value may be changed at any time so check it inside spinlock
-                    if ( level.load() != UMax )
-                    {
-                        const auto  hi_lvl_bit  = (HiLevelBits_t{1} << hi_lvl_idx);
+                EXLOCK( chunk.hiLevelGuard );
 
-                        update_top = (chunk.hiLevel.fetch_and( ~hi_lvl_bit ) == MaxHighLevel);  // 1 -> 0
-                    }
-                }
-
-                if_unlikely( update_top )
+                // low level value may be changed at any time so check it inside spinlock
+                if ( level.load() != UMax )
                 {
-                    auto&   top_chunk = _topChunks[ i / CT_SizeOfInBits<TopLevelBits_t> ];
-
-                    EXLOCK( top_chunk.assignedGuard );
+                    const auto  hi_bit  = (HiLevelBits_t{1} << hi_lvl_idx);
 
-                    if ( chunk.hiLevel.load() != MaxHighLevel )
-                    {
-                        const auto  top_lvl_bit = TopLevelBits_t{1} << (i % CT_SizeOfInBits<TopLevelBits_t>);
-
-                        top_chunk.assigned.fetch_and( ~top_lvl_bit );   // 1 -> 0
-                    }
+                    chunk.hiLevel.fetch_and( ~hi_bit ); // 1 -> 0
                 }
             }
             return true;
@@ -424,14 +385,14 @@ namespace AE::Threading
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    Bytes  LfFixedBlockAllocator3<CS,MC,BA,GA>::AllocatedSize () C_NE___
+    Bytes  LfFixedBlockAllocator1<CS,MC,BA,GA>::AllocatedSize () C_NE___
     {
         const Bytes block_size  = LargeBlockSize();
         Bytes       result;
 
         for (uint i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk   = _bottomChunks[i];
+            auto&   chunk   = _chunkInfo[i];
 
             if ( chunk.memBlock.load() != null )
                 result += block_size;
@@ -440,4 +401,33 @@ namespace AE::Threading
     }
 
 
+/*
+=================================================
+    Allocate
+=================================================
+*/
+    template <usize CS, usize MC, typename BA, typename GA>
+    void*  LfFixedBlockAllocator1<CS,MC,BA,GA>::Allocate (const SizeAndAlign sizeAndAlign) __NE___
+    {
+        CHECK_ERR(  sizeAndAlign.size  <= BlockSize() and
+                    sizeAndAlign.align <= BlockAlign() );
+        return AllocBlock();
+    }
+
+
+/*
+=================================================
+    Deallocate
+=================================================
+*/
+    template <usize CS, usize MC, typename BA, typename GA>
+    void  LfFixedBlockAllocator1<CS,MC,BA,GA>::Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE___
+    {
+        ASSERT( sizeAndAlign.size  <= BlockSize() and
+                sizeAndAlign.align <= BlockAlign() );
+        Unused( sizeAndAlign );
+        CHECK( DeallocBlock( ptr ));
+    }
+
+
 } // AE::Threading
diff --git a/AE/engine/src/threading/Containers/LfIndexedPool2.h b/AE/engine/deprecated/threading/LfIndexedPool2.h
similarity index 89%
rename from AE/engine/src/threading/Containers/LfIndexedPool2.h
rename to AE/engine/deprecated/threading/LfIndexedPool2.h
index 487b255f..269a24e1 100644
--- a/AE/engine/src/threading/Containers/LfIndexedPool2.h
+++ b/AE/engine/deprecated/threading/LfIndexedPool2.h
@@ -20,24 +20,24 @@ namespace AE::Threading
 {
 
     //
-    // Lock-Free Indexed Pool
+    // Lock-Free Indexed Pool v2
     //
 
     template <typename ValueType,
               typename IndexType,
-              usize ChunkSize_v = 256,
-              usize MaxChunks_v = 16,
+              usize ChunkSize_v,
+              usize MaxChunks_v,
               typename AllocatorType = UntypedAllocator
              >
     class LfIndexedPool2 final : public Noncopyable
     {
-        STATIC_ASSERT( ChunkSize_v > 0 );
-        STATIC_ASSERT( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
-        STATIC_ASSERT( ChunkSize_v <= 64*64 );
-        STATIC_ASSERT( MaxChunks_v > 0 and MaxChunks_v <= 64 );
-        STATIC_ASSERT( IsPowerOfTwo( ChunkSize_v ));    // must be power of 2 to increase performance
-        STATIC_ASSERT( AllocatorType::IsThreadSafe );
-        STATIC_ASSERT( MaxValue<IndexType>() >= (ChunkSize_v * MaxChunks_v) );
+        StaticAssert( ChunkSize_v > 0 );
+        StaticAssert( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
+        StaticAssert( ChunkSize_v <= 64*64 );
+        StaticAssert( MaxChunks_v > 0 and MaxChunks_v <= 64 );
+        StaticAssert( IsPowerOfTwo( ChunkSize_v )); // must be power of 2 to increase performance
+        StaticAssert( AllocatorType::IsThreadSafe );
+        StaticAssert( MaxValue<IndexType>() >= (ChunkSize_v * MaxChunks_v) );
 
     // types
     public:
@@ -131,4 +131,4 @@ namespace AE::Threading
 
 } // AE::Threading
 
-#include "threading/Containers/LfIndexedPool2.inl.h"
+#include "LfIndexedPool2.inl.h"
diff --git a/AE/engine/src/threading/Containers/LfIndexedPool2.inl.h b/AE/engine/deprecated/threading/LfIndexedPool2.inl.h
similarity index 99%
rename from AE/engine/src/threading/Containers/LfIndexedPool2.inl.h
rename to AE/engine/deprecated/threading/LfIndexedPool2.inl.h
index dbc22b0e..b44e3d62 100644
--- a/AE/engine/src/threading/Containers/LfIndexedPool2.inl.h
+++ b/AE/engine/deprecated/threading/LfIndexedPool2.inl.h
@@ -306,7 +306,7 @@ namespace AE::Threading
                 if_unlikely( i > ThreadUtils::SpinBeforeLock() )
                 {
                     i = 0;
-                    ThreadUtils::YieldOrSleep();
+                    ThreadUtils::YieldOrMicroSleep();
                 }
                 ThreadUtils::Pause();
             }
diff --git a/AE/engine/tests/threading/UnitTest_LfIndexedPool2.cpp b/AE/engine/deprecated/threading/UnitTest_LfIndexedPool2.cpp
similarity index 100%
rename from AE/engine/tests/threading/UnitTest_LfIndexedPool2.cpp
rename to AE/engine/deprecated/threading/UnitTest_LfIndexedPool2.cpp
diff --git a/AE/engine/docs/CMakeLists.txt b/AE/engine/docs/CMakeLists.txt
deleted file mode 100644
index 9ea66f32..00000000
--- a/AE/engine/docs/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-file( GLOB_RECURSE SOURCES "*.*" )
-add_library( "Docs" STATIC EXCLUDE_FROM_ALL ${SOURCES} "../Changelog.md" "../../../Readme.md" )
-set_target_properties( "Docs" PROPERTIES LINKER_LANGUAGE CXX )
-set_property( TARGET "Docs" PROPERTY FOLDER "Engine" )
-source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
diff --git a/AE/engine/docs/ru/ArchitectureNotes.md b/AE/engine/docs/ru/ArchitectureNotes.md
deleted file mode 100644
index e19243ea..00000000
--- a/AE/engine/docs/ru/ArchitectureNotes.md
+++ /dev/null
@@ -1,47 +0,0 @@
-Заметки по планированию архитектуры.
-
-## ООП
-
-В больших классах частая проблема - множество методов, которые имеют доступ ко всем полям класса.
-В чем тут проблема:
-* Проблемы с читаемостью - непонятно что где меняется.
-* Проблемы с синхронизацией - если поля класса защищены разными примитивами синхронизации, то очень сложно отследить где что используется и была ли синхронизация перед использованием.
-
-Решается это использованием статичных функций, у них остается доступ к приватным типам класса, но нет доступа к полям, для этого их нужно явно передавать, что сразу же улучшает читаемость кода.
-
-Другой вариант это константные методы, они могут читать все поля, но меняют только те, что передаются в виде параметров.
-```cpp
-class Obj
-{
-  ReadOnly r;
-  Mutable  m;
-
-  static void  StaticFn (const ReadOnly &, Mutable &);
-  void  ConstMethod (Mutable &) const;
-};
-```
-
-## Синхронизации
-
-Если в классе используется mutex или другой примитив синхронизации, то он должен использоваться для всех полей, кроме константных. Иначе это выглядит как ошибка, когда часть методов не используют синхронизацию.
-
-Вместо нескольких примитивов синхронизации внутри одного класса лучше использовать [Synchronized](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/threading/Primitives/Synchronized.h) тип.
-
-
-## Исключения
-
-Текущая реализация C++ не позволяет писать безопасный код с использованием исключений.
-
-Проблемы:
-* Приходится вручную отслеживать какая функция бросает исключения. Компилятор выдает ошибку, если функция с `noexcept` бросает исключение, которое не перехватывается, но это работает только на явный вызов `throw` внутри функции, а используемые функции могут кидать исключения и компилятор никак это не проверяет. Пока не будет предупреждений на использование не-`noexcept` функций внутри `noexcept` функций исключения будут опасны.
-* Концепция исключений предполагает, что после бросания исключений объект возвращается в первоначальное состояние, никаких частичных изменений, либо все, либо ничего, это часто требует выделение дополнительной памяти.
-* Бросание исключений в конструкторах, особенно в move-конструкторах, приводит к выделению дополнительной памяти, как описано выше.
-* В ObjC бросание исключения внутри `autoreleasepool` приводит к утечке памяти.
-* Сложно писать код, который требует соблюдения правил и компилятор в этом никак не помогает, поэтому поддержка исключений усложняет код и увеличивает время разработки.
-
-Преимущества:
-* Хорошо подходят для функций, вызываемых из скриптов, тогда в случае бросания исключения скрипт завершается и выдает ошибку из исключения.
-* Неплохо подходит для десериализации, где из-за порчи данных может произойти попытка выделить большого объема памяти.
-
-В большинстве случаев достаточно использовать атрибут `[[nodiscard]]`, что позволяет использовать возвращаемые коды ошибок, которые не будут проигнорированы.
-
diff --git a/AE/engine/external/shared/Abseil/CMakeLists.txt b/AE/engine/external/shared/Abseil/CMakeLists.txt
index 9d62fec8..ca226dc6 100644
--- a/AE/engine/external/shared/Abseil/CMakeLists.txt
+++ b/AE/engine/external/shared/Abseil/CMakeLists.txt
@@ -27,7 +27,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.Abseil" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.Abseil" "tests/main.cpp" )
-        add_test( NAME "Tests.Abseil" COMMAND "Tests.Abseil" )
+        #add_test( NAME "Tests.Abseil" COMMAND "Tests.Abseil" )
     endif()
     set_target_properties( "Tests.Abseil" PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES )
     target_compile_features( "Tests.Abseil" PUBLIC cxx_std_17 )
diff --git a/AE/engine/external/shared/AngelScript/CMakeLists.txt b/AE/engine/external/shared/AngelScript/CMakeLists.txt
index 77d9fb51..42b32bf9 100644
--- a/AE/engine/external/shared/AngelScript/CMakeLists.txt
+++ b/AE/engine/external/shared/AngelScript/CMakeLists.txt
@@ -41,7 +41,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.AngelScript" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.AngelScript" "tests/main.cpp" )
-        add_test( NAME "Tests.AngelScript" COMMAND "Tests.AngelScript" )
+        #add_test( NAME "Tests.AngelScript" COMMAND "Tests.AngelScript" )
     endif()
     set_property( TARGET "Tests.AngelScript" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.AngelScript" PUBLIC "AngelScript-lib" )
diff --git a/AE/engine/external/shared/Assimp/CMakeLists.txt b/AE/engine/external/shared/Assimp/CMakeLists.txt
index 61ff5741..b78f9803 100644
--- a/AE/engine/external/shared/Assimp/CMakeLists.txt
+++ b/AE/engine/external/shared/Assimp/CMakeLists.txt
@@ -40,7 +40,7 @@ endif()
 
 if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.Assimp" "tests/main.cpp" )
-    add_test( NAME "Tests.Assimp" COMMAND "Tests.Assimp" )
+    #add_test( NAME "Tests.Assimp" COMMAND "Tests.Assimp" )
     set_target_properties( "Tests.Assimp" PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES )
     target_compile_features( "Tests.Assimp" PUBLIC cxx_std_17 )
     set_property( TARGET "Tests.Assimp" PROPERTY FOLDER "Engine/External/Tests" )
diff --git a/AE/engine/external/shared/Brotli/CMakeLists.txt b/AE/engine/external/shared/Brotli/CMakeLists.txt
index 36dc8b52..ea7131b6 100644
--- a/AE/engine/external/shared/Brotli/CMakeLists.txt
+++ b/AE/engine/external/shared/Brotli/CMakeLists.txt
@@ -28,7 +28,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.Brotli" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.Brotli" "tests/main.cpp" )
-        add_test( NAME "Tests.Brotli" COMMAND "Tests.Brotli" )
+        #add_test( NAME "Tests.Brotli" COMMAND "Tests.Brotli" )
     endif()
     set_property( TARGET "Tests.Brotli" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.Brotli" PUBLIC "Brotli-lib" )
diff --git a/AE/engine/external/shared/CDT/CMakeLists.txt b/AE/engine/external/shared/CDT/CMakeLists.txt
index ef8c55b0..3ff81e43 100644
--- a/AE/engine/external/shared/CDT/CMakeLists.txt
+++ b/AE/engine/external/shared/CDT/CMakeLists.txt
@@ -18,7 +18,7 @@ set_property( TARGET "CDT-lib" PROPERTY INTERFACE_LINK_LIBRARIES
 
 if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.CDT" "tests/main.cpp" )
-    add_test( NAME "Tests.CDT" COMMAND "Tests.CDT" )
+    #add_test( NAME "Tests.CDT" COMMAND "Tests.CDT" )
     set_property( TARGET "Tests.CDT" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.CDT" PUBLIC "CDT-lib" )
 endif ()
diff --git a/AE/engine/external/shared/CMakeLists.txt b/AE/engine/external/shared/CMakeLists.txt
index 4ad50416..f5ca990a 100644
--- a/AE/engine/external/shared/CMakeLists.txt
+++ b/AE/engine/external/shared/CMakeLists.txt
@@ -26,8 +26,6 @@ set( AE_ENABLE_KTX              ON  CACHE BOOL "use KTX" )
 set( AE_ENABLE_MSDFGEN          ON  CACHE BOOL "use msdfgen" )
 set( AE_ENABLE_METAL            OFF CACHE BOOL "enable Metal API" )
 
-set( AE_ENABLE_OPENGL           OFF CACHE BOOL "enable OpenGL (ES) API" )
-
 set( AE_ENABLE_REMOTE_GRAPHICS  OFF CACHE BOOL "enable Remote Graphics" )
 set( AE_ENABLE_RGRAPHICS_SERVER ON  CACHE BOOL "enable Remote Graphics server" )
 
@@ -41,11 +39,7 @@ set( AE_ENABLE_VMA              ON  CACHE BOOL "use Vulkan Memory Allocator" )
 
 set( AE_ENABLE_UTF8PROC         ON  CACHE BOOL "use Utf8Proc" )
 
-if (APPLE)
-    set( AE_ENABLE_METAL        ON  CACHE INTERNAL "" FORCE )
-    set( AE_ENABLE_OPENGL       OFF CACHE INTERNAL "" FORCE )
-    set( AE_ENABLE_VULKAN       OFF CACHE INTERNAL "" FORCE )
-endif()
+set( AE_ENABLE_XXHASH           ON  CACHE BOOL "use xxHash" )
 
 if (${AE_ENABLE_REMOTE_GRAPHICS} AND ${AE_ENABLE_RGRAPHICS_SERVER})
     message( FATAL_ERROR "AE_ENABLE_REMOTE_GRAPHICS and AE_ENABLE_RGRAPHICS_SERVER are not compatible" )
@@ -102,6 +96,8 @@ if (${AE_ENABLE_FREETYPE})
     add_subdirectory( "FreeType" )
 endif()
 
+add_subdirectory( "fameta-counter" )
+
 if (${AE_ENABLE_IMGUI})
     add_subdirectory( "imgui" )
 endif()
@@ -114,10 +110,6 @@ if (${AE_ENABLE_MSDFGEN})
     add_subdirectory( "msdfgen" )
 endif()
 
-if (${AE_ENABLE_OPENGL})
-    add_subdirectory( "OpenGL" )
-endif()
-
 if (${AE_ENABLE_SPIRV_CROSS})
     add_subdirectory( "SPIRV-Cross" )
 endif()
@@ -130,7 +122,7 @@ if (${AE_ENABLE_VULKAN})
     add_subdirectory( "Vulkan" )
 endif()
 
-if (${AE_ENABLE_VMA})
+if (${AE_ENABLE_VMA} AND ${AE_ENABLE_VULKAN})
     add_subdirectory( "VMA" )
 endif()
 
@@ -142,3 +134,6 @@ if (${AE_ENABLE_TINYGLTF})
     add_subdirectory( "tinygltf" )
 endif()
 
+if (${AE_ENABLE_XXHASH})
+    add_subdirectory( "xxHash" )
+endif()
diff --git a/AE/engine/external/shared/FreeType/CMakeLists.txt b/AE/engine/external/shared/FreeType/CMakeLists.txt
index d2cdc9af..b2468992 100644
--- a/AE/engine/external/shared/FreeType/CMakeLists.txt
+++ b/AE/engine/external/shared/FreeType/CMakeLists.txt
@@ -29,7 +29,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.FreeType" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.FreeType" "tests/main.cpp" )
-        add_test( NAME "Tests.FreeType" COMMAND "Tests.FreeType" )
+        #add_test( NAME "Tests.FreeType" COMMAND "Tests.FreeType" )
     endif()
     set_property( TARGET "Tests.FreeType" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.FreeType" PUBLIC "FreeType-lib" )
diff --git a/AE/engine/external/shared/GLFW/CMakeLists.txt b/AE/engine/external/shared/GLFW/CMakeLists.txt
index 18851e9c..b117f170 100644
--- a/AE/engine/external/shared/GLFW/CMakeLists.txt
+++ b/AE/engine/external/shared/GLFW/CMakeLists.txt
@@ -31,5 +31,5 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.GLFW" "tests/main.cpp" )
     set_property( TARGET "Tests.GLFW" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.GLFW" PUBLIC "GLFW-lib" )
-    add_test( NAME "Tests.GLFW" COMMAND "Tests.GLFW" )
+    #add_test( NAME "Tests.GLFW" COMMAND "Tests.GLFW" )
 endif ()
diff --git a/AE/engine/external/shared/GLM/CMakeLists.txt b/AE/engine/external/shared/GLM/CMakeLists.txt
index b87911c4..54c855af 100644
--- a/AE/engine/external/shared/GLM/CMakeLists.txt
+++ b/AE/engine/external/shared/GLM/CMakeLists.txt
@@ -16,7 +16,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.GLM" PRIVATE "${AE_TEST_DIR}" )
     else ()
         add_executable( "Tests.GLM" "tests/main.cpp" )
-        add_test( NAME "Tests.GLM" COMMAND "Tests.GLM" )
+        #add_test( NAME "Tests.GLM" COMMAND "Tests.GLM" )
     endif ()
     set_target_properties( "Tests.GLM" PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES )
     target_compile_features( "Tests.GLM" PUBLIC cxx_std_17 )
diff --git a/AE/engine/external/shared/GLM/update.bat b/AE/engine/external/shared/GLM/update.bat
index 973b8f16..8ca4b8dc 100644
--- a/AE/engine/external/shared/GLM/update.bat
+++ b/AE/engine/external/shared/GLM/update.bat
@@ -1,6 +1,7 @@
 rmdir /Q /S "..\..\..\..\..\AE-Data\external\source\GLM"
 rmdir /Q /S "temp"
 git clone --branch "AE-version" "..\..\..\..\..\3party\ae-glm" "temp"
+mkdir "..\..\..\..\..\AE-Data\external\source\GLM"
 robocopy "temp\glm" "..\..\..\..\..\AE-Data\external\source\GLM" *.h /S 
 robocopy "temp\glm" "..\..\..\..\..\AE-Data\external\source\GLM" *.hpp /S 
 robocopy "temp\glm" "..\..\..\..\..\AE-Data\external\source\GLM" *.inl /S 
diff --git a/AE/engine/external/shared/KTX-Software/CMakeLists.txt b/AE/engine/external/shared/KTX-Software/CMakeLists.txt
index b0ed260f..bf2f8cd8 100644
--- a/AE/engine/external/shared/KTX-Software/CMakeLists.txt
+++ b/AE/engine/external/shared/KTX-Software/CMakeLists.txt
@@ -18,7 +18,7 @@ set_property( TARGET "KTX-lib" PROPERTY INTERFACE_LINK_LIBRARIES
 
 if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.KTX" "tests/main.cpp" )
-    add_test( NAME "Tests.KTX" COMMAND "Tests.KTX" )
+    #add_test( NAME "Tests.KTX" COMMAND "Tests.KTX" )
     set_property( TARGET "Tests.KTX" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.KTX" PUBLIC "KTX-lib" )
 endif ()
diff --git a/AE/engine/external/shared/KTX-Software/ktx_CMakeLists.txt b/AE/engine/external/shared/KTX-Software/ktx_CMakeLists.txt
index 4629e369..80892a28 100644
--- a/AE/engine/external/shared/KTX-Software/ktx_CMakeLists.txt
+++ b/AE/engine/external/shared/KTX-Software/ktx_CMakeLists.txt
@@ -6,26 +6,38 @@ set( AE_EXTERNAL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../.." )
 include( "${AE_EXTERNAL_PATH}/config.cmake" )
 
 # SIMD
-if (${AE_SIMD_AVX} GREATER 0)
-    set( ASTCENC_ISA_SSE41  ON  CACHE BOOL "" FORCE )
-    set( BASISU_SUPPORT_SSE ON  CACHE BOOL "" FORCE )
-
-elseif (${AE_SIMD_SSE} GREATER_EQUAL 41)
-    set( ASTCENC_ISA_SSE41  ON  CACHE BOOL "" FORCE )
-    set( BASISU_SUPPORT_SSE ON  CACHE BOOL "" FORCE )
-
-elseif (${AE_SIMD_SSE} GREATER_EQUAL 20)
-    set( ASTCENC_ISA_SSE41  OFF CACHE BOOL "" FORCE )
-    set( ASTCENC_ISA_SSE2   ON  CACHE BOOL "" FORCE )
-    set( BASISU_SUPPORT_SSE ON  CACHE BOOL "" FORCE )
+if (AE_CPU_ARCH_X64 OR AE_CPU_ARCH_X86)
+    if (${AE_SIMD_AVX} GREATER 0)
+        set( ASTCENC_ISA_SSE41  ON  CACHE BOOL "" FORCE )
+        set( BASISU_SUPPORT_SSE ON  CACHE BOOL "" FORCE )
+
+    elseif (${AE_SIMD_SSE} GREATER_EQUAL 41)
+        set( ASTCENC_ISA_SSE41  ON  CACHE BOOL "" FORCE )
+        set( BASISU_SUPPORT_SSE ON  CACHE BOOL "" FORCE )
+
+    elseif (${AE_SIMD_SSE} GREATER_EQUAL 20)
+        set( ASTCENC_ISA_SSE41  OFF CACHE BOOL "" FORCE )
+        set( ASTCENC_ISA_SSE2   ON  CACHE BOOL "" FORCE )
+        set( BASISU_SUPPORT_SSE ON  CACHE BOOL "" FORCE )
+
+    else()
+        set( ASTCENC_ISA_SSE41  OFF CACHE BOOL "" FORCE )
+        set( ASTCENC_ISA_SSE2   OFF CACHE BOOL "" FORCE )
+        set( ASTCENC_ISA_NEON   OFF CACHE BOOL "" FORCE )
+        set( ASTCENC_ISA_NONE   ON  CACHE BOOL "" FORCE )
+        set( BASISU_SUPPORT_SSE OFF CACHE BOOL "" FORCE )
+    endif()
+endif()
 
-else()
+if (AE_CPU_ARCH_ARM32 OR AE_CPU_ARCH_ARM64)
     set( ASTCENC_ISA_SSE41  OFF CACHE BOOL "" FORCE )
     set( ASTCENC_ISA_SSE2   OFF CACHE BOOL "" FORCE )
-    set( ASTCENC_ISA_NEON   OFF CACHE BOOL "" FORCE )   # TODO: Mac/iOS ARM
-    set( ASTCENC_ISA_NONE   ON  CACHE BOOL "" FORCE )
+    set( ASTCENC_ISA_NONE   OFF CACHE BOOL "" FORCE )
     set( BASISU_SUPPORT_SSE OFF CACHE BOOL "" FORCE )
 endif()
+if (AE_CPU_ARCH_ARM64)
+    set( ASTCENC_ISA_NEON   ON  CACHE BOOL "" FORCE )
+endif()
 
 set( KTX_FEATURE_DOC            OFF CACHE BOOL "" FORCE )
 set( KTX_FEATURE_GL_UPLOAD      OFF CACHE BOOL "" FORCE )
diff --git a/AE/engine/external/shared/SPIRV-Cross/CMakeLists.txt b/AE/engine/external/shared/SPIRV-Cross/CMakeLists.txt
index 84ce7a38..09de6bd8 100644
--- a/AE/engine/external/shared/SPIRV-Cross/CMakeLists.txt
+++ b/AE/engine/external/shared/SPIRV-Cross/CMakeLists.txt
@@ -31,5 +31,5 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.SPIRV-Cross" "tests/main.cpp" )
     set_property( TARGET "Tests.SPIRV-Cross" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.SPIRV-Cross" PUBLIC "SPIRV-Cross-lib" )
-    add_test( NAME "Tests.SPIRV-Cross" COMMAND "Tests.SPIRV-Cross" )
+    #add_test( NAME "Tests.SPIRV-Cross" COMMAND "Tests.SPIRV-Cross" )
 endif ()
diff --git a/AE/engine/external/shared/Utf8Proc/CMakeLists.txt b/AE/engine/external/shared/Utf8Proc/CMakeLists.txt
index ad02d5f6..6dac1df7 100644
--- a/AE/engine/external/shared/Utf8Proc/CMakeLists.txt
+++ b/AE/engine/external/shared/Utf8Proc/CMakeLists.txt
@@ -27,7 +27,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.Utf8Proc" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.Utf8Proc" "tests/main.cpp" )
-        add_test( NAME "Tests.Utf8Proc" COMMAND "Tests.Utf8Proc" )
+        #add_test( NAME "Tests.Utf8Proc" COMMAND "Tests.Utf8Proc" )
     endif()
     set_property( TARGET "Tests.Utf8Proc" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.Utf8Proc" PUBLIC "Utf8Proc-lib" )
diff --git a/AE/engine/external/shared/VMA/CMakeLists.txt b/AE/engine/external/shared/VMA/CMakeLists.txt
index 44ad1a48..c2a2076b 100644
--- a/AE/engine/external/shared/VMA/CMakeLists.txt
+++ b/AE/engine/external/shared/VMA/CMakeLists.txt
@@ -17,7 +17,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS} AND ${AE_ENABLE_VULKAN})
         target_include_directories( "Tests.VMA" PRIVATE "${AE_TEST_DIR}" )
     else ()
         add_executable( "Tests.VMA" "tests/main.cpp" )
-        add_test( NAME "Tests.VMA" COMMAND "Tests.VMA" )
+        #add_test( NAME "Tests.VMA" COMMAND "Tests.VMA" )
     endif ()
     set_property( TARGET "Tests.VMA" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.VMA" PUBLIC "VMA-lib" )
diff --git a/AE/engine/external/shared/Vulkan/CMakeLists.txt b/AE/engine/external/shared/Vulkan/CMakeLists.txt
index 9bf6bf07..7773cbbf 100644
--- a/AE/engine/external/shared/Vulkan/CMakeLists.txt
+++ b/AE/engine/external/shared/Vulkan/CMakeLists.txt
@@ -16,7 +16,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.Vulkan" PRIVATE "${AE_TEST_DIR}" )
     else ()
         add_executable( "Tests.Vulkan" "tests/main.cpp" )
-        add_test( NAME "Tests.Vulkan" COMMAND "Tests.Vulkan" )
+        #add_test( NAME "Tests.Vulkan" COMMAND "Tests.Vulkan" )
     endif ()
     set_property( TARGET "Tests.Vulkan" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.Vulkan" PUBLIC "Vulkan-lib" )
diff --git a/AE/engine/external/shared/Vulkan/update.bat b/AE/engine/external/shared/Vulkan/update.bat
index 8c98c679..5ad23f1a 100644
--- a/AE/engine/external/shared/Vulkan/update.bat
+++ b/AE/engine/external/shared/Vulkan/update.bat
@@ -1,6 +1,7 @@
 rmdir /Q /S "..\..\..\..\..\AE-Data\external\source\Vulkan"
 rmdir /Q /S "temp"
 git clone --branch "sdk-1.3.261.1" "..\..\..\..\..\3party\Vulkan-Headers" "temp"
+mkdir "..\..\..\..\..\AE-Data\external\source\Vulkan"
 robocopy "temp\include" "..\..\..\..\..\AE-Data\external\source\Vulkan" *.h /S 
 copy /Y "temp\LICENSE.txt" "..\..\..\..\..\AE-Data\external\source\Vulkan\LICENSE.txt"
 rmdir /Q /S "temp"
diff --git a/AE/engine/external/shared/fameta-counter/CMakeLists.txt b/AE/engine/external/shared/fameta-counter/CMakeLists.txt
new file mode 100644
index 00000000..5bb2a6b2
--- /dev/null
+++ b/AE/engine/external/shared/fameta-counter/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#
+# fameta-counter source code (unlicense)
+
+add_library( "FametaCounter-lib" INTERFACE )
+
+target_compile_definitions( "FametaCounter-lib" INTERFACE "AE_ENABLE_FAMETA_COUNTER" "AE_LICENSE_UNLICENSE" )
+
+install( FILES "${FREETYPE_PATH}/LICENSE" DESTINATION "3party_license" RENAME "FametaCounter-LICENSE" )
diff --git a/AE/engine/external/shared/fameta-counter/LICENSE b/AE/engine/external/shared/fameta-counter/LICENSE
new file mode 100644
index 00000000..fdddb29a
--- /dev/null
+++ b/AE/engine/external/shared/fameta-counter/LICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>
diff --git a/AE/engine/external/shared/fameta-counter/counter.hpp b/AE/engine/external/shared/fameta-counter/counter.hpp
new file mode 100644
index 00000000..95f25eaa
--- /dev/null
+++ b/AE/engine/external/shared/fameta-counter/counter.hpp
@@ -0,0 +1,178 @@
+// Author: Fabio Alemagna <personal@fabioalemagna.net>
+// Source: https://github.com/falemagn/fameta-counter
+// Inspired to Filip Roséen's work. See https://stackoverflow.com/questions/60082260/c-compile-time-counters-revisited
+
+#ifndef FAMETA_COUNTER_HPP
+#define FAMETA_COUNTER_HPP
+
+#if !defined(__cpp_if_constexpr) || __cpp_if_constexpr < 201606L
+#   if defined(FAMETA_BINARY_LOOKUP) && FAMETA_BINARY_LOOKUP
+#       error "Binary lookup is only available when compiling with c++17 and above"
+#   endif
+#
+#   undef FAMETA_BINARY_LOOKUP
+#   define FAMETA_BINARY_LOOKUP 0
+#   define FAMETA_UNIQUE_VALUE_TYPE unsigned long long
+#else
+#   if !defined(FAMETA_BINARY_LOOKUP)
+#       define FAMETA_BINARY_LOOKUP 1
+#   endif
+#   define FAMETA_UNIQUE_VALUE_TYPE auto
+#endif
+
+#if defined(__GNUC__) && !defined(__clang__)
+// There appears to be a bug on gcc that makes it emit a diagnostic that cannot be turned off in certain conditions. This will silence it.
+// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=112267
+#   define FAMETA_FRIEND_RETURN_TYPE auto
+#else
+#   define FAMETA_FRIEND_RETURN_TYPE bool
+#endif
+
+#if !defined(FAMETA_FRIEND_INJECTION_PRAGMA_BEGIN) && !defined(FAMETA_FRIEND_INJECTION_PRAGMA_END)
+#   if defined(__INTEL_COMPILER)
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_BEGIN _Pragma("warning push"); _Pragma("warning disable 1624");
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_END   _Pragma("warning pop");
+#   elif defined(__clang__)
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_BEGIN _Pragma("GCC diagnostic push"); _Pragma("GCC diagnostic ignored \"-Wundefined-internal\"");
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_END   _Pragma("GCC diagnostic pop");
+#   elif defined(__GNUC__)
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_BEGIN _Pragma("GCC diagnostic push"); _Pragma("GCC diagnostic ignored \"-Wnon-template-friend\""); \
+                                                                                    _Pragma("GCC diagnostic ignored \"-Wunused-function\"");
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_END   _Pragma("GCC diagnostic pop");
+#   else
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_BEGIN
+#       define FAMETA_FRIEND_INJECTION_PRAGMA_END
+#   endif
+#endif
+
+namespace fameta
+{
+
+// Anonymous namespace to avoid ODR violation
+namespace {
+
+template <typename Context, int Start = 0, int Step = 1>
+class counter
+{
+public:
+    template <typename Unique>
+    static constexpr int next()
+    {
+        return next<Unique>(0)*Step+Start;
+    }
+
+    template <FAMETA_UNIQUE_VALUE_TYPE>
+    static constexpr int next()
+    {
+        struct Unique{};
+        return next<Unique>(0)*Step+Start;
+    }
+
+    template <typename Unique>
+    static constexpr int current()
+    {
+        return current<Unique>(0)*Step+Start;
+    }
+
+    template <FAMETA_UNIQUE_VALUE_TYPE>
+    static constexpr int current()
+    {
+        struct Unique{};
+        return current<Unique>(0)*Step+Start;
+    }
+
+private:
+    template <int I>
+    struct slot
+    {
+        FAMETA_FRIEND_INJECTION_PRAGMA_BEGIN
+
+            friend constexpr FAMETA_FRIEND_RETURN_TYPE slot_allocated(slot<I>);
+
+        FAMETA_FRIEND_INJECTION_PRAGMA_END
+    };
+
+    template <int I>
+    struct allocate_slot {
+        friend constexpr FAMETA_FRIEND_RETURN_TYPE slot_allocated(slot<I>) {
+            return true;
+        }
+
+        enum { value = I };
+    };
+
+#if FAMETA_BINARY_LOOKUP
+    // If slot_allocated(slot<I>) has NOT been defined, then SFINAE will keep this function out of the overload set...
+    template <typename Unique, int I = 0, int P = 0, bool = slot_allocated(slot<I + (1<<P)-1>())>
+    static constexpr int next(int)
+    {
+        return next<Unique, I, P+1>(0);
+    }
+
+    // ...And this function will be used, instead, which will define slot_allocated(slot<I>) via allocate_slot<I>.
+    template <typename Unique, int I = 0, int P = 0>
+    static constexpr int next(double)
+    {
+        if constexpr (P == 0)
+            return allocate_slot<I>::value;
+        else
+            return next<Unique, I+(1<<(P-1)), 0>(0);
+    }
+
+    // If slot_allocated(slot<I>) has NOT been defined, then SFINAE will keep this function out of the overload set...
+    template <typename Unique, int I = 0, int P = 0, bool = slot_allocated(slot<I + (1<<P)-1>())>
+    static constexpr int current(int)
+    {
+        return current<Unique, I, P+1>(0);
+    }
+
+    // ...And this function will be used, instead, which will return the current counter, or assert in case next() hasn't been called yet.
+    template <typename Unique, int I = 0, int P = 0>
+    static constexpr int current(double)
+    {
+        static_assert(I != 0 || P != 0, "You must invoke next() first");
+
+        if constexpr (P == 0)
+            return I-1;
+        else
+            return current<Unique, I+(1<<(P-1)), 0>(0);
+    }
+#else // FAMETA_BINARY_LOOKUP
+    // If slot_allocated(slot<I>) has NOT been defined, then SFINAE will keep this function out of the overload set...
+    template <typename Unique, int I = 0, bool = slot_allocated(slot<I>())>
+    static constexpr int next(int)
+    {
+        return next<Unique, I+1>(0);
+    }
+
+    // ...And this function will be used, instead, which will define slot_allocated(slot<I>) via allocate_slot<I>.
+    template <typename Unique, int I = 0>
+    static constexpr int next(double)
+    {
+        return allocate_slot<I>::value;
+    }
+
+    // If slot_allocated(slot<I>) has NOT been defined, then SFINAE will keep this function out of the overload set...
+    template <typename Unique, int I = Start, bool = slot_allocated(slot<I>())>
+    static constexpr int current(int)
+    {
+        return current<Unique, I+1>(0);
+    }
+
+    // ...And this function will be used, instead, which will return the current counter, or assert in case next() hasn't been called yet.
+    template <typename Unique, int I = Start>
+    static constexpr int current(double)
+    {
+        static_assert(I != 0, "You must invoke next() first");
+
+        return I-1;
+    }
+#endif // !FAMETA_BINARY_LOOKUP
+
+};
+
+}
+
+}
+
+#endif // FAMETA_COUNTER_HPP
diff --git a/AE/engine/external/shared/glslang/CMakeLists.txt b/AE/engine/external/shared/glslang/CMakeLists.txt
index 5f6034f5..cbb7345d 100644
--- a/AE/engine/external/shared/glslang/CMakeLists.txt
+++ b/AE/engine/external/shared/glslang/CMakeLists.txt
@@ -55,5 +55,5 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.GLSLang" "tests/main.cpp" )
     set_property( TARGET "Tests.GLSLang" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.GLSLang" PUBLIC "GLSLang-lib" )
-    add_test( NAME "Tests.GLSLang" COMMAND "Tests.GLSLang" )
+    #add_test( NAME "Tests.GLSLang" COMMAND "Tests.GLSLang" )
 endif ()
diff --git a/AE/engine/external/shared/imgui/CMakeLists.txt b/AE/engine/external/shared/imgui/CMakeLists.txt
index fb65e7b6..d3bf34c9 100644
--- a/AE/engine/external/shared/imgui/CMakeLists.txt
+++ b/AE/engine/external/shared/imgui/CMakeLists.txt
@@ -30,7 +30,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.ImGUI" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.ImGUI" "tests/main.cpp" )
-        add_test( NAME "Tests.ImGUI" COMMAND "Tests.ImGUI" )
+        #add_test( NAME "Tests.ImGUI" COMMAND "Tests.ImGUI" )
     endif()
     set_property( TARGET "Tests.ImGUI" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.ImGUI" PUBLIC "ImGUI-lib" )
diff --git a/AE/engine/external/shared/msdfgen/CMakeLists.txt b/AE/engine/external/shared/msdfgen/CMakeLists.txt
index b830264c..bc949e40 100644
--- a/AE/engine/external/shared/msdfgen/CMakeLists.txt
+++ b/AE/engine/external/shared/msdfgen/CMakeLists.txt
@@ -25,7 +25,7 @@ set_property( TARGET "msdfgen-lib" PROPERTY INTERFACE_LINK_LIBRARIES
 
 if (${AE_ENABLE_EXTERNAL_TESTS})
     add_executable( "Tests.msdfgen" "tests/main.cpp" )
-    add_test( NAME "Tests.msdfgen" COMMAND "Tests.msdfgen" )
+    #add_test( NAME "Tests.msdfgen" COMMAND "Tests.msdfgen" )
     set_property( TARGET "Tests.msdfgen" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.msdfgen" PUBLIC "msdfgen-lib" )
 endif ()
diff --git a/AE/engine/external/shared/stb/CMakeLists.txt b/AE/engine/external/shared/stb/CMakeLists.txt
index 1ecc9f8e..127a140d 100644
--- a/AE/engine/external/shared/stb/CMakeLists.txt
+++ b/AE/engine/external/shared/stb/CMakeLists.txt
@@ -16,7 +16,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.STB" PRIVATE "${AE_TEST_DIR}" )
     else()
         add_executable( "Tests.STB" "tests/main.cpp" )
-        add_test( NAME "Tests.STB" COMMAND "Tests.STB" )
+        #add_test( NAME "Tests.STB" COMMAND "Tests.STB" )
     endif()
     set_property( TARGET "Tests.STB" PROPERTY FOLDER "Engine/External/Tests" )
     target_link_libraries( "Tests.STB" PUBLIC "STB-lib" )
diff --git a/AE/engine/external/shared/tinygltf/CMakeLists.txt b/AE/engine/external/shared/tinygltf/CMakeLists.txt
index 4987daa7..2ba6e7ec 100644
--- a/AE/engine/external/shared/tinygltf/CMakeLists.txt
+++ b/AE/engine/external/shared/tinygltf/CMakeLists.txt
@@ -16,7 +16,7 @@ if (${AE_ENABLE_EXTERNAL_TESTS})
         target_include_directories( "Tests.TinyglTF" PRIVATE "${AE_TEST_DIR}" )
     else ()
         add_executable( "Tests.TinyglTF" "tests/main.cpp" )
-        add_test( NAME "Tests.TinyglTF" COMMAND "Tests.TinyglTF" )
+        #add_test( NAME "Tests.TinyglTF" COMMAND "Tests.TinyglTF" )
     endif ()
     set_target_properties( "Tests.TinyglTF" PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED YES )
     target_compile_features( "Tests.TinyglTF" PUBLIC cxx_std_17 )
diff --git a/AE/engine/external/shared/xxHash/CMakeLists.txt b/AE/engine/external/shared/xxHash/CMakeLists.txt
new file mode 100644
index 00000000..dc5234e0
--- /dev/null
+++ b/AE/engine/external/shared/xxHash/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#
+# download xxHash (BSD-2 license)
+
+set( XXHASH_PATH "${AE_EXTERNAL_SHARED_PATH}/xxHash" )
+
+add_library( "xxHash-lib" INTERFACE )
+target_include_directories( "xxHash-lib" INTERFACE "${XXHASH_PATH}" )
+target_compile_definitions( "xxHash-lib" INTERFACE "AE_ENABLE_XXHASH" "AE_LICENSE_BSD_2" "XXH_INLINE_ALL" )
+install( FILES "${XXHASH_PATH}/LICENSE.txt" DESTINATION "3party_license" RENAME "xxHash-LICENSE.txt" )
+
+if (${AE_ENABLE_EXTERNAL_TESTS})
+    add_executable( "Tests.xxHash" "tests/main.cpp" )
+    #add_test( NAME "Tests.xxHash" COMMAND "Tests.xxHash" )
+    set_property( TARGET "Tests.xxHash" PROPERTY FOLDER "Engine/External/Tests" )
+    target_link_libraries( "Tests.xxHash" PUBLIC "xxHash-lib" )
+endif ()
diff --git a/AE/engine/external/shared/xxHash/android/install.bat b/AE/engine/external/shared/xxHash/android/install.bat
new file mode 100644
index 00000000..da8b6d25
--- /dev/null
+++ b/AE/engine/external/shared/xxHash/android/install.bat
@@ -0,0 +1,8 @@
+rmdir /Q /S "..\..\..\..\..\AE-Data\external\android-clang\xxHash"
+rmdir /Q /S "temp"
+git clone --branch "v0.8.2" "..\..\..\..\..\3party\xxHash" "temp"
+copy /Y "temp\cmake_unofficial\CMakeLists.txt" "temp\cmake_unofficial\origin_CMakeLists.txt"
+copy /Y "xxHash_CMakeLists.txt" "temp\cmake_unofficial\CMakeLists.txt"
+cmake -S temp/cmake_unofficial -B build  -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="../../../../../AE-Data/external/android-clang/xxHash" 
+cmake --build build --config Release --target install -j 2
+rmdir /Q /S "temp"
diff --git a/AE/engine/external/shared/xxHash/tests/main.cpp b/AE/engine/external/shared/xxHash/tests/main.cpp
new file mode 100644
index 00000000..cbe3246b
--- /dev/null
+++ b/AE/engine/external/shared/xxHash/tests/main.cpp
@@ -0,0 +1,21 @@
+
+#ifndef AE_ENABLE_XXHASH
+#   error AE_ENABLE_XXHASH required
+#endif
+
+#include "xxhash.h"
+
+#ifdef ANDROID
+# include "TestHelper.h"
+
+extern void AE_xxHash_Test ()
+#else
+int main ()
+#endif
+{
+    char    buffer [128];
+    XXH64_hash_t hash = XXH64( buffer, 128, 0 );
+    (void)(hash);
+
+    return 0;
+}
diff --git a/AE/engine/external/shared/xxHash/update.bat b/AE/engine/external/shared/xxHash/update.bat
new file mode 100644
index 00000000..156073f4
--- /dev/null
+++ b/AE/engine/external/shared/xxHash/update.bat
@@ -0,0 +1,8 @@
+rmdir /Q /S "..\..\..\..\..\AE-Data\external\source\xxHash"
+rmdir /Q /S "temp"
+git clone --branch "v0.8.2" "..\..\..\..\..\3party\xxHash" "temp"
+mkdir "..\..\..\..\..\AE-Data\external\source\xxHash"
+copy /Y "temp\xxhash.h" "..\..\..\..\..\AE-Data\external\source\xxHash\xxhash.h"
+copy /Y "temp\LICENSE" "..\..\..\..\..\AE-Data\external\source\xxHash\LICENSE.txt"
+rmdir /Q /S "temp"
+pause
diff --git a/AE/engine/external/shared/xxHash/xxHash_CMakeLists.txt b/AE/engine/external/shared/xxHash/xxHash_CMakeLists.txt
new file mode 100644
index 00000000..1fdf4c6f
--- /dev/null
+++ b/AE/engine/external/shared/xxHash/xxHash_CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
+
+project( "xxHash-main" LANGUAGES CXX )
+
+set( AE_EXTERNAL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../.." )
+include( "${AE_EXTERNAL_PATH}/config.cmake" )
+
+set( XXHASH_BUILD_ENABLE_INLINE_API     ON   CACHE INTERNAL "" FORCE )
+set( XXHASH_BUILD_XXHSUM                OFF  CACHE INTERNAL "" FORCE )
+set( BUILD_SHARED_LIBS                  OFF  CACHE INTERNAL "" FORCE )
+set( DISPATCH                           OFF  CACHE INTERNAL "" FORCE )
+
+include( "origin_CMakeLists.txt" )
+
+install( FILES "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE" DESTINATION "." )
diff --git a/AE/engine/pch/Base.h b/AE/engine/pch/Base.h
index 16bea67e..283ff045 100644
--- a/AE/engine/pch/Base.h
+++ b/AE/engine/pch/Base.h
@@ -8,6 +8,7 @@
 #include "base/CompileTime/Math.h"
 #include "base/CompileTime/TypeList.h"
 #include "base/CompileTime/FunctionInfo.h"
+#include "base/CompileTime/Counter.h"
 
 // Algorithms
 #include "base/Algorithms/ArrayUtils.h"
@@ -18,6 +19,7 @@
 // Containers
 #include "base/Containers/AnyTypeRef.h"
 #include "base/Containers/ArrayView.h"
+#include "base/Containers/ChunkList.h"
 #include "base/Containers/FixedArray.h"
 #include "base/Containers/FixedMap.h"
 #include "base/Containers/FixedSet.h"
@@ -52,7 +54,7 @@
 #include "base/Math/Bytes.h"
 #include "base/Math/Percent.h"
 #include "base/Math/Math.h"
-#include "base/Math/Radians.h"
+#include "base/Math/Radian.h"
 #include "base/Math/VecSwizzle.h"
 #include "base/Math/Fractional.h"
 #include "base/Math/Float8.h"
@@ -86,14 +88,14 @@
 
 // Memory
 #include "base/Memory/AllocatorFwdDecl.h"
-#include "base/Memory/IAllocator.h"
 #include "base/Memory/UntypedAllocator.h"
+#include "base/Memory/IAllocator.h"
 #include "base/Memory/SharedMem.h"
 #include "base/Memory/StackAllocator.h"
 #include "base/Memory/LinearAllocator.h"
-#include "base/Memory/AllocatorRef.h"
 #include "base/Memory/MemUtils.h"
 #include "base/Memory/MemWriter.h"
+#include "base/Memory/MemChunkList.h"
 
 // Platforms
 #include "base/Platforms/CPUInfo.h"
@@ -117,5 +119,6 @@
 #include "base/Utils/TypeId.h"
 #include "base/Utils/Version.h"
 #include "base/Utils/FrameUID.h"
+#include "base/Utils/PackedPtr.h"
 
 
diff --git a/AE/engine/pch/Networking.h b/AE/engine/pch/Networking.h
index f7a9c361..8de751eb 100644
--- a/AE/engine/pch/Networking.h
+++ b/AE/engine/pch/Networking.h
@@ -2,12 +2,16 @@
 
 #pragma once
 
-// Raw
-#include "networking/Raw/IpAddress.h"
-#include "networking/Raw/TcpSocket.h"
-#include "networking/Raw/UdpSocket.h"
-#include "networking/Raw/SocketService.h"
+// LowLevel
+#include "networking/LowLevel/IpAddress.h"
+#include "networking/LowLevel/TcpSocket.h"
+#include "networking/LowLevel/UdpSocket.h"
+#include "networking/LowLevel/SocketService.h"
 
-// DataSource
+// HighLevel
+#include "networking/HighLevel/Client.h"
+#include "networking/HighLevel/Server.h"
+#include "networking/HighLevel/Messages.h"
 
-// Channels
+// Utils
+#include "networking/HighLevel/AsyncCSMessageProducer.h"
diff --git a/AE/engine/pch/Platform.h b/AE/engine/pch/Platform.h
index a71b38af..5fc3e54f 100644
--- a/AE/engine/pch/Platform.h
+++ b/AE/engine/pch/Platform.h
@@ -12,6 +12,5 @@
 #include "platform/Public/VRDevice.h"
 #include "platform/Public/IApplication.h"
 
-#include "platform/DefaultV1/DefaultAppV1.h"
-
-#include "platform/DefaultV2/DefaultAppV2.h"
+#include "platform/BaseAppV1/DefaultAppV1.h"
+#include "platform/BaseAppV2/DefaultAppV2.h"
diff --git a/AE/engine/pch/Serializing.h b/AE/engine/pch/Serializing.h
index 5e2cd9c0..60f2a671 100644
--- a/AE/engine/pch/Serializing.h
+++ b/AE/engine/pch/Serializing.h
@@ -3,5 +3,5 @@
 #pragma once
 
 #include "serializing/Common.h"
-#include "serializing/ISerializable.h"
-#include "serializing/ObjectFactory.h"
+#include "serializing/Basic/ISerializable.h"
+#include "serializing/Basic/ObjectFactory.h"
diff --git a/AE/engine/pch/Threading.h b/AE/engine/pch/Threading.h
index f8c43083..ebbfd371 100644
--- a/AE/engine/pch/Threading.h
+++ b/AE/engine/pch/Threading.h
@@ -5,8 +5,8 @@
 #include "threading/Common.h"
 
 // Containers
-#include "threading/Containers/LfIndexedPool2.h"
-#include "threading/Containers/LfIndexedPool3.h"
+#include "threading/Containers/LfChunkList.h"
+#include "threading/Containers/LfIndexedPool.h"
 #include "threading/Containers/LfStaticIndexedPool.h"
 #include "threading/Containers/LfStaticPool.h"
 #include "threading/Containers/LfStaticQueue.h"
@@ -15,19 +15,21 @@
 #include "threading/DataSource/AsyncDataSource.h"
 #include "threading/DataSource/TsDataSource.h"
 #include "threading/DataSource/WinAsyncDataSource.h"
+//#include "threading/DataSource/UnixAsyncDataSource.h"
 #include "threading/DataSource/AsyncDataSourceAsStream.h"
+#include "threading/DataSource/SyncDataSource.h"
 
 // Memory
 #include "threading/Memory/FrameAllocator.h"
 #include "threading/Memory/GlobalLinearAllocator.h"
 #include "threading/Memory/LfFixedBlockAllocator.h"
-#include "threading/Memory/LfFixedBlockAllocator3.h"
 #include "threading/Memory/LfLinearAllocator.h"
 #include "threading/Memory/MemoryManager.h"
 #include "threading/Memory/MemoryProfiler.h"
 #include "threading/Memory/TsLinearAllocator.h"
 #include "threading/Memory/TsSharedMem.h"
 #include "threading/Memory/TsStackAllocator.h"
+#include "threading/Memory/TsIAllocator.h"
 
 // Primitives
 #include "threading/Primitives/Barrier.h"
diff --git a/AE/engine/shared_data/3party_shaders/Blur-1.glsl b/AE/engine/shared_data/3party_shaders/Blur-1.glsl
index 9fedbacb..b58c72c3 100644
--- a/AE/engine/shared_data/3party_shaders/Blur-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/Blur-1.glsl
@@ -10,7 +10,7 @@ float4  Blur5 (gl::CombinedTex2D<float> image, float2 uv, float2 invResolution,
     color += gl.texture.Sample( image, uv ) * 0.29411764705882354;
     color += gl.texture.Sample( image, uv + (off1 * invResolution) ) * 0.35294117647058826;
     color += gl.texture.Sample( image, uv - (off1 * invResolution) ) * 0.35294117647058826;
-    return color; 
+    return color;
 }
 
 float4  Blur9 (gl::CombinedTex2D<float> image, float2 uv, float2 invResolution, float2 direction)
diff --git a/AE/engine/shared_data/3party_shaders/ColorSpaceUtility-1.glsl b/AE/engine/shared_data/3party_shaders/ColorSpaceUtility-1.glsl
index 02fedaf5..934f5152 100644
--- a/AE/engine/shared_data/3party_shaders/ColorSpaceUtility-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/ColorSpaceUtility-1.glsl
@@ -2,7 +2,7 @@
 
 // Copyright (c) Microsoft. All rights reserved.
 // This code is licensed under the MIT License (MIT).
-// 
+//
 // GLSL port by Zhirnov Andrey.
 
 #ifdef __cplusplus
diff --git a/AE/engine/shared_data/3party_shaders/ColorUtils-1.glsl b/AE/engine/shared_data/3party_shaders/ColorUtils-1.glsl
index 8c1397fa..f0570c57 100644
--- a/AE/engine/shared_data/3party_shaders/ColorUtils-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/ColorUtils-1.glsl
@@ -83,7 +83,7 @@ float3  HSVtoRGB_v2 (float3 hsv)
     //    if      ( var_i == 0 ) { R = V         ; G = TempRGB.z ; B = TempRGB.x }
     //    else if ( var_i == 2 ) { R = TempRGB.x ; G = V         ; B = TempRGB.z }
     //    else if ( var_i == 4 ) { R = TempRGB.z ; G = TempRGB.x ; B = V     }
-    // 
+    //
     //    else if ( var_i == 1 ) { R = TempRGB.y ; G = V         ; B = TempRGB.x }
     //    else if ( var_i == 3 ) { R = TempRGB.x ; G = TempRGB.y ; B = V     }
     //    else if ( var_i == 5 ) { R = V         ; G = TempRGB.x ; B = TempRGB.y }
@@ -208,7 +208,7 @@ float3  XYYtoRGB_v2 (float3 xyY)
     );
     const float3x3  XYZ2RGB = float3x3(
         3.2406, -1.5372, -0.4986,
-        -0.9689, 1.8758, 0.0415, 
+        -0.9689, 1.8758, 0.0415,
         0.0557, -0.2040, 1.0570
     );
     return XYZ2RGB * XYZ;
@@ -267,3 +267,67 @@ float3  XYYtoRGB (const float3 xyY)
                           xyY.z * (1.0 - xyY.x - xyY.y) / xyY.y );
     return XYZtoRGB( xyz );
 }
+
+/*
+=================================================
+    RGBtoOklab / OklabToRGB
+-----
+    from https://mini.gmshaders.com/p/oklab
+    originally from https://bottosson.github.io/posts/gamutclipping/#source-code (MIT license)
+=================================================
+*/
+float3  RGBtoOklab (float3 rgb)
+{
+    const float3x3  im1 = float3x3( 0.4121656120, 0.2118591070, 0.0883097947,
+                                    0.5362752080, 0.6807189584, 0.2818474174,
+                                    0.0514575653, 0.1074065790, 0.6302613616 );
+
+    const float3x3  im2 = float3x3( +0.2104542553, +1.9779984951, +0.0259040371,
+                                    +0.7936177850, -2.4285922050, +0.7827717662,
+                                    -0.0040720468, +0.4505937099, -0.8086757660 );
+
+    float3  lms = im1 * rgb;
+    return im2 * (Sign(lms) * Pow( Abs(lms), float3(1.0/3.0) ));
+}
+
+float3  OklabToRGB (float3 oklab)
+{
+    const float3x3  m1 = float3x3(  +1.000000000, +1.000000000, +1.000000000,
+                                    +0.396337777, -0.105561346, -0.089484178,
+                                    +0.215803757, -0.063854173, -1.291485548 );
+
+    const float3x3  m2 = float3x3(  +4.076724529, -1.268143773, -0.004111989,
+                                    -3.307216883, +2.609332323, -0.703476310,
+                                    +0.230759054, -0.341134429, +1.706862569 );
+    float3  lms = m1 * oklab;
+    return m2 * (lms * lms * lms);
+}
+
+/*
+=================================================
+    RGBLerpOklab
+-----
+    By Inigo Quilez, under MIT license
+    https://www.shadertoy.com/view/ttcyRS
+=================================================
+*/
+float3  RGBLerpOklab (const float3 lin1, const float3 lin2, const float factor)
+{
+    const float3x3  kCONEtoLMS = float3x3(
+         0.4121656120,  0.2118591070,  0.0883097947,
+         0.5362752080,  0.6807189584,  0.2818474174,
+         0.0514575653,  0.1074065790,  0.6302613616 );
+
+    const float3x3  kLMStoCONE = float3x3(
+         4.0767245293, -1.2681437731, -0.0041119885,
+        -3.3072168827,  2.6093323231, -0.7034763098,
+         0.2307590544, -0.3411344290,  1.7068625689 );
+
+    float3  lms1    = Pow( kCONEtoLMS * lin1, float3(1.0/3.0) );
+    float3  lms2    = Pow( kCONEtoLMS * lin2, float3(1.0/3.0) );
+
+    float3  lms     = Lerp( lms1, lms2, factor );
+            lms     *= 1.0 + 0.2 * factor * (1.0 - factor);
+
+    return kLMStoCONE * (lms * lms * lms);
+}
diff --git a/AE/engine/shared_data/3party_shaders/Hash-1.glsl b/AE/engine/shared_data/3party_shaders/Hash-1.glsl
index 8437e4dc..88430adb 100644
--- a/AE/engine/shared_data/3party_shaders/Hash-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/Hash-1.glsl
@@ -5,7 +5,7 @@
 #include "Math.glsl"
 
 
-// DHash from https://www.shadertoy.com/view/4djSRW 
+// DHash from https://www.shadertoy.com/view/4djSRW
 // MIT License...
 // Copyright (c) 2014 David Hoskins.
 
diff --git a/AE/engine/shared_data/3party_shaders/Hash-2.glsl b/AE/engine/shared_data/3party_shaders/Hash-2.glsl
index d663bd19..d1e85dde 100644
--- a/AE/engine/shared_data/3party_shaders/Hash-2.glsl
+++ b/AE/engine/shared_data/3party_shaders/Hash-2.glsl
@@ -72,8 +72,8 @@ float  HEHash12 (int2 uv) { return HEHash12( uint2(uv) ); }
 uint3 _IWeylConst ()
 {
     return uint3(
-        0x3504f333u,    // W0 = 3*2309*128413 
-        0xf1bbcdcbu,    // W1 = 7*349*1660097 
+        0x3504f333u,    // W0 = 3*2309*128413
+        0xf1bbcdcbu,    // W1 = 7*349*1660097
         741103597u      // M = 13*83*686843
     );
 }
@@ -138,7 +138,7 @@ ND_ float  Hash_Gaussianish (const float2 n, const float seed)
 {
     const float t = Fract( seed );
     const float nrnd0 = nrand( n + 0.07*t );
-    const float nrnd1 = nrand( n + 0.11*t );    
+    const float nrnd1 = nrand( n + 0.11*t );
     const float nrnd2 = nrand( n + 0.13*t );
     const float nrnd3 = nrand( n + 0.17*t );
     return (nrnd0+nrnd1+nrnd2+nrnd3) / 4.0;
@@ -148,7 +148,7 @@ ND_ float  Hash_MoarGaussianish (const float2 n, const float seed)
 {
     const float t = Fract( seed );
     const float nrnd0 = nrand( n + 0.07*t );
-    const float nrnd1 = nrand( n + 0.11*t );    
+    const float nrnd1 = nrand( n + 0.11*t );
     const float nrnd2 = nrand( n + 0.13*t );
     const float nrnd3 = nrand( n + 0.17*t );
 
diff --git a/AE/engine/shared_data/3party_shaders/Noise-1.glsl b/AE/engine/shared_data/3party_shaders/Noise-1.glsl
index 2c87097d..4f0b49cd 100644
--- a/AE/engine/shared_data/3party_shaders/Noise-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/Noise-1.glsl
@@ -32,7 +32,7 @@ float  GradientNoise (gl::CombinedTex2D<float> rgbaNoise, const float3 pos)
     // cubic interpolant
     float3 u = w*w*(3.0-2.0*w);
     float3 du = 6.0*w*(1.0-w);
-    #endif    
+    #endif
 
     // gradients
     float3 ga = hash( i+float3(0.0,0.0,0.0) );
@@ -76,7 +76,7 @@ float  GradientNoise (const float3 pos)
     // cubic interpolant
     float3 u = w*w*(3.0-2.0*w);
     float3 du = 6.0*w*(1.0-w);
-    #endif    
+    #endif
 
     // gradients
     float3 ga = hash( i+float3(0.0,0.0,0.0) );
@@ -193,11 +193,11 @@ float  ValueNoise (gl::CombinedTex2D<float> greyNoise, const float3 pos)
     return  Lerp(
                 Lerp(
                     Lerp(hash(pi + float3(0, 0, 0)), hash(pi + float3(1, 0, 0)), w.x),
-                    Lerp(hash(pi + float3(0, 0, 1)), hash(pi + float3(1, 0, 1)), w.x), 
+                    Lerp(hash(pi + float3(0, 0, 1)), hash(pi + float3(1, 0, 1)), w.x),
                     w.z),
                 Lerp(
                     Lerp(hash(pi + float3(0, 1, 0)), hash(pi + float3(1, 1, 0)), w.x),
-                    Lerp(hash(pi + float3(0, 1, 1)), hash(pi + float3(1, 1, 1)), w.x), 
+                    Lerp(hash(pi + float3(0, 1, 1)), hash(pi + float3(1, 1, 1)), w.x),
                     w.z),
                 w.y);
     #undef hash
@@ -215,11 +215,11 @@ float  ValueNoise (const float3 pos)
     return  Lerp(
                 Lerp(
                     Lerp(hash(pi + float3(0, 0, 0)), hash(pi + float3(1, 0, 0)), w.x),
-                    Lerp(hash(pi + float3(0, 0, 1)), hash(pi + float3(1, 0, 1)), w.x), 
+                    Lerp(hash(pi + float3(0, 0, 1)), hash(pi + float3(1, 0, 1)), w.x),
                     w.z),
                 Lerp(
                     Lerp(hash(pi + float3(0, 1, 0)), hash(pi + float3(1, 1, 0)), w.x),
-                    Lerp(hash(pi + float3(0, 1, 1)), hash(pi + float3(1, 1, 1)), w.x), 
+                    Lerp(hash(pi + float3(0, 1, 1)), hash(pi + float3(1, 1, 1)), w.x),
                     w.z),
                 w.y);
     #undef hash
@@ -246,18 +246,18 @@ float  PerlinNoise (gl::CombinedTex2D<float> rgbaNoise, const float3 pos)
 
     return  Lerp(
                 Lerp(
-                    Lerp(Dot(pf - float3(0, 0, 0), hash(pi + float3(0, 0, 0))), 
+                    Lerp(Dot(pf - float3(0, 0, 0), hash(pi + float3(0, 0, 0))),
                          Dot(pf - float3(1, 0, 0), hash(pi + float3(1, 0, 0))),
                          w.x),
-                    Lerp(Dot(pf - float3(0, 0, 1), hash(pi + float3(0, 0, 1))), 
+                    Lerp(Dot(pf - float3(0, 0, 1), hash(pi + float3(0, 0, 1))),
                          Dot(pf - float3(1, 0, 1), hash(pi + float3(1, 0, 1))),
                          w.x),
                     w.z),
                 Lerp(
-                    Lerp(Dot(pf - float3(0, 1, 0), hash(pi + float3(0, 1, 0))), 
+                    Lerp(Dot(pf - float3(0, 1, 0), hash(pi + float3(0, 1, 0))),
                          Dot(pf - float3(1, 1, 0), hash(pi + float3(1, 1, 0))),
                          w.x),
-                    Lerp(Dot(pf - float3(0, 1, 1), hash(pi + float3(0, 1, 1))), 
+                    Lerp(Dot(pf - float3(0, 1, 1), hash(pi + float3(0, 1, 1))),
                          Dot(pf - float3(1, 1, 1), hash(pi + float3(1, 1, 1))),
                          w.x),
                     w.z),
@@ -276,18 +276,18 @@ float  PerlinNoise (const float3 pos)
 
     return  Lerp(
                 Lerp(
-                    Lerp(Dot(pf - float3(0, 0, 0), hash(pi + float3(0, 0, 0))), 
+                    Lerp(Dot(pf - float3(0, 0, 0), hash(pi + float3(0, 0, 0))),
                          Dot(pf - float3(1, 0, 0), hash(pi + float3(1, 0, 0))),
                          w.x),
-                    Lerp(Dot(pf - float3(0, 0, 1), hash(pi + float3(0, 0, 1))), 
+                    Lerp(Dot(pf - float3(0, 0, 1), hash(pi + float3(0, 0, 1))),
                          Dot(pf - float3(1, 0, 1), hash(pi + float3(1, 0, 1))),
                          w.x),
                     w.z),
                 Lerp(
-                    Lerp(Dot(pf - float3(0, 1, 0), hash(pi + float3(0, 1, 0))), 
+                    Lerp(Dot(pf - float3(0, 1, 0), hash(pi + float3(0, 1, 0))),
                          Dot(pf - float3(1, 1, 0), hash(pi + float3(1, 1, 0))),
                          w.x),
-                    Lerp(Dot(pf - float3(0, 1, 1), hash(pi + float3(0, 1, 1))), 
+                    Lerp(Dot(pf - float3(0, 1, 1), hash(pi + float3(0, 1, 1))),
                          Dot(pf - float3(1, 1, 1), hash(pi + float3(1, 1, 1))),
                          w.x),
                     w.z),
diff --git a/AE/engine/shared_data/3party_shaders/SDF-1.glsl b/AE/engine/shared_data/3party_shaders/SDF-1.glsl
index 5dd98014..303109ef 100644
--- a/AE/engine/shared_data/3party_shaders/SDF-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/SDF-1.glsl
@@ -22,7 +22,7 @@ float  SDF2_Line (const float2 position, const float2 point0, const float2 point
 float  SDF2_Rect (const float2 position, const float2 hsize)
 {
     const float2  d = Abs( position ) - hsize;
-    return Length(Max( d, float2(0.0f) )) + Min(Max( d.x, d.y ), 0.0f );
+    return Length( Max( d, float2(0.0f) )) + Min( Max( d.x, d.y ), 0.0f );
 }
 
 
@@ -37,30 +37,30 @@ float  SDF2_Pentagon (const float2 position, const float radius)
     const float3  k = float3( 0.809016994f, 0.587785252f, 0.726542528f );
           float2  p = position;
     p.x = Abs(p.x);
-    p -= 2.0f * Min(Dot( float2(-k.x,k.y), p ), 0.0f) * float2(-k.x,k.y);
-    p -= 2.0f * Min(Dot( float2( k.x,k.y), p ), 0.0f) * float2( k.x,k.y);
+    p -= 2.0f * Min( Dot( float2(-k.x, k.y ), p ), 0.0f ) * float2(-k.x, k.y);
+    p -= 2.0f * Min( Dot( float2( k.x, k.y ), p ), 0.0f ) * float2( k.x, k.y);
     p -= float2( Clamp( p.x, -radius * k.z, radius * k.z ), radius );
-    return Length(p) * SignOrZero(p.y);
+    return Length( p ) * SignOrZero( p.y );
 }
 
 
 float  SDF2_Hexagon (const float2 position, const float radius)
 {
     const float3    k = float3( -0.866025404, 0.5, 0.577350269 );
-          float2    p = Abs(position);
+          float2    p = Abs( position );
     p -= 2.0 * Min(Dot( k.xy, p ), 0.0f ) * k.xy;
-    p -= float2(Clamp( p.x, -k.z * radius, k.z * radius ), radius );
-    return Length(p) * SignOrZero(p.y);
+    p -= float2( Clamp( p.x, -k.z * radius, k.z * radius ), radius );
+    return Length( p ) * SignOrZero( p.y );
 }
 
 
 float  SDF2_Octagon (const float2 position, const float radius)
 {
-    const float3    k = float3( -0.9238795325, 0.3826834323, 0.4142135623 );
-          float2    p = Abs(position);
-    p -= 2.0 * Min(Dot( float2( k.x, k.y), p ), 0.0 ) * float2( k.x,k.y);
-    p -= 2.0 * Min(Dot( float2(-k.x, k.y), p ), 0.0 ) * float2(-k.x,k.y);
-    p -= float2(Clamp( p.x, -k.z * radius, k.z * radius ), radius );
+    const float3    k = float3( -0.9238795325f, 0.3826834323f, 0.4142135623f );
+          float2    p = Abs( position );
+    p -= 2.0 * Min( Dot( float2( k.x, k.y), p ), 0.0f ) * float2( k.x,k.y);
+    p -= 2.0 * Min( Dot( float2(-k.x, k.y), p ), 0.0f ) * float2(-k.x,k.y);
+    p -= float2( Clamp( p.x, -k.z * radius, k.z * radius ), radius );
     return Length(p) * SignOrZero(p.y);
 }
 
@@ -69,8 +69,8 @@ float  SDF2_RoundedRect (const float2 position, const float2 hsize, float4 radiu
 {
             radius.xy   = (position.x > 0.0) ? radius.xy : radius.zw;
             radius.x    = (position.y > 0.0) ? radius.x  : radius.y;
-    float2  q           = Abs(position) - hsize + radius.x;
-    return Min(Max( q.x, q.y ), 0.0f ) + Length(Max( q, 0.0f )) - radius.x;
+    float2  q           = Abs( position ) - hsize + radius.x;
+    return Min( Max( q.x, q.y ), 0.0f ) + Length( Max( q, 0.0f )) - radius.x;
 }
 
 
@@ -81,14 +81,14 @@ float  SDF2_OrientedRect (const float2 position, const float2 a, const float2 b,
     float2  q = (position - (a + b) * 0.5f);
             q = float2x2( d.x, -d.y, d.y, d.x ) * q;
             q = Abs(q) - float2( l, angle ) * 0.5f;
-    return Length(Max( q, 0.0f )) + Min(Max( q.x, q.y ), 0.0f );
+    return Length( Max( q, 0.0f )) + Min( Max( q.x, q.y ), 0.0f );
 }
 
 
 float  SDF2_EquilateralTriangle (float2 p, const float size)
 {
     const float k = Sqrt(3.0);  // TODO
-    p.x = Abs(p.x) - size;
+    p.x = Abs( p.x ) - size;
     p.y = p.y + size / k;
     if ( p.x + k * p.y > 0.0 )  p = float2( p.x - k * p.y, -k * p.x - p.y ) / 2.0;
     p.x -= Clamp( p.x, -2.0 * size, 0.0 );
@@ -108,7 +108,7 @@ float  SDF2_Triangle (const float2 position, const float2 p0, const float2 p1, c
     float2  pq1 = v1 - e1 * Saturate( Dot( v1, e1 ) / Dot( e1, e1 ));
     float2  pq2 = v2 - e2 * Saturate( Dot( v2, e2 ) / Dot( e2, e2 ));
     float   s   = SignOrZero( e0.x * e2.y - e0.y * e2.x );
-    float2  d   = Min(  Min(float2( Dot( pq0, pq0 ), s * (v0.x * e0.y - v0.y * e0.x)),
+    float2  d   = Min(  Min( float2( Dot( pq0, pq0 ), s * (v0.x * e0.y - v0.y * e0.x)),
                         float2( Dot( pq1, pq1 ), s * (v1.x * e1.y - v1.y * e1.x) )),
                         float2( Dot( pq2, pq2 ), s * (v2.x * e2.y - v2.y * e2.x) ));
     return -Sqrt(d.x) * SignOrZero(d.y);
@@ -241,8 +241,8 @@ float  SDF_Octahedron (const float3 position, const float size)
     if ( 3.0 * p.z < m )    q = p.zxy;          else
                             return m * 0.57735027f;
 
-    const float  k = Clamp( 0.5f * (q.z - q.y + size), 0.0f, size ); 
-    return Length( float3( q.x, q.y - size + k, q.z - k )); 
+    const float  k = Clamp( 0.5f * (q.z - q.y + size), 0.0f, size );
+    return Length( float3( q.x, q.y - size + k, q.z - k ));
 }
 
 
@@ -410,16 +410,16 @@ float2  SDF_Rotate2D (const float2 p, const float angle)
     (_sdf_( (_pos_)/(_scale_) ) * _scale_)
 
 #define SDF_OpSymX( _pos_, _sdf_ )\
-    _sdf_(float3( Abs((_pos_).x), (_pos_).yz ))
+    (_sdf_(float3( Abs((_pos_).x), (_pos_).yz )))
 
 #define SDF_OpSymXZ( _pos_, _sdf_ )\
-    _sdf_(float3( Abs((_pos_).x), (_pos_).y, Abs((_pos_).z) ))
+    (_sdf_(float3( Abs((_pos_).x), (_pos_).y, Abs((_pos_).z) )))
 
-#define SDF_InfRepetition( _pos_, _center_, _sdf_ )\
-    _sdf_( Mod( (_pos_) + 0.5f * (_center_), (_center_) ) - 0.5f * (_center_) )
+#define SDF_InfRepetition( _pos_, _step_, _sdf_ )\
+    (_sdf_( Mod( (_pos_) + 0.5f * (_step_), (_step_) ) - 0.5f * (_step_) ))
 
-#define SDF_Repetition( _pos_, _c_, _l_, _sdf_ )\
-    _sdf_( (_pos_) - (_c_) * Clamp( Round( (_pos_)/(_c_) ), -(_l_), (_l_) ))
+#define SDF_Repetition( _pos_, _step_, _count_, _sdf_ )\
+    (_sdf_( (_pos_) - (_step_) * Clamp( Round( (_pos_)/(_step_) ), -(_count_), (_count_) )))
 
 
 //-----------------------------------------------------------------------------
diff --git a/AE/engine/shared_data/3party_shaders/ToneMapping-1.glsl b/AE/engine/shared_data/3party_shaders/ToneMapping-1.glsl
index 47b34d08..9acfc935 100644
--- a/AE/engine/shared_data/3party_shaders/ToneMapping-1.glsl
+++ b/AE/engine/shared_data/3party_shaders/ToneMapping-1.glsl
@@ -11,7 +11,7 @@
 
 //
 // Reinhard
-// 
+//
 
 // The Reinhard tone operator. Typically, the value of k is 1.0, but you can adjust exposure by 1/k.
 // I.e. ToneMap_Reinhard(x, 0.5) == ToneMap_Reinhard(x * 2.0, 1.0)
diff --git a/AE/engine/shared_data/3party_shaders/ToneMapping-2.glsl b/AE/engine/shared_data/3party_shaders/ToneMapping-2.glsl
index 12869ad8..a4f55ad2 100644
--- a/AE/engine/shared_data/3party_shaders/ToneMapping-2.glsl
+++ b/AE/engine/shared_data/3party_shaders/ToneMapping-2.glsl
@@ -5,7 +5,7 @@
 
 // from https://www.shadertoy.com/view/XsGfWV
 float3  ToneMap_ACES_v2 (const float3 color)
-{   
+{
     const float3x3  m1 = float3x3(
         0.59719, 0.07600, 0.02840,
         0.35458, 0.90834, 0.13383,
@@ -16,14 +16,14 @@ float3  ToneMap_ACES_v2 (const float3 color)
         -0.53108,  1.10813, -0.07276,
         -0.07367, -0.00605,  1.07602
     );
-    float3 v = m1 * color;    
+    float3 v = m1 * color;
     float3 a = v * (v + 0.0245786) - 0.000090537;
     float3 b = v * (0.983729 * v + 0.4329510) + 0.238081;
     return clamp( m2 * (a / b), 0.0, 1.0 );
 }
 
 float3  ToneMap_ACES_v3 (const float3 color)
-{   
+{
     const float3x3  m1 = float3x3(
         0.59719, 0.35458, 0.04823,
         0.07600, 0.90834, 0.01566,
@@ -34,7 +34,7 @@ float3  ToneMap_ACES_v3 (const float3 color)
         -0.10208,  1.10813, -0.00605,
         -0.00327, -0.07276,  1.07602
     );
-    float3 v = m1 * color;    
+    float3 v = m1 * color;
     float3 a = v * (v + 0.0245786) - 0.000090537;
     float3 b = v * (0.983729 * v + 0.4329510) + 0.238081;
     return clamp( m2 * (a / b), 0.0, 1.0 );
@@ -47,7 +47,7 @@ float3  ToneMap_ACES_v3 (const float3 color)
 
 //
 // Reinhard2
-// 
+//
 
 float3  ToneMap_Reinhard2 (const float3 hdr)
 {
@@ -58,7 +58,7 @@ float3  ToneMap_Reinhard2 (const float3 hdr)
 
 //
 // Unreal
-// 
+//
 
 // Unreal 3, Documentation: "Color Grading"
 // Adapted to be close to Tonemap_ACES, with similar range
@@ -72,7 +72,7 @@ float3  ToneMap_Unreal (const float3 hdr)
 
 //
 // Uchimura
-// 
+//
 
 // Uchimura 2017, "HDR theory and practice"
 // Math: https://www.desmos.com/calculator/gslcdxvipg
@@ -118,7 +118,7 @@ float3  ToneMap_Uchimura (const float3 hdr) {
 
 //
 // Lottes
-// 
+//
 
 // Lottes 2016, "Advanced Techniques and Optimization of HDR Color Pipelines"
 
diff --git a/AE/engine/shared_data/feature_set/min_apple.as b/AE/engine/shared_data/feature_set/min_apple.as
index a75a5a82..7b5ac159 100644
--- a/AE/engine/shared_data/feature_set/min_apple.as
+++ b/AE/engine/shared_data/feature_set/min_apple.as
@@ -7,6 +7,8 @@ void ASmain ()
     //  Apple M1 driver 0.2.1914 on Osx 12.0
     //  Apple A12 GPU driver 0.2.1915 on Ios 15.3
     //  Apple A15 GPU driver 0.2.1914 on Ios 15.3
+    //  Apple A17 Pro GPU driver 0.2.2014 on Ios 17.1
+    //  Apple M3 Max driver 0.2.2014 on Osx 14.2
     //  Apple8
     //  Apple8_Mac
     //  Apple7_Metal3
@@ -95,7 +97,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (155);
     fset.perDescrSet_maxStorageImages (40);
     fset.perDescrSet_maxUniformBuffers (155);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (96);
     fset.perStage_maxSampledImages (96);
     fset.perStage_maxSamplers (16);
diff --git a/AE/engine/shared_data/feature_set/min_desktop.as b/AE/engine/shared_data/feature_set/min_desktop.as
index 68ec9dd3..0d9c6ec6 100644
--- a/AE/engine/shared_data/feature_set/min_desktop.as
+++ b/AE/engine/shared_data/feature_set/min_desktop.as
@@ -95,7 +95,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (155);
     fset.perDescrSet_maxStorageImages (40);
     fset.perDescrSet_maxUniformBuffers (90);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (8);
     fset.perStage_maxSampledImages (128);
     fset.perStage_maxSamplers (16);
diff --git a/AE/engine/shared_data/feature_set/min_inline_rt.as b/AE/engine/shared_data/feature_set/min_inline_rt.as
index 25c3fbae..5b26ea5a 100644
--- a/AE/engine/shared_data/feature_set/min_inline_rt.as
+++ b/AE/engine/shared_data/feature_set/min_inline_rt.as
@@ -11,7 +11,9 @@ void ASmain ()
     //  NVIDIA GeForce RTX 2080 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 3090 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 4090 driver 526.98.0.0 on Windows 10
+    //  AMD Radeon RX 7900 XTX (RADV GFX1100) driver 23.2.1 on Arch unknown
     //  Samsung Xclipse 920 driver 2.0.0 on Android 12.0
+    //  vivo V2324A driver 44.1.0 on Android 14.0
     //  Apple8
     //  Apple8_Mac
     //  Apple7_Metal3
@@ -27,8 +29,6 @@ void ASmain ()
     RC<FeatureSet>  fset = FeatureSet( "MinInlineRayTracing" );
 
     fset.depthBiasClamp (True);
-    fset.dualSrcBlend (True);
-    fset.fillModeNonSolid (True);
     fset.independentBlend (True);
     fset.sampleRateShading (True);
     fset.constantAlphaColorBlendFactors (True);
@@ -55,14 +55,13 @@ void ASmain ()
         EShaderStages::Compute
     ));
     fset.subgroupQuadStages(EShaderStages(
-        EShaderStages::Vertex | 
         EShaderStages::Fragment | 
         EShaderStages::Compute
     ));
     fset.subgroup (True);
     fset.subgroupSizeControl (True);
     fset.minSubgroupSize (4);
-    fset.maxSubgroupSize (32);
+    fset.maxSubgroupSize (16);
     fset.shaderInt8 (True);
     fset.shaderInt16 (True);
     fset.shaderFloat16 (True);
@@ -72,8 +71,6 @@ void ASmain ()
     fset.scalarBlockLayout (True);
     fset.bufferDeviceAddress (True);
     fset.fragmentStoresAndAtomics (True);
-    fset.vertexPipelineStoresAndAtomics (True);
-    fset.shaderClipDistance (True);
     fset.runtimeDescriptorArray (True);
     fset.shaderSampledImageArrayDynamicIndexing (True);
     fset.shaderStorageBufferArrayDynamicIndexing (True);
@@ -92,33 +89,31 @@ void ASmain ()
     fset.minSpirvVersion (140);
     fset.minMetalVersion (240);
     fset.drawIndirectFirstInstance (True);
-    fset.multiViewport (True);
-    fset.maxViewports (16);
+    fset.maxViewports (1);
     fset.maxTexelBufferElements (64 << 20);
     fset.maxUniformBufferSize (64 << 10);
     fset.maxStorageBufferSize (64 << 10);
-    fset.perDescrSet_maxInputAttachments (1000000);
-    fset.perDescrSet_maxSampledImages (1000000);
+    fset.perDescrSet_maxInputAttachments (9);
+    fset.perDescrSet_maxSampledImages (500000);
     fset.perDescrSet_maxSamplers (1024);
-    fset.perDescrSet_maxStorageBuffers (1048576);
-    fset.perDescrSet_maxStorageImages (1000000);
-    fset.perDescrSet_maxUniformBuffers (1048576);
-    fset.perDescrSet_maxAccelStructures (1048576);
-    fset.perDescrSet_maxTotalResources (1024);
-    fset.perStage_maxInputAttachments (1048576);
-    fset.perStage_maxSampledImages (1048576);
+    fset.perDescrSet_maxStorageBuffers (500000);
+    fset.perDescrSet_maxStorageImages (500000);
+    fset.perDescrSet_maxUniformBuffers (216);
+    fset.perDescrSet_maxAccelStructures (500000);
+    fset.perDescrSet_maxTotalResources (512);
+    fset.perStage_maxInputAttachments (9);
+    fset.perStage_maxSampledImages (500000);
     fset.perStage_maxSamplers (8192);
-    fset.perStage_maxStorageBuffers (1048576);
-    fset.perStage_maxStorageImages (1048576);
-    fset.perStage_maxUniformBuffers (1048576);
-    fset.perStage_maxAccelStructures (1048576);
-    fset.perStage_maxTotalResources (8008184);
-    fset.maxDescriptorSets (8);
+    fset.perStage_maxStorageBuffers (500000);
+    fset.perStage_maxStorageImages (500000);
+    fset.perStage_maxUniformBuffers (36);
+    fset.perStage_maxAccelStructures (500000);
+    fset.perStage_maxTotalResources (500000);
+    fset.maxDescriptorSets (7);
     fset.maxTexelOffset (7);
     fset.maxTexelGatherOffset (7);
     fset.maxFragmentOutputAttachments (8);
-    fset.maxFragmentDualSrcAttachments (1);
-    fset.maxFragmentCombinedOutputResources (8008184);
+    fset.maxFragmentCombinedOutputResources (1000008);
     fset.maxPushConstantsSize (128);
     fset.maxComputeSharedMemorySize (32 << 10);
     fset.maxComputeWorkGroupInvocations (1 << 10);
@@ -196,8 +191,7 @@ void ASmain ()
         EPixelFormat::R16_SNorm, EPixelFormat::R8_SNorm, EPixelFormat::RGBA16_UNorm, EPixelFormat::RGBA8_UNorm, 
         EPixelFormat::RG16_UNorm, EPixelFormat::RG8_UNorm, EPixelFormat::R16_UNorm, EPixelFormat::R8_UNorm, 
         EPixelFormat::RGB10_A2_UNorm, EPixelFormat::BGRA8_UNorm, EPixelFormat::sRGB8_A8, EPixelFormat::sBGR8_A8, 
-        EPixelFormat::R16F, EPixelFormat::RG16F, EPixelFormat::RGBA16F, EPixelFormat::R32F, 
-        EPixelFormat::RG32F, EPixelFormat::RGB_11_11_10F
+        EPixelFormat::R16F, EPixelFormat::RG16F, EPixelFormat::RGBA16F, EPixelFormat::RGB_11_11_10F
     });
     fset.AddTexelFormats( EFormatFeature::Attachment, {
         EPixelFormat::RGBA16_SNorm, EPixelFormat::RGBA8_SNorm, EPixelFormat::RG16_SNorm, EPixelFormat::RG8_SNorm, 
@@ -222,6 +216,6 @@ void ASmain ()
     fset.samplerAnisotropy (True);
     fset.maxSamplerAnisotropy (16.00);
     fset.maxSamplerLodBias (4.00);
-    fset.maxFramebufferLayers (1 << 10);
+    fset.maxFramebufferLayers (256);
     fset.supportedQueues(EQueueMask( EQueueMask::Graphics ));
 }
diff --git a/AE/engine/shared_data/feature_set/min_mesh_shader.as b/AE/engine/shared_data/feature_set/min_mesh_shader.as
index b2392868..b4b7bbf8 100644
--- a/AE/engine/shared_data/feature_set/min_mesh_shader.as
+++ b/AE/engine/shared_data/feature_set/min_mesh_shader.as
@@ -9,6 +9,7 @@ void ASmain ()
     //  NVIDIA GeForce RTX 2080 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 3090 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 4090 driver 526.98.0.0 on Windows 10
+    //  AMD Radeon RX 7900 XTX (RADV GFX1100) driver 23.2.1 on Arch unknown
     //  Apple8
     //  Apple8_Mac
     //  Apple7_Metal3
diff --git a/AE/engine/shared_data/feature_set/min_mobile.as b/AE/engine/shared_data/feature_set/min_mobile.as
index 641e5da0..eb6d44c5 100644
--- a/AE/engine/shared_data/feature_set/min_mobile.as
+++ b/AE/engine/shared_data/feature_set/min_mobile.as
@@ -4,26 +4,36 @@
 void ASmain ()
 {
     // include:
+    //  AMD Radeon RX 7900 XTX (RADV GFX1100) driver 23.2.1 on Arch unknown
     //  Apple A12 GPU driver 0.2.1915 on Ios 15.3
     //  Apple A15 GPU driver 0.2.1914 on Ios 15.3
+    //  Apple A17 Pro GPU driver 0.2.2014 on Ios 17.1
+    //  Apple M3 Max driver 0.2.2014 on Osx 14.2
     //  Adreno (TM) 660 driver 512.530.0 on Android 11.0
+    //  Google Pixel 8 Pro driver 44.0.0 on Android 14.0
     //  Intel(R) Haswell Desktop driver 19.0.0 on Android 9.0
     //  Mali-T830 driver 28.0.0 on Android 9.0
     //  Adreno (TM) 505 driver 512.454.0 on Android 9.0
+    //  nubia NX729J driver 512.746.0 on Android 13.0
     //  NVIDIA Tegra X1 (rev B) (nvgpu) driver 495.0.0.0 on Android 11.0
     //  Mali-G71 driver 575.795.1934 on Android 7.1
+    //  OPPO CPH1951 driver 1.386.1368 on Android 11.0
+    //  OPPO PDYT20 driver 32.1.0 on Android 12.0
+    //  OPPO PFFM20 driver 32.1.0 on Android 12.0
     //  V3D 4.2 driver 21.2.5 on Android 12.0
     //  Mali-G52 MC2 driver 26.0.0 on Android 11.0
     //  Adreno (TM) 730 driver 512.615.0 on Android 12.0
     //  rockchip orangepi5 driver 12.0.0 on Android 12.0
     //  Mali-G72 driver 26.0.0 on Android 11.0
+    //  samsung SM-G780F driver 38.1.0 on Android 13.0
     //  Mali-G76 driver 32.1.0 on Android 12.0
+    //  samsung SM-S901E driver 512.744.6 on Android 13.0
     //  Samsung Xclipse 920 driver 2.0.0 on Android 12.0
     //  PowerVR Rogue GE8320 driver 1.386.1368 on Android 11.0
     //  Adreno (TM) 610 driver 512.502.0 on Android 11.0
     //  PowerVR Rogue GE8300 driver 1.322.3448 on Android 10.0
     //  VeriSilicon  driver 6.4.0 on Android 11.0
-    //  Mali-G57 driver 21.0.0 on Android 10.0
+    //  vivo V2324A driver 44.1.0 on Android 14.0
     //  Adreno (TM) 612 driver 512.502.0 on Android 12.0
     //  Apple8
     //  Apple7_Metal3
@@ -51,7 +61,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (24);
     fset.perDescrSet_maxStorageImages (24);
     fset.perDescrSet_maxUniformBuffers (72);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (4);
     fset.perStage_maxSampledImages (16);
     fset.perStage_maxSamplers (16);
diff --git a/AE/engine/shared_data/feature_set/min_mobile_adreno.as b/AE/engine/shared_data/feature_set/min_mobile_adreno.as
index e9ffb876..17c03d41 100644
--- a/AE/engine/shared_data/feature_set/min_mobile_adreno.as
+++ b/AE/engine/shared_data/feature_set/min_mobile_adreno.as
@@ -65,7 +65,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (24);
     fset.perDescrSet_maxStorageImages (24);
     fset.perDescrSet_maxUniformBuffers (84);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (8);
     fset.perStage_maxSampledImages (128);
     fset.perStage_maxSamplers (16);
diff --git a/AE/engine/shared_data/feature_set/min_mobile_mali.as b/AE/engine/shared_data/feature_set/min_mobile_mali.as
index 6c767047..ace33dff 100644
--- a/AE/engine/shared_data/feature_set/min_mobile_mali.as
+++ b/AE/engine/shared_data/feature_set/min_mobile_mali.as
@@ -18,7 +18,6 @@ void ASmain ()
     //  Mali-G52 MC2 driver 26.0.0 on Android 11.0
     //  Mali-G72 driver 26.0.0 on Android 11.0
     //  Mali-G76 driver 32.1.0 on Android 12.0
-    //  Mali-G57 driver 21.0.0 on Android 10.0
 
     const EFeature  True = EFeature::RequireTrue;
 
@@ -51,7 +50,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (24);
     fset.perDescrSet_maxStorageImages (24);
     fset.perDescrSet_maxUniformBuffers (72);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (4);
     fset.perStage_maxSampledImages (16);
     fset.perStage_maxSamplers (128);
@@ -171,9 +170,9 @@ void ASmain ()
         EPixelFormat::ASTC_sRGB8_A8_8x6, EPixelFormat::ASTC_sRGB8_A8_8x8, EPixelFormat::ASTC_sRGB8_A8_10x5, EPixelFormat::ASTC_sRGB8_A8_10x6, 
         EPixelFormat::ASTC_sRGB8_A8_10x8, EPixelFormat::ASTC_sRGB8_A8_10x10, EPixelFormat::ASTC_sRGB8_A8_12x10, EPixelFormat::ASTC_sRGB8_A8_12x12
     });
-    fset.AddTexelFormats( EFormatFeature::HWCompressedAttachment, {
-        EPixelFormat::RGBA8_UNorm
-    });
+    //fset.AddTexelFormats( EFormatFeature::HWCompressedAttachment, {
+    //  EPixelFormat::RGBA8_UNorm
+    //});
     fset.samplerMipLodBias (True);
     fset.maxSamplerAnisotropy (1.00);
     fset.maxSamplerLodBias (2.00);
diff --git a/AE/engine/shared_data/feature_set/min_mobile_pvr.as b/AE/engine/shared_data/feature_set/min_mobile_pvr.as
index 4fe8451d..51e96053 100644
--- a/AE/engine/shared_data/feature_set/min_mobile_pvr.as
+++ b/AE/engine/shared_data/feature_set/min_mobile_pvr.as
@@ -77,7 +77,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (256);
     fset.perDescrSet_maxStorageImages (256);
     fset.perDescrSet_maxUniformBuffers (256);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (8);
     fset.perStage_maxSampledImages (128);
     fset.perStage_maxSamplers (128);
diff --git a/AE/engine/shared_data/feature_set/min_recursive_rt.as b/AE/engine/shared_data/feature_set/min_recursive_rt.as
index 2b62a820..a867d0ea 100644
--- a/AE/engine/shared_data/feature_set/min_recursive_rt.as
+++ b/AE/engine/shared_data/feature_set/min_recursive_rt.as
@@ -10,6 +10,7 @@ void ASmain ()
     //  NVIDIA GeForce RTX 2080 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 3090 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 4090 driver 526.98.0.0 on Windows 10
+    //  AMD Radeon RX 7900 XTX (RADV GFX1100) driver 23.2.1 on Arch unknown
 
     const EFeature  True = EFeature::RequireTrue;
 
diff --git a/AE/engine/shared_data/feature_set/minimal.as b/AE/engine/shared_data/feature_set/minimal.as
index 6997cf5b..763054cd 100644
--- a/AE/engine/shared_data/feature_set/minimal.as
+++ b/AE/engine/shared_data/feature_set/minimal.as
@@ -23,7 +23,7 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (24);
     fset.perDescrSet_maxStorageImages (24);
     fset.perDescrSet_maxUniformBuffers (72);
-    fset.perDescrSet_maxTotalResources (1024);
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (4);
     fset.perStage_maxSampledImages (16);
     fset.perStage_maxSamplers (16);
diff --git a/AE/engine/shared_data/feature_set/parts/min_desc_indexing.as b/AE/engine/shared_data/feature_set/parts/min_desc_indexing.as
index 043b0597..b45f48ad 100644
--- a/AE/engine/shared_data/feature_set/parts/min_desc_indexing.as
+++ b/AE/engine/shared_data/feature_set/parts/min_desc_indexing.as
@@ -22,24 +22,34 @@ void ASmain ()
     //  NVIDIA GeForce RTX 3090 driver 473.11.0.0 on Windows 10
     //  NVIDIA GeForce RTX 4090 driver 526.98.0.0 on Windows 10
     //  Radeon RX 580 Series driver 2.0.207 on Ubuntu 20.04
+    //  AMD Radeon RX 7900 XTX (RADV GFX1100) driver 23.2.1 on Arch unknown
     //  Apple A12 GPU driver 0.2.1915 on Ios 15.3
     //  Apple A15 GPU driver 0.2.1914 on Ios 15.3
+    //  Apple A17 Pro GPU driver 0.2.2014 on Ios 17.1
+    //  Apple M3 Max driver 0.2.2014 on Osx 14.2
     //  Adreno (TM) 660 driver 512.530.0 on Android 11.0
+    //  Google Pixel 8 Pro driver 44.0.0 on Android 14.0
     //  Intel(R) Haswell Desktop driver 19.0.0 on Android 9.0
     //  Mali-T830 driver 28.0.0 on Android 9.0
     //  Adreno (TM) 505 driver 512.454.0 on Android 9.0
+    //  nubia NX729J driver 512.746.0 on Android 13.0
     //  NVIDIA Tegra X1 (rev B) (nvgpu) driver 495.0.0.0 on Android 11.0
     //  Mali-G71 driver 575.795.1934 on Android 7.1
+    //  OPPO CPH1951 driver 1.386.1368 on Android 11.0
+    //  OPPO PDYT20 driver 32.1.0 on Android 12.0
+    //  OPPO PFFM20 driver 32.1.0 on Android 12.0
     //  Mali-G52 MC2 driver 26.0.0 on Android 11.0
     //  Adreno (TM) 730 driver 512.615.0 on Android 12.0
     //  rockchip orangepi5 driver 12.0.0 on Android 12.0
     //  Mali-G72 driver 26.0.0 on Android 11.0
+    //  samsung SM-G780F driver 38.1.0 on Android 13.0
     //  Mali-G76 driver 32.1.0 on Android 12.0
+    //  samsung SM-S901E driver 512.744.6 on Android 13.0
     //  Samsung Xclipse 920 driver 2.0.0 on Android 12.0
     //  PowerVR Rogue GE8320 driver 1.386.1368 on Android 11.0
     //  Adreno (TM) 610 driver 512.502.0 on Android 11.0
     //  PowerVR Rogue GE8300 driver 1.322.3448 on Android 10.0
-    //  Mali-G57 driver 21.0.0 on Android 10.0
+    //  vivo V2324A driver 44.1.0 on Android 14.0
     //  Adreno (TM) 612 driver 512.502.0 on Android 12.0
     //  Apple8
     //  Apple8_Mac
@@ -68,8 +78,8 @@ void ASmain ()
     fset.perDescrSet_maxStorageBuffers (24);
     fset.perDescrSet_maxStorageImages (24);
     fset.perDescrSet_maxUniformBuffers (72);
-    fset.perDescrSet_maxTotalResources (1024);
 
+    fset.perDescrSet_maxTotalResources (512);
     fset.perStage_maxInputAttachments (4);
     fset.perStage_maxSampledImages (16);
     fset.perStage_maxSamplers (16);
diff --git a/AE/engine/shared_data/feature_set/parts/min_nonuniform_desc_idx.as b/AE/engine/shared_data/feature_set/parts/min_nonuniform_desc_idx.as
index c92b1215..6704ce6e 100644
--- a/AE/engine/shared_data/feature_set/parts/min_nonuniform_desc_idx.as
+++ b/AE/engine/shared_data/feature_set/parts/min_nonuniform_desc_idx.as
@@ -14,10 +14,16 @@ void ASmain ()
     //  NVIDIA GeForce RTX 4090 driver 526.98.0.0 on Windows 10
     //  Apple A12 GPU driver 0.2.1915 on Ios 15.3
     //  Apple A15 GPU driver 0.2.1914 on Ios 15.3
+    //  Apple A17 Pro GPU driver 0.2.2014 on Ios 17.1
+    //  Apple M3 Max driver 0.2.2014 on Osx 14.2
     //  Adreno (TM) 660 driver 512.530.0 on Android 11.0
+    //  nubia NX729J driver 512.746.0 on Android 13.0
+    //  OPPO PDYT20 driver 32.1.0 on Android 12.0
+    //  OPPO PFFM20 driver 32.1.0 on Android 12.0
     //  Adreno (TM) 730 driver 512.615.0 on Android 12.0
+    //  samsung SM-G780F driver 38.1.0 on Android 13.0
+    //  samsung SM-S901E driver 512.744.6 on Android 13.0
     //  Samsung Xclipse 920 driver 2.0.0 on Android 12.0
-    //  Mali-G57 driver 21.0.0 on Android 10.0
     //  Apple8
     //  Apple8_Mac
     //  Apple7_Metal3
@@ -48,24 +54,24 @@ void ASmain ()
     fset.maxUniformBufferSize (64 << 10);
 
     fset.maxStorageBufferSize (64 << 10);
-    fset.perDescrSet_maxInputAttachments (4);
-    fset.perDescrSet_maxSampledImages (96);
+    fset.perDescrSet_maxInputAttachments (8);
+    fset.perDescrSet_maxSampledImages (480);
     fset.perDescrSet_maxSamplers (80);
     fset.perDescrSet_maxStorageBuffers (155);
     fset.perDescrSet_maxStorageImages (40);
-    fset.perDescrSet_maxUniformBuffers (72);
-    fset.perDescrSet_maxTotalResources (1024);
 
-    fset.perStage_maxInputAttachments (4);
-    fset.perStage_maxSampledImages (16);
+    fset.perDescrSet_maxUniformBuffers (90);
+    fset.perDescrSet_maxTotalResources (512);
+    fset.perStage_maxInputAttachments (8);
+    fset.perStage_maxSampledImages (96);
     fset.perStage_maxSamplers (16);
     fset.perStage_maxStorageBuffers (31);
     fset.perStage_maxStorageImages (8);
-    fset.perStage_maxUniformBuffers (12);
-    fset.perStage_maxTotalResources (83);
 
+    fset.perStage_maxUniformBuffers (15);
+    fset.perStage_maxTotalResources (127);
     fset.maxDescriptorSets (4);
     fset.maxFragmentOutputAttachments (8);
-    fset.maxFragmentCombinedOutputResources (51);
+    fset.maxFragmentCombinedOutputResources (72);
     fset.maxPushConstantsSize (128);
 }
diff --git a/AE/engine/shared_data/scripts/asset_packer.as b/AE/engine/shared_data/scripts/asset_packer.as
index c9014a3e..00335541 100644
--- a/AE/engine/shared_data/scripts/asset_packer.as
+++ b/AE/engine/shared_data/scripts/asset_packer.as
@@ -1,4 +1,4 @@
-//CB390BE2
+//bfe1cedf
 #include <vector>
 #include <string>
 
@@ -20,90 +20,90 @@ struct RC;
 template <typename T>
 using array = std::vector<T>;
 
+struct EPipelineDynamicState;
+struct EFilter;
+struct MultiSamples;
+struct EFeature;
+struct ESamplerChromaLocation;
+struct EDescSetUsage;
+struct EVertexInputRate;
+struct EBorderColor;
+struct EAttachmentStoreOp;
+struct EImageAspect;
+struct EShaderIO;
+struct EVendorID;
 struct EResourceState;
+struct float3;
 struct EPipelineOpt;
 struct RasterFont;
 struct float2;
-struct ESurfaceFormat;
-struct MipmapLevel;
-struct ESamplerYcbcrRange;
-struct ESamplerUsage;
-struct EReductionMode;
-struct ubyte4;
-struct ESubgroupOperation;
-struct ubyte2;
-struct EGraphicsDeviceID;
-struct ubyte3;
-struct Material;
-struct Mesh;
-struct EPrimitive;
-struct DepthStencil;
+struct float4;
+struct RectU;
+struct ECompareOp;
+struct EIndex;
+struct uint4;
+struct uint3;
+struct RectI;
+struct EShaderStages;
+struct uint2;
+struct EShader;
+struct RectF;
+struct ESubgroupTypes;
+struct RGBA32u;
+struct ESamplerYcbcrModelConversion;
+struct ImageAtlas;
+struct EMipmapFilter;
+struct short2;
+struct Texture;
+struct sbyte4;
 struct short4;
-struct EPixelFormat;
-struct EBlendOp;
+struct sbyte3;
+struct RGBA8u;
+struct ushort4;
+struct sbyte2;
+struct short3;
 struct ushort3;
 struct ushort2;
-struct sbyte2;
+struct RGBA32f;
 struct HSVColor;
-struct ELogicOp;
+struct bool2;
+struct int3;
 struct int4;
+struct EPixelFormat;
 struct EImage;
-struct RGBA32f;
-struct int2;
-struct EQueueMask;
-struct bool3;
 struct RGBA32i;
+struct bool3;
+struct int2;
 struct bool4;
-struct ImageLayer;
-struct EVertexType;
-struct bool2;
-struct int3;
 struct ECullMode;
-struct ECubeFace;
 struct EAddressMode;
-struct EPolygonMode;
-struct ERasterFontMode;
+struct ECubeFace;
+struct EQueueMask;
 struct EAttachmentLoadOp;
+struct EVertexType;
+struct EPolygonMode;
+struct ImageLayer;
 struct EBlendFactor;
-struct EStencilOp;
-struct ERTInstanceOpt;
+struct ERasterFontMode;
+struct EBlendOp;
+struct ELogicOp;
 struct Model;
-struct float4;
-struct ECompareOp;
-struct uint4;
-struct RectU;
-struct uint2;
-struct EIndex;
-struct uint3;
-struct RectI;
-struct RectF;
-struct ESubgroupTypes;
-struct EShader;
-struct EShaderStages;
-struct RGBA32u;
-struct short3;
-struct ushort4;
-struct short2;
-struct sbyte3;
-struct sbyte4;
-struct ESamplerYcbcrModelConversion;
-struct RGBA8u;
-struct Texture;
-struct ImageAtlas;
-struct EFilter;
-struct EMipmapFilter;
-struct EPipelineDynamicState;
-struct MultiSamples;
-struct EFeature;
-struct ESamplerChromaLocation;
-struct EBorderColor;
-struct EDescSetUsage;
-struct EAttachmentStoreOp;
-struct EVertexInputRate;
-struct EImageAspect;
-struct EVendorID;
-struct EShaderIO;
-struct float3;
+struct ERTInstanceOpt;
+struct EStencilOp;
+struct ESurfaceFormat;
+struct MipmapLevel;
+struct ESamplerYcbcrRange;
+struct ubyte4;
+struct ESamplerUsage;
+struct EReductionMode;
+struct ubyte3;
+struct EGraphicsDeviceID;
+struct ubyte2;
+struct ESubgroupOperation;
+struct Mesh;
+struct Material;
+struct DepthStencil;
+struct EPrimitive;
 
 using sbyte = int8;
 using ubyte = uint8;
@@ -1991,57 +1991,60 @@ struct EGraphicsDeviceID
     static constexpr uint32 Adreno_600_QC5 = 4;
     static constexpr uint32 Adreno_700_SC3 = 5;
     static constexpr uint32 Adreno_700_DC4_SC5 = 6;
-    static constexpr uint32 AMD_GCN1 = 7;
-    static constexpr uint32 AMD_GCN2 = 8;
-    static constexpr uint32 AMD_GCN3 = 9;
-    static constexpr uint32 AMD_GCN4 = 10;
-    static constexpr uint32 AMD_GCN5 = 11;
-    static constexpr uint32 AMD_GCN5_APU = 12;
-    static constexpr uint32 AMD_RDNA1 = 13;
-    static constexpr uint32 AMD_RDNA2 = 14;
-    static constexpr uint32 AMD_RDNA2_APU = 15;
-    static constexpr uint32 AMD_RDNA3 = 16;
-    static constexpr uint32 AMD_RDNA3_APU = 17;
-    static constexpr uint32 Apple_A8 = 18;
-    static constexpr uint32 Apple_A9_A10 = 19;
-    static constexpr uint32 Apple_A11 = 20;
-    static constexpr uint32 Apple_A12 = 21;
-    static constexpr uint32 Apple_A13 = 22;
-    static constexpr uint32 Apple_A14_M1 = 23;
-    static constexpr uint32 Apple_A15_M2 = 24;
-    static constexpr uint32 Apple_A16 = 25;
-    static constexpr uint32 Mali_Midgard_Gen2 = 26;
-    static constexpr uint32 Mali_Midgard_Gen3 = 27;
-    static constexpr uint32 Mali_Midgard_Gen4 = 28;
-    static constexpr uint32 Mali_Bifrost_Gen1 = 29;
-    static constexpr uint32 Mali_Bifrost_Gen2 = 30;
-    static constexpr uint32 Mali_Bifrost_Gen3 = 31;
-    static constexpr uint32 Mali_Valhall_Gen1 = 32;
-    static constexpr uint32 Mali_Valhall_Gen2 = 33;
-    static constexpr uint32 Mali_Valhall_Gen3 = 34;
-    static constexpr uint32 Mali_Valhall_Gen4 = 35;
-    static constexpr uint32 NV_Maxwell = 36;
-    static constexpr uint32 NV_Maxwell_Tegra = 37;
-    static constexpr uint32 NV_Pascal = 38;
-    static constexpr uint32 NV_Pascal_MX = 39;
-    static constexpr uint32 NV_Pascal_Tegra = 40;
-    static constexpr uint32 NV_Volta = 41;
-    static constexpr uint32 NV_Turing_16 = 42;
-    static constexpr uint32 NV_Turing = 43;
-    static constexpr uint32 NV_Turing_MX = 44;
-    static constexpr uint32 NV_Ampere = 45;
-    static constexpr uint32 NV_Ampere_Orin = 46;
-    static constexpr uint32 NV_Ada = 47;
-    static constexpr uint32 Intel_Gen9 = 48;
-    static constexpr uint32 Intel_Gen11 = 49;
-    static constexpr uint32 Intel_Gen12 = 50;
-    static constexpr uint32 PowerVR_Series8XE = 51;
-    static constexpr uint32 PowerVR_Series8XEP = 52;
-    static constexpr uint32 PowerVR_Series8XT = 53;
-    static constexpr uint32 PowerVR_Series9XE = 54;
-    static constexpr uint32 VeriSilicon = 55;
-    static constexpr uint32 V3D_4 = 56;
-    static constexpr uint32 SwiftShader = 57;
+    static constexpr uint32 Adreno_700_QC5X = 7;
+    static constexpr uint32 AMD_GCN1 = 8;
+    static constexpr uint32 AMD_GCN2 = 9;
+    static constexpr uint32 AMD_GCN3 = 10;
+    static constexpr uint32 AMD_GCN4 = 11;
+    static constexpr uint32 AMD_GCN5 = 12;
+    static constexpr uint32 AMD_GCN5_APU = 13;
+    static constexpr uint32 AMD_RDNA1 = 14;
+    static constexpr uint32 AMD_RDNA2 = 15;
+    static constexpr uint32 AMD_RDNA2_APU = 16;
+    static constexpr uint32 AMD_RDNA3 = 17;
+    static constexpr uint32 AMD_RDNA3_APU = 18;
+    static constexpr uint32 Apple_A8 = 19;
+    static constexpr uint32 Apple_A9_A10 = 20;
+    static constexpr uint32 Apple_A11 = 21;
+    static constexpr uint32 Apple_A12 = 22;
+    static constexpr uint32 Apple_A13 = 23;
+    static constexpr uint32 Apple_A14_M1 = 24;
+    static constexpr uint32 Apple_A15_M2 = 25;
+    static constexpr uint32 Apple_A16 = 26;
+    static constexpr uint32 Apple_A17_M3 = 27;
+    static constexpr uint32 Mali_Midgard_Gen2 = 28;
+    static constexpr uint32 Mali_Midgard_Gen3 = 29;
+    static constexpr uint32 Mali_Midgard_Gen4 = 30;
+    static constexpr uint32 Mali_Bifrost_Gen1 = 31;
+    static constexpr uint32 Mali_Bifrost_Gen2 = 32;
+    static constexpr uint32 Mali_Bifrost_Gen3 = 33;
+    static constexpr uint32 Mali_Valhall_Gen1 = 34;
+    static constexpr uint32 Mali_Valhall_Gen2 = 35;
+    static constexpr uint32 Mali_Valhall_Gen3 = 36;
+    static constexpr uint32 Mali_Valhall_Gen4 = 37;
+    static constexpr uint32 Mali_Valhall_Gen5 = 38;
+    static constexpr uint32 NV_Maxwell = 39;
+    static constexpr uint32 NV_Maxwell_Tegra = 40;
+    static constexpr uint32 NV_Pascal = 41;
+    static constexpr uint32 NV_Pascal_MX = 42;
+    static constexpr uint32 NV_Pascal_Tegra = 43;
+    static constexpr uint32 NV_Volta = 44;
+    static constexpr uint32 NV_Turing_16 = 45;
+    static constexpr uint32 NV_Turing = 46;
+    static constexpr uint32 NV_Turing_MX = 47;
+    static constexpr uint32 NV_Ampere = 48;
+    static constexpr uint32 NV_Ampere_Orin = 49;
+    static constexpr uint32 NV_Ada = 50;
+    static constexpr uint32 Intel_Gen9 = 51;
+    static constexpr uint32 Intel_Gen11 = 52;
+    static constexpr uint32 Intel_Gen12 = 53;
+    static constexpr uint32 Intel_Gen12_7 = 54;
+    static constexpr uint32 PowerVR_Series8XE = 55;
+    static constexpr uint32 PowerVR_Series8XEP = 56;
+    static constexpr uint32 PowerVR_Series8XT = 57;
+    static constexpr uint32 PowerVR_Series9XE = 58;
+    static constexpr uint32 VeriSilicon = 59;
+    static constexpr uint32 SwiftShader = 60;
 };
 
 struct EFilter
@@ -2106,8 +2109,7 @@ struct ESamplerUsage
     ESamplerUsage (uint8) {}
     operator uint8 () const;
     static constexpr uint8 Default = 0;
-    static constexpr uint8 Subsampled = 1;
-    static constexpr uint8 SubsampledCoarseReconstruction = 2;
+    static constexpr uint8 NonSeamlessCubeMap = 1;
 };
 
 struct EVertexInputRate
@@ -2133,16 +2135,19 @@ struct EDescSetUsage
 struct EPipelineOpt
 {
     EPipelineOpt () {}
-    EPipelineOpt (uint8) {}
-    operator uint8 () const;
-    static constexpr uint8 Optimize = 1;
-    static constexpr uint8 CS_DispatchBase = 2;
-    static constexpr uint8 RT_NoNullAnyHitShaders = 4;
-    static constexpr uint8 RT_NoNullClosestHitShaders = 8;
-    static constexpr uint8 RT_NoNullMissShaders = 16;
-    static constexpr uint8 RT_NoNullIntersectionShaders = 32;
-    static constexpr uint8 RT_SkipTriangles = 64;
-    static constexpr uint8 RT_SkipAABBs = 128;
+    EPipelineOpt (uint16) {}
+    operator uint16 () const;
+    static constexpr uint16 Optimize = 1;
+    static constexpr uint16 CS_DispatchBase = 2;
+    static constexpr uint16 RT_NoNullAnyHitShaders = 4;
+    static constexpr uint16 RT_NoNullClosestHitShaders = 8;
+    static constexpr uint16 RT_NoNullMissShaders = 16;
+    static constexpr uint16 RT_NoNullIntersectionShaders = 32;
+    static constexpr uint16 RT_SkipTriangles = 64;
+    static constexpr uint16 RT_SkipAABBs = 128;
+    static constexpr uint16 DontCompile = 256;
+    static constexpr uint16 CaptureStatistics = 512;
+    static constexpr uint16 CaptureInternalRepresentation = 1024;
 };
 
 struct EQueueMask
@@ -2343,15 +2348,15 @@ struct RC<RasterFont> : RasterFont
 };
 
 template <>
-struct RC<Material> : Material
+struct RC<ImageAtlas> : ImageAtlas
 {
-    RC (const Material &);
+    RC (const ImageAtlas &);
 };
 
 template <>
-struct RC<Mesh> : Mesh
+struct RC<Texture> : Texture
 {
-    RC (const Mesh &);
+    RC (const Texture &);
 };
 
 template <>
@@ -2361,14 +2366,14 @@ struct RC<Model> : Model
 };
 
 template <>
-struct RC<Texture> : Texture
+struct RC<Mesh> : Mesh
 {
-    RC (const Texture &);
+    RC (const Mesh &);
 };
 
 template <>
-struct RC<ImageAtlas> : ImageAtlas
+struct RC<Material> : Material
 {
-    RC (const ImageAtlas &);
+    RC (const Material &);
 };
 
diff --git a/AE/engine/shared_data/scripts/input_actions.as b/AE/engine/shared_data/scripts/input_actions.as
index bccf421c..6bb31ca6 100644
--- a/AE/engine/shared_data/scripts/input_actions.as
+++ b/AE/engine/shared_data/scripts/input_actions.as
@@ -1,4 +1,4 @@
-//2C45077E
+//eda3b3b4
 #include <vector>
 #include <string>
 
@@ -20,47 +20,47 @@ struct RC;
 template <typename T>
 using array = std::vector<T>;
 
-struct ubyte2;
-struct ubyte3;
-struct EGestureType;
-struct EGestureState;
-struct WinAPI_ActionBindings;
-struct OpenVR_Input;
-struct ubyte4;
-struct VecSwizzle;
-struct Android_ActionBindings;
-struct EValueType;
+struct uint4;
 struct WinAPI_Input;
-struct OpenVR_BindingsMode;
+struct EValueType;
+struct Android_ActionBindings;
+struct VecSwizzle;
+struct GLFW_Input;
+struct int4;
+struct int3;
+struct bool2;
+struct int2;
+struct bool3;
+struct bool4;
+struct short4;
 struct ushort3;
-struct sbyte2;
-struct ushort2;
 struct ActionInfo;
 struct Android_BindingsMode;
-struct short4;
-struct bool4;
-struct int2;
-struct bool3;
-struct int3;
-struct bool2;
-struct GLFW_Input;
-struct int4;
-struct GLFW_BindingsMode;
+struct ushort2;
+struct OpenVR_BindingsMode;
+struct sbyte2;
+struct EGestureType;
+struct ubyte3;
+struct ubyte2;
+struct ubyte4;
+struct WinAPI_ActionBindings;
+struct EGestureState;
+struct OpenVR_Input;
+struct float3;
+struct float2;
+struct OpenVR_ActionBindings;
+struct WinAPI_BindingsMode;
+struct GLFW_ActionBindings;
+struct sbyte3;
+struct sbyte4;
 struct short3;
 struct short2;
 struct ushort4;
-struct sbyte3;
-struct sbyte4;
-struct uint4;
-struct float4;
+struct GLFW_BindingsMode;
 struct uint3;
 struct uint2;
 struct Android_Input;
-struct float2;
-struct float3;
-struct GLFW_ActionBindings;
-struct WinAPI_BindingsMode;
-struct OpenVR_ActionBindings;
+struct float4;
 
 using sbyte = int8;
 using ubyte = uint8;
@@ -1509,7 +1509,7 @@ struct Android_Input
     static constexpr uint16 Delete = 67;
     static constexpr uint16 Grave = 68;
     static constexpr uint16 Minus = 69;
-    static constexpr uint16 Equals = 70;
+    static constexpr uint16 Equal = 70;
     static constexpr uint16 LeftBracket = 71;
     static constexpr uint16 RightBracket = 72;
     static constexpr uint16 BackSlash = 73;
@@ -1787,15 +1787,15 @@ struct OpenVR_ActionBindings
 };
 
 template <>
-struct RC<WinAPI_ActionBindings> : WinAPI_ActionBindings
+struct RC<Android_ActionBindings> : Android_ActionBindings
 {
-    RC (const WinAPI_ActionBindings &);
+    RC (const Android_ActionBindings &);
 };
 
 template <>
-struct RC<Android_ActionBindings> : Android_ActionBindings
+struct RC<Android_BindingsMode> : Android_BindingsMode
 {
-    RC (const Android_ActionBindings &);
+    RC (const Android_BindingsMode &);
 };
 
 template <>
@@ -1805,32 +1805,32 @@ struct RC<OpenVR_BindingsMode> : OpenVR_BindingsMode
 };
 
 template <>
-struct RC<Android_BindingsMode> : Android_BindingsMode
+struct RC<WinAPI_ActionBindings> : WinAPI_ActionBindings
 {
-    RC (const Android_BindingsMode &);
+    RC (const WinAPI_ActionBindings &);
 };
 
 template <>
-struct RC<GLFW_BindingsMode> : GLFW_BindingsMode
+struct RC<OpenVR_ActionBindings> : OpenVR_ActionBindings
 {
-    RC (const GLFW_BindingsMode &);
+    RC (const OpenVR_ActionBindings &);
 };
 
 template <>
-struct RC<GLFW_ActionBindings> : GLFW_ActionBindings
+struct RC<WinAPI_BindingsMode> : WinAPI_BindingsMode
 {
-    RC (const GLFW_ActionBindings &);
+    RC (const WinAPI_BindingsMode &);
 };
 
 template <>
-struct RC<WinAPI_BindingsMode> : WinAPI_BindingsMode
+struct RC<GLFW_ActionBindings> : GLFW_ActionBindings
 {
-    RC (const WinAPI_BindingsMode &);
+    RC (const GLFW_ActionBindings &);
 };
 
 template <>
-struct RC<OpenVR_ActionBindings> : OpenVR_ActionBindings
+struct RC<GLFW_BindingsMode> : GLFW_BindingsMode
 {
-    RC (const OpenVR_ActionBindings &);
+    RC (const GLFW_BindingsMode &);
 };
 
diff --git a/AE/engine/shared_data/scripts/offline_packer.as b/AE/engine/shared_data/scripts/offline_packer.as
index 1f98f5f1..1f380828 100644
--- a/AE/engine/shared_data/scripts/offline_packer.as
+++ b/AE/engine/shared_data/scripts/offline_packer.as
@@ -1,4 +1,4 @@
-//F104D754
+//457d401f
 #include <vector>
 #include <string>
 
@@ -20,37 +20,37 @@ struct RC;
 template <typename T>
 using array = std::vector<T>;
 
-struct int3;
+struct PipelineCompiler;
+struct float2;
+struct float3;
+struct float4;
+struct uint4;
+struct uint2;
+struct uint3;
+struct AssetPacker;
+struct EReflectionFlags;
+struct short2;
+struct ushort4;
+struct short3;
+struct sbyte4;
+struct sbyte3;
+struct sbyte2;
+struct ushort3;
+struct ushort2;
+struct short4;
+struct Archive;
 struct bool2;
+struct int3;
 struct int2;
 struct bool3;
-struct EPathParamsFlags;
 struct int4;
+struct EPathParamsFlags;
 struct bool4;
-struct ushort3;
-struct sbyte2;
-struct ushort2;
-struct short4;
-struct Archive;
-struct InputActions;
+struct ubyte4;
 struct ubyte3;
 struct EFileType;
 struct ubyte2;
-struct ubyte4;
-struct float2;
-struct float3;
-struct PipelineCompiler;
-struct short2;
-struct ushort4;
-struct short3;
-struct sbyte4;
-struct sbyte3;
-struct AssetPacker;
-struct EReflectionFlags;
-struct uint3;
-struct uint2;
-struct float4;
-struct uint4;
+struct InputActions;
 
 using sbyte = int8;
 using ubyte = uint8;
@@ -1098,26 +1098,26 @@ struct Archive
 };
 
 template <>
-struct RC<Archive> : Archive
+struct RC<PipelineCompiler> : PipelineCompiler
 {
-    RC (const Archive &);
+    RC (const PipelineCompiler &);
 };
 
 template <>
-struct RC<InputActions> : InputActions
+struct RC<AssetPacker> : AssetPacker
 {
-    RC (const InputActions &);
+    RC (const AssetPacker &);
 };
 
 template <>
-struct RC<PipelineCompiler> : PipelineCompiler
+struct RC<Archive> : Archive
 {
-    RC (const PipelineCompiler &);
+    RC (const Archive &);
 };
 
 template <>
-struct RC<AssetPacker> : AssetPacker
+struct RC<InputActions> : InputActions
 {
-    RC (const AssetPacker &);
+    RC (const InputActions &);
 };
 
diff --git a/AE/engine/shared_data/scripts/pipeline_compiler.as b/AE/engine/shared_data/scripts/pipeline_compiler.as
index 01b0119b..55a11f18 100644
--- a/AE/engine/shared_data/scripts/pipeline_compiler.as
+++ b/AE/engine/shared_data/scripts/pipeline_compiler.as
@@ -1,4 +1,4 @@
-//9F2C308D
+//dda2b636
 #include <vector>
 #include <string>
 
@@ -20,137 +20,137 @@ struct RC;
 template <typename T>
 using array = std::vector<T>;
 
-struct EBlendFactor;
+struct ComputePipelineSpec;
+struct EPrimitive;
+struct ubyte3;
+struct EGraphicsDeviceID;
+struct RenderState_InputAssemblyState;
+struct ubyte2;
+struct ESubgroupOperation;
+struct RenderState_RasterizationState;
+struct EFormatFeature;
+struct ESamplerYcbcrRange;
+struct ubyte4;
+struct ESamplerUsage;
+struct CompatibleRenderPass;
+struct GlobalConfig;
 struct ERTInstanceOpt;
 struct Shader;
 struct ShaderStructType;
+struct EBlendFactor;
 struct EStencilOp;
-struct EAddressMode;
 struct ECompilationTarget;
-struct RayIndex;
+struct EAddressMode;
 struct RenderState_MultisampleState;
-struct EImage;
+struct RayIndex;
 struct bool2;
 struct bool3;
+struct EImage;
+struct bool4;
 struct RGBA32i;
 struct EVertexType;
-struct bool4;
 struct EBlendOp;
+struct ECullMode;
 struct ELogicOp;
 struct ETessPatch;
-struct ECullMode;
-struct EQueueMask;
+struct EShaderPreprocessor;
 struct RGBA32f;
-struct HSVColor;
 struct RenderState_ColorBuffer_ColorMask;
+struct EQueueMask;
 struct ShaderStructTypeUsage;
-struct ComputePipelineSpec;
-struct EShaderPreprocessor;
-struct EPrimitive;
-struct ESubgroupOperation;
-struct ubyte3;
-struct EGraphicsDeviceID;
-struct ubyte2;
-struct RenderState_InputAssemblyState;
-struct RenderState_RasterizationState;
-struct EFormatFeature;
-struct ESamplerYcbcrRange;
-struct ESamplerUsage;
-struct ubyte4;
-struct CompatibleRenderPass;
-struct GlobalConfig;
-struct EShaderIO;
+struct HSVColor;
+struct ESamplerYcbcrModelConversion;
+struct EAttachment;
+struct short2;
+struct ushort4;
+struct GraphicsPass;
+struct short3;
+struct sbyte4;
+struct sbyte3;
+struct ESubgroupTypes;
+struct Align;
+struct EAccessType;
+struct EIndex;
+struct ComputePipeline;
+struct float4;
 struct EImageAspect;
-struct InstanceIndex;
-struct EPipelineOpt;
+struct EShaderIO;
 struct float2;
 struct float3;
-struct EDescSetUsage;
+struct InstanceIndex;
+struct EPipelineOpt;
 struct EVertexInputRate;
+struct EDescSetUsage;
 struct ESamplerChromaLocation;
 struct DescriptorSetLayout;
+struct EFilter;
 struct EPipelineDynamicState;
 struct RenderState_StencilBufferState;
-struct EFilter;
-struct MultiSamples;
 struct RayTracingPipeline;
-struct RayTracingShaderBinding;
 struct RenderTechnique;
-struct EAttachment;
-struct ESamplerYcbcrModelConversion;
-struct sbyte4;
-struct sbyte3;
-struct ushort4;
-struct short2;
-struct short3;
-struct ESubgroupTypes;
-struct GraphicsPass;
-struct Align;
-struct EIndex;
-struct ComputePipeline;
-struct EAccessType;
-struct float4;
+struct MultiSamples;
+struct RayTracingShaderBinding;
+struct AttachmentSpec;
+struct DepthStencil;
+struct RenderState;
+struct RenderState_ColorBuffersState;
+struct RayTracingPipelineSpec;
+struct EReductionMode;
+struct ESurfaceFormat;
+struct EShaderVersion;
+struct MipmapLevel;
 struct EValueType;
 struct ETessSpacing;
-struct TilePipeline;
 struct TilePipelineSpec;
+struct TilePipeline;
 struct EAttachmentLoadOp;
 struct EPolygonMode;
-struct ImageLayer;
-struct int4;
 struct int3;
 struct ArraySize;
 struct int2;
-struct PipelineLayout;
+struct int4;
+struct ImageLayer;
 struct GraphicsPipelineSpec;
-struct short4;
-struct EPixelFormat;
+struct PipelineLayout;
 struct sbyte2;
 struct ushort3;
 struct ushort2;
-struct RenderState_ColorBuffer;
+struct short4;
+struct EPixelFormat;
 struct RenderPass;
-struct AttachmentSpec;
-struct RenderState;
-struct DepthStencil;
-struct RenderState_ColorBuffersState;
-struct RayTracingPipelineSpec;
-struct EReductionMode;
-struct ESurfaceFormat;
-struct MipmapLevel;
-struct EShaderVersion;
-struct MeshPipeline;
-struct EVendorID;
-struct EResourceState;
-struct ComputePass;
-struct NamedRenderState;
-struct FeatureSet;
-struct VertexDivisor;
-struct EAttachmentStoreOp;
-struct EBorderColor;
-struct EImageType;
-struct Sampler;
-struct MeshPipelineSpec;
-struct GraphicsPipeline;
-struct CallableIndex;
-struct EShaderOpt;
-struct EFeature;
-struct EMipmapFilter;
-struct VertexBufferInput;
+struct RenderState_ColorBuffer;
 struct RGBA8u;
+struct VertexBufferInput;
+struct EMipmapFilter;
 struct EStructLayout;
-struct RGBA32u;
 struct Attachment;
+struct RGBA32u;
 struct uint2;
-struct ShaderIO;
-struct EMutableRenderState;
 struct uint3;
+struct EMutableRenderState;
+struct ShaderIO;
+struct EShader;
 struct EShaderStages;
 struct RenderState_DepthBufferState;
-struct EShader;
-struct RenderState_StencilFaceState;
 struct ECompareOp;
+struct RenderState_StencilFaceState;
 struct uint4;
+struct EVendorID;
+struct MeshPipeline;
+struct FeatureSet;
+struct EResourceState;
+struct NamedRenderState;
+struct ComputePass;
+struct EAttachmentStoreOp;
+struct EImageType;
+struct VertexDivisor;
+struct EBorderColor;
+struct Sampler;
+struct EShaderOpt;
+struct GraphicsPipeline;
+struct MeshPipelineSpec;
+struct CallableIndex;
+struct EFeature;
 
 using sbyte = int8;
 using ubyte = uint8;
@@ -1987,57 +1987,60 @@ struct EGraphicsDeviceID
     static constexpr uint32 Adreno_600_QC5 = 4;
     static constexpr uint32 Adreno_700_SC3 = 5;
     static constexpr uint32 Adreno_700_DC4_SC5 = 6;
-    static constexpr uint32 AMD_GCN1 = 7;
-    static constexpr uint32 AMD_GCN2 = 8;
-    static constexpr uint32 AMD_GCN3 = 9;
-    static constexpr uint32 AMD_GCN4 = 10;
-    static constexpr uint32 AMD_GCN5 = 11;
-    static constexpr uint32 AMD_GCN5_APU = 12;
-    static constexpr uint32 AMD_RDNA1 = 13;
-    static constexpr uint32 AMD_RDNA2 = 14;
-    static constexpr uint32 AMD_RDNA2_APU = 15;
-    static constexpr uint32 AMD_RDNA3 = 16;
-    static constexpr uint32 AMD_RDNA3_APU = 17;
-    static constexpr uint32 Apple_A8 = 18;
-    static constexpr uint32 Apple_A9_A10 = 19;
-    static constexpr uint32 Apple_A11 = 20;
-    static constexpr uint32 Apple_A12 = 21;
-    static constexpr uint32 Apple_A13 = 22;
-    static constexpr uint32 Apple_A14_M1 = 23;
-    static constexpr uint32 Apple_A15_M2 = 24;
-    static constexpr uint32 Apple_A16 = 25;
-    static constexpr uint32 Mali_Midgard_Gen2 = 26;
-    static constexpr uint32 Mali_Midgard_Gen3 = 27;
-    static constexpr uint32 Mali_Midgard_Gen4 = 28;
-    static constexpr uint32 Mali_Bifrost_Gen1 = 29;
-    static constexpr uint32 Mali_Bifrost_Gen2 = 30;
-    static constexpr uint32 Mali_Bifrost_Gen3 = 31;
-    static constexpr uint32 Mali_Valhall_Gen1 = 32;
-    static constexpr uint32 Mali_Valhall_Gen2 = 33;
-    static constexpr uint32 Mali_Valhall_Gen3 = 34;
-    static constexpr uint32 Mali_Valhall_Gen4 = 35;
-    static constexpr uint32 NV_Maxwell = 36;
-    static constexpr uint32 NV_Maxwell_Tegra = 37;
-    static constexpr uint32 NV_Pascal = 38;
-    static constexpr uint32 NV_Pascal_MX = 39;
-    static constexpr uint32 NV_Pascal_Tegra = 40;
-    static constexpr uint32 NV_Volta = 41;
-    static constexpr uint32 NV_Turing_16 = 42;
-    static constexpr uint32 NV_Turing = 43;
-    static constexpr uint32 NV_Turing_MX = 44;
-    static constexpr uint32 NV_Ampere = 45;
-    static constexpr uint32 NV_Ampere_Orin = 46;
-    static constexpr uint32 NV_Ada = 47;
-    static constexpr uint32 Intel_Gen9 = 48;
-    static constexpr uint32 Intel_Gen11 = 49;
-    static constexpr uint32 Intel_Gen12 = 50;
-    static constexpr uint32 PowerVR_Series8XE = 51;
-    static constexpr uint32 PowerVR_Series8XEP = 52;
-    static constexpr uint32 PowerVR_Series8XT = 53;
-    static constexpr uint32 PowerVR_Series9XE = 54;
-    static constexpr uint32 VeriSilicon = 55;
-    static constexpr uint32 V3D_4 = 56;
-    static constexpr uint32 SwiftShader = 57;
+    static constexpr uint32 Adreno_700_QC5X = 7;
+    static constexpr uint32 AMD_GCN1 = 8;
+    static constexpr uint32 AMD_GCN2 = 9;
+    static constexpr uint32 AMD_GCN3 = 10;
+    static constexpr uint32 AMD_GCN4 = 11;
+    static constexpr uint32 AMD_GCN5 = 12;
+    static constexpr uint32 AMD_GCN5_APU = 13;
+    static constexpr uint32 AMD_RDNA1 = 14;
+    static constexpr uint32 AMD_RDNA2 = 15;
+    static constexpr uint32 AMD_RDNA2_APU = 16;
+    static constexpr uint32 AMD_RDNA3 = 17;
+    static constexpr uint32 AMD_RDNA3_APU = 18;
+    static constexpr uint32 Apple_A8 = 19;
+    static constexpr uint32 Apple_A9_A10 = 20;
+    static constexpr uint32 Apple_A11 = 21;
+    static constexpr uint32 Apple_A12 = 22;
+    static constexpr uint32 Apple_A13 = 23;
+    static constexpr uint32 Apple_A14_M1 = 24;
+    static constexpr uint32 Apple_A15_M2 = 25;
+    static constexpr uint32 Apple_A16 = 26;
+    static constexpr uint32 Apple_A17_M3 = 27;
+    static constexpr uint32 Mali_Midgard_Gen2 = 28;
+    static constexpr uint32 Mali_Midgard_Gen3 = 29;
+    static constexpr uint32 Mali_Midgard_Gen4 = 30;
+    static constexpr uint32 Mali_Bifrost_Gen1 = 31;
+    static constexpr uint32 Mali_Bifrost_Gen2 = 32;
+    static constexpr uint32 Mali_Bifrost_Gen3 = 33;
+    static constexpr uint32 Mali_Valhall_Gen1 = 34;
+    static constexpr uint32 Mali_Valhall_Gen2 = 35;
+    static constexpr uint32 Mali_Valhall_Gen3 = 36;
+    static constexpr uint32 Mali_Valhall_Gen4 = 37;
+    static constexpr uint32 Mali_Valhall_Gen5 = 38;
+    static constexpr uint32 NV_Maxwell = 39;
+    static constexpr uint32 NV_Maxwell_Tegra = 40;
+    static constexpr uint32 NV_Pascal = 41;
+    static constexpr uint32 NV_Pascal_MX = 42;
+    static constexpr uint32 NV_Pascal_Tegra = 43;
+    static constexpr uint32 NV_Volta = 44;
+    static constexpr uint32 NV_Turing_16 = 45;
+    static constexpr uint32 NV_Turing = 46;
+    static constexpr uint32 NV_Turing_MX = 47;
+    static constexpr uint32 NV_Ampere = 48;
+    static constexpr uint32 NV_Ampere_Orin = 49;
+    static constexpr uint32 NV_Ada = 50;
+    static constexpr uint32 Intel_Gen9 = 51;
+    static constexpr uint32 Intel_Gen11 = 52;
+    static constexpr uint32 Intel_Gen12 = 53;
+    static constexpr uint32 Intel_Gen12_7 = 54;
+    static constexpr uint32 PowerVR_Series8XE = 55;
+    static constexpr uint32 PowerVR_Series8XEP = 56;
+    static constexpr uint32 PowerVR_Series8XT = 57;
+    static constexpr uint32 PowerVR_Series9XE = 58;
+    static constexpr uint32 VeriSilicon = 59;
+    static constexpr uint32 SwiftShader = 60;
 };
 
 struct EFilter
@@ -2102,8 +2105,7 @@ struct ESamplerUsage
     ESamplerUsage (uint8) {}
     operator uint8 () const;
     static constexpr uint8 Default = 0;
-    static constexpr uint8 Subsampled = 1;
-    static constexpr uint8 SubsampledCoarseReconstruction = 2;
+    static constexpr uint8 NonSeamlessCubeMap = 1;
 };
 
 struct EVertexInputRate
@@ -2129,16 +2131,19 @@ struct EDescSetUsage
 struct EPipelineOpt
 {
     EPipelineOpt () {}
-    EPipelineOpt (uint8) {}
-    operator uint8 () const;
-    static constexpr uint8 Optimize = 1;
-    static constexpr uint8 CS_DispatchBase = 2;
-    static constexpr uint8 RT_NoNullAnyHitShaders = 4;
-    static constexpr uint8 RT_NoNullClosestHitShaders = 8;
-    static constexpr uint8 RT_NoNullMissShaders = 16;
-    static constexpr uint8 RT_NoNullIntersectionShaders = 32;
-    static constexpr uint8 RT_SkipTriangles = 64;
-    static constexpr uint8 RT_SkipAABBs = 128;
+    EPipelineOpt (uint16) {}
+    operator uint16 () const;
+    static constexpr uint16 Optimize = 1;
+    static constexpr uint16 CS_DispatchBase = 2;
+    static constexpr uint16 RT_NoNullAnyHitShaders = 4;
+    static constexpr uint16 RT_NoNullClosestHitShaders = 8;
+    static constexpr uint16 RT_NoNullMissShaders = 16;
+    static constexpr uint16 RT_NoNullIntersectionShaders = 32;
+    static constexpr uint16 RT_SkipTriangles = 64;
+    static constexpr uint16 RT_SkipAABBs = 128;
+    static constexpr uint16 DontCompile = 256;
+    static constexpr uint16 CaptureStatistics = 512;
+    static constexpr uint16 CaptureInternalRepresentation = 1024;
 };
 
 struct EQueueMask
@@ -2402,6 +2407,7 @@ struct EShaderVersion
 
     // Added mesh shading.
     static constexpr uint32 Metal_3_0 = 1073741872;
+    static constexpr uint32 Metal_3_1 = 1073741873;
 
     // Compile for iOS.
     static constexpr uint32 Metal_iOS_2_0 = 536870944;
@@ -2410,6 +2416,7 @@ struct EShaderVersion
     static constexpr uint32 Metal_iOS_2_3 = 536870947;
     static constexpr uint32 Metal_iOS_2_4 = 536870948;
     static constexpr uint32 Metal_iOS_3_0 = 536870960;
+    static constexpr uint32 Metal_iOS_3_1 = 536870961;
 
     // Compile for MacOS.
     static constexpr uint32 Metal_Mac_2_0 = 805306400;
@@ -2418,6 +2425,7 @@ struct EShaderVersion
     static constexpr uint32 Metal_Mac_2_3 = 805306403;
     static constexpr uint32 Metal_Mac_2_4 = 805306404;
     static constexpr uint32 Metal_Mac_3_0 = 805306416;
+    static constexpr uint32 Metal_Mac_3_1 = 805306417;
 };
 
 struct EShaderOpt
@@ -2774,6 +2782,7 @@ struct FeatureSet
     void  shaderSubgroupClock (EFeature);
     void  shaderDeviceClock (EFeature);
     void  cooperativeMatrix (EFeature);
+    void  cooperativeMatrixStages (uint);
     void  shaderClipDistance (EFeature);
     void  shaderCullDistance (EFeature);
     void  shaderResourceMinLod (EFeature);
@@ -2897,6 +2906,7 @@ struct FeatureSet
     void  filterMinmaxImageComponentMapping (EFeature);
     void  samplerMipLodBias (EFeature);
     void  samplerYcbcrConversion (EFeature);
+    void  nonSeamlessCubeMap (EFeature);
     void  maxSamplerAnisotropy (float);
     void  maxSamplerLodBias (float);
     void  maxFramebufferLayers (uint);
@@ -4123,6 +4133,18 @@ const string Sampler_Anisotropy8Clamp;
 const string Sampler_Anisotropy16Repeat;
 const string Sampler_Anisotropy16MirrorRepeat;
 const string Sampler_Anisotropy16Clamp;
+template <>
+struct RC<ComputePipelineSpec> : ComputePipelineSpec
+{
+    RC (const ComputePipelineSpec &);
+};
+
+template <>
+struct RC<CompatibleRenderPass> : CompatibleRenderPass
+{
+    RC (const CompatibleRenderPass &);
+};
+
 template <>
 struct RC<Shader> : Shader
 {
@@ -4136,15 +4158,15 @@ struct RC<ShaderStructType> : ShaderStructType
 };
 
 template <>
-struct RC<ComputePipelineSpec> : ComputePipelineSpec
+struct RC<GraphicsPass> : GraphicsPass
 {
-    RC (const ComputePipelineSpec &);
+    RC (const GraphicsPass &);
 };
 
 template <>
-struct RC<CompatibleRenderPass> : CompatibleRenderPass
+struct RC<ComputePipeline> : ComputePipeline
 {
-    RC (const CompatibleRenderPass &);
+    RC (const ComputePipeline &);
 };
 
 template <>
@@ -4159,12 +4181,6 @@ struct RC<RayTracingPipeline> : RayTracingPipeline
     RC (const RayTracingPipeline &);
 };
 
-template <>
-struct RC<RayTracingShaderBinding> : RayTracingShaderBinding
-{
-    RC (const RayTracingShaderBinding &);
-};
-
 template <>
 struct RC<RenderTechnique> : RenderTechnique
 {
@@ -4172,21 +4188,21 @@ struct RC<RenderTechnique> : RenderTechnique
 };
 
 template <>
-struct RC<GraphicsPass> : GraphicsPass
+struct RC<RayTracingShaderBinding> : RayTracingShaderBinding
 {
-    RC (const GraphicsPass &);
+    RC (const RayTracingShaderBinding &);
 };
 
 template <>
-struct RC<ComputePipeline> : ComputePipeline
+struct RC<AttachmentSpec> : AttachmentSpec
 {
-    RC (const ComputePipeline &);
+    RC (const AttachmentSpec &);
 };
 
 template <>
-struct RC<TilePipeline> : TilePipeline
+struct RC<RayTracingPipelineSpec> : RayTracingPipelineSpec
 {
-    RC (const TilePipeline &);
+    RC (const RayTracingPipelineSpec &);
 };
 
 template <>
@@ -4196,9 +4212,9 @@ struct RC<TilePipelineSpec> : TilePipelineSpec
 };
 
 template <>
-struct RC<PipelineLayout> : PipelineLayout
+struct RC<TilePipeline> : TilePipeline
 {
-    RC (const PipelineLayout &);
+    RC (const TilePipeline &);
 };
 
 template <>
@@ -4207,6 +4223,12 @@ struct RC<GraphicsPipelineSpec> : GraphicsPipelineSpec
     RC (const GraphicsPipelineSpec &);
 };
 
+template <>
+struct RC<PipelineLayout> : PipelineLayout
+{
+    RC (const PipelineLayout &);
+};
+
 template <>
 struct RC<RenderPass> : RenderPass
 {
@@ -4214,15 +4236,15 @@ struct RC<RenderPass> : RenderPass
 };
 
 template <>
-struct RC<AttachmentSpec> : AttachmentSpec
+struct RC<VertexBufferInput> : VertexBufferInput
 {
-    RC (const AttachmentSpec &);
+    RC (const VertexBufferInput &);
 };
 
 template <>
-struct RC<RayTracingPipelineSpec> : RayTracingPipelineSpec
+struct RC<Attachment> : Attachment
 {
-    RC (const RayTracingPipelineSpec &);
+    RC (const Attachment &);
 };
 
 template <>
@@ -4232,9 +4254,9 @@ struct RC<MeshPipeline> : MeshPipeline
 };
 
 template <>
-struct RC<ComputePass> : ComputePass
+struct RC<FeatureSet> : FeatureSet
 {
-    RC (const ComputePass &);
+    RC (const FeatureSet &);
 };
 
 template <>
@@ -4244,9 +4266,9 @@ struct RC<NamedRenderState> : NamedRenderState
 };
 
 template <>
-struct RC<FeatureSet> : FeatureSet
+struct RC<ComputePass> : ComputePass
 {
-    RC (const FeatureSet &);
+    RC (const ComputePass &);
 };
 
 template <>
@@ -4255,12 +4277,6 @@ struct RC<Sampler> : Sampler
     RC (const Sampler &);
 };
 
-template <>
-struct RC<MeshPipelineSpec> : MeshPipelineSpec
-{
-    RC (const MeshPipelineSpec &);
-};
-
 template <>
 struct RC<GraphicsPipeline> : GraphicsPipeline
 {
@@ -4268,14 +4284,8 @@ struct RC<GraphicsPipeline> : GraphicsPipeline
 };
 
 template <>
-struct RC<VertexBufferInput> : VertexBufferInput
-{
-    RC (const VertexBufferInput &);
-};
-
-template <>
-struct RC<Attachment> : Attachment
+struct RC<MeshPipelineSpec> : MeshPipelineSpec
 {
-    RC (const Attachment &);
+    RC (const MeshPipelineSpec &);
 };
 
diff --git a/AE/engine/shared_data/scripts/res_editor.as b/AE/engine/shared_data/scripts/res_editor.as
index f0fae09f..e8ecf527 100644
--- a/AE/engine/shared_data/scripts/res_editor.as
+++ b/AE/engine/shared_data/scripts/res_editor.as
@@ -1,4 +1,4 @@
-//F2DCA70E
+//e9eee8b5
 #include <vector>
 #include <string>
 
@@ -20,163 +20,163 @@ struct RC;
 template <typename T>
 using array = std::vector<T>;
 
+struct EAddressMode;
+struct Collection;
+struct RayIndex;
+struct RTScene;
+struct EPassFlags;
+struct EBlendFactor;
+struct ERTInstanceOpt;
+struct EStencilOp;
 struct EBlendOp;
-struct RGBA8u;
+struct ECullMode;
+struct RGBA32f;
+struct EQueueMask;
+struct DbgViewFlags;
+struct HSVColor;
 struct ELogicOp;
-struct EMipmapFilter;
-struct OrbitalCamera;
-struct UnifiedGeometry_DrawMeshTasksIndirectCount;
-struct RGBA32u;
-struct UnifiedGeometry_DrawMeshTasks;
-struct RectF;
-struct SphericalCube;
-struct EShader;
-struct DynamicFloat;
-struct EShaderStages;
-struct RTInstanceMask;
-struct uint3;
-struct uint2;
-struct RectI;
-struct RectU;
-struct EColorSpace;
-struct uint4;
-struct FPSCamera;
-struct ECompareOp;
-struct DynamicDim;
-struct RayTracingPass;
-struct EResourceState;
-struct UnifiedGeometry_DrawMeshTasksIndirect;
-struct ComputePass;
-struct EVendorID;
-struct Postprocess;
-struct SceneRayTracingPass;
-struct EImageType;
-struct EAttachmentStoreOp;
-struct UnifiedGeometry;
-struct EBorderColor;
-struct UnifiedGeometry_DrawIndirectCount;
-struct EFeature;
-struct CallableIndex;
-struct Buffer;
-struct DepthStencil;
-struct TopDownCamera;
-struct ScaleBiasCamera;
-struct EReductionMode;
-struct BaseController;
-struct MipmapLevel;
-struct FlightCamera;
-struct ESurfaceFormat;
-struct float3x4;
-struct Model;
-struct float3x3;
-struct float3x2;
-struct float4x3;
-struct EPolygonMode;
-struct EAttachmentLoadOp;
-struct DynamicUInt;
-struct float4x2;
-struct float4x4;
-struct int2;
-struct int3;
-struct int4;
-struct ImageLayer;
-struct Scene;
-struct ushort2;
-struct sbyte2;
-struct ushort3;
-struct EPixelFormat;
-struct short4;
-struct UnifiedGeometry_DrawIndexed;
-struct short3;
-struct Random;
-struct short2;
-struct ushort4;
-struct sbyte3;
-struct sbyte4;
-struct ESamplerYcbcrModelConversion;
-struct ScriptFlags;
-struct UnifiedGeometry_DrawIndexedIndirectCount;
-struct Image;
-struct ESubgroupTypes;
-struct GeomSource;
-struct UnifiedGeometry_DrawIndirect;
-struct DynamicInt3;
-struct DynamicInt2;
-struct EIndex;
-struct DynamicInt4;
-struct RTShader;
-struct DynamicUInt2;
-struct DynamicUInt3;
-struct DynamicFloat4;
-struct EPostprocess;
-struct float4;
-struct DynamicFloat3;
-struct ImageLoadOpFlags;
-struct DynamicUInt4;
-struct RTGeometry;
-struct DynamicFloat2;
-struct float3;
+struct DynamicULong;
+struct EImage;
+struct bool2;
+struct bool3;
+struct RGBA32i;
+struct EVertexType;
+struct SceneGraphicsPass;
+struct bool4;
+struct VideoImage;
+struct ESubgroupOperation;
+struct ubyte3;
+struct EGraphicsDeviceID;
+struct FPVCamera;
+struct ubyte2;
+struct Random_Normal4;
+struct Random_Normal3;
+struct Random_Normal1;
+struct UnifiedGeometry_Draw;
+struct Random_Normal2;
+struct EPrimitive;
+struct RTInstanceSBTOffset;
+struct ESamplerYcbcrRange;
+struct ubyte4;
+struct RTInstanceCustomIndex;
+struct ESamplerUsage;
+struct EDescSetUsage;
+struct EVertexInputRate;
+struct EShaderIO;
+struct EImageAspect;
+struct RTInstanceTransform;
+struct ERenderLayer;
+struct InstanceIndex;
 struct float2;
 struct EPipelineOpt;
+struct float3;
+struct EPipelineDynamicState;
 struct DynamicInt;
-struct InstanceIndex;
-struct ERenderLayer;
-struct RTInstanceTransform;
-struct EImageAspect;
-struct EShaderIO;
-struct EVertexInputRate;
-struct EDescSetUsage;
-struct float2x4;
+struct EFilter;
+struct Random_Binomial4;
+struct Random_Binomial2;
+struct MultiSamples;
+struct IPass;
+struct Random_Binomial1;
+struct Random_Binomial3;
+struct ESamplerChromaLocation;
 struct float2x2;
 struct float2x3;
+struct float2x4;
 struct UnifiedGeometry_DrawIndexedIndirect;
-struct ESamplerChromaLocation;
-struct Random_Binomial3;
-struct Random_Binomial1;
-struct IPass;
-struct MultiSamples;
-struct Random_Binomial2;
-struct Random_Binomial4;
-struct EFilter;
-struct EPipelineDynamicState;
-struct EPrimitive;
-struct Random_Normal1;
-struct Random_Normal2;
-struct UnifiedGeometry_Draw;
-struct Random_Normal3;
-struct Random_Normal4;
-struct ubyte2;
-struct ubyte3;
-struct EGraphicsDeviceID;
-struct FPVCamera;
-struct ESubgroupOperation;
-struct VideoImage;
-struct RTInstanceCustomIndex;
-struct ubyte4;
-struct ESamplerUsage;
-struct ESamplerYcbcrRange;
-struct RTInstanceSBTOffset;
-struct EStencilOp;
-struct DbgViewFlags;
-struct ERTInstanceOpt;
-struct EBlendFactor;
-struct RayIndex;
-struct RTScene;
-struct EPassFlags;
-struct Collection;
-struct EAddressMode;
-struct bool4;
-struct SceneGraphicsPass;
-struct EVertexType;
-struct RGBA32i;
-struct bool3;
-struct bool2;
-struct EImage;
-struct DynamicULong;
-struct HSVColor;
-struct RGBA32f;
-struct EQueueMask;
-struct ECullMode;
+struct ESubgroupTypes;
+struct UnifiedGeometry_DrawIndexedIndirectCount;
+struct Image;
+struct ScriptFlags;
+struct ESamplerYcbcrModelConversion;
+struct sbyte4;
+struct sbyte3;
+struct short2;
+struct ushort4;
+struct short3;
+struct Random;
+struct DynamicFloat2;
+struct UnifiedGeometry_DrawIndexed;
+struct RTGeometry;
+struct DynamicUInt4;
+struct DynamicFloat3;
+struct float4;
+struct ImageLoadOpFlags;
+struct EPostprocess;
+struct DynamicFloat4;
+struct DynamicUInt3;
+struct RTShader;
+struct DynamicUInt2;
+struct EIndex;
+struct DynamicInt4;
+struct DynamicInt2;
+struct DynamicInt3;
+struct UnifiedGeometry_DrawIndirect;
+struct GeomSource;
+struct float4x2;
+struct float4x4;
+struct DynamicUInt;
+struct EAttachmentLoadOp;
+struct EPolygonMode;
+struct float4x3;
+struct float3x2;
+struct float3x3;
+struct Model;
+struct float3x4;
+struct short4;
+struct EPixelFormat;
+struct ushort3;
+struct sbyte2;
+struct ushort2;
+struct Scene;
+struct ImageLayer;
+struct int4;
+struct int3;
+struct int2;
+struct DepthStencil;
+struct ESurfaceFormat;
+struct MipmapLevel;
+struct FlightCamera;
+struct BaseController;
+struct EReductionMode;
+struct ScaleBiasCamera;
+struct TopDownCamera;
+struct EBorderColor;
+struct EAttachmentStoreOp;
+struct UnifiedGeometry;
+struct EImageType;
+struct SceneRayTracingPass;
+struct EVendorID;
+struct Postprocess;
+struct EResourceState;
+struct UnifiedGeometry_DrawMeshTasksIndirect;
+struct ComputePass;
+struct Buffer;
+struct CallableIndex;
+struct EFeature;
+struct UnifiedGeometry_DrawIndirectCount;
+struct RectF;
+struct SphericalCube;
+struct RGBA32u;
+struct UnifiedGeometry_DrawMeshTasks;
+struct UnifiedGeometry_DrawMeshTasksIndirectCount;
+struct OrbitalCamera;
+struct EMipmapFilter;
+struct RGBA8u;
+struct DynamicDim;
+struct ECompareOp;
+struct FPSCamera;
+struct RayTracingPass;
+struct EColorSpace;
+struct uint4;
+struct RectU;
+struct RectI;
+struct uint3;
+struct uint2;
+struct EShaderStages;
+struct RTInstanceMask;
+struct EShader;
+struct DynamicFloat;
 
 struct EImageType
 {
@@ -2359,57 +2359,60 @@ struct EGraphicsDeviceID
     static constexpr uint32 Adreno_600_QC5 = 4;
     static constexpr uint32 Adreno_700_SC3 = 5;
     static constexpr uint32 Adreno_700_DC4_SC5 = 6;
-    static constexpr uint32 AMD_GCN1 = 7;
-    static constexpr uint32 AMD_GCN2 = 8;
-    static constexpr uint32 AMD_GCN3 = 9;
-    static constexpr uint32 AMD_GCN4 = 10;
-    static constexpr uint32 AMD_GCN5 = 11;
-    static constexpr uint32 AMD_GCN5_APU = 12;
-    static constexpr uint32 AMD_RDNA1 = 13;
-    static constexpr uint32 AMD_RDNA2 = 14;
-    static constexpr uint32 AMD_RDNA2_APU = 15;
-    static constexpr uint32 AMD_RDNA3 = 16;
-    static constexpr uint32 AMD_RDNA3_APU = 17;
-    static constexpr uint32 Apple_A8 = 18;
-    static constexpr uint32 Apple_A9_A10 = 19;
-    static constexpr uint32 Apple_A11 = 20;
-    static constexpr uint32 Apple_A12 = 21;
-    static constexpr uint32 Apple_A13 = 22;
-    static constexpr uint32 Apple_A14_M1 = 23;
-    static constexpr uint32 Apple_A15_M2 = 24;
-    static constexpr uint32 Apple_A16 = 25;
-    static constexpr uint32 Mali_Midgard_Gen2 = 26;
-    static constexpr uint32 Mali_Midgard_Gen3 = 27;
-    static constexpr uint32 Mali_Midgard_Gen4 = 28;
-    static constexpr uint32 Mali_Bifrost_Gen1 = 29;
-    static constexpr uint32 Mali_Bifrost_Gen2 = 30;
-    static constexpr uint32 Mali_Bifrost_Gen3 = 31;
-    static constexpr uint32 Mali_Valhall_Gen1 = 32;
-    static constexpr uint32 Mali_Valhall_Gen2 = 33;
-    static constexpr uint32 Mali_Valhall_Gen3 = 34;
-    static constexpr uint32 Mali_Valhall_Gen4 = 35;
-    static constexpr uint32 NV_Maxwell = 36;
-    static constexpr uint32 NV_Maxwell_Tegra = 37;
-    static constexpr uint32 NV_Pascal = 38;
-    static constexpr uint32 NV_Pascal_MX = 39;
-    static constexpr uint32 NV_Pascal_Tegra = 40;
-    static constexpr uint32 NV_Volta = 41;
-    static constexpr uint32 NV_Turing_16 = 42;
-    static constexpr uint32 NV_Turing = 43;
-    static constexpr uint32 NV_Turing_MX = 44;
-    static constexpr uint32 NV_Ampere = 45;
-    static constexpr uint32 NV_Ampere_Orin = 46;
-    static constexpr uint32 NV_Ada = 47;
-    static constexpr uint32 Intel_Gen9 = 48;
-    static constexpr uint32 Intel_Gen11 = 49;
-    static constexpr uint32 Intel_Gen12 = 50;
-    static constexpr uint32 PowerVR_Series8XE = 51;
-    static constexpr uint32 PowerVR_Series8XEP = 52;
-    static constexpr uint32 PowerVR_Series8XT = 53;
-    static constexpr uint32 PowerVR_Series9XE = 54;
-    static constexpr uint32 VeriSilicon = 55;
-    static constexpr uint32 V3D_4 = 56;
-    static constexpr uint32 SwiftShader = 57;
+    static constexpr uint32 Adreno_700_QC5X = 7;
+    static constexpr uint32 AMD_GCN1 = 8;
+    static constexpr uint32 AMD_GCN2 = 9;
+    static constexpr uint32 AMD_GCN3 = 10;
+    static constexpr uint32 AMD_GCN4 = 11;
+    static constexpr uint32 AMD_GCN5 = 12;
+    static constexpr uint32 AMD_GCN5_APU = 13;
+    static constexpr uint32 AMD_RDNA1 = 14;
+    static constexpr uint32 AMD_RDNA2 = 15;
+    static constexpr uint32 AMD_RDNA2_APU = 16;
+    static constexpr uint32 AMD_RDNA3 = 17;
+    static constexpr uint32 AMD_RDNA3_APU = 18;
+    static constexpr uint32 Apple_A8 = 19;
+    static constexpr uint32 Apple_A9_A10 = 20;
+    static constexpr uint32 Apple_A11 = 21;
+    static constexpr uint32 Apple_A12 = 22;
+    static constexpr uint32 Apple_A13 = 23;
+    static constexpr uint32 Apple_A14_M1 = 24;
+    static constexpr uint32 Apple_A15_M2 = 25;
+    static constexpr uint32 Apple_A16 = 26;
+    static constexpr uint32 Apple_A17_M3 = 27;
+    static constexpr uint32 Mali_Midgard_Gen2 = 28;
+    static constexpr uint32 Mali_Midgard_Gen3 = 29;
+    static constexpr uint32 Mali_Midgard_Gen4 = 30;
+    static constexpr uint32 Mali_Bifrost_Gen1 = 31;
+    static constexpr uint32 Mali_Bifrost_Gen2 = 32;
+    static constexpr uint32 Mali_Bifrost_Gen3 = 33;
+    static constexpr uint32 Mali_Valhall_Gen1 = 34;
+    static constexpr uint32 Mali_Valhall_Gen2 = 35;
+    static constexpr uint32 Mali_Valhall_Gen3 = 36;
+    static constexpr uint32 Mali_Valhall_Gen4 = 37;
+    static constexpr uint32 Mali_Valhall_Gen5 = 38;
+    static constexpr uint32 NV_Maxwell = 39;
+    static constexpr uint32 NV_Maxwell_Tegra = 40;
+    static constexpr uint32 NV_Pascal = 41;
+    static constexpr uint32 NV_Pascal_MX = 42;
+    static constexpr uint32 NV_Pascal_Tegra = 43;
+    static constexpr uint32 NV_Volta = 44;
+    static constexpr uint32 NV_Turing_16 = 45;
+    static constexpr uint32 NV_Turing = 46;
+    static constexpr uint32 NV_Turing_MX = 47;
+    static constexpr uint32 NV_Ampere = 48;
+    static constexpr uint32 NV_Ampere_Orin = 49;
+    static constexpr uint32 NV_Ada = 50;
+    static constexpr uint32 Intel_Gen9 = 51;
+    static constexpr uint32 Intel_Gen11 = 52;
+    static constexpr uint32 Intel_Gen12 = 53;
+    static constexpr uint32 Intel_Gen12_7 = 54;
+    static constexpr uint32 PowerVR_Series8XE = 55;
+    static constexpr uint32 PowerVR_Series8XEP = 56;
+    static constexpr uint32 PowerVR_Series8XT = 57;
+    static constexpr uint32 PowerVR_Series9XE = 58;
+    static constexpr uint32 VeriSilicon = 59;
+    static constexpr uint32 SwiftShader = 60;
 };
 
 struct EFilter
@@ -2474,8 +2477,7 @@ struct ESamplerUsage
     ESamplerUsage (uint8) {}
     operator uint8 () const;
     static constexpr uint8 Default = 0;
-    static constexpr uint8 Subsampled = 1;
-    static constexpr uint8 SubsampledCoarseReconstruction = 2;
+    static constexpr uint8 NonSeamlessCubeMap = 1;
 };
 
 struct EVertexInputRate
@@ -2501,16 +2503,19 @@ struct EDescSetUsage
 struct EPipelineOpt
 {
     EPipelineOpt () {}
-    EPipelineOpt (uint8) {}
-    operator uint8 () const;
-    static constexpr uint8 Optimize = 1;
-    static constexpr uint8 CS_DispatchBase = 2;
-    static constexpr uint8 RT_NoNullAnyHitShaders = 4;
-    static constexpr uint8 RT_NoNullClosestHitShaders = 8;
-    static constexpr uint8 RT_NoNullMissShaders = 16;
-    static constexpr uint8 RT_NoNullIntersectionShaders = 32;
-    static constexpr uint8 RT_SkipTriangles = 64;
-    static constexpr uint8 RT_SkipAABBs = 128;
+    EPipelineOpt (uint16) {}
+    operator uint16 () const;
+    static constexpr uint16 Optimize = 1;
+    static constexpr uint16 CS_DispatchBase = 2;
+    static constexpr uint16 RT_NoNullAnyHitShaders = 4;
+    static constexpr uint16 RT_NoNullClosestHitShaders = 8;
+    static constexpr uint16 RT_NoNullMissShaders = 16;
+    static constexpr uint16 RT_NoNullIntersectionShaders = 32;
+    static constexpr uint16 RT_SkipTriangles = 64;
+    static constexpr uint16 RT_SkipAABBs = 128;
+    static constexpr uint16 DontCompile = 256;
+    static constexpr uint16 CaptureStatistics = 512;
+    static constexpr uint16 CaptureInternalRepresentation = 1024;
 };
 
 struct EQueueMask
@@ -2645,7 +2650,6 @@ struct ScriptFlags
 
 struct DynamicDim
 {
-    DynamicDim ();
     RC<DynamicDim>  opMul (int) const;
     RC<DynamicDim>  opDiv (int) const;
     RC<DynamicDim>  Mul (int) const;
@@ -2669,66 +2673,79 @@ struct DynamicDim
 struct DynamicUInt
 {
     DynamicUInt ();
+    DynamicUInt (uint);
 };
 
 struct DynamicUInt2
 {
     DynamicUInt2 ();
+    DynamicUInt2 (const uint2 &);
 };
 
 struct DynamicUInt3
 {
     DynamicUInt3 ();
+    DynamicUInt3 (const uint3 &);
 };
 
 struct DynamicUInt4
 {
     DynamicUInt4 ();
+    DynamicUInt4 (const uint4 &);
 };
 
 struct DynamicInt
 {
     DynamicInt ();
+    DynamicInt (int);
 };
 
 struct DynamicInt2
 {
     DynamicInt2 ();
+    DynamicInt2 (const int2 &);
 };
 
 struct DynamicInt3
 {
     DynamicInt3 ();
+    DynamicInt3 (const int3 &);
 };
 
 struct DynamicInt4
 {
     DynamicInt4 ();
+    DynamicInt4 (const int4 &);
 };
 
 struct DynamicFloat
 {
     DynamicFloat ();
+    DynamicFloat (float);
 };
 
 struct DynamicFloat2
 {
     DynamicFloat2 ();
+    DynamicFloat2 (const float2 &);
 };
 
 struct DynamicFloat3
 {
     DynamicFloat3 ();
+    DynamicFloat3 (const float3 &);
 };
 
 struct DynamicFloat4
 {
     DynamicFloat4 ();
+    DynamicFloat4 (const float4 &);
 };
 
 struct DynamicULong
 {
     DynamicULong ();
+    DynamicULong (uint64);
 };
 
 struct ImageLoadOpFlags
@@ -2743,7 +2760,6 @@ struct ImageLoadOpFlags
 
 struct Image
 {
-    Image ();
 
     // Create image from file.
     // File will be searched in VFS.
@@ -3294,10 +3310,6 @@ struct SphericalCube
     // Vertex count: (lod+2)^2, index count: 6*(lod+1)^2.
     void  DetailLevel (uint maxLOD);
     void  DetailLevel (uint minLOD, uint maxLOD);
-
-    // Set constant or dynamic tessellation level.
-    void  TessLevel (float level);
-    void  TessLevel (const RC<DynamicFloat> & level);
 };
 
 struct UnifiedGeometry_Draw
@@ -3572,9 +3584,12 @@ struct EPostprocess
 
     // Entry point: 'void mainVR (out float4 fragColor, in float2 fragCoord, in float3 fragRayOri, in float3 fragRayDir)'
     static constexpr uint32 ShadertoyVR = 2;
-    static constexpr uint32 ShadertoyVR_180 = 4;
-    static constexpr uint32 ShadertoyVR_360 = 8;
-    static constexpr uint32 Shadertoy_360 = 16;
+    static constexpr uint32 ShadertoyVR_180 = 3;
+    static constexpr uint32 ShadertoyVR_360 = 4;
+    static constexpr uint32 Shadertoy_360 = 5;
+    static constexpr uint32 Curved_1000R = 6;
+    static constexpr uint32 Curved_1500R = 7;
+    static constexpr uint32 Curved_1800R = 8;
 };
 
 struct EPassFlags
@@ -3598,7 +3613,6 @@ struct EPassFlags
 
 struct Postprocess
 {
-    Postprocess ();
 
     // Set debug label and color. It is used in graphics profiler.
     void  SetDebugLabel (const string & label);
@@ -3628,8 +3642,18 @@ struct Postprocess
     void  ColorSelector (const string & name, const RGBA8u & initial);
 
     // TODO
-    void  Constant (const string &, const RC<DynamicFloat4> &);
-    void  Constant (const string &, const RC<DynamicInt4> &);
+    void  Constant (const string & name, const RC<DynamicFloat> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt4> & dynamicValue);
 
     // Returns dynamic dimension of the pass.
     // It is auto-detected when used render targets with dynamic dimension or dynamic size for compute dispatches.
@@ -3639,7 +3663,7 @@ struct Postprocess
     void  EnableIfGreater (const RC<DynamicUInt> & dynamic, uint refValue);
 
     // Add resource to all shaders in the current pass.
-    // In - resource is used for read access.
+    // In  - resource is used for read access.
     // Out - resource is used for write access.
     void  ArgIn (const string & uniformName, const RC<RTScene> & resource);
     void  ArgIn (const string & uniformName, const RC<Buffer> & resource);
@@ -3650,7 +3674,7 @@ struct Postprocess
     void  ArgInOut (const string & uniformName, const RC<Image> & resource);
     void  ArgIn (const string & uniformName, const RC<Image> & resource, const string & samplerName);
     void  ArgIn (const string & uniformName, const RC<VideoImage> & resource, const string & samplerName);
-    void  ArgIn (const RC<BaseController> & camera);
+    void  Set (const RC<BaseController> & camera);
     void  ArgIn (const string & uniformName, const array<Image@> & resources);
     void  ArgOut (const string & uniformName, const array<Image@> & resources);
     void  ArgInOut (const string & uniformName, const array<Image@> & resources);
@@ -3658,47 +3682,67 @@ struct Postprocess
     // Add color/depth render target.
     // Implicitly name will be 'out_Color' + index.
     void  Output (const RC<Image> &);
-    void  Output (const RC<Image> &, const MipmapLevel &);
-    void  Output (const RC<Image> &, const ImageLayer &);
-    void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &);
-    void  Output (const RC<Image> &, const RGBA32f &);
-    void  Output (const RC<Image> &, const MipmapLevel &, const RGBA32f &);
-    void  Output (const RC<Image> &, const ImageLayer &, const RGBA32f &);
-    void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32f &);
+    void  Output (const RC<Image> & image, const MipmapLevel & mipmap);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, const MipmapLevel & mipmap);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount, const MipmapLevel & mipmap);
+    void  Output (const RC<Image> & image, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const MipmapLevel & mipmap, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, const MipmapLevel & mipmap, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount, const MipmapLevel & mipmap, const RGBA32f & clearColor);
     void  Output (const RC<Image> &, const RGBA32u &);
     void  Output (const RC<Image> &, const MipmapLevel &, const RGBA32u &);
     void  Output (const RC<Image> &, const ImageLayer &, const RGBA32u &);
     void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32u &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const RGBA32u &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32u &);
     void  Output (const RC<Image> &, const RGBA32i &);
     void  Output (const RC<Image> &, const MipmapLevel &, const RGBA32i &);
     void  Output (const RC<Image> &, const ImageLayer &, const RGBA32i &);
     void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32i &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const RGBA32i &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32i &);
     void  Output (const RC<Image> &, const DepthStencil &);
     void  Output (const RC<Image> &, const MipmapLevel &, const DepthStencil &);
     void  Output (const RC<Image> &, const ImageLayer &, const DepthStencil &);
     void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const DepthStencil &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const DepthStencil &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const DepthStencil &);
 
     // Add color/depth render target with explicit name.
     void  Output (const string &, const RC<Image> &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &);
     void  Output (const string &, const RC<Image> &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32f &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const RGBA32f &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32u &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const RGBA32u &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32i &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const RGBA32i &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const DepthStencil &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const DepthStencil &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const DepthStencil &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const DepthStencil &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const DepthStencil &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const DepthStencil &);
 
     // Add color render target with blend operation.
     // Implicitly name will be 'out_Color' + index.
@@ -3706,23 +3750,32 @@ struct Postprocess
     void  OutputBlend (const RC<Image> &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const RC<Image> &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const RC<Image> &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const RC<Image> &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const RC<Image> &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const RC<Image> &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const RC<Image> &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const RC<Image> &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const RC<Image> &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
 
     // Add color render target with blend operation and with explicit name.
     void  OutputBlend (const string &, const RC<Image> &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
+    void  OutputBlend (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp);
     void  DepthRange (float min, float max);
 
     // Set path to fragment shader, empty - load current file.
+    Postprocess  ();
     Postprocess (const string & shaderPath);
     Postprocess (const string & shaderPath, EPostprocess postprocessFlags);
     Postprocess (EPostprocess postprocessFlags);
@@ -3766,8 +3819,18 @@ struct ComputePass
     void  ColorSelector (const string & name, const RGBA8u & initial);
 
     // TODO
-    void  Constant (const string &, const RC<DynamicFloat4> &);
-    void  Constant (const string &, const RC<DynamicInt4> &);
+    void  Constant (const string & name, const RC<DynamicFloat> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt4> & dynamicValue);
 
     // Returns dynamic dimension of the pass.
     // It is auto-detected when used render targets with dynamic dimension or dynamic size for compute dispatches.
@@ -3777,7 +3840,7 @@ struct ComputePass
     void  EnableIfGreater (const RC<DynamicUInt> & dynamic, uint refValue);
 
     // Add resource to all shaders in the current pass.
-    // In - resource is used for read access.
+    // In  - resource is used for read access.
     // Out - resource is used for write access.
     void  ArgIn (const string & uniformName, const RC<RTScene> & resource);
     void  ArgIn (const string & uniformName, const RC<Buffer> & resource);
@@ -3788,7 +3851,7 @@ struct ComputePass
     void  ArgInOut (const string & uniformName, const RC<Image> & resource);
     void  ArgIn (const string & uniformName, const RC<Image> & resource, const string & samplerName);
     void  ArgIn (const string & uniformName, const RC<VideoImage> & resource, const string & samplerName);
-    void  ArgIn (const RC<BaseController> & camera);
+    void  Set (const RC<BaseController> & camera);
     void  ArgIn (const string & uniformName, const array<Image@> & resources);
     void  ArgOut (const string & uniformName, const array<Image@> & resources);
     void  ArgInOut (const string & uniformName, const array<Image@> & resources);
@@ -3899,8 +3962,18 @@ struct RayTracingPass
     void  ColorSelector (const string & name, const RGBA8u & initial);
 
     // TODO
-    void  Constant (const string &, const RC<DynamicFloat4> &);
-    void  Constant (const string &, const RC<DynamicInt4> &);
+    void  Constant (const string & name, const RC<DynamicFloat> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt4> & dynamicValue);
 
     // Returns dynamic dimension of the pass.
     // It is auto-detected when used render targets with dynamic dimension or dynamic size for compute dispatches.
@@ -3910,7 +3983,7 @@ struct RayTracingPass
     void  EnableIfGreater (const RC<DynamicUInt> & dynamic, uint refValue);
 
     // Add resource to all shaders in the current pass.
-    // In - resource is used for read access.
+    // In  - resource is used for read access.
     // Out - resource is used for write access.
     void  ArgIn (const string & uniformName, const RC<RTScene> & resource);
     void  ArgIn (const string & uniformName, const RC<Buffer> & resource);
@@ -3921,7 +3994,7 @@ struct RayTracingPass
     void  ArgInOut (const string & uniformName, const RC<Image> & resource);
     void  ArgIn (const string & uniformName, const RC<Image> & resource, const string & samplerName);
     void  ArgIn (const string & uniformName, const RC<VideoImage> & resource, const string & samplerName);
-    void  ArgIn (const RC<BaseController> & camera);
+    void  Set (const RC<BaseController> & camera);
     void  ArgIn (const string & uniformName, const array<Image@> & resources);
     void  ArgOut (const string & uniformName, const array<Image@> & resources);
     void  ArgInOut (const string & uniformName, const array<Image@> & resources);
@@ -3969,7 +4042,6 @@ struct ERenderLayer
 
 struct SceneGraphicsPass
 {
-    SceneGraphicsPass ();
 
     // Set debug label and color. It is used in graphics profiler.
     void  SetDebugLabel (const string & label);
@@ -3999,8 +4071,18 @@ struct SceneGraphicsPass
     void  ColorSelector (const string & name, const RGBA8u & initial);
 
     // TODO
-    void  Constant (const string &, const RC<DynamicFloat4> &);
-    void  Constant (const string &, const RC<DynamicInt4> &);
+    void  Constant (const string & name, const RC<DynamicFloat> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt4> & dynamicValue);
 
     // Returns dynamic dimension of the pass.
     // It is auto-detected when used render targets with dynamic dimension or dynamic size for compute dispatches.
@@ -4010,7 +4092,7 @@ struct SceneGraphicsPass
     void  EnableIfGreater (const RC<DynamicUInt> & dynamic, uint refValue);
 
     // Add resource to all shaders in the current pass.
-    // In - resource is used for read access.
+    // In  - resource is used for read access.
     // Out - resource is used for write access.
     void  ArgIn (const string & uniformName, const RC<RTScene> & resource);
     void  ArgIn (const string & uniformName, const RC<Buffer> & resource);
@@ -4021,7 +4103,7 @@ struct SceneGraphicsPass
     void  ArgInOut (const string & uniformName, const RC<Image> & resource);
     void  ArgIn (const string & uniformName, const RC<Image> & resource, const string & samplerName);
     void  ArgIn (const string & uniformName, const RC<VideoImage> & resource, const string & samplerName);
-    void  ArgIn (const RC<BaseController> & camera);
+    void  Set (const RC<BaseController> & camera);
     void  ArgIn (const string & uniformName, const array<Image@> & resources);
     void  ArgOut (const string & uniformName, const array<Image@> & resources);
     void  ArgInOut (const string & uniformName, const array<Image@> & resources);
@@ -4029,52 +4111,69 @@ struct SceneGraphicsPass
     // Add color/depth render target.
     // Implicitly name will be 'out_Color' + index.
     void  Output (const RC<Image> &);
-    void  Output (const RC<Image> &, const MipmapLevel &);
-    void  Output (const RC<Image> &, const ImageLayer &);
-    void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &);
-    void  Output (const RC<Image> &, const RGBA32f &);
-    void  Output (const RC<Image> &, const MipmapLevel &, const RGBA32f &);
-    void  Output (const RC<Image> &, const ImageLayer &, const RGBA32f &);
-    void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32f &);
+    void  Output (const RC<Image> & image, const MipmapLevel & mipmap);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, const MipmapLevel & mipmap);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount, const MipmapLevel & mipmap);
+    void  Output (const RC<Image> & image, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const MipmapLevel & mipmap, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, const MipmapLevel & mipmap, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount, const RGBA32f & clearColor);
+    void  Output (const RC<Image> & image, const ImageLayer & baseLayer, uint layerCount, const MipmapLevel & mipmap, const RGBA32f & clearColor);
     void  Output (const RC<Image> &, const RGBA32u &);
     void  Output (const RC<Image> &, const MipmapLevel &, const RGBA32u &);
     void  Output (const RC<Image> &, const ImageLayer &, const RGBA32u &);
     void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32u &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const RGBA32u &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32u &);
     void  Output (const RC<Image> &, const RGBA32i &);
     void  Output (const RC<Image> &, const MipmapLevel &, const RGBA32i &);
     void  Output (const RC<Image> &, const ImageLayer &, const RGBA32i &);
     void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32i &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const RGBA32i &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32i &);
     void  Output (const RC<Image> &, const DepthStencil &);
     void  Output (const RC<Image> &, const MipmapLevel &, const DepthStencil &);
     void  Output (const RC<Image> &, const ImageLayer &, const DepthStencil &);
     void  Output (const RC<Image> &, const ImageLayer &, const MipmapLevel &, const DepthStencil &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const DepthStencil &);
+    void  Output (const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const DepthStencil &);
 
     // Add color/depth render target with explicit name.
     void  Output (const string &, const RC<Image> &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &);
     void  Output (const string &, const RC<Image> &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32f &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const RGBA32f &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32f &);
     void  Output (const string &, const RC<Image> &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32u &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const RGBA32u &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32u &);
     void  Output (const string &, const RC<Image> &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const RGBA32i &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const RGBA32i &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32i &);
     void  Output (const string &, const RC<Image> &, const DepthStencil &);
     void  Output (const string &, const RC<Image> &, const MipmapLevel &, const DepthStencil &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const DepthStencil &);
     void  Output (const string &, const RC<Image> &, const ImageLayer &, const MipmapLevel &, const DepthStencil &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const DepthStencil &);
+    void  Output (const string &, const RC<Image> &, const ImageLayer &, uint, const MipmapLevel &, const DepthStencil &);
     void  DepthRange (float min, float max);
 
-    // Set input controller (camera), supported single controller per pass.
-    void  Set (const RC<BaseController> &);
-
     // Add path to single pipeline or folder with pipelines.
     // Scene geometry will be linked with compatible pipeline or error will be generated.
     void  AddPipeline (const string & pplnFile);
@@ -4084,7 +4183,6 @@ struct SceneGraphicsPass
 
 struct SceneRayTracingPass
 {
-    SceneRayTracingPass ();
 
     // Set debug label and color. It is used in graphics profiler.
     void  SetDebugLabel (const string & label);
@@ -4114,8 +4212,18 @@ struct SceneRayTracingPass
     void  ColorSelector (const string & name, const RGBA8u & initial);
 
     // TODO
-    void  Constant (const string &, const RC<DynamicFloat4> &);
-    void  Constant (const string &, const RC<DynamicInt4> &);
+    void  Constant (const string & name, const RC<DynamicFloat> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicFloat4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicInt4> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt2> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt3> & dynamicValue);
+    void  Constant (const string & name, const RC<DynamicUInt4> & dynamicValue);
 
     // Returns dynamic dimension of the pass.
     // It is auto-detected when used render targets with dynamic dimension or dynamic size for compute dispatches.
@@ -4125,7 +4233,7 @@ struct SceneRayTracingPass
     void  EnableIfGreater (const RC<DynamicUInt> & dynamic, uint refValue);
 
     // Add resource to all shaders in the current pass.
-    // In - resource is used for read access.
+    // In  - resource is used for read access.
     // Out - resource is used for write access.
     void  ArgIn (const string & uniformName, const RC<RTScene> & resource);
     void  ArgIn (const string & uniformName, const RC<Buffer> & resource);
@@ -4136,14 +4244,11 @@ struct SceneRayTracingPass
     void  ArgInOut (const string & uniformName, const RC<Image> & resource);
     void  ArgIn (const string & uniformName, const RC<Image> & resource, const string & samplerName);
     void  ArgIn (const string & uniformName, const RC<VideoImage> & resource, const string & samplerName);
-    void  ArgIn (const RC<BaseController> & camera);
+    void  Set (const RC<BaseController> & camera);
     void  ArgIn (const string & uniformName, const array<Image@> & resources);
     void  ArgOut (const string & uniformName, const array<Image@> & resources);
     void  ArgInOut (const string & uniformName, const array<Image@> & resources);
 
-    // Set input controller (camera), supported single controller per pass.
-    void  Set (const RC<BaseController> &);
-
     // Set path to single pipeline.
     // Scene geometry will be linked with compatible pipeline or error will be generated.
     void  SetPipeline (const string & pplnFile);
@@ -4182,7 +4287,7 @@ struct Scene
 };
 
 
-// Returns dynamic dimensions of the screen size.
+// Returns dynamic dimensions of the screen surface.
 RC<DynamicDim>  SurfaceSize ();
 
 // Present image to the screen.
@@ -4266,6 +4371,9 @@ void  GetCylinder (uint segmentCount, bool isInner, array<float3> & positions, a
 // Returns cylinder
 void  GetCylinder (uint segmentCount, bool isInner, array<float3> & positions, array<float3> & normals, array<float3> & tangents, array<float3> & bitangents, array<float2> & texcoords, array<uint> & indices);
 
+// Returns spherical cube without projection and rotation
+void  GetSphericalCube (uint lod, array<float3> & positions, array<uint> & indices);
+
 // Helper function to convert array of indices to array of uint3 indices per triangle
 void  IndicesToPrimitives (const array<uint> & indices, array<uint3> & primitives);
 
@@ -4324,120 +4432,123 @@ void  WhiteColorSpectrum3 (array<float4> & wavelengthToRGB);
 void  WhiteColorSpectrum7 (array<float4> & wavelengthToRGB, bool normalized);
 void  WhiteColorSpectrumStep50nm (array<float4> & wavelengthToRGB, bool normalized);
 void  WhiteColorSpectrumStep100nm (array<float4> & wavelengthToRGB, bool normalized);
+float3  CM_CubeSC_Forward (const float3 &);
+float3  CM_IdentitySC_Forward (const float3 &);
+float3  CM_TangentialSC_Forward (const float3 &);
 #define SCRIPT
 
 template <>
-struct RC<OrbitalCamera> : OrbitalCamera
+struct RC<Collection> : Collection
 {
-    RC (const OrbitalCamera &);
+    RC (const Collection &);
 };
 
 template <>
-struct RC<SphericalCube> : SphericalCube
+struct RC<RTScene> : RTScene
 {
-    RC (const SphericalCube &);
+    RC (const RTScene &);
 };
 
 template <>
-struct RC<DynamicFloat> : DynamicFloat
+struct RC<DynamicULong> : DynamicULong
 {
-    RC (const DynamicFloat &);
+    RC (const DynamicULong &);
 };
 
 template <>
-struct RC<FPSCamera> : FPSCamera
+struct RC<SceneGraphicsPass> : SceneGraphicsPass
 {
-    RC (const FPSCamera &);
+    RC (const SceneGraphicsPass &);
 };
 
 template <>
-struct RC<DynamicDim> : DynamicDim
+struct RC<VideoImage> : VideoImage
 {
-    RC (const DynamicDim &);
+    RC (const VideoImage &);
 };
 
 template <>
-struct RC<RayTracingPass> : RayTracingPass
+struct RC<FPVCamera> : FPVCamera
 {
-    RC (const RayTracingPass &);
+    RC (const FPVCamera &);
 };
 
 template <>
-struct RC<ComputePass> : ComputePass
+struct RC<DynamicInt> : DynamicInt
 {
-    RC (const ComputePass &);
+    RC (const DynamicInt &);
 };
 
 template <>
-struct RC<Postprocess> : Postprocess
+struct RC<IPass> : IPass
 {
-    RC (const Postprocess &);
+    RC (const IPass &);
 };
 
 template <>
-struct RC<SceneRayTracingPass> : SceneRayTracingPass
+struct RC<Image> : Image
 {
-    RC (const SceneRayTracingPass &);
+    RC (const Image &);
 };
 
 template <>
-struct RC<UnifiedGeometry> : UnifiedGeometry
+struct RC<DynamicFloat2> : DynamicFloat2
 {
-    RC (const UnifiedGeometry &);
+    RC (const DynamicFloat2 &);
 };
 
 template <>
-struct RC<Buffer> : Buffer
+struct RC<RTGeometry> : RTGeometry
 {
-    RC (const Buffer &);
+    RC (const RTGeometry &);
 };
 
 template <>
-struct RC<TopDownCamera> : TopDownCamera
+struct RC<DynamicUInt4> : DynamicUInt4
 {
-    RC (const TopDownCamera &);
+    RC (const DynamicUInt4 &);
 };
 
 template <>
-struct RC<ScaleBiasCamera> : ScaleBiasCamera
+struct RC<DynamicFloat3> : DynamicFloat3
 {
-    RC (const ScaleBiasCamera &);
+    RC (const DynamicFloat3 &);
 };
 
 template <>
-struct RC<BaseController> : BaseController
+struct RC<DynamicFloat4> : DynamicFloat4
 {
-    RC (const BaseController &);
+    RC (const DynamicFloat4 &);
 };
 
 template <>
-struct RC<FlightCamera> : FlightCamera
+struct RC<DynamicUInt3> : DynamicUInt3
 {
-    RC (const FlightCamera &);
+    RC (const DynamicUInt3 &);
 };
 
 template <>
-struct RC<Model> : Model
+struct RC<DynamicUInt2> : DynamicUInt2
 {
-    RC (const Model &);
+    RC (const DynamicUInt2 &);
 };
 
 template <>
-struct RC<DynamicUInt> : DynamicUInt
+struct RC<DynamicInt4> : DynamicInt4
 {
-    RC (const DynamicUInt &);
+    RC (const DynamicInt4 &);
 };
 
 template <>
-struct RC<Scene> : Scene
+struct RC<DynamicInt2> : DynamicInt2
 {
-    RC (const Scene &);
+    RC (const DynamicInt2 &);
 };
 
 template <>
-struct RC<Image> : Image
+struct RC<DynamicInt3> : DynamicInt3
 {
-    RC (const Image &);
+    RC (const DynamicInt3 &);
 };
 
 template <>
@@ -4447,110 +4558,110 @@ struct RC<GeomSource> : GeomSource
 };
 
 template <>
-struct RC<DynamicInt3> : DynamicInt3
+struct RC<DynamicUInt> : DynamicUInt
 {
-    RC (const DynamicInt3 &);
+    RC (const DynamicUInt &);
 };
 
 template <>
-struct RC<DynamicInt2> : DynamicInt2
+struct RC<Model> : Model
 {
-    RC (const DynamicInt2 &);
+    RC (const Model &);
 };
 
 template <>
-struct RC<DynamicInt4> : DynamicInt4
+struct RC<Scene> : Scene
 {
-    RC (const DynamicInt4 &);
+    RC (const Scene &);
 };
 
 template <>
-struct RC<DynamicUInt2> : DynamicUInt2
+struct RC<FlightCamera> : FlightCamera
 {
-    RC (const DynamicUInt2 &);
+    RC (const FlightCamera &);
 };
 
 template <>
-struct RC<DynamicUInt3> : DynamicUInt3
+struct RC<BaseController> : BaseController
 {
-    RC (const DynamicUInt3 &);
+    RC (const BaseController &);
 };
 
 template <>
-struct RC<DynamicFloat4> : DynamicFloat4
+struct RC<ScaleBiasCamera> : ScaleBiasCamera
 {
-    RC (const DynamicFloat4 &);
+    RC (const ScaleBiasCamera &);
 };
 
 template <>
-struct RC<DynamicFloat3> : DynamicFloat3
+struct RC<TopDownCamera> : TopDownCamera
 {
-    RC (const DynamicFloat3 &);
+    RC (const TopDownCamera &);
 };
 
 template <>
-struct RC<DynamicUInt4> : DynamicUInt4
+struct RC<UnifiedGeometry> : UnifiedGeometry
 {
-    RC (const DynamicUInt4 &);
+    RC (const UnifiedGeometry &);
 };
 
 template <>
-struct RC<RTGeometry> : RTGeometry
+struct RC<SceneRayTracingPass> : SceneRayTracingPass
 {
-    RC (const RTGeometry &);
+    RC (const SceneRayTracingPass &);
 };
 
 template <>
-struct RC<DynamicFloat2> : DynamicFloat2
+struct RC<Postprocess> : Postprocess
 {
-    RC (const DynamicFloat2 &);
+    RC (const Postprocess &);
 };
 
 template <>
-struct RC<DynamicInt> : DynamicInt
+struct RC<ComputePass> : ComputePass
 {
-    RC (const DynamicInt &);
+    RC (const ComputePass &);
 };
 
 template <>
-struct RC<IPass> : IPass
+struct RC<Buffer> : Buffer
 {
-    RC (const IPass &);
+    RC (const Buffer &);
 };
 
 template <>
-struct RC<FPVCamera> : FPVCamera
+struct RC<SphericalCube> : SphericalCube
 {
-    RC (const FPVCamera &);
+    RC (const SphericalCube &);
 };
 
 template <>
-struct RC<VideoImage> : VideoImage
+struct RC<OrbitalCamera> : OrbitalCamera
 {
-    RC (const VideoImage &);
+    RC (const OrbitalCamera &);
 };
 
 template <>
-struct RC<RTScene> : RTScene
+struct RC<DynamicDim> : DynamicDim
 {
-    RC (const RTScene &);
+    RC (const DynamicDim &);
 };
 
 template <>
-struct RC<Collection> : Collection
+struct RC<FPSCamera> : FPSCamera
 {
-    RC (const Collection &);
+    RC (const FPSCamera &);
 };
 
 template <>
-struct RC<SceneGraphicsPass> : SceneGraphicsPass
+struct RC<RayTracingPass> : RayTracingPass
 {
-    RC (const SceneGraphicsPass &);
+    RC (const RayTracingPass &);
 };
 
 template <>
-struct RC<DynamicULong> : DynamicULong
+struct RC<DynamicFloat> : DynamicFloat
 {
-    RC (const DynamicULong &);
+    RC (const DynamicFloat &);
 };
 
diff --git a/AE/engine/shared_data/shaders/CodeTemplates.glsl b/AE/engine/shared_data/shaders/CodeTemplates.glsl
index b83acbfc..f77ae633 100644
--- a/AE/engine/shared_data/shaders/CodeTemplates.glsl
+++ b/AE/engine/shared_data/shaders/CodeTemplates.glsl
@@ -2,6 +2,7 @@
 /*
     Code templates, snippets, default shaders, ...
 */
+#include "Math.glsl"
 
 
 //-----------------------------------------------------------------------------
@@ -21,3 +22,23 @@ ND_ float2  FullscreenQuadUV ()         { return float2( gl.VertexIndex>>1, gl.V
 #endif
 //-----------------------------------------------------------------------------
 
+
+#if defined(SH_FRAG) and defined(GL_EXT_fragment_shader_barycentric)
+/*
+=================================================
+    FSBarycentricWireframe
+=================================================
+*/
+ND_ float  FSBarycentricWireframe (float thicknessPx, float falloffPx)
+{
+    const float3    dx_barycoord    = gl.dFdx( gl.BaryCoord );
+    const float3    dy_barycoord    = gl.dFdy( gl.BaryCoord );
+    const float3    d_barycoord     = Sqrt( dx_barycoord * dx_barycoord + dy_barycoord * dy_barycoord );
+    const float3    d_thickness     = d_barycoord * thicknessPx;
+    const float3    d_falloff       = d_barycoord * falloffPx;
+
+    const float3    remap           = SmoothStep( d_thickness, d_thickness + d_falloff, gl.BaryCoord);
+    const float     wireframe       = Min( remap.x, Min( remap.y, remap.z ));
+    return wireframe;
+}
+#endif
diff --git a/AE/engine/shared_data/shaders/Color.glsl b/AE/engine/shared_data/shaders/Color.glsl
index 22880671..f130160f 100644
--- a/AE/engine/shared_data/shaders/Color.glsl
+++ b/AE/engine/shared_data/shaders/Color.glsl
@@ -30,12 +30,19 @@ ND_ float3  XYYtoRGB (const float3 xyY);
 ND_ float3  RGBtoXYY_v2 (float3 rgb);
 ND_ float3  XYYtoRGB_v2 (float3 xyY);
 
+ND_ float3  RGBtoOklab (float3 rgb);
+ND_ float3  OklabToRGB (float3 oklab);
+
 ND_ float  RGBtoLuminance (const float3 linear);
 ND_ float  RGBtoLogLuminance (const float3 linear, float gamma);
 ND_ float  RGBtoLogLuminance (const float3 linear);
 
 ND_ float3  FromRGBM (const float4 rgbm);
 ND_ float4  ToRGBM (const float3 rgb);
+
+ND_ float3  LerpHSV (float3 a, float3 b, float factor);
+ND_ float3  RGBLerpHSV (float3 a, float3 b, const float factor);
+ND_ float3  RGBLerpOklab (const float3 a, const float3 b, const float factor);
 //-----------------------------------------------------------------------------
 
 #include "../3party_shaders/ColorUtils-1.glsl"
@@ -54,7 +61,7 @@ float4  RainbowWrap (const float factor)
 //-----------------------------------------------------------------------------
 
 
-float3  ColorLerpHSV (float3 a, float3 b, float factor)
+float3  RGBLerpHSV (float3 a, float3 b, const float factor)
 {
     a = RGBtoHSV( a );
     b = RGBtoHSV( b );
diff --git a/AE/engine/shared_data/shaders/CubeMap.glsl b/AE/engine/shared_data/shaders/CubeMap.glsl
index bc5dd20e..6817373e 100644
--- a/AE/engine/shared_data/shaders/CubeMap.glsl
+++ b/AE/engine/shared_data/shaders/CubeMap.glsl
@@ -1,6 +1,13 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    Cube map utilities
+    Cube map and spherical cube utilities.
+
+    Also see [SphericalCubeMath.h](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeMath.h)
+
+    1. Forward projection converts snorm coordinate (UV) to the snorm coord with distortion correction.
+    2. Forward projection converts snorm coordinate (UV) to the 3D coordinate of the cube face / sphere with applied distortion correction.
+    3. Inverse projection invert distortion for UV coordinate.
+    4. Inverse projection converts 3D coordinate to the snorm UV and cube face index.
 */
 
 #ifdef __cplusplus
@@ -9,14 +16,48 @@
 
 #include "Math.glsl"
 
-ND_ float3  CM_RotateVec (const float3 c, const int face);
-ND_ float4  CM_InverseRotation (const float3 c);        // returns {xyz, face}
+#define ECubeFace       int
+#define ECubeFace_XPos  0   // right
+#define ECubeFace_XNeg  1   // left
+#define ECubeFace_YPos  2   // down
+#define ECubeFace_YNeg  3   // up
+#define ECubeFace_ZPos  4   // front - inside, back  - outside
+#define ECubeFace_ZNeg  5   // back  - inside, front - outside
+
+
+ND_ float3  CM_RotateVec (const float3 snormCoord, const ECubeFace face);
+ND_ float4  CM_InverseRotation (float3 dir);                        // returns {transformed 'dir', face}
+ND_ float3  CM_InverseRotation (const ECubeFace face, float3 dir);  // returns transformed 'dir' for specified 'face'
 
-ND_ float3  CM_IdentitySC_Forward (const float2 snormCoord, const int face);
+ND_ float3  CM_CubeSC_Forward (const float2 snormCoord, const ECubeFace face);
+
+ND_ float3  CM_IdentitySC_Forward (const float2 snormCoord, const ECubeFace face);
 ND_ float3  CM_IdentitySC_Inverse (const float3 coord);
 
-ND_ float3  CM_TangentialSC_Forward (const float2 snormCoord, const int face);
+ND_ float2  CM_TangentialSC_Forward (const float2 snormCoord);
+ND_ float3  CM_TangentialSC_Forward (const float2 snormCoord, const ECubeFace face);
+ND_ float2  CM_TangentialSC_Inverse (const float2 snormCoord);
 ND_ float3  CM_TangentialSC_Inverse (const float3 coord);
+
+ND_ float2  CM_EverittSC_Forward (const float2 snormCoord);
+ND_ float3  CM_EverittSC_Forward (const float2 snormCoord, const ECubeFace face);
+ND_ float2  CM_EverittSC_Inverse (const float2 snormCoord);
+ND_ float3  CM_EverittSC_Inverse (const float3 coord);
+
+ND_ float2  CM_5thPolySC_Forward (const float2 snormCoord);
+ND_ float3  CM_5thPolySC_Forward (const float2 snormCoord, const ECubeFace face);
+ND_ float2  CM_5thPolySC_Inverse (const float2 snormCoord);
+ND_ float3  CM_5thPolySC_Inverse (const float3 coord);
+
+ND_ float2  CM_COBE_SC_Forward (const float2 snormCoord);
+ND_ float3  CM_COBE_SC_Forward (const float2 snormCoord, const ECubeFace face);
+ND_ float2  CM_COBE_SC_Inverse (const float2 snormCoord);
+ND_ float3  CM_COBE_SC_Inverse (const float3 coord);
+
+ND_ float2  CM_ArvoSC_Forward (const float2 snormCoord);
+ND_ float3  CM_ArvoSC_Forward (const float2 snormCoord, const ECubeFace face);
+ND_ float2  CM_ArvoSC_Inverse (const float2 snormCoord);
+ND_ float3  CM_ArvoSC_Inverse (const float3 coord);
 //-----------------------------------------------------------------------------
 
 
@@ -26,57 +67,63 @@ ND_ float3  CM_TangentialSC_Inverse (const float3 coord);
     CM_RotateVec / CM_InverseRotation
 =================================================
 */
-float3  CM_RotateVec (const float3 c, const int face)
-{
-  #if 0
-    switch ( face )
-    {
-        case 0 : return float3( c.z,  c.y, -c.x);   // X+
-        case 1 : return float3(-c.z,  c.y,  c.x);   // X-
-        case 2 : return float3( c.x, -c.z,  c.y);   // Y+
-        case 3 : return float3( c.x,  c.z, -c.y);   // Y-
-        case 4 : return float3( c.x,  c.y,  c.z);   // Z+
-        case 5 : return float3(-c.x,  c.y, -c.z);   // Z-
-    }
-    return float3(0.f);
-  #else
-    return  float3( c.z,  c.y, -c.x) * float(face == 0) +
-            float3(-c.z,  c.y,  c.x) * float(face == 1) +
-            float3( c.x, -c.z,  c.y) * float(face == 2) +
-            float3( c.x,  c.z, -c.y) * float(face == 3) +
-            float3( c.x,  c.y,  c.z) * float(face == 4) +
-            float3(-c.x,  c.y, -c.z) * float(face == 5);
-  #endif
-}
-
-float4  CM_InverseRotation (const float3 c)
+float3  CM_RotateVec (const float3 c, const ECubeFace face)
+{
+    return  float3( c.z, -c.y, -c.x) * float(face == ECubeFace_XPos) +
+            float3(-c.z, -c.y,  c.x) * float(face == ECubeFace_XNeg) +
+            float3( c.x,  c.z,  c.y) * float(face == ECubeFace_YPos) +
+            float3( c.x, -c.z, -c.y) * float(face == ECubeFace_YNeg) +
+            float3( c.x, -c.y,  c.z) * float(face == ECubeFace_ZPos) +
+            float3(-c.x, -c.y, -c.z) * float(face == ECubeFace_ZNeg);
+}
+
+float4  CM_InverseRotation (float3 c)
 {
+    c.y = -c.y;
+
     // front (xy space)
     if ( All(bool3( Abs(c.x) <= c.z,  c.z > 0.f,  Abs(c.y) <= c.z )))
-        return float4( c.x, c.y, c.z, 4.f );
+        return float4( c.x, c.y, c.z, ECubeFace_ZPos );
 
     // right (zy space)
     if ( All(bool3( Abs(c.z) <= c.x,  c.x > 0.f,  Abs(c.y) <= c.x )))
-        return float4( -c.z, c.y, c.x, 0.f );
+        return float4( -c.z, c.y, c.x, ECubeFace_XPos );
 
     // back (xy space)
     if ( All(bool3( Abs(c.x) <= -c.z,  c.z < 0.f,  Abs(c.y) <= -c.z )))
-        return float4( -c.x, c.y, -c.z, 5.f );
+        return float4( -c.x, c.y, -c.z, ECubeFace_ZNeg );
 
     // left (zy space)
     if ( All(bool3( Abs(c.z) <= -c.x,  c.x < 0.f,  Abs(c.y) <= -c.x )))
-        return float4( c.z, c.y, -c.x, 1.f );
+        return float4( c.z, c.y, -c.x, ECubeFace_XNeg );
 
     // up (xz space)
     if ( c.y > 0.f )
-        return float4( c.x, c.z, c.y, 2.f );
+        return float4( c.x, -c.z, c.y, ECubeFace_YNeg );
 
     // down (xz space)
-    return float4( c.x, -c.z, -c.y, 3.f );
+    return float4( c.x, c.z, -c.y, ECubeFace_YPos );
+}
 
-    // TODO:
-    //  float2( 0.5f + 0.5f * ATan(dir.z, dir.x) / Pi(),
-    //          1.f - ACos(dir.y) / Pi());
+float3  CM_InverseRotation (const ECubeFace face, float3 c)
+{
+    c.y = -c.y;
+    return  float3( -c.z,  c.y,  c.x ) * float(face == ECubeFace_XPos) +
+            float3(  c.z,  c.y, -c.x ) * float(face == ECubeFace_XNeg) +
+            float3(  c.x, -c.z,  c.y ) * float(face == ECubeFace_YNeg) +
+            float3(  c.x,  c.z, -c.y ) * float(face == ECubeFace_YPos) +
+            float3(  c.x,  c.y,  c.z ) * float(face == ECubeFace_ZPos) +
+            float3( -c.x,  c.y, -c.z ) * float(face == ECubeFace_ZNeg);
+}
+
+/*
+=================================================
+    CM_CubeSC_Forward
+=================================================
+*/
+float3  CM_CubeSC_Forward (const float2 snormCoord, const ECubeFace face)
+{
+    return CM_RotateVec( float3(snormCoord, 1.f), face );
 }
 
 /*
@@ -86,9 +133,9 @@ float4  CM_InverseRotation (const float3 c)
     identity spherical cube projection
 =================================================
 */
-float3  CM_IdentitySC_Forward (const float2 snormCoord, const int face)
+float3  CM_IdentitySC_Forward (const float2 snormCoord, const ECubeFace face)
 {
-    return Normalize( CM_RotateVec( float3(snormCoord, 1.f), face ));
+    return Normalize( CM_CubeSC_Forward( snormCoord, face ));
 }
 
 float3  CM_IdentitySC_Inverse (const float3 coord)
@@ -105,23 +152,152 @@ float3  CM_IdentitySC_Inverse (const float3 coord)
     tangential spherical cube projection
 =================================================
 */
-float3  CM_TangentialSC_Forward (const float2 snormCoord, const int face)
+float2  CM_TangentialSC_Forward (const float2 snormCoord)
 {
     const float warp_theta      = 0.868734829276f;
     const float tan_warp_theta  = 1.182286685546f; //tan( warp_theta );
-    float2      coord           = Tan( warp_theta * snormCoord ) / tan_warp_theta;
+    return Tan( warp_theta * snormCoord ) / tan_warp_theta;
+}
 
+float3  CM_TangentialSC_Forward (const float2 snormCoord, const ECubeFace face)
+{
+    float2  coord = CM_TangentialSC_Forward( snormCoord );
     return Normalize( CM_RotateVec( float3(coord.x, coord.y, 1.f), face ));
 }
 
-float3  CM_TangentialSC_Inverse (const float3 coord)
+float2  CM_TangentialSC_Inverse (const float2 snormCoord)
 {
     const float warp_theta      = 0.868734829276f;
     const float tan_warp_theta  = 1.182286685546f; //tan( warp_theta );
+    return ATan( snormCoord * tan_warp_theta ) / warp_theta;
+}
 
+float3  CM_TangentialSC_Inverse (const float3 coord)
+{
     float4  coord_face = CM_InverseRotation( coord );
-    coord_face.xy /= coord_face.z;
+    return float3( CM_TangentialSC_Inverse( coord_face.xy / coord_face.z ), coord_face.w );
+}
 
-    float2  c = ATan( coord_face.xy * tan_warp_theta ) / warp_theta;
-    return float3( c.xy, coord_face.w );
+/*
+=================================================
+    CM_EverittSC_Forward / CM_EverittSC_Inverse
+=================================================
+*/
+float2  CM_EverittSC_Forward (const float2 snormCoord)
+{
+    const float  e = 1.4511;
+    return Sign( snormCoord ) * (e - Sqrt( e*e - 4.0 * (e - 1.0) * Abs(snormCoord) )) / (2.0 * (e - 1.0));
+}
+
+float3  CM_EverittSC_Forward (const float2 snormCoord, const ECubeFace face)
+{
+    float2  coord = CM_EverittSC_Forward( snormCoord );
+    return Normalize( CM_RotateVec( float3(coord.x, coord.y, 1.f), face ));
 }
+
+float2  CM_EverittSC_Inverse (const float2 snormCoord)
+{
+    const float  e = 1.4511;
+    return snormCoord * (e + (1.0 - e) * Abs(snormCoord));
+}
+
+float3  CM_EverittSC_Inverse (const float3 coord)
+{
+    float4  coord_face = CM_InverseRotation( coord );
+    return float3( CM_EverittSC_Inverse( coord_face.xy / coord_face.z ), coord_face.w );
+}
+
+/*
+=================================================
+    CM_5thPolySC_Forward / CM_5thPolySC_Inverse
+=================================================
+*/
+float2  CM_5thPolySC_Forward (const float2 snormCoord)
+{
+    float2  sq = snormCoord * snormCoord;
+    return (0.745558715593 + (0.130546850193 + 0.123894434214 * sq) * sq) * snormCoord;
+}
+
+float3  CM_5thPolySC_Forward (const float2 snormCoord, const ECubeFace face)
+{
+    float2  coord = CM_5thPolySC_Forward( snormCoord );
+    return Normalize( CM_RotateVec( float3(coord.x, coord.y, 1.f), face ));
+}
+
+float2  CM_5thPolySC_Inverse (const float2 snormCoord)
+{
+    float2  sq = snormCoord * snormCoord;
+    return (1.34318229552 + (-0.486514066449 + 0.143331770927 * sq) * sq) * snormCoord;
+}
+
+float3  CM_5thPolySC_Inverse (const float3 coord)
+{
+    float4  coord_face = CM_InverseRotation( coord );
+    return float3( CM_5thPolySC_Inverse( coord_face.xy / coord_face.z ), coord_face.w );
+}
+
+/*
+=================================================
+    CM_COBE_SC_Forward / CM_COBE_SC_Inverse
+=================================================
+*/
+float2  CM_COBE_SC_Forward (const float2 snormCoord)
+{
+    float2  sq1 = snormCoord * snormCoord;
+    float2  sq2 = sq1.yx;
+    float2  sum = ((-0.0941180085824 + 0.0409125981187 * sq2 - 0.0623272690881 * sq1) * sq1 + (0.0275922480902 + 0.0342217026979 * sq2) * sq2);
+    return (0.723951234952 + 0.276048765048 * sq1 + (1.0 - sq1) * sum) * snormCoord;
+}
+
+float3  CM_COBE_SC_Forward (const float2 snormCoord, const ECubeFace face)
+{
+    float2  coord = CM_COBE_SC_Forward( snormCoord );
+    return Normalize( CM_RotateVec( float3(coord.x, coord.y, 1.f), face ));
+}
+
+float2  CM_COBE_SC_Inverse (const float2 snormCoord)
+{
+    float2  sq1 = snormCoord * snormCoord;
+    float2  sq2 = sq1.yx;
+    float2  sum = ((-0.212853382041 + 0.0941259684877 * sq2 + 0.0693532685333 * sq1) * sq1 + (-0.117847692949 + 0.0107989197181 * sq2) * sq2);
+    return (1.37738198385 - 0.377381983848 * sq1 + (1.0 - sq1) * sum) * snormCoord;
+}
+
+float3  CM_COBE_SC_Inverse (const float3 coord)
+{
+    float4  coord_face = CM_InverseRotation( coord );
+    return float3( CM_COBE_SC_Inverse( coord_face.xy / coord_face.z ), coord_face.w );
+}
+
+/*
+=================================================
+    CM_ArvoSC_Forward / CM_ArvoSC_Inverse
+=================================================
+*/
+float2  CM_ArvoSC_Forward (const float2 snormCoord)
+{
+    float   tan_a_term  = Tan( snormCoord.x * 0.523598775598 );
+    float   cos_a_term  = Cos( snormCoord.x * 1.0471975512 );
+    return float2( 1.41421356237 * tan_a_term / Sqrt( 1.0 - tan_a_term * tan_a_term ),
+                   snormCoord.y / Sqrt( 1.0 + (1.0 - snormCoord.y * snormCoord.y) * cos_a_term) );
+}
+
+float3  CM_ArvoSC_Forward (const float2 snormCoord, const ECubeFace face)
+{
+    float2  coord = CM_ArvoSC_Forward( snormCoord );
+    return Normalize( CM_RotateVec( float3(coord.x, coord.y, 1.f), face ));
+}
+
+float2  CM_ArvoSC_Inverse (const float2 snormCoord)
+{
+    float   ss2 = Sqrt( snormCoord.x * snormCoord.x + 2.0 );
+    return float2( ATan( snormCoord.x / ss2 ) * 1.9098593171,
+                   snormCoord.y * ss2 / Sqrt( Dot( snormCoord, snormCoord ) + 1.0 ));
+}
+
+float3  CM_ArvoSC_Inverse (const float3 coord)
+{
+    float4  coord_face = CM_InverseRotation( coord );
+    return float3( CM_ArvoSC_Inverse( coord_face.xy / coord_face.z ), coord_face.w );
+}
+
diff --git a/AE/engine/shared_data/shaders/Geometry.glsl b/AE/engine/shared_data/shaders/Geometry.glsl
index 7730223d..3dedf77d 100644
--- a/AE/engine/shared_data/shaders/Geometry.glsl
+++ b/AE/engine/shared_data/shaders/Geometry.glsl
@@ -22,6 +22,9 @@ ND_ bool  IsInsideRect (const float2 pos, const float2 minBound, const float2 ma
 ND_ bool  IsInsideRect (const int2   pos, const int4   rect)                                { return IsInsideRect( pos, rect.xy, rect.zw ); }
 ND_ bool  IsInsideRect (const float2 pos, const float4 rect)                                { return IsInsideRect( pos, rect.xy, rect.zw ); }
 
+ND_ bool  IsInsideRect (const int2   pos, const int2   halfSize)                            { return AllLess( Abs(pos), halfSize ); }
+ND_ bool  IsInsideRect (const float2 pos, const float2 halfSize)                            { return AllLess( Abs(pos), halfSize ); }
+
 ND_ bool  IsOutsideRect (const float2 pos, const float2 minBound, const float2 maxBound)    { return Any(bool4( Less( pos, minBound ), Greater( pos, maxBound ))); }
 ND_ bool  IsOutsideRect (const float2 pos, const float4 rect)                               { return IsOutsideRect( pos, rect.xy, rect.zw ); }
 
@@ -34,14 +37,30 @@ ND_ float2  Rect_HalfSize (const float4 rect)
 //-----------------------------------------------------------------------------
 
 
-ND_ int2    LeftVector  (const int2   v)        { return int2  ( -v.y,  v.x ); }
-ND_ float2  LeftVector  (const float2 v)        { return float2( -v.y,  v.x ); }
+ND_ int2    LeftVector  (const int2   v)                                                    { return int2  ( -v.y,  v.x ); }
+ND_ float2  LeftVector  (const float2 v)                                                    { return float2( -v.y,  v.x ); }
+
+ND_ int2    RightVector (const int2   v)                                                    { return int2  (  v.y, -v.x ); }
+ND_ float2  RightVector (const float2 v)                                                    { return float2(  v.y, -v.x ); }
+
+ND_ float3  LeftVectorXZ  (const float3 v)                                                  { return float3( -v.z, v.y,  v.x ); }
+ND_ float3  RightVectorXZ (const float3 v)                                                  { return float3(  v.z, v.y, -v.x ); }
+//-----------------------------------------------------------------------------
+
+
+ND_ float  TriangleArea (const float3 a, const float3 b, const float3 c)                    { return Length(Cross( b - a, c - a )) * 0.5; }
+ND_ float  TriangleArea (const float2 a, const float2 b, const float2 c)                    { return TriangleArea( float3(a, 0.f), float3(b, 0.f), float3(c, 0.f) ); }
+//-----------------------------------------------------------------------------
+
 
-ND_ int2    RightVector (const int2   v)        { return int2  (  v.y, -v.x ); }
-ND_ float2  RightVector (const float2 v)        { return float2(  v.y, -v.x ); }
+// spherical coordinates
+ND_ float3  SphericalToCartesian (const float2 spherical);
+ND_ float3  SphericalToCartesian (const float3 sphericalAndRadius);
+ND_ float3  CartesianToSpherical (const float3 cartesian);
+
+ND_ float   DistanceOnSphere (const float3 n0, const float3 n1)                             { return ACos( Dot( n0, n1 )); }
+ND_ float   DistanceSqOnSphereApprox (const float3 n0, const float3 n1)                     { return (2.0 - 2.0 * Dot( n0, n1 )); }
 
-ND_ float3  LeftVectorXZ  (const float3 v)      { return float3( -v.z, v.y,  v.x ); }
-ND_ float3  RightVectorXZ (const float3 v)      { return float3(  v.z, v.y, -v.x ); }
 //-----------------------------------------------------------------------------
 
 
@@ -67,3 +86,25 @@ float  ToNonlinearDepth (const float linearDepth, const float zNear, const float
 {
     return ((zFar + zNear) - 2.0 * zNear / linearDepth) / (zFar - zNear);
 }
+
+
+float3  SphericalToCartesian (const float2 spherical)
+{
+    float   phi     = spherical.x;
+    float   theta   = spherical.y;
+    float   sin_t   = Sin(theta);
+    return float3( sin_t * Cos(phi),  Cos(theta),  sin_t * Sin(phi) );
+}
+
+float3  SphericalToCartesian (const float3 sphericalAndRadius)
+{
+    return SphericalToCartesian( sphericalAndRadius.xy ) * sphericalAndRadius.z;
+}
+
+float3  CartesianToSpherical (const float3 cartesian)
+{
+    float   theta   = ACos( cartesian.y );
+    float   phi     = ATan( cartesian.z, cartesian.x );
+    return float3( phi, theta, 1.0f );
+}
+
diff --git a/AE/engine/shared_data/shaders/HWRayTracing.glsl b/AE/engine/shared_data/shaders/HWRayTracing.glsl
index d195ca97..fa353ad1 100644
--- a/AE/engine/shared_data/shaders/HWRayTracing.glsl
+++ b/AE/engine/shared_data/shaders/HWRayTracing.glsl
@@ -238,6 +238,8 @@
 #   define /*float3*/   GetCommittedIntersectionObjectRayOrigin(/*gl::RayQuery*/ _rquery_)      gl.rayQuery.GetIntersectionObjectRayOrigin( _rquery_, true )
 #   define /*float4x3*/ GetCommittedIntersectionObjectToWorld(/*gl::RayQuery*/ _rquery_)        gl.rayQuery.GetIntersectionObjectToWorld( _rquery_, true )
 #   define /*float4x3*/ GetCommittedIntersectionWorldToObject(/*gl::RayQuery*/ _rquery_)        gl.rayQuery.GetIntersectionWorldToObject( _rquery_, true )
+#   define /*float3x4*/ GetCommittedIntersectionObjectToWorld3x4(/*gl::RayQuery*/ _rquery_)     MatTranspose(gl.rayQuery.GetIntersectionObjectToWorld( _rquery_, true ))
+#   define /*float3x4*/ GetCommittedIntersectionWorldToObject3x4(/*gl::RayQuery*/ _rquery_)     MatTranspose(gl.rayQuery.GetIntersectionWorldToObject( _rquery_, true ))
 #   define /*void*/     GetCommittedIntersectionTriangleVertexPositions(/*gl::RayQuery*/ _rquery_, /*float3[3]*/_pos_)  gl.rayQuery.GetIntersectionTriangleVertexPositions( _rquery_, true, _pos_ )
 
 // Candidate
@@ -255,6 +257,8 @@
 #   define /*float3*/   GetCandidateIntersectionObjectRayOrigin(/*gl::RayQuery*/ _rquery_)      gl.rayQuery.GetIntersectionObjectRayOrigin( _rquery_, false )
 #   define /*float4x3*/ GetCandidateIntersectionObjectToWorld(/*gl::RayQuery*/ _rquery_)        gl.rayQuery.GetIntersectionObjectToWorld( _rquery_, false )
 #   define /*float4x3*/ GetCandidateIntersectionWorldToObject(/*gl::RayQuery*/ _rquery_)        gl.rayQuery.GetIntersectionWorldToObject( _rquery_, false )
+#   define /*float3x4*/ GetCandidateIntersectionObjectToWorld3x4(/*gl::RayQuery*/ _rquery_)     MatTranspose(gl.rayQuery.GetIntersectionObjectToWorld( _rquery_, false ))
+#   define /*float3x4*/ GetCandidateIntersectionWorldToObject3x4(/*gl::RayQuery*/ _rquery_)     MatTranspose(gl.rayQuery.GetIntersectionWorldToObject( _rquery_, false ))
 #   define /*void*/     GetCandidateIntersectionTriangleVertexPositions(/*gl::RayQuery*/ _rquery_, /*float3[3]*/_pos_)  gl.rayQuery.GetIntersectionTriangleVertexPositions( _rquery_, false, _pos_ )
 
 #endif // AE_RAY_QUERY
diff --git a/AE/engine/shared_data/shaders/Math.glsl b/AE/engine/shared_data/shaders/Math.glsl
index 62e3f049..d03a5f3d 100644
--- a/AE/engine/shared_data/shaders/Math.glsl
+++ b/AE/engine/shared_data/shaders/Math.glsl
@@ -5,7 +5,33 @@
 
 #ifdef __cplusplus
 # pragma once
+
+# ifdef __INTELLISENSE__
+#   include <aestyle.glsl.h>
+# endif
+#endif
+
+#ifndef AE_ENABLE_BYTE_TYPE
+# define AE_ENABLE_BYTE_TYPE    0
+#endif
+
+#ifndef AE_ENABLE_SHORT_TYPE
+# define AE_ENABLE_SHORT_TYPE   0
+#endif
+
+#ifndef AE_ENABLE_HALF_TYPE
+# define AE_ENABLE_HALF_TYPE    0
+#endif
+
+#ifndef AE_ENABLE_LONG_TYPE
+# define AE_ENABLE_LONG_TYPE    0
+#endif
+
+#ifndef AE_ENABLE_DOUBLE_TYPE
+# define AE_ENABLE_DOUBLE_TYPE  0
 #endif
+//-----------------------------------------------------------------------------
+
 
 #define and             &&
 #define or              ||
@@ -13,11 +39,11 @@
 #define Any             any
 #define All             all
 #define Abs             abs
-#define ACos            acos
-#define ASin            asin
+#define ACos            acos            // result in range [0 .. Pi]
+#define ASin            asin            // result in range [-Pi/2 ... Pi/2]
 #define ASinH           asinh
 #define ACosH           acosh
-#define ATan            atan            // result in range [-Pi...+Pi]
+#define ATan            atan            // for 2 arg overload: result in range [-Pi...+Pi], for 1 arg overload result in range [-Pi/2 ... Pi/2]
 #define BitScanReverse  findMSB
 #define BitScanForward  findLSB
 #define ATanH           atanh
@@ -32,7 +58,6 @@
 #define Exp2            exp2
 #define Fract           fract           // x - Floor( x )
 #define Floor           floor
-#define FusedMulAdd     fma             // (a * b) + c
 #define IsNaN           isnan
 #define IsInfinity      isinf
 #define InvSqrt         inversesqrt
@@ -53,7 +78,6 @@
 #define Refract         refract
 #define Step            step
 #define SmoothStep      smoothstep
-#define Saturate( x )   (clamp( (x), 0.0f, 1.0f ))
 #define Sqrt            sqrt
 #define Sin             sin
 #define SinH            sinh
@@ -61,15 +85,19 @@
 #define Tan             tan
 #define TanH            tanh
 #define Trunc           trunc
-#define ToUNorm( x )    ((x) * 0.5f + 0.5f)
-#define ToSNorm( x )    ((x) * 2.0f - 1.0f)
 #define BitCount        bitCount
 #define ToDeg           degrees
 #define ToRad           radians
 
+#define FusedMulAdd     fma             // (a * b) + c
+//#define FusedMulAdd(_a_,_b_,_c_)      ((_a_) * (_b_) + (_c_))     // different precision
+
 #define MatInverse      inverse
 #define MatTranspose    transpose
 #define MatDeterminant  determinant
+
+ND_ float2  SinCos (const float x)      { return float2(sin(x), cos(x)); }
+
 //-----------------------------------------------------------------------------
 
 
@@ -80,36 +108,66 @@
 
 //-----------------------------------------------------------------------------
 
-#define Less            lessThan            // <
-#define Greater         greaterThan         // >
-#define LessEqual       lessThanEqual       // <=
-#define GreaterEqual    greaterThanEqual    // >=
-//#define not           !
-
-ND_ bool   Equals (const float  lhs, const float  rhs)      { return lhs == rhs; }
-ND_ bool2  Equals (const float2 lhs, const float2 rhs)      { return equal( lhs, rhs ); }
-ND_ bool3  Equals (const float3 lhs, const float3 rhs)      { return equal( lhs, rhs ); }
-ND_ bool4  Equals (const float4 lhs, const float4 rhs)      { return equal( lhs, rhs ); }
-
-ND_ bool   Equals (const int  lhs, const int  rhs)          { return lhs == rhs; }
-ND_ bool2  Equals (const int2 lhs, const int2 rhs)          { return equal( lhs, rhs ); }
-ND_ bool3  Equals (const int3 lhs, const int3 rhs)          { return equal( lhs, rhs ); }
-ND_ bool4  Equals (const int4 lhs, const int4 rhs)          { return equal( lhs, rhs ); }
-
-ND_ bool   Equals (const uint  lhs, const uint  rhs)        { return lhs == rhs; }
-ND_ bool2  Equals (const uint2 lhs, const uint2 rhs)        { return equal( lhs, rhs ); }
-ND_ bool3  Equals (const uint3 lhs, const uint3 rhs)        { return equal( lhs, rhs ); }
-ND_ bool4  Equals (const uint4 lhs, const uint4 rhs)        { return equal( lhs, rhs ); }
-
-ND_ bool   Equals (const double  lhs, const double  rhs)    { return lhs == rhs; }
-ND_ bool2  Equals (const double2 lhs, const double2 rhs)    { return equal( lhs, rhs ); }
-ND_ bool3  Equals (const double3 lhs, const double3 rhs)    { return equal( lhs, rhs ); }
-ND_ bool4  Equals (const double4 lhs, const double4 rhs)    { return equal( lhs, rhs ); }
-
-ND_ bool   Not (const bool  value)                          { return !value; }
-ND_ bool2  Not (const bool2 value)                          { return not(value); }
-ND_ bool3  Not (const bool3 value)                          { return not(value); }
-ND_ bool4  Not (const bool4 value)                          { return not(value); }
+
+/*
+=================================================
+    Equal / NotEqual /
+    Less / Greater / LessEqual / GreaterEqual
+----
+    boolType  Equal (T lhs, T rhs)
+    boolType  NotEqual (T lhs, T rhs)
+    boolType  Less (T lhs, T rhs)
+    boolType  Greater (T lhs, T rhs)
+    boolType  LessEqual (T lhs, T rhs)
+    boolType  GreaterEqual (T lhs, T rhs)
+----
+    per component comparator
+=================================================
+*/
+#define Gen_CMP1( _stype_, _vtype_, _name_, _opS_, _opV_ )                                          \
+    ND_ bool   _name_ (const _stype_    lhs, const _stype_    rhs)  { return lhs _opS_ rhs; }       \
+    ND_ bool2  _name_ (const _vtype_##2 lhs, const _vtype_##2 rhs)  { return _opV_( lhs, rhs ); }   \
+    ND_ bool3  _name_ (const _vtype_##3 lhs, const _vtype_##3 rhs)  { return _opV_( lhs, rhs ); }   \
+    ND_ bool4  _name_ (const _vtype_##4 lhs, const _vtype_##4 rhs)  { return _opV_( lhs, rhs ); }
+
+#define Gen_CMP( _stype_, _vtype_ )                                     \
+    Gen_CMP1( _stype_, _vtype_, Equal,          ==, equal )             \
+    Gen_CMP1( _stype_, _vtype_, NotEqual,       !=, notEqual )          \
+    Gen_CMP1( _stype_, _vtype_, Less,           <,  lessThan )          \
+    Gen_CMP1( _stype_, _vtype_, Greater,        >,  greaterThan )       \
+    Gen_CMP1( _stype_, _vtype_, LessEqual,      <=, lessThanEqual )     \
+    Gen_CMP1( _stype_, _vtype_, GreaterEqual,   >=, greaterThanEqual )
+
+Gen_CMP( float, float_vec_t )
+Gen_CMP( int,   int_vec_t )
+Gen_CMP( uint,  uint_vec_t )
+
+#if AE_ENABLE_BYTE_TYPE
+    Gen_CMP( sbyte,     sbyte_vec_t )
+    Gen_CMP( ubyte,     ubyte_vec_t )
+#endif
+#if AE_ENABLE_SHORT_TYPE
+    Gen_CMP( sshort,    sshort_vec_t )
+    Gen_CMP( ushort,    ushort_vec_t )
+#endif
+#if AE_ENABLE_LONG_TYPE
+    Gen_CMP( slong,     slong_vec_t )
+    Gen_CMP( ulong,     ulong_vec_t )
+#endif
+#if AE_ENABLE_HALF_TYPE
+    Gen_CMP( half,      half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_CMP( double,    double_vec_t )
+#endif
+
+#undef Gen_CMP1
+#undef Gen_CMP
+
+ND_ bool   Not (const bool  value)      { return !value; }
+ND_ bool2  Not (const bool2 value)      { return not(value); }
+ND_ bool3  Not (const bool3 value)      { return not(value); }
+ND_ bool4  Not (const bool4 value)      { return not(value); }
 
 #define AllLess( a, b )         All( Less( (a), (b) ))
 #define AllLessEqual( a, b )    All( LessEqual( (a), (b) ))
@@ -123,117 +181,302 @@ ND_ bool4  Not (const bool4 value)                          { return not(value);
 #define AnyGreater( a, b )      Any( Greater( (a), (b) ))
 #define AnyGreaterEqual( a, b ) Any( GreaterEqual( (a), (b) ))
 
-#define AllEqual( a, b )        All( Equals( (a), (b) ))
-#define AnyEqual( a, b )        Any( Equals( (a), (b) ))
+#define AllEqual( a, b )        All( Equal( (a), (b) ))
+#define AnyEqual( a, b )        Any( Equal( (a), (b) ))
 
-#define AllNotEqual( a, b )     All( Not( Equals( (a), (b) )))
-#define AnyNotEqual( a, b )     Any( Not( Equals( (a), (b) )))
+#define AllNotEqual( a, b )     All( Not( Equal( (a), (b) )))
+#define AnyNotEqual( a, b )     Any( Not( Equal( (a), (b) )))
 
-#define NotAllEqual( a, b )     Not( All( Equals( (a), (b) )))
-#define NotAnyEqual( a, b )     Not( Any( Equals( (a), (b) )))
-//-----------------------------------------------------------------------------
+#define NotAllEqual( a, b )     Not( All( Equal( (a), (b) )))
+#define NotAnyEqual( a, b )     Not( Any( Equal( (a), (b) )))
 
+/*
+=================================================
+    Saturate
+----
+    T  Saturate (T x)
+=================================================
+*/
+#define Gen_SATURATE1( _stype_, _type_ )                \
+    ND_ _type_  Saturate (const _type_ x) {             \
+        return clamp( x, _stype_(0.0), _stype_(1.0) );  \
+    }
 
-#define Min3( a, b, c )         Min( Min( (a), (b) ), (c) )
-#define Min4( a, b, c, d )      Min( Min( (a), (b) ), Min( (c), (d) ))
-#define Max3( a, b, c )         Max( Max( (a), (b) ), (c) )
-#define Max4( a, b, c, d )      Max( Max( (a), (b) ), Max( (c), (d) ))
+#define Gen_SATURATE( _stype_, _vtype_ )\
+    Gen_SATURATE1( _stype_, _stype_ )\
+    Gen_SATURATE1( _stype_, _vtype_##2 )\
+    Gen_SATURATE1( _stype_, _vtype_##3 )\
+    Gen_SATURATE1( _stype_, _vtype_##4 )
 
+Gen_SATURATE( float, float_vec_t )
 
-//-----------------------------------------------------------------------------
-// Constants
+#if AE_ENABLE_HALF_TYPE
+    Gen_SATURATE( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_SATURATE( double, double_vec_t )
+#endif
 
-ND_ float  Epsilon ()               { return 1.e-5f; }
-ND_ float  Pi ()                    { return 3.14159265358979323846f; }
-ND_ float  Pi2 ()                   { return Pi() * 2.0f; }
+#undef Gen_SATURATE1
+#undef Gen_SATURATE
 
-ND_ float  ReciprocalPi ()          { return 0.31830988618379067153f; }
-ND_ float  SqrtOf2 ()               { return 1.41421356237309504880f; }
+/*
+=================================================
+    ToUNorm / ToSNorm
+----
+    T  ToUNorm (T x)    [-1, +1] to [ 0,  1]
+    T  ToSNorm (T x)    [ 0,  1] to [-1, +1]
+=================================================
+*/
+#define Gen_TOUSNORM1( _type_ )                             \
+    ND_ _type_  ToUNorm (const _type_ x) {                  \
+        return FusedMulAdd( x, _type_(0.5), _type_(0.5) );  \
+    }                                                       \
+    ND_ _type_  ToSNorm (const _type_ x) {                  \
+        return FusedMulAdd( x, _type_(2.0), _type_(-1.0) ); \
+    }
 
+#define Gen_TOUSNORM( _stype_, _vtype_ )\
+    Gen_TOUSNORM1( _stype_ )            \
+    Gen_TOUSNORM1( _vtype_##2 )         \
+    Gen_TOUSNORM1( _vtype_##3 )         \
+    Gen_TOUSNORM1( _vtype_##4 )
 
-//-----------------------------------------------------------------------------
-// Square
+Gen_TOUSNORM( float, float_vec_t )
 
-ND_ float   Square (const float x)      { return x * x; }
-ND_ float2  Square (const float2 x)     { return x * x; }
-ND_ float3  Square (const float3 x)     { return x * x; }
-ND_ float4  Square (const float4 x)     { return x * x; }
+#if AE_ENABLE_HALF_TYPE
+    Gen_TOUSNORM( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_TOUSNORM( double, double_vec_t )
+#endif
 
-ND_ int     Square (const int x)        { return x * x; }
-ND_ int2    Square (const int2 x)       { return x * x; }
-ND_ int3    Square (const int3 x)       { return x * x; }
-ND_ int4    Square (const int4 x)       { return x * x; }
+#undef Gen_TOUSNORM1
+#undef Gen_TOUSNORM
 
-ND_ uint    Square (const uint x)       { return x * x; }
-ND_ uint2   Square (const uint2 x)      { return x * x; }
-ND_ uint3   Square (const uint3 x)      { return x * x; }
-ND_ uint4   Square (const uint4 x)      { return x * x; }
+//-----------------------------------------------------------------------------
+// Constants
 
+ND_ float  Epsilon ()               { return 1.e-5f; }
+ND_ float  Pi ()                    { return 3.14159265358979323846f; }
+ND_ float  Pi2 ()                   { return 6.28318530717958647692f; }
+ND_ float  HalfPi ()                { return 1.57079632679489661923f; }
 
-//-----------------------------------------------------------------------------
-// Same as 'condition ? ifTrue : ifFalse'
+ND_ float  ReciprocalPi ()          { return 0.31830988618379067153f; }
+ND_ float  SqrtOf2 ()               { return 1.41421356237309504880f; }
 
-#define Gen_SELECT( _vtype_, _btype_ )\
-    ND_ _vtype_  Select (const _btype_ condition, const _vtype_ ifTrue, const _vtype_ ifFalse)  { return (ifFalse * _vtype_(Not(condition)))  + (ifTrue * _vtype_(condition)); }
 
-Gen_SELECT( float,  bool  )
-Gen_SELECT( float2, bool2 )
-Gen_SELECT( float3, bool3 )
-Gen_SELECT( float4, bool4 )
+/*
+=================================================
+    Square
+----
+    T  Square (T x)
+=================================================
+*/
+#define Gen_SQUARE( _stype_, _vtype_ )\
+    ND_ _stype_     Square (const _stype_    x)     { return x * x; }\
+    ND_ _vtype_##2  Square (const _vtype_##2 x)     { return x * x; }\
+    ND_ _vtype_##3  Square (const _vtype_##3 x)     { return x * x; }\
+    ND_ _vtype_##4  Square (const _vtype_##4 x)     { return x * x; }
+
+Gen_SQUARE( float,  float_vec_t )
+Gen_SQUARE( int,    int_vec_t )
+Gen_SQUARE( uint,   uint_vec_t )
+
+#if AE_ENABLE_BYTE_TYPE
+    Gen_SQUARE( sbyte,  sbyte_vec_t )
+    Gen_SQUARE( ubyte,  ubyte_vec_t )
+#endif
+#if AE_ENABLE_SHORT_TYPE
+    Gen_SQUARE( sshort, sshort_vec_t )
+    Gen_SQUARE( ushort, ushort_vec_t )
+#endif
+#if AE_ENABLE_LONG_TYPE
+    Gen_SQUARE( slong,  slong_vec_t )
+    Gen_SQUARE( ulong,  ulong_vec_t )
+#endif
+#if AE_ENABLE_HALF_TYPE
+    Gen_SQUARE( half,   half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_SQUARE( double, double_vec_t )
+#endif
 
-Gen_SELECT( int,    bool  )
-Gen_SELECT( int2,   bool2 )
-Gen_SELECT( int3,   bool3 )
-Gen_SELECT( int4,   bool4 )
+#undef Gen_SQUARE
 
-#undef Gen_SELECT
+/*
+=================================================
+    Select
+----
+    T  Select (boolType condition, T ifTrue, T ifFalse)
+----
+    same as per component 'condition ? ifTrue : ifFalse'
+=================================================
+*/
+#define Gen_SELECT1( _vtype_, _btype_ )\
+    ND_ _vtype_  Select (const _btype_ condition, const _vtype_ ifTrue, const _vtype_ ifFalse)  { return (ifFalse * _vtype_(Not(condition)))  + (ifTrue * _vtype_(condition)); }
 
+#define Gen_SELECT( _stype_, _vtype_ )\
+    Gen_SELECT1( _stype_,       bool  )\
+    Gen_SELECT1( _vtype_##2,    bool2 )\
+    Gen_SELECT1( _vtype_##3,    bool3 )\
+    Gen_SELECT1( _vtype_##4,    bool4 )
 
-//-----------------------------------------------------------------------------
-// BranchLess
-// same as 'condition ? ifTrue : ifFalse'
+Gen_SELECT( float,  float_vec_t )
+Gen_SELECT( int,    int_vec_t )
+Gen_SELECT( uint,   uint_vec_t )
 
-#define Gen_BRANCHLESS( _vtype_ )\
-    ND_ _vtype_  BranchLess (bool condition, const _vtype_ ifTrue, const _vtype_ ifFalse)   { _vtype_ tmp[2] = {ifTrue, ifFalse};  return tmp[int(condition)]; }
+#if AE_ENABLE_BYTE_TYPE
+    Gen_SELECT( sbyte,  sbyte_vec_t )
+    Gen_SELECT( ubyte,  ubyte_vec_t )
+#endif
+#if AE_ENABLE_SHORT_TYPE
+    Gen_SELECT( sshort, sshort_vec_t )
+    Gen_SELECT( ushort, ushort_vec_t )
+#endif
+#if AE_ENABLE_LONG_TYPE
+    Gen_SELECT( slong,  slong_vec_t )
+    Gen_SELECT( ulong,  ulong_vec_t )
+#endif
+#if AE_ENABLE_HALF_TYPE
+    Gen_SELECT( half,   half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_SELECT( double, double_vec_t )
+#endif
 
-Gen_BRANCHLESS( float  )
-Gen_BRANCHLESS( float2 )
-Gen_BRANCHLESS( float3 )
-Gen_BRANCHLESS( float4 )
+#undef Gen_SELECT1
+#undef Gen_SELECT
 
-Gen_BRANCHLESS( int  )
-Gen_BRANCHLESS( int2 )
-Gen_BRANCHLESS( int3 )
-Gen_BRANCHLESS( int4 )
+/*
+=================================================
+    BranchLess
+----
+    T  BranchLess (bool condition, T ifTrue, T ifFalse)
+----
+    same as 'condition ? ifTrue : ifFalse'
+=================================================
+*/
+#define Gen_BRANCHLESS1( _vtype_ )\
+    ND_ _vtype_  BranchLess (const bool condition, const _vtype_ ifTrue, const _vtype_ ifFalse) { _vtype_ tmp[2] = {ifTrue, ifFalse};  return tmp[int(condition)]; }
+
+#define Gen_BRANCHLESS( _stype_, _vtype_ )\
+    Gen_BRANCHLESS1( _stype_    )\
+    Gen_BRANCHLESS1( _vtype_##2 )\
+    Gen_BRANCHLESS1( _vtype_##3 )\
+    Gen_BRANCHLESS1( _vtype_##4 )
+
+Gen_BRANCHLESS( float,  float_vec_t )
+Gen_BRANCHLESS( int,    int_vec_t )
+Gen_BRANCHLESS( uint,   uint_vec_t )
+
+#if AE_ENABLE_BYTE_TYPE
+    Gen_BRANCHLESS( sbyte,  sbyte_vec_t )
+    Gen_BRANCHLESS( ubyte,  ubyte_vec_t )
+#endif
+#if AE_ENABLE_SHORT_TYPE
+    Gen_BRANCHLESS( sshort, sshort_vec_t )
+    Gen_BRANCHLESS( ushort, ushort_vec_t )
+#endif
+#if AE_ENABLE_LONG_TYPE
+    Gen_BRANCHLESS( slong,  slong_vec_t )
+    Gen_BRANCHLESS( ulong,  ulong_vec_t )
+#endif
+#if AE_ENABLE_HALF_TYPE
+    Gen_BRANCHLESS( half,   half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_BRANCHLESS( double, double_vec_t )
+#endif
 
+#undef Gen_BRANCHLESS1
 #undef Gen_BRANCHLESS
 
 
-//-----------------------------------------------------------------------------
-// square length and distance
+/*
+=================================================
+    Min* / Max*
+=================================================
+*/
+#define Min3( a, b, c )         Min( Min( (a), (b) ), (c) )
+#define Min4( a, b, c, d )      Min( Min( (a), (b) ), Min( (c), (d) ))
+#define Max3( a, b, c )         Max( Max( (a), (b) ), (c) )
+#define Max4( a, b, c, d )      Max( Max( (a), (b) ), Max( (c), (d) ))
 
-ND_ float  LengthSq (const float2 x)                    { return Dot( x, x ); }
-ND_ float  LengthSq (const float3 x)                    { return Dot( x, x ); }
+#define MinAbs( _a_, _b_ )      Select( Less(Abs(_a_), Abs(_b_)), (_a_), (_b_) )
+#define MaxAbs( _a_, _b_ )      Select( Greater(Abs(_a_), Abs(_b_)), (_a_), (_b_) )
 
-ND_ float  DistanceSq (const float2 x, const float2 y)  { float2 r = x - y;  return Dot( r, r ); }
-ND_ float  DistanceSq (const float3 x, const float3 y)  { float3 r = x - y;  return Dot( r, r ); }
+/*
+=================================================
+    LengthSq / DistanceSq
+----
+    Scalar  LengthSq (Vec x)
+    Scalar  DistanceSq (Vec x, Vec y)
+=================================================
+*/
+#define Gen_LENGTHSQ_DISTANCESQ1( _stype_, _vtype_ )                                                        \
+    ND_ _stype_  LengthSq (const _vtype_ x)                     { return Dot( x, x ); }                     \
+    ND_ _stype_  DistanceSq (const _vtype_ x, const _vtype_ y)  { _vtype_ r = x - y;  return Dot( r, r ); }
 
+#define Gen_LENGTHSQ_DISTANCESQ( _stype_, _vtype_ )\
+    Gen_LENGTHSQ_DISTANCESQ1( _stype_, _vtype_##2 )\
+    Gen_LENGTHSQ_DISTANCESQ1( _stype_, _vtype_##3 )
 
-//-----------------------------------------------------------------------------
-// Other functions
+Gen_LENGTHSQ_DISTANCESQ( float, float_vec_t )
 
-// -1 or +1, nan = +1
-ND_ float   Sign (const float  x)       { return x < 0.0f ? -1.0f : 1.0f; }
-ND_ float2  Sign (const float2 v)       { return Select( Less( v, float2(0.f) ), float2(-1.0f), float2(1.0f) ); }
-ND_ float3  Sign (const float3 v)       { return Select( Less( v, float3(0.f) ), float3(-1.0f), float3(1.0f) ); }
-ND_ float4  Sign (const float4 v)       { return Select( Less( v, float4(0.f) ), float4(-1.0f), float4(1.0f) ); }
+#if AE_ENABLE_HALF_TYPE
+    Gen_LENGTHSQ_DISTANCESQ( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_LENGTHSQ_DISTANCESQ( double, double_vec_t )
+#endif
 
-ND_ int     Sign (const int  x)         { return  x < 0 ? -1 : 1; }
-ND_ int2    Sign (const int2 v)         { return Select( Less( v, int2(0) ), int2(-1), int2(1) ); }
-ND_ int3    Sign (const int3 v)         { return Select( Less( v, int3(0) ), int3(-1), int3(1) ); }
-ND_ int4    Sign (const int4 v)         { return Select( Less( v, int4(0) ), int4(-1), int4(1) ); }
+#undef Gen_LENGTHSQ_DISTANCESQ1
+#undef Gen_LENGTHSQ_DISTANCESQ
 
-ND_ float2  SinCos (const float x)      { return float2(sin(x), cos(x)); }
+/*
+=================================================
+    Sign
+----
+    T  Sign (T x)
+----
+    returns -1 or +1, +1 on nan
+=================================================
+*/
+#define Gen_SIGN1( _vtype_ )\
+    ND_ _vtype_  Sign (const _vtype_ v) { return Select( Less( v, _vtype_(0) ), _vtype_(-1), _vtype_(1) ); }
+
+#define Gen_SIGN( _stype_, _vtype_ )\
+    ND_ _stype_  Sign (const _stype_ x)  { return x < _stype_(0) ? _stype_(-1) : _stype_(1); }\
+    Gen_SIGN1( _vtype_##2 )\
+    Gen_SIGN1( _vtype_##3 )\
+    Gen_SIGN1( _vtype_##4 )
+
+Gen_SIGN( float,    float_vec_t )
+Gen_SIGN( int,      int_vec_t )
+Gen_SIGN( uint,     uint_vec_t )
+
+#if AE_ENABLE_BYTE_TYPE
+    Gen_SIGN( sbyte,    sbyte_vec_t )
+    Gen_SIGN( ubyte,    ubyte_vec_t )
+#endif
+#if AE_ENABLE_SHORT_TYPE
+    Gen_SIGN( sshort,   sshort_vec_t )
+    Gen_SIGN( ushort,   ushort_vec_t )
+#endif
+#if AE_ENABLE_LONG_TYPE
+    Gen_SIGN( slong,    slong_vec_t )
+    Gen_SIGN( ulong,    ulong_vec_t )
+#endif
+#if AE_ENABLE_HALF_TYPE
+    Gen_SIGN( half,     half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_SIGN( double,   double_vec_t )
+#endif
+
+#undef Gen_SIGN1
+#undef Gen_SIGN
 
 
 //-----------------------------------------------------------------------------
@@ -398,54 +641,214 @@ ND_ bool  HasBit (const uint value, const uint index)
     return (value & (1u << index)) != 0;
 }
 
+ND_ uint  ExtractBit (inout uint bits)
+{
+    uint    result = bits & ~(bits - 1);
+    bits = bits & ~result;
+    return result;
+}
+
+ND_ uint  ExtractBitLog2 (inout uint bits)
+{
+    return uint(IntLog2( ExtractBit( INOUT bits )));
+}
+
 
 //-----------------------------------------------------------------------------
 // interpolation
 
-ND_ float   BaryLerp (const float  v0, const float  v1, const float  v2, const float3 barycentrics)  { return v0 * barycentrics.x + v1 * barycentrics.y + v2 * barycentrics.z; }
-ND_ float2  BaryLerp (const float2 v0, const float2 v1, const float2 v2, const float3 barycentrics)  { return v0 * barycentrics.x + v1 * barycentrics.y + v2 * barycentrics.z; }
-ND_ float3  BaryLerp (const float3 v0, const float3 v1, const float3 v2, const float3 barycentrics)  { return v0 * barycentrics.x + v1 * barycentrics.y + v2 * barycentrics.z; }
-ND_ float4  BaryLerp (const float4 v0, const float4 v1, const float4 v2, const float3 barycentrics)  { return v0 * barycentrics.x + v1 * barycentrics.y + v2 * barycentrics.z; }
+/*
+=================================================
+    BaryLerp
+----
+    T  BaryLerp (T v0, T v1, T v2, Vec3 barycentrics)  -- barycentric interpolation
+    T  BaryLerp (T v0, T v1, T v2, Vec2 barycentrics)  -- barycentric interpolation with much better precision
+=================================================
+*/
+#define Gen_BARYLERP1( _type_, _bary3_, _bary2_ )\
+    ND_ _type_  BaryLerp (const _type_ v0, const _type_ v1, const _type_ v2, const _bary3_ barycentrics)  { return v0 * barycentrics.x + v1 * barycentrics.y + v2 * barycentrics.z; }\
+    ND_ _type_  BaryLerp (const _type_ v0, const _type_ v1, const _type_ v2, const _bary2_ barycentrics)  { return v0 + FusedMulAdd( _type_(barycentrics.x), (v1 - v0), barycentrics.y * (v2 - v0) ); }
 
-// has much precision
-ND_ float   BaryLerp (const float  v0, const float  v1, const float  v2, const float2 barycentrics)  { return v0 + FusedMulAdd( barycentrics.x,    (v1 - v0), barycentrics.y * (v2 - v0)); }
-ND_ float2  BaryLerp (const float2 v0, const float2 v1, const float2 v2, const float2 barycentrics)  { return v0 + FusedMulAdd( barycentrics.xx,   (v1 - v0), barycentrics.y * (v2 - v0)); }
-ND_ float3  BaryLerp (const float3 v0, const float3 v1, const float3 v2, const float2 barycentrics)  { return v0 + FusedMulAdd( barycentrics.xxx,  (v1 - v0), barycentrics.y * (v2 - v0)); }
-ND_ float4  BaryLerp (const float4 v0, const float4 v1, const float4 v2, const float2 barycentrics)  { return v0 + FusedMulAdd( barycentrics.xxxx, (v1 - v0), barycentrics.y * (v2 - v0)); }
+#define Gen_BARYLERP( _stype_, _vtype_ )\
+    Gen_BARYLERP1( _stype_,    _vtype_##3, _vtype_##2 )\
+    Gen_BARYLERP1( _vtype_##2, _vtype_##3, _vtype_##2 )\
+    Gen_BARYLERP1( _vtype_##3, _vtype_##3, _vtype_##2 )\
+    Gen_BARYLERP1( _vtype_##4, _vtype_##3, _vtype_##2 )
 
-ND_ float   BiLerp (const float  x1y1, const float  x2y1, const float  x1y2, const float  x2y2, const float2 factor)  { return Lerp( Lerp( x1y1, x2y1, factor.x ), Lerp( x1y2, x2y2, factor.x ), factor.y ); }
-ND_ float2  BiLerp (const float2 x1y1, const float2 x2y1, const float2 x1y2, const float2 x2y2, const float2 factor)  { return Lerp( Lerp( x1y1, x2y1, factor.x ), Lerp( x1y2, x2y2, factor.x ), factor.y ); }
-ND_ float3  BiLerp (const float3 x1y1, const float3 x2y1, const float3 x1y2, const float3 x2y2, const float2 factor)  { return Lerp( Lerp( x1y1, x2y1, factor.x ), Lerp( x1y2, x2y2, factor.x ), factor.y ); }
-ND_ float4  BiLerp (const float4 x1y1, const float4 x2y1, const float4 x1y2, const float4 x2y2, const float2 factor)  { return Lerp( Lerp( x1y1, x2y1, factor.x ), Lerp( x1y2, x2y2, factor.x ), factor.y ); }
+Gen_BARYLERP( float, float_vec_t )
 
+#if AE_ENABLE_HALF_TYPE
+    Gen_BARYLERP( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_BARYLERP( double, double_vec_t )
+#endif
+
+#undef Gen_BARYLERP1
+#undef Gen_BARYLERP
+
+/*
+=================================================
+    BiLerp
+----
+    T  BiLerp (T x1y1, T x2y1, T x1y2, T x2y2, Vec2 factor)
+----
+    bilinear interpolation
+=================================================
+*/
+#define Gen_BILERP1( _type_, _factor_ )\
+    ND_ _type_  BiLerp (const _type_ x1y1, const _type_ x2y1, const _type_ x1y2, const _type_ x2y2, const _factor_ factor)  { return Lerp( Lerp( x1y1, x2y1, factor.x ), Lerp( x1y2, x2y2, factor.x ), factor.y ); }
 
-// map 'v' in 'src' interval to 'dst' interval.
-// only for scalar range.
+#define Gen_BILERP( _stype_, _vtype_ )\
+    Gen_BILERP1( _stype_,    _vtype_##2 )\
+    Gen_BILERP1( _vtype_##2, _vtype_##2 )\
+    Gen_BILERP1( _vtype_##3, _vtype_##2 )\
+    Gen_BILERP1( _vtype_##4, _vtype_##2 )
+
+Gen_BILERP( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_BILERP( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_BILERP( double, double_vec_t )
+#endif
+
+#undef Gen_BILERP1
+#undef Gen_BILERP
+
+/*
+=================================================
+    Remap / RemapClamped
+----
+    T  Remap (Vec2 src, Vec2 dst, T v)
+    T  RemapClamped (Vec2 src, Vec2 dst, T v)
+----
+    Map 'v' in 'src' interval to 'dst' interval.
+    Map 'v' in 'src' interval to 'dst' interval and clamp.
+    Interval is a scalar range which specified for all components.
+=================================================
+*/
 ND_ float   Remap (const float2 src, const float2 dst, const float  v)  { return (v - src.x) / (src.y - src.x) * (dst.y - dst.x) + dst.x; }
 ND_ float2  Remap (const float2 src, const float2 dst, const float2 v)  { return (v - src.x) / (src.y - src.x) * (dst.y - dst.x) + dst.x; }
 ND_ float3  Remap (const float2 src, const float2 dst, const float3 v)  { return (v - src.x) / (src.y - src.x) * (dst.y - dst.x) + dst.x; }
 ND_ float4  Remap (const float2 src, const float2 dst, const float4 v)  { return (v - src.x) / (src.y - src.x) * (dst.y - dst.x) + dst.x; }
 
-// map 'v' in 'src' interval to 'dst' interval.
-ND_ float2  Remap (const float2 src0, const float2 src1, const float2 dst0, const float2 dst1, const float2 v)  { return (v - src0) / (src1 - src0) * (dst1 - dst0) + dst0; }
-ND_ float3  Remap (const float3 src0, const float3 src1, const float3 dst0, const float3 dst1, const float3 v)  { return (v - src0) / (src1 - src0) * (dst1 - dst0) + dst0; }
-ND_ float4  Remap (const float4 src0, const float4 src1, const float4 dst0, const float4 dst1, const float4 v)  { return (v - src0) / (src1 - src0) * (dst1 - dst0) + dst0; }
-
-
-// map 'v' in 'src' interval to 'dst' interval and clamp.
-// only for scalar range.
 ND_ float   RemapClamped (const float2 src, const float2 dst, const float  v)  { return Clamp( Remap( src, dst, v ), dst.x, dst.y ); }
 ND_ float2  RemapClamped (const float2 src, const float2 dst, const float2 v)  { return Clamp( Remap( src, dst, v ), dst.x, dst.y ); }
 ND_ float3  RemapClamped (const float2 src, const float2 dst, const float3 v)  { return Clamp( Remap( src, dst, v ), dst.x, dst.y ); }
 ND_ float4  RemapClamped (const float2 src, const float2 dst, const float4 v)  { return Clamp( Remap( src, dst, v ), dst.x, dst.y ); }
 
-// map 'v' in 'src' interval to 'dst' interval and clamp.
+/*
+=================================================
+    Remap / RemapClamped
+----
+    Map 'v' in 'src' interval to 'dst' interval.
+    Map 'v' in 'src' interval to 'dst' interval and clamp.
+    Interval is specified per-component.
+=================================================
+*/
+ND_ float2  Remap (const float2 src0, const float2 src1, const float2 dst0, const float2 dst1, const float2 v)  { return (v - src0) / (src1 - src0) * (dst1 - dst0) + dst0; }
+ND_ float3  Remap (const float3 src0, const float3 src1, const float3 dst0, const float3 dst1, const float3 v)  { return (v - src0) / (src1 - src0) * (dst1 - dst0) + dst0; }
+ND_ float4  Remap (const float4 src0, const float4 src1, const float4 dst0, const float4 dst1, const float4 v)  { return (v - src0) / (src1 - src0) * (dst1 - dst0) + dst0; }
+
 ND_ float2  RemapClamped (const float2 src0, const float2 src1, const float2 dst0, const float2 dst1, const float2 v)  { return Clamp( Remap( src0, src1, dst0, dst1, v ), dst0, dst1 ); }
 ND_ float3  RemapClamped (const float3 src0, const float3 src1, const float3 dst0, const float3 dst1, const float3 v)  { return Clamp( Remap( src0, src1, dst0, dst1, v ), dst0, dst1 ); }
 ND_ float4  RemapClamped (const float4 src0, const float4 src1, const float4 dst0, const float4 dst1, const float4 v)  { return Clamp( Remap( src0, src1, dst0, dst1, v ), dst0, dst1 ); }
-//-----------------------------------------------------------------------------
 
+/*
+=================================================
+    UIndexToUNormFloor / UIndexToSNormFloor
+----
+    map coordinate 'index' in N dimension with size 'count'
+    to unorm value with rounding downwards
+=================================================
+*/
+ND_ float   UIndexToUNormFloor (const int  index, const int  count)         { return float( index) / float( count - 1); }
+ND_ float2  UIndexToUNormFloor (const int2 index, const int2 count)         { return float2(index) / float2(count - 1); }
+ND_ float3  UIndexToUNormFloor (const int3 index, const int3 count)         { return float3(index) / float3(count - 1); }
+ND_ float4  UIndexToUNormFloor (const int4 index, const int4 count)         { return float4(index) / float4(count - 1); }
+
+ND_ float   UIndexToUNormFloor (const uint  index, const uint  count)       { return float( index) / float( count - 1); }
+ND_ float2  UIndexToUNormFloor (const uint2 index, const uint2 count)       { return float2(index) / float2(count - 1); }
+ND_ float3  UIndexToUNormFloor (const uint3 index, const uint3 count)       { return float3(index) / float3(count - 1); }
+ND_ float4  UIndexToUNormFloor (const uint4 index, const uint4 count)       { return float4(index) / float4(count - 1); }
+
+ND_ float   UIndexToUNormFloor (const float  index, const float  count)     { return index / (count - 1.f); }
+ND_ float2  UIndexToUNormFloor (const float2 index, const float2 count)     { return index / (count - 1.f); }
+ND_ float3  UIndexToUNormFloor (const float3 index, const float3 count)     { return index / (count - 1.f); }
+ND_ float4  UIndexToUNormFloor (const float4 index, const float4 count)     { return index / (count - 1.f); }
+
+#define UIndexToSNormFloor( _index_, _count_ )                              ToSNorm( UIndexToUNormFloor( (_index_), (_count_) ))
+
+/*
+=================================================
+    UIndexToUNormRound / UIndexToSNormRound
+----
+    map coordinate 'index' in N dimension with size 'count'
+    to unorm value with rounding
+=================================================
+*/
+ND_ float   UIndexToUNormRound (const int  index, const int  count)         { return (float( index) + 0.5f) / float( count); }
+ND_ float2  UIndexToUNormRound (const int2 index, const int2 count)         { return (float2(index) + 0.5f) / float2(count); }
+ND_ float3  UIndexToUNormRound (const int3 index, const int3 count)         { return (float3(index) + 0.5f) / float3(count); }
+ND_ float4  UIndexToUNormRound (const int4 index, const int4 count)         { return (float4(index) + 0.5f) / float4(count); }
+
+ND_ float   UIndexToUNormRound (const uint  index, const uint  count)       { return (float( index) + 0.5f) / float( count); }
+ND_ float2  UIndexToUNormRound (const uint2 index, const uint2 count)       { return (float2(index) + 0.5f) / float2(count); }
+ND_ float3  UIndexToUNormRound (const uint3 index, const uint3 count)       { return (float3(index) + 0.5f) / float3(count); }
+ND_ float4  UIndexToUNormRound (const uint4 index, const uint4 count)       { return (float4(index) + 0.5f) / float4(count); }
+
+ND_ float   UIndexToUNormRound (const float  index, const float  count)     { return (index + 0.5f) / count; }
+ND_ float2  UIndexToUNormRound (const float2 index, const float2 count)     { return (index + 0.5f) / count; }
+ND_ float3  UIndexToUNormRound (const float3 index, const float3 count)     { return (index + 0.5f) / count; }
+ND_ float4  UIndexToUNormRound (const float4 index, const float4 count)     { return (index + 0.5f) / count; }
+
+#define UIndexToSNormRound( _index_, _count_ )                              ToSNorm( UIndexToUNormRound( (_index_), (_count_) ))
 
+/*
+=================================================
+    SLerp / BiSLerp
+----
+    float3  SLerp (float3 x, float3 y, float factor)
+    float3  BiSLerp (float3 x1y1, float3 x2y1, float3 x1y2, float3 x2y2, float2 factor)
+=================================================
+*/
+#define Gen_SLERP( _stype_, _vtype_ )\
+    ND_ _vtype_##3  SLerp (const _vtype_##3 x, const _vtype_##3 y, const _stype_ factor)\
+    {                                                                                   \
+        /* from GLM (MIT license) https://github.com/g-truc/glm */                      \
+        _stype_ cos_a   = Dot( x, y );                                                  \
+        _stype_ alpha   = ACos( cos_a );                                                \
+        _stype_ sin_a   = Sin( alpha );                                                 \
+        _stype_ t1      = Sin( (_stype_(1) - factor) * alpha ) / sin_a;                 \
+        _stype_ t2      = Sin( factor * alpha ) / sin_a;                                \
+        return x * t1 + y * t2;                                                         \
+    }                                                                                   \
+                                                                                        \
+    ND_ _vtype_##3  BiSLerp (const _vtype_##3 x1y1, const _vtype_##3 x2y1,              \
+                             const _vtype_##3 x1y2, const _vtype_##3 x2y2,              \
+                             const _vtype_##2 factor)                                   \
+    {                                                                                   \
+        return SLerp( SLerp( x1y1, x2y1, factor.x ),                                    \
+                      SLerp( x1y2, x2y2, factor.x ), factor.y );                        \
+    }
+
+Gen_SLERP( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_SLERP( half, half_vec_t )
+#endif
+
+#undef Gen_SLERP
+
+/*
+=================================================
+    NearestSampleArray / LinearSampleArray
+----
+    used to get array element from unorm float
+=================================================
+*/
 #define NearestSampleArray( _result_, _array_, _factor_ )                           \
     {                                                                               \
         int     lll = (_array_).length() - 1;                                       \
@@ -465,21 +868,26 @@ ND_ float4  RemapClamped (const float4 src0, const float4 src1, const float4 dst
 
 #define LinearSampleArray( _result_, _array_, _factor_ )\
     LinearSampleArray2( (_result_), (_array_), (_factor_), Lerp )
-//-----------------------------------------------------------------------------
 
+/*
+=================================================
+    InterpolateQuad / InterpolateTriangle
+----
+    can be used in TessEval shader
+=================================================
+*/
+#define InterpolateQuad( _arr_, _field_, _factor2_ )\
+    BiLerp( _arr_[0] _field_, _arr_[1] _field_, _arr_[3] _field_, _arr_[2] _field_, _factor2_.xy )
 
-#define InterpolateQuad( _arr_, _field_, _factor2_ )                \
-    (Lerp( Lerp( _arr_[0] _field_, _arr_[1] _field_, _factor2_.x ), \
-           Lerp( _arr_[3] _field_, _arr_[2] _field_, _factor2_.x ), \
-           _factor2_.y ))
-
-#define InterpolateTriangle( _arr_, _field_, _factor3_ )            \
-    ( _factor3_.x * _arr_[0] _field_ +                              \
-      _factor3_.y * _arr_[1] _field_ +                              \
+#define InterpolateTriangle( _arr_, _field_, _factor3_ )\
+    ( _factor3_.x * _arr_[0] _field_ +                  \
+      _factor3_.y * _arr_[1] _field_ +                  \
       _factor3_.z * _arr_[2] _field_ )
-//-----------------------------------------------------------------------------
 
 
+//-----------------------------------------------------------------------------
+// IsZero / IsNotZero / IsNormalized
+
 ND_ bool   IsZero (const float  x)      { return Abs(x) <= Epsilon(); }
 ND_ bool2  IsZero (const float2 v)      { return LessEqual( Abs(v), float2(Epsilon()) ); }
 ND_ bool3  IsZero (const float3 v)      { return LessEqual( Abs(v), float3(Epsilon()) ); }
@@ -493,18 +901,24 @@ ND_ bool4  IsNotZero (const float4 v)   { return Greater( Abs(v), float4(Epsilon
 #define AllZeros( v )                   All( IsZero( v ))
 #define AnyNotZero( v )                 Any( IsNotZero( v ))
 
-#define IsFinite( v )                   All(Equals( (v), (v) ))
+#define IsFinite( v )                   All(Equal( (v), (v) ))
 
 ND_ bool  IsNormalized (const float2 v, const float err)    { float d = Dot( v, v ) - 1.f;  return Abs(d) < err; }
 ND_ bool  IsNormalized (const float3 v, const float err)    { float d = Dot( v, v ) - 1.f;  return Abs(d) < err; }
 ND_ bool  IsNormalized (const float2 v)                     { return IsNormalized( v, Epsilon() ); }
 ND_ bool  IsNormalized (const float3 v)                     { return IsNormalized( v, Epsilon() ); }
-//-----------------------------------------------------------------------------
-
 
-#define SWAP_Impl( _type_ )     void  Swap (inout _type_ lhs, inout _type_ rhs) { _type_ tmp = lhs;  lhs = rhs;  rhs = tmp; }
+/*
+=================================================
+    Swap
+----
+    void  Swap (T& lhs, T& rhs)
+=================================================
+*/
+#define Gen_SWAP( _type_ )\
+    void  Swap (inout _type_ lhs, inout _type_ rhs) { _type_ tmp = lhs;  lhs = rhs;  rhs = tmp; }
 
-SWAP_Impl( float )
+Gen_SWAP( float )
 
-#undef SWAP_Impl
+#undef Gen_SWAP
 //-----------------------------------------------------------------------------
diff --git a/AE/engine/shared_data/shaders/Matrix.glsl b/AE/engine/shared_data/shaders/Matrix.glsl
index 0b955041..f734eb95 100644
--- a/AE/engine/shared_data/shaders/Matrix.glsl
+++ b/AE/engine/shared_data/shaders/Matrix.glsl
@@ -205,11 +205,10 @@ float3x3  f3x3_Rotate (const float angle, const float3 inAxis)
     return result;
 }
 
-// TODO: set [3][3] = 1
-float4x4  f4x4_RotateX (const float angle)                      { return float4x4(f3x3_RotateX( angle )); }
-float4x4  f4x4_RotateY (const float angle)                      { return float4x4(f3x3_RotateY( angle )); }
-float4x4  f4x4_RotateZ (const float angle)                      { return float4x4(f3x3_RotateZ( angle )); }
-float4x4  f4x4_Rotate  (const float angle, const float3 axis)   { return float4x4(f3x3_Rotate( angle, axis )); }
+float4x4  f4x4_RotateX (const float angle)                      { float4x4 m = float4x4(f3x3_RotateX( angle ));  m[3][3] = 1.f;  return m; }
+float4x4  f4x4_RotateY (const float angle)                      { float4x4 m = float4x4(f3x3_RotateY( angle ));  m[3][3] = 1.f;  return m; }
+float4x4  f4x4_RotateZ (const float angle)                      { float4x4 m = float4x4(f3x3_RotateZ( angle ));  m[3][3] = 1.f;  return m; }
+float4x4  f4x4_Rotate  (const float angle, const float3 axis)   { float4x4 m = float4x4(f3x3_Rotate( angle, axis ));  m[3][3] = 1.f;  return m; }
 //-----------------------------------------------------------------------------
 
 
@@ -253,7 +252,7 @@ float3  UnProject (const float4x4 invMat, const float3 pos, const float4 viewpor
 
 float3  ViewDir (const float4x4 invMat, const float2 unormPos)
 {
-    const float4    world_pos = invMat * float4(ToSNorm(unormPos), 1.0f, 1.0f);
+    const float4    world_pos = invMat * float4(ToSNorm(unormPos), -1.0f, 1.0f);
     return Normalize( world_pos.xyz / world_pos.w );
 }
 
diff --git a/AE/engine/shared_data/shaders/Normal.glsl b/AE/engine/shared_data/shaders/Normal.glsl
index 51cc4e3c..23307dd1 100644
--- a/AE/engine/shared_data/shaders/Normal.glsl
+++ b/AE/engine/shared_data/shaders/Normal.glsl
@@ -1,6 +1,10 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    Normal calculation functions
+    Normal calculation functions.
+
+    TBN matrix:
+        tan_view_dir = Normalize( MatTranspose(TBN) * viewDir );
+        world_normal = Normalize( TBN * normalMap );
 */
 
 #ifdef __cplusplus
@@ -58,9 +62,9 @@ ND_ float3  ComputeNormal (const float3 position0, const float3 position1, const
 */
 #define _impl_SmoothNormal2x1( _outNormalInWS_, _getPos_, _coord_ )     \
                                                                         \
-        const float3    v0  = _getPos_( _coord_, offset.xx );           \
-        const float3    v1  = _getPos_( _coord_, offset.yx );           \
-        const float3    v2  = _getPos_( _coord_, offset.xy );           \
+        const float3    v0  = _getPos_( _coord_, offset.xx ).xyz;       \
+        const float3    v1  = _getPos_( _coord_, offset.yx ).xyz;       \
+        const float3    v2  = _getPos_( _coord_, offset.xy ).xyz;       \
                                                                         \
         _outNormalInWS_  = Cross( v1 - v0, v2 - v0 );   /* 1-0, 2-0 */  \
         _outNormalInWS_  = Normalize( _outNormalInWS_ );                \
@@ -88,10 +92,10 @@ ND_ float3  ComputeNormal (const float3 position0, const float3 position1, const
 */
 #define _impl_SmoothNormal2x2( _outNormalInWS_, _getPos_, _coord_ )     \
                                                                         \
-        const float3    v0  = _getPos_( _coord_, offset.xx );           \
-        const float3    v1  = _getPos_( _coord_, offset.yx );           \
-        const float3    v2  = _getPos_( _coord_, offset.xy );           \
-        const float3    v3  = _getPos_( _coord_, offset.yy );           \
+        const float3    v0  = _getPos_( _coord_, offset.xx ).xyz;       \
+        const float3    v1  = _getPos_( _coord_, offset.yx ).xyz;       \
+        const float3    v2  = _getPos_( _coord_, offset.xy ).xyz;       \
+        const float3    v3  = _getPos_( _coord_, offset.yy ).xyz;       \
                                                                         \
         _outNormalInWS_  = Cross( v1 - v0, v3 - v0 );   /* 1-0, 3-0 */  \
         _outNormalInWS_ += Cross( v3 - v0, v2 - v0 );   /* 3-0, 2-0 */  \
@@ -121,15 +125,15 @@ ND_ float3  ComputeNormal (const float3 position0, const float3 position1, const
 */
 #define _impl_SmoothNormal3x3( _outNormalInWS_, _getPos_, _coord_ )     \
                                                                         \
-        const float3    v0  = _getPos_( _coord_, offset.xx );           \
-        const float3    v1  = _getPos_( _coord_, offset.yx );           \
-        const float3    v2  = _getPos_( _coord_, offset.zx );           \
-        const float3    v3  = _getPos_( _coord_, offset.xy );           \
-        const float3    v4  = _getPos_( _coord_, offset.yy );           \
-        const float3    v5  = _getPos_( _coord_, offset.zy );           \
-        const float3    v6  = _getPos_( _coord_, offset.xz );           \
-        const float3    v7  = _getPos_( _coord_, offset.yz );           \
-        const float3    v8  = _getPos_( _coord_, offset.zz );           \
+        const float3    v0  = _getPos_( _coord_, offset.xx ).xyz;       \
+        const float3    v1  = _getPos_( _coord_, offset.yx ).xyz;       \
+        const float3    v2  = _getPos_( _coord_, offset.zx ).xyz;       \
+        const float3    v3  = _getPos_( _coord_, offset.xy ).xyz;       \
+        const float3    v4  = _getPos_( _coord_, offset.yy ).xyz;       \
+        const float3    v5  = _getPos_( _coord_, offset.zy ).xyz;       \
+        const float3    v6  = _getPos_( _coord_, offset.xz ).xyz;       \
+        const float3    v7  = _getPos_( _coord_, offset.yz ).xyz;       \
+        const float3    v8  = _getPos_( _coord_, offset.zz ).xyz;       \
                                                                         \
         _outNormalInWS_  = Cross( v1 - v4, v2 - v4 );   /* 1-4, 2-4 */  \
         _outNormalInWS_ += Cross( v2 - v4, v5 - v4 );   /* 2-4, 5-4 */  \
@@ -174,7 +178,7 @@ ND_ float3  ComputeNormal (const float3 position0, const float3 position1, const
 
     // Calc normal using quad subgroup
     float3  ComputeNormalInWS_quadSg (const float3 worldPos)
-    {   
+    {
         float3  p0   = gl.subgroup.QuadBroadcast( worldPos, 0 );
         float3  p1   = gl.subgroup.QuadBroadcast( worldPos, 1 );
         float3  p2   = gl.subgroup.QuadBroadcast( worldPos, 2 );
@@ -285,10 +289,10 @@ ND_ float3  ComputeNormal (const float3 position0, const float3 position1, const
 */
 #define _impl_SmoothTBN2x2( _outTBNinWS_, _getPos_, _getUV_, _coord_ )          \
                                                                                 \
-        const float3    pos0    = _getPos_( _coord_, offset.xx );               \
-        const float3    pos1    = _getPos_( _coord_, offset.yx );               \
-        const float3    pos2    = _getPos_( _coord_, offset.zx );               \
-        const float3    pos3    = _getPos_( _coord_, offset.xy );               \
+        const float3    pos0    = _getPos_( _coord_, offset.xx ).xyz;           \
+        const float3    pos1    = _getPos_( _coord_, offset.yx ).xyz;           \
+        const float3    pos2    = _getPos_( _coord_, offset.zx ).xyz;           \
+        const float3    pos3    = _getPos_( _coord_, offset.xy ).xyz;           \
                                                                                 \
         const float2    uv0     = _getUV_( _coord_, offset.xx );                \
         const float2    uv1     = _getUV_( _coord_, offset.yx );                \
@@ -328,15 +332,15 @@ ND_ float3  ComputeNormal (const float3 position0, const float3 position1, const
 */
 #define _impl_SmoothTBN3x3( _outTBNinWS_, _getPos_, _getUV_, _coord_ )          \
                                                                                 \
-        const float3    pos0    = _getPos_( _coord_, offset.xx );               \
-        const float3    pos1    = _getPos_( _coord_, offset.yx );               \
-        const float3    pos2    = _getPos_( _coord_, offset.zx );               \
-        const float3    pos3    = _getPos_( _coord_, offset.xy );               \
-        const float3    pos4    = _getPos_( _coord_, offset.yy );               \
-        const float3    pos5    = _getPos_( _coord_, offset.zy );               \
-        const float3    pos6    = _getPos_( _coord_, offset.xz );               \
-        const float3    pos7    = _getPos_( _coord_, offset.yz );               \
-        const float3    pos8    = _getPos_( _coord_, offset.zz );               \
+        const float3    pos0    = _getPos_( _coord_, offset.xx ).xyz;           \
+        const float3    pos1    = _getPos_( _coord_, offset.yx ).xyz;           \
+        const float3    pos2    = _getPos_( _coord_, offset.zx ).xyz;           \
+        const float3    pos3    = _getPos_( _coord_, offset.xy ).xyz;           \
+        const float3    pos4    = _getPos_( _coord_, offset.yy ).xyz;           \
+        const float3    pos5    = _getPos_( _coord_, offset.zy ).xyz;           \
+        const float3    pos6    = _getPos_( _coord_, offset.xz ).xyz;           \
+        const float3    pos7    = _getPos_( _coord_, offset.yz ).xyz;           \
+        const float3    pos8    = _getPos_( _coord_, offset.zz ).xyz;           \
                                                                                 \
         const float2    uv0     = _getUV_( _coord_, offset.xx );                \
         const float2    uv1     = _getUV_( _coord_, offset.yx );                \
diff --git a/AE/engine/shared_data/shaders/PBR.glsl b/AE/engine/shared_data/shaders/PBR.glsl
index 9c3df8e9..537fa424 100644
--- a/AE/engine/shared_data/shaders/PBR.glsl
+++ b/AE/engine/shared_data/shaders/PBR.glsl
@@ -84,7 +84,7 @@ float3  SpecularBRDF (const float3 albedo, const float3 lightColor, const float3
             float   alpha   = rough * rough;
             float   alpha2  = alpha * alpha;
             float   denom   = n_dot_h * n_dot_h * (alpha2 - 1.0f) + 1.0f;
-            D = (alpha2) / (Pi() * denom*denom); 
+            D = (alpha2) / (Pi() * denom*denom);
         }
 
         float  G;
@@ -99,7 +99,7 @@ float3  SpecularBRDF (const float3 albedo, const float3 lightColor, const float3
         float3 F;
         {
             float3  F0 = Lerp( float3(0.04f), albedo, metallic );
-            F = F0 + (1.0f - F0) * Pow( 1.0f - n_dot_v, 5.0f ); 
+            F = F0 + (1.0f - F0) * Pow( 1.0f - n_dot_v, 5.0f );
         }
 
         float3  spec = D * F * G / (4.0f * n_dot_l * n_dot_v);
diff --git a/AE/engine/shared_data/shaders/Quaternion.glsl b/AE/engine/shared_data/shaders/Quaternion.glsl
index 4ffc8f9a..da9090b6 100644
--- a/AE/engine/shared_data/shaders/Quaternion.glsl
+++ b/AE/engine/shared_data/shaders/Quaternion.glsl
@@ -119,7 +119,7 @@ quat  QMul (const quat left, const quat right)
 {
     quat    ret;
 
-    ret.data.xyz    = left.data.w * right.data.xyz + 
+    ret.data.xyz    = left.data.w * right.data.xyz +
                       left.data.xyz * right.data.w +
                       Cross( left.data.xyz, right.data.xyz );
 
diff --git a/AE/engine/shared_data/shaders/Ray.glsl b/AE/engine/shared_data/shaders/Ray.glsl
index 8d9963ec..475fabd8 100644
--- a/AE/engine/shared_data/shaders/Ray.glsl
+++ b/AE/engine/shared_data/shaders/Ray.glsl
@@ -20,14 +20,34 @@ struct Ray
 };
 
 ND_ Ray     Ray_Create (const float3 origin, const float3 direction, const float tmin);
-ND_ Ray     Ray_FromScreen (const float3 origin, const quat rotation, const float fovX, const float nearPlane, const int2 screenSize, const int2 screenCoord);
-ND_ Ray     Ray_From (const float3 leftBottom, const float3 rightBottom, const float3 leftTop, const float3 rightTop, const float3 origin, const float nearPlane, const float2 unormCoord);
+
+ND_ Ray     Ray_FromScreen (const float3 origin, const float fovX, const float nearPlane,
+                            const float2 screenSizePx, const float2 screenCoordPx);
+
+ND_ Ray     Ray_From (const float3 leftBottom, const float3 rightBottom, const float3 leftTop, const float3 rightTop,
+                      const float3 origin, const float nearPlane, const float2 unormCoord);
 ND_ Ray     Ray_From (const float4x4 invViewProj, const float3 origin, const float nearPlane, const float2 unormCoord);
+
+ND_ Ray     Ray_FromFlatScreen (const float3 origin, const float distanceToEye, float2 screenSize, const float nearPlane, const float2 snormCoord);
+ND_ Ray     Ray_FromCurvedScreen (const float3 origin, const float distanceToEye, const float screenRadius, float2 screenSize, const float nearPlane, const float2 snormCoord);
+
+ND_ Ray     Ray_PlaneToVR180 (const float ipd, const float3 origin, const float nearPlane, float2 uv);
+ND_ Ray     Ray_PlaneToVR360 (const float ipd, const float3 origin, const float nearPlane, float2 uv);
+ND_ Ray     Ray_PlaneTo360 (const float3 origin, const float nearPlane, const float2 uv);
+ND_ Ray     Ray_PlaneToSphere (float2 fov, const float3 origin, const float nearPlane, float2 uv);
+
+ND_ float2  Inverted_PlaneToVR180 (const float3 rayDir, const uint eye);
+ND_ float2  Inverted_PlaneToVR360 (const float3 rayDir, const uint eye);
+ND_ float2  Inverted_PlaneTo360 (const float3 rayDir);
+ND_ float2  Inverted_PlaneToCubemap360 (const float3 rayDir);
+ND_ float2  Inverted_PlaneToCubemapVR360 (const float3 rayDir, const uint eye);
+
 ND_ float3  Ray_CalcX (const Ray ray, const float2 pointYZ);
 ND_ float3  Ray_CalcY (const Ray ray, const float2 pointXZ);
 ND_ float3  Ray_CalcZ (const Ray ray, const float2 pointXY);
 ND_ bool    Ray_Contains (const Ray ray, const float3 point);
     void    Ray_Rotate (inout Ray ray, const quat rotation);
+    void    Ray_Rotate (inout Ray ray, const float3x3 rotation);
     void    Ray_Move (inout Ray ray, const float delta);
     void    Ray_SetLength (inout Ray ray, const float length);
     void    Ray_SetOrigin (inout Ray ray, const float3 origin);
@@ -43,9 +63,9 @@ Ray  Ray_Create (const float3 origin, const float3 direction, const float tmin)
 {
     Ray     ray;
     ray.origin  = origin;
-    ray.t       = tmin;
     ray.dir     = direction;
-    ray.pos     = FusedMulAdd( ray.dir, float3(ray.t), ray.origin );
+
+    Ray_SetLength( INOUT ray, tmin );  // set 't' and 'pos'
     return ray;
 }
 
@@ -56,23 +76,19 @@ Ray  Ray_Create (const float3 origin, const float3 direction, const float tmin)
     create ray for raytracing, raymarching, ...
 =================================================
 */
-Ray  Ray_FromScreen (const float3 origin, const quat rotation, const float fovX, const float nearPlane,
-                     const int2 screenSize, const int2 screenCoord)
+Ray  Ray_FromScreen (const float3 origin, const float fovX, const float nearPlane,
+                     const float2 screenSize, const float2 screenCoord)
 {
-    float2  scr_size    = float2(screenSize);
-    float2  coord       = float2(screenCoord);
-
-    float   ratio       = scr_size.y / scr_size.x;
-    float   fovY        = fovX * ratio;
-    float2  scale       = nearPlane / Cos( float2(fovX, fovY) * 0.5 );
-    float2  uv          = (coord - scr_size * 0.5) / (scr_size.x * 0.5) * scale;
+    float   ratio   = screenSize.y / screenSize.x;
+    float   fovY    = fovX * ratio;
+    float2  scale   = nearPlane / Cos( float2(fovX, fovY) * 0.5 );
+    float2  uv      = (screenCoord - screenSize * 0.5) / (screenSize.x * 0.5) * scale;
 
     Ray     ray;
     ray.origin  = origin;
-    ray.dir     = Normalize( QMul( rotation, Normalize( float3(uv.x, -uv.y, -0.5) )));
-    ray.t       = nearPlane;
-    ray.pos     = FusedMulAdd( ray.dir, float3(ray.t), ray.origin );
+    ray.dir     = Normalize( float3( uv.x, -uv.y, -0.5 ));
 
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
     return ray;
 }
 
@@ -93,9 +109,8 @@ Ray  Ray_From (const float3 leftBottom, const float3 rightBottom, const float3 l
     Ray     ray;
     ray.origin  = origin;
     ray.dir     = Normalize( vec );
-    ray.t       = nearPlane;
-    ray.pos     = FusedMulAdd( ray.dir, float3(ray.t), ray.origin );
 
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
     return ray;
 }
 
@@ -114,9 +129,262 @@ Ray  Ray_From (const float4x4 invViewProj, const float3 origin, const float near
     Ray     ray;
     ray.origin  = origin;
     ray.dir     = dir;
-    ray.pos     = origin + dir * nearPlane;
-    ray.t       = nearPlane;
 
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
+    return ray;
+}
+
+/*
+=================================================
+    Ray_FromFlatScreen
+----
+    _______  -- screen
+
+       * -- eye
+=================================================
+*/
+Ray  Ray_FromFlatScreen (const float3 origin, const float distanceToEye, float2 screenSize, const float nearPlane, const float2 snormCoord)
+{
+    screenSize *= 0.5f;
+
+    Ray     ray;
+    ray.origin  = origin;
+    ray.dir     = Normalize(float3( screenSize * snormCoord, distanceToEye ));
+
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
+    return ray;
+}
+
+/*
+=================================================
+    Ray_FromCurvedScreen
+----
+    Field of view on Y-axis is larger because of screen curvature.
+    _____  -- curved screen
+   /     \
+      * --- eye
+=================================================
+*/
+Ray  Ray_FromCurvedScreen (const float3 origin, const float distanceToEye, const float screenRadius, float2 screenSize, const float nearPlane, const float2 snormCoord)
+{
+    screenSize *= 0.5f;
+
+    float2  corner;
+    corner.y = screenSize.x / screenRadius;
+    corner.x = Sqrt( 1.f - corner.y * corner.y );
+
+    Ray     ray;
+    ray.origin  = origin;
+    ray.dir     = Normalize(float3( corner.y * snormCoord.x,
+                                    screenSize.y * snormCoord.y,
+                                    (screenRadius - distanceToEye) - corner.x ));
+
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
+    return ray;
+}
+
+/*
+=================================================
+    Ray_PlaneToVR180
+----
+    VR180  left-right
+    Z+ - forward, X+ - right, Y+ - down
+=================================================
+*/
+Ray  Ray_PlaneToVR180 (const float ipd, const float3 origin, const float nearPlane, float2 uv)
+{
+    // from https://developers.google.com/vr/jump/rendering-ods-content.pdf
+    float   scale   = ipd * 0.5 * (uv.x < 0.5 ? -1.0 : 1.0);
+            uv      = float2( (uv.x < 0.5 ? uv.x : uv.x - 0.5) * 0.5 + 0.375, uv.y );   // map [0, 1] to [0.375, 0.875]
+    float   theta   = (-uv.x) * 2.0 * Pi();
+    float   phi     = uv.y * Pi() - Pi() * 0.5;
+    float   sin_t   = Sin( theta );
+    float   cos_t   = Cos( theta );
+    float   cos_p   = Cos( phi );
+
+    Ray     ray;
+    ray.origin  = origin + float3( cos_t, 0.0, sin_t ) * scale;
+    ray.dir     = float3( sin_t * cos_p, Sin(phi), -cos_t * cos_p );
+
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
+    return ray;
+}
+
+float2  Inverted_PlaneToVR180 (const float3 rayDir, const uint eye)
+{
+    float   theta   = ASin( rayDir.y );
+    float   phi     = ATan( rayDir.z, rayDir.x );
+
+            theta   = (theta + Pi() * 0.5f) / Pi();
+            phi     = (Pi() - phi) / Pi2();
+            phi     = Fract( phi - 0.125f ) * 2.f + (eye == 0 ? 0.f : 0.5f);
+
+    return float2( phi, theta );
+}
+
+/*
+=================================================
+    Ray_PlaneToVR360
+----
+    VR360  top-bottom
+    Z+ - forward, X+ - right, Y+ - down
+=================================================
+*/
+Ray  Ray_PlaneToVR360 (const float ipd, const float3 origin, const float nearPlane, float2 uv)
+{
+    // from https://developers.google.com/vr/jump/rendering-ods-content.pdf
+    float   scale   = ipd * 0.5 * (uv.y < 0.5 ? -1.0 : 1.0);
+            uv      = float2( uv.x, (uv.y < 0.5 ? uv.y : uv.y - 0.5) * 2.0 );
+    float   theta   = (-uv.x) * 2.0 * Pi();
+    float   phi     = uv.y * Pi() - Pi() * 0.5;
+    float   sin_t   = Sin( theta );
+    float   cos_t   = Cos( theta );
+    float   cos_p   = Cos( phi );
+
+    Ray     ray;
+    ray.origin  = origin + float3( cos_t, 0.0, sin_t ) * scale;
+    ray.dir     = float3( sin_t * cos_p, Sin(phi), -cos_t * cos_p );
+
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
+    return ray;
+}
+
+float2  Inverted_PlaneToVR360 (const float3 rayDir, const uint eye)
+{
+    float   theta   = ASin( rayDir.y );
+    float   phi     = ATan( rayDir.z, rayDir.x );
+
+            theta   = (theta + Pi() * 0.5f) * 0.5f / Pi();
+            theta   += (eye == 0 ? 0.f : 0.5f);
+            phi     = (Pi() - phi) / Pi2();
+
+    return float2( Fract( phi - 0.75f ), theta );
+}
+
+/*
+=================================================
+    Ray_PlaneTo360
+----
+    Z+ - forward, X+ - right, Y+ - down
+=================================================
+*/
+Ray  Ray_PlaneTo360 (const float3 origin, const float nearPlane, const float2 uv)
+{
+    float   theta   = (-uv.x) * 2.0 * Pi();
+    float   phi     = uv.y * Pi() - Pi() * 0.5;
+    float   cos_p   = Cos( phi );
+
+    Ray     ray;
+    ray.origin  = origin;
+    ray.dir     = float3( Sin(theta) * cos_p, Sin(phi), -Cos(theta) * cos_p );
+
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
+    return ray;
+}
+
+float2  Inverted_PlaneTo360 (const float3 rayDir)
+{
+    float   theta   = ASin( rayDir.y );
+    float   phi     = ATan( rayDir.z, rayDir.x );
+
+            theta   = (theta + Pi() * 0.5) / Pi();
+            phi     = (Pi() - phi) / Pi2();
+
+    return float2( Fract( phi - 0.75 ), theta );
+}
+
+/*
+=================================================
+    Inverted_PlaneToCubemap360
+----
+    for webm 360;  top plane (horizontal): left, front, right;  bottom plane (vertical): down, back, up.
+=================================================
+*/
+float2  Inverted_PlaneToCubemap360 (const float3 c)
+{
+    // front (xy space)
+    if ( All(bool3( Abs(c.x) <= c.z,  c.z > 0.f,  Abs(c.y) <= c.z )))
+        return Lerp( float2(1.0/3.0, 0.0), float2(2.0/3.0, 0.5), ToUNorm(c.xy / c.z) );
+
+    // right (zy space)
+    if ( All(bool3( Abs(c.z) <= c.x,  c.x > 0.f,  Abs(c.y) <= c.x )))
+        return Lerp( float2(2.0/3.0, 0.0), float2(1.0, 0.5), ToUNorm(float2( -c.z, c.y ) / c.x) );
+
+    // back (xy space)
+    if ( All(bool3( Abs(c.x) <= -c.z,  c.z < 0.f,  Abs(c.y) <= -c.z )))
+        return Lerp( float2(2.0/3.0, 1.0), float2(1.0/3.0, 0.5), ToUNorm(c.yx / -c.z) );
+
+    // left (zy space)
+    if ( All(bool3( Abs(c.z) <= -c.x,  c.x < 0.f,  Abs(c.y) <= -c.x )))
+        return Lerp( float2(0.0, 0.0), float2(1.0/3.0, 0.5), ToUNorm(c.zy / -c.x) );
+
+    // down (xz space)
+    if ( c.y > 0.f )
+        return Lerp( float2(1.0/3.0, 1.0), float2(0.0, 0.5), ToUNorm(c.zx / c.y) );
+
+    // up (xz space)
+    return Lerp( float2(1.0, 1.0), float2(2.0/3.0, 0.5), ToUNorm(float2( c.z, -c.x ) / c.y) );
+}
+
+/*
+=================================================
+    Inverted_PlaneToCubemap360
+----
+    for webm VR360;  left plane (vertical): left, front, right;  bottom plane (vertical): down, back, up.
+=================================================
+*/
+float2  Inverted_PlaneToCubemapVR360 (const float3 c, const uint eye)
+{
+    float2  uv;
+
+    // front (xy space)
+    if ( All(bool3( Abs(c.x) <= c.z,  c.z > 0.f,  Abs(c.y) <= c.z )))
+        uv = Lerp( float2(1.0/3.0, 0.0), float2(2.0/3.0, 0.5), ToUNorm(c.xy / c.z) );
+    else
+    // right (zy space)
+    if ( All(bool3( Abs(c.z) <= c.x,  c.x > 0.f,  Abs(c.y) <= c.x )))
+        uv = Lerp( float2(2.0/3.0, 0.0), float2(1.0, 0.5), ToUNorm(float2( -c.z, c.y ) / c.x) );
+    else
+    // back (xy space)
+    if ( All(bool3( Abs(c.x) <= -c.z,  c.z < 0.f,  Abs(c.y) <= -c.z )))
+        uv = Lerp( float2(2.0/3.0, 1.0), float2(1.0/3.0, 0.5), ToUNorm(c.yx / c.z) );
+    else
+    // left (zy space)
+    if ( All(bool3( Abs(c.z) <= -c.x,  c.x < 0.f,  Abs(c.y) <= -c.x )))
+        uv = Lerp( float2(0.0, 0.0), float2(1.0/3.0, 0.5), ToUNorm(c.zy / -c.x) );
+    else
+    // down (xz space)
+    if ( c.y > 0.f )
+        uv = Lerp( float2(1.0, 1.0), float2(2.0/3.0, 0.5), ToUNorm(c.zx / -c.y) );
+    else
+    // up (xz space)
+        uv = Lerp( float2(1.0/3.0, 1.0), float2(0.0, 0.5), ToUNorm(float2( -c.z, c.x ) / c.y) );
+
+    uv = uv.yx;
+    uv.x = uv.x * 0.5f + (eye == 0 ? 0.f : 0.5f);
+    return uv;
+}
+
+/*
+=================================================
+    Ray_PlaneToSphere
+----
+    Z+ - forward, X+ - right, Y+ - down
+=================================================
+*/
+Ray  Ray_PlaneToSphere (float2 fov, const float3 origin, const float nearPlane, float2 uv)
+{
+            uv      = ToSNorm( uv );
+            fov     *= 0.5;
+    float   theta   = fov.x * -uv.x + Pi();
+    float   phi     = fov.y * uv.y;
+    float   cos_p   = Cos( phi );
+
+    Ray     ray;
+    ray.origin  = origin;
+    ray.dir     = float3( Sin(theta) * cos_p, Sin(phi), -Cos(theta) * cos_p );
+
+    Ray_SetLength( INOUT ray, nearPlane );  // set 't' and 'pos'
     return ray;
 }
 
@@ -159,20 +427,28 @@ bool  Ray_Contains (const Ray ray, const float3 point)
     const float2    z = ray.pos.zz + ray.dir.zz * (point.xy - ray.pos.xy) / ray.dir.xy;
 
     // z(x) == z(y) and z(x) == point.z
-    return Equals( z.x, z.y ) and Equals( z.x, point.z );
+    return Equal( z.x, z.y ) and Equal( z.x, point.z );
 }
 
 /*
 =================================================
     Ray_Rotate
+----
+    view matrix must be transposed
 =================================================
 */
 void  Ray_Rotate (inout Ray ray, const quat rotation)
 {
     // ray.origin - const
     ray.dir = Normalize( QMul( rotation, ray.dir ));
-    ray.t   = Distance( ray.origin, ray.pos );
-    ray.pos = ray.t * ray.dir;
+    ray.pos = FusedMulAdd( ray.dir, float3(ray.t), ray.origin );
+}
+
+void  Ray_Rotate (inout Ray ray, const float3x3 rotation)
+{
+    // ray.origin - const
+    ray.dir = Normalize( rotation * ray.dir );
+    ray.pos = FusedMulAdd( ray.dir, float3(ray.t), ray.origin );
 }
 
 /*
diff --git a/AE/engine/shared_data/shaders/ReliefMapping.glsl b/AE/engine/shared_data/shaders/ReliefMapping.glsl
index dc545527..ff978fcf 100644
--- a/AE/engine/shared_data/shaders/ReliefMapping.glsl
+++ b/AE/engine/shared_data/shaders/ReliefMapping.glsl
@@ -16,14 +16,23 @@
 ND_ float2  ParallaxMapping (gl::CombinedTex2D<float> heightMap,
                              const float2 uv, const float3 viewDir,
                              const float heightScale, const float parallaxBias);
+ND_ float3  ParallaxMapping (gl::CombinedTexCube<float> heightMap,
+                             const float3 uv, const float3 viewDir,
+                             const float heightScale, const float parallaxBias);
 
 ND_ float2  SteepParallaxMapping (gl::CombinedTex2D<float> heightMap,
                                   const float2 uv, const float3 viewDir,
                                   const int numLayers, const float heightScale);
+ND_ float3  SteepParallaxMapping (gl::CombinedTexCube<float> heightMap,
+                                  const float3 uv, const float3 viewDir,
+                                  const int numLayers, const float heightScale);
 
 ND_ float2  ParallaxOcclusionMapping (gl::CombinedTex2D<float> heightMap,
                                       const float2 uv, const float3 viewDir,
                                       const int numLayers, const float heightScale);
+ND_ float3  ParallaxOcclusionMapping (gl::CombinedTexCube<float> heightMap,
+                                      const float3 uv, const float3 viewDir,
+                                      const int numLayers, const float heightScale);
 
 
 // returns shading factor
@@ -54,6 +63,13 @@ float2  ParallaxMapping (gl::CombinedTex2D<float> heightMap, const float2 uv, co
     return uv - p;
 }
 
+float3  ParallaxMapping (gl::CombinedTexCube<float> heightMap, const float3 uv, const float3 viewDir, const float heightScale, const float parallaxBias)
+{
+    float   h = ExtractDepth( heightMap, uv );
+    float3  p = viewDir * (h * (heightScale * 0.5f) + parallaxBias);
+    return uv - p;
+}
+
 /*
 =================================================
     SteepParallaxMapping
@@ -79,6 +95,26 @@ float2  SteepParallaxMapping (gl::CombinedTex2D<float> heightMap, const float2 u
     return cur_uv;
 }
 
+float3  SteepParallaxMapping (gl::CombinedTexCube<float> heightMap, const float3 uv, const float3 viewDir, const int numLayers, const float heightScale)
+{
+    const float     layer_depth     = 1.0f / numLayers;
+    const float3    delta_uv        = viewDir * heightScale / numLayers;
+    float           cur_layer_depth = 0.0f;
+    float3          cur_uv          = uv;
+    float           height          = ExtractDepth( heightMap, cur_uv );
+
+    for (int i = 0; i < numLayers; ++i)
+    {
+        cur_layer_depth += layer_depth;
+        cur_uv          -= delta_uv;
+        height          = ExtractDepth( heightMap, cur_uv );
+
+        if ( height < cur_layer_depth )
+            break;
+    }
+    return cur_uv;
+}
+
 /*
 =================================================
     ParallaxOcclusionMapping
@@ -109,6 +145,31 @@ float2  ParallaxOcclusionMapping (gl::CombinedTex2D<float> heightMap, const floa
     return Lerp( cur_uv, prev_uv, next_depth / (next_depth - prev_depth) );
 }
 
+float3  ParallaxOcclusionMapping (gl::CombinedTexCube<float> heightMap, const float3 uv, const float3 viewDir, const int numLayers, const float heightScale)
+{
+    const float     layer_depth     = 1.0f / numLayers;
+    const float3    delta_uv        = viewDir * heightScale / numLayers;
+    float           cur_layer_depth = 0.0f;
+    float3          cur_uv          = uv;
+    float           height          = ExtractDepth( heightMap, cur_uv );
+
+    for (int i = 0; i < numLayers; ++i)
+    {
+        cur_layer_depth += layer_depth;
+        cur_uv          -= delta_uv;
+        height          = ExtractDepth( heightMap, cur_uv );
+
+        if ( height < cur_layer_depth )
+            break;
+    }
+
+    const float3    prev_uv     = cur_uv + delta_uv;
+    const float     next_depth  = height - cur_layer_depth;
+    const float     prev_depth  = ExtractDepth( heightMap, prev_uv ) - cur_layer_depth + layer_depth;
+
+    return Lerp( cur_uv, prev_uv, next_depth / (next_depth - prev_depth) );
+}
+
 /*
 =================================================
     ParallaxOcclusionSoftShadow
diff --git a/AE/engine/shared_data/shaders/SDF.glsl b/AE/engine/shared_data/shaders/SDF.glsl
index 14eca785..de94b3ac 100644
--- a/AE/engine/shared_data/shaders/SDF.glsl
+++ b/AE/engine/shared_data/shaders/SDF.glsl
@@ -82,11 +82,15 @@ ND_ float  SDF_OpSymX (const float3 position, float (*sdf)(float3));
 ND_ float  SDF_OpSymXZ (const float2 position, float (*sdf)(float2));
 ND_ float  SDF_OpSymXZ (const float3 position, float (*sdf)(float3));
 
-ND_ float  SDF_InfRepetition (const float2 position, const float2 center, float (*sdf)(float2));
-ND_ float  SDF_InfRepetition (const float3 position, const float3 center, float (*sdf)(float3));
-
-ND_ float  SDF_Repetition (const float2 position, const float step, const float2 count, float (*sdf)(float2));
-ND_ float  SDF_Repetition (const float3 position, const float step, const float3 count, float (*sdf)(float3));
+ND_ float  SDF_InfRepetition (const float2 position, const float  step, float (*sdf)(float2));
+ND_ float  SDF_InfRepetition (const float2 position, const float2 step, float (*sdf)(float2));
+ND_ float  SDF_InfRepetition (const float3 position, const float  step, float (*sdf)(float3));
+ND_ float  SDF_InfRepetition (const float3 position, const float3 step, float (*sdf)(float3));
+
+ND_ float  SDF_Repetition (const float2 position, const float  step, const float2 count, float (*sdf)(float2));
+ND_ float  SDF_Repetition (const float2 position, const float2 step, const float2 count, float (*sdf)(float2));
+ND_ float  SDF_Repetition (const float3 position, const float  step, const float3 count, float (*sdf)(float3));
+ND_ float  SDF_Repetition (const float3 position, const float3 step, const float3 count, float (*sdf)(float3));
 #endif
 
 
diff --git a/AE/engine/shared_data/shaders/Sphere.glsl b/AE/engine/shared_data/shaders/Sphere.glsl
index 7c249ecf..f4b4c277 100644
--- a/AE/engine/shared_data/shaders/Sphere.glsl
+++ b/AE/engine/shared_data/shaders/Sphere.glsl
@@ -14,5 +14,16 @@ struct Sphere
     float3  center;
     float   radius;
 };
+
+ND_ Sphere  Sphere_Create (const float3 center, const float radius);
 //-----------------------------------------------------------------------------
 
+
+
+Sphere  Sphere_Create (const float3 center, const float radius)
+{
+    Sphere  result;
+    result.center   = center;
+    result.radius   = radius;
+    return result;
+}
diff --git a/AE/engine/shared_data/shaders/Spline.glsl b/AE/engine/shared_data/shaders/Spline.glsl
new file mode 100644
index 00000000..a7cb73d9
--- /dev/null
+++ b/AE/engine/shared_data/shaders/Spline.glsl
@@ -0,0 +1,212 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Spline interpolation.
+*/
+
+#ifdef __cplusplus
+# pragma once
+#endif
+
+#include "Math.glsl"
+
+/*
+=================================================
+    CatmullRom
+----
+    T  CatmullRom (T p0, T p1, T p2, T p3, Scalar t)
+----
+    Result will be in range [p1, p2],
+    points p0 and p3 used as control points.
+----
+    Multiple calls:
+        CatmullRom( p4, p5, p6, p7, a );    result in range: [p5, p6]
+        CatmullRom( p5, p6, p7, p8, b );    result in range: [p6, p7]
+=================================================
+*/
+#define Gen_CATMULLROM1( _stype_, _type_ )                                          \
+    ND_ _type_  CatmullRom (_type_ p0, _type_ p1, _type_ p2, _type_ p3, _stype_ t)  \
+    {                                                                               \
+        _type_  a0  = Lerp( p0, p1, t + _stype_(1.0) );                             \
+        _type_  a1  = Lerp( p1, p2, t );                                            \
+        _type_  a2  = Lerp( p2, p3, t - _stype_(1.0) );                             \
+        _type_  b0  = Lerp( a0, a1, ToUNorm(t) );                                   \
+        _type_  b1  = Lerp( a1, a2, t * _stype_(0.5) );                             \
+        return Lerp( b0, b1, t );                                                   \
+    }
+
+#define Gen_CATMULLROM( _stype_, _vtype_ )  \
+    Gen_CATMULLROM1( _stype_, _stype_ )     \
+    Gen_CATMULLROM1( _stype_, _vtype_##2 )  \
+    Gen_CATMULLROM1( _stype_, _vtype_##3 )  \
+    Gen_CATMULLROM1( _stype_, _vtype_##4 )
+
+Gen_CATMULLROM( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_CATMULLROM( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_CATMULLROM( double, double_vec_t )
+#endif
+
+#undef Gen_CATMULLROM1
+#undef Gen_CATMULLROM
+
+/*
+=================================================
+    QLerp
+----
+    T  QLerp (T p0, T p1, Scalar t)
+=================================================
+*/
+#define Gen_QLERP1( _stype_, _type_ )                                       \
+    ND_ _type_  QLerp (_type_ p0, _type_ p1, _stype_ t)                     \
+    {                                                                       \
+        /* SmoothStep() - Hermite interpolation */                          \
+        return Lerp( p0, p1, SmoothStep( _stype_(0.0), _stype_(1.0), t ));  \
+    }
+
+#define Gen_QLERP( _stype_, _vtype_ )   \
+    Gen_QLERP1( _stype_, _stype_ )      \
+    Gen_QLERP1( _stype_, _vtype_##2 )   \
+    Gen_QLERP1( _stype_, _vtype_##3 )   \
+    Gen_QLERP1( _stype_, _vtype_##4 )
+
+Gen_QLERP( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_QLERP( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_QLERP( double, double_vec_t )
+#endif
+
+#undef Gen_QLERP1
+#undef Gen_QLERP
+
+/*
+=================================================
+    Bezier3
+----
+    T  Bezier3 (T p0, T p1, T p2, Scalar t)
+----
+    Result is interpolation between all 3 points (p0, p1, p2), but:
+    * may not intersects with specified points.
+    * may walk outside of points bounding box.
+----
+    Multiple calls:
+        Bezier3( p0, p1, p2, a );
+        Bezier3( p2, p3, p4, b );
+=================================================
+*/
+#define Gen_BEZIER3A( _stype_, _type_ )                                 \
+    ND_ _type_  Bezier3 (_type_ p0, _type_ p1, _type_ p2, _stype_ t)    \
+    {                                                                   \
+        _type_  a = Lerp( p0, p1, t );                                  \
+        _type_  b = Lerp( p1, p2, t );                                  \
+        return Lerp( a, b, t );                                         \
+    }
+
+#define Gen_BEZIER3( _stype_, _vtype_ ) \
+    Gen_BEZIER3A( _stype_, _stype_ )    \
+    Gen_BEZIER3A( _stype_, _vtype_##2 ) \
+    Gen_BEZIER3A( _stype_, _vtype_##3 ) \
+    Gen_BEZIER3A( _stype_, _vtype_##4 )
+
+Gen_BEZIER3( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_BEZIER3( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_BEZIER3( double, double_vec_t )
+#endif
+
+#undef Gen_BEZIER3A
+#undef Gen_BEZIER3
+
+/*
+=================================================
+    Bezier4
+----
+    T  Bezier4 (T p0, T p1, T p2, T p4, Scalar t)
+----
+    Result is interpolation between all 4 points (p0, p1, p2, p4), but:
+    * may not intersects with specified points.
+    * may walk outside of points bounding box.
+----
+    Multiple calls:
+        Bezier4( p0, p1, p2, p3, a );
+        Bezier4( p3, p4, p5, p6, b );
+=================================================
+*/
+#define Gen_BEZIER4A( _stype_, _type_ )                                         \
+    ND_ _type_  Bezier4 (_type_ p0, _type_ p1, _type_ p2, _type_ p3, _stype_ t) \
+    {                                                                           \
+        _type_  a = Lerp( p0, p1, t );                                          \
+        _type_  b = Lerp( p1, p2, t );                                          \
+        _type_  c = Lerp( p2, p3, t );                                          \
+        _type_  m = Lerp( a,  b,  t );                                          \
+        _type_  n = Lerp( b,  c,  t );                                          \
+        return Lerp( m, n, t );                                                 \
+    }
+
+#define Gen_BEZIER4( _stype_, _vtype_ ) \
+    Gen_BEZIER4A( _stype_, _stype_ )    \
+    Gen_BEZIER4A( _stype_, _vtype_##2 ) \
+    Gen_BEZIER4A( _stype_, _vtype_##3 ) \
+    Gen_BEZIER4A( _stype_, _vtype_##4 )
+
+Gen_BEZIER4( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_BEZIER4( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_BEZIER4( double, double_vec_t )
+#endif
+
+#undef Gen_BEZIER4A
+#undef Gen_BEZIER4
+
+/*
+=================================================
+    BSpline
+----
+    T  BSpline (T p0, T p1, T p2, T p4, Scalar t)
+----
+    Result will be in range [p1, p2],
+    points p0 and p3 used as control points.
+----
+    Multiple calls:
+        BSpline( p4, p5, p6, p7, a );   result in range: [p5, p6]
+        BSpline( p5, p6, p7, p8, b );   result in range: [p6, p7]
+=================================================
+*/
+#define Gen_BSPLINE1( _stype_, _type_ )                                         \
+    ND_ _type_  BSpline (_type_ p0, _type_ p1, _type_ p2, _type_ p3, _stype_ t) \
+    {                                                                           \
+        _type_  c0 = (p0 + _stype_(4.0) * p1 + p2) / _stype_(6.0);              \
+        _type_  c1 = (p2 - p0) * _stype_(0.5);                                  \
+        _type_  c2 = (p0 + p2) * _stype_(0.5) - p1;                             \
+        _type_  c3 = (p3 - p0) / _stype_(6.0) + (p1 - p2) * _stype_(0.5);       \
+        return c0 + (c1 * t) + (c2 * t*t) + (c3 * t*t*t);                       \
+    }
+
+#define Gen_BSPLINE( _stype_, _vtype_ ) \
+    Gen_BSPLINE1( _stype_, _stype_ )    \
+    Gen_BSPLINE1( _stype_, _vtype_##2 ) \
+    Gen_BSPLINE1( _stype_, _vtype_##3 ) \
+    Gen_BSPLINE1( _stype_, _vtype_##4 )
+
+Gen_BSPLINE( float, float_vec_t )
+
+#if AE_ENABLE_HALF_TYPE
+    Gen_BSPLINE( half, half_vec_t )
+#endif
+#if AE_ENABLE_DOUBLE_TYPE
+    Gen_BSPLINE( double, double_vec_t )
+#endif
+
+#undef Gen_BSPLINE1
+#undef Gen_BSPLINE
diff --git a/AE/engine/shared_data/shaders/aestyle.glsl.h b/AE/engine/shared_data/shaders/aestyle.glsl.h
index f36e9e92..17bddae6 100644
--- a/AE/engine/shared_data/shaders/aestyle.glsl.h
+++ b/AE/engine/shared_data/shaders/aestyle.glsl.h
@@ -29,27 +29,49 @@
 #define INOUT
 #define OUT
 
+// used for vec/mat type building (templates)
+#define float_vec_t     float
+#define float_mat_t     float
+#define double_vec_t    double
+#define double_mat_t    double
+#define int_vec_t       int
+#define uint_vec_t      uint
+#define bool_vec_t      bool
+#define sbyte_vec_t     sbyte
+#define ubyte_vec_t     ubyte
+#define sshort_vec_t    sshort
+#define ushort_vec_t    ushort
+#define half_vec_t      half
+#define half_mat_t      half
+#define slong_vec_t     slong
+#define ulong_vec_t     ulong
+
 
 // Math types
 #if 1
 #include "aestyle_shared.h"
 
 template <typename T>           ND_ T               abs (const T);
-template <typename T>           ND_ T               acos (const T);
-template <typename T>           ND_ T               acosh (const T);
+template <typename T>           ND_ T               acos (const T x);                       // result in range [0, Pi], undefined if Abs(x) > 1
+template <typename T>           ND_ T               acosh (const T x);                      // result is non-negative inverse of cosh, undefined if x < 1
                                 ND_ bool            all (const bool2);
                                 ND_ bool            all (const bool3);
                                 ND_ bool            all (const bool4);
                                 ND_ bool            any (const bool2);
                                 ND_ bool            any (const bool3);
                                 ND_ bool            any (const bool4);
-template <typename T>           ND_ T               asin (const T);
-template <typename T>           ND_ T               asinh (const T);
-template <typename T>           ND_ T               atan (const T y, const T x);
-template <typename T>           ND_ T               atan (const T y_over_x);
-template <typename T>           ND_ T               atan (const T);
+template <typename T>           ND_ T               asin (const T);                         // result in range [-Pi/2, Pi/2], undefined if Abs(x) > 1
+template <typename T>           ND_ T               asinh (const T);                        // result is inverse of sinh
+template <typename T>           ND_ T               atan (const T y, const T x);            // result in range [-Pi, Pi], undefined if x = 0
+template <typename T>           ND_ T               atan (const T y_over_x);                // result in range [-Pi/2, Pi/2]
+template <typename T>           ND_ T               atanh (const T);                        // result is inverse of tanh, undefined if Abs(x) > 1
 template <typename T>           ND_ T               bitCount (const T);
+
+// For signed data types, the most significant bits will be set to the value of bit offset + base - 1 (i.e., it is sign extended to the width of the return type).
+// The result will be undefined if offset or bits is negative, or if the sum of offset and bits is greater than the number of bits used to store the operand.
 template <typename T>           ND_ T               bitfieldExtract (const T value, int offset, int bits);
+
+// The result will be undefined if offset or bits is negative, or if the sum of offset and bits is greater than the number of bits used to store the operand.
 template <typename T>           ND_ T               bitfieldInsert (const T base, const T insert, int offset, int bits);
 template <typename T>           ND_ T               bitfieldReverse (const T);
 template <typename T>           ND_ T               ceil (const T);
@@ -61,28 +83,18 @@ template <typename T>           ND_ T               cosh (const T);
                                 ND_ float3          cross (const float3 x, const float3 y);
                                 ND_ double3         cross (const double3 x, const double3 y);
 template <typename T>           ND_ T               degrees (const T);
-                                ND_ float           distance (const float2, const float2);
-                                ND_ float           distance (const float3, const float3);
-                                ND_ float           distance (const float4, const float4);
-                                ND_ double          distance (const double2, const double2);
-                                ND_ double          distance (const double3, const double3);
-                                ND_ double          distance (const double4, const double4);
-                                ND_ float           dot (const float2, const float2);
-                                ND_ float           dot (const float3, const float3);
-                                ND_ float           dot (const float4, const float4);
-                                ND_ double          dot (const double2, const double2);
-                                ND_ double          dot (const double3, const double3);
-                                ND_ double          dot (const double4, const double4);
+template <typename T, int I>    ND_ T               distance (const _Vec<T,I>, const _Vec<T,I>);
+template <typename T, int I>    ND_ T               dot (const _Vec<T,I>, const _Vec<T,I>);
 template <typename T, int I>    ND_ _Vec<bool,I>    equal (const _Vec<T,I> x, const _Vec<T,I> y);
 template <typename T>           ND_ T               exp (const T);
 template <typename T>           ND_ T               exp2 (const T);
 template <typename T>           ND_ T               faceforward (const T n, const T i, const T Nref);
-template <typename T>           ND_ T               findLSB (const T);
-template <typename T>           ND_ T               findMSB (const T);
-                                ND_ int             floatBitsToInt (const float);           // intBitsToFloat
-template <int I>                ND_ _Vec<int,I>     floatBitsToInt (const _Vec<float,I>);   // intBitsToFloat
-                                ND_ uint            floatBitsToUint (const float);          // uintBitsToFloat
-template <int I>                ND_ _Vec<uint,I>    floatBitsToUint (const _Vec<float,I>);  // uintBitsToFloat
+template <typename T>           ND_ T               findLSB (const T);                      // -1 on incorrect input
+template <typename T>           ND_ T               findMSB (const T);                      // -1 on incorrect input
+                                ND_ int             floatBitsToInt (const float);           // inverse intBitsToFloat
+template <int I>                ND_ _Vec<int,I>     floatBitsToInt (const _Vec<float,I>);   // inverse intBitsToFloat
+                                ND_ uint            floatBitsToUint (const float);          // inverse uintBitsToFloat
+template <int I>                ND_ _Vec<uint,I>    floatBitsToUint (const _Vec<float,I>);  // inverse uintBitsToFloat
 template <typename T>           ND_ T               floor (const T);
 template <typename T>           ND_ T               fma (const T a, const T b, const T c);
 template <typename T>           ND_ T               fract (const T);
@@ -91,10 +103,10 @@ template <typename T, int I>    ND_ _Vec<bool,I>    greaterThan (const _Vec<T,I>
 template <typename T, int I>    ND_ _Vec<bool,I>    greaterThanEqual (const _Vec<T,I> x, const _Vec<T,I> y);
 template <typename T>           ND_ void            umulExtended (const T x, const T y, OUT T &msb, OUT T &lsb);
 template <typename T>           ND_ void            imulExtended (const T x, const T y, OUT T &msb, OUT T &lsb);
-                                ND_ float           intBitsToFloat (const int);             // floatBitsToInt
-template <int I>                ND_ _Vec<float,I>   intBitsToFloat (const _Vec<int,I>);     // floatBitsToInt
-                                ND_ float           uintBitsToFloat (const uint);           // floatBitsToUint
-template <int I>                ND_ _Vec<float,I>   uintBitsToFloat (const _Vec<uint,I>);   // floatBitsToUint
+                                ND_ float           intBitsToFloat (const int);             // inverse floatBitsToInt
+template <int I>                ND_ _Vec<float,I>   intBitsToFloat (const _Vec<int,I>);     // inverse floatBitsToInt
+                                ND_ float           uintBitsToFloat (const uint);           // inverse floatBitsToUint
+template <int I>                ND_ _Vec<float,I>   uintBitsToFloat (const _Vec<uint,I>);   // inverse floatBitsToUint
 template <typename T>           ND_ T               inversesqrt (const T);
 template <typename T>           ND_ bool            isinf (const T);
 template <typename T, int I>    ND_ _Vec<bool,I>    isinf (const _Vec<T,I>);
@@ -107,8 +119,8 @@ template <int I>                ND_ float           length (const _Vec<float,I>)
 template <int I>                ND_ double          length (const _Vec<double,I>);
 template <typename T, int I>    ND_ _Vec<bool,I>    lessThan (const _Vec<T,I> x, const _Vec<T,I> y);
 template <typename T, int I>    ND_ _Vec<bool,I>    lessThanEqual (const _Vec<T,I> x, const _Vec<T,I> y);
-template <typename T>           ND_ T               log (const T);
-template <typename T>           ND_ T               log2 (const T);
+template <typename T>           ND_ T               log (const T);                                  // result is undefined if x <= 0
+template <typename T>           ND_ T               log2 (const T);                                 // result is undefined if x <= 0
 template <typename T, int I>    ND_ _Vec<T,I>       max (const _Vec<T,I> x, const _Vec<T,I> y);
 template <typename T, int I>    ND_ _Vec<T,I>       max (const _Vec<T,I> x, const T y);
 template <typename T>           ND_ T               max (const T x, const T y);
@@ -211,35 +223,35 @@ template <typename T, int C, int R> ND_ _Matrix<T,R,C>  transpose (const _Matrix
                                 ND_ ushort2         unpackUint2x16 (const uint v);
                                 ND_ ushort4         unpackUint4x16 (const ulong v);
 
-                                ND_ short           halfBitsToInt16 (const half);               // int16BitsToHalf
-template <int I>                ND_ _Vec<short,I>   halfBitsToInt16 (const _Vec<half,I>);       // int16BitsToHalf
-                                ND_ ushort          halfBitsToUint16 (const half);              // uint16BitsToHalf
-template <int I>                ND_ _Vec<ushort,I>  halfBitsToUint16 (const _Vec<half,I>);      // uint16BitsToHalf
-
-                                ND_ short           float16BitsToInt16 (const half);            // int16BitsToFloat16
-template <int I>                ND_ _Vec<short,I>   float16BitsToInt16 (const _Vec<half,I>);    // int16BitsToFloat16
-                                ND_ ushort          float16BitsToUint16 (const half);           // uint16BitsToFloat16
-template <int I>                ND_ _Vec<ushort,I>  float16BitsToUint16 (const _Vec<half,I>);   // uint16BitsToFloat16
-
-                                ND_ slong           doubleBitsToInt64 (const double);           // int64BitsToDouble
-template <int I>                ND_ _Vec<slong,I>   doubleBitsToInt64 (const _Vec<double,I>);   // int64BitsToDouble
-                                ND_ ulong           doubleBitsToUint64 (const double);          // uint64BitsToDouble
-template <int I>                ND_ _Vec<ulong,I>   doubleBitsToUint64 (const _Vec<double,I>);  // uint64BitsToDouble
-
-                                ND_ half            int16BitsToHalf (const short);              // halfBitsToInt16
-template <int I>                ND_ _Vec<half,I>    int16BitsToHalf (const _Vec<short,I>);      // halfBitsToInt16
-                                ND_ half            uint16BitsToHalf (const ushort);            // halfBitsToUint16
-template <int I>                ND_ _Vec<half,I>    uint16BitsToHalf (const _Vec<ushort,I>);    // halfBitsToUint16
-
-                                ND_ half            int16BitsToFloat16 (const short);           // float16BitsToInt16
-template <int I>                ND_ _Vec<half,I>    int16BitsToFloat16 (const _Vec<short,I>);   // float16BitsToInt16
-                                ND_ half            uint16BitsToFloat16 (const ushort);         // float16BitsToUint16
-template <int I>                ND_ _Vec<half,I>    uint16BitsToFloat16 (const _Vec<ushort,I>); // float16BitsToUint16
-
-                                ND_ double          int64BitsToDouble (const slong);            // doubleBitsToInt64
-template <int I>                ND_ _Vec<double,I>  int64BitsToDouble (const _Vec<slong,I>);    // doubleBitsToInt64
-                                ND_ double          uint64BitsToDouble (const ulong);           // doubleBitsToUint64
-template <int I>                ND_ _Vec<double,I>  uint64BitsToDouble (const _Vec<ulong,I>);   // doubleBitsToUint64
+                                ND_ short           halfBitsToInt16 (const half);               // inverse int16BitsToHalf
+template <int I>                ND_ _Vec<short,I>   halfBitsToInt16 (const _Vec<half,I>);       // inverse int16BitsToHalf
+                                ND_ ushort          halfBitsToUint16 (const half);              // inverse uint16BitsToHalf
+template <int I>                ND_ _Vec<ushort,I>  halfBitsToUint16 (const _Vec<half,I>);      // inverse uint16BitsToHalf
+
+                                ND_ short           float16BitsToInt16 (const half);            // inverse int16BitsToFloat16
+template <int I>                ND_ _Vec<short,I>   float16BitsToInt16 (const _Vec<half,I>);    // inverse int16BitsToFloat16
+                                ND_ ushort          float16BitsToUint16 (const half);           // inverse uint16BitsToFloat16
+template <int I>                ND_ _Vec<ushort,I>  float16BitsToUint16 (const _Vec<half,I>);   // inverse uint16BitsToFloat16
+
+                                ND_ slong           doubleBitsToInt64 (const double);           // inverse int64BitsToDouble
+template <int I>                ND_ _Vec<slong,I>   doubleBitsToInt64 (const _Vec<double,I>);   // inverse int64BitsToDouble
+                                ND_ ulong           doubleBitsToUint64 (const double);          // inverse uint64BitsToDouble
+template <int I>                ND_ _Vec<ulong,I>   doubleBitsToUint64 (const _Vec<double,I>);  // inverse uint64BitsToDouble
+
+                                ND_ half            int16BitsToHalf (const short);              // inverse halfBitsToInt16
+template <int I>                ND_ _Vec<half,I>    int16BitsToHalf (const _Vec<short,I>);      // inverse halfBitsToInt16
+                                ND_ half            uint16BitsToHalf (const ushort);            // inverse halfBitsToUint16
+template <int I>                ND_ _Vec<half,I>    uint16BitsToHalf (const _Vec<ushort,I>);    // inverse halfBitsToUint16
+
+                                ND_ half            int16BitsToFloat16 (const short);           // inverse float16BitsToInt16
+template <int I>                ND_ _Vec<half,I>    int16BitsToFloat16 (const _Vec<short,I>);   // inverse float16BitsToInt16
+                                ND_ half            uint16BitsToFloat16 (const ushort);         // inverse float16BitsToUint16
+template <int I>                ND_ _Vec<half,I>    uint16BitsToFloat16 (const _Vec<ushort,I>); // inverse float16BitsToUint16
+
+                                ND_ double          int64BitsToDouble (const slong);            // inverse doubleBitsToInt64
+template <int I>                ND_ _Vec<double,I>  int64BitsToDouble (const _Vec<slong,I>);    // inverse doubleBitsToInt64
+                                ND_ double          uint64BitsToDouble (const ulong);           // inverse doubleBitsToUint64
+template <int I>                ND_ _Vec<double,I>  uint64BitsToDouble (const _Vec<ulong,I>);   // inverse doubleBitsToUint64
 #endif
 
 
@@ -253,6 +265,7 @@ struct gl
 
     enum class _Uns_ {};
 
+    // used some random constants because unsized arrays are not supported
     static constexpr uint   _MaxClipDistance                = 8;
     static constexpr uint   _MaxCullDistance                = 8;
     static constexpr uint   _MaxSampleMask                  = 1;
@@ -311,7 +324,7 @@ struct gl
     //  - Data from uniform buffer, for arrays it must be constant or dynamically uniform indexing.
     //  - Data from push constants.
     //  - 'DrawID'.
-    // 
+    //
     // Non-dynamically uniform:
     //  - 'VertexIndex', 'PrimitiveID', ...
     //  - 'InstanceIndex' - non-uniform on TBDR.
@@ -1116,7 +1129,7 @@ struct gl
 
   #else
 
-    // sync 
+    // sync
     #ifdef AE_MEM_SCOPE
     void  MemoryBarrier (gl::Scope execution, gl::Scope memory, gl::StorageSemantics storage, gl::Semantics sem);
     #endif
@@ -1384,7 +1397,9 @@ struct gl
     {
         A,              // 'a' argument in CoopMatMulAdd()
         B,              // 'b' argument in CoopMatMulAdd()
-        Accumulator     // 'c' argument in CoopMatMulAdd()
+        Accumulator,    // 'c' argument in CoopMatMulAdd()
+
+        C   = Accumulator
     };
 
     enum class MatrixOperands
@@ -1402,7 +1417,15 @@ struct gl
     template <typename T, Scope ScopeType, uint Rows, uint Columns, MatrixUse Use>
     struct CoopMat
     {
-        ND_ constexpr uint  length()                        { return Rows * Columns; }
+        explicit CoopMat (T scalar);
+
+        template <typename T2, Scope ScopeType, uint Rows, uint Columns, MatrixUse Use>
+        explicit CoopMat (const CoopMat<T2, ScopeType, Rows, Columns, Use> &);
+
+        ND_ uint    length()                const   { return Rows * Columns; }
+
+        ND_ T &     operator [] (int i);
+        ND_ T       operator [] (int i)     const;
     };
 
     template <typename T, Scope S, uint R, uint C, MatrixUse U, typename B>
@@ -1411,8 +1434,9 @@ struct gl
     template <typename T, Scope S, uint R, uint C, MatrixUse U, typename B>
     void  CoopMatStore (CoopMat<T,S,R,C,U> m, OUT B* buf, uint element, uint stride, CooperativeMatrixLayout layout);
 
-    template <typename T, Scope S, uint R, uint C, MatrixUse U, typename T>
-    ND_ CoopMat<T,S,R,C,U>  CoopMatMulAdd (CoopMat<T,S,R,C,U> a, CoopMat<T,S,R,C,U> b, CoopMat<T,S,R,C,U> c, MatrixOperands matrixOperands = MatrixOperands::None);
+    // a * b + c
+    template <typename T, Scope S, uint M, uint N, uint K>
+    ND_ CoopMat<T,S,M,N,MatrixUse::C>  CoopMatMulAdd (CoopMat<T,S,M,K,MatrixUse::A> a, CoopMat<T,S,K,N,MatrixUse::B> b, CoopMat<T,S,M,N,MatrixUse::C> c, MatrixOperands matrixOperands = MatrixOperands::None);
 
   #endif // AE_COOP_MATRIX and AE_MEM_SCOPE
 
diff --git a/AE/engine/src/base/Algorithms/ArrayUtils.h b/AE/engine/src/base/Algorithms/ArrayUtils.h
index 9b4cbab3..683300a6 100644
--- a/AE/engine/src/base/Algorithms/ArrayUtils.h
+++ b/AE/engine/src/base/Algorithms/ArrayUtils.h
@@ -110,19 +110,19 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    ND_ constexpr ssize  Distance (T *lhs, T *rhs) __NE___
+    ND_ constexpr ssize  Distance (T* lhs, T* rhs) __NE___
     {
         return std::distance< T *>( lhs, rhs );
     }
 
     template <typename T>
-    ND_ constexpr ssize  Distance (const T *lhs, T *rhs) __NE___
+    ND_ constexpr ssize  Distance (const T* lhs, T* rhs) __NE___
     {
         return std::distance< T const *>( lhs, rhs );
     }
 
     template <typename T>
-    ND_ constexpr ssize  Distance (T *lhs, const T *rhs) __NE___
+    ND_ constexpr ssize  Distance (T* lhs, const T* rhs) __NE___
     {
         return std::distance< T const *>( lhs, rhs );
     }
@@ -238,9 +238,9 @@ namespace AE::Base
 =================================================
 */
     template <typename Iter, typename Cmp>
-    ND_ bool  IsSorted (Iter begin, Iter end, Cmp && fn) __NE___
+    ND_ bool  IsSorted (Iter begin, Iter end, Cmp &&fn) __NE___
     {
-        //STATIC_ASSERT( IsNothrowInvocable<Cmp> );
+        CheckNothrow( IsNoExcept( fn( begin, end )));
 
         if ( begin == end )
             return true;
@@ -297,12 +297,23 @@ namespace AE::Base
     template <typename T, typename Compare>
     void  RemoveDuplicates (INOUT Array<T> &arr, Compare comp) __NE___
     {
-        STATIC_ASSERT( IsNothrowInvocable<Compare> );
+        CheckNothrow( IsNothrowInvocable<Compare> );
 
         std::sort( arr.begin(), arr.end(), comp );
         arr.erase( std::unique( arr.begin(), arr.end() ), arr.end() );
     }
 
+/*
+=================================================
+    EraseIfEqual
+=================================================
+*/
+    template <typename T, typename B>
+    void  EraseIfEqual (INOUT Array<T> &arr, const B &value) __NE___
+    {
+        arr.erase( std::remove( arr.begin(), arr.end(), value ), arr.end() );
+    }
+
 /*
 =================================================
     ArrayContains
@@ -461,9 +472,7 @@ namespace AE::Base
     } // _hidden_
 
 
-    template <typename Container,
-              typename = EnableIf< IsClass<Container> >
-             >
+    template <typename Container, ENABLEIF( IsClass<Container> )>
     ND_ constexpr auto  IndicesOnly (const Container& container) __NE___
     {
         return Base::_hidden_::IndicesOnlyRange{ 0, container.size() };
@@ -480,9 +489,7 @@ namespace AE::Base
         return Base::_hidden_::IndicesOnlyRange{ 0, count };
     }
 
-    template <typename T,
-              typename = EnableIf< IsEnum<T> >
-             >
+    template <typename T, ENABLEIF( IsEnum<T> )>
     ND_ constexpr inline auto  IndicesOnly () __NE___
     {
         return Base::_hidden_::IndicesOnlyRange{ 0, usize(T::_Count) };
@@ -540,9 +547,7 @@ namespace AE::Base
     } // _hidden_
 
 
-    template <typename Container,
-              typename = EnableIf< IsClass<Container> >
-             >
+    template <typename Container, ENABLEIF( IsClass<Container> )>
     ND_ constexpr auto  ReverseIndices (const Container& container) __NE___
     {
         return Base::_hidden_::ReverseIndicesRange{ container.size()-1, container.size() };
@@ -662,10 +667,20 @@ namespace AE::Base
     template <typename T>
     ND_ constexpr auto  BitfieldIterate (const T &bits) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsUnsignedInteger<T> );
+        StaticAssert( IsEnum<T> or IsUnsignedInteger<T> );
         return Base::_hidden_::BitfieldIterateView<T>{ bits };
     }
 
+    template <usize C>
+    ND_ constexpr auto  BitfieldIterate (const BitSet<C> &bits) __NE___
+    {
+        if constexpr( C <= 32 )
+            return Base::_hidden_::BitfieldIterateView<uint>{ uint(bits.to_ulong()) };
+        else
+        if constexpr( C <= 64 )
+            return Base::_hidden_::BitfieldIterateView<ulong>{ bits.to_ullong() };
+    }
+
 /*
 =================================================
     BitIndexIterate
@@ -721,16 +736,25 @@ namespace AE::Base
     template <typename T>
     ND_ constexpr auto  BitIndexIterate (const T &bits) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsUnsignedInteger<T> );
+        StaticAssert( IsEnum<T> or IsUnsignedInteger<T> );
         return Base::_hidden_::BitIndexIterateView< uint, T >{ bits };
     }
 
     template <typename R, typename T>
     ND_ constexpr auto  BitIndexIterate (const T &bits) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsUnsignedInteger<T> );
+        StaticAssert( IsEnum<T> or IsUnsignedInteger<T> );
         return Base::_hidden_::BitIndexIterateView< R, T >{ bits };
     }
 
+    template <usize C>
+    ND_ constexpr auto  BitIndexIterate (const BitSet<C> &bits) __NE___
+    {
+        if constexpr( C <= 32 )
+            return Base::_hidden_::BitIndexIterateView< uint, uint >{ uint(bits.to_ulong()) };
+        else
+        if constexpr( C <= 64 )
+            return Base::_hidden_::BitIndexIterateView< uint, ulong >{ bits.to_ullong() };
+    }
 
 } // AE::Base
diff --git a/AE/engine/src/base/Algorithms/Cast.h b/AE/engine/src/base/Algorithms/Cast.h
index 9ba1d4b8..2b956ce8 100644
--- a/AE/engine/src/base/Algorithms/Cast.h
+++ b/AE/engine/src/base/Algorithms/Cast.h
@@ -5,7 +5,6 @@
 #include "base/Common.h"
 #include "base/Containers/Ptr.h"
 
-
 namespace AE::Base
 {
 
@@ -26,7 +25,7 @@ namespace AE::Base
     {
         constexpr usize align = alignof(R);
 
-        STATIC_ASSERT( ((align & (align - 1)) == 0), "Align must be power of 2" );
+        StaticAssert( ((align & (align - 1)) == 0), "Align must be power of 2" );
 
         return (usize(ptr) & (align-1)) == 0;
     }
@@ -45,7 +44,7 @@ namespace AE::Base
             if ( not CheckPointerAlignment<R>( ptr ))
             {
                 std::stringstream   str;
-                str << "Failed to cast pointer from '" << typeid(T).name() << "' to '" << typeid(R).name()
+                str << "Failed to cast pointer from '" << TypeNameOf<T>() << "' to '" << TypeNameOf<R>()
                     << "': memory address " << std::hex << usize(ptr) << " is not aligned to " << std::dec << alignof(R)
                     << ", it may cause undefined behavior";
                 AE_LOGE( str.str() );
@@ -64,7 +63,7 @@ namespace AE::Base
     template <typename R, typename T>
     ND_ constexpr R const volatile*  Cast (T const volatile* value) __NE___
     {
-        STATIC_ASSERT( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
+        StaticAssert( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
         CheckPointerCast<R>( value );
         return static_cast< R const volatile *>( static_cast< void const volatile *>(value) );
     }
@@ -72,7 +71,7 @@ namespace AE::Base
     template <typename R, typename T>
     ND_ constexpr R volatile*  Cast (T volatile* value) __NE___
     {
-        STATIC_ASSERT( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
+        StaticAssert( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
         CheckPointerCast<R>( value );
         return static_cast< R volatile *>( static_cast< void volatile *>(value) );
     }
@@ -80,7 +79,7 @@ namespace AE::Base
     template <typename R, typename T>
     ND_ constexpr R const*  Cast (T const* value) __NE___
     {
-        STATIC_ASSERT( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
+        StaticAssert( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
         CheckPointerCast<R>( value );
         return static_cast< R const *>( static_cast< void const *>(value) );
     }
@@ -88,7 +87,7 @@ namespace AE::Base
     template <typename R, typename T>
     ND_ constexpr R*  Cast (T* value) __NE___
     {
-        STATIC_ASSERT( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
+        StaticAssert( sizeof(R*) == sizeof(T*) and sizeof(T*) == sizeof(void*) );
         CheckPointerCast<R>( value );
         return static_cast< R *>( static_cast< void *>(value) );
     }
@@ -157,13 +156,13 @@ namespace AE::Base
     TimeCast (chrono)
 =================================================
 */
-    template <typename To, typename Rep, typename Period, EnableIf<IsDuration<To>, int> = 0>
+    template <typename To, typename Rep, typename Period, ENABLEIF( IsDuration<To> )>
     ND_ constexpr To  TimeCast (const std::chrono::duration<Rep, Period> &value) __NE___
     {
         return std::chrono::duration_cast<To>( value );
     }
 
-    template <typename ToDuration, typename Clock, typename Duration, EnableIf<IsDuration<ToDuration>, int> = 0>
+    template <typename ToDuration, typename Clock, typename Duration, ENABLEIF( IsDuration<ToDuration> )>
     ND_ constexpr std::chrono::time_point<Clock, ToDuration>  TimeCast (const std::chrono::time_point<Clock, Duration> &value) __NE___
     {
         return std::chrono::time_point_cast<ToDuration>( value );
@@ -204,6 +203,27 @@ namespace AE::Base
     {
         return std::dynamic_pointer_cast<R>( other );
     }
+
+    template <typename R, typename T>
+    ND_ bool  CastAllowed (T const* value) __NE___
+    {
+        return (dynamic_cast<R const*>( value ) != null) == (value != null);
+    }
+
+    template <typename R, typename T>
+    ND_ bool  CastNotAllowed (T const* value) __NE___
+    {
+        return not CastAllowed<R>( value );
+    }
+
+#else
+
+    template <typename R, typename T>
+    ND_ bool  CastAllowed (T const* value)      __NE___ { return true; }
+
+    template <typename R, typename T>
+    ND_ bool  CastNotAllowed (T const* value)   __NE___ { return true; }
+
 #endif
 
 /*
@@ -214,9 +234,9 @@ namespace AE::Base
     template <typename To, typename From>
     ND_ constexpr To  BitCast (const From& src) __NE___
     {
-        STATIC_ASSERT( sizeof(To) == sizeof(From), "must be same size!" );
-        STATIC_ASSERT( IsMemCopyAvailable<From> and IsMemCopyAvailable<To>, "must be trivial types!" );
-        //STATIC_ASSERT( not IsSameTypes< To, From >);  // to find unnecessary cast
+        StaticAssert( sizeof(To) == sizeof(From), "must be same size!" );
+        StaticAssert( IsMemCopyAvailable<From> and IsMemCopyAvailable<To>, "must be trivial types!" );
+        //StaticAssert( not IsSameTypes< To, From >);   // to find unnecessary cast
 
       #ifdef __cpp_lib_bit_cast
         if constexpr( std::is_trivially_copyable_v<From> and std::is_trivially_copyable_v<To> ){
@@ -241,9 +261,9 @@ namespace AE::Base
     template <typename To, typename From>
     ND_ constexpr To  UnsafeBitCast (const From& src) __NE___
     {
-        //STATIC_ASSERT( sizeof(From) <= sizeof(To), "cast will lost data!" );
-        STATIC_ASSERT( IsMemCopyAvailable<From> and IsMemCopyAvailable<To>, "must be trivial types!" );
-        //STATIC_ASSERT( not IsSameTypes< To, From >);  // to find unnecessary cast
+        //StaticAssert( sizeof(From) <= sizeof(To), "cast will lost data!" );
+        StaticAssert( IsMemCopyAvailable<From> and IsMemCopyAvailable<To>, "must be trivial types!" );
+        //StaticAssert( not IsSameTypes< To, From >);   // to find unnecessary cast
 
         To  dst = {};
         std::memcpy( OUT &dst, &src, std::min( sizeof(From), sizeof(To) ));
@@ -298,7 +318,7 @@ namespace AE::Base
     template <typename To, typename From>
     ND_ constexpr To  LimitCast (const From& src) __NE___
     {
-        STATIC_ASSERT( MaxValue<From>() >= MaxValue<To>() );
+        StaticAssert( MaxValue<From>() >= MaxValue<To>() );
 
         if constexpr( IsSigned<From> and IsUnsigned<To> )
         {
@@ -308,7 +328,7 @@ namespace AE::Base
         }
         else
         {
-            STATIC_ASSERT( MinValue<From>() <= MinValue<To>() );
+            StaticAssert( MinValue<From>() <= MinValue<To>() );
 
             return  src > static_cast<From>(MaxValue<To>()) ? MaxValue<To>() :
                     src < static_cast<From>(MinValue<To>()) ? MinValue<To>() :
diff --git a/AE/engine/src/base/Algorithms/Hash.h b/AE/engine/src/base/Algorithms/Hash.h
index 53a01422..bcc07823 100644
--- a/AE/engine/src/base/Algorithms/Hash.h
+++ b/AE/engine/src/base/Algorithms/Hash.h
@@ -2,6 +2,10 @@
 
 #pragma once
 
+#ifdef AE_ENABLE_XXHASH
+# include "xxhash.h"
+#endif
+
 namespace AE::Base
 {
 
@@ -139,6 +143,37 @@ namespace AE::Base
         dst &= ~((1 << ignoreMantissaBits)-1);
         return HashVal( std::hash<ulong>()( dst ));
     }
+//-----------------------------------------------------------------------------
+
+
+#ifdef AE_ENABLE_XXHASH
+/*
+=================================================
+    XXHash32 (buffer)
+=================================================
+*/
+    ND_ inline HashVal32  XXHash32 (const void* ptr, const usize sizeInBytes) __NE___
+    {
+        return HashVal32{ XXH32( ptr, sizeInBytes, 0 )};
+    }
+
+/*
+=================================================
+    XXHash64 (buffer)
+=================================================
+*/
+    ND_ inline HashVal64  XXHash64 (const void* ptr, const usize sizeInBytes) __NE___
+    {
+      #if AE_HAS_SIMD
+        return HashVal64{ XXH3_64bits( ptr, sizeInBytes )};
+      #else
+        return HashVal64{ XXH64( ptr, sizeInBytes, 0 )};
+      #endif
+    }
+
+#endif // AE_ENABLE_XXHASH
+//-----------------------------------------------------------------------------
+
 
 /*
 =================================================
@@ -147,11 +182,18 @@ namespace AE::Base
     use private api to calculate hash of buffer
 =================================================
 */
-    ND_ inline HashVal  HashOf (const void *ptr, usize sizeInBytes) __NE___
+    ND_ inline HashVal  HashOf (const void* ptr, const usize sizeInBytes) __NE___
     {
-        ASSERT( ptr != null and sizeInBytes );
+        ASSERT( ptr != null and sizeInBytes > 0 );
+
+        #if defined(AE_ENABLE_XXHASH)
+            if constexpr( sizeof(HashVal) == sizeof(HashVal64) )
+                return HashVal{XXHash64( ptr, sizeInBytes )};
+            else
+            if constexpr( sizeof(HashVal) == sizeof(HashVal32) )
+                return HashVal{XXHash32( ptr, sizeInBytes )};
 
-        # if defined(AE_HAS_HASHFN_HashArrayRepresentation)
+        #elif defined(AE_HAS_HASHFN_HashArrayRepresentation)
             return HashVal{std::_Hash_array_representation( static_cast<const unsigned char*>(ptr), sizeInBytes )};
 
         #elif defined(AE_HAS_HASHFN_Murmur2OrCityhash)
diff --git a/AE/engine/src/base/Algorithms/Parser.cpp b/AE/engine/src/base/Algorithms/Parser.cpp
index 438ea6b7..3de6b3b2 100644
--- a/AE/engine/src/base/Algorithms/Parser.cpp
+++ b/AE/engine/src/base/Algorithms/Parser.cpp
@@ -147,7 +147,7 @@ namespace AE::Base
             // windows style "\r\n"
             if_unlikely( (c == '\r') & (n == '\n') )
             {
-                if ( lines == 0 and pos > 0 ) ++lines; 
+                if ( lines == 0 and pos > 0 ) ++lines;
                 ++lines;
                 ++pos;
                 continue;
@@ -565,7 +565,7 @@ namespace {
 
             //if ( not parser.OnUnknown( c ))
             //  RETURN_ERR( "invalid char '"s << c << "'" );
-        }   
+        }
 
         if ( is_word )
             tokens.push_back( StringView{ str.data() + begin, str.length() - begin });
@@ -675,7 +675,7 @@ namespace {
             if ( not parser.OnUnknown( c )) {
                 RETURN_ERR( "invalid char '"s << c << "'" );
             }
-        }   
+        }
 
         if ( is_word )
             tokens.push_back( StringView{ str.data() + begin, str.length() - begin });
@@ -852,7 +852,7 @@ namespace
 */
     void  Parser::ValidateVarName_CPP (StringView name, OUT String &result) __NE___
     {
-        CATCH_ERRV( result.resize( name.size() ));
+        NOTHROW_ERRV( result.resize( name.size() ));
 
         for (usize i = 0; i < name.size(); ++i)
         {
diff --git a/AE/engine/src/base/Algorithms/StringUtils.h b/AE/engine/src/base/Algorithms/StringUtils.h
index 01cacdba..666fe6a0 100644
--- a/AE/engine/src/base/Algorithms/StringUtils.h
+++ b/AE/engine/src/base/Algorithms/StringUtils.h
@@ -22,6 +22,7 @@
 namespace AE::Base
 {
     using namespace std::string_literals;
+    using namespace std::string_view_literals;
 
 /*
 =================================================
@@ -510,7 +511,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    ND_ constexpr bool  IsAnsiString (const T *ptr, usize length) __NE___
+    ND_ constexpr bool  IsAnsiString (const T* ptr, usize length) __NE___
     {
         for (usize i = 0; i < length; ++i)
         {
@@ -575,7 +576,7 @@ namespace AE::Base
 =================================================
 */
     template <int Radix, typename T>
-    ND_ EnableIf< IsEnum<T> or IsInteger<T>, String>  ToString (const T &value) __Th___
+    ND_ EnableIf<IsEnum<T> or IsInteger<T>, String>  ToString (const T &value) __Th___
     {
         if constexpr( Radix == 10 )
         {
@@ -703,7 +704,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    ND_ String  ToString (const TBytes<T> &value) __Th___
+    ND_ String  ToString (const TByte<T> &value) __Th___
     {
         const T kb  = SafeLeftBitShift( T{1}, 12 );
         const T mb  = SafeLeftBitShift( T{1}, 22 );
@@ -748,6 +749,8 @@ namespace AE::Base
         const double    abs_time = Abs( time );
         String          str;
 
+        if ( not IsFinite( time )) {}
+        else
         if ( abs_time > 59.0 * 60.0 )
             str << ToString( time * (1.0/3600.0), precission ) << " h";
         else
@@ -788,7 +791,7 @@ namespace AE::Base
         return ToAnsiString<char>( str );
     }
 
-    ND_ inline String  ToString (const wchar_t *str) __Th___
+    ND_ inline String  ToString (const wchar_t* str) __Th___
     {
         return ToAnsiString<char>( WStringView{str} );
     }
@@ -1087,7 +1090,7 @@ namespace AE::Base
 
         int     val = 0;
         auto    err = std::from_chars( str.data(), str.data() + str.size(), OUT val, base );
-
+        Unused( err );
         ASSERT( err.ec == std::errc() );
         return val;
     }
@@ -1099,7 +1102,7 @@ namespace AE::Base
 
         uint    val = 0;
         auto    err = std::from_chars( str.data(), str.data() + str.size(), OUT val, base );
-
+        Unused( err );
         ASSERT( err.ec == std::errc() );
         return val;
     }
@@ -1111,7 +1114,7 @@ namespace AE::Base
 
         ulong   val = 0;
         auto    err = std::from_chars( str.data(), str.data() + str.size(), OUT val, base );
-
+        Unused( err );
         ASSERT( err.ec == std::errc() );
         return val;
     }
diff --git a/AE/engine/src/base/Algorithms/Utf8.h b/AE/engine/src/base/Algorithms/Utf8.h
index d38d75b8..6f780c90 100644
--- a/AE/engine/src/base/Algorithms/Utf8.h
+++ b/AE/engine/src/base/Algorithms/Utf8.h
@@ -43,7 +43,7 @@ namespace AE::Base
     ND_ forceinline CharUtf32  Utf8Decode (const CharUtf8 *str, const usize length, INOUT usize &pos) __NE___
     {
         ASSERT( pos < length );
-        STATIC_ASSERT( sizeof(utf8proc_uint8_t) == sizeof(*str) );
+        StaticAssert( sizeof(utf8proc_uint8_t) == sizeof(*str) );
 
         utf8proc_int32_t    symb;
         utf8proc_ssize_t    res = utf8proc_iterate( Cast<utf8proc_uint8_t>(str + pos), length - pos, OUT &symb );
@@ -68,7 +68,7 @@ namespace AE::Base
     {
         Unused( size );
         ASSERT( pos+4 <= size );
-        STATIC_ASSERT( sizeof(utf8proc_uint8_t) == sizeof(*dst) );
+        StaticAssert( sizeof(utf8proc_uint8_t) == sizeof(*dst) );
 
         ssize   cnt = utf8proc_encode_char( symb, Cast<utf8proc_uint8_t>(dst + pos) );
         ASSERT( cnt > 0 and cnt <= 4 );
diff --git a/AE/engine/src/base/CMakeLists.txt b/AE/engine/src/base/CMakeLists.txt
index 86446b1f..55b6bad6 100644
--- a/AE/engine/src/base/CMakeLists.txt
+++ b/AE/engine/src/base/CMakeLists.txt
@@ -33,6 +33,12 @@ if (TARGET "Abseil-lib")
     target_link_libraries( "Base" PUBLIC "Abseil-lib" )
 endif()
 
+if (TARGET "xxHash-lib")
+    target_link_libraries( "Base" PUBLIC "xxHash-lib" )
+endif()
+
+target_link_libraries( "Base" PUBLIC "FametaCounter-lib" )
+
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     # for sockets
     target_link_libraries( "Base" PUBLIC "ws2_32" )
diff --git a/AE/engine/src/base/Common.h b/AE/engine/src/base/Common.h
index 0bd2489e..bd7c9636 100644
--- a/AE/engine/src/base/Common.h
+++ b/AE/engine/src/base/Common.h
@@ -18,7 +18,7 @@ namespace AE
     using ssize     = intptr_t;
     using usize     = size_t;
 
-#if defined(__cpp_char8_t) and not defined(AE_PLATFORM_APPLE)
+#if defined(__cpp_char8_t)
     using CharUtf8  = char8_t;  // C++20
 #else
     enum class CharUtf8 : char {};
@@ -66,13 +66,13 @@ namespace AE::Base
 
     template <typename T,
               typename A = std::allocator<T>>
-    using BasicString   = std::basic_string< T, std::char_traits<T>, A >;
+    using BasicString       = std::basic_string< T, std::char_traits<T>, A >;
 
-    using String        = BasicString< CharAnsi >;
-    using WString       = BasicString< wchar_t >;
-    using U8String      = BasicString< CharUtf8 >;
-    using U16String     = BasicString< CharUtf16 >;
-    using U32String     = BasicString< CharUtf32 >;
+    using String            = BasicString< CharAnsi >;
+    using WString           = BasicString< wchar_t >;
+    using U8String          = BasicString< CharUtf8 >;
+    using U16String         = BasicString< CharUtf16 >;
+    using U32String         = BasicString< CharUtf32 >;
 
 
     template <typename T>
@@ -84,10 +84,6 @@ namespace AE::Base
     using U32StringView     = BasicStringView< CharUtf32 >;
 
 
-    template <typename T,
-              typename A = std::allocator<T>>
-    using Array = std::vector< T, A >;
-
     template <typename T>   using SharedPtr     = std::shared_ptr< T >;
     template <typename T>   using WeakPtr       = std::weak_ptr< T >;
 
@@ -102,6 +98,10 @@ namespace AE::Base
     template <typename T>   using Function      = std::function< T >;
 
 
+    template <typename T,
+              typename A = std::allocator<T>>
+    using Array         = std::vector< T, A >;
+
     template <typename T,
               typename Deleter = std::default_delete<T>>
     using Unique        = std::unique_ptr< T, Deleter >;
@@ -117,7 +117,6 @@ namespace AE::Base
 
 
 
-
     // Uppercase names reserved by physical quantity wrappers
     using seconds       = std::chrono::seconds;
     using milliseconds  = std::chrono::milliseconds;
@@ -134,10 +133,10 @@ namespace AE::Base
     MakeShared
 =================================================
 */
-    template <typename T, typename ...Types>
-    ND_ SharedPtr<T>  MakeShared (Types&&... args)  __Th___
+    template <typename T, typename ...Args>
+    ND_ SharedPtr<T>  MakeShared (Args&&... args) __Th___
     {
-        return std::make_shared<T>( FwdArg<Types>( args )... );
+        return std::make_shared<T>( FwdArg<Args>( args )... );
     }
 
 /*
@@ -145,10 +144,13 @@ namespace AE::Base
     MakeUnique
 =================================================
 */
-    template <typename T, typename ...Types>
-    ND_ Unique<T>  MakeUnique (Types&&... args)  __Th___
+    template <typename T, typename ...Args>
+    ND_ Unique<T>  MakeUnique (Args&&... args) __NE___
     {
-        return std::make_unique<T>( FwdArg<Types>( args )... );
+        CheckNothrow( IsNothrowCtor< T, Args... >);
+        //CheckNothrow( IsNoExcept( new T{ FwdArg<Args>(args)... }));
+
+        return Unique<T>( new T{ FwdArg<Args>( args )... });
     }
 
 /*
@@ -176,6 +178,37 @@ namespace AE::Base
       #endif
     }
 
+/*
+=================================================
+    TypeNameOf
+=================================================
+*/
+#ifdef AE_ENABLE_RTTI
+    template <typename T>
+    ND_ constexpr StringView  TypeNameOf () __NE___
+    {
+        return StringView{ typeid(T).name() };
+    }
+
+# if defined(__cpp_char8_t) and defined(AE_PLATFORM_APPLE)
+    // bugfix: link error in MacOS clang14-15
+    template <>
+    ND_ constexpr StringView  TypeNameOf<char8_t> () __NE___
+    {
+        return StringView{"char8_t"};
+    }
+# endif
+#endif
+//-----------------------------------------------------------------------------
+
+
+    template <typename T>   struct TMemCopyAvailable< BasicStringView<T> >      { static constexpr bool  value = true; };
+    template <typename T>   struct TZeroMemAvailable< BasicStringView<T> >      { static constexpr bool  value = false; };
+    template <typename T>   struct TTriviallySerializable< BasicStringView<T> > { static constexpr bool  value = false; };
+    template <typename T>   struct TTriviallyDestructible< BasicStringView<T> > { static constexpr bool  value = true; };
+
+    template <usize N>      struct TTriviallyDestructible< BitSet<N> >          { static constexpr bool  value = true; };
+
 } // AE::Base
 
 
@@ -189,7 +222,7 @@ namespace AE
 
     // methods
     public:
-        explicit Exception (const char *str)        __NE___ : _what{str} {}
+        explicit Exception (const char* str)        __NE___ : _what{str} {}
         explicit Exception (const std::string &str) __NE___ : _what{str.c_str()} {}
 
         ND_ const char*  what ()                    C_NE___ { return _what; }
diff --git a/AE/engine/src/base/CompileTime/Constants.h b/AE/engine/src/base/CompileTime/Constants.h
index cb6f00e2..1fa2929c 100644
--- a/AE/engine/src/base/CompileTime/Constants.h
+++ b/AE/engine/src/base/CompileTime/Constants.h
@@ -18,7 +18,7 @@ namespace AE::Base
             template <typename T>
             ND_ constexpr operator const T ()                                           C_NE___
             {
-                STATIC_ASSERT( T(~T{0}) > T{0} );
+                StaticAssert( T(~T{0}) > T{0} );
                 return T(~T{0});
             }
 
@@ -49,7 +49,7 @@ namespace AE::Base
             template <typename T>
             ND_ constexpr operator const T ()                                           C_NE___
             {
-                //STATIC_ASSERT( std::is_integral_v<T> or std::is_enum_v<T> );
+                //StaticAssert( std::is_integral_v<T> or std::is_enum_v<T> );
                 return T(0);
             }
 
@@ -106,10 +106,10 @@ namespace AE::Base
 
 
     public:
-        constexpr AnyFloatConst (double val)    __NE___ : _d{val}, _f{float(val)} {}
+        explicit constexpr AnyFloatConst (double val)   __NE___ : _d{val}, _f{float(val)} {}
 
         template <typename T>
-        ND_ constexpr operator const T ()       C_NE___
+        ND_ constexpr operator const T ()               C_NE___
         {
             if constexpr( std::is_same_v< T, double >)
                 return _d;
diff --git a/AE/engine/src/base/CompileTime/Counter.h b/AE/engine/src/base/CompileTime/Counter.h
new file mode 100644
index 00000000..37587981
--- /dev/null
+++ b/AE/engine/src/base/CompileTime/Counter.h
@@ -0,0 +1,18 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_ENABLE_FAMETA_COUNTER
+# include "external/shared/fameta-counter/counter.hpp"
+# include "base/Common.h"
+
+namespace AE::Base
+{
+
+    template <typename UniqueType>
+    using CT_Counter = fameta::counter< UniqueType >;
+
+
+} // AE::Base
+
+#endif // AE_ENABLE_FAMETA_COUNTER
diff --git a/AE/engine/src/base/CompileTime/Hash.h b/AE/engine/src/base/CompileTime/Hash.h
index 3c971629..972e8838 100644
--- a/AE/engine/src/base/CompileTime/Hash.h
+++ b/AE/engine/src/base/CompileTime/Hash.h
@@ -53,7 +53,7 @@ namespace AE::Base::_hidden_
         0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
     };
 
-    ND_ inline constexpr uint  crc32_hash (char const *str, usize len, uint prev_crc) __NE___
+    ND_ inline constexpr uint  crc32_hash (char const* str, usize len, uint prev_crc) __NE___
     {
         for (; (*str != '\0') & (len != 0); ++str, --len)
         {
@@ -73,7 +73,7 @@ namespace AE::Base
     CT_Hash (string)
 =================================================
 */
-    ND_ inline constexpr HashVal32  CT_Hash (const char *str, usize len, uint seed) __NE___
+    ND_ inline constexpr HashVal32  CT_Hash (const char* str, usize len, uint seed) __NE___
     {
         return HashVal32{ Base::_hidden_::crc32_hash( str, len, seed )};
     }
diff --git a/AE/engine/src/base/CompileTime/Math.h b/AE/engine/src/base/CompileTime/Math.h
index 869ec9af..7b839194 100644
--- a/AE/engine/src/base/CompileTime/Math.h
+++ b/AE/engine/src/base/CompileTime/Math.h
@@ -88,7 +88,7 @@ namespace _hidden_
     template <auto Power, typename T>
     inline constexpr T  CT_Pow (const T &base)
     {
-        STATIC_ASSERT( IsInteger<T> and IsInteger<decltype(Power)> and Power >= 0 );
+        StaticAssert( IsInteger<T> and IsInteger<decltype(Power)> and Power >= 0 );
 
         if constexpr( Power == 0 )
         {
@@ -145,7 +145,7 @@ namespace _hidden_
 {
     template <typename R, auto Count>
     struct _ToBitMask {
-        STATIC_ASSERT( IsUnsignedInteger<R> );
+        StaticAssert( IsUnsignedInteger<R> );
         static constexpr R  mask    =   Count >= CT_SizeOfInBits<R> ? ~R{0} :
                                         Count <  0                  ?  R{0} :
                                                                       (R{1} << Count) - 1;
diff --git a/AE/engine/src/base/CompileTime/TypeList.h b/AE/engine/src/base/CompileTime/TypeList.h
index d5124101..a73ac320 100644
--- a/AE/engine/src/base/CompileTime/TypeList.h
+++ b/AE/engine/src/base/CompileTime/TypeList.h
@@ -15,47 +15,47 @@ namespace AE::Base
     struct TypeList
     {
     public:
-        struct AsTuple { using          type            = Tuple< Types... >; };
+        struct AsTuple { using          type                = Tuple< Types... >; };
 
         template <typename T>
-        inline static constexpr usize   FirstIndex      = Base::_hidden_::TL_GetFirstIndex< T, 0, Types... >::value;
+        inline static constexpr usize   FirstIndex          = Base::_hidden_::TL_GetFirstIndex< T, 0, Types... >::value;
 
         template <typename T>
-        inline static constexpr usize   LastIndex       = Base::_hidden_::TL_GetLastIndex< T, 0, Types... >::value;
+        inline static constexpr usize   LastIndex           = Base::_hidden_::TL_GetLastIndex< T, 0, Types... >::value;
 
         template <template <typename...> class Templ>
         inline static constexpr usize   FirstSpecializationOf = Base::_hidden_::TL_GetFirstSpecializationOf< Templ, 0, Types... >::value;
 
         template <typename T>
-        inline static constexpr usize   Index           = FirstIndex<T>;
+        inline static constexpr usize   Index               = FirstIndex<T>;
 
-        inline static constexpr usize   Count           = sizeof...(Types);
+        inline static constexpr usize   Count               = sizeof...(Types);
 
         template <typename T>
-        inline static constexpr bool    HasType         = (Index<T> != UMax);
+        inline static constexpr bool    HasType             = (Index<T> != UMax);
 
         template <typename T>
-        inline static constexpr bool    HasSingle       = HasType<T> and (FirstIndex<T> == LastIndex<T>);
+        inline static constexpr bool    HasSingle           = HasType<T> and (FirstIndex<T> == LastIndex<T>);
 
-        template <usize I>      using   GetT            = Base::_hidden_::TL_GetTypeByIndex< I, Types... >;                 // usage: GetT<0>::type
-        template <usize I>      using   Get             = typename Base::_hidden_::TL_GetTypeByIndex< I, Types... >::type;  // usage: Get<0>
+        template <usize I>      using   GetT                = Base::_hidden_::TL_GetTypeByIndex< I, Types... >;                 // usage: GetT<0>::type
+        template <usize I>      using   Get                 = typename Base::_hidden_::TL_GetTypeByIndex< I, Types... >::type;  // usage: Get<0>
 
-        struct Front { using            type            = Get<0>; };
-        struct Back  { using            type            = Get<Count-1>; };
+        struct Front { using            type                = Get<0>; };
+        struct Back  { using            type                = Get<Count-1>; };
 
-        struct Self  { using            type            = TypeList< Types... >; };
+        struct Self  { using            type                = TypeList< Types... >; };
 
-        struct PopFront { using         type            = typename Base::_hidden_::TL_PopFront< TypeList<>, Types... >::type; };
-        struct PopBack  { using         type            = typename Base::_hidden_::TL_PopBack< TypeList<>, Types... >::type; };
+        struct PopFront { using         type                = typename Base::_hidden_::TL_PopFront< TypeList<>, Types... >::type; };
+        struct PopBack  { using         type                = typename Base::_hidden_::TL_PopBack< TypeList<>, Types... >::type; };
 
-        template <typename T>   using   PushBack        = TypeList< Types..., T >;
-        template <typename T>   using   PushFront       = TypeList< T, Types... >;
+        template <typename T>   using   PushBack            = TypeList< Types..., T >;
+        template <typename T>   using   PushFront           = TypeList< T, Types... >;
 
         template <template <typename> class Tmpl>
-        using                           Apply           = TypeList< Tmpl< Types >... >;
+        using                           Apply               = TypeList< Tmpl< Types >... >;
 
         template <template <typename> class Tmpl>
-        using                           Apply2          = TypeList< typename Tmpl< Types >::type ... >;
+        using                           Apply_t             = TypeList< typename Tmpl< Types >::type ... >;
 
         template <template <typename> class Tmpl>
         static constexpr auto           ForEach_Or ()       __NE___ { return (... or Tmpl<Types>::value); }
@@ -74,30 +74,40 @@ namespace AE::Base
 
 
         template <typename FN>
-        static constexpr void           Visit (FN&& fn)     noexcept(IsNothrowInvocable<FN>)    { return _RecursiveVisit<0>( FwdArg<FN>(fn) ); }
+        static constexpr void           Visit (FN&& fn)     __NE___ { return _RecursiveVisit<0>( FwdArg<FN>(fn) ); }
 
-
-        static constexpr bool           AllNothrowDtor              = ForEach_And< IsNothrowDtor_t >();
-        static constexpr bool           AllNothrowCopyCtor          = ForEach_And< IsNothrowCopyCtor_t >();
-        static constexpr bool           AllNothrowMoveCtor          = ForEach_And< IsNothrowMoveCtor_t >();
-        static constexpr bool           AllNothrowDefaultCtor       = ForEach_And< IsNothrowDefaultCtor_t >();
-        static constexpr bool           AllNothrowInvocable         = ForEach_And< IsNothrowInvocable_t >();
-        static constexpr bool           AllNothrowCopyAssignable    = ForEach_And< IsNothrowCopyAssignable_t >();
-        static constexpr bool           AllNothrowMoveAssignable    = ForEach_And< IsNothrowMoveAssignable_t >();
+        template <typename FN>
+        static constexpr void           VisitTh (FN&& fn)   __Th___ { return _RecursiveVisit2<0>( FwdArg<FN>(fn) ); }
 
 
     private:
         template <usize I, typename FN>
-        static constexpr void  _RecursiveVisit (FN&& fn)    noexcept(IsNothrowInvocable<FN>)
+        static constexpr void  _RecursiveVisit (FN&& fn)    __NE___
         {
             if constexpr( I < Count )
             {
                 using T = Get<I>;
+                CheckNothrow( IsNoExcept( fn.template operator()<T,I>() ));
+
                 fn.template operator()<T,I>();
                 _RecursiveVisit< I+1 >( FwdArg<FN>(fn) );
             }
             Unused( fn );
         }
+
+        template <usize I, typename FN>
+        static constexpr void  _RecursiveVisit2 (FN&& fn)   __Th___
+        {
+            if constexpr( I < Count )
+            {
+                using T = Get<I>;
+                CheckNothrow( not IsNoExcept( fn.template operator()<T,I>() )); // use 'Visit'
+
+                fn.template operator()<T,I>();
+                _RecursiveVisit2< I+1 >( FwdArg<FN>(fn) );
+            }
+            Unused( fn );
+        }
     };
 
 
@@ -153,25 +163,22 @@ namespace _hidden_
     static constexpr bool   AllAreSameTypes             = TypeList< Types... >::template ForEach_And< Base::_hidden_::AreSameTypes<T>::Impl >();
 
     template <typename ...Types>
-    static constexpr bool   AllNothrowDtor              = TypeList< Types... >::template ForEach_And< IsNothrowDtor_t >();
-
-    template <typename ...Types>
-    static constexpr bool   AllNothrowCopyCtor          = TypeList< Types... >::template ForEach_And< IsNothrowCopyCtor_t >();
+    static constexpr bool   AllNothrowCopyCtor          = TypeList< Types... >::template ForEach_And< TNothrowCopyCtor >();
 
     template <typename ...Types>
-    static constexpr bool   AllNothrowMoveCtor          = TypeList< Types... >::template ForEach_And< IsNothrowMoveCtor_t >();
+    static constexpr bool   AllNothrowMoveCtor          = TypeList< Types... >::template ForEach_And< TNothrowMoveCtor >();
 
     template <typename ...Types>
-    static constexpr bool   AllNothrowDefaultCtor       = TypeList< Types... >::template ForEach_And< IsNothrowDefaultCtor_t >();
+    static constexpr bool   AllNothrowDefaultCtor       = TypeList< Types... >::template ForEach_And< TNothrowDefaultCtor >();
 
     template <typename ...Types>
-    static constexpr bool   AllNothrowCopyAssignable    = TypeList< Types... >::template ForEach_And< IsNothrowCopyAssignable_t >();
+    static constexpr bool   AllNothrowCopyAssignable    = TypeList< Types... >::template ForEach_And< TNothrowCopyAssignable >();
 
     template <typename ...Types>
-    static constexpr bool   AllNothrowMoveAssignable    = TypeList< Types... >::template ForEach_And< IsNothrowMoveAssignable_t >();
+    static constexpr bool   AllNothrowMoveAssignable    = TypeList< Types... >::template ForEach_And< TNothrowMoveAssignable >();
 
     template <typename ...Types>
-    static constexpr bool   AllNothrowInvocable         = TypeList< Types... >::template ForEach_And< IsNothrowInvocable_t >();
+    static constexpr bool   AllNothrowInvocable         = TypeList< Types... >::template ForEach_And< TNothrowInvocable >();
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/CompileTime/TypeListImpl.h b/AE/engine/src/base/CompileTime/TypeListImpl.h
index e9d9d044..19fdbe5b 100644
--- a/AE/engine/src/base/CompileTime/TypeListImpl.h
+++ b/AE/engine/src/base/CompileTime/TypeListImpl.h
@@ -110,7 +110,7 @@ namespace AE::Base::_hidden_
     template <usize ReqIndex, usize I>
     struct TL_GetTypeByIndex2< ReqIndex, I >
     {
-        STATIC_ASSERT( "index is out of range" );
+        StaticAssert( "index is out of range" );
     };
 
     template <usize ReqIndex, usize I, typename Head, typename... Tail>
diff --git a/AE/engine/src/base/CompileTime/TypeTraits.h b/AE/engine/src/base/CompileTime/TypeTraits.h
index c39f0c47..56b67927 100644
--- a/AE/engine/src/base/CompileTime/TypeTraits.h
+++ b/AE/engine/src/base/CompileTime/TypeTraits.h
@@ -50,18 +50,9 @@ namespace _hidden_
     static constexpr bool   IsScalarOrEnum          = IsScalar<T> or IsEnum<T>;
 
     template <typename T>
-    static constexpr bool   IsTrivial               = std::is_trivially_destructible_v<T>       and
-                                                      std::is_trivially_move_assignable_v<T>    and
-                                                      std::is_trivially_move_constructible_v<T>;
-
-    template <typename T>
-    static constexpr bool   IsPOD                   = std::is_trivially_destructible_v<T>           and
+    static constexpr bool   IsTrivial               = std::is_trivially_destructible_v<T>           and
                                                       std::is_trivially_move_assignable_v<T>        and
-                                                      std::is_trivially_move_constructible_v<T>     and
-                                                      std::is_trivially_constructible_v<T>          and
-                                                      std::is_trivially_copyable_v<T>               and
-                                                      std::is_trivially_copy_assignable_v<T>        and
-                                                      std::is_trivially_default_constructible_v<T>;
+                                                      std::is_trivially_move_constructible_v<T>;
 
     template <typename T>
     static constexpr bool   IsPointer               = std::is_pointer_v<T>;
@@ -108,6 +99,10 @@ namespace _hidden_
     template <typename Base, typename Derived>
     static constexpr bool   IsBaseOf                = std::is_base_of_v< Base, Derived >;
 
+    template <typename Base, typename Derived>
+    static constexpr bool   IsBaseOfNotSame         = std::is_base_of_v< Base, Derived >    and
+                                                      not std::is_same_v< Base, Derived >;
+
     template <typename T>
     static constexpr bool   IsEmpty                 = std::is_empty_v<T>;
 
@@ -133,52 +128,136 @@ namespace _hidden_
     static constexpr bool   IsMoveAssignable        = std::is_move_assignable_v<T>;
 
 
+#ifdef AE_ENABLE_EXCEPTIONS
     template <typename T>
-    static constexpr bool   IsNothrowable           = std::is_nothrow_move_constructible_v<T>       and
-                                                      std::is_nothrow_default_constructible_v<T>    and
-                                                      std::is_nothrow_copy_assignable_v<T>          and
-                                                      std::is_nothrow_copy_constructible_v<T>       and
-                                                      std::is_nothrow_destructible_v<T>             and
-                                                      std::is_nothrow_move_assignable_v<T>;
+    struct TNothrowCopyCtor {
+        StaticAssert( std::is_copy_constructible_v<T> );
+        static constexpr bool   value = std::is_nothrow_copy_constructible_v<T>     or
+                                        std::is_trivially_copy_constructible_v<T>;
+    };
+
     template <typename T>
-    static constexpr bool   IsNothrowCopyCtor       = std::is_nothrow_copy_constructible_v<T>       or
-                                                      std::is_trivially_copy_constructible_v<T>;
+    struct TNothrowMoveCtor {
+        StaticAssert( std::is_move_constructible_v<T> );
+        static constexpr bool   value = std::is_nothrow_move_constructible_v<T>     or
+                                        std::is_trivially_move_constructible_v<T>;
+    };
+
     template <typename T>
-    static constexpr bool   IsNothrowDtor           = std::is_nothrow_destructible_v<T>             or
-                                                      std::is_trivially_destructible_v<T>;
+    struct TNothrowDefaultCtor {
+        StaticAssert( std::is_default_constructible_v<T> );
+        static constexpr bool   value = std::is_nothrow_default_constructible_v<T>  or
+                                        std::is_trivially_default_constructible_v<T>;
+    };
+
+    template <typename T, typename ...Args>
+    struct TNothrowCtor {
+        StaticAssert( std::is_constructible_v< T, Args... >);
+        static constexpr bool   value = std::is_nothrow_constructible_v< T, Args... >   or
+                                        std::is_trivially_constructible_v< T, Args... >;
+    };
+
     template <typename T>
-    static constexpr bool   IsNothrowMoveCtor       = std::is_nothrow_move_constructible_v<T>       or
-                                                      std::is_trivially_move_constructible_v<T>;
+    struct TNothrowCopyAssignable {
+        static constexpr bool   value = std::is_nothrow_copy_assignable_v<T>    or
+                                        TNothrowCopyCtor<T>::value;     // if used dtor + ctor
+    };
+
     template <typename T>
-    static constexpr bool   IsNothrowDefaultCtor    = std::is_nothrow_default_constructible_v<T>    or
-                                                      std::is_trivially_default_constructible_v<T>;
+    struct TNothrowMoveAssignable {
+        static constexpr bool   value = std::is_nothrow_move_assignable_v<T>    or
+                                        TNothrowMoveCtor<T>::value;     // if used dtor + move ctor
+    };
+
+    template <typename Fn, typename ...Args>
+    struct TNothrowInvocable
+    {
+        StaticAssert( std::is_invocable_v< Fn, Args... >);
+        static constexpr bool   value = std::is_nothrow_invocable_v< Fn, Args... >;
+    };
+
+    template <typename T>
+    struct TNothrowable {
+        static constexpr bool   value   = std::is_nothrow_move_constructible_v<T>       and
+                                          std::is_nothrow_default_constructible_v<T>    and
+                                          std::is_nothrow_copy_assignable_v<T>          and
+                                          std::is_nothrow_copy_constructible_v<T>       and
+                                          std::is_nothrow_destructible_v<T>             and
+                                          std::is_nothrow_move_assignable_v<T>;
+    };
+
+#else
+
     template <typename T>
-    static constexpr bool   IsNothrowCopyAssignable = std::is_nothrow_copy_assignable_v<T>          or
-                                                      (IsNothrowCopyCtor<T> and IsNothrowDtor<T>);      // if used dtor + ctor
+    struct TNothrowCopyCtor {
+        StaticAssert( std::is_copy_constructible_v<T> );
+        static constexpr bool   value = true;
+    };
+
     template <typename T>
-    static constexpr bool   IsNothrowMoveAssignable = std::is_nothrow_move_assignable_v<T>          or
-                                                      (IsNothrowMoveCtor<T> and IsNothrowDtor<T>);      // if used dtor + move ctor
+    struct TNothrowMoveCtor {
+        StaticAssert( std::is_move_constructible_v<T> );
+        static constexpr bool   value = true;
+    };
+
+    template <typename T>
+    struct TNothrowDefaultCtor {
+        StaticAssert( std::is_default_constructible_v<T> );
+        static constexpr bool   value = true;
+    };
 
     template <typename T, typename ...Args>
-    static constexpr bool   IsNothrowCtor           = std::is_nothrow_constructible_v< T, Args... >     or
-                                                      std::is_trivially_constructible_v< T, Args... >   or
-                                                      (std::is_constructible_v< T, Args... > and std::is_trivial_v<T>);
+    struct TNothrowCtor {
+        StaticAssert( std::is_constructible_v< T, Args... >);
+        static constexpr bool   value = true;
+    };
+
+    template <typename T>
+    struct TNothrowCopyAssignable {
+        static constexpr bool   value = true;
+    };
 
+    template <typename T>
+    struct TNothrowMoveAssignable {
+        static constexpr bool   value = true;
+    };
 
-    template <typename T>                   struct IsNothrowDtor_t              { static constexpr bool  value = IsNothrowDtor<T>; };
-    template <typename T>                   struct IsNothrowCopyCtor_t          { static constexpr bool  value = IsNothrowCopyCtor<T>; };
-    template <typename T>                   struct IsNothrowMoveCtor_t          { static constexpr bool  value = IsNothrowMoveCtor<T>; };
-    template <typename T>                   struct IsNothrowDefaultCtor_t       { static constexpr bool  value = IsNothrowDefaultCtor<T>; };
-    template <typename T>                   struct IsNothrowMoveAssignable_t    { static constexpr bool  value = IsNothrowMoveAssignable<T>; };
-    template <typename T>                   struct IsNothrowCopyAssignable_t    { static constexpr bool  value = IsNothrowCopyAssignable<T>; };
-    template <typename T, typename ...Args> struct IsNothrowCtor_t              { static constexpr bool  value = IsNothrowCtor< T, Args... >; };
+    template <typename Fn, typename ...Args>
+    struct TNothrowInvocable
+    {
+        StaticAssert( std::is_invocable_v< Fn, Args... >);
+        static constexpr bool   value = true;
+    };
 
+    template <typename T>
+    struct TNothrowable {
+        static constexpr bool   value = true;
+    };
+#endif
 
-    template <typename Fn>
-    static constexpr bool   IsNothrowInvocable      = std::is_nothrow_invocable_v<Fn>;
+    template <typename T>
+    static constexpr bool   IsNothrowCopyCtor       = TNothrowCopyCtor<T>::value;
 
-    template <typename Fn> struct IsNothrowInvocable_t { static constexpr bool  value = IsNothrowInvocable<Fn>; };
+    template <typename T>
+    static constexpr bool   IsNothrowMoveCtor       = TNothrowMoveCtor<T>::value;
 
+    template <typename T>
+    static constexpr bool   IsNothrowDefaultCtor    = TNothrowDefaultCtor<T>::value;
+
+    template <typename T, typename ...Args>
+    static constexpr bool   IsNothrowCtor           = TNothrowCtor<T,Args...>::value;
+
+    template <typename T>
+    static constexpr bool   IsNothrowable           = TNothrowable<T>::value;
+
+    template <typename T>
+    static constexpr bool   IsNothrowCopyAssignable = TNothrowCopyAssignable<T>::value;
+
+    template <typename T>
+    static constexpr bool   IsNothrowMoveAssignable = TNothrowMoveAssignable<T>::value;
+
+    template <typename Fn, typename ...Args>
+    static constexpr bool   IsNothrowInvocable      = TNothrowInvocable< Fn, Args... >::value;
 
 
     template <typename T>
@@ -208,14 +287,14 @@ namespace _hidden_
 
 
     template <bool Test, typename Type = void>
-    using EnableIf      = std::enable_if_t< Test, Type >;
+    using EnableIf          = std::enable_if_t< Test, Type >;
 
     template <bool Test, typename Type = void>
-    using DisableIf     = std::enable_if_t< !Test, Type >;
+    using DisableIf         = std::enable_if_t< !Test, Type >;
 
 
     template <bool Test, typename IfTrue, typename IfFalse>
-    using Conditional   = std::conditional_t< Test, IfTrue, IfFalse >;
+    using Conditional       = std::conditional_t< Test, IfTrue, IfFalse >;
 
 
     template <typename T>   ND_ constexpr usize     CT_SizeofInBits (const T&)  __NE___ { return sizeof(T) << 3; }
@@ -236,6 +315,11 @@ namespace _hidden_
                                         Conditional< Bits <= CT_SizeOfInBits<slong>, slong,
                                             void >>>>;
 
+    template <usize Bits>
+    using BitSizeToFloat    = Conditional< Bits <= CT_SizeOfInBits<float>, float,
+                                Conditional< Bits <= CT_SizeOfInBits<double>, double,
+                                    void >>;
+
 
     template <usize ByteCount>
     using ByteSizeToUInt    = BitSizeToUInt< ByteCount * 8 >;
@@ -243,6 +327,9 @@ namespace _hidden_
     template <usize ByteCount>
     using ByteSizeToInt     = BitSizeToInt< ByteCount * 8 >;
 
+    template <usize ByteCount>
+    using ByteSizeToFloat   = BitSizeToFloat< ByteCount * 8 >;
+
 
     template <typename T>
     using ToUnsignedInteger = BitSizeToUInt< CT_SizeOfInBits<T> >;
@@ -250,6 +337,9 @@ namespace _hidden_
     template <typename T>
     using ToSignedInteger   = BitSizeToInt< CT_SizeOfInBits<T> >;
 
+    template <typename T>
+    using ToFloatPoint      = BitSizeToInt< CT_SizeOfInBits<T> >;
+
 
     namespace _hidden_
     {
@@ -390,7 +480,7 @@ namespace _hidden_
     template <typename T>
     ND_ constexpr auto  Infinity ()
     {
-        STATIC_ASSERT( IsAnyFloatPoint<T> );
+        StaticAssert( IsAnyFloatPoint<T> );
         return std::numeric_limits< RemoveAllQualifiers<T> >::infinity();
     }
 
@@ -402,7 +492,7 @@ namespace _hidden_
     template <typename T>
     ND_ constexpr auto  NaN ()
     {
-        STATIC_ASSERT( IsAnyFloatPoint<T> );
+        StaticAssert( IsAnyFloatPoint<T> );
         return std::numeric_limits< RemoveAllQualifiers<T> >::quiet_NaN();
     }
 
@@ -436,7 +526,7 @@ namespace _hidden_
 =================================================
     IsZeroMemAvailable
 ----
-    allow to use ZeroMem
+    Allow to use ZeroMem as a constructor.
 =================================================
 */
     template <typename T>
@@ -488,5 +578,21 @@ namespace _hidden_
     template <typename T>
     static constexpr bool   IsTriviallySerializable = TTriviallySerializable< RemoveCV<T> >::value;
 
+/*
+=================================================
+    IsTriviallyDestructible
+----
+    Allow to skip destructor.
+=================================================
+*/
+    template <typename T>
+    struct TTriviallyDestructible {
+        static constexpr bool   value = std::is_trivially_destructible_v<T> or
+                                        IsZeroMemAvailable<T>;
+    };
+
+    template <typename T>
+    static constexpr bool   IsTriviallyDestructible = TTriviallyDestructible< RemoveCV<T> >::value;
+
 
 } // AE::Base
diff --git a/AE/engine/src/base/Containers/AnyTypeRef.h b/AE/engine/src/base/Containers/AnyTypeRef.h
index 7e119590..ba58b6c6 100644
--- a/AE/engine/src/base/Containers/AnyTypeRef.h
+++ b/AE/engine/src/base/Containers/AnyTypeRef.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "base/Common.h"
+#include "base/Utils/TypeId.h"
 
 namespace AE::Base
 {
@@ -18,17 +19,14 @@ namespace AE::Base
     {
     // types
     private:
-        template <typename T>
-        using NonAnyTypeRef = DisableIf< IsConst<T> or IsSameTypes< T, AnyTypeRef > or IsSameTypes< T, AnyTypeCRef >, int >;
-
         template <typename T>
         inline static constexpr bool    IsNtCopy = IsNothrowCopyCtor<T> and IsNothrowDefaultCtor<T>;
 
 
     // variables
     private:
-        std::type_index     _typeId     = typeid(void);
-        void *              _ref        = null;
+        TypeId      _typeId;
+        void *      _ref        = null;
 
 
     // methods
@@ -39,17 +37,21 @@ namespace AE::Base
 
         AnyTypeRef&  operator = (const AnyTypeRef &rhs)     __NE___ = default;
 
-        template <typename T>   AnyTypeRef (T &value, NonAnyTypeRef<T> = 0) __NE___ : _typeId{ typeid(T) }, _ref{ std::addressof(value) } {}
+        template <typename T,
+                  DISABLEIF( IsConst<T> or IsSameTypes< T, AnyTypeRef > or IsSameTypes< T, AnyTypeCRef >)
+                 >
+        AnyTypeRef (T &value)                               __NE___ : _typeId{ TypeIdOf<T>() }, _ref{ std::addressof(value) } {}
+
 
-        template <typename T>   ND_ bool    Is ()           C_NE___                     { return _typeId == typeid(T); }
-        template <typename T>   ND_ bool    Is (const T &)  C_NE___                     { return _typeId == typeid(T); }
+        template <typename T>   ND_ bool    Is ()           C_NE___                 { return _typeId == TypeIdOf<T>(); }
+        template <typename T>   ND_ bool    Is (const T &)  C_NE___                 { return _typeId == TypeIdOf<T>(); }
 
-        template <typename T>   ND_ T *     GetIf ()        C_NE___                     { return Is<T>() ? static_cast<T*>( _ref ) : null; }
-        template <typename T>   ND_ T       GetCopyIf ()    const noexcept(IsNtCopy<T>) { return Is<T>() ? *static_cast<T*>( _ref ) : T{}; }
-        template <typename T>   ND_ T &     As ()           C_NE___                     { ASSERT( Is<T>() );  return *static_cast<T*>( _ref ); }
+        template <typename T>   ND_ T *     GetIf ()        C_NE___                 { return Is<T>() ? static_cast<T*>( _ref ) : null; }
+        template <typename T>   ND_ T       GetCopyIf ()    CNoExcept(IsNtCopy<T>)  { return Is<T>() ? *static_cast<T*>( _ref ) : T{}; }
+        template <typename T>   ND_ T &     As ()           C_NE___                 { ASSERT( Is<T>() );  return *static_cast<T*>( _ref ); }
 
-        ND_ std::type_index     GetType ()                  C_NE___                     { return _typeId; }
-        ND_ StringView          GetTypeName ()              C_NE___                     { return _typeId.name(); }
+        ND_ TypeId          GetType ()                      C_NE___                 { return _typeId; }
+        ND_ StringView      GetTypeName ()                  C_NE___                 { return _typeId.Name(); }
     };
 
 
@@ -62,20 +64,14 @@ namespace AE::Base
     {
     // types
     private:
-        template <typename T>
-        using NonAnyTypeRef = DisableIf< IsConst<T> or IsSameTypes< T, AnyTypeRef > or IsSameTypes< T, AnyTypeCRef >, int >;
-
-        template <typename T>
-        using NonAnyTypeCRef = DisableIf< IsSameTypes< T, AnyTypeRef > or IsSameTypes< T, AnyTypeCRef >, int >;
-
         template <typename T>
         inline static constexpr bool    IsNtCopy = IsNothrowCopyCtor<T> and IsNothrowDefaultCtor<T>;
 
 
     // variables
     private:
-        std::type_index     _typeId     = typeid(void);
-        void const *        _ref        = null;
+        TypeId          _typeId;
+        void const *    _ref        = null;
 
 
     // methods
@@ -86,18 +82,26 @@ namespace AE::Base
 
         AnyTypeCRef&  operator = (const AnyTypeCRef &rhs)       __NE___ = default;
 
-        template <typename T>   AnyTypeCRef (T &value, NonAnyTypeRef<T> = 0)                 __NE___ : _typeId{ typeid(T) }, _ref{ std::addressof(value) } {}
-        template <typename T>   explicit AnyTypeCRef (const T &value, NonAnyTypeCRef<T> = 0) __NE___ : _typeId{ typeid(T) }, _ref{ std::addressof(value) } {}
+        template <typename T,
+                  DISABLEIF( IsConst<T> or IsSameTypes< T, AnyTypeRef > or IsSameTypes< T, AnyTypeCRef >)
+                 >
+        AnyTypeCRef (T &value)                                  __NE___ : _typeId{ TypeIdOf<T>() }, _ref{ std::addressof(value) } {}
+
+        template <typename T,
+                  DISABLEIF( IsSameTypes< T, AnyTypeRef > or IsSameTypes< T, AnyTypeCRef >)
+                 >
+        explicit AnyTypeCRef (const T &value)                   __NE___ : _typeId{ TypeIdOf<T>() }, _ref{ std::addressof(value) } {}
+
 
-        template <typename T>   ND_ bool        Is ()           C_NE___                     { return _typeId == typeid(T); }
-        template <typename T>   ND_ bool        Is (const T &)  C_NE___                     { return _typeId == typeid(T); }
+        template <typename T>   ND_ bool        Is ()           C_NE___                 { return _typeId == TypeIdOf<T>(); }
+        template <typename T>   ND_ bool        Is (const T &)  C_NE___                 { return _typeId == TypeIdOf<T>(); }
 
-        template <typename T>   ND_ T const *   GetIf ()        C_NE___                     { return Is<T>() ? static_cast<T const*>( _ref ) : null; }
-        template <typename T>   ND_ T           GetCopyIf ()    const noexcept(IsNtCopy<T>) { return Is<T>() ? *static_cast<T*>( _ref ) : T{}; }
-        template <typename T>   ND_ T const &   As ()           C_NE___                     { ASSERT( Is<T>() );  return *static_cast<T const*>( _ref ); }
+        template <typename T>   ND_ T const *   GetIf ()        C_NE___                 { return Is<T>() ? static_cast<T const*>( _ref ) : null; }
+        template <typename T>   ND_ T           GetCopyIf ()    CNoExcept(IsNtCopy<T>)  { return Is<T>() ? *static_cast<T*>( _ref ) : T{}; }
+        template <typename T>   ND_ T const &   As ()           C_NE___                 { ASSERT( Is<T>() );  return *static_cast<T const*>( _ref ); }
 
-        ND_ std::type_index     GetType ()                      C_NE___                     { return _typeId; }
-        ND_ StringView          GetTypeName ()                  C_NE___                     { return _typeId.name(); }
+        ND_ TypeId          GetType ()                          C_NE___                 { return _typeId; }
+        ND_ StringView      GetTypeName ()                      C_NE___                 { return _typeId.Name(); }
     };
 
 
diff --git a/AE/engine/src/base/Containers/ArrayView.h b/AE/engine/src/base/Containers/ArrayView.h
index 63bb0484..dc0b9e0e 100644
--- a/AE/engine/src/base/Containers/ArrayView.h
+++ b/AE/engine/src/base/Containers/ArrayView.h
@@ -37,8 +37,8 @@ namespace AE::Base
         constexpr ArrayView (T const* ptr, usize count)         __NE___ : _array{ptr}, _count{count}  { ASSERT( (_count == 0) or (_array != null) ); }
         constexpr ArrayView (T const* begin, T const* end)      __NE___ : _array{begin}, _count{usize(std::distance( begin, end ))}  { ASSERT( begin <= end ); }
 
-        template <typename = DisableIf< IsStaticArray<T> or IsArray<T> >
-                 >
+        // warning: initializer_list allocated on stack!
+        template <DISABLEIF( IsStaticArray<T> or IsArray<T> )>
         constexpr ArrayView (std::initializer_list<T> list)     __NE___ : _array{list.begin()}, _count{list.size()} {}
 
         template <typename AllocT>
@@ -189,8 +189,8 @@ namespace AE::Base
     template <typename R>
     constexpr EnableIf<IsTrivial<T> and IsTrivial<R>, ArrayView<R>>  ArrayView<T>::Cast () C_NE___
     {
-        STATIC_ASSERT( alignof(R) >= alignof(T) );
-        STATIC_ASSERT( sizeof(R) > sizeof(T) ? IsMultipleOf( sizeof(R), sizeof(T) ) : IsMultipleOf( sizeof(T), sizeof(R) ));
+        StaticAssert( alignof(R) >= alignof(T) );
+        StaticAssert( sizeof(R) > sizeof(T) ? IsMultipleOf( sizeof(R), sizeof(T) ) : IsMultipleOf( sizeof(T), sizeof(R) ));
 
         return ArrayView<R>{ static_cast<const R*>(static_cast<const void *>( _array )), (_count * sizeof(T)) / sizeof(R) };
     }
@@ -206,8 +206,12 @@ namespace AE::Base
         ASSERT( it >= begin() and it < end() );
         return it - begin();
     }
+//-----------------------------------------------------------------------------
 
 
+    template <typename T>   struct TMemCopyAvailable< ArrayView<T> >    { static constexpr bool  value = true; };
+    template <typename T>   struct TZeroMemAvailable< ArrayView<T> >    { static constexpr bool  value = true; };
+
 } // AE::Base
 
 
diff --git a/AE/engine/src/base/Containers/ChunkList.h b/AE/engine/src/base/Containers/ChunkList.h
new file mode 100644
index 00000000..3a9b5370
--- /dev/null
+++ b/AE/engine/src/base/Containers/ChunkList.h
@@ -0,0 +1,476 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Forward linked list of chunks with small arrays.
+*/
+
+#pragma once
+
+#include "base/Memory/IAllocator.h"
+#include "base/Memory/CopyPolicy.h"
+#include "base/Containers/ArrayView.h"
+
+namespace AE::Base
+{
+    template <typename T>
+    class ChunkList;
+
+namespace _hidden_
+{
+    template <typename T>
+    class BaseChunkList
+    {
+    // types
+    protected:
+        using Count_t       = ByteSizeToUInt< sizeof(void*)/2 >;
+        using CopyPolicy_t  = CopyPolicy::AutoDetect<T>;
+
+        static constexpr usize  _Align      = Max( AE_CACHE_LINE, alignof(T) );
+        static constexpr usize  _HeaderSize = AlignUp( sizeof(void*)*2, alignof(T) );
+
+        template <typename C>
+        struct alignas(_Align) BaseChunk : public Noncopyable
+        {
+        // types
+            using ChunkPtr_t = Conditional< IsConst<T>, C const*, C* >;
+
+        // variables
+            ChunkPtr_t      next        = null;
+            Count_t         count       = 0;        // number of constructed elements in '_data'
+            Count_t         capacity    = 0;
+            union {
+                T           _data  [1];             // needed to put elements with correct alignment
+                char        _data2 [1];
+            };
+
+        // methods
+            BaseChunk ()                                                __NE___ {}
+            ~BaseChunk ()                                               __NE___ { CopyPolicy_t::Destroy( Data(), count ); }
+
+            ND_ T &         operator [] (usize i)                       __NE___ { ASSERT( i < count );  return _data[i]; }
+            ND_ T const&    operator [] (usize i)                       C_NE___ { ASSERT( i < count );  return _data[i]; }
+
+            ND_ T *         Data ()                                     __NE___ { ASSERT( capacity > 0 );  return _data; }
+            ND_ T const*    Data ()                                     C_NE___ { ASSERT( capacity > 0 );  return _data; }
+
+            ND_ Bytes       ChunkSize ()                                C_NE___ { return CalcChunkSize( capacity ); }
+
+            ND_ bool        IsEmpty ()                                  C_NE___ { return count == 0; }
+            ND_ bool        IsFull ()                                   C_NE___ { return count >= capacity; }
+
+            ND_ explicit operator ArrayView<T> ()                       C_NE___ { return ArrayView<T>{ _data, count }; }
+
+            ND_ constexpr static usize  CalcCapacity (Bytes size)       __NE___ { return usize{(size - _HeaderSize) / sizeof(T)}; }
+
+            ND_ constexpr static Bytes  CalcChunkSize (usize capacity)  __NE___
+            {
+                Bytes   size { _HeaderSize + sizeof(T) * capacity };
+                //ASSERT( (size % alignof(BaseChunk)) < sizeof(T) );
+                return size;
+            }
+        };
+
+
+        template <typename C>
+        struct ElemIter
+        {
+        // variables
+        private:
+            using ChunkPtr_t = Conditional< IsConst<T>, C const*, C* >;
+
+            ChunkPtr_t      _chunk  = null;
+            Count_t         _count  = 0;        // --- cached to avoid cache miss when accessing begin of the chunk
+            Count_t         _index  = 0;        //   /
+            ChunkPtr_t      _next   = null;     // -'
+
+        // methods
+        public:
+            ElemIter ()                                                 __NE___ {}
+
+            explicit ElemIter (ChunkPtr_t chunk, Count_t idx)           __NE___ :
+                _chunk{chunk},
+                _count{_chunk ? Min( _chunk->count, _chunk->capacity ) : Count_t{0}},
+                _index{idx},
+                _next{_chunk ? _chunk->next : null}
+            {
+                _Validate();
+            }
+
+            ElemIter (const ElemIter &)                                 __NE___ = default;
+            ElemIter (ElemIter &&)                                      __NE___ = default;
+
+                ElemIter&   operator = (const ElemIter &)               __NE___ = default;
+                ElemIter&   operator = (ElemIter &&)                    __NE___ = default;
+
+                ElemIter&   operator ++ ()                              __NE___ { ++_index;  _Validate();  return *this; }
+                ElemIter    operator ++ (int)                           __NE___ { ElemIter<C>  res {*this};  this->operator++();  return res; }
+
+            ND_ bool        operator != (const ElemIter &rhs)           C_NE___ { return not (*this == rhs); }
+            ND_ bool        operator == (const ElemIter &rhs)           C_NE___ { return (_chunk == rhs._chunk) & (_index == rhs._index); }
+
+            ND_ auto        GetChunk ()                                 __NE___ { return _chunk; }
+            ND_ auto        GetChunk ()                                 C_NE___ { return _chunk; }
+            ND_ Count_t     GetIndexInChunk ()                          C_NE___ { return _index; }
+
+            ND_ T const& operator * ()                                  C_NE___ { ASSERT( _chunk != null );  return (*_chunk)[_index]; }
+
+            ND_ explicit operator ArrayView<T> ()                       C_NE___ { ASSERT( _chunk != null );  return ArrayView<T>{ *_chunk }; }
+
+        private:
+            void  _Validate ()                                          __NE___
+            {
+                for_unlikely(; (_chunk != null) & (_index >= _count); )
+                {
+                    _chunk  = _next;
+                    _index  = 0;
+                    _next   = _chunk ? _chunk->next : null;
+                    _count  = _chunk ? Min( _chunk->count, _chunk->capacity ) : Count_t{0}; // see LfChunkList
+                }
+            }
+        };
+
+
+        template <typename C>
+        static void  _MoveToLast (INOUT C* &first)      __NE___
+        {
+            if ( first != null )
+            {
+                for (;;)
+                {
+                    if_likely( first->next != null )
+                        first = first->next;
+                    else
+                        break;
+                }
+            }
+        }
+
+        template <typename C>
+        ND_ static usize  _Count (C* chunk)             __NE___
+        {
+            usize   count = 0;
+            for (; chunk != null; chunk = chunk->next) {
+                count += chunk->count;
+            }
+            return count;
+        }
+    };
+
+} // _hidden_
+
+
+
+    //
+    // List of Chunks
+    //
+
+    template <typename T>
+    class ChunkList final : Base::_hidden_::BaseChunkList<T>
+    {
+        StaticAssert( not IsConst<T> );
+
+    // types
+    private:
+        using Base_t    = Base::_hidden_::BaseChunkList<T>;
+    public:
+        using Self      = ChunkList< T >;
+        using Value_t   = T;
+        using Count_t   = typename Base_t::Count_t;
+
+        struct Chunk : Base_t::template BaseChunk<Chunk>
+        {
+        // methods
+            ND_ T &     emplace_back ()                             __NE___;
+
+            template <typename T0, typename ...Types>
+                T &     emplace_back (T0 &&arg0, Types&& ...args)   __NE___;
+        };
+
+    private:
+        using ChunkPtr_t        = typename Chunk::ChunkPtr_t;
+        using Const_t           = ChunkList< const T >;
+    public:
+        using iterator          = typename Base_t::template ElemIter< Chunk >;
+        using const_iterator    = typename Base_t::template ElemIter< const Chunk >;
+
+
+    // variables
+    private:
+        ChunkPtr_t      _first  = null;
+
+
+    // methods
+    public:
+        ChunkList ()                                                __NE___ {}
+        ChunkList (Self &&)                                         __NE___ = default;
+        ChunkList (const Self &)                                    __NE___ = default;
+
+        explicit ChunkList (iterator it)                            __NE___ : _first{it.GetChunk()} {}
+        explicit ChunkList (ChunkPtr_t first)                       __NE___ : _first{first} {}
+
+            Self&   operator = (Self &&)                            __NE___ = default;
+            Self&   operator = (const Self &)                       __NE___ = default;
+
+        ND_ auto    begin ()                                        __NE___ { return iterator{ _first, 0 }; }
+        ND_ auto    end ()                                          __NE___ { return iterator{}; }
+
+        ND_ auto    begin ()                                        C_NE___ { return const_iterator{ _first, 0 }; }
+        ND_ auto    end ()                                          C_NE___ { return const_iterator{}; }
+
+        ND_ auto*   FirstChunk ()                                   __NE___ { return _first; }
+        ND_ auto*   FirstChunk ()                                   C_NE___ { return _first; }
+
+        ND_ auto*   operator -> ()                                  __NE___ { ASSERT( _first != null );  return _first; }
+        ND_ auto*   operator -> ()                                  C_NE___ { ASSERT( _first != null );  return _first; }
+
+        ND_ Self    LastChunk ()                                    __NE___ { Self res {_first};  res.MoveToLast();  return res; }
+        ND_ Const_t LastChunk ()                                    C_NE___;
+
+        ND_ Self    NextChunk ()                                    __NE___;
+        ND_ Const_t NextChunk ()                                    C_NE___;
+
+        ND_ bool    empty ()                                        C_NE___ { return _first == null; }
+        ND_ usize   Count ()                                        C_NE___ { return Base_t::_Count( _first ); }
+
+            void    Append (ChunkPtr_t newChunk)                    __NE___;
+            void    Append (Self newChunks)                         __NE___ { Append( newChunks._first ); }
+
+            void    MoveToLast ()                                   __NE___ { Base_t::_MoveToLast( INOUT _first ); }
+        ND_ bool    IsLastChunk ()                                  C_NE___ { return _first == null or _first->next == null; }
+
+        // create new chunk and append it to the end
+        ND_ Self    AddChunk (void* ptr, Bytes size)                __NE___;
+
+        template <typename Allocator>
+        ND_ Self    AddChunk (Allocator &alloc, Bytes size)         __NE___;
+
+        template <typename Allocator>
+        ND_ Self    AddChunk (Allocator &alloc, usize capacity)     __NE___;
+
+        template <typename Allocator>
+            void    Destroy (Allocator &alloc)                      __NE___;
+    };
+
+
+
+    //
+    // List of Chunks (const)
+    //
+
+    template <typename T>
+    class ChunkList< const T > final : Base::_hidden_::BaseChunkList< const T >
+    {
+    // types
+    private:
+        using Base_t    = Base::_hidden_::BaseChunkList< const T >;
+    public:
+        using Self      = ChunkList< const T >;
+        using Value_t   = const T;
+        using Count_t   = typename Base_t::Count_t;
+
+        struct Chunk : Base_t::template BaseChunk<Chunk>
+        {};
+
+    private:
+        using ChunkPtr_t        = typename Chunk::ChunkPtr_t;
+
+    public:
+        using iterator          = typename Base_t::template ElemIter< Chunk >;
+        using const_iterator    = iterator;
+
+
+    // variables
+    private:
+        ChunkPtr_t      _first  = null;
+
+
+    // methods
+    public:
+        ChunkList ()                                            __NE___ {}
+        ChunkList (Self &&)                                     __NE___ = default;
+        ChunkList (const Self &)                                __NE___ = default;
+
+        explicit ChunkList (iterator it)                        __NE___ : _first{it.GetChunk()} {}
+        explicit ChunkList (ChunkPtr_t first)                   __NE___ : _first{first} {}
+        ChunkList (const ChunkList<RemoveConst<T>> &other)      __NE___ : _first{Cast<Chunk>( other.FirstChunk() )} {}
+
+            Self&   operator = (Self &&)                        __NE___ = default;
+            Self&   operator = (const Self &)                   __NE___ = default;
+
+        ND_ auto    begin ()                                    C_NE___ { return const_iterator{ _first, 0 }; }
+        ND_ auto    end ()                                      C_NE___ { return const_iterator{ null, 0 }; }
+
+        ND_ auto*   FirstChunk ()                               C_NE___ { return _first; }
+        ND_ auto*   operator -> ()                              C_NE___ { ASSERT( _first != null );  return _first; }
+
+        ND_ Self    LastChunk ()                                C_NE___ { Self res {_first};  res.MoveToLast();  return res; }
+        ND_ Self    NextChunk ()                                C_NE___;
+
+            void    MoveToLast ()                               __NE___ { Base_t::_MoveToLast( INOUT _first ); }
+        ND_ bool    IsLastChunk ()                              C_NE___ { return _first == null or _first->next == null; }
+
+        ND_ bool    empty ()                                    C_NE___ { return _first == null; }
+        ND_ usize   Count ()                                    C_NE___ { return Base_t::_Count( _first ); }
+    };
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    AddChunk
+=================================================
+*/
+    template <typename T>
+    ChunkList<T>  ChunkList<T>::AddChunk (void* ptr, Bytes size) __NE___
+    {
+        ASSERT( ptr != null and size > 0 );
+        auto*   chunk = Cast<Chunk>(ptr);
+        chunk->next     = null;
+        chunk->count    = 0;
+        chunk->capacity = Chunk::CalcCapacity( size );
+        ASSERT( chunk->capacity > 0 );
+
+        Append( chunk );
+        return Self{ chunk };
+    }
+
+    template <typename T>
+    template <typename Allocator>
+    ChunkList<T>  ChunkList<T>::AddChunk (Allocator &alloc, Bytes size) __NE___
+    {
+        void*   ptr = alloc.Allocate( SizeAndAlign{ size, AlignOf<Chunk> });
+        return ptr != null ? AddChunk( ptr, size ) : Default;
+    }
+
+    template <typename T>
+    template <typename Allocator>
+    ChunkList<T>  ChunkList<T>::AddChunk (Allocator &alloc, const usize capacity) __NE___
+    {
+        ASSERT( capacity > 0 );
+        ASSERT( capacity < MaxValue<Count_t>() );
+
+        void*   ptr = alloc.Allocate( SizeAndAlign{ Chunk::CalcChunkSize( capacity ), AlignOf<Chunk> });
+        if_likely( ptr != null ) {
+            auto*   chunk   = Cast<Chunk>(ptr);
+            chunk->next     = null;
+            chunk->count    = 0;
+            chunk->capacity = Count_t(capacity);
+
+            Append( chunk );
+            return Self{ chunk };
+        }
+        return Default;
+    }
+
+/*
+=================================================
+    Destroy
+=================================================
+*/
+    template <typename T>
+    template <typename Allocator>
+    void  ChunkList<T>::Destroy (Allocator &alloc) __NE___
+    {
+        Chunk*  chunk   = _first;
+                _first  = null;
+
+        for (; chunk != null;)
+        {
+            Chunk*  ptr     = chunk;
+            Bytes   size    = chunk->ChunkSize();
+
+            chunk = chunk->next;
+
+            ptr->~Chunk();
+            alloc.Deallocate( ptr, SizeAndAlign{ size, AlignOf<Chunk> });
+        }
+    }
+
+/*
+=================================================
+    Append
+=================================================
+*/
+    template <typename T>
+    void  ChunkList<T>::Append (ChunkPtr_t newChunk) __NE___
+    {
+        Chunk**     next = &_first;
+
+        // find last chunk
+        for (; *next != null; next = &(*next)->next) {}
+
+        *next = newChunk;
+    }
+
+/*
+=================================================
+    LastChunk
+=================================================
+*/
+    template <typename T>
+    ChunkList<const T>  ChunkList<T>::LastChunk () C_NE___
+    {
+        ChunkList<const T>  res {_first};
+        res.MoveToLast();
+        return res;
+    }
+
+/*
+=================================================
+    NextChunk
+=================================================
+*/
+    template <typename T>
+    ChunkList<T>  ChunkList<T>::NextChunk () __NE___
+    {
+        return _first != null ? ChunkList<T>{ _first->next } : Default;
+    }
+
+    template <typename T>
+    ChunkList<const T>  ChunkList<T>::NextChunk () C_NE___
+    {
+        return _first != null ? ChunkList<const T>{ _first->next } : Default;
+    }
+
+    template <typename T>
+    ChunkList<const T>  ChunkList<const T>::NextChunk () C_NE___
+    {
+        return _first != null ? ChunkList<const T>{ _first->next } : Default;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    emplace_back
+=================================================
+*/
+    template <typename T>
+    T&  ChunkList<T>::Chunk::emplace_back () __NE___
+    {
+        ASSERT( this->count < this->capacity );
+        if constexpr( std::is_trivially_constructible_v<T> )
+            return this->_data [this->count++]; // skip ctor
+        else
+            return *PlacementNew<T>( OUT &this->_data [this->count++] );
+    }
+
+    template <typename T>
+    template <typename T0, typename ...Types>
+    T&  ChunkList<T>::Chunk::emplace_back (T0 &&arg0, Types&& ...args) __NE___
+    {
+        ASSERT( this->count < this->capacity );
+        if constexpr( std::is_trivially_constructible_v<T> and CountOf<Types...>() == 0 )
+            return (this->_data [this->count++] = FwdArg<T0>(arg0));
+        else
+            return *PlacementNew<T>( OUT &this->_data [this->count++], FwdArg<T0>(arg0), FwdArg<Types>(args)... );
+    }
+//-----------------------------------------------------------------------------
+
+
+    template <typename T>   struct TMemCopyAvailable< ChunkList<T> >    { static constexpr bool  value = true; };
+    template <typename T>   struct TZeroMemAvailable< ChunkList<T> >    { static constexpr bool  value = true; };
+
+
+} // AE::Base
diff --git a/AE/engine/src/base/Containers/FixedArray.h b/AE/engine/src/base/Containers/FixedArray.h
index 419b5dae..1eadc01b 100644
--- a/AE/engine/src/base/Containers/FixedArray.h
+++ b/AE/engine/src/base/Containers/FixedArray.h
@@ -1,8 +1,4 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-/*
-    Exceptions:
-        - array elements may throw exceptions (in copy-ctor)
-*/
 
 #pragma once
 
@@ -19,25 +15,21 @@ namespace AE::Base
 
     template <typename T,
               usize ArraySize,
-              typename Policy = CopyPolicy::AutoDetect<T>
+              typename TCopyPolicy = CopyPolicy::AutoDetect<T>
              >
-    struct FixedArray
+    struct FixedArray : NothrowAllocatable
     {
-        STATIC_ASSERT( IsNothrowDtor<T> );
-        //STATIC_ASSERT( IsNothrowMoveCtor<T> );
-
     // types
     public:
         using iterator          = T *;
         using const_iterator    = const T *;
-        using Self              = FixedArray< T, ArraySize, Policy >;
+        using Self              = FixedArray< T, ArraySize, TCopyPolicy >;
 
     private:
-        using CPolicy_t     = Policy;
-        using Count_t       = Conditional< (ArraySize <= MaxValue<ubyte>()), ubyte, ushort >;
-        STATIC_ASSERT( ArraySize < MaxValue<Count_t>() );
+        using CPolicy_t         = TCopyPolicy;
+        using Count_t           = Conditional< (ArraySize <= MaxValue<ubyte>()), ubyte, ushort >;
 
-        static constexpr bool   _IsNothrowCopy = IsNothrowCopyCtor<T>;
+        StaticAssert( ArraySize <= MaxValue<Count_t>() );
 
 
     // variables
@@ -52,9 +44,9 @@ namespace AE::Base
     // methods
     public:
         constexpr FixedArray ()                                 __NE___;
-        constexpr FixedArray (std::initializer_list<T> list)    noexcept(_IsNothrowCopy);       // TODO: use Args... to allow move ctor
-        constexpr FixedArray (ArrayView<T> view)                noexcept(_IsNothrowCopy);
-        constexpr FixedArray (const Self &other)                noexcept(_IsNothrowCopy);
+        constexpr FixedArray (std::initializer_list<T> list)    __NE___;        // TODO: use Args... to allow move ctor
+        constexpr FixedArray (ArrayView<T> view)                __NE___;
+        constexpr FixedArray (const Self &other)                __NE___;
         constexpr FixedArray (Self &&other)                     __NE___;
 
         ~FixedArray ()                                          __NE___ { clear(); }
@@ -91,26 +83,26 @@ namespace AE::Base
         ND_ constexpr bool  operator <= (ArrayView<T> rhs)      C_NE___ { return ArrayView<T>{*this} <= rhs; }
 
 
-        constexpr Self&  operator = (const Self &rhs)           noexcept(_IsNothrowCopy);
-        constexpr Self&  operator = (ArrayView<T> rhs)          noexcept(_IsNothrowCopy);
+        constexpr Self&  operator = (const Self &rhs)           __NE___;
+        constexpr Self&  operator = (ArrayView<T> rhs)          __NE___;
         constexpr Self&  operator = (Self &&rhs)                __NE___;
 
-        constexpr void  assign (const_iterator beginIter, const_iterator endIter)   noexcept(_IsNothrowCopy);
-        constexpr void  append (ArrayView<T> items)                                 noexcept(_IsNothrowCopy);
+        constexpr void  assign (const_iterator beginIter, const_iterator endIter)   __NE___;
+        constexpr void  append (ArrayView<T> items)                                 __NE___;
 
-        constexpr void  push_back (const T &value)              noexcept(_IsNothrowCopy);
+        constexpr void  push_back (const T &value)              __NE___;
         constexpr void  push_back (T &&value)                   __NE___;
 
         template <typename ...Args>
-        constexpr T&    emplace_back (Args&& ...args)           noexcept(_IsNothrowCopy);
+        constexpr T&    emplace_back (Args&& ...args)           __NE___;
 
         constexpr void  pop_back ()                             __NE___;
 
-        constexpr bool  try_push_back (const T &value)          noexcept(_IsNothrowCopy);
+        constexpr bool  try_push_back (const T &value)          __NE___;
         constexpr bool  try_push_back (T&& value)               __NE___;
 
         template <typename ...Args>
-        constexpr bool  try_emplace_back (Args&& ...args)       noexcept(_IsNothrowCopy);
+        constexpr bool  try_emplace_back (Args&& ...args)       __NE___;
 
         constexpr void  insert (usize pos, T &&value)           __NE___;
 
@@ -140,33 +132,34 @@ namespace AE::Base
     {
         DEBUG_ONLY( DbgInitMem( data(), SizeOf<T> * capacity() ));
 
-        STATIC_ASSERT( IsMultipleOf( alignof(Self), alignof(T) ));
+        StaticAssert( IsMultipleOf( alignof(Self), alignof(T) ));
     }
 
     template <typename T, usize S, typename CS>
-    constexpr FixedArray<T,S,CS>::FixedArray (std::initializer_list<T> list) noexcept(_IsNothrowCopy) : FixedArray()
+    constexpr FixedArray<T,S,CS>::FixedArray (std::initializer_list<T> list) __NE___ : FixedArray()
     {
         ASSERT( list.size() <= capacity() );
-        assign( list.begin(), list.end() );     // throw
+        assign( list.begin(), list.end() );
     }
 
     template <typename T, usize S, typename CS>
-    constexpr FixedArray<T,S,CS>::FixedArray (ArrayView<T> view) noexcept(_IsNothrowCopy) : FixedArray()
+    constexpr FixedArray<T,S,CS>::FixedArray (ArrayView<T> view) __NE___ : FixedArray()
     {
         ASSERT( view.size() <= capacity() );
-        assign( view.begin(), view.end() );     // throw
+        assign( view.begin(), view.end() );
     }
 
     template <typename T, usize S, typename CS>
-    constexpr FixedArray<T,S,CS>::FixedArray (const Self &other) noexcept(_IsNothrowCopy) : FixedArray()
+    constexpr FixedArray<T,S,CS>::FixedArray (const Self &other) __NE___ : FixedArray()
     {
-        assign( other.begin(), other.end() );   // throw
+        assign( other.begin(), other.end() );
     }
 
     template <typename T, usize S, typename CS>
     constexpr FixedArray<T,S,CS>::FixedArray (Self &&other) __NE___ : _count{other._count}
     {
         ASSERT( not _IsMemoryAliased( other.begin(), other.end() ));
+        CheckNothrow( IsNothrowMoveCtor<T> );
 
         CPolicy_t::Replace( OUT _array, INOUT other._array, _count );
         other._count = 0;
@@ -178,17 +171,17 @@ namespace AE::Base
 =================================================
 */
     template <typename T, usize S, typename CS>
-    constexpr FixedArray<T,S,CS>&  FixedArray<T,S,CS>::operator = (const Self &rhs) noexcept(_IsNothrowCopy)
+    constexpr FixedArray<T,S,CS>&  FixedArray<T,S,CS>::operator = (const Self &rhs) __NE___
     {
-        assign( rhs.begin(), rhs.end() );   // throw
+        assign( rhs.begin(), rhs.end() );
         return *this;
     }
 
     template <typename T, usize S, typename CS>
-    constexpr FixedArray<T,S,CS>&  FixedArray<T,S,CS>::operator = (ArrayView<T> rhs) noexcept(_IsNothrowCopy)
+    constexpr FixedArray<T,S,CS>&  FixedArray<T,S,CS>::operator = (ArrayView<T> rhs) __NE___
     {
         ASSERT( rhs.size() < capacity() );
-        assign( rhs.begin(), rhs.end() );   // throw
+        assign( rhs.begin(), rhs.end() );
         return *this;
     }
 
@@ -196,6 +189,7 @@ namespace AE::Base
     constexpr FixedArray<T,S,CS>&  FixedArray<T,S,CS>::operator = (Self &&rhs) __NE___
     {
         ASSERT( not _IsMemoryAliased( rhs.begin(), rhs.end() ));
+        CheckNothrow( IsNothrowMoveCtor<T> );
 
         CPolicy_t::Destroy( INOUT _array, _count );
         CPolicy_t::Replace( OUT _array, INOUT rhs._array, rhs._count );
@@ -212,7 +206,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T, usize S, typename CS>
-    constexpr void  FixedArray<T,S,CS>::assign (const_iterator beginIter, const_iterator endIter) noexcept(_IsNothrowCopy)
+    constexpr void  FixedArray<T,S,CS>::assign (const_iterator beginIter, const_iterator endIter) __NE___
     {
         ASSERT( beginIter <= endIter );
         ASSERT( not _IsMemoryAliased( beginIter, endIter ));
@@ -221,7 +215,7 @@ namespace AE::Base
 
         for (auto iter = beginIter; _count < capacity() and iter != endIter; ++iter, ++_count)
         {
-            PlacementNew<T>( OUT data() + _count, *iter );  // throw
+            PlacementNew<T>( OUT data() + _count, *iter );
         }
     }
 
@@ -231,10 +225,10 @@ namespace AE::Base
 =================================================
 */
     template <typename T, usize S, typename CS>
-    constexpr void  FixedArray<T,S,CS>::append (ArrayView<T> items) noexcept(_IsNothrowCopy)
+    constexpr void  FixedArray<T,S,CS>::append (ArrayView<T> items) __NE___
     {
         for (auto& item : items) {
-            push_back( item );      // throw
+            push_back( item );
         }
     }
 
@@ -244,10 +238,10 @@ namespace AE::Base
 =================================================
 */
     template <typename T, usize S, typename CS>
-    constexpr void  FixedArray<T,S,CS>::push_back (const T &value) noexcept(_IsNothrowCopy)
+    constexpr void  FixedArray<T,S,CS>::push_back (const T &value) __NE___
     {
         ASSERT( _count < capacity() );
-        PlacementNew<T>( OUT data() + _count, value );  // throw
+        PlacementNew<T>( OUT data() + _count, value );
         ++_count;
     }
 
@@ -255,7 +249,7 @@ namespace AE::Base
     constexpr void  FixedArray<T,S,CS>::push_back (T &&value) __NE___
     {
         ASSERT( _count < capacity() );
-        PlacementNew<T>( OUT data() + _count, RVRef(value) );   // nothrow
+        PlacementNew<T>( OUT data() + _count, RVRef(value) );
         ++_count;
     }
 
@@ -266,11 +260,11 @@ namespace AE::Base
 */
     template <typename T, usize S, typename CS>
     template <typename ...Args>
-    constexpr T&  FixedArray<T,S,CS>::emplace_back (Args&& ...args) noexcept(_IsNothrowCopy)
+    constexpr T&  FixedArray<T,S,CS>::emplace_back (Args&& ...args) __NE___
     {
         ASSERT( _count < capacity() );
         T* ptr = data() + _count;
-        PlacementNew<T>( OUT ptr, FwdArg<Args &&>( args )... );     // throw
+        PlacementNew<T>( OUT ptr, FwdArg<Args>( args )... );
         ++_count;
         return *ptr;
     }
@@ -295,11 +289,11 @@ namespace AE::Base
 =================================================
 */
     template <typename T, usize S, typename CS>
-    constexpr bool  FixedArray<T,S,CS>::try_push_back (const T &value) noexcept(_IsNothrowCopy)
+    constexpr bool  FixedArray<T,S,CS>::try_push_back (const T &value) __NE___
     {
         if_likely( _count < capacity() )
         {
-            PlacementNew<T>( OUT data() + _count, value );  // throw
+            PlacementNew<T>( OUT data() + _count, value );
             ++_count;
             return true;
         }
@@ -311,7 +305,7 @@ namespace AE::Base
     {
         if_likely( _count < capacity() )
         {
-            PlacementNew<T>( OUT data() + _count, RVRef(value) );   // nothrow
+            PlacementNew<T>( OUT data() + _count, RVRef(value) );
             ++_count;
             return true;
         }
@@ -325,11 +319,11 @@ namespace AE::Base
 */
     template <typename T, usize S, typename CS>
     template <typename ...Args>
-    constexpr bool  FixedArray<T,S,CS>::try_emplace_back (Args&& ...args) noexcept(_IsNothrowCopy)
+    constexpr bool  FixedArray<T,S,CS>::try_emplace_back (Args&& ...args) __NE___
     {
         if_likely( _count < capacity() )
         {
-            PlacementNew<T>( OUT data() + _count, FwdArg<Args &&>( args )... );     // throw
+            PlacementNew<T>( OUT data() + _count, FwdArg<Args &&>( args )... );
             ++_count;
             return true;
         }
@@ -345,12 +339,13 @@ namespace AE::Base
     constexpr void  FixedArray<T,S,CS>::insert (usize pos, T &&value) __NE___
     {
         ASSERT( _count < capacity() );
+        CheckNothrow( IsNothrowMoveCtor<T> );
 
         pos = Min( pos, _count );
         CPolicy_t::Replace( OUT &_array[pos+1], INOUT &_array[pos], _count - pos );
 
         ++_count;
-        PlacementNew<T>( OUT &_array[pos], RVRef(value) );  // nothrow
+        PlacementNew<T>( OUT &_array[pos], RVRef(value) );
     }
 
 /*
@@ -370,6 +365,7 @@ namespace AE::Base
         else
         if ( newSize > _count )
         {
+            CheckNothrow( IsNothrowDefaultCtor<T> );
             CPolicy_t::Create( OUT &_array[_count], newSize - _count );
         }
 
@@ -388,6 +384,7 @@ namespace AE::Base
         else
         if ( newSize > _count )
         {
+            CheckNothrow( IsNothrowCopyCtor<T> );
             CPolicy_t::Create( OUT &_array[_count], newSize - _count, defaultValue );
         }
 
@@ -423,6 +420,7 @@ namespace AE::Base
         if ( index != _count )
         {
             // move element from back to 'index'
+            CheckNothrow( IsNothrowMoveCtor<T> );
             CPolicy_t::Replace( OUT &_array[index], INOUT &_array[_count], 1 );
         }
         else
@@ -444,10 +442,18 @@ namespace AE::Base
         CPolicy_t::Destroy( INOUT &_array[index], 1 );
 
         if ( index+1 < _count )
+        {
+            CheckNothrow( IsNothrowMoveCtor<T> );
             CPolicy_t::Replace( OUT &_array[index], INOUT &_array[index + 1], _count - index - 1 );
-
+        }
         --_count;
     }
+//-----------------------------------------------------------------------------
+
+
+    template <typename T, usize S, typename CS> struct TMemCopyAvailable< FixedArray<T,S,CS> >      { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T, usize S, typename CS> struct TZeroMemAvailable< FixedArray<T,S,CS> >      { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T, usize S, typename CS> struct TTriviallyDestructible< FixedArray<T,S,CS> > { static constexpr bool  value = IsTriviallyDestructible<T>; };
 
 
 } // AE::Base
diff --git a/AE/engine/src/base/Containers/FixedMap.h b/AE/engine/src/base/Containers/FixedMap.h
index 7a8bd513..1c55ee6d 100644
--- a/AE/engine/src/base/Containers/FixedMap.h
+++ b/AE/engine/src/base/Containers/FixedMap.h
@@ -3,12 +3,11 @@
     Map emulation on static array with binary/linear search.
 
     Use only for small number of elements.
-    Recomended maximum size is 8..16 elements.
+    Recommended maximum size is 8..16 elements.
 
-    References are not invalidated.
-
-    Exceptions:
-        - key & value may throw exceptions (in copy-ctor)
+    On insertion references are not invalidated.
+    On erase references may be invalidated.
+    Iterators are not invalidated.
 */
 
 #pragma once
@@ -30,28 +29,21 @@ namespace AE::Base
     template <typename Key,
               typename Value,
               usize ArraySize,
-              typename KeyPolicy   = CopyPolicy::AutoDetect< Key >,
-              typename ValuePolicy = CopyPolicy::AutoDetect< Value >
+              typename KeyCopyPolicy   = CopyPolicy::AutoDetect< Key >,
+              typename ValueCopyPolicy = CopyPolicy::AutoDetect< Value >
              >
-    struct FixedMap
+    struct FixedMap : NothrowAllocatable
     {
-        STATIC_ASSERT( ArraySize < 256 );
-        STATIC_ASSERT( IsNothrowDtor< Key >);
-        STATIC_ASSERT( IsNothrowDtor< Value >);
-        //STATIC_ASSERT( IsNothrowMoveCtor< Key >);
-        //STATIC_ASSERT( IsNothrowMoveCtor< Value >);
-
     // types
     private:
-        using Self          = FixedMap< Key, Value, ArraySize, KeyPolicy, ValuePolicy >;
-        using Index_t       = Conditional< (ArraySize < 0xFF), ubyte, Conditional< (ArraySize < 0xFFFF), ushort, uint >>;
+        using Self          = FixedMap< Key, Value, ArraySize, KeyCopyPolicy, ValueCopyPolicy >;
+        using Index_t       = Conditional< (ArraySize <= MaxValue<ubyte>()), ubyte, ushort >;
         using PairRef_t     = Pair< const Key &, Value & >;
         using PairCRef_t    = Pair< const Key &, const Value & >;
-        using KPolicy_t     = KeyPolicy;
-        using VPolicy_t     = ValuePolicy;
-
-        static constexpr bool   _IsNothrowCopy = AllNothrowCopyCtor< Key, Value >;
+        using KPolicy_t     = KeyCopyPolicy;
+        using VPolicy_t     = ValueCopyPolicy;
 
+        StaticAssert( ArraySize <= MaxValue<Index_t>() );
 
         template <typename PairType>
         struct TPairPtr
@@ -60,7 +52,7 @@ namespace AE::Base
             PairType    _pair;
 
         public:
-            TPairPtr (PairType && p)            __NE___ : _pair{p} {}
+            TPairPtr (PairType &&p)             __NE___ : _pair{p} {}
 
             ND_ PairType*       operator -> ()  __NE___ { return &_pair; }
             ND_ PairType const* operator -> ()  C_NE___ { return &_pair; }
@@ -94,7 +86,9 @@ namespace AE::Base
             Iter&  operator = (Iter &&)                 __NE___ = default;
 
             ND_ bool  operator != (const Iter &rhs)     C_NE___ { return not (*this == rhs); }
-            ND_ bool  operator == (const Iter &rhs)     C_NE___ { return _mapPtr == rhs._mapPtr and _index == rhs._index; }
+            ND_ bool  operator == (const Iter &rhs)     C_NE___ { return (_mapPtr == rhs._mapPtr) & (_index == rhs._index); }
+
+            ND_ explicit operator bool ()               C_NE___ { return _mapPtr != null; }
 
             Iter&  operator ++ ()                       __NE___
             {
@@ -137,15 +131,15 @@ namespace AE::Base
 
     // variables
     private:
-        Index_t             _count      = 0;
-        mutable Index_t     _indices [ArraySize];
+        Index_t         _count      = 0;
+        Index_t         _indices [ArraySize];
         union {
-            key_type        _keyArray  [ArraySize];
-            char            _keyBuffer [sizeof(key_type) * ArraySize];      // don't use this field!
+            key_type    _keyArray  [ArraySize];
+            char        _keyBuffer [sizeof(key_type) * ArraySize];      // don't use this field!
         };
         union {
-            value_type      _valArray  [ArraySize];
-            char            _valBuffer [sizeof(value_type) * ArraySize];    // don't use this field!
+            value_type  _valArray  [ArraySize];
+            char        _valBuffer [sizeof(value_type) * ArraySize];    // don't use this field!
         };
 
 
@@ -153,7 +147,7 @@ namespace AE::Base
     public:
         FixedMap ()                                                     __NE___;
         FixedMap (Self &&)                                              __NE___;
-        FixedMap (const Self &)                                         noexcept(_IsNothrowCopy);
+        FixedMap (const Self &)                                         __NE___;
 
         ~FixedMap ()                                                    __NE___ { clear(); }
 
@@ -168,25 +162,25 @@ namespace AE::Base
         ND_ static constexpr usize  capacity ()                         __NE___ { return ArraySize; }
 
             Self&   operator = (Self &&)                                __NE___;
-            Self&   operator = (const Self &)                           noexcept(_IsNothrowCopy);
+            Self&   operator = (const Self &)                           __NE___;
 
         ND_ bool    operator == (const Self &rhs)                       C_NE___;
         ND_ bool    operator != (const Self &rhs)                       C_NE___ { return not (*this == rhs); }
 
         // on overflow 'iterator' will be 'null'
             template <typename K, typename V>
-            Pair<iterator,bool>  emplace (K&& key, V&& value)           noexcept(_IsNothrowCopy);
+            Pair<iterator,bool>  emplace (K&& key, V&& value)           __NE___;
 
-            Pair<iterator,bool>  insert (const pair_type &value)        noexcept(_IsNothrowCopy)    { return emplace( value.first, value.second ); }
-            Pair<iterator,bool>  insert (pair_type&& value)             __NE___                     { return emplace( RVRef(value.first), RVRef(value.second) ); }
+            Pair<iterator,bool>  insert (const pair_type &value)        __NE___ { return emplace( value.first, value.second ); }
+            Pair<iterator,bool>  insert (pair_type&& value)             __NE___ { return emplace( RVRef(value.first), RVRef(value.second) ); }
 
             template <typename K, typename V>
-            Pair<iterator,bool>  insert_or_assign (K&& key, V&& value) noexcept(_IsNothrowCopy);
+            Pair<iterator,bool>  insert_or_assign (K&& key, V&& value)  __NE___;
 
 
         // same as operator [] in std
             template <typename KeyType>
-        ND_ Value &         operator () (KeyType&& key)                 noexcept(_IsNothrowCopy)    { auto[iter, inst] = emplace( FwdArg<KeyType>(key), Value{} );  return iter->second; }
+        ND_ Value &         operator () (KeyType&& key)                 __NE___ { auto[iter, inst] = emplace( FwdArg<KeyType>(key), Value{} );  return iter->second; }
 
             template <typename KeyType>
         ND_ const_iterator  find (const KeyType &key)                   C_NE___ { return _Find<const_iterator>( *this, key ); }
@@ -256,12 +250,13 @@ namespace AE::Base
 =================================================
 */
     template <typename K, typename V, usize S, typename KS, typename VS>
-    FixedMap<K,V,S,KS,VS>::FixedMap (const Self &other) noexcept(_IsNothrowCopy) : _count{ other._count }
+    FixedMap<K,V,S,KS,VS>::FixedMap (const Self &other) __NE___ : _count{ other._count }
     {
         ASSERT( not _IsMemoryAliased( &other ));
+        CheckNothrow( IsNothrowCopyCtor< K > and IsNothrowCopyCtor< V >);
 
-        KPolicy_t::Copy( OUT _keyArray, other._keyArray, _count );  // throw
-        VPolicy_t::Copy( OUT _valArray, other._valArray, _count );  // throw
+        KPolicy_t::Copy( OUT _keyArray, other._keyArray, _count );
+        VPolicy_t::Copy( OUT _valArray, other._valArray, _count );
         MemCopy( OUT _indices, other._indices, SizeOf<Index_t> * _count );
     }
 
@@ -274,6 +269,7 @@ namespace AE::Base
     FixedMap<K,V,S,KS,VS>::FixedMap (Self &&other) __NE___ : _count{ other._count }
     {
         ASSERT( not _IsMemoryAliased( &other ));
+        CheckNothrow( IsNothrowMoveCtor< K > and IsNothrowMoveCtor< V >);
 
         KPolicy_t::Replace( OUT _keyArray, INOUT other._keyArray, _count );
         VPolicy_t::Replace( OUT _valArray, INOUT other._valArray, _count );
@@ -292,6 +288,7 @@ namespace AE::Base
     FixedMap<K,V,S,KS,VS>&  FixedMap<K,V,S,KS,VS>::operator = (Self &&rhs) __NE___
     {
         ASSERT( not _IsMemoryAliased( &rhs ));
+        CheckNothrow( IsNothrowMoveCtor< K > and IsNothrowMoveCtor< V >);
 
         KPolicy_t::Destroy( INOUT _keyArray, _count );
         VPolicy_t::Destroy( INOUT _valArray, _count );
@@ -314,17 +311,18 @@ namespace AE::Base
 =================================================
 */
     template <typename K, typename V, usize S, typename KS, typename VS>
-    FixedMap<K,V,S,KS,VS>&  FixedMap<K,V,S,KS,VS>::operator = (const Self &rhs) noexcept(_IsNothrowCopy)
+    FixedMap<K,V,S,KS,VS>&  FixedMap<K,V,S,KS,VS>::operator = (const Self &rhs) __NE___
     {
         ASSERT( not _IsMemoryAliased( &rhs ));
+        CheckNothrow( IsNothrowCopyCtor< K > and IsNothrowCopyCtor< V >);
 
         KPolicy_t::Destroy( INOUT _keyArray, _count );
         VPolicy_t::Destroy( INOUT _valArray, _count );
 
         _count = rhs._count;
 
-        KPolicy_t::Copy( OUT _keyArray, rhs._keyArray, _count );    // throw
-        VPolicy_t::Copy( OUT _valArray, rhs._valArray, _count );    // throw
+        KPolicy_t::Copy( OUT _keyArray, rhs._keyArray, _count );
+        VPolicy_t::Copy( OUT _valArray, rhs._valArray, _count );
         MemCopy( OUT _indices, rhs._indices, SizeOf<Index_t> * _count );
 
         return *this;
@@ -387,7 +385,7 @@ namespace _hidden_
     template <typename K1, typename K, typename I>
     struct RecursiveBinarySearch
     {
-        ND_ static usize  Find (usize size, const K1 &key, const I* indices, const K* data) __NE___
+        ND_ static usize  Find (const usize size, const K1 &key, const I* indices, const K* data) __NE___
         {
             usize2  range { 0, size };
 
@@ -401,7 +399,7 @@ namespace _hidden_
             return range.x;
         }
 
-        ND_ static usize  LowerBound (usize size, const K1 &key, const I* indices, const K* data) __NE___
+        ND_ static usize  LowerBound (const usize size, const K1 &key, const I* indices, const K* data) __NE___
         {
             usize2  range { 0, size };
 
@@ -426,7 +424,7 @@ namespace _hidden_
     template <typename K, typename V, usize S, typename KS, typename VS>
     template <typename KeyType, typename ValueType>
     Pair< typename FixedMap<K,V,S,KS,VS>::iterator, bool >
-        FixedMap<K,V,S,KS,VS>::emplace (KeyType&& key, ValueType&& value) noexcept(_IsNothrowCopy)
+        FixedMap<K,V,S,KS,VS>::emplace (KeyType&& key, ValueType&& value) __NE___
     {
         using BinarySearch = Base::_hidden_::RecursiveBinarySearch< KeyType, K, Index_t >;
 
@@ -439,8 +437,8 @@ namespace _hidden_
         if_likely( _count < capacity() )
         {
             const usize j = _count++;
-            PlacementNew<key_type  >( OUT &_keyArray[j], FwdArg<KeyType  >(key)   );    // throw
-            PlacementNew<value_type>( OUT &_valArray[j], FwdArg<ValueType>(value) );    // throw
+            PlacementNew<key_type  >( OUT &_keyArray[j], FwdArg<KeyType  >(key)   );
+            PlacementNew<value_type>( OUT &_valArray[j], FwdArg<ValueType>(value) );
 
             if ( i < _count )
                 for (usize k = _count-1; k > i; --k) {
@@ -467,7 +465,7 @@ namespace _hidden_
     template <typename K, typename V, usize S, typename KS, typename VS>
     template <typename KeyType, typename ValueType>
     Pair< typename FixedMap<K,V,S,KS,VS>::iterator, bool >
-        FixedMap<K,V,S,KS,VS>::insert_or_assign (KeyType&& key, ValueType&& value) noexcept(_IsNothrowCopy)
+        FixedMap<K,V,S,KS,VS>::insert_or_assign (KeyType&& key, ValueType&& value) __NE___
     {
         using BinarySearch = Base::_hidden_::RecursiveBinarySearch< KeyType, K, Index_t >;
 
@@ -478,8 +476,8 @@ namespace _hidden_
             const Index_t   idx = _indices[i];
             KPolicy_t::Destroy( INOUT &_keyArray[idx], 1 );
             VPolicy_t::Destroy( INOUT &_valArray[idx], 1 );
-            PlacementNew<key_type  >( OUT &_keyArray[idx], FwdArg<KeyType  >(key)   );  // throw
-            PlacementNew<value_type>( OUT &_valArray[idx], FwdArg<ValueType>(value) );  // throw
+            PlacementNew<key_type  >( OUT &_keyArray[idx], FwdArg<KeyType  >(key)   );
+            PlacementNew<value_type>( OUT &_valArray[idx], FwdArg<ValueType>(value) );
             return { iterator{ this, idx }, false };
         }
 
@@ -487,8 +485,8 @@ namespace _hidden_
         if_likely( _count < capacity() )
         {
             const usize j = _count++;
-            PlacementNew<key_type  >( OUT &_keyArray[j], FwdArg<KeyType  >(key)   );    // throw
-            PlacementNew<value_type>( OUT &_valArray[j], FwdArg<ValueType>(value) );    // throw
+            PlacementNew<key_type  >( OUT &_keyArray[j], FwdArg<KeyType  >(key)   );
+            PlacementNew<value_type>( OUT &_valArray[j], FwdArg<ValueType>(value) );
 
             if ( i < _count )
                 for (usize k = _count-1; k > i; --k) {
@@ -622,7 +620,7 @@ namespace _hidden_
 =================================================
 */
     template <typename K, typename V, usize S, typename KS, typename VS>
-    void  FixedMap<K,V,S,KS,VS>::_Erase (Index_t idx) __NE___
+    void  FixedMap<K,V,S,KS,VS>::_Erase (const Index_t idx) __NE___
     {
         _keyArray[idx].~K();
         _valArray[idx].~V();
@@ -643,8 +641,9 @@ namespace _hidden_
 
         if ( idx != _count )
         {
-            KPolicy_t::Replace( OUT &_keyArray[idx], INOUT &_keyArray[_count], 1, true );
-            VPolicy_t::Replace( OUT &_valArray[idx], INOUT &_valArray[_count], 1, true );
+            CheckNothrow( IsNothrowMoveCtor< K > and IsNothrowMoveCtor< V >);
+            KPolicy_t::Replace( OUT &_keyArray[idx], INOUT &_keyArray[_count], 1, True{"single mem block"} );
+            VPolicy_t::Replace( OUT &_valArray[idx], INOUT &_valArray[_count], 1, True{"single mem block"} );
         }
         DEBUG_ONLY(
             DbgInitMem( _indices[_count] );
@@ -700,6 +699,23 @@ namespace _hidden_
         }
         return result;
     }
+//-----------------------------------------------------------------------------
+
+
+    template <typename K, typename V, usize S, typename KS, typename VS>
+    struct TMemCopyAvailable< FixedMap<K,V,S,KS,VS> > {
+        static constexpr bool  value = IsMemCopyAvailable<K> and IsMemCopyAvailable<V>;
+    };
+
+    template <typename K, typename V, usize S, typename KS, typename VS>
+    struct TZeroMemAvailable< FixedMap<K,V,S,KS,VS> > {
+        static constexpr bool  value = IsZeroMemAvailable<K> and IsZeroMemAvailable<V>;
+    };
+
+    template <typename K, typename V, usize S, typename KS, typename VS>
+    struct TTriviallyDestructible< FixedMap<K,V,S,KS,VS> > {
+        static constexpr bool  value = IsTriviallyDestructible<K> and IsTriviallyDestructible<V>;
+    };
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Containers/FixedSet.h b/AE/engine/src/base/Containers/FixedSet.h
index f7133a5a..329b4b0f 100644
--- a/AE/engine/src/base/Containers/FixedSet.h
+++ b/AE/engine/src/base/Containers/FixedSet.h
@@ -3,12 +3,11 @@
     Set emulation on static array with binary/linear search.
     Use only for small number of elements.
 
-    Recomended maximum size is 8..16 elements.
+    Recommended maximum size is 8..16 elements.
 
-    References are not invalidated.
-
-    Exceptions:
-        - key may throw exceptions (in copy-ctor)
+    On insertion references are not invalidated.
+    On erase references may be invalidated.
+    Iterators are not invalidated.
 */
 
 #pragma once
@@ -24,21 +23,17 @@ namespace AE::Base
 
     template <typename Value,
               usize ArraySize,
-              typename Policy = CopyPolicy::AutoDetect< Value >
+              typename CopyPolicy = CopyPolicy::AutoDetect< Value >
              >
-    struct FixedSet
+    struct FixedSet : NothrowAllocatable
     {
-        STATIC_ASSERT( ArraySize < 256 );
-        STATIC_ASSERT( IsNothrowDtor< Value >);
-        //STATIC_ASSERT( IsNothrowMoveCtor< Value >);
-
     // types
     private:
-        using Self          = FixedSet< Value, ArraySize, Policy >;
-        using Index_t       = Conditional< (ArraySize < 0xFF), ubyte, Conditional< (ArraySize < 0xFFFF), ushort, uint >>;
-        using CPolicy_t     = Policy;
+        using Self          = FixedSet< Value, ArraySize, CopyPolicy >;
+        using Index_t       = Conditional< (ArraySize <= MaxValue<ubyte>()), ubyte, ushort >;
+        using CPolicy_t     = CopyPolicy;
 
-        static constexpr bool   _IsNothrowCopy = IsNothrowCopyCtor<Value>;
+        StaticAssert( ArraySize <= MaxValue<Index_t>() );
 
     public:
         using value_type        = Value;
@@ -48,11 +43,11 @@ namespace AE::Base
 
     // variables
     private:
-        Index_t             _count      = 0;
-        mutable Index_t     _indices [ArraySize];
+        Index_t         _count      = 0;
+        Index_t         _indices [ArraySize];
         union {
-            value_type      _array  [ArraySize];
-            char            _buffer [sizeof(value_type) * ArraySize];       // don't use this field!
+            value_type  _array  [ArraySize];
+            char        _buffer [sizeof(value_type) * ArraySize];       // don't use this field!
         };
 
 
@@ -60,9 +55,9 @@ namespace AE::Base
     public:
         FixedSet ()                                                 __NE___;
         FixedSet (Self &&)                                          __NE___;
-        FixedSet (const Self &)                                     noexcept(_IsNothrowCopy);
+        FixedSet (const Self &)                                     __NE___;
 
-        ~FixedSet ()                                                __NE___ { clear(); }
+        ~FixedSet ()                                                __NE___ { clear(); }    // TODO: remove for trivial destructor
 
         ND_ usize       size ()                                     C_NE___ { return _count; }
         ND_ bool        empty ()                                    C_NE___ { return _count == 0; }
@@ -73,19 +68,19 @@ namespace AE::Base
         ND_ static constexpr usize  capacity ()                     __NE___ { return ArraySize; }
 
             Self&   operator = (Self &&)                            __NE___;
-            Self&   operator = (const Self &)                       noexcept(_IsNothrowCopy);
+            Self&   operator = (const Self &)                       __NE___;
 
         ND_ bool    operator == (const Self &rhs)                   C_NE___;
         ND_ bool    operator != (const Self &rhs)                   C_NE___ { return not (*this == rhs); }
 
             template <typename ValueType>
-            Pair<iterator,bool>  emplace (ValueType&& value)        noexcept(_IsNothrowCopy);
+            Pair<iterator,bool>  emplace (ValueType&& value)        __NE___;
 
-            Pair<iterator,bool>  insert (const Value &value)        noexcept(_IsNothrowCopy)    { return emplace( value ); }
-            Pair<iterator,bool>  insert (Value&& value)             __NE___                     { return emplace( RVRef(value) ); }
+            Pair<iterator,bool>  insert (const Value &value)        __NE___ { return emplace( value ); }
+            Pair<iterator,bool>  insert (Value&& value)             __NE___ { return emplace( RVRef(value) ); }
 
             template <typename ValueType>
-            Pair<iterator,bool>  insert_or_assign (ValueType&& value) noexcept(_IsNothrowCopy);
+            Pair<iterator,bool>  insert_or_assign (ValueType&& value) __NE___;
 
             template <typename KeyType>
             bool        erase (const KeyType &key)                  __NE___;
@@ -108,7 +103,8 @@ namespace AE::Base
 
         // cache friendly access to unsorted data
 
-        ND_ explicit operator ArrayView<Value> ()                   C_NE___ { return { &_array[0], size() }; }
+        ND_ ArrayView<Value>    GetValueArray ()                    C_NE___ { return { &_array[0], size() }; }
+        ND_ explicit operator ArrayView<Value> ()                   C_NE___ { return GetValueArray(); }
 
         ND_ Value const&    operator [] (usize i)                   C_NE___;
 
@@ -140,11 +136,12 @@ namespace AE::Base
 =================================================
 */
     template <typename V, usize S, typename CS>
-    FixedSet<V,S,CS>::FixedSet (const Self &other) noexcept(_IsNothrowCopy) : _count{ other._count }
+    FixedSet<V,S,CS>::FixedSet (const Self &other) __NE___ : _count{ other._count }
     {
         ASSERT( not _IsMemoryAliased( &other ));
+        CheckNothrow( IsNothrowDefaultCtor< V >);
 
-        CPolicy_t::Copy( OUT _array, other._array, _count );    // throw
+        CPolicy_t::Copy( OUT _array, other._array, _count );
         MemCopy( OUT _indices, other._indices, SizeOf<Index_t> * _count );
     }
 
@@ -157,6 +154,7 @@ namespace AE::Base
     FixedSet<V,S,CS>::FixedSet (Self &&other) __NE___ : _count{ other._count }
     {
         ASSERT( not _IsMemoryAliased( &other ));
+        CheckNothrow( IsNothrowMoveCtor< V >);
 
         CPolicy_t::Replace( OUT _array, INOUT other._array, _count );
         MemCopy( OUT _indices, other._indices, SizeOf<Index_t> * _count );
@@ -174,6 +172,7 @@ namespace AE::Base
     FixedSet<V,S,CS>&  FixedSet<V,S,CS>::operator = (Self &&rhs) __NE___
     {
         ASSERT( not _IsMemoryAliased( &rhs ));
+        CheckNothrow( IsNothrowMoveCtor< V >);
 
         CPolicy_t::Destroy( INOUT _array, _count );
 
@@ -194,15 +193,16 @@ namespace AE::Base
 =================================================
 */
     template <typename V, usize S, typename CS>
-    FixedSet<V,S,CS>&  FixedSet<V,S,CS>::operator = (const Self &rhs) noexcept(_IsNothrowCopy)
+    FixedSet<V,S,CS>&  FixedSet<V,S,CS>::operator = (const Self &rhs) __NE___
     {
         ASSERT( not _IsMemoryAliased( &rhs ));
+        CheckNothrow( IsNothrowCopyCtor< V >);
 
         CPolicy_t::Destroy( INOUT _array, _count );
 
         _count = rhs._count;
 
-        CPolicy_t::Copy( OUT _array, rhs._array, _count );  // throw
+        CPolicy_t::Copy( OUT _array, rhs._array, _count );
         MemCopy( OUT _indices, rhs._indices, SizeOf<Index_t> * _count );
 
         return *this;
@@ -250,7 +250,7 @@ namespace AE::Base
     template <typename V, usize S, typename CS>
     template <typename ValueType>
     Pair< typename FixedSet<V,S,CS>::iterator, bool >
-        FixedSet<V,S,CS>::emplace (ValueType&& value) noexcept(_IsNothrowCopy)
+        FixedSet<V,S,CS>::emplace (ValueType&& value) __NE___
     {
         using BinarySearch = Base::_hidden_::RecursiveBinarySearch< ValueType, value_type, Index_t >;
 
@@ -263,7 +263,7 @@ namespace AE::Base
         if_likely( _count < capacity() )
         {
             const usize j = _count++;
-            PlacementNew<value_type>( OUT &_array[j], FwdArg<ValueType>(value) );   // throw
+            PlacementNew<value_type>( OUT &_array[j], FwdArg<ValueType>(value) );
 
             if ( i < _count )
                 for (usize k = _count-1; k > i; --k) {
@@ -290,7 +290,7 @@ namespace AE::Base
     template <typename V, usize S, typename CS>
     template <typename ValueType>
     Pair< typename FixedSet<V,S,CS>::iterator, bool >
-        FixedSet<V,S,CS>::insert_or_assign (ValueType&& value) noexcept(_IsNothrowCopy)
+        FixedSet<V,S,CS>::insert_or_assign (ValueType&& value) __NE___
     {
         using BinarySearch = Base::_hidden_::RecursiveBinarySearch< ValueType, value_type, Index_t >;
 
@@ -306,7 +306,7 @@ namespace AE::Base
         if_likely( _count < capacity() )
         {
             const usize j = _count++;
-            PlacementNew<value_type>( OUT &_array[j], FwdArg<ValueType>(value) );   // throw
+            PlacementNew<value_type>( OUT &_array[j], FwdArg<ValueType>(value) );
 
             if ( i < _count )
                 for (usize k = _count-1; k > i; --k) {
@@ -390,8 +390,10 @@ namespace AE::Base
             }
 
             if ( idx != _count )
-                CPolicy_t::Replace( OUT &_array[idx], INOUT &_array[_count], 1, true );
-
+            {
+                CheckNothrow( IsNothrowMoveCtor< V >);
+                CPolicy_t::Replace( OUT &_array[idx], INOUT &_array[_count], 1, True{"single mem block"} );
+            }
             DEBUG_ONLY(
                 DbgInitMem( _indices[_count] );
             )
@@ -442,8 +444,24 @@ namespace AE::Base
         ASSERT( it >= begin() and it < end() );
         return usize(it) - usize(begin());
     }
+//-----------------------------------------------------------------------------
 
 
+    template <typename V, usize S, typename CS>
+    struct TMemCopyAvailable< FixedSet<V,S,CS> > {
+        static constexpr bool  value = IsMemCopyAvailable<V>;
+    };
+
+    template <typename V, usize S, typename CS>
+    struct TZeroMemAvailable< FixedSet<V,S,CS> > {
+        static constexpr bool  value = IsZeroMemAvailable<V>;
+    };
+
+    template <typename V, usize S, typename CS>
+    struct TTriviallyDestructible< FixedSet<V,S,CS> > {
+        static constexpr bool  value = IsTriviallyDestructible<V>;
+    };
+
 } // AE::Base
 
 
diff --git a/AE/engine/src/base/Containers/FixedString.h b/AE/engine/src/base/Containers/FixedString.h
index a006bb7d..c0cc3405 100644
--- a/AE/engine/src/base/Containers/FixedString.h
+++ b/AE/engine/src/base/Containers/FixedString.h
@@ -4,6 +4,7 @@
 
 #include "base/Math/Vec.h"
 #include "base/Memory/MemUtils.h"
+#include "base/Utils/Helpers.h"
 
 namespace AE::Base
 {
@@ -12,10 +13,12 @@ namespace AE::Base
     // Fixed Size String
     //
 
-    template <typename CharT, usize StringSize>
-    struct TFixedString
+    template <typename CharT,
+              usize StringSize
+             >
+    struct TFixedString : NothrowAllocatable
     {
-        STATIC_ASSERT( StringSize <= 512 );
+        StaticAssert( StringSize <= 512 );
 
     // type
     public:
@@ -26,7 +29,7 @@ namespace AE::Base
         using Self              = TFixedString< CharT, StringSize >;
 
     private:
-        using Length_t          = Conditional< alignof(CharT) < 4, ubyte, uint >;
+        using Length_t          = Conditional< alignof(CharT) == 1 and StringSize <= 256, ubyte, ushort >;
 
 
     // variables
@@ -40,7 +43,7 @@ namespace AE::Base
         constexpr TFixedString ()                           __NE___ = default;
         constexpr TFixedString (const View_t &view)         __NE___ : TFixedString{ view.data(), view.length() } {}
 
-        constexpr TFixedString (const CharT *str)           __NE___
+        constexpr TFixedString (const CharT* str)           __NE___
         {
             for (; str[_length] and _length < StringSize; ++_length) {
                 _array[_length] = str[_length];
@@ -48,7 +51,7 @@ namespace AE::Base
             _array[_length] = CharT{0};
         }
 
-        constexpr TFixedString (const CharT *str, usize length) __NE___
+        constexpr TFixedString (const CharT* str, usize length) __NE___
         {
             ASSERT( length < StringSize );
 
@@ -61,8 +64,6 @@ namespace AE::Base
         constexpr TFixedString (Self &&)                    __NE___ = default;
         constexpr TFixedString (const Self &)               __NE___ = default;
 
-        constexpr ~TFixedString ()                          __NE___ = default;
-
         Self&  operator = (Self &&)                         __NE___ = default;
         Self&  operator = (const Self &)                    __NE___ = default;
 
@@ -125,6 +126,11 @@ namespace AE::Base
 
     template <usize StringSize>
     using FixedString = TFixedString< char, StringSize >;
+//-----------------------------------------------------------------------------
+
+
+    template <typename T, usize S>  struct TMemCopyAvailable< TFixedString<T,S> >   { static constexpr bool  value = true; };
+    template <typename T, usize S>  struct TZeroMemAvailable< TFixedString<T,S> >   { static constexpr bool  value = true; };
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Containers/FixedTupleArray.h b/AE/engine/src/base/Containers/FixedTupleArray.h
index 865ed359..9914a4c0 100644
--- a/AE/engine/src/base/Containers/FixedTupleArray.h
+++ b/AE/engine/src/base/Containers/FixedTupleArray.h
@@ -1,9 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
     Cache-friendly array of structures.
-
-    Exceptions:
-        - array elements may throw exceptions (in copy-ctor)
 */
 
 #pragma once
@@ -20,12 +17,14 @@ namespace AE::Base
     // Fixed Size Tuple Array
     //
 
-    template <usize ArraySize, typename ...Types>
-    struct FixedTupleArray : Noncopyable
+    template <usize ArraySize,
+              typename ...Types
+             >
+    struct FixedTupleArray : Noncopyable, NothrowAllocatable
     {
-        STATIC_ASSERT( ArraySize < 256 );
-        STATIC_ASSERT( TypeList< Types... >::template ForEach_And< std::is_nothrow_move_constructible >() );
-        STATIC_ASSERT( TypeList< Types... >::template ForEach_And< std::is_nothrow_default_constructible >() );
+        StaticAssert( ArraySize < 256 );
+        CheckNothrow( AllNothrowMoveCtor< Types... >);
+        CheckNothrow( AllNothrowDefaultCtor< Types... >);
 
     // types
     private:
@@ -122,12 +121,12 @@ namespace AE::Base
         constexpr FixedTupleArray ()                            __NE___ {}
 
         constexpr FixedTupleArray (Self &&)                     __NE___;
-        constexpr FixedTupleArray (const Self &)                __Th___;
+        constexpr FixedTupleArray (const Self &)                __NE___;
 
         constexpr ~FixedTupleArray ()                           __NE___ { clear(); }
 
         constexpr Self&  operator = (Self &&)                   __NE___;
-        constexpr Self&  operator = (const Self &)              __Th___;
+        constexpr Self&  operator = (const Self &)              __NE___;
 
         template <usize I>
         ND_ constexpr auto          get ()                      C_NE___ { return ArrayView<typename Types_t::template Get<I>>{ _Data<I>(), _count }; }
@@ -175,18 +174,18 @@ namespace AE::Base
             constexpr Result_t      emplace_back ()             __NE___;
 
         template <typename ...Args>
-        constexpr bool  set (usize index, Args&&... values)     __Th___;
+        constexpr bool  set (usize index, Args&&... values)     __NE___;
 
         template <typename ...Args>
-        constexpr void  push_back (Args&&... values)            __Th___;
+        constexpr void  push_back (Args&&... values)            __NE___;
 
         template <typename ...Args>
-        constexpr bool  try_push_back (Args&&... values)        __Th___;
+        constexpr bool  try_push_back (Args&&... values)        __NE___;
 
         constexpr void  pop_back ()                             __NE___;
 
         template <typename ...Args>
-        constexpr void  insert (usize pos, Args&&... values)    __Th___;
+        constexpr void  insert (usize pos, Args&&... values)    __NE___;
 
         constexpr void  resize (usize newSize)                  __NE___;
 
@@ -209,10 +208,10 @@ namespace AE::Base
         ND_ constexpr T*  _At (usize i)                                     __NE___ { return _Data< Types_t::template Index<T> >() + i; }
 
         template <usize I, typename Arg0, typename ...Args>
-        constexpr void  _PushBack (Arg0 &&arg0, Args&&... args)             __Th___;
+        constexpr void  _PushBack (Arg0 &&arg0, Args&&... args)             __NE___;
 
         template <usize I, typename Arg0, typename ...Args>
-        constexpr void  _Insert (usize pos, Arg0 &&arg0, Args&&... args)    __Th___;
+        constexpr void  _Insert (usize pos, Arg0 &&arg0, Args&&... args)    __NE___;
 
         template <usize I>
         constexpr void  _Destroy (usize index, usize count)                 __NE___;
@@ -227,7 +226,7 @@ namespace AE::Base
         static constexpr void  _Move (Self &dst, Self &src, usize count)    __NE___;
 
         template <usize I>
-        static constexpr void  _Copy (Self &dst, const Self &src, usize count) __Th___;
+        static constexpr void  _Copy (Self &dst, const Self &src, usize count) __NE___;
 
         template <usize I>
         ND_ HashVal  _CalcHash ()                                           C_NE___;
@@ -243,7 +242,7 @@ namespace AE::Base
 =================================================
 */
     template <usize S, typename ...Types>
-    constexpr FixedTupleArray<S, Types...>::FixedTupleArray (Self && other) __NE___ :
+    constexpr FixedTupleArray<S, Types...>::FixedTupleArray (Self &&other) __NE___ :
         _count{ other._count }
     {
         other._count = 0;
@@ -252,7 +251,7 @@ namespace AE::Base
     }
 
     template <usize S, typename ...Types>
-    constexpr FixedTupleArray<S, Types...>::FixedTupleArray (const Self &other) __Th___ :
+    constexpr FixedTupleArray<S, Types...>::FixedTupleArray (const Self &other) __NE___ :
         _count{ other._count }
     {
         if ( _count > 0 )
@@ -265,7 +264,7 @@ namespace AE::Base
 =================================================
 */
     template <usize S, typename ...Types>
-    constexpr FixedTupleArray<S, Types...>&  FixedTupleArray<S, Types...>::operator = (Self && rhs) __NE___
+    constexpr FixedTupleArray<S, Types...>&  FixedTupleArray<S, Types...>::operator = (Self &&rhs) __NE___
     {
         clear();
 
@@ -279,7 +278,7 @@ namespace AE::Base
     }
 
     template <usize S, typename ...Types>
-    constexpr FixedTupleArray<S, Types...>&  FixedTupleArray<S, Types...>::operator = (const Self &rhs) __Th___
+    constexpr FixedTupleArray<S, Types...>&  FixedTupleArray<S, Types...>::operator = (const Self &rhs) __NE___
     {
         clear();
 
@@ -298,13 +297,13 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <typename ...Args>
-    constexpr bool  FixedTupleArray<S, Types...>::set (usize index, Args&&... values) __Th___
+    constexpr bool  FixedTupleArray<S, Types...>::set (usize index, Args&&... values) __NE___
     {
-        STATIC_ASSERT( sizeof...(Args) == Types_t::Count );
+        StaticAssert( sizeof...(Args) == Types_t::Count );
         if_likely( index < _count )
         {
             _Destroy<0>( index, 1 );
-            _Insert<0>( index, FwdArg<Args>(values)... );   // throw
+            _Insert<0>( index, FwdArg<Args>(values)... );
             return true;
         }
         return false;
@@ -317,11 +316,11 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <typename ...Args>
-    constexpr void  FixedTupleArray<S, Types...>::push_back (Args&&... values) __Th___
+    constexpr void  FixedTupleArray<S, Types...>::push_back (Args&&... values) __NE___
     {
-        STATIC_ASSERT( sizeof...(Args) == Types_t::Count );
+        StaticAssert( sizeof...(Args) == Types_t::Count );
         ASSERT( _count < capacity() );
-        _PushBack<0>( FwdArg<Args>(values)... );    // throw
+        _PushBack<0>( FwdArg<Args>(values)... );
         ++_count;
     }
 
@@ -332,12 +331,12 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <typename ...Args>
-    constexpr bool  FixedTupleArray<S, Types...>::try_push_back (Args&&... values) __Th___
+    constexpr bool  FixedTupleArray<S, Types...>::try_push_back (Args&&... values) __NE___
     {
-        STATIC_ASSERT( sizeof...(Args) == Types_t::Count );
+        StaticAssert( sizeof...(Args) == Types_t::Count );
         if_likely( _count < capacity() )
         {
-            _PushBack<0>( FwdArg<Args>(values)... );    // throw
+            _PushBack<0>( FwdArg<Args>(values)... );
             ++_count;
             return true;
         }
@@ -399,15 +398,15 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <typename ...Args>
-    constexpr void  FixedTupleArray<S, Types...>::insert (usize pos, Args&&... values) __Th___
+    constexpr void  FixedTupleArray<S, Types...>::insert (usize pos, Args&&... values) __NE___
     {
-        STATIC_ASSERT( sizeof...(Args) == Types_t::Count );
+        StaticAssert( sizeof...(Args) == Types_t::Count );
         ASSERT( _count < capacity() );
         if ( pos >= _count ) {
-            _PushBack<0>( FwdArg<Args>(values)... );    // throw
+            _PushBack<0>( FwdArg<Args>(values)... );
         }else{
             _Replace<0>( pos, pos+1, _count - pos );
-            _Insert<0>( pos, FwdArg<Args>(values)... ); // throw
+            _Insert<0>( pos, FwdArg<Args>(values)... );
         }
         ++_count;
     }
@@ -516,14 +515,14 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <usize I, typename Arg0, typename ...Args>
-    constexpr void  FixedTupleArray<S, Types...>::_PushBack (Arg0 &&arg0, Args&&... args) __Th___
+    constexpr void  FixedTupleArray<S, Types...>::_PushBack (Arg0 &&arg0, Args&&... args) __NE___
     {
         using T = typename Types_t::template Get<I>;
 
-        PlacementNew<T>( OUT _Data<I>() + _count, FwdArg<Arg0>(arg0) ); // throw
+        PlacementNew<T>( OUT _Data<I>() + _count, FwdArg<Arg0>(arg0) );
 
         if constexpr( I+1 < Types_t::Count )
-            _PushBack<I+1>( FwdArg<Args>(args)... );    // throw
+            _PushBack<I+1>( FwdArg<Args>(args)... );
     }
 
 /*
@@ -533,14 +532,14 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <usize I, typename Arg0, typename ...Args>
-    constexpr void  FixedTupleArray<S, Types...>::_Insert (usize pos, Arg0 &&arg0, Args&&... args) __Th___
+    constexpr void  FixedTupleArray<S, Types...>::_Insert (usize pos, Arg0 &&arg0, Args&&... args) __NE___
     {
         using T = typename Types_t::template Get<I>;
 
-        PlacementNew<T>( OUT _Data<I>() + pos, FwdArg<Arg0>(arg0) );    // throw
+        PlacementNew<T>( OUT _Data<I>() + pos, FwdArg<Arg0>(arg0) );
 
         if constexpr( I+1 < Types_t::Count )
-            _Insert<I+1>( pos, FwdArg<Args>(args)... ); // throw
+            _Insert<I+1>( pos, FwdArg<Args>(args)... );
     }
 
 /*
@@ -646,7 +645,7 @@ namespace AE::Base
 */
     template <usize S, typename ...Types>
     template <usize I>
-    constexpr void  FixedTupleArray<S, Types...>::_Copy (Self &dst, const Self &src, usize count) __Th___
+    constexpr void  FixedTupleArray<S, Types...>::_Copy (Self &dst, const Self &src, usize count) __NE___
     {
         using T         = typename Types_t::template Get<I>;
         using CPolicy_t = CopyPolicy::template AutoDetect<T>;
@@ -656,6 +655,23 @@ namespace AE::Base
         if constexpr( I+1 < Types_t::Count )
             return _Copy<I+1>( dst, src, count );
     }
+//-----------------------------------------------------------------------------
+
+
+    template <usize S, typename ...Types>
+    struct TMemCopyAvailable< FixedTupleArray<S, Types...> > {
+        static constexpr bool  value = TypeList< Types... >::template ForEach_And< TMemCopyAvailable >();
+    };
+
+    template <usize S, typename ...Types>
+    struct TZeroMemAvailable< FixedTupleArray<S, Types...> > {
+        static constexpr bool  value = TypeList< Types... >::template ForEach_And< TZeroMemAvailable >();
+    };
+
+    template <usize S, typename ...Types>
+    struct TTriviallyDestructible< FixedTupleArray<S, Types...> > {
+        static constexpr bool  value = TypeList< Types... >::template ForEach_And< TTriviallyDestructible >();
+    };
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Containers/HashTable.h b/AE/engine/src/base/Containers/HashTable.h
index bc47f540..39e657b9 100644
--- a/AE/engine/src/base/Containers/HashTable.h
+++ b/AE/engine/src/base/Containers/HashTable.h
@@ -87,36 +87,6 @@ namespace AE::Base
              >
     using FlatHashSet = absl::flat_hash_set< Key, Hasher, KeyEq, Alloc >;
 
-
-    /*//
-    // Hash Map
-    //
-    template <typename Key,
-              typename Value,
-              typename Hasher   = std::hash< Key >,
-              typename KeyEq    = std::equal_to< Key >,
-              typename Alloc    = std::allocator< std::pair< const Key, Value >>
-             >
-    using HashMap = absl::node_hash_map< Key, Value, Hasher, KeyEq, Alloc >;
-
-    template <typename Key,
-              typename Value,
-              typename Hasher = std::hash<Key>,
-              typename KeyEq  = std::equal_to<Key>,
-              typename Alloc  = std::allocator<std::pair<const Key, Value>>>
-    using HashMultiMap  = std::unordered_multimap< Key, Value, Hasher, KeyEq, Alloc >;
-
-
-    //
-    // Hash Set
-    //
-    template <typename Key,
-              typename Hasher   = std::hash< Key >,
-              typename KeyEq    = std::equal_to< Key >,
-              typename Alloc    = std::allocator< Key >
-             >
-    using HashSet = absl::node_hash_set< Key, Hasher, KeyEq, Alloc >;*/
-
 #else
 
     // fallback
diff --git a/AE/engine/src/base/Containers/InPlace.h b/AE/engine/src/base/Containers/InPlace.h
index dc5864d5..3a3229f6 100644
--- a/AE/engine/src/base/Containers/InPlace.h
+++ b/AE/engine/src/base/Containers/InPlace.h
@@ -42,19 +42,23 @@ namespace AE::Base
             DEBUG_ONLY( DbgFreeMem( OUT _value ));
         }
 
-        InPlace (const Self &other)                         noexcept(IsNothrowCopyCtor<T>) :
+        InPlace (const Self &other)                         __NE___ :
             _value{ other.AsRef() }
             DEBUG_ONLY(, _isCreated{ true })
-        {}
+        {
+            CheckNothrow( IsNothrowCopyCtor< T >);
+        }
 
-        InPlace (Self && other)                             __NE___ :
+        InPlace (Self &&other)                              __NE___ :
             _value{ other.AsRVRef() }
             DEBUG_ONLY(, _isCreated{ true })
-        {}
+        {
+            CheckNothrow( IsNothrowMoveCtor< T >);
+        }
 
         ~InPlace ()                                         __NE___
         {
-            STATIC_ASSERT( alignof(Self) >= alignof(T) );
+            StaticAssert( alignof(Self) >= alignof(T) );
             ASSERT( not _isCreated );
         }
 
@@ -64,10 +68,27 @@ namespace AE::Base
 
 
         template <typename ...Args>
-        Self&  Create (Args&& ...args)                      noexcept(IsNothrowCtor<T, Args...>)
+        Self&  Create (Args&& ...args)                      __NE___
         {
             ASSERT( not _isCreated );
-            new (&_value) T{ FwdArg<Args &&>( args )... };  // throw
+
+            CheckNothrow( IsNoExcept( T{ FwdArg<Args>( args )... }));
+            CheckNothrow( IsNoExcept( new (&_value) T{ FwdArg<Args>( args )... }));
+
+            new (&_value) T{ FwdArg<Args>( args )... };
+
+            DEBUG_ONLY( _isCreated = true;)
+            return *this;
+        }
+
+        template <typename ...Args>
+        Self&  CreateTh (Args&& ...args)                    __Th___
+        {
+            ASSERT( not _isCreated );
+
+            CheckNothrow( not IsNoExcept( new (&_value) T{ FwdArg<Args>( args )... }));
+
+            new (&_value) T{ FwdArg<Args>( args )... };
 
             DEBUG_ONLY( _isCreated = true;)
             return *this;
@@ -86,19 +107,23 @@ namespace AE::Base
 
 
         template <typename Fn>
-        Self&  CustomCtor (const Fn &fn)                    noexcept(IsNothrowInvocable<Fn>)
+        Self&  CustomCtor (const Fn &fn)                    __NE___
         {
+            CheckNothrow( IsNoExcept( fn( _value )));
             ASSERT( not _isCreated );
-            fn( OUT _value );   // throw
+
+            fn( OUT _value );
 
             DEBUG_ONLY( _isCreated = true;)
             return *this;
         }
 
         template <typename Fn>
-        void  CustomDtor (const Fn &fn)                     noexcept(IsNothrowInvocable<Fn>)
+        void  CustomDtor (const Fn &fn)                     __NE___
         {
+            CheckNothrow( IsNoExcept( fn( _value )));
             ASSERT( _isCreated );
+
             fn( OUT _value );
 
             DEBUG_ONLY(
@@ -129,4 +154,8 @@ namespace AE::Base
     };
 
 
+    template <typename T>   struct TMemCopyAvailable< InPlace<T> >      { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TTriviallyDestructible< InPlace<T> > { static constexpr bool  value = IsTriviallyDestructible<T>; };
+
+
 } // AE::Base
diff --git a/AE/engine/src/base/Containers/Ptr.h b/AE/engine/src/base/Containers/Ptr.h
index 04bbad9d..39c2c680 100644
--- a/AE/engine/src/base/Containers/Ptr.h
+++ b/AE/engine/src/base/Containers/Ptr.h
@@ -21,7 +21,7 @@ namespace AE::Base
     // methods
     public:
         Ptr ()                                      __NE___ {}
-        Ptr (T *ptr)                                __NE___ : _value{ptr} {}
+        Ptr (T* ptr)                                __NE___ : _value{ptr} {}
 
         template <typename B>
         Ptr (const Ptr<B> &other)                   __NE___ : _value{static_cast<T*>( (B*)other )} {}
@@ -65,6 +65,10 @@ namespace AE::Base
     template <typename T>
     using RemovePtr = typename Base::_hidden_::_RemovePtr<T>::type;
 
+
+    template <typename T>   struct TMemCopyAvailable< Ptr<T> >  { static constexpr bool  value = true; };
+    template <typename T>   struct TZeroMemAvailable< Ptr<T> >  { static constexpr bool  value = true; };
+
 } // AE::Base
 
 
diff --git a/AE/engine/src/base/Containers/RingBuffer.h b/AE/engine/src/base/Containers/RingBuffer.h
index f5013714..ee2615f0 100644
--- a/AE/engine/src/base/Containers/RingBuffer.h
+++ b/AE/engine/src/base/Containers/RingBuffer.h
@@ -24,19 +24,25 @@ namespace AE::Base
     //
 
     template <typename T,
-              typename Policy = CopyPolicy::AutoDetect<T>
+              typename TAllocator       = UntypedAllocator,
+              typename TCopyPolicy      = CopyPolicy::AutoDetect<T>,
+              typename TResizePolicy    = ResizePolicy< TAllocator >
              >
-    struct RingBuffer
+    struct RingBuffer : NothrowAllocatable
     {
-        STATIC_ASSERT( IsNothrowDtor< T >);
-        //STATIC_ASSERT( IsNothrowMoveCtor< T >);
-        //STATIC_ASSERT( IsNothrowDefaultCtor< T >);
+        //CheckNothrow( IsNothrowMoveCtor< T >);
+        //CheckNothrow( IsNothrowDefaultCtor< T >);
 
     // types
+    public:
+        using Self              = RingBuffer< T, TAllocator, TCopyPolicy, TResizePolicy >;
+        using Allocator_t       = TAllocator;
+        using value_type        = T;
+
     private:
-        using Self          = RingBuffer< T, Policy >;
-        using CPolicy_t     = Policy;
-        using Offset_t      = uint;
+        using CopyPolicy_t      = TCopyPolicy;
+        using ResizePolicy_t    = TResizePolicy;
+        using Offset_t          = uint;
 
         template <bool IsConst>
         struct TIterator
@@ -61,11 +67,7 @@ namespace AE::Base
             Iter& operator = (Iter &&)              __NE___ = default;
 
             ND_ bool operator != (const Iter &rhs)  C_NE___ { return not (*this == rhs); }
-
-            ND_ bool operator == (const Iter &rhs)  C_NE___
-            {
-                return _rbPtr == rhs._rbPtr and _index == rhs._index;
-            }
+            ND_ bool operator == (const Iter &rhs)  C_NE___ { return (_rbPtr == rhs._rbPtr) & (_index == rhs._index); }
 
             Iter& operator ++ ()                    __NE___
             {
@@ -88,10 +90,7 @@ namespace AE::Base
                 return *this;
             }
 
-            ND_ Iter  operator + (usize x)          C_NE___
-            {
-                return (Iter{*this} += x);
-            }
+            ND_ Iter  operator + (usize x)          C_NE___ { return (Iter{*this} += x); }
 
             ND_ T &         operator * ()           __NE___ { ASSERT( _rbPtr != null ); return (*_rbPtr)[_index]; }
             ND_ T const&    operator * ()           C_NE___ { ASSERT( _rbPtr != null ); return (*_rbPtr)[_index]; }
@@ -103,8 +102,6 @@ namespace AE::Base
         static constexpr Offset_t   _EmptyBit = Offset_t{1} << (CT_SizeOfInBits<Offset_t> - 1);
 
     public:
-        using Allocator_t       = UntypedAllocator;
-        using value_type        = T;
         using iterator          = TIterator< false >;
         using const_iterator    = TIterator< true >;
 
@@ -189,7 +186,8 @@ namespace AE::Base
             void        clear ()                            __NE___;
 
         ND_ HashVal     CalcHash ()                         C_NE___;
-            void        GetParts (OUT ArrayView<T> &part0, OUT ArrayView<T> &part1) C_NE___;
+            void        GetParts (OUT ArrayView<T> &part0,
+                                  OUT ArrayView<T> &part1)  C_NE___;
 
             void        AppendFront (ArrayView<T> value)    __Th___;
             void        AppendBack (ArrayView<T> value)     __Th___;
@@ -219,8 +217,8 @@ namespace AE::Base
     constructor
 =================================================
 */
-    template <typename T, typename S>
-    RingBuffer<T,S>::RingBuffer (const Self &other) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    RingBuffer<T,A,CP,RP>::RingBuffer (const Self &other) __Th___
     {
         _Copy( other ); // throw
     }
@@ -230,8 +228,8 @@ namespace AE::Base
     constructor
 =================================================
 */
-    template <typename T, typename S>
-    RingBuffer<T,S>::RingBuffer (Self &&other) __NE___ :
+    template <typename T, typename A, typename CP, typename RP>
+    RingBuffer<T,A,CP,RP>::RingBuffer (Self &&other) __NE___ :
         _array{ other._array },
         _first{ other._first },
         _end{ other._end },
@@ -247,8 +245,8 @@ namespace AE::Base
     operator =
 =================================================
 */
-    template <typename T, typename S>
-    RingBuffer<T,S>&  RingBuffer<T,S>::operator = (const Self &rhs) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    RingBuffer<T,A,CP,RP>&  RingBuffer<T,A,CP,RP>::operator = (const Self &rhs) __Th___
     {
         clear();
         _Copy( rhs );   // throw
@@ -260,8 +258,8 @@ namespace AE::Base
     operator =
 =================================================
 */
-    template <typename T, typename S>
-    RingBuffer<T,S>&  RingBuffer<T,S>::operator = (Self &&rhs) __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    RingBuffer<T,A,CP,RP>&  RingBuffer<T,A,CP,RP>::operator = (Self &&rhs) __NE___
     {
         _Release();
 
@@ -283,8 +281,8 @@ namespace AE::Base
     _Release
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::_Release () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::_Release () __NE___
     {
         clear();
 
@@ -305,8 +303,8 @@ namespace AE::Base
     _Copy
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::_Copy (const Self &other) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::_Copy (const Self &other) __Th___
     {
         clear();
         AppendBack( other );
@@ -317,15 +315,15 @@ namespace AE::Base
     _Reallocate
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::_Reallocate (usize newCapacity, bool allowReserve) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::_Reallocate (usize newCapacity, bool allowReserve) __Th___
     {
         ASSERT( newCapacity > size() );
 
         const usize     old_size    = capacity();
         const usize     old_count   = size();
         T * const       old_ptr     = _array;
-        const usize     new_cap     = ResizePolicy::Resize<T>( newCapacity, allowReserve );
+        const usize     new_cap     = ResizePolicy_t::template Resize<T>( newCapacity, allowReserve );
 
         CHECK_THROW( new_cap < _EmptyBit, std::bad_array_new_length{} );
 
@@ -345,12 +343,12 @@ namespace AE::Base
         if ( _first >= _end )
         {
             usize   off = old_size - _first;
-            CPolicy_t::Replace( OUT _array,         INOUT old_ptr + _first, off );
-            CPolicy_t::Replace( OUT _array + off,   INOUT old_ptr, _end );
+            CopyPolicy_t::Replace( OUT _array,       INOUT old_ptr + _first, off );
+            CopyPolicy_t::Replace( OUT _array + off, INOUT old_ptr, _end );
         }
         else
         {
-            CPolicy_t::Replace( OUT _array, INOUT old_ptr + _first, _end - _first );
+            CopyPolicy_t::Replace( OUT _array, INOUT old_ptr + _first, _end - _first );
         }
 
         if ( old_ptr != null )
@@ -368,8 +366,8 @@ namespace AE::Base
     _WrapIndex
 =================================================
 */
-    template <typename T, typename S>
-    typename RingBuffer<T,S>::Offset_t  RingBuffer<T,S>::_WrapIndex (const ssize i) C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    typename RingBuffer<T,A,CP,RP>::Offset_t  RingBuffer<T,A,CP,RP>::_WrapIndex (const ssize i) C_NE___
     {
         const ssize cap = ssize(capacity());
         return Offset_t( i < 0 ? (cap + i) : (i >= cap ? (i - cap) : i) ) & _SizeMask();
@@ -380,8 +378,8 @@ namespace AE::Base
     size
 =================================================
 */
-    template <typename T, typename S>
-    usize  RingBuffer<T,S>::size () C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    usize  RingBuffer<T,A,CP,RP>::size () C_NE___
     {
         return  Offset_t(_first < _end ?
                     (_end - _first) :
@@ -396,15 +394,15 @@ namespace AE::Base
     UB if empty
 =================================================
 */
-    template <typename T, typename S>
-    T &  RingBuffer<T,S>::front () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T &  RingBuffer<T,A,CP,RP>::front () __NE___
     {
         ASSERT( not empty() );
         return _array[ _first ];
     }
 
-    template <typename T, typename S>
-    T const &  RingBuffer<T,S>::front () C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T const &  RingBuffer<T,A,CP,RP>::front () C_NE___
     {
         ASSERT( not empty() );
         return _array[ _first ];
@@ -417,15 +415,15 @@ namespace AE::Base
     UB if empty
 =================================================
 */
-    template <typename T, typename S>
-    T &  RingBuffer<T,S>::back () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T &  RingBuffer<T,A,CP,RP>::back () __NE___
     {
         ASSERT( not empty() );
         return _array[ _WrapIndex( ssize(_end) - 1 )];
     }
 
-    template <typename T, typename S>
-    T const &  RingBuffer<T,S>::back () C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T const &  RingBuffer<T,A,CP,RP>::back () C_NE___
     {
         ASSERT( not empty() );
         return _array[ _WrapIndex( ssize(_end) - 1 )];
@@ -436,15 +434,15 @@ namespace AE::Base
     operator []
 =================================================
 */
-    template <typename T, typename S>
-    T &  RingBuffer<T,S>::operator [] (const usize i) __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T &  RingBuffer<T,A,CP,RP>::operator [] (const usize i) __NE___
     {
         ASSERT( i < size() );
         return _array[ _WrapIndex( i + _first )];
     }
 
-    template <typename T, typename S>
-    T const &  RingBuffer<T,S>::operator [] (const usize i) C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T const &  RingBuffer<T,A,CP,RP>::operator [] (const usize i) C_NE___
     {
         ASSERT( i < size() );
         return _array[ _WrapIndex( i + _first )];
@@ -455,26 +453,26 @@ namespace AE::Base
     push_back
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::push_back (const T &value) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::push_back (const T &value) __Th___
     {
         if_unlikely( size() + 1 > capacity() )
             _Reallocate( capacity() + 1, true );    // throw
 
-        CPolicy_t::Copy( OUT _array + _end, AddressOf(value), 1 );  // throw
+        CopyPolicy_t::Copy( OUT _array + _end, AddressOf(value), 1 );   // throw
         _packed &= ~_EmptyBit;
         _end    = _WrapIndex( _end + 1 );
 
         _UpdateDbgView();
     }
 
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::push_back (T&& value) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::push_back (T&& value) __Th___
     {
         if_unlikely( size() + 1 > capacity() )
             _Reallocate( capacity() + 1, true );    // throw
 
-        CPolicy_t::Move( OUT _array + _end, INOUT AddressOf(value), 1 );
+        CopyPolicy_t::Move( OUT _array + _end, INOUT AddressOf(value), 1 );
         _packed &= ~_EmptyBit;
         _end    = _WrapIndex( _end + 1 );
 
@@ -486,28 +484,28 @@ namespace AE::Base
     push_front
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::push_front (const T &value) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::push_front (const T &value) __Th___
     {
         if_unlikely( size() + 1 > capacity() )
             _Reallocate( capacity() + 1, true );    // throw
 
         _packed &= ~_EmptyBit;
         _first  = _WrapIndex( ssize(_first) - 1 );
-        CPolicy_t::Copy( OUT _array + _first, AddressOf(value), 1 );    // throw
+        CopyPolicy_t::Copy( OUT _array + _first, AddressOf(value), 1 ); // throw
 
         _UpdateDbgView();
     }
 
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::push_front (T&& value) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::push_front (T&& value) __Th___
     {
         if_unlikely( size() + 1 > capacity() )
             _Reallocate( capacity() + 1, true );    // throw
 
         _packed &= ~_EmptyBit;
         _first  = _WrapIndex( ssize(_first) - 1 );
-        CPolicy_t::Move( OUT _array + _first, INOUT AddressOf(value), 1 );
+        CopyPolicy_t::Move( OUT _array + _first, INOUT AddressOf(value), 1 );
 
         _UpdateDbgView();
     }
@@ -517,13 +515,13 @@ namespace AE::Base
     pop_back
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::pop_back () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::pop_back () __NE___
     {
         if_likely( not empty() )
         {
             _end = _WrapIndex( ssize(_end) - 1 );
-            CPolicy_t::Destroy( INOUT _array + _end, 1 );
+            CopyPolicy_t::Destroy( INOUT _array + _end, 1 );
 
             if_unlikely( _first == _end )
                 _packed |= _EmptyBit;
@@ -537,12 +535,12 @@ namespace AE::Base
     pop_front
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::pop_front () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::pop_front () __NE___
     {
         if_likely( not empty() )
         {
-            CPolicy_t::Destroy( INOUT _array + _first, 1 );
+            CopyPolicy_t::Destroy( INOUT _array + _first, 1 );
             _first = _WrapIndex( _first + 1 );
 
             if_unlikely( _first == _end )
@@ -557,9 +555,9 @@ namespace AE::Base
     emplace_front
 =================================================
 */
-    template <typename T, typename S>
+    template <typename T, typename A, typename CP, typename RP>
     template <typename ...Types>
-    T&  RingBuffer<T,S>::emplace_front (Types&& ...args) __Th___
+    T&  RingBuffer<T,A,CP,RP>::emplace_front (Types&& ...args) __Th___
     {
         if_unlikely( size() + 1 > capacity() )
             _Reallocate( capacity() + 1, true );    // throw
@@ -577,9 +575,9 @@ namespace AE::Base
     emplace_back
 =================================================
 */
-    template <typename T, typename S>
+    template <typename T, typename A, typename CP, typename RP>
     template <typename ...Types>
-    T&  RingBuffer<T,S>::emplace_back (Types&& ...args) __Th___
+    T&  RingBuffer<T,A,CP,RP>::emplace_back (Types&& ...args) __Th___
     {
         if_unlikely( size() + 1 > capacity() )
             _Reallocate( capacity() + 1, true );    // throw
@@ -600,8 +598,8 @@ namespace AE::Base
     UB if empty
 =================================================
 */
-    template <typename T, typename S>
-    T  RingBuffer<T,S>::ExtractFront () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T  RingBuffer<T,A,CP,RP>::ExtractFront () __NE___
     {
         T   tmp = RVRef(front());
         pop_front();
@@ -615,8 +613,8 @@ namespace AE::Base
     UB if empty
 =================================================
 */
-    template <typename T, typename S>
-    T  RingBuffer<T,S>::ExtractBack () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    T  RingBuffer<T,A,CP,RP>::ExtractBack () __NE___
     {
         T   tmp = RVRef(back());
         pop_back();
@@ -628,8 +626,8 @@ namespace AE::Base
     reserve
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::reserve (usize newSize) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::reserve (usize newSize) __Th___
     {
         if ( newSize <= capacity() )
             return;
@@ -642,8 +640,8 @@ namespace AE::Base
     operator ==
 =================================================
 */
-    template <typename T, typename S>
-    bool  RingBuffer<T,S>::operator == (ArrayView<T> rhs) C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    bool  RingBuffer<T,A,CP,RP>::operator == (ArrayView<T> rhs) C_NE___
     {
         if ( size() != rhs.size() )
             return false;
@@ -661,8 +659,8 @@ namespace AE::Base
     operator ==
 =================================================
 */
-    template <typename T, typename S>
-    bool  RingBuffer<T,S>::operator == (const Self &rhs) C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    bool  RingBuffer<T,A,CP,RP>::operator == (const Self &rhs) C_NE___
     {
         if ( size() != rhs.size() )
             return false;
@@ -680,8 +678,8 @@ namespace AE::Base
     clear
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::clear () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::clear () __NE___
     {
         if ( _array != null )
         {
@@ -690,12 +688,12 @@ namespace AE::Base
             else
             if ( _first > _end )
             {
-                CPolicy_t::Destroy( INOUT _array + _first, capacity() - _first );
-                CPolicy_t::Destroy( INOUT _array, _end );
+                CopyPolicy_t::Destroy( INOUT _array + _first, capacity() - _first );
+                CopyPolicy_t::Destroy( INOUT _array, _end );
             }
             else
             {
-                CPolicy_t::Destroy( INOUT _array + _first, size() );
+                CopyPolicy_t::Destroy( INOUT _array + _first, size() );
             }
         }
         _first = _end = 0;
@@ -709,8 +707,8 @@ namespace AE::Base
     GetParts
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::GetParts (OUT ArrayView<T> &part0, OUT ArrayView<T> &part1) C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::GetParts (OUT ArrayView<T> &part0, OUT ArrayView<T> &part1) C_NE___
     {
         if ( empty() )
         {
@@ -719,7 +717,7 @@ namespace AE::Base
         }
         else
         if ( _first > _end )
-        {   
+        {
             part0 = ArrayView<T>( _array + _first, capacity() - _first );
             part1 = ArrayView<T>( _array, _end );
         }
@@ -735,8 +733,8 @@ namespace AE::Base
     CalcHash
 =================================================
 */
-    template <typename T, typename S>
-    HashVal  RingBuffer<T,S>::CalcHash () C_NE___
+    template <typename T, typename A, typename CP, typename RP>
+    HashVal  RingBuffer<T,A,CP,RP>::CalcHash () C_NE___
     {
         ArrayView<T>    part0;
         ArrayView<T>    part1;
@@ -749,9 +747,9 @@ namespace AE::Base
     _AppendFront
 =================================================
 */
-    template <typename T, typename S>
+    template <typename T, typename A, typename CP, typename RP>
     template <typename B>
-    void  RingBuffer<T,S>::_AppendFront (B* src, usize count) __Th___
+    void  RingBuffer<T,A,CP,RP>::_AppendFront (B* src, usize count) __Th___
     {
         if_unlikely( src == null or count == 0 )
             return;
@@ -769,8 +767,8 @@ namespace AE::Base
 
         if_unlikely( empty() )
         {
-            if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array, src, count );  // throw
-            else                        CPolicy_t::Move( OUT _array, INOUT src, count );
+            if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array, src, count );   // throw
+            else                        CopyPolicy_t::Move( OUT _array, INOUT src, count );
 
             _first = 0;
             _end   = Offset_t(count);
@@ -781,8 +779,8 @@ namespace AE::Base
         {
             const usize cnt = Min( count, _first );
 
-            if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array + _first - cnt, src + count - cnt, cnt );   // throw
-            else                        CPolicy_t::Move( OUT _array + _first - cnt, INOUT src + count - cnt, cnt );
+            if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array + _first - cnt, src + count - cnt, cnt );    // throw
+            else                        CopyPolicy_t::Move( OUT _array + _first - cnt, INOUT src + count - cnt, cnt );
 
             _first = Offset_t(_first - cnt);
 
@@ -790,14 +788,14 @@ namespace AE::Base
             {
                 _first = Offset_t( capacity() - (count - cnt) );
 
-                if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array + _first, src, count - cnt );   // throw
-                else                        CPolicy_t::Move( OUT _array + _first, INOUT src, count - cnt );
+                if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array + _first, src, count - cnt );    // throw
+                else                        CopyPolicy_t::Move( OUT _array + _first, INOUT src, count - cnt );
             }
         }
         else
         {
-            if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array + _first - count, src, count ); // throw
-            else                        CPolicy_t::Move( OUT _array + _first - count, INOUT src, count );
+            if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array + _first - count, src, count );  // throw
+            else                        CopyPolicy_t::Move( OUT _array + _first - count, INOUT src, count );
 
             _first = Offset_t(_first - count);
         }
@@ -811,9 +809,9 @@ namespace AE::Base
     _AppendBack
 =================================================
 */
-    template <typename T, typename S>
+    template <typename T, typename A, typename CP, typename RP>
     template <typename B>
-    void  RingBuffer<T,S>::_AppendBack (B* src, usize count) __Th___
+    void  RingBuffer<T,A,CP,RP>::_AppendBack (B* src, usize count) __Th___
     {
         if_unlikely( src == null or count == 0 )
             return;
@@ -831,8 +829,8 @@ namespace AE::Base
 
         if_unlikely( empty() )
         {
-            if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array,                       src, count );    // throw
-            else                        CPolicy_t::Move( OUT _array, INOUT const_cast<T*>(src), count );
+            if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array,                       src, count ); // throw
+            else                        CopyPolicy_t::Move( OUT _array, INOUT const_cast<T*>(src), count );
 
             _first = 0;
             _end   = Offset_t(count);
@@ -843,8 +841,8 @@ namespace AE::Base
         {
             const usize cnt = Min( count, capacity() - _end );
 
-            if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array + _end,       src, cnt );   // throw
-            else                        CPolicy_t::Move( OUT _array + _end, INOUT src, cnt );
+            if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array + _end,       src, cnt );    // throw
+            else                        CopyPolicy_t::Move( OUT _array + _end, INOUT src, cnt );
 
             _end = Offset_t(_end + cnt);
 
@@ -852,14 +850,14 @@ namespace AE::Base
             {
                 _end = Offset_t(count - cnt);
 
-                if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array,       src + cnt, count - cnt );    // throw
-                else                        CPolicy_t::Move( OUT _array, INOUT src + cnt, count - cnt );
+                if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array,       src + cnt, count - cnt ); // throw
+                else                        CopyPolicy_t::Move( OUT _array, INOUT src + cnt, count - cnt );
             }
         }
         else
         {
-            if constexpr( IsConst<B> )  CPolicy_t::Copy( OUT _array + _end,       src, count ); // throw
-            else                        CPolicy_t::Move( OUT _array + _end, INOUT src, count );
+            if constexpr( IsConst<B> )  CopyPolicy_t::Copy( OUT _array + _end,       src, count );  // throw
+            else                        CopyPolicy_t::Move( OUT _array + _end, INOUT src, count );
 
             _end = Offset_t(_end + count);
         }
@@ -873,8 +871,8 @@ namespace AE::Base
     AppendFront
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::AppendFront (ArrayView<T> value) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::AppendFront (ArrayView<T> value) __Th___
     {
         return _AppendFront<const T>( value.data(), value.size() ); // throw
     }
@@ -884,8 +882,8 @@ namespace AE::Base
     AppendBack
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::AppendBack (ArrayView<T> value) __Th___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::AppendBack (ArrayView<T> value) __Th___
     {
         return _AppendBack<const T>( value.data(), value.size() );  // throw
     }
@@ -895,14 +893,14 @@ namespace AE::Base
     EraseFront
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::EraseFront (usize count) __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::EraseFront (usize count) __NE___
     {
         count = Min( count, size() );
 
         for (usize i = 0; i < count; ++i)
         {
-            CPolicy_t::Destroy( INOUT _array + _first, 1 );
+            CopyPolicy_t::Destroy( INOUT _array + _first, 1 );
             _first = _WrapIndex( _first + 1 );
         }
 
@@ -917,15 +915,15 @@ namespace AE::Base
     EraseBack
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::EraseBack (usize count) __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::EraseBack (usize count) __NE___
     {
         count = Min( count, size() );
 
         for (usize i = 0; i < count; ++i)
         {
             _end = _WrapIndex( ssize(_end) - 1 );
-            CPolicy_t::Destroy( INOUT _array + _end, 1 );
+            CopyPolicy_t::Destroy( INOUT _array + _end, 1 );
         }
 
         if ( _first == _end )
@@ -939,8 +937,8 @@ namespace AE::Base
     _UpdateDbgView
 =================================================
 */
-    template <typename T, typename S>
-    void  RingBuffer<T,S>::_UpdateDbgView () __NE___
+    template <typename T, typename A, typename CP, typename RP>
+    void  RingBuffer<T,A,CP,RP>::_UpdateDbgView () __NE___
     {
         DEBUG_ONLY(
             _dbg_first = BitCast<decltype(_dbg_first)>( &_array[_first] );
@@ -955,10 +953,10 @@ namespace AE::Base
 } // AE::Base
 
 
-template <typename T, typename S>
-struct std::hash< AE::Base::RingBuffer<T,S> >
+template <typename T, typename A, typename CP, typename RP>
+struct std::hash< AE::Base::RingBuffer<T,A,CP,RP> >
 {
-    ND_ size_t  operator () (const AE::Base::RingBuffer<T,S> &value) C_NE___
+    ND_ size_t  operator () (const AE::Base::RingBuffer<T,A,CP,RP> &value) C_NE___
     {
         return size_t(value.CalcHash());
     }
diff --git a/AE/engine/src/base/Containers/StructView.h b/AE/engine/src/base/Containers/StructView.h
index 52b43985..aabeed50 100644
--- a/AE/engine/src/base/Containers/StructView.h
+++ b/AE/engine/src/base/Containers/StructView.h
@@ -70,9 +70,9 @@ namespace AE::Base
     private:
         static constexpr uint   DBG_VIEW_COUNT = 400;
 
-        struct _IViewer
+        struct _IViewer : NothrowAllocatable
         {
-            virtual ~_IViewer () {}
+            virtual ~_IViewer () __NE___ {}
 
             ND_ virtual Unique<_IViewer>  Clone () = 0;
         };
@@ -94,8 +94,8 @@ namespace AE::Base
             ElementsPtr_t const     elements;
 
         // methods
-            explicit _ViewerWithPaddingUnaligned (const void *ptr) __NE___ : elements{ BitCast<ElementsPtr_t>(ptr) } {
-                STATIC_ASSERT( sizeof(Element) == sizeof(St) );
+            explicit _ViewerWithPaddingUnaligned (const void* ptr) __NE___ : elements{ BitCast<ElementsPtr_t>(ptr) } {
+                StaticAssert( sizeof(Element) == sizeof(St) );
             }
 
             Unique<_IViewer>  Clone () __Th_OV { return Unique<_IViewer>{new _ViewerWithPaddingUnaligned< St, Padding >{ elements }}; }
@@ -116,8 +116,8 @@ namespace AE::Base
             ElementsPtr_t const     elements;
 
         // methods
-            explicit _ViewerWithPadding (const void *ptr) __NE___ : elements{ BitCast<ElementsPtr_t>(ptr) } {
-                STATIC_ASSERT( sizeof(Element) == sizeof(St) );
+            explicit _ViewerWithPadding (const void* ptr) __NE___ : elements{ BitCast<ElementsPtr_t>(ptr) } {
+                StaticAssert( sizeof(Element) == sizeof(St) );
             }
 
             Unique<_IViewer>  Clone () __Th_OV { return Unique<_IViewer>{new _ViewerWithPadding< St, Padding >{ elements }}; }
@@ -134,9 +134,9 @@ namespace AE::Base
             ElementsPtr_t const     elements;
 
         // methods
-            explicit _ViewerImpl (const void *ptr) __NE___ : elements{ BitCast<ElementsPtr_t>(ptr) } {}
+            explicit _ViewerImpl (const void* ptr)  __NE___ : elements{ BitCast<ElementsPtr_t>(ptr) } {}
 
-            Unique<_IViewer>  Clone () __Th_OV { return Unique<_IViewer>{new _ViewerImpl< St >{ elements }}; }
+            Unique<_IViewer>  Clone ()              __Th_OV { return Unique<_IViewer>{new _ViewerImpl< St >{ elements }}; }
         };
 
 
@@ -144,10 +144,10 @@ namespace AE::Base
     private:
         void const *    _array      = null;
         uint            _count      = 0;
-        Bytes32u        _stride;
+        Byte32u         _stride;
 
         DEBUG_ONLY(
-            Unique<_IViewer>    _dbgView;   
+            Unique<_IViewer>    _dbgView;
         )
 
 
@@ -157,7 +157,7 @@ namespace AE::Base
 
         StructView (ArrayView<T> arr)                   __NE___ : _array{ arr.data() }, _count{ CheckCast<uint>( arr.size() )}, _stride{ SizeOf<T> }
         {
-            DEBUG_ONLY( _dbgView = _CreateView<T, sizeof(T)>( _array ));
+            DEBUG_ONLY( _dbgView = _CreateView< T, sizeof(T) >( _array ));
         }
 
         StructView (const Self &other)                  __NE___ : _array{other._array}, _count{other._count}, _stride{other._stride}
@@ -172,22 +172,22 @@ namespace AE::Base
 
         StructView (const T* ptr, usize count)          __NE___ : _array{ ptr }, _count{ CheckCast<uint>( count )}, _stride{ SizeOf<T> }
         {
-            DEBUG_ONLY( _dbgView = _CreateView<T, sizeof(T)>( _array ));
+            DEBUG_ONLY( _dbgView = _CreateView< T, sizeof(T) >( _array ));
         }
 
         template <typename Class>
         StructView (ArrayView<Class> arr, T (Class::*member)) __NE___ :
             _array{ arr.data() + OffsetOf(member) }, _count{ CheckCast<uint>( arr.size() )}, _stride{ SizeOf<Class> }
         {
-            DEBUG_ONLY( _dbgView = _CreateView<Class, sizeof(Class)>( _array ));
+            DEBUG_ONLY( _dbgView = _CreateView< Class, sizeof(Class) >( _array ));
         }
 
-        StructView (const void *ptr, usize count, Bytes stride) __NE___ :
-            _array{ptr}, _count{ CheckCast<uint>( count )}, _stride{Bytes32u(stride)}
+        StructView (const void* ptr, usize count, Bytes stride) __NE___ :
+            _array{ptr}, _count{ CheckCast<uint>( count )}, _stride{Byte32u(stride)}
         {}
 
-            Self&  operator = (const Self &rhs)         __NE___;
-            Self&  operator = (Self && rhs)             __NE___;
+            Self&   operator = (const Self &rhs)        __NE___;
+            Self&   operator = (Self &&rhs)             __NE___;
 
 
         ND_ usize           size ()                     C_NE___ { return _count; }
@@ -209,11 +209,11 @@ namespace AE::Base
         ND_ Bytes           Stride ()                   C_NE___ { return Bytes{_stride}; }
         ND_ Bytes           DataSize ()                 C_NE___ { return SizeOf<T> * size(); }
 
-        ND_ bool  operator == (const Self &rhs)         C_NE___;
+        ND_ bool    operator == (const Self &rhs)       C_NE___;
 
-        ND_ Self  section (usize first, usize count)    C_NE___;
+        ND_ Self    section (usize first, usize count)  C_NE___;
 
-        ND_ usize  IndexOf (const const_iterator &it)   C_NE___;
+        ND_ usize   IndexOf (const const_iterator &it)  C_NE___;
 
         ND_ explicit operator Array<T> ()               C_NE___
         {
@@ -229,7 +229,7 @@ namespace AE::Base
 
     private:
         template <typename Class, usize Stride>
-        ND_ static Unique<_IViewer>  _CreateView (const void *ptr);
+        ND_ static Unique<_IViewer>  _CreateView (const void* ptr);
     };
 
 
@@ -241,7 +241,7 @@ namespace AE::Base
     template <typename SrcType, typename DstType>
     struct StructViewTransform_CastConverter
     {
-        STATIC_ASSERT( std::is_convertible_v< SrcType, DstType >);
+        StaticAssert( std::is_convertible_v< SrcType, DstType >);
 
         ND_ DstType  operator () (SrcType src)          C_NE___ { return DstType{src}; }
     };
@@ -378,7 +378,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    StructView<T>&  StructView<T>::operator = (StructView<T> && rhs) __NE___
+    StructView<T>&  StructView<T>::operator = (StructView<T> &&rhs) __NE___
     {
         _array  = rhs._array;
         _count  = rhs._count;
@@ -428,19 +428,19 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    template <typename Class, usize Stride>
-    Unique<typename StructView<T>::_IViewer>  StructView<T>::_CreateView (const void *ptr)
+    template <typename C, usize S>
+    Unique<typename StructView<T>::_IViewer>  StructView<T>::_CreateView (const void* ptr)
     {
-        STATIC_ASSERT( Stride >= sizeof(T) );
-        const usize padding = Stride - sizeof(T);
+        StaticAssert( S >= sizeof(T) );
+        const usize padding = S - sizeof(T);
 
         if constexpr( padding == 0 )
-            return MakeUnique< _ViewerImpl< Class >>( ptr );
+            return MakeUnique< _ViewerImpl< C >>( ptr );
         else
         if constexpr( IsMultipleOf( padding, alignof(T) ))
-            return MakeUnique< _ViewerWithPadding< Class, padding >>( ptr );
+            return MakeUnique< _ViewerWithPadding< C, padding >>( ptr );
         else
-            return MakeUnique< _ViewerWithPaddingUnaligned< Class, padding >>( ptr );
+            return MakeUnique< _ViewerWithPaddingUnaligned< C, padding >>( ptr );
     }
 
 /*
diff --git a/AE/engine/src/base/Containers/Tuple.h b/AE/engine/src/base/Containers/Tuple.h
index 533f40f8..133bbb47 100644
--- a/AE/engine/src/base/Containers/Tuple.h
+++ b/AE/engine/src/base/Containers/Tuple.h
@@ -43,20 +43,20 @@ namespace _hidden_
     // methods
         constexpr Tuple ()                                          __NE___ = default;
 
-        constexpr Tuple (const Self &)                              __Th___ = default;
+        constexpr Tuple (const Self &)                              __NE___ = default;
         constexpr Tuple (Self &&)                                   __NE___ = default;
 
         template <typename ...UTypes>
-        constexpr explicit Tuple (UTypes&& ...args)                 __Th___ : Base_t{ FwdArg<UTypes>(args)... } {}
+        constexpr explicit Tuple (UTypes&& ...args)                 __NE___ : Base_t{ FwdArg<UTypes>(args)... } {}
 
         template <typename ...UTypes>
-        constexpr Tuple (const Tuple<UTypes...> &other)             __Th___ : Base_t{ other.AsBase() } {}
+        constexpr Tuple (const Tuple<UTypes...> &other)             __NE___ : Base_t{ other.AsBase() } {}
 
         template <typename ...UTypes>
-        constexpr Tuple (Tuple<UTypes...>&& other)                  __Th___ : Base_t{ RVRef(other).AsBase() } {}
+        constexpr Tuple (Tuple<UTypes...>&& other)                  __NE___ : Base_t{ RVRef(other).AsBase() } {}
 
 
-        constexpr Self&  operator = (const Self &)                  __Th___ = default;
+        constexpr Self&  operator = (const Self &)                  __NE___ = default;
         constexpr Self&  operator = (Self &&)                       __NE___ = default;
 
         template <typename ...UTypes>
@@ -101,16 +101,16 @@ namespace _hidden_
         ND_ HashVal                     CalcHash ()                 C_NE___ { return _RecursiveCalcHash<0>(); }
 
         template <typename ...Args>
-        constexpr void                  Set (Args && ...args)       __Th___ { _RecursiveSet<0>( FwdArg<Args>(args)... ); }
+        constexpr void                  Set (Args&& ...args)        __NE___ { _RecursiveSet<0>( FwdArg<Args>(args)... ); }
 
         template <typename Fn>
-        constexpr decltype(auto)        Apply (Fn &&fn)             __Th___
+        constexpr decltype(auto)        Apply (Fn &&fn)             NoExcept(IsNothrowInvocable< Fn, Types&... >)
         {
             return std::apply( FwdArg<Fn>(fn), static_cast<Base_t &>(*this) );
         }
 
         template <typename Fn>
-        constexpr decltype(auto)        Apply (Fn &&fn)             C_Th___
+        constexpr decltype(auto)        Apply (Fn &&fn)             CNoExcept(IsNothrowInvocable< Fn, const Types&... >)
         {
             return std::apply( FwdArg<Fn>(fn), static_cast<const Base_t &>(*this) );
         }
@@ -126,8 +126,9 @@ namespace _hidden_
         }
 
         template <usize I, typename Arg0, typename ...Args>
-        constexpr void  _RecursiveSet (Arg0 &&arg0, Args&& ...args) __Th___
+        constexpr void  _RecursiveSet (Arg0 &&arg0, Args&& ...args) __NE___
         {
+            CheckNothrow( IsNoExcept( Get<I>() = FwdArg<Arg0>(arg0) ));
             Get<I>() = FwdArg<Arg0>(arg0);
 
             if constexpr( I+1 < sizeof... (Types) )
@@ -290,8 +291,8 @@ namespace _hidden_
     template <typename Tuple1, typename Tuple2>
     ND_ constexpr auto  TupleConcat (Tuple1&& tuple1, Tuple2&& tuple2) __Th___
     {
-        STATIC_ASSERT( IsTuple<Tuple1> );
-        STATIC_ASSERT( IsTuple<Tuple2> );
+        StaticAssert( IsTuple<Tuple1> );
+        StaticAssert( IsTuple<Tuple2> );
         return Base::_hidden_::_TupleConcat( FwdArg<Tuple1>(tuple1), FwdArg<Tuple2>(tuple2),
                                              typename RemoveCVRef< Tuple1 >::Indices_t{},
                                              typename RemoveCVRef< Tuple2 >::Indices_t{} );
diff --git a/AE/engine/src/base/Containers/TupleArrayView.h b/AE/engine/src/base/Containers/TupleArrayView.h
index 09827673..5d3a13d3 100644
--- a/AE/engine/src/base/Containers/TupleArrayView.h
+++ b/AE/engine/src/base/Containers/TupleArrayView.h
@@ -34,7 +34,7 @@ namespace AE::Base
         using Types_t   = TypeList< Types... >;
         using CResult_t = TupleRef< const Types ...>;
 
-        STATIC_ASSERT( Types_t::Count > 0 );
+        StaticAssert( Types_t::Count > 0 );
 
 
         struct TIterator
@@ -49,7 +49,7 @@ namespace AE::Base
             TIterator ()                                __NE___ {}
             TIterator (const TIterator &)               __NE___ = default;
             TIterator (TIterator &&)                    __NE___ = default;
-            TIterator (const Self *ptr, usize idx)      __NE___ : _ptr{ptr}, _index{idx} { ASSERT( _ptr != null ); }
+            TIterator (const Self* ptr, usize idx)      __NE___ : _ptr{ptr}, _index{idx} { ASSERT( _ptr != null ); }
 
             TIterator&  operator = (const TIterator &)  __NE___ = default;
             TIterator&  operator = (TIterator &&)       __NE___ = default;
diff --git a/AE/engine/src/base/Containers/Union.h b/AE/engine/src/base/Containers/Union.h
index a1938615..3ab941fa 100644
--- a/AE/engine/src/base/Containers/Union.h
+++ b/AE/engine/src/base/Containers/Union.h
@@ -28,17 +28,17 @@ namespace AE::Base
 =================================================
 */
     template <typename ...Types, typename ...Funcs>
-    ND_ constexpr decltype(auto)  Visit (Union<Types...> &un, Funcs&&... fn) noexcept(AllNothrowInvocable< Funcs... >)
+    ND_ constexpr decltype(auto)  Visit (Union<Types...> &un, Funcs&&... fn) //noexcept(AllNothrowInvocable< Funcs... >)  // TODO
     {
         using namespace Base::_hidden_;
-        return std::visit( overloaded{ FwdArg<Funcs &&>(fn)... }, un );
+        return std::visit( overloaded{ FwdArg<Funcs>(fn)... }, un );
     }
 
     template <typename ...Types, typename ...Funcs>
-    ND_ constexpr decltype(auto)  Visit (const Union<Types...> &un, Funcs&&... fn) noexcept(AllNothrowInvocable< Funcs... >)
+    ND_ constexpr decltype(auto)  Visit (const Union<Types...> &un, Funcs&&... fn) //noexcept(AllNothrowInvocable< Funcs... >)  // TODO
     {
         using namespace Base::_hidden_;
-        return std::visit( overloaded{ FwdArg<Funcs &&>(fn)... }, un );
+        return std::visit( overloaded{ FwdArg<Funcs>(fn)... }, un );
     }
 
 /*
diff --git a/AE/engine/src/base/Containers/UntypedStorage.h b/AE/engine/src/base/Containers/UntypedStorage.h
index 0acef075..e3dd6a3f 100644
--- a/AE/engine/src/base/Containers/UntypedStorage.h
+++ b/AE/engine/src/base/Containers/UntypedStorage.h
@@ -1,10 +1,16 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    UntypedStorage and DynUntypedStorage can be used as static variable.
+    For RC object use SharedMem type.
+*/
 
 #pragma once
 
+#include "base/CompileTime/TypeList.h"
 #include "base/Math/Bytes.h"
 #include "base/Math/POTValue.h"
 #include "base/Memory/UntypedAllocator.h"
+#include "base/Memory/IAllocator.h"
 #include "base/Utils/Helpers.h"
 #include "base/Utils/RestrictPtr.h"
 
@@ -14,7 +20,6 @@ namespace AE::Base
     //
     // Static Untyped Storage
     //
-
     template <usize Size_v, usize Align_v>
     struct UntypedStorage final : Noncopyable
     {
@@ -30,50 +35,29 @@ namespace AE::Base
 
     // methods
     public:
-        UntypedStorage ()                                               __NE___
-        {
-            DEBUG_ONLY( DbgInitMem( _buffer, Sizeof(_buffer) ));
-        }
-
-        //explicit UntypedStorage (Base::_hidden_::_Zero)               __NE___ : _buffer{}
-        //{}
+        template <typename T>
+        explicit UntypedStorage (const T &value)                __NE___;
 
         template <typename T>
-        explicit UntypedStorage (const T &value)                        __NE___
-        {
-            STATIC_ASSERT( sizeof(T) == Size_v );
-            STATIC_ASSERT( alignof(T) <= Align_v );
+        explicit UntypedStorage (TypeList<T>)                   __NE___;
 
-            std::memcpy( OUT _buffer, &value, Size_v );
-        }
-
-        ~UntypedStorage ()                                              __NE___
-        {
-            DEBUG_ONLY( DbgFreeMem( _buffer, Sizeof(_buffer) ));
-        }
+        UntypedStorage ()                                       __NE___ { DEBUG_ONLY( DbgInitMem( _buffer, Sizeof(_buffer) )); }
+        ~UntypedStorage ()                                      __NE___ { DEBUG_ONLY( DbgFreeMem( _buffer, Sizeof(_buffer) )); }
 
         template <typename T>
-        ND_ T*  Ptr (Bytes offset = 0_b)                                __NE___
-        {
-            ASSERT( SizeOf<T> + offset <= sizeof(_buffer) );
-            return Base::Cast<T>( _buffer + offset );
-        }
+        ND_ T*          Ptr (Bytes offset = 0_b)                __NE___;
 
         template <typename T>
-        ND_ T const*  Ptr (Bytes offset = 0_b)                          C_NE___
-        {
-            ASSERT( SizeOf<T> + offset <= sizeof(_buffer) );
-            return Base::Cast<T>( _buffer + offset );
-        }
+        ND_ T const*    Ptr (Bytes offset = 0_b)                C_NE___ { return const_cast<Self*>(this)->Ptr<T>( offset ); }
 
         template <typename T>
-        ND_ T&  Ref (Bytes offset = 0_b)                                __NE___ { return *Ptr<T>( offset ); }
+        ND_ T&          Ref (Bytes offset = 0_b)                __NE___ { return *Ptr<T>( offset ); }
 
         template <typename T>
-        ND_ T const&  Ref (Bytes offset = 0_b)                          C_NE___ { return *Ptr<T>( offset ); }
+        ND_ T const&    Ref (Bytes offset = 0_b)                C_NE___ { return *Ptr<T>( offset ); }
 
-        ND_ Bytes   Size ()                                             C_NE___ { return Bytes{Size_v}; }
-        ND_ Bytes   Align ()                                            C_NE___ { return Bytes{Align_v}; }
+        ND_ static constexpr Bytes      Size ()                 __NE___ { return Bytes{Size_v}; }
+        ND_ static constexpr Bytes      Align ()                __NE___ { return Bytes{Align_v}; }
     };
 
 
@@ -81,104 +65,170 @@ namespace AE::Base
     //
     // Dynamic Untyped Storage
     //
-
-    template <typename AllocType = UntypedAllocator>
     struct DynUntypedStorage final : Noncopyable
     {
-    // types
-    public:
-        using Self          = DynUntypedStorage< AllocType >;
-        using Allocator_t   = AllocType;
-
-
     // variables
     private:
         RstPtr<void>    _ptr;
         usize           _size   : 28;
         usize           _align  : 4;
 
+        DEBUG_ONLY( RC<IAllocator>  _dbgAllocator;)
+
 
     // methods
     public:
-        DynUntypedStorage ()                            __NE___ {}
-        DynUntypedStorage (Bytes size, Bytes align)     __NE___ { Alloc( SizeAndAlign{ size, align }); }
-        explicit DynUntypedStorage (const SizeAndAlign sizeAndAlign) __NE___ { Alloc( sizeAndAlign ); }
+        DynUntypedStorage ()                                            __NE___ : _size{0}, _align{0} {}
+        ~DynUntypedStorage ()                                           __NE___ { Dealloc( null ); }
 
-        ~DynUntypedStorage ()                           __NE___ { Dealloc(); }
+        explicit DynUntypedStorage (Bytes size, Bytes align = DefaultAllocatorAlign, IAllocator* alloc = null)  __NE___;
+        explicit DynUntypedStorage (SizeAndAlign sizeAndAlign, IAllocator* alloc = null)                        __NE___;
 
-        ND_ Bytes               Size ()                 C_NE___ { return Bytes{_size}; }
-        ND_ POTBytes            AlignPOT ()             C_NE___ { return POTBytes{PowerOfTwo( _align )}; }
-        ND_ Bytes               Align ()                C_NE___ { return Bytes{ AlignPOT() }; }
-        ND_ bool                Empty ()                C_NE___ { return _ptr == null; }
+        ND_ Bytes               Size ()                                 C_NE___ { return Bytes{_size}; }
+        ND_ POTBytes            AlignPOT ()                             C_NE___ { return POTBytes{PowerOfTwo( _align )}; }
+        ND_ Bytes               Align ()                                C_NE___ { return Bytes{ AlignPOT() }; }
+        ND_ bool                Empty ()                                C_NE___ { return _ptr == null; }
 
-        ND_ RstPtr<void>        Data ()                 __NE___ { return _ptr; }
-        ND_ RstPtr<const void>  Data ()                 C_NE___ { return RstPtr<const void>{ _ptr.get() }; }
+        ND_ RstPtr<void>        Data ()                                 __NE___ { return _ptr; }
+        ND_ RstPtr<const void>  Data ()                                 C_NE___ { return RstPtr<const void>{ _ptr.get() }; }
 
-        ND_ explicit operator bool ()                   C_NE___ { return not Empty(); }
+        ND_ const void*         End ()                                  C_NE___ { return _ptr.get() + Size(); }
 
+        ND_ explicit operator bool ()                                   C_NE___ { return _ptr != null; }
 
-        bool  Alloc (const SizeAndAlign sizeAndAlign)   __NE___
-        {
-            Dealloc();
+            bool  Alloc (Bytes size, Bytes align, IAllocator* alloc)    __NE___ { return Alloc( SizeAndAlign{size,align}, alloc ); }
+            bool  Alloc (SizeAndAlign sizeAndAlign, IAllocator* alloc)  __NE___;
+            void  Dealloc (IAllocator* alloc)                           __NE___;
 
-            _size   = usize(sizeAndAlign.size);
-            _align  = POTBytes( sizeAndAlign.align ).GetPOT();
+        template <typename T>
+        ND_ T*          Ptr (Bytes offset = 0_b)                        __NE___ { ASSERT( SizeOf<T> + offset <= Size() );  return Cast<T>( _ptr.get() + offset ); }
 
-            ASSERT( Size() == sizeAndAlign.size );
-            ASSERT( Align() == sizeAndAlign.align );
+        template <typename T>
+        ND_ T const*    Ptr (Bytes offset = 0_b)                        C_NE___ { ASSERT( SizeOf<T> + offset <= Size() );  return Cast<T>( _ptr.get() + offset ); }
 
-            _ptr = RstPtr<void>{ Allocator_t::Allocate( sizeAndAlign )};
-            return _ptr;
-        }
+        ND_ void*       Ptr (Bytes offset = 0_b)                        __NE___ { ASSERT( offset <= Size() );  return _ptr.get() + offset; }
+        ND_ void const* Ptr (Bytes offset = 0_b)                        C_NE___ { ASSERT( offset <= Size() );  return _ptr.get() + offset; }
 
-        void  Dealloc ()                                __NE___
-        {
-            if ( _ptr )
-                Allocator_t::Deallocate( _ptr.get(), SizeAndAlign{ Size(), Align() });
+        template <typename T>
+        ND_ T&          Ref (Bytes offset = 0_b)                        __NE___ { return *Ptr<T>( offset ); }
 
-            _ptr    = null;
-            _size   = 0;
-            _align  = 0;
-        }
+        template <typename T>
+        ND_ T const&    Ref (Bytes offset = 0_b)                        C_NE___ { return *Ptr<T>( offset ); }
+    };
 
 
-        template <typename T>
-        ND_ T*  Ptr (Bytes offset = 0_b)                __NE___
-        {
-            ASSERT( SizeOf<T> + offset <= Size() );
-            return Base::Cast<T>( _ptr.get() + offset );
-        }
+    template <typename T, usize Capacity>
+    using UninitializedStaticArray = UntypedStorage< sizeof(T) * Capacity, alignof(T) >;
 
-        template <typename T>
-        ND_ T const*  Ptr (Bytes offset = 0_b)          C_NE___
-        {
-            ASSERT( SizeOf<T> + offset <= Size() );
-            return Base::Cast<T>( _ptr.get() + offset );
-        }
+//-----------------------------------------------------------------------------
 
 
-        ND_ void*  Ptr (Bytes offset = 0_b)             __NE___
-        {
-            ASSERT( offset <= Size() );
-            return _ptr.get() + offset;
-        }
 
-        ND_ void const*  Ptr (Bytes offset = 0_b)       C_NE___
-        {
-            ASSERT( offset <= Size() );
-            return _ptr.get() + offset;
-        }
+/*
+=================================================
+    constructor
+=================================================
+*/
+    template <usize S, usize A>
+    template <typename T>
+    UntypedStorage<S,A>::UntypedStorage (const T &value) __NE___
+    {
+        StaticAssert( sizeof(T) == S );
+        StaticAssert( alignof(T) <= A );
 
-        template <typename T>
-        ND_ T&  Ref (Bytes offset = 0_b)                __NE___ { return *Ptr<T>( offset ); }
+        std::memcpy( OUT _buffer, &value, S );
+    }
 
-        template <typename T>
-        ND_ T const&  Ref (Bytes offset = 0_b)          C_NE___ { return *Ptr<T>( offset ); }
-    };
+    template <usize S, usize A>
+    template <typename T>
+    UntypedStorage<S,A>::UntypedStorage (TypeList<T>) __NE___
+    {
+        StaticAssert( sizeof(T) == S );
+        StaticAssert( alignof(T) <= A );
+
+        PlacementNew<T>( OUT _buffer );
+    }
+
+/*
+=================================================
+    Ptr
+=================================================
+*/
+    template <usize S, usize A>
+    template <typename T>
+    T*  UntypedStorage<S,A>::Ptr (Bytes offset) __NE___
+    {
+        StaticAssert( sizeof(T) <= S );
+        StaticAssert( alignof(T) <= A );
 
+        ASSERT( SizeOf<T> + offset <= sizeof(_buffer) );
+        return Cast<T>( _buffer + offset );
+    }
+//-----------------------------------------------------------------------------
 
-    template <typename T, usize Capacity>
-    using UninitializedStaticArray = UntypedStorage< sizeof(T) * Capacity, alignof(T) >;
 
 
+/*
+=================================================
+    constructor
+=================================================
+*/
+    inline DynUntypedStorage::DynUntypedStorage (Bytes size, Bytes align, IAllocator* allocator) __NE___ :
+        _size{0}, _align{0}
+    {
+        Alloc( SizeAndAlign{ size, align }, allocator );
+    }
+
+    inline DynUntypedStorage::DynUntypedStorage (SizeAndAlign sizeAndAlign, IAllocator* allocator) __NE___ :
+        _size{0}, _align{0}
+    {
+        Alloc( sizeAndAlign, allocator );
+    }
+
+/*
+=================================================
+    Alloc
+=================================================
+*/
+    inline bool  DynUntypedStorage::Alloc (const SizeAndAlign sizeAndAlign, IAllocator* allocator) __NE___
+    {
+        if_unlikely( _ptr != null )
+            return false;
+
+        if_unlikely( allocator == null )
+            allocator = AE::GetDefaultAllocatorPtr().get();
+
+        _size   = usize(sizeAndAlign.size);
+        _align  = POTBytes( sizeAndAlign.align ).GetPOT();
+
+        ASSERT( Size() == sizeAndAlign.size );
+        ASSERT( Align() == sizeAndAlign.align );
+
+        _ptr = RstPtr<void>{ allocator->Allocate( sizeAndAlign )};
+
+        DEBUG_ONLY( _dbgAllocator = allocator->GetRC(); )
+        return _ptr != null;
+    }
+
+/*
+=================================================
+    Dealloc
+=================================================
+*/
+    inline void  DynUntypedStorage::Dealloc (IAllocator* allocator) __NE___
+    {
+        if_likely( _ptr != null )
+        {
+            if_unlikely( allocator == null )
+                allocator = AE::GetDefaultAllocatorPtr().get();
+
+            ASSERT( _dbgAllocator == allocator );
+            allocator->Deallocate( _ptr.get(), SizeAndAlign{ Size(), Align() });
+        }
+
+        _ptr    = null;
+        _size   = 0;
+        _align  = 0;
+    }
+
 } // AE::Base
diff --git a/AE/engine/src/base/DataSource/BrotliStream.cpp b/AE/engine/src/base/DataSource/BrotliStream.cpp
index c1bfe11d..09a34129 100644
--- a/AE/engine/src/base/DataSource/BrotliStream.cpp
+++ b/AE/engine/src/base/DataSource/BrotliStream.cpp
@@ -14,7 +14,7 @@
 namespace AE::Base
 {
 namespace
-{   
+{
     static void*  BrotliAlloc (void* opaque, size_t size) __NE___
     {
         return Cast<IAllocator>(opaque)->Allocate( Bytes{size} );
@@ -93,7 +93,7 @@ namespace
     ReadSeq
 =================================================
 */
-    Bytes  BrotliRStream::ReadSeq (OUT void *buffer, Bytes size) __NE___
+    Bytes  BrotliRStream::ReadSeq (OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
         ASSERT_Eq( _position, _stream->Position() );
@@ -109,7 +109,7 @@ namespace
             usize           available_in    = 0;
             ubyte const*    next_in         = null;
 
-            result = BrotliDecoderDecompressStream( static_cast<BrotliDecoderState *>(_instance), INOUT &available_in, INOUT &next_in, 
+            result = BrotliDecoderDecompressStream( static_cast<BrotliDecoderState *>(_instance), INOUT &available_in, INOUT &next_in,
                                                     INOUT &available_out, INOUT &next_out, null );
 
             written += (size - available_out);
@@ -130,7 +130,7 @@ namespace
 
             _position += available_in;
 
-            result = BrotliDecoderDecompressStream( static_cast<BrotliDecoderState *>(_instance), INOUT &available_in, INOUT &next_in, 
+            result = BrotliDecoderDecompressStream( static_cast<BrotliDecoderState *>(_instance), INOUT &available_in, INOUT &next_in,
                                                     INOUT &available_out, INOUT &next_out, null );
 
             written += ((size - written) - available_out);
@@ -235,7 +235,7 @@ namespace
     WriteSeq
 =================================================
 */
-    Bytes   BrotliWStream::WriteSeq (const void *buffer, Bytes size) __NE___
+    Bytes   BrotliWStream::WriteSeq (const void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
         ASSERT( not BrotliEncoderIsFinished( static_cast<BrotliEncoderState *>(_instance) ));
diff --git a/AE/engine/src/base/DataSource/BrotliStream.h b/AE/engine/src/base/DataSource/BrotliStream.h
index dbf8c970..6c7eefc4 100644
--- a/AE/engine/src/base/DataSource/BrotliStream.h
+++ b/AE/engine/src/base/DataSource/BrotliStream.h
@@ -39,7 +39,7 @@ namespace AE::Base
         ESourceType GetSourceType ()                                        C_NE_OV { return ESourceType::SequentialAccess | ESourceType::ReadAccess; }
 
         bool        SeekFwd (Bytes offset)                                  __NE_OV;
-        Bytes       ReadSeq (OUT void *buffer, Bytes size)                  __NE_OV;
+        Bytes       ReadSeq (OUT void* buffer, Bytes size)                  __NE_OV;
     };
 
 
@@ -92,7 +92,7 @@ namespace AE::Base
         bool        SeekFwd (Bytes)                                         __NE_OV { return false; }
         void        Flush ()                                                __NE_OV { _Flush(); }
 
-        Bytes       WriteSeq (const void *buffer, Bytes size)               __NE_OV;
+        Bytes       WriteSeq (const void* buffer, Bytes size)               __NE_OV;
 
     private:
         bool        _Flush ()                                               __NE___;
diff --git a/AE/engine/src/base/DataSource/BufferedStream.cpp b/AE/engine/src/base/DataSource/BufferedStream.cpp
index 56e4995a..4f3b2eb4 100644
--- a/AE/engine/src/base/DataSource/BufferedStream.cpp
+++ b/AE/engine/src/base/DataSource/BufferedStream.cpp
@@ -17,7 +17,7 @@ namespace AE::Base
     {
         if ( not _stream ) return;
 
-        CATCH( _data.reserve( usize(bufferSize) ));
+        NOTHROW( _data.reserve( usize(bufferSize) ));
 
         if ( IsOpen() )
             _ReadNext();
@@ -119,7 +119,7 @@ namespace AE::Base
     ReadSeq
 =================================================
 */
-    Bytes  BufferedRStream::ReadSeq (OUT void *buffer, const Bytes size) __NE___
+    Bytes  BufferedRStream::ReadSeq (OUT void* buffer, const Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
@@ -189,7 +189,7 @@ namespace AE::Base
     BufferedWStream::BufferedWStream (RC<WStream> stream, Bytes bufferSize) __NE___ :
         _stream{ RVRef(stream) }
     {
-        CATCH( _data.resize( usize(bufferSize) ));
+        NOTHROW( _data.resize( usize(bufferSize) ));
     }
 
 /*
@@ -213,17 +213,6 @@ namespace AE::Base
         return _stream->Position() + _pos;
     }
 
-/*
-=================================================
-    Reserve
-=================================================
-*/
-    Bytes  BufferedWStream::Reserve (Bytes) __NE___
-    {
-        // TODO
-        return 0_b;
-    }
-
 /*
 =================================================
     SeekFwd
@@ -258,7 +247,7 @@ namespace AE::Base
     WriteSeq
 =================================================
 */
-    Bytes  BufferedWStream::WriteSeq (const void *buffer, const Bytes size) __NE___
+    Bytes  BufferedWStream::WriteSeq (const void* buffer, const Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
diff --git a/AE/engine/src/base/DataSource/BufferedStream.h b/AE/engine/src/base/DataSource/BufferedStream.h
index 0a63e2cc..2664dbcd 100644
--- a/AE/engine/src/base/DataSource/BufferedStream.h
+++ b/AE/engine/src/base/DataSource/BufferedStream.h
@@ -39,7 +39,7 @@ namespace AE::Base
         ESourceType GetSourceType ()                                            C_NE_OV;
 
         bool    SeekFwd (Bytes offset)                                          __NE_OV;
-        Bytes   ReadSeq (OUT void *buffer, Bytes size)                          __NE_OV;
+        Bytes   ReadSeq (OUT void* buffer, Bytes size)                          __NE_OV;
 
         void    UpdateFastStream (OUT const void* &begin, OUT const void* &end) __NE_OV;
         void    EndFastStream (const void* ptr)                                 __NE_OV;
@@ -74,10 +74,8 @@ namespace AE::Base
         Bytes       Position ()                                                 C_NE_OV;
         ESourceType GetSourceType ()                                            C_NE_OV { return ESourceType::Buffered | ESourceType::SequentialAccess | ESourceType::WriteAccess; }
 
-        Bytes   Reserve (Bytes additionalSize)                                  __NE_OV;
-
         bool    SeekFwd (Bytes offset)                                          __NE_OV;
-        Bytes   WriteSeq (const void *buffer, Bytes size)                       __NE_OV;
+        Bytes   WriteSeq (const void* buffer, Bytes size)                       __NE_OV;
 
         void    Flush ()                                                        __NE_OV;
 
diff --git a/AE/engine/src/base/DataSource/DataSource.cpp b/AE/engine/src/base/DataSource/DataSource.cpp
index fc045b93..ab836a50 100644
--- a/AE/engine/src/base/DataSource/DataSource.cpp
+++ b/AE/engine/src/base/DataSource/DataSource.cpp
@@ -61,7 +61,7 @@ namespace AE::Base
         CHECK_ERR( dstStream.IsOpen() and srcDS.IsOpen() );
         CHECK_ERR( buffer.size > 0 and buffer.ptr != null );
 
-        const Bytes align   = srcDS.OffsetAlign();
+        const Bytes align   = 1_b; //srcDS.OffsetAlign();
         Bytes       copied;
         Bytes       offset;
 
diff --git a/AE/engine/src/base/DataSource/DataSource.h b/AE/engine/src/base/DataSource/DataSource.h
index 48230e92..e78f4702 100644
--- a/AE/engine/src/base/DataSource/DataSource.h
+++ b/AE/engine/src/base/DataSource/DataSource.h
@@ -2,6 +2,13 @@
 /*
     Thread safe:    optional
     Exceptions:     no
+
+    Asynchronous DataSource defined in 'threading' module:
+      [AsyncDataSource](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/threading/DataSource/AsyncDataSource.h).
+
+    Network DataSource defined in 'VFS' module:
+      [NetworkStorageClient](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/vfs/Network/NetworkStorageClient.h)
+      [NetworkStorageServer](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/vfs/Network/NetworkStorageServer.h)
 */
 
 #pragma once
@@ -9,6 +16,7 @@
 #include "base/Math/Bytes.h"
 #include "base/Utils/RefCounter.h"
 #include "base/Containers/ArrayView.h"
+#include "base/Memory/MemChunkList.h"
 
 namespace AE::Base
 {
@@ -40,13 +48,14 @@ namespace AE::Base
             FixedSize           = 1 << 4,       // total size is known, not supported for compressed stream
             ReadAccess          = 1 << 5,
             WriteAccess         = 1 << 6,
-            Async               = 1 << 7,
+            Async               = 1 << 7,       // must be 'ThreadSafe' too
+            DeferredOpen        = 1 << 8,       // async file can be opened even if it not exists, but read/write request will fail
         };
 
 
     // methods
     protected:
-        IDataSource () __NE___ {}
+        IDataSource ()                                  __NE___ {}
 
     public:
         IDataSource (const IDataSource &)               = delete;
@@ -76,35 +85,44 @@ namespace AE::Base
     {
     // interface
     public:
-            ESourceType     GetSourceType ()                                                            C_NE_OV;
+            ESourceType     GetSourceType ()                                        C_NE_OV;
+
+
+        // Returns file size.
+        // If 'GetSourceType()' doesn't returns 'FixedSize'
+        // size may be unknown and 'UMax' will be returned.
+        //
+        ND_ virtual Bytes   Size ()                                                 C_NE___ = 0;
 
-        ND_ virtual Bytes   OffsetAlign ()                                                              C_NE___ { return 1_b; }
-        ND_ virtual Bytes   Size ()                                                                     C_NE___ = 0;
 
-        // returns size of readn data
-        ND_ virtual Bytes   ReadBlock (Bytes offset, OUT void *buffer, Bytes size)                      __NE___ = 0;
+        // Read file from 'pos' to 'pos + size' and write result to 'buffer'.
+        // Returns size of readn data or zero on error or on end of file.
+        //
+        ND_ virtual Bytes   ReadBlock (Bytes pos, OUT void* buffer, Bytes size)     __NE___ = 0;
 
 
     // methods
     public:
-        RDataSource ()                                                                                  __NE___ {}
+        RDataSource ()                                                              __NE___ {}
 
-        ND_ bool  Read (Bytes offset, OUT void *buffer, Bytes size)                                     __NE___;
+        ND_ bool  Read (Bytes pos, OUT void* buffer, Bytes size)                    __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes offset, usize length, OUT BasicString<T,A> &str)  __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, usize length, OUT BasicString<T,A> &str)         __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes offset, Bytes size, OUT BasicString<T,A> &str)    __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, Bytes size, OUT BasicString<T,A> &str)           __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes offset, usize count, OUT Array<T,A> &arr)         __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, usize count, OUT Array<T,A> &arr)                __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes offset, Bytes size, OUT Array<T,A> &arr)          __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, Bytes size, OUT Array<T,A> &arr)                 __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes offset, OUT T &data)                              __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, OUT T &data)                                     __NE___;
+
+        ND_ bool  Read (Bytes pos, Bytes size, OUT MemChunkList &mem)               __NE___;
     };
 
 
@@ -117,35 +135,44 @@ namespace AE::Base
     {
     // interface
     public:
-            ESourceType     GetSourceType ()                                                C_NE_OV { return ESourceType::RandomAccess | ESourceType::WriteAccess; }
+            ESourceType     GetSourceType ()                                        C_NE_OV { return ESourceType::RandomAccess | ESourceType::WriteAccess; }
+
+        ND_ virtual Bytes   Capacity ()                                             C_NE___ { DBG_WARNING( "Capacity() is not supported" );  return 0_b; }
+
+        ND_ virtual Bytes   Reserve (Bytes capacity)                                __NE___ { DBG_WARNING( "Reserve() is not supported" );  Unused( capacity );  return 0_b; }
 
-        ND_ virtual Bytes   OffsetAlign ()                                                  C_NE___ { return 1_b; }
-        ND_ virtual Bytes   Capacity ()                                                     C_NE___ = 0;
-        ND_ virtual Bytes   Reserve (Bytes capacity)                                        __NE___ = 0;
 
-        // returns size of written data
-        ND_ virtual Bytes   WriteBlock (Bytes offset, const void *buffer, Bytes size)       __NE___ = 0;
+        // Write 'buffer' to a file from 'pos' to 'pos + size'.
+        // Returns size of written data or zero on error.
+        //
+        ND_ virtual Bytes   WriteBlock (Bytes pos, const void* buffer, Bytes size)  __NE___ = 0;
 
-            virtual void    Flush ()                                                        __NE___ = 0;
+
+        // Flush internal cache.
+        // Will block until pending data is not completely written to the destination file.
+        //
+            virtual void    Flush ()                                                __NE___ = 0;
 
 
     // methods
     public:
-        WDataSource ()                                                                      __NE___ {}
+        WDataSource ()                                                              __NE___ {}
+
+        ND_ bool  Write (Bytes pos, const void* buffer, Bytes size)                 __NE___;
 
-        ND_ bool  Write (Bytes offset, const void *buffer, Bytes size)                      __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, ArrayView<T> arr)                               __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (Bytes offset, ArrayView<T> arr)            __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, const BasicString<T,A> str)                     __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (Bytes offset, const BasicString<T,A> str)  __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, BasicStringView<T> str)                         __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (Bytes offset, BasicStringView<T> str)      __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, const T &data)                                  __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (Bytes offset, const T &data)               __NE___;
+        ND_ bool  Write (Bytes pos, const MemChunkList &mem)                        __NE___;
     };
 
 
@@ -160,7 +187,8 @@ namespace AE::Base
     public:
         struct CmpResult
         {
-            Bytes   processed;
+            Bytes   processed;          // 'Compare()': multiple of block size.
+                                        // 'CompareStrict()': exact position to the first non equal byte.
             slong   diff        = 0;    // 0 if equal
 
             constexpr CmpResult ()                              __NE___ {}
@@ -227,55 +255,78 @@ namespace AE::Base
     Read
 =================================================
 */
-    inline bool  RDataSource::Read (Bytes offset, OUT void *buffer, Bytes size) __NE___
+    inline bool  RDataSource::Read (Bytes pos, OUT void* buffer, Bytes size) __NE___
     {
-        return ReadBlock( offset, buffer, size ) == size;
+        return ReadBlock( pos, buffer, size ) == size;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RDataSource::Read (Bytes offset, usize length, OUT BasicString<T,A> &str) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RDataSource::Read (Bytes pos, usize length, OUT BasicString<T,A> &str) __NE___
     {
-        CATCH_ERR( str.resize( length ));
+        NOTHROW_ERR( str.resize( length ));
 
-        Bytes   expected_size   { sizeof(T) * length };
-        Bytes   current_size    = ReadBlock( offset, OUT str.data(), expected_size );
+        const Bytes     expected_size   { sizeof(T) * length };
+        const Bytes     current_size    = ReadBlock( pos, OUT str.data(), expected_size );
 
-        CATCH_ERR( str.resize( usize(current_size / sizeof(T)) ));
+        NOTHROW_ERR( str.resize( usize(current_size / sizeof(T)) ));
 
         return str.length() == length;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RDataSource::Read (Bytes offset, Bytes size, OUT BasicString<T,A> &str) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RDataSource::Read (Bytes pos, Bytes size, OUT BasicString<T,A> &str) __NE___
     {
         ASSERT( IsMultipleOf( size, sizeof(T) ));
-        return Read( offset, usize(size) / sizeof(T), OUT str );
+        return Read( pos, usize(size) / sizeof(T), OUT str );
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RDataSource::Read (Bytes offset, usize count, OUT Array<T,A> &arr) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RDataSource::Read (Bytes pos, usize count, OUT Array<T,A> &arr) __NE___
     {
-        CATCH_ERR( arr.resize( count ));
+        NOTHROW_ERR( arr.resize( count ));
 
-        Bytes   expected_size   { sizeof(arr[0]) * arr.size() };
-        Bytes   current_size    = ReadBlock( offset, OUT arr.data(), expected_size );
+        const Bytes     expected_size   { sizeof(arr[0]) * arr.size() };
+        const Bytes     current_size    = ReadBlock( pos, OUT arr.data(), expected_size );
 
-        CATCH_ERR( arr.resize( usize(current_size / sizeof(arr[0])) ));
+        NOTHROW_ERR( arr.resize( usize(current_size / sizeof(arr[0])) ));
 
         return arr.size() == count;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RDataSource::Read (Bytes offset, Bytes size, OUT Array<T,A> &arr) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RDataSource::Read (Bytes pos, Bytes size, OUT Array<T,A> &arr) __NE___
     {
         ASSERT( IsMultipleOf( size, sizeof(T) ));
-        return Read( offset, usize(size) / sizeof(T), OUT arr );
+        return Read( pos, usize(size) / sizeof(T), OUT arr );
+    }
+
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RDataSource::Read (Bytes pos, OUT T &data) __NE___
+    {
+        return ReadBlock( pos, OUT AddressOf(data), Sizeof(data) ) == Sizeof(data);
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  RDataSource::Read (Bytes offset, OUT T &data) __NE___
+    inline bool  RDataSource::Read (Bytes pos, Bytes dataSize, OUT MemChunkList &mem) __NE___
     {
-        return ReadBlock( offset, OUT AddressOf(data), Sizeof(data) ) == Sizeof(data);
+        const Bytes     chunk_size  = mem.ChunkDataSize();
+        auto*           chunk       = mem.First();
+
+        if_unlikely( (chunk == null) | (dataSize == 0) )
+            return true;
+
+        ASSERT( dataSize <= mem.Capacity() );
+
+        bool    ok = true;
+        for (; (chunk != null) & ok;)
+        {
+            Bytes   size = Min( dataSize, chunk_size );
+            ok = (ReadBlock( pos, OUT chunk->Data(), size ) == size);
+
+            chunk       = chunk->next;
+            pos         += size;
+            dataSize    -= size;
+        }
+        return ok;
     }
 //-----------------------------------------------------------------------------
 
@@ -286,43 +337,66 @@ namespace AE::Base
     Write
 =================================================
 */
-    inline bool  WDataSource::Write (Bytes offset, const void *buffer, Bytes size) __NE___
+    inline bool  WDataSource::Write (Bytes pos, const void* buffer, Bytes size) __NE___
     {
-        return WriteBlock( offset, buffer, size ) == size;
+        return WriteBlock( pos, buffer, size ) == size;
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  WDataSource::Write (Bytes offset, ArrayView<T> arr) __NE___
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WDataSource::Write (Bytes pos, ArrayView<T> arr) __NE___
     {
         if_unlikely( arr.empty() )
             return true;
 
-        Bytes   size { sizeof(arr[0]) * arr.size() };
+        const Bytes     size { sizeof(arr[0]) * arr.size() };
 
-        return WriteBlock( offset, arr.data(), size ) == size;
+        return WriteBlock( pos, arr.data(), size ) == size;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  WDataSource::Write (Bytes offset, const BasicString<T,A> str) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WDataSource::Write (Bytes pos, const BasicString<T,A> str) __NE___
     {
-        return Write( offset, BasicStringView<T>{ str });
+        return Write( pos, BasicStringView<T>{ str });
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  WDataSource::Write (Bytes offset, BasicStringView<T> str) __NE___
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WDataSource::Write (Bytes pos, BasicStringView<T> str) __NE___
     {
         if_unlikely( str.empty() )
             return true;
 
-        Bytes   size { sizeof(str[0]) * str.length() };
+        const Bytes     size { sizeof(str[0]) * str.length() };
 
-        return WriteBlock( offset, str.data(), size ) == size;
+        return WriteBlock( pos, str.data(), size ) == size;
+    }
+
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WDataSource::Write (Bytes pos, const T &data) __NE___
+    {
+        return WriteBlock( pos, AddressOf(data), Sizeof(data) ) == Sizeof(data);
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  WDataSource::Write (Bytes offset, const T &data) __NE___
+    inline bool  WDataSource::Write (Bytes pos, const MemChunkList &mem) __NE___
     {
-        return WriteBlock( offset, AddressOf(data), Sizeof(data) ) == Sizeof(data);
+        const Bytes     chunk_size  = mem.ChunkDataSize();
+        Bytes           data_size   = mem.Size();
+        auto*           chunk       = mem.First();
+
+        if_unlikely( (chunk == null) | (data_size == 0) )
+            return true;
+
+        bool    ok = true;
+        for (; (chunk != null) & ok;)
+        {
+            Bytes   size = Min( data_size, chunk_size );
+            ok = (WriteBlock( pos, chunk->Data(), size ) == size);
+
+            chunk       = chunk->next;
+            pos         += size;
+            data_size   -= size;
+        }
+
+        return ok;
     }
 
 
diff --git a/AE/engine/src/base/DataSource/DataSourceAsStream.h b/AE/engine/src/base/DataSource/DataSourceAsStream.h
index 9e8e8acf..cbb829bc 100644
--- a/AE/engine/src/base/DataSource/DataSourceAsStream.h
+++ b/AE/engine/src/base/DataSource/DataSourceAsStream.h
@@ -27,20 +27,22 @@ namespace AE::Base
     // methods
     public:
         template <typename B>
-        explicit RDataSourceAsStream (B && dataSource) __Th___ :
+        explicit RDataSourceAsStream (B &&dataSource) __NE___ :
             _dataSource{ FwdArg<B>(dataSource) },
             _offset{ 0_b },
             _size{ _dataSource->Size() }
         {
+            CheckNothrow( IsNoExcept( T{ FwdArg<B>(dataSource) }));
             CHECK( AllBits( _dataSource->GetSourceType(), _TypeMask ));
         }
 
         template <typename B>
-        RDataSourceAsStream (B && dataSource, Bytes offset, Bytes size) __Th___ :
+        RDataSourceAsStream (B &&dataSource, Bytes offset, Bytes size) __NE___ :
             _dataSource{ FwdArg<B>(dataSource) },
             _offset{ Min( offset, _dataSource->Size() )},
             _size{ Min( size, _dataSource->Size() - _offset )}
         {
+            CheckNothrow( IsNoExcept( T{ FwdArg<B>(dataSource) }));
             CHECK( AllBits( _dataSource->GetSourceType(), _TypeMask ));
         }
 
@@ -53,7 +55,7 @@ namespace AE::Base
         bool        SeekSet (Bytes pos)                     __NE_OV;
         bool        SeekFwd (Bytes offset)                  __NE_OV;
 
-        Bytes       ReadSeq (OUT void *buffer, Bytes size) __NE_OV;
+        Bytes       ReadSeq (OUT void* buffer, Bytes size)  __NE_OV;
     };
 //-----------------------------------------------------------------------------
 
@@ -112,7 +114,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    Bytes  RDataSourceAsStream<T>::ReadSeq (OUT void *buffer, Bytes size) __NE___
+    Bytes  RDataSourceAsStream<T>::ReadSeq (OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
diff --git a/AE/engine/src/base/DataSource/DataSourceRange.h b/AE/engine/src/base/DataSource/DataSourceRange.h
index 944cf4ce..4a533243 100644
--- a/AE/engine/src/base/DataSource/DataSourceRange.h
+++ b/AE/engine/src/base/DataSource/DataSourceRange.h
@@ -26,7 +26,7 @@ namespace AE::Base
     // methods
     public:
         template <typename B>
-        explicit RDataSourceRange (B && dataSource) __NE___ :
+        explicit RDataSourceRange (B &&dataSource) __NE___ :
             _dataSource{ FwdArg<B>(dataSource) },
             _offset{ 0_b },
             _size{ _dataSource ? _dataSource->Size() : 0_b }
@@ -35,7 +35,7 @@ namespace AE::Base
         }
 
         template <typename B>
-        RDataSourceRange (B && dataSource, Bytes offset, Bytes size) __NE___ :
+        RDataSourceRange (B &&dataSource, Bytes offset, Bytes size) __NE___ :
             _dataSource{ FwdArg<B>(dataSource) },
             _offset{ Min( offset, _dataSource ? _dataSource->Size() : 0_b )},
             _size{ Min( size, _dataSource ? (_dataSource->Size() - _offset) : 0_b )}
@@ -45,11 +45,11 @@ namespace AE::Base
 
 
         // RDataSource //
-        bool        IsOpen ()           C_NE_OV     { return _dataSource and _dataSource->IsOpen(); }
-        ESourceType GetSourceType ()    C_NE_OV;
-        Bytes       Size ()             C_NE_OV     { return _size; }
+        bool        IsOpen ()                           C_NE_OV { return _dataSource and _dataSource->IsOpen(); }
+        ESourceType GetSourceType ()                    C_NE_OV;
+        Bytes       Size ()                             C_NE_OV { return _size; }
 
-        Bytes       ReadBlock (Bytes offset, OUT void *buffer, Bytes size) __NE_OV;
+        Bytes       ReadBlock (Bytes, OUT void*, Bytes) __NE_OV;
     };
 
 
@@ -73,7 +73,7 @@ namespace AE::Base
     // methods
     public:
         template <typename B>
-        explicit WDataSourceRange (B && dataSource) __Th___ :
+        explicit WDataSourceRange (B &&dataSource) __Th___ :
             _dataSource{ FwdArg<B>(dataSource) },   // throw
             _offset{ 0_b },
             _capacity{ _dataSource ? _dataSource->Capacity() : 0_b }
@@ -82,7 +82,7 @@ namespace AE::Base
         }
 
         template <typename B>
-        WDataSourceRange (B && dataSource, Bytes offset, Bytes capacity) __Th___ :
+        WDataSourceRange (B &&dataSource, Bytes offset, Bytes capacity) __Th___ :
             _dataSource{ FwdArg<B>(dataSource) },   // throw
             _offset{ Min( offset, _dataSource ? _dataSource->Capacity() : 0_b )},
             _capacity{ Min( capacity, _dataSource ? (_dataSource->Capacity() - _offset) : 0_b )}
@@ -92,14 +92,13 @@ namespace AE::Base
 
 
         // WDataSource //
-        bool        IsOpen ()                   C_NE_OV     { return _dataSource and _dataSource->IsOpen(); }
-        ESourceType GetSourceType ()            C_NE_OV;
-        Bytes       Capacity ()                 C_NE_OV     { return _capacity; }
+        bool        IsOpen ()                               C_NE_OV { return _dataSource and _dataSource->IsOpen(); }
+        ESourceType GetSourceType ()                        C_NE_OV;
+        Bytes       Capacity ()                             C_NE_OV { return _capacity; }
 
-        Bytes       Reserve (Bytes capacity)    __NE_OV;
-        Bytes       WriteBlock (Bytes, const void *, Bytes) __NE_OV;
+        Bytes       WriteBlock (Bytes, const void*, Bytes)  __NE_OV;
 
-        void        Flush ()                    __NE_OV     { ASSERT( IsOpen() );  return _dataSource->Flush(); }
+        void        Flush ()                                __NE_OV { ASSERT( IsOpen() );  return _dataSource->Flush(); }
     };
 //-----------------------------------------------------------------------------
 
@@ -125,13 +124,13 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    Bytes  RDataSourceRange<T>::ReadBlock (Bytes offset, OUT void *buffer, Bytes size) __NE___
+    Bytes  RDataSourceRange<T>::ReadBlock (Bytes pos, OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
-        size = Min( offset + size, _size ) - offset;
+        size = Min( pos + size, _size ) - pos;
 
-        return _dataSource->ReadBlock( _offset + offset, OUT buffer, size );
+        return _dataSource->ReadBlock( _offset + pos, OUT buffer, size );
     }
 //-----------------------------------------------------------------------------
 
@@ -151,28 +150,16 @@ namespace AE::Base
                 (_dataSource->GetSourceType() & ESourceType::ThreadSafe);
     }
 
-/*
-=================================================
-    Reserve
-=================================================
-*/
-    template <typename T>
-    Bytes  WDataSourceRange<T>::Reserve (Bytes) __NE___
-    {
-        // TODO
-        return 0_b;
-    }
-
 /*
 =================================================
     WriteBlock
 =================================================
 */
     template <typename T>
-    Bytes  WDataSourceRange<T>::WriteBlock (Bytes offset, const void *buffer, Bytes size) __NE___
+    Bytes  WDataSourceRange<T>::WriteBlock (Bytes pos, const void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
-        return _dataSource->WriteBlock( _offset + offset, buffer, size );
+        return _dataSource->WriteBlock( _offset + pos, buffer, size );
     }
 
 
diff --git a/AE/engine/src/base/DataSource/FastStream.h b/AE/engine/src/base/DataSource/FastStream.h
index 4425d6c7..a929e577 100644
--- a/AE/engine/src/base/DataSource/FastStream.h
+++ b/AE/engine/src/base/DataSource/FastStream.h
@@ -26,20 +26,17 @@ namespace AE::Base
     public:
         FastRStream (FastRStream &&)                                    __NE___ = default;
 
+        explicit FastRStream (const void* ptr, const void* end)         __NE___ : _ptr{ptr}, _end{end} { ASSERT( _ptr <= _end ); }
         explicit FastRStream (RC<RStream> stream)                       __NE___;
 
         ~FastRStream ()                                                 __NE___;
 
-        ND_ bool    Empty ()                                            C_NE___ { return _ptr == _end; }
-        ND_ Bytes   RemainingSize ()                                    C_NE___ { return Bytes{_end} - Bytes{_ptr}; }
-        ND_ Bytes   Position ()                                         C_NE___ { return _stream->GetFastStreamPosition( _ptr ); }
+        ND_ bool    Empty ()                                            C_NE___ { return _ptr >= _end; }
+        ND_ Bytes   RemainingSize ()                                    C_NE___ { ASSERT( _ptr <= _end );  return Bytes{_end} - Bytes{_ptr}; }
+        ND_ Bytes   Position ()                                         C_NE___;
 
         template <typename T>
-        ND_ forceinline bool  Read (OUT T& value)                       __NE___
-        {
-            return Read( OUT &value, SizeOf<T> );
-        }
-
+        ND_ forceinline bool  Read (OUT T& value)                       __NE___ { return Read( OUT &value, SizeOf<T> ); }
         ND_ forceinline bool  Read (OUT void* buffer, Bytes size)       __NE___;
     };
 
@@ -60,20 +57,17 @@ namespace AE::Base
     public:
         FastWStream (FastWStream &&)                                    __NE___ = default;
 
+        explicit FastWStream (void* ptr, const void* end)               __NE___ : _ptr{ptr}, _end{end} { ASSERT( _ptr <= _end ); }
         explicit FastWStream (RC<WStream> stream)                       __NE___;
 
         ~FastWStream ()                                                 __NE___;
 
-        ND_ bool    Empty ()                                            C_NE___ { return _ptr == _end; }
-        ND_ Bytes   RemainingSize ()                                    C_NE___ { return Bytes{_end} - Bytes{_ptr}; }
-        ND_ Bytes   Position ()                                         C_NE___ { return _stream->GetFastStreamPosition( _ptr ); }
+        ND_ bool    Empty ()                                            C_NE___ { return _ptr >= _end; }
+        ND_ Bytes   RemainingSize ()                                    C_NE___ { ASSERT( _ptr <= _end );  return Bytes{_end} - Bytes{_ptr}; }
+        ND_ Bytes   Position ()                                         C_NE___;
 
         template <typename T>
-        ND_ forceinline bool  Write (const T& value)                    __NE___
-        {
-            return Write( &value, SizeOf<T> );
-        }
-
+        ND_ forceinline bool  Write (const T& value)                    __NE___ { return Write( &value, SizeOf<T> ); }
         ND_ forceinline bool  Write (const void* buffer, Bytes size)    __NE___;
     };
 //-----------------------------------------------------------------------------
@@ -105,10 +99,25 @@ namespace AE::Base
 */
     inline FastRStream::~FastRStream () __NE___
     {
-        if ( (_stream != null) & (_ptr <= _end) )
+        if ( (_stream != null) & (not Empty()) )
             _stream->EndFastStream( _ptr );
     }
 
+/*
+=================================================
+    Position
+----
+    returns current position in stream
+=================================================
+*/
+    inline Bytes  FastRStream::Position () C_NE___
+    {
+        if_likely( _stream )
+            return _stream->GetFastStreamPosition( _ptr );
+        else
+            return UMax;  // error
+    }
+
 /*
 =================================================
     Read
@@ -131,10 +140,13 @@ namespace AE::Base
             buffer += part_size;
             size   -= part_size;
 
-            _stream->UpdateFastStream( OUT _ptr, OUT _end );
-            CHECK( _ptr != null );
+            if_likely( _stream )
+            {
+                _stream->UpdateFastStream( OUT _ptr, OUT _end );
+                CHECK( _ptr != null );
+            }
 
-            if_unlikely( _ptr == _end )
+            if_unlikely( Empty() )
                 return false; // stream is completely read
         }
 
@@ -169,10 +181,25 @@ namespace AE::Base
 */
     inline FastWStream::~FastWStream () __NE___
     {
-        if ( (_stream != null) & (_ptr <= _end) )
+        if ( (_stream != null) & (not Empty()) )
             _stream->EndFastStream( _ptr );
     }
 
+/*
+=================================================
+    Position
+----
+    returns current position in stream
+=================================================
+*/
+    inline Bytes  FastWStream::Position () C_NE___
+    {
+        if_likely( _stream )
+            return _stream->GetFastStreamPosition( _ptr );
+        else
+            return UMax;  // error
+    }
+
 /*
 =================================================
     Write
@@ -195,10 +222,13 @@ namespace AE::Base
             buffer += part_size;
             size   -= part_size;
 
-            _stream->UpdateFastStream( OUT _ptr, OUT _end );
-            CHECK( _ptr != null );
+            if_likely( _stream )
+            {
+                _stream->UpdateFastStream( OUT _ptr, OUT _end );
+                CHECK( _ptr != null );
+            }
 
-            if_unlikely( _ptr == _end )
+            if_unlikely( Empty() )
                 return false; // stream is completely read
         }
 
diff --git a/AE/engine/src/base/DataSource/FileStream.cpp b/AE/engine/src/base/DataSource/FileStream.cpp
index 22876723..18c61faf 100644
--- a/AE/engine/src/base/DataSource/FileStream.cpp
+++ b/AE/engine/src/base/DataSource/FileStream.cpp
@@ -30,7 +30,7 @@ namespace
     OpenFile
 =================================================
 */
-    ND_ static FILE*  OpenFile (const char *filename, const char* access) __NE___
+    ND_ static FILE*  OpenFile (const char* filename, const char* access) __NE___
     {
         FILE*   file = null;
         fopen_s( OUT &file, filename, access );
@@ -38,7 +38,7 @@ namespace
     }
 
 #ifdef AE_PLATFORM_WINDOWS
-    ND_ static FILE*  OpenFile (const wchar_t *filename, const wchar_t* access) __NE___
+    ND_ static FILE*  OpenFile (const wchar_t* filename, const wchar_t* access) __NE___
     {
         FILE*   file = null;
         _wfopen_s( OUT &file, filename, access );
@@ -216,7 +216,7 @@ DEBUG_ONLY(
     ReadSeq
 =================================================
 */
-    Bytes  FileRStream::ReadSeq (OUT void *buffer, Bytes size) __NE___
+    Bytes  FileRStream::ReadSeq (OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
@@ -330,7 +330,7 @@ DEBUG_ONLY(
     WriteSeq
 =================================================
 */
-    Bytes  FileWStream::WriteSeq (const void *buffer, Bytes size) __NE___
+    Bytes  FileWStream::WriteSeq (const void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
@@ -430,19 +430,19 @@ DEBUG_ONLY(
     ReadBlock
 =================================================
 */
-    Bytes  FileRDataSource::ReadBlock (Bytes offset, OUT void *buffer, Bytes size) __NE___
+    Bytes  FileRDataSource::ReadBlock (Bytes pos, OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
-        if ( _lastPos != offset )
+        if ( _lastPos != pos )
         {
-            if_unlikely( fseek( _file, slong(offset), SEEK_SET ) != 0 )
+            if_unlikely( fseek( _file, slong(pos), SEEK_SET ) != 0 )
                 return 0_b;     // error
         }
 
         Bytes   readn{ fread( buffer, 1, usize(size), _file )};
 
-        _lastPos = offset + readn;
+        _lastPos = pos + readn;
         ASSERT_Eq( slong(_lastPos), GetPositionInFile( _file ));
 
         return readn;
@@ -540,19 +540,19 @@ DEBUG_ONLY(
     WriteBlock
 =================================================
 */
-    Bytes  FileWDataSource::WriteBlock (Bytes offset, const void *buffer, Bytes size) __NE___
+    Bytes  FileWDataSource::WriteBlock (const Bytes pos, const void* buffer, const Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
-        if ( _lastPos != offset )
+        if ( _lastPos != pos )
         {
-            if_unlikely( fseek( _file, slong(offset), SEEK_SET ) != 0 )
+            if_unlikely( fseek( _file, slong(pos), SEEK_SET ) != 0 )
                 return 0_b;     // error
         }
 
         Bytes   written{ fwrite( buffer, 1, usize(size), _file )};
 
-        _lastPos = offset + written;
+        _lastPos = pos + written;
         ASSERT_Eq( slong(_lastPos), GetPositionInFile( _file ));
 
         return written;
diff --git a/AE/engine/src/base/DataSource/FileStream.h b/AE/engine/src/base/DataSource/FileStream.h
index 7358bce3..d650e695 100644
--- a/AE/engine/src/base/DataSource/FileStream.h
+++ b/AE/engine/src/base/DataSource/FileStream.h
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
     TODO:
-        setbuf, setvbuf 
+        setbuf, setvbuf
 */
 
 #pragma once
@@ -57,7 +57,7 @@ namespace AE::Base
         bool        SeekSet (Bytes pos)         __NE_OV;    // require ESourceType::RandomAccess
         bool        SeekFwd (Bytes offset)      __NE_OV;
 
-        Bytes       ReadSeq (OUT void *, Bytes) __NE_OV;
+        Bytes       ReadSeq (OUT void*, Bytes)  __NE_OV;
 
         RC<RDataSource>  AsRDataSource ();
     };
@@ -115,9 +115,8 @@ namespace AE::Base
         ESourceType GetSourceType ()                                                C_NE_OV;
 
         bool        SeekFwd (Bytes offset)                                          __NE_OV;
-        Bytes       Reserve (Bytes)                                                 __NE_OV { return 0_b; }
 
-        Bytes       WriteSeq (const void *buffer, Bytes size)                       __NE_OV;
+        Bytes       WriteSeq (const void* buffer, Bytes size)                       __NE_OV;
         void        Flush ()                                                        __NE_OV;
     };
 //-----------------------------------------------------------------------------
@@ -166,7 +165,7 @@ namespace AE::Base
         ESourceType GetSourceType ()                                                C_NE_OV;
         Bytes       Size ()                                                         C_NE_OV { return _fileSize; }
 
-        Bytes       ReadBlock (Bytes offset, OUT void *buffer, Bytes size)          __NE_OV;
+        Bytes       ReadBlock (Bytes pos, OUT void* buffer, Bytes size)             __NE_OV;
     };
 
 
@@ -217,9 +216,7 @@ namespace AE::Base
         ESourceType GetSourceType ()                                                    C_NE_OV;
         Bytes       Capacity ()                                                         C_NE_OV;
 
-        Bytes       Reserve (Bytes)                                                     __NE_OV { return UMax; }
-
-        Bytes       WriteBlock (Bytes offset, const void *buffer, Bytes size)           __NE_OV;
+        Bytes       WriteBlock (Bytes pos, const void* buffer, Bytes size)              __NE_OV;
         void        Flush ()                                                            __NE_OV;
     };
 
diff --git a/AE/engine/src/base/DataSource/MemDataSource.cpp b/AE/engine/src/base/DataSource/MemDataSource.cpp
index 4a235958..9bae702a 100644
--- a/AE/engine/src/base/DataSource/MemDataSource.cpp
+++ b/AE/engine/src/base/DataSource/MemDataSource.cpp
@@ -49,11 +49,11 @@ namespace AE::Base
     ReadBlock
 =================================================
 */
-    Bytes  MemRefRDataSource::ReadBlock (Bytes offset, OUT void *buffer, Bytes size) __NE___
+    Bytes  MemRefRDataSource::ReadBlock (const Bytes pos, OUT void* buffer, Bytes size) __NE___
     {
-        size = Min( offset + size, _size ) - offset;
+        size = Min( pos + size, _size ) - pos;
 
-        MemCopy( OUT buffer, _dataPtr + offset, size );
+        MemCopy( OUT buffer, _dataPtr + pos, size );
 
         return size;
     }
@@ -73,7 +73,7 @@ namespace AE::Base
 
     MemRDataSource::MemRDataSource (const void* ptr, Bytes size) __NE___
     {
-        CATCH( _data.assign( Cast<ubyte>(ptr), Cast<ubyte>(ptr + size) ));
+        NOTHROW( _data.assign( Cast<ubyte>(ptr), Cast<ubyte>(ptr + size) ));
 
         _Set( _data.data(), ArraySizeOf(_data) );
     }
@@ -133,7 +133,7 @@ namespace AE::Base
 */
     MemWDataSource::MemWDataSource () __NE___
     {
-        CATCH( _data.reserve( usize(DefaultAllocationSize) ));
+        NOTHROW( _data.reserve( usize(DefaultAllocationSize) ));
     }
 
     MemWDataSource::MemWDataSource (Array<ubyte> data, Bytes maxSize) __NE___ :
@@ -144,7 +144,7 @@ namespace AE::Base
     MemWDataSource::MemWDataSource (Bytes bufferSize, Bytes maxSize) __NE___ :
         _maxSize{ maxSize }
     {
-        CATCH( _data.reserve( usize(bufferSize) ));
+        NOTHROW( _data.reserve( usize(bufferSize) ));
     }
 
 /*
@@ -165,7 +165,7 @@ namespace AE::Base
 */
     Bytes  MemWDataSource::Reserve (Bytes capacity) __NE___
     {
-        CATCH( _data.reserve( Min( Max( _data.capacity(), usize(capacity) ), usize(_maxSize) )));
+        NOTHROW( _data.reserve( Min( Max( _data.capacity(), usize(capacity) ), usize(_maxSize) )));
 
         return Bytes{ _data.capacity() };
     }
@@ -175,13 +175,13 @@ namespace AE::Base
     WriteBlock
 =================================================
 */
-    Bytes  MemWDataSource::WriteBlock (Bytes offset, const void *buffer, Bytes size) __NE___
+    Bytes  MemWDataSource::WriteBlock (const Bytes pos, const void* buffer, Bytes size) __NE___
     {
-        size = Min( offset + size, _maxSize ) - offset;
+        size = Min( pos + size, _maxSize ) - pos;
 
-        CATCH_ERR( _data.resize( Max( _data.size(), usize(offset + size) )));
+        NOTHROW_ERR( _data.resize( Max( _data.size(), usize(pos + size) )));
 
-        MemCopy( OUT _data.data() + offset, buffer, size );
+        MemCopy( OUT _data.data() + pos, buffer, size );
         return size;
     }
 
diff --git a/AE/engine/src/base/DataSource/MemDataSource.h b/AE/engine/src/base/DataSource/MemDataSource.h
index 3bc1d5f7..0afaea27 100644
--- a/AE/engine/src/base/DataSource/MemDataSource.h
+++ b/AE/engine/src/base/DataSource/MemDataSource.h
@@ -36,7 +36,7 @@ namespace AE::Base
         ESourceType GetSourceType ()                                            C_NE_OF;
         Bytes       Size ()                                                     C_NE_OF { return _size; }
 
-        Bytes       ReadBlock (Bytes offset, OUT void *buffer, Bytes size)      __NE_OF;
+        Bytes       ReadBlock (Bytes pos, OUT void* buffer, Bytes size)         __NE_OF;
 
 
         ND_ ArrayView<ubyte>    GetData ()                                      C_NE___ { return ArrayView<ubyte>{ Cast<ubyte>(_dataPtr), usize(_size) }; }
@@ -103,7 +103,7 @@ namespace AE::Base
         Bytes       Capacity ()                                                 C_NE_OV { return Bytes{_data.size()}; }
 
         Bytes       Reserve (Bytes capacity)                                    __NE_OV;
-        Bytes       WriteBlock (Bytes offset, const void *buffer, Bytes size)   __NE_OV;
+        Bytes       WriteBlock (Bytes pos, const void* buffer, Bytes size)      __NE_OV;
 
         void        Flush ()                                                    __NE_OV {}
 
diff --git a/AE/engine/src/base/DataSource/MemStream.cpp b/AE/engine/src/base/DataSource/MemStream.cpp
index 6715d531..1869c433 100644
--- a/AE/engine/src/base/DataSource/MemStream.cpp
+++ b/AE/engine/src/base/DataSource/MemStream.cpp
@@ -67,7 +67,7 @@ namespace AE::Base
     ReadSeq
 =================================================
 */
-    Bytes  MemRefRStream::ReadSeq (OUT void *buffer, Bytes size) __NE___
+    Bytes  MemRefRStream::ReadSeq (OUT void* buffer, Bytes size) __NE___
     {
         size = Min( size, _size - _pos );
 
@@ -132,7 +132,7 @@ namespace AE::Base
     RC<MemRefRStream>  MemRefRStream::ToSubStream (Bytes offset, Bytes size) C_Th___
     {
         CHECK_ERR( size + offset <= _size );
-        return MakeRC<MemRefRStream>( _dataPtr + offset, size );    // throw
+        return MakeRC<MemRefRStream>( _dataPtr + offset, size );
     }
 //-----------------------------------------------------------------------------
 
@@ -150,7 +150,7 @@ namespace AE::Base
 
     MemRStream::MemRStream (const void* ptr, Bytes size) __NE___
     {
-        CATCH( _data.assign( Cast<ubyte>(ptr), Cast<ubyte>(ptr + size) ));
+        NOTHROW( _data.assign( Cast<ubyte>(ptr), Cast<ubyte>(ptr + size) ));
 
         _Set( _data.data(), ArraySizeOf(_data) );
     }
@@ -215,12 +215,12 @@ namespace AE::Base
 */
     MemWStream::MemWStream () __NE___
     {
-        CATCH( _data.reserve( usize(DefaultAllocationSize) ));
+        NOTHROW( _data.reserve( usize(DefaultAllocationSize) ));
     }
 
     MemWStream::MemWStream (Bytes bufferSize) __NE___
     {
-        CATCH( _data.reserve( usize(bufferSize) ));
+        NOTHROW( _data.reserve( usize(bufferSize) ));
     }
 
 /*
@@ -255,7 +255,7 @@ namespace AE::Base
 */
     Bytes  MemWStream::Reserve (Bytes additionalSize) __NE___
     {
-        CATCH( _data.reserve( Max( _data.capacity(), usize(_pos + additionalSize) )));
+        NOTHROW( _data.reserve( Max( _data.capacity(), usize(_pos + additionalSize) )));
 
         return ArraySizeOf(_data) - _pos;
     }
@@ -265,9 +265,9 @@ namespace AE::Base
     WriteSeq
 =================================================
 */
-    Bytes  MemWStream::WriteSeq (const void *buffer, Bytes size) __NE___
+    Bytes  MemWStream::WriteSeq (const void* buffer, Bytes size) __NE___
     {
-        CATCH_ERR( _data.resize( Max( _data.size(), usize(_pos + size) )));
+        NOTHROW_ERR( _data.resize( Max( _data.size(), usize(_pos + size) )));
 
         MemCopy( OUT _data.data() + _pos, buffer, size );
 
diff --git a/AE/engine/src/base/DataSource/MemStream.h b/AE/engine/src/base/DataSource/MemStream.h
index 8cd743b5..62fa46a8 100644
--- a/AE/engine/src/base/DataSource/MemStream.h
+++ b/AE/engine/src/base/DataSource/MemStream.h
@@ -40,7 +40,7 @@ namespace AE::Base
         bool    SeekSet (Bytes pos)                                             __NE_OF;
         bool    SeekFwd (Bytes offset)                                          __NE_OF;
 
-        Bytes   ReadSeq (OUT void *buffer, Bytes size)                          __NE_OF;
+        Bytes   ReadSeq (OUT void* buffer, Bytes size)                          __NE_OF;
 
         void    UpdateFastStream (OUT const void* &begin, OUT const void* &end) __NE_OF;
         void    EndFastStream (const void* ptr)                                 __NE_OF;
@@ -113,7 +113,7 @@ namespace AE::Base
 
         bool        SeekFwd (Bytes offset)                                      __NE_OV;
         Bytes       Reserve (Bytes additionalSize)                              __NE_OV;
-        Bytes       WriteSeq (const void *, Bytes)                              __NE_OV;
+        Bytes       WriteSeq (const void*, Bytes)                               __NE_OV;
         void        Flush ()                                                    __NE_OV {}
 
         void        UpdateFastStream (OUT void* &begin, OUT const void* &end,
@@ -128,7 +128,7 @@ namespace AE::Base
 
         ND_ ArrayView<ubyte>    GetData ()                                      C_NE___ { return ArrayView<ubyte>{ _data.data(), usize(_pos) }; }
         ND_ Array<ubyte>        ReleaseData ()                                  __NE___;
-        ND_ RC<MemRefRStream>   ToRStream ()                                    C_Th___ { return MakeRC<MemRefRStream>( GetData() ); }
+        ND_ RC<MemRefRStream>   ToRStream ()                                    C_NE___ { return MakeRC<MemRefRStream>( GetData() ); }
     };
 
 
diff --git a/AE/engine/src/base/DataSource/Stream.h b/AE/engine/src/base/DataSource/Stream.h
index 0b64c0bf..7ff8047a 100644
--- a/AE/engine/src/base/DataSource/Stream.h
+++ b/AE/engine/src/base/DataSource/Stream.h
@@ -34,49 +34,52 @@ namespace AE::Base
 
     // interface
     public:
-        ND_ virtual PosAndSize  PositionAndSize ()                                              C_NE___ = 0;
+        ND_ virtual PosAndSize  PositionAndSize ()                                      C_NE___ = 0;
 
-            virtual bool        SeekFwd (Bytes offset)                                          __NE___ = 0;
+            virtual bool        SeekFwd (Bytes offset)                                  __NE___ = 0;
 
         // returns size of readn data
-        ND_ virtual Bytes       ReadSeq (OUT void *buffer, Bytes size)                          __NE___ = 0;
+        ND_ virtual Bytes       ReadSeq (OUT void* buffer, Bytes size)                  __NE___ = 0;
 
-            virtual bool        SeekSet (Bytes newPos)                                          __NE___;
+            virtual bool        SeekSet (Bytes newPos)                                  __NE___;
 
-            virtual void        UpdateFastStream (OUT const void* &begin, OUT const void* &end) __NE___;
-            virtual void        EndFastStream (const void* ptr)                                 __NE___;
-        ND_ virtual Bytes       GetFastStreamPosition (const void* ptr)                         __NE___;
+            virtual void        UpdateFastStream (OUT const void* &begin,
+                                                  OUT const void* &end)                 __NE___;
+            virtual void        EndFastStream (const void* ptr)                         __NE___;
+        ND_ virtual Bytes       GetFastStreamPosition (const void* ptr)                 __NE___;
 
 
     // methods
     public:
-        RStream ()                                                                              __NE___ {}
+        RStream ()                                                                      __NE___ {}
 
 
         // IDataSource //
-            ESourceType     GetSourceType ()                                                    C_NE_OV { return ESourceType::SequentialAccess | ESourceType::ReadAccess; }
+            ESourceType     GetSourceType ()                                            C_NE_OV { return ESourceType::SequentialAccess | ESourceType::ReadAccess; }
 
-        ND_ Bytes           Position ()                                                         C_NE___ { return PositionAndSize().pos; }
-        ND_ Bytes           Size ()                                                             C_NE___ { return PositionAndSize().size; }
-        ND_ Bytes           RemainingSize ()                                                    C_NE___ { auto tmp = PositionAndSize();  return tmp.Remaining(); }
+        ND_ Bytes           Position ()                                                 C_NE___ { return PositionAndSize().pos; }
+        ND_ Bytes           Size ()                                                     C_NE___ { return PositionAndSize().size; }
+        ND_ Bytes           RemainingSize ()                                            C_NE___ { auto tmp = PositionAndSize();  return tmp.Remaining(); }
 
 
-        ND_ bool  Read (OUT void *buffer, Bytes size)                                           __NE___;
+        ND_ bool  Read (OUT void* buffer, Bytes size)                                   __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (usize length, OUT BasicString<T,A> &str)        __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (usize length, OUT BasicString<T,A> &str)                        __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes size, OUT BasicString<T,A> &str)          __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes size, OUT BasicString<T,A> &str)                          __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (usize count, OUT Array<T,A> &arr)               __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (usize count, OUT Array<T,A> &arr)                               __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (Bytes size, OUT Array<T,A> &arr)                __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes size, OUT Array<T,A> &arr)                                __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Read (OUT T &data)                                    __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (OUT T &data)                                                    __NE___;
+
+        ND_ bool  Read (Bytes size, OUT MemChunkList &mem)                          __NE___;
     };
 
 
@@ -90,45 +93,47 @@ namespace AE::Base
     // interface
     public:
         // returns remaining size
-        ND_ virtual Bytes   Reserve (Bytes additionalSize)                                      __NE___ = 0;
+        ND_ virtual Bytes   Reserve (Bytes additionalSize)                              __NE___ { DBG_WARNING( "Reserve() is not supported" );  Unused( additionalSize );  return 0_b; }
 
-        ND_ virtual Bytes   Position ()                                                         C_NE___ = 0;    // same as 'Size()'
+        ND_ virtual Bytes   Position ()                                                 C_NE___ = 0;    // same as 'Size()'
 
-            virtual bool    SeekFwd (Bytes offset)                                              __NE___ = 0;
+            virtual bool    SeekFwd (Bytes offset)                                      __NE___ = 0;
 
         // returns size of written data
-        ND_ virtual Bytes   WriteSeq (const void *buffer, Bytes size)                           __NE___ = 0;
+        ND_ virtual Bytes   WriteSeq (const void* buffer, Bytes size)                   __NE___ = 0;
 
-            virtual void    Flush ()                                                            __NE___ = 0;
+            virtual void    Flush ()                                                    __NE___ = 0;
 
             virtual void    UpdateFastStream (OUT void* &begin, OUT const void* &end,
-                                              Bytes reserve = DefaultAllocationSize)            __NE___;
-            virtual void    EndFastStream (const void* ptr)                                     __NE___;
-        ND_ virtual Bytes   GetFastStreamPosition (const void* ptr)                             __NE___;
+                                              Bytes reserve = DefaultAllocationSize)    __NE___;
+            virtual void    EndFastStream (const void* ptr)                             __NE___;
+        ND_ virtual Bytes   GetFastStreamPosition (const void* ptr)                     __NE___;
 
 
     // methods
     public:
-        WStream ()                                                                              __NE___ {}
+        WStream ()                                                                      __NE___ {}
 
 
         // IDataSource //
-        ESourceType     GetSourceType ()                                                        C_NE_OV { return ESourceType::SequentialAccess | ESourceType::WriteAccess; }
+        ESourceType     GetSourceType ()                                                C_NE_OV { return ESourceType::SequentialAccess | ESourceType::WriteAccess; }
+
 
+        ND_ bool  Write (const void* buffer, Bytes size)                                __NE___;
 
-        ND_ bool  Write (const void *buffer, Bytes size)                                        __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (ArrayView<T> buf)                                              __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (ArrayView<T> buf)                              __NE___;
+        template <typename T, typename A, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (const BasicString<T,A> str)                                    __NE___;
 
-        template <typename T, typename A>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (const BasicString<T,A> str)                    __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (BasicStringView<T> str)                                        __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (BasicStringView<T> str)                        __NE___;
+        template <typename T, ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (const T &data)                                                 __NE___;
 
-        template <typename T>
-        ND_ EnableIf<IsTrivial<T>, bool>  Write (const T &data)                                 __NE___;
+        ND_ bool  Write (const MemChunkList &mem)                                       __NE___;
     };
 //-----------------------------------------------------------------------------
 
@@ -174,15 +179,15 @@ namespace AE::Base
     Read
 =================================================
 */
-    inline bool  RStream::Read (OUT void *buffer, Bytes size) __NE___
+    inline bool  RStream::Read (OUT void* buffer, Bytes size) __NE___
     {
         return ReadSeq( buffer, size ) == size;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RStream::Read (usize length, OUT BasicString<T,A> &str) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RStream::Read (usize length, OUT BasicString<T,A> &str) __NE___
     {
-        CATCH_ERR( str.resize( length ));
+        NOTHROW_ERR( str.resize( length ));
 
         Bytes   expected_size   { sizeof(str[0]) * str.length() };
         Bytes   current_size    = ReadSeq( str.data(), expected_size );
@@ -192,17 +197,17 @@ namespace AE::Base
         return str.length() == length;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RStream::Read (Bytes size, OUT BasicString<T,A> &str) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RStream::Read (Bytes size, OUT BasicString<T,A> &str) __NE___
     {
         ASSERT( IsMultipleOf( size, sizeof(T) ));
         return Read( usize(size) / sizeof(T), OUT str );
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RStream::Read (usize count, OUT Array<T,A> &arr) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RStream::Read (usize count, OUT Array<T,A> &arr) __NE___
     {
-        CATCH_ERR( arr.resize( count ));
+        NOTHROW_ERR( arr.resize( count ));
 
         Bytes   expected_size   { sizeof(arr[0]) * arr.size() };
         Bytes   current_size    = ReadSeq( arr.data(), expected_size );
@@ -212,18 +217,40 @@ namespace AE::Base
         return arr.size() == count;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  RStream::Read (Bytes size, OUT Array<T,A> &arr) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RStream::Read (Bytes size, OUT Array<T,A> &arr) __NE___
     {
         ASSERT( IsMultipleOf( size, sizeof(T) ));
         return Read( usize(size) / sizeof(T), OUT arr );
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  RStream::Read (OUT T &data) __NE___
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  RStream::Read (OUT T &data) __NE___
     {
         return ReadSeq( AddressOf(data), Sizeof(data) ) == Sizeof(data);
     }
+
+    inline bool  RStream::Read (Bytes dataSize, OUT MemChunkList &mem) __NE___
+    {
+        const Bytes     chunk_size  = mem.ChunkDataSize();
+        auto*           chunk       = mem.First();
+
+        if_unlikely( (chunk == null) | (dataSize == 0) )
+            return true;
+
+        ASSERT( dataSize <= mem.Capacity() );
+
+        bool    ok = true;
+        for (; (chunk != null) & ok;)
+        {
+            Bytes   size = Min( dataSize, chunk_size );
+            ok = (ReadSeq( OUT chunk->Data(), size ) == size);
+
+            chunk       = chunk->next;
+            dataSize    -= size;
+        }
+        return ok;
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -256,27 +283,27 @@ namespace AE::Base
     Write
 =================================================
 */
-    inline bool  WStream::Write (const void *buffer, Bytes size) __NE___
+    inline bool  WStream::Write (const void* buffer, Bytes size) __NE___
     {
         return WriteSeq( buffer, size ) == size;
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  WStream::Write (ArrayView<T> buf) __NE___
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WStream::Write (ArrayView<T> buf) __NE___
     {
         Bytes   size { sizeof(buf[0]) * buf.size() };
 
         return WriteSeq( buf.data(), size ) == size;
     }
 
-    template <typename T, typename A>
-    EnableIf<IsTrivial<T>, bool>  WStream::Write (const BasicString<T,A> str) __NE___
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WStream::Write (const BasicString<T,A> str) __NE___
     {
         return Write( BasicStringView<T>{ str });
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  WStream::Write (BasicStringView<T> str) __NE___
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WStream::Write (BasicStringView<T> str) __NE___
     {
         if ( str.empty() )
             return true;
@@ -286,12 +313,34 @@ namespace AE::Base
         return WriteSeq( str.data(), size ) == size;
     }
 
-    template <typename T>
-    EnableIf<IsTrivial<T>, bool>  WStream::Write (const T &data) __NE___
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  WStream::Write (const T &data) __NE___
     {
         return WriteSeq( AddressOf(data), Sizeof(data) ) == Sizeof(data);
     }
 
+    inline bool  WStream::Write (const MemChunkList &mem) __NE___
+    {
+        const Bytes     chunk_size  = mem.ChunkDataSize();
+        Bytes           data_size   = mem.Size();
+        auto*           chunk       = mem.First();
+
+        if_unlikely( (chunk == null) | (data_size == 0) )
+            return true;
+
+        bool    ok = true;
+        for (; (chunk != null) & ok;)
+        {
+            Bytes   size = Min( data_size, chunk_size );
+            ok = (WriteSeq( chunk->Data(), size ) == size);
+
+            chunk       = chunk->next;
+            data_size   -= size;
+        }
+
+        return ok;
+    }
+
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/DataSource/WindowsFile.cpp b/AE/engine/src/base/DataSource/WindowsFile.cpp
index 3ece49b4..049451b6 100644
--- a/AE/engine/src/base/DataSource/WindowsFile.cpp
+++ b/AE/engine/src/base/DataSource/WindowsFile.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_PLATFORM_WINDOWS
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "base/Platforms/WindowsUtils.h"
 # include "base/Algorithms/StringUtils.h"
 # include "base/DataSource/WindowsFile.h"
@@ -156,7 +156,7 @@ namespace AE::Base
             WIN_CHECK_DEV( "Can't open file: \""s << filename << "\": " );
     }
 
-    WinWFileStream::WinWFileStream (const wchar_t *filename, EFlags flags)  __NE___ :
+    WinWFileStream::WinWFileStream (const wchar_t* filename, EFlags flags)  __NE___ :
         WinWFileStream{ Handle_t{OpenFileForWrite( filename, INOUT flags )}, flags DEBUG_ONLY(, Path{filename} )}
     {
         if_unlikely( not IsOpen() )
@@ -273,7 +273,7 @@ namespace AE::Base
     WriteSeq
 =================================================
 */
-    Bytes  WinWFileStream::WriteSeq (const void *buffer, Bytes size) __NE___
+    Bytes  WinWFileStream::WriteSeq (const void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
         ASSERT_Lt( size, MaxValue<DWORD>() );
@@ -373,13 +373,13 @@ namespace AE::Base
     https://learn.microsoft.com/en-us/troubleshoot/windows/win32/asynchronous-disk-io-synchronous
 =================================================
 */
-    Bytes  WinRFileDataSource::ReadBlock (Bytes offset, OUT void* buffer, Bytes size) __NE___
+    Bytes  WinRFileDataSource::ReadBlock (const Bytes pos, OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
         ASSERT_Lt( size, MaxValue<DWORD>() );
 
         OVERLAPPED  ov = {};
-        SetOverlappedOffset( INOUT ov, offset );
+        SetOverlappedOffset( INOUT ov, pos );
 
         DWORD   readn = 0;
         if_likely( ::ReadFile( _file.Ref<HANDLE>(), OUT buffer, DWORD(size), OUT &readn, INOUT &ov ) != FALSE )
@@ -512,13 +512,13 @@ namespace AE::Base
     WriteBlock
 =================================================
 */
-    Bytes  WinWFileDataSource::WriteBlock (Bytes offset, const void *buffer, Bytes size) __NE___
+    Bytes  WinWFileDataSource::WriteBlock (const Bytes pos, const void* buffer, const Bytes size) __NE___
     {
         ASSERT( IsOpen() );
         ASSERT_Lt( size, MaxValue<DWORD>() );
 
         OVERLAPPED  ov = {};
-        SetOverlappedOffset( INOUT ov, offset );
+        SetOverlappedOffset( INOUT ov, pos );
 
         DWORD   written = 0;
         if_likely( ::WriteFile( _file.Ref<HANDLE>(), buffer, DWORD(size), OUT &written, INOUT &ov ) != FALSE )
diff --git a/AE/engine/src/base/DataSource/WindowsFile.h b/AE/engine/src/base/DataSource/WindowsFile.h
index 16aa4c31..44b58163 100644
--- a/AE/engine/src/base/DataSource/WindowsFile.h
+++ b/AE/engine/src/base/DataSource/WindowsFile.h
@@ -136,7 +136,7 @@ namespace AE::Base
         bool        SeekFwd (Bytes offset)                                              __NE_OV;
         Bytes       Reserve (Bytes additionalSize)                                      __NE_OV;
 
-        Bytes       WriteSeq (const void *, Bytes)                                      __NE_OV;
+        Bytes       WriteSeq (const void*, Bytes)                                       __NE_OV;
         void        Flush ()                                                            __NE_OV;
     };
 
@@ -193,7 +193,7 @@ namespace AE::Base
         ESourceType GetSourceType ()                                                        C_NE_OV;
         Bytes       Size ()                                                                 C_NE_OV { return _fileSize; }
 
-        Bytes       ReadBlock (Bytes, OUT void *, Bytes)                                    __NE_OV;
+        Bytes       ReadBlock (Bytes, OUT void*, Bytes)                                     __NE_OV;
     };
 
 
@@ -247,7 +247,7 @@ namespace AE::Base
 
         Bytes       Reserve (Bytes)                                                         __NE_OV;
 
-        Bytes       WriteBlock (Bytes, const void *, Bytes)                                 __NE_OV;
+        Bytes       WriteBlock (Bytes, const void*, Bytes)                                  __NE_OV;
         void        Flush ()                                                                __NE_OV;
     };
 
diff --git a/AE/engine/src/base/Defines/Attribs.h b/AE/engine/src/base/Defines/Attribs.h
index b13abd56..9acd8067 100644
--- a/AE/engine/src/base/Defines/Attribs.h
+++ b/AE/engine/src/base/Defines/Attribs.h
@@ -7,7 +7,7 @@
 // Previous content will be discarded.
 // On error: returns empty object.
 // On success: returns new object.
-// 
+//
 // OUT for reference - argument will be replaced by the new object.
 // OUT for pointer   - memory pointed to will be overwritten.
 //
@@ -17,10 +17,10 @@
 
 // Previous content will be modified or added new content.
 // On error: fallback to previous content is implementation defined, content may be partially modified.
-// 
+//
 // INOUT for reference - argument has read-write access.
 // INOUT for pointer   - memory pointed to has read-write access.
-// 
+//
 #ifndef INOUT
 #   define INOUT
 #endif
@@ -32,6 +32,7 @@
 #define __NE_OV             noexcept        override
 #define __NE_OF             noexcept        override final
 #define C_NE___     const   noexcept
+#define M_NE___     mutable noexcept
 #define CrNE___     const&  noexcept
 #define r_NE___     &       noexcept
 #define rvNE___     &&      noexcept
@@ -41,11 +42,13 @@
 #define rvTh___     &&      noexcept(false)
 #define __Th___             noexcept(false)
 #define C_Th___     const   noexcept(false)
+#define M_Th___     mutable noexcept(false)
 #define C_Th_OV     const   noexcept(false) override
 #define __Th_OV             noexcept(false) override
 #define C_Th_OF     const   noexcept(false) override final
 #define __Th_OF             noexcept(false) override final
 
+
 // function prefix attribs
 /*
 #define __Cx__              constexpr
@@ -96,14 +99,14 @@
 
 // force inline
 #ifndef forceinline
-# if defined(AE_DEBUG)
+# if defined(AE_CFG_DEBUG)
 #   define forceinline          inline
 
 # elif defined(AE_COMPILER_MSVC)
 #   define forceinline          __forceinline
 
 # elif defined(AE_COMPILER_CLANG) or defined(AE_COMPILER_GCC)
-#   define forceinline          __inline__ __attribute__((always_inline))
+#   define forceinline          __inline__ __attribute__((__always_inline__))
 
 # else
 #   pragma warning ("'forceinline' is not supported")
@@ -299,12 +302,7 @@
 #   define AE_SIMD_NEON_HALF    0
 #endif
 
-
-#if (AE_SIMD_AVX | AE_SIMD_SSE | AE_SIMD_NEON)
-#   define AE_HAS_SIMD          1
-#else
-#   define AE_HAS_SIMD          0
-#endif
+#define AE_HAS_SIMD             (AE_SIMD_AVX | AE_SIMD_SSE | AE_SIMD_NEON)
 
 
 // allow to use 'offsetof()' in 'static_assert()'
@@ -313,4 +311,25 @@
 #endif
 
 
-#define INTERNAL_LINKAGE( ... )     namespace { static __VA_ARGS__ ; }
+#define INTERNAL_LINKAGE( /* type  name */... )     namespace { static __VA_ARGS__ ; }
+
+
+// Keep exactly the same type.
+// 'auto' will deduce the value type instead of reference type.
+// 'exact_t' will use reference type where it is possible.
+//#define exact_t       decltype(auto)
+/*
+example of variable initialization:
+    int i;
+    int&& f();
+    auto x3a = i;                  // decltype(x3a) is int
+    decltype(auto) x3d = i;        // decltype(x3d) is int
+    auto x4a = (i);                // decltype(x4a) is int
+    decltype(auto) x4d = (i);      // decltype(x4d) is int&
+    auto x5a = f();                // decltype(x5a) is int
+    decltype(auto) x5d = f();      // decltype(x5d) is int&&
+    auto x6a = { 1, 2 };           // decltype(x6a) is std::initializer_list<int>
+    decltype(auto) x6d = { 1, 2 }; // error, { 1, 2 } is not an expression
+    auto *x7a = &i;                // decltype(x7a) is int*
+    decltype(auto)*x7d = &i;       // error, declared type is not plain decltype(auto)
+*/
diff --git a/AE/engine/src/base/Defines/Config.h b/AE/engine/src/base/Defines/Config.h
index d3f3262b..3ed65b19 100644
--- a/AE/engine/src/base/Defines/Config.h
+++ b/AE/engine/src/base/Defines/Config.h
@@ -14,7 +14,7 @@
 #endif
 
 // mem leak check
-#if defined(AE_COMPILER_MSVC) and defined(AE_ENABLE_MEMLEAK_CHECKS) and defined(AE_CFG_DEBUG)
+#if defined(AE_COMPILER_MSVC) and defined(AE_ENABLE_MEMLEAK_CHECKS) and defined(_DEBUG)
 #   define _CRTDBG_MAP_ALLOC
 #   include <crtdbg.h>
 #   include <stdlib.h>
@@ -22,11 +22,15 @@
 
     // call at exit
     // returns 'true' if no mem leaks
-#   define AE_DUMP_MEMLEAKS()   (::_CrtDumpMemoryLeaks() != 1)
+#   define AE_DUMP_MEMLEAKS()   (::_CrtDumpMemoryLeaks() != TRUE)
+
+    // returns 'true' if no mem corruptions
+#   define AE_CHECK_MEMORY()    (::_CrtCheckMemory() != TRUE)
 #else
 
 #   undef  AE_ENABLE_MEMLEAK_CHECKS
 #   define AE_DUMP_MEMLEAKS()   (true)
+#   define AE_CHECK_MEMORY()    (true)
 #endif
 
 #if defined(AE_CFG_DEBUG) or defined(AE_CFG_DEVELOP) or defined(AE_CFG_PROFILE)
@@ -68,7 +72,7 @@
 
 #ifdef AE_COMPILER_MSVC
 #   define AE_COMPILER_NAME         "MS Visual Studio"
-#   define AE_COMPILER_VERSION      AE::Base::Version3{ _MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, _MSC_FULL_VER % 100000 } // (4) _MSC_BUILD 
+#   define AE_COMPILER_VERSION      AE::Base::Version3{ _MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, _MSC_FULL_VER % 100000 } // (4) _MSC_BUILD
                                     // 2017: 19.10 - 19.16
                                     // 2019: 19.20 - 19.29
                                     // 2022: 19.30 - ...
diff --git a/AE/engine/src/base/Defines/DetectLicense.inl.h b/AE/engine/src/base/Defines/DetectLicense.inl.h
index c46f7ab5..3ae5223a 100644
--- a/AE/engine/src/base/Defines/DetectLicense.inl.h
+++ b/AE/engine/src/base/Defines/DetectLicense.inl.h
@@ -28,6 +28,7 @@
      * AE_LICENSE_MPL_2     - Mozilla Public License    // https://en.wikipedia.org/wiki/Mozilla_Public_License
      * AE_LICENSE_ZLIB                                  // https://en.wikipedia.org/wiki/Zlib_License
      * AE_LICENSE_FREE_NON_COMMERCIAL
+     * AE_LICENSE_UNLICENSE
 
     reference:
     https://en.wikipedia.org/wiki/Comparison_of_free_and_open-source_software_licenses
@@ -42,6 +43,7 @@
 //  AE_LICENSE_MIT              - ok
 //  AE_LICENSE_MPL_2            - ?
 //  AE_LICENSE_ZLIB             - ok
+//  AE_LICENSE_UNLICENSE        - ok
 
 #   if defined(AE_LICENSE_APACHE_2)
 #     error Apache 2.0 is not compatible with MIT/BSD
@@ -66,6 +68,7 @@
 //  AE_LICENSE_MIT              - ok
 //  AE_LICENSE_MPL_2            - ?
 //  AE_LICENSE_ZLIB             - ok
+//  AE_LICENSE_UNLICENSE        - ok
 
 #   if defined(AE_LICENSE_GPLv2) or defined(AE_LICENSE_GPLv3) or defined(AE_LICENSE_LGPLv2) or defined(AE_LICENSE_LGPLv3)
 #     error GPL/LGPL 2/3 is not compatible with Apache 2.0
@@ -82,6 +85,7 @@
 //  AE_LICENSE_MIT              - ok
 //  AE_LICENSE_ZLIB             - ok
 //  AE_LICENSE_MPL_2            - ok
+//  AE_LICENSE_UNLICENSE        - ok
 
 #   if defined(AE_LICENSE_APACHE_2) or defined(AE_LICENSE_MPL_2)
 #     error Apache 2.0 / MPL is not compatible with LGPLv2
@@ -101,6 +105,7 @@
 //  AE_LICENSE_MIT              - ok
 //  AE_LICENSE_ZLIB             - ok
 //  AE_LICENSE_MPL_2            - ok
+//  AE_LICENSE_UNLICENSE        - ok
 
 #   if defined(AE_LICENSE_GPLv2)
 #     error GPLv2 is not compatible with LGPLv3
@@ -119,6 +124,7 @@
 //  AE_LICENSE_MIT              - ok
 //  AE_LICENSE_ZLIB             - ok
 //  AE_LICENSE_MPL_2            - ok
+//  AE_LICENSE_UNLICENSE        - ok
 
 #   if defined(AE_LICENSE_APACHE_2)
 #     error Apache 2.0 is not compatible with GPLv2, try GPLv3
@@ -142,6 +148,7 @@
 //  AE_LICENSE_MIT              - ok
 //  AE_LICENSE_ZLIB             - ok
 //  AE_LICENSE_MPL_2            - ok
+//  AE_LICENSE_UNLICENSE        - ok
 
 #   if defined(AE_LICENSE_GPLv2)
 #     error GPLv3 is not compatible with GPLv2
diff --git a/AE/engine/src/base/Defines/Errors.h b/AE/engine/src/base/Defines/Errors.h
index 76849c43..f4f62196 100644
--- a/AE/engine/src/base/Defines/Errors.h
+++ b/AE/engine/src/base/Defines/Errors.h
@@ -43,11 +43,9 @@
 # ifdef AE_CFG_DEBUG
 #   define DBG_CHECK                                CHECK
 #   define DBG_CHECK_MSG                            CHECK_MSG
-#   define DBG_WARNING( _msg_ )                     CHECK_MSG( false, _msg_ )
 # else
 #   define DBG_CHECK( /* expr */... )               {}
 #   define DBG_CHECK_MSG( /* expr, message */... )  {}
-#   define DBG_WARNING( /* message */... )          {}
 # endif
 
 
@@ -77,11 +75,11 @@
 #ifdef AE_DEBUG
 #   define DEV_CHECK                                CHECK
 #   define DEV_CHECK_MSG                            CHECK_MSG
-#   define DEV_WARNING( _msg_ )                     CHECK_MSG( false, _msg_ )
+#   define DBG_WARNING( _msg_ )                     CHECK_MSG( false, _msg_ )
 #else
 #   define DEV_CHECK( /* expr */... )               {}
 #   define DEV_CHECK_MSG( /* expr, message */... )  {}
-#   define DEV_WARNING( /* message */... )          {}
+#   define DBG_WARNING( /* message */... )          {}
 #endif
 
 
@@ -167,8 +165,9 @@
             AE_PRIVATE_EXIT();                                                      \
         }}
 
-#   define CHECK_FATAL( /* expr */... )                                             \
-        CHECK_FATAL_MSG( (__VA_ARGS__), AE_TOSTRING( __VA_ARGS__ ))
+#   define CHECK_FATAL( /* expr, message */... )                                    \
+        CHECK_FATAL_MSG( AE_PRIVATE_GETARG_0( __VA_ARGS__ ),                        \
+                         AE_PRIVATE_GETARG_1( __VA_ARGS__, AE_TOSTRING( AE_PRIVATE_GETARG_0( __VA_ARGS__ ))) )
 #endif
 
 
@@ -178,7 +177,8 @@
         { AE_LOGE( _text_ );  return (_ret_); }
 
 #   define RETURN_ERR( /* msg, return */... )                                       \
-        AE_PRIVATE_RETURN_ERR( AE_PRIVATE_GETARG_0( __VA_ARGS__ ), AE_PRIVATE_GETARG_1( __VA_ARGS__, AE::Base::Default ))
+        AE_PRIVATE_RETURN_ERR(  AE_PRIVATE_GETARG_0( __VA_ARGS__ ),                 \
+                                AE_PRIVATE_GETARG_1( __VA_ARGS__, AE::Base::Default ))
 
 #   define RETURN_ERRV( _text_ )                                                    \
         { AE_LOGE( _text_ );  return; }
@@ -191,7 +191,7 @@
         {if_likely(( _expr_ )) {}                                                                           \
          else_unlikely {                                                                                    \
             AE_LOGE( AE_TOSTRING( _text_ ));                                                                \
-            STATIC_ASSERT( AE::Base::IsBaseOfNoQual< AE::Threading::IAsyncTask, decltype(*this) >);         \
+            StaticAssert( AE::Base::IsBaseOfNoQual< AE::Threading::IAsyncTask, decltype(*this) >);          \
             ASSERT( AE::Base::StringView{"Run"} == AE_FUNCTION_NAME );                                      \
             return this->OnFailure(); /* call 'IAsyncTask::OnFailure()' */                                  \
         }}
@@ -233,15 +233,30 @@
 
 // compile time assert
 #if 1
-#   define STATIC_ASSERT( /* expr, msg */... )                                                              \
-        static_assert(  AE_PRIVATE_GETRAW( AE_PRIVATE_GETARG_0( __VA_ARGS__ )),                             \
-                        AE_PRIVATE_GETRAW( AE_PRIVATE_GETARG_1( __VA_ARGS__, AE_TOSTRING(__VA_ARGS__))) )
+#   define StaticAssert                             static_assert
 
-    // only for 64 bit
 # if AE_PLATFORM_BITS == 64
-#   define STATIC_ASSERT_64( /* expr, msg */... )       STATIC_ASSERT( __VA_ARGS__ )
+#   define StaticAssert64                           static_assert
 # else
-#   define STATIC_ASSERT_64( /* expr, msg */... )
+#   define StaticAssert64( /* expr, msg */... )     static_assert(true)
+# endif
+
+# ifdef AE_ENABLE_EXCEPTIONS
+#   define CheckNothrow                             static_assert
+# else
+#   define CheckNothrow( /* expr, msg */... )       static_assert(true)
+#endif
+
+# ifdef AE_DEBUG
+#   define StaticAssertDbg                          static_assert
+# else
+#   define StaticAssertDbg( /* expr, msg */... )    static_assert(true)
+# endif
+
+# ifdef AE_RELEASE
+#   define StaticAssertRel                          static_assert
+# else
+#   define StaticAssertRel( /* expr, msg */... )    static_assert(true)
 # endif
 #endif
 
@@ -280,8 +295,8 @@
 #endif
 
 
-// throw exception
-#if 1
+// check and throw exception
+#ifdef AE_ENABLE_EXCEPTIONS
 #   define AE_PRIVATE_CHECK_THROW_MSG( _expr_, _text_ )                                                 \
         {if_likely(( _expr_ )) {}                                                                       \
          else_unlikely {                                                                                \
@@ -319,12 +334,20 @@
 #   define CHECK_THROW_GE( _lhs_, _rhs_ )           AE_PRIVATE_CHECK_THROW_OP( (_lhs_), >=, (_rhs_) )
 #   define CHECK_THROW_Lt( _lhs_, _rhs_ )           AE_PRIVATE_CHECK_THROW_OP( (_lhs_), <,  (_rhs_) )
 #   define CHECK_THROW_LE( _lhs_, _rhs_ )           AE_PRIVATE_CHECK_THROW_OP( (_lhs_), <=, (_rhs_) )
+
+#else
+
+// TODO: emulate exceptions
+
+#   define CHECK_THROW( /*expr, exception*/... )    CHECK_FATAL( AE_PRIVATE_GETARG_0( __VA_ARGS__ ))
+#   define CHECK_THROW_MSG( /* expr, msg */... )    CHECK_FATAL( __VA_ARGS__ )
+
 #endif
 
 
 // catch exceptions
-#if 1
-#   define CATCH( ... )                                                                                 \
+#ifdef AE_ENABLE_EXCEPTIONS
+#   define NOTHROW( ... )                                                                               \
         try { __VA_ARGS__; }                                                                            \
         catch(...) {}
 
@@ -336,13 +359,17 @@
             return _return_on_exc_;                                                                     \
         }
 
-#   define CATCH_ERR( /* expr, return_on_exc*/... )                                                     \
+#   define NOTHROW_ERR( /* expr, return_on_exc*/... )                                                   \
         AE_PRIVATE_CATCH_ERR( AE_PRIVATE_GETARG_0( __VA_ARGS__ ),                                       \
                               AE_PRIVATE_GETARG_1( __VA_ARGS__, AE::Base::Default ))
 
-#   define CATCH_ERRV( _expr_ )                                                                         \
-        CATCH_ERR( (_expr_), void() )
+#   define NOTHROW_ERRV( _expr_ )                                                                       \
+        NOTHROW_ERR( (_expr_), void() )
 
+#else
+#   define NOTHROW( ... )                               {__VA_ARGS__;}
+#   define NOTHROW_ERR( /* expr, return_on_exc*/... )       {AE_PRIVATE_GETARG_0( __VA_ARGS__ );}
+#   define NOTHROW_ERRV( _expr_ )                           {_expr_;}
 #endif
 
 
diff --git a/AE/engine/src/base/Defines/Helpers.h b/AE/engine/src/base/Defines/Helpers.h
index ebbb9d06..45f0a190 100644
--- a/AE/engine/src/base/Defines/Helpers.h
+++ b/AE/engine/src/base/Defines/Helpers.h
@@ -108,10 +108,25 @@
 
 
 // enable/disable exceptions
-#if 1
+#ifdef AE_ENABLE_EXCEPTIONS
 #   define TRY                  try
 #   define CATCH_ALL( ... )     catch(...) { __VA_ARGS__ }
+#   define IsNoExcept( ... )    noexcept( __VA_ARGS__ )
+#   define NoExcept( ... )      noexcept( __VA_ARGS__ )
+#   define CNoExcept( ... )     const noexcept( __VA_ARGS__ )
 #else
 #   define TRY
 #   define CATCH_ALL( ... )     {}
+#   define IsNoExcept( ... )    true
+#   define NoExcept( ... )
+#   define CNoExcept( ... )     const
 #endif
+
+
+// helper for 'template <..., EnableIf<..., bool>=true >'
+#define ENABLEIF( ... )     EnableIf< (__VA_ARGS__), bool > = true
+#define ENABLEIF2( ... )    EnableIf< (__VA_ARGS__), bool >
+
+#define DISABLEIF( ... )    DisableIf< (__VA_ARGS__), bool > = true
+#define DISABLEIF2( ... )   DisableIf< (__VA_ARGS__), bool >
+
diff --git a/AE/engine/src/base/Log/Log.cpp b/AE/engine/src/base/Log/Log.cpp
index 5a9dc557..fcb8898a 100644
--- a/AE/engine/src/base/Log/Log.cpp
+++ b/AE/engine/src/base/Log/Log.cpp
@@ -1,12 +1,14 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
+#ifdef AE_COMPILER_MSVC
+#   include "base/Platforms/WindowsHeader.cpp.h"
+#endif
+
 #include "base/Common.h"
 #include "base/Containers/InPlace.h"
 #include "base/Utils/Atomic.h"
 
-#ifdef AE_COMPILER_MSVC
-#   include "base/Platforms/WindowsHeader.h"
-#endif
+#ifdef AE_ENABLE_LOGS
 
 namespace AE::Base
 {
@@ -70,7 +72,6 @@ namespace
 } // namespace
 
 
-
 /*
 =================================================
     Initialize
@@ -173,14 +174,14 @@ namespace
     {
         Initialize();
 
-        try {
+        TRY{
             AddLogger( ILogger::CreateIDEOutput() );
             AddLogger( ILogger::CreateConsoleOutput() );
             //AddLogger( ILogger::CreateFileOutput( "log.txt" ));
             //AddLogger( ILogger::CreateHtmlOutput( "log.html" ));
             AddLogger( ILogger::CreateDialogOutput() );
-        } catch(...)
-        {}
+        }
+        CATCH_ALL();
 
         SetCurrentThreadName( "main" );
     }
@@ -192,6 +193,7 @@ namespace
 */
     StaticLogger::EResult  StaticLogger::Process (StringView msg, StringView func, StringView file, unsigned int line, ILogger::ELevel level, ILogger::EScope scope) __Th___
     {
+    #ifdef AE_ENABLE_LOGS
         ILogger::MessageInfo    info;
         info.message    = msg;
         info.func       = func;
@@ -202,9 +204,14 @@ namespace
         info.scope      = scope;
 
         return ProcessMessage( info );
+
+    #else
+        Unused( msg, func, file, line, level, scope );
+
+    #endif
     }
 
-    StaticLogger::EResult  StaticLogger::Process (const char *msg, const char *func, const char *file, unsigned int line, ILogger::ELevel level, ILogger::EScope scope) __Th___
+    StaticLogger::EResult  StaticLogger::Process (const char* msg, const char* func, const char* file, unsigned int line, ILogger::ELevel level, ILogger::EScope scope) __Th___
     {
         return Process( StringView{msg}, StringView{func}, StringView{file}, line, level, scope );
     }
@@ -231,3 +238,23 @@ namespace
     }
 
 } // AE::Base
+//-----------------------------------------------------------------------------
+
+#else
+
+namespace AE::Base
+{
+    void  StaticLogger::Initialize ()                           __NE___ {}
+    void  StaticLogger::Deinitialize (bool)                     __NE___ {}
+    void  StaticLogger::SetFilter (LevelBits, ScopeBits)        __NE___ {}
+    void  StaticLogger::ClearLoggers ()                         __NE___ {}
+    void  StaticLogger::AddLogger (Unique<ILogger>)             __NE___ {}
+    void  StaticLogger::InitDefault ()                          __NE___ {}
+    void  StaticLogger::SetCurrentThreadName (std::string_view) __NE___ {}
+
+    StaticLogger::EResult  StaticLogger::Process (StringView, StringView, StringView, unsigned int, ILogger::ELevel, ILogger::EScope) __Th___ { return StaticLogger::EResult::Continue; }
+    StaticLogger::EResult  StaticLogger::Process (const char*, const char*, const char*, unsigned int, ILogger::ELevel, ILogger::EScope) __Th___ { return StaticLogger::EResult::Continue; }
+
+} // AE::Base
+
+#endif // AE_ENABLE_LOGS
diff --git a/AE/engine/src/base/Log/Log.h b/AE/engine/src/base/Log/Log.h
index 7c5d26a4..8fd1bb5e 100644
--- a/AE/engine/src/base/Log/Log.h
+++ b/AE/engine/src/base/Log/Log.h
@@ -5,7 +5,6 @@
 namespace AE::Base
 {
 
-
     //
     // Logger interface
     //
@@ -62,7 +61,8 @@ namespace AE::Base
 
     // interface
     public:
-        virtual ~ILogger () {}
+        ILogger ()                                                  __NE___ {}
+        virtual ~ILogger ()                                         __NE___ {}
 
         ND_ virtual EResult Process (const MessageInfo &info)       __Th___ = 0;
             virtual void    SetCurrentThreadName (std::string_view) __NE___ {}
@@ -72,14 +72,15 @@ namespace AE::Base
     public:
         using LoggerPtr = std::unique_ptr< ILogger >;
 
-        ND_ static LevelBits    GetDialogLevelBits () __NE___;
-        ND_ static ScopeBits    GetDialogScopeBits () __NE___;
+        ND_ static LevelBits    GetDialogLevelBits ()               __NE___;
+        ND_ static ScopeBits    GetDialogScopeBits ()               __NE___;
 
-        ND_ static LoggerPtr    CreateIDEOutput ();                                             // VS only
-        ND_ static LoggerPtr    CreateConsoleOutput (std::string_view tag = AE_ENGINE_NAME);    // cross platform
-        ND_ static LoggerPtr    CreateFileOutput (std::string_view fileName);
-        ND_ static LoggerPtr    CreateHtmlOutput (std::string_view fileName);
-        ND_ static LoggerPtr    CreateDialogOutput (LevelBits levelBits = GetDialogLevelBits(), ScopeBits scopeBits = GetDialogScopeBits());
+        ND_ static LoggerPtr    CreateIDEOutput ()                                              __NE___;    // VS only
+        ND_ static LoggerPtr    CreateConsoleOutput (std::string_view tag = {})                 __NE___;    // cross platform
+        ND_ static LoggerPtr    CreateFileOutput (std::string_view fileName)                    __NE___;
+        ND_ static LoggerPtr    CreateHtmlOutput (std::string_view fileName)                    __NE___;
+        ND_ static LoggerPtr    CreateDialogOutput (LevelBits levelBits = GetDialogLevelBits(),
+                                                    ScopeBits scopeBits = GetDialogScopeBits()) __NE___;
     };
 
 
@@ -97,7 +98,7 @@ namespace AE::Base
 
 
     // methods
-        ND_ static EResult  Process (const char *msg, const char *func, const char *file, unsigned int line, ILogger::ELevel level, ILogger::EScope scope)                  __Th___;
+        ND_ static EResult  Process (const char* msg, const char* func, const char* file, unsigned int line, ILogger::ELevel level, ILogger::EScope scope)                  __Th___;
         ND_ static EResult  Process (std::string_view msg, std::string_view func, std::string_view file, unsigned int line, ILogger::ELevel level, ILogger::EScope scope)   __Th___;
 
             static void     SetFilter (LevelBits levelBits, ScopeBits scopeBits)__NE___;
@@ -130,8 +131,9 @@ namespace AE
 
 } // AE
 
-#define AE_PRIVATE_LOGX( /*ELogLevel*/_level_, /*ELogScope*/ _scope_, _msg_, _file_, _line_ ) \
-    try { \
+#ifdef AE_ENABLE_LOGS
+# define AE_PRIVATE_LOGX( /*ELogLevel*/_level_, /*ELogScope*/ _scope_, _msg_, _file_, _line_ ) \
+    TRY{ \
         BEGIN_ENUM_CHECKS() \
         {switch ( AE::Base::StaticLogger::Process( (_msg_), (AE_FUNCTION_NAME), (_file_), (_line_), (_level_), (_scope_) )) \
         { \
@@ -140,7 +142,11 @@ namespace AE
             case        AE::Base::StaticLogger::EResult::Abort :        AE_PRIVATE_EXIT();          break; \
         }} \
         END_ENUM_CHECKS() \
-    } catch(...) {} // to catch exceptions in string formating
+    }CATCH_ALL();   // to catch exceptions in string formatting
+
+#else
+# define AE_PRIVATE_LOGX( ... ) {}
+#endif
 
 
 #define AE_PRIVATE_LOG_I(  _msg_, _file_, _line_ )  AE_PRIVATE_LOGX( AE::ELogLevel::Info,        AE::ELogScope::Unknown, (_msg_), (_file_), (_line_) )
diff --git a/AE/engine/src/base/Log/Logger.cpp b/AE/engine/src/base/Log/Logger.cpp
index 02978857..1a76d153 100644
--- a/AE/engine/src/base/Log/Logger.cpp
+++ b/AE/engine/src/base/Log/Logger.cpp
@@ -11,7 +11,7 @@
 #   include <emscripten.h>
 #endif
 #ifdef AE_COMPILER_MSVC
-#   include "base/Platforms/WindowsHeader.h"
+#   include "base/Platforms/WindowsHeader.cpp.h"
 #endif
 
 #include "base/Log/Logger.h"
@@ -159,7 +159,7 @@ namespace
     CreateIDEOutput
 =================================================
 */
-    ILogger::LoggerPtr  ILogger::CreateIDEOutput ()
+    ILogger::LoggerPtr  ILogger::CreateIDEOutput () __NE___
     {
     #ifdef AE_COMPILER_MSVC
         if ( ::IsDebuggerPresent() )
@@ -203,7 +203,7 @@ namespace
                 str << info.message;
         }
 
-        return _ProcessImpl( caption, str );
+        return _ProcessImpl( caption, str, info.level );
     }
 #endif
 
@@ -213,7 +213,7 @@ namespace
     DialogLogOutput
 =================================================
 */
-    ILogger::EResult  DialogLogOutput::_ProcessImpl (const String &caption, const String &msg)
+    ILogger::EResult  DialogLogOutput::_ProcessImpl (const String &caption, const String &msg, ELevel)
     {
         UINT    flags = MB_ICONERROR | MB_SETFOREGROUND | MB_TOPMOST;
 
@@ -251,15 +251,13 @@ namespace
 
         String  msg = "confirm( \""s << info.message << "\" )";
 
-        try {
+        TRY{
             int ok = emscripten_run_script_int( msg.c_str() );
-
             return ok == 0 ? EResult::Break : EResult::Continue;
         }
-        catch(...)
-        {
+        CATCH_ALL(
             return EResult::Unknown;
-        }
+        )
     }
 #endif
 
@@ -268,7 +266,7 @@ namespace
     CreateDialogOutput
 =================================================
 */
-    ILogger::LoggerPtr  ILogger::CreateDialogOutput (LevelBits levelBits, ScopeBits scopeBits)
+    ILogger::LoggerPtr  ILogger::CreateDialogOutput (LevelBits levelBits, ScopeBits scopeBits) __NE___
     {
         #if not defined(AE_CI_BUILD)
         # if defined(AE_PLATFORM_WINDOWS) or defined(AE_PLATFORM_APPLE)
@@ -319,11 +317,9 @@ namespace
 
         for (; offset < info.message.size();)
         {
-            const usize max = Min( offset + CountOf(buf), info.message.size() );
-            usize       end = max;
-            end = (info.message.size() <= end ? StringView::npos : info.message.rfind( '\n', end ));
-            end = (end == StringView::npos or end <= offset ? max : end);
-
+            const usize max = Min( offset + CountOf(buf)-1, info.message.size() );
+            usize       end = Clamp( info.message.rfind( '\n', max ), offset, max );
+                        end = (max - end < 5 ? max : ((float(end - offset) / float(max - offset)) < 0.7f ? max : end));
             const usize pos = end - offset;
 
             MemCopy( OUT buf, Sizeof(buf), info.message.data() + offset, Bytes{pos} );
@@ -349,8 +345,11 @@ namespace
     CreateConsoleOutput
 =================================================
 */
-    ILogger::LoggerPtr  ILogger::CreateConsoleOutput (StringView tag)
+    ILogger::LoggerPtr  ILogger::CreateConsoleOutput (StringView tag) __NE___
     {
+        if ( tag.empty() )
+            tag = "<<<< AE >>>>";
+
         return MakeUnique<AndroidLogOutput>( tag );
     }
 
@@ -392,7 +391,7 @@ namespace
     CreateConsoleOutput
 =================================================
 */
-    ILogger::LoggerPtr  ILogger::CreateConsoleOutput (StringView)
+    ILogger::LoggerPtr  ILogger::CreateConsoleOutput (StringView) __NE___
     {
         // enable console colors
         #ifdef AE_PLATFORM_WINDOWS
@@ -417,7 +416,7 @@ namespace
     FileLogOutput::ctor
 =================================================
 */
-    FileLogOutput::FileLogOutput (RC<WStream> file) :
+    FileLogOutput::FileLogOutput (RC<WStream> file) __NE___ :
         _file{ RVRef(file) }
     {
         CHECK( _file and _file->IsOpen() );
@@ -466,13 +465,13 @@ namespace
 */
     void  FileLogOutput::SetCurrentThreadName (StringView name) __NE___
     {
-        try {
+        TRY{
             EXLOCK( _guard );
             const usize     tid = ThreadUtils::GetIntID();
 
             _threadNames.insert_or_assign( tid, String{name} );
         }
-        catch(...) {}
+        CATCH_ALL()
     }
 
 /*
@@ -480,7 +479,7 @@ namespace
     CreateFileOutput
 =================================================
 */
-    ILogger::LoggerPtr  ILogger::CreateFileOutput (StringView fileName)
+    ILogger::LoggerPtr  ILogger::CreateFileOutput (StringView fileName) __NE___
     {
         auto    file = MakeRC<FileWStream>( NtStringView{fileName} );
 
@@ -498,7 +497,7 @@ namespace
     HtmlLogOutput::ctor
 =================================================
 */
-    HtmlLogOutput::HtmlLogOutput (RC<WStream> file) :
+    HtmlLogOutput::HtmlLogOutput (RC<WStream> file) __NE___ :
         _file{ RVRef(file) },
         _txtColor{ uint(EColor::Black) },
         _bgColor{ uint(EColor::White) }
@@ -518,7 +517,7 @@ namespace
     HtmlLogOutput::dtor
 =================================================
 */
-    HtmlLogOutput::~HtmlLogOutput ()
+    HtmlLogOutput::~HtmlLogOutput () __NE___
     {
         EXLOCK( _guard );
 
@@ -655,7 +654,7 @@ namespace
 */
     void  HtmlLogOutput::SetCurrentThreadName (StringView name) __NE___
     {
-        try {
+        TRY{
             EXLOCK( _guard );
             const usize tid = ThreadUtils::GetIntID();
 
@@ -676,7 +675,7 @@ namespace
 
             _threadInfos.insert_or_assign( tid, RVRef(info) );
         }
-        catch(...) {}
+        CATCH_ALL()
     }
 
 /*
@@ -684,7 +683,7 @@ namespace
     CreateHtmlOutput
 =================================================
 */
-    ILogger::LoggerPtr  ILogger::CreateHtmlOutput (StringView fileName)
+    ILogger::LoggerPtr  ILogger::CreateHtmlOutput (StringView fileName) __NE___
     {
         auto    file = MakeRC<FileWStream>( NtStringView{fileName} );
 
diff --git a/AE/engine/src/base/Log/Logger.h b/AE/engine/src/base/Log/Logger.h
index 6ff64e13..5a79b419 100644
--- a/AE/engine/src/base/Log/Logger.h
+++ b/AE/engine/src/base/Log/Logger.h
@@ -14,7 +14,7 @@ namespace AE::Base
     //
     // Visual Studio Log output
     //
-    class VisualStudioLogOutput final : public ILogger
+    class VisualStudioLogOutput final : public ILogger, public NothrowAllocatable
     {
     public:
         EResult  Process (const MessageInfo &info) __Th_OV;
@@ -28,15 +28,15 @@ namespace AE::Base
     //
     // Android Log output
     //
-    class AndroidLogOutput final : public ILogger
+    class AndroidLogOutput final : public ILogger, public NothrowAllocatable
     {
     private:
         const String    _tag;
 
     public:
-        explicit AndroidLogOutput (StringView tag) : _tag{ tag } {}
+        explicit AndroidLogOutput (StringView tag)  __NE___ : _tag{ tag } {}
 
-        EResult  Process (const MessageInfo &info) __Th_OV;
+        EResult  Process (const MessageInfo &info)  __Th_OV;
     };
 
 #else
@@ -44,7 +44,7 @@ namespace AE::Base
     //
     // Console Log output
     //
-    class ConsoleLogOutput final : public ILogger
+    class ConsoleLogOutput final : public ILogger, public NothrowAllocatable
     {
     private:
         Mutex       _guard;
@@ -61,7 +61,7 @@ namespace AE::Base
     //
     // Dialog Log output
     //
-    class DialogLogOutput final : public ILogger
+    class DialogLogOutput final : public ILogger, public NothrowAllocatable
     {
     private:
         Mutex               _guard;
@@ -70,15 +70,15 @@ namespace AE::Base
         const ThreadID      _mainThread;    // for Apple
 
     public:
-        DialogLogOutput (LevelBits levelBits, ScopeBits scopeBits) :
+        DialogLogOutput (LevelBits levelBits, ScopeBits scopeBits)          __NE___ :
             _levelBits{ levelBits }, _scopeBits{ scopeBits },
             _mainThread{ std::this_thread::get_id() }
         {}
 
-        EResult  Process (const MessageInfo &info) __Th_OV;
+        EResult  Process (const MessageInfo &info)                          __Th_OV;
 
     private:
-        EResult  _ProcessImpl (const String &caption, const String &msg) __Th___;
+        EResult  _ProcessImpl (const String &caption, const String &msg, ELevel level)  __Th___;
     };
 
 #endif
@@ -89,18 +89,18 @@ namespace AE::Base
     //
     // Dialog Log output
     //
-    class DialogLogOutputEms final : public ILogger
+    class DialogLogOutputEms final : public ILogger, public NothrowAllocatable
     {
     private:
         const LevelBits     _levelBits;
         const ScopeBits     _scopeBits;
 
     public:
-        DialogLogOutputEms (LevelBits levelBits, ScopeBits scopeBits) :
+        DialogLogOutputEms (LevelBits levelBits, ScopeBits scopeBits)   __NE___ :
             _levelBits{ levelBits }, _scopeBits{ scopeBits }
         {}
 
-        EResult  Process (const MessageInfo &info) __Th_OV;
+        EResult  Process (const MessageInfo &info)                      __Th_OV;
     };
 
 #endif
@@ -109,7 +109,7 @@ namespace AE::Base
     //
     // File Log output
     //
-    class FileLogOutput final : public ILogger
+    class FileLogOutput final : public ILogger, public NothrowAllocatable
     {
     private:
         Mutex                           _guard;
@@ -117,7 +117,7 @@ namespace AE::Base
         FlatHashMap< usize, String >    _threadNames;
 
     public:
-        explicit FileLogOutput (RC<WStream> file);
+        explicit FileLogOutput (RC<WStream> file)       __NE___;
 
         EResult Process (const MessageInfo &info)       __Th_OV;
         void    SetCurrentThreadName (StringView name)  __NE_OV;
@@ -128,7 +128,7 @@ namespace AE::Base
     //
     // HTML Log output
     //
-    class HtmlLogOutput final : public ILogger
+    class HtmlLogOutput final : public ILogger, public NothrowAllocatable
     {
     // types
     private:
@@ -176,15 +176,15 @@ namespace AE::Base
 
     // methods
     public:
-        explicit HtmlLogOutput (RC<WStream> file);
-        ~HtmlLogOutput ();
+        explicit HtmlLogOutput (RC<WStream> file)                       __NE___;
+        ~HtmlLogOutput ()                                               __NE___;
 
-        EResult Process (const MessageInfo &info)       __Th_OV;
-        void    SetCurrentThreadName (StringView name)  __NE_OV;
+        EResult Process (const MessageInfo &info)                       __Th_OV;
+        void    SetCurrentThreadName (StringView name)                  __NE_OV;
 
     private:
         void    _SetColor (EColor col, EColor bg, INOUT String &str);
-        void    _Flush (StringView str)                 C_NE___;
+        void    _Flush (StringView str)                                 C_NE___;
     };
 
 
diff --git a/AE/engine/src/base/Log/Logger.mm b/AE/engine/src/base/Log/Logger.mm
index 5bb86c63..bfeeab8d 100644
--- a/AE/engine/src/base/Log/Logger.mm
+++ b/AE/engine/src/base/Log/Logger.mm
@@ -1,6 +1,11 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
+#include "base/ObjC/NS.h"
+
+#undef null
 #import <Cocoa/Cocoa.h>
+#define null    nullptr
+
 #include "base/Log/Logger.h"
 
 #if defined(AE_PLATFORM_APPLE) and not defined(AE_CI_BUILD)
@@ -39,7 +44,7 @@ static NSModalResponse  ShowAlertDialog (const String &caption, const String &ms
     DialogLogOutput
 =================================================
 */
-    ILogger::EResult  DialogLogOutput::_ProcessImpl (const String &caption, const String &msg) __Th___
+    ILogger::EResult  DialogLogOutput::_ProcessImpl (const String &caption, const String &msg, ELevel level) __Th___
     {
         if ( _mainThread != std::this_thread::get_id() )
         {
@@ -50,7 +55,7 @@ static NSModalResponse  ShowAlertDialog (const String &caption, const String &ms
                                 ShowAlertDialog( caption, msg );
                             }
                           );*/
-            return EResult::Unknown;
+            return level >= ELevel::Error ? EResult::Break : EResult::Unknown;
         }
 
         NSModalResponse returnCode = ShowAlertDialog( caption, msg );
diff --git a/AE/engine/src/base/Math/BitMath.h b/AE/engine/src/base/Math/BitMath.h
index 7933a024..fd1baa95 100644
--- a/AE/engine/src/base/Math/BitMath.h
+++ b/AE/engine/src/base/Math/BitMath.h
@@ -17,11 +17,11 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, ToUnsignedInteger<T>>  ToNearUInt (const T &value) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, ToUnsignedInteger<T>>  ToNearUInt (const T value) __NE___
     {
-        STATIC_ASSERT( IsScalarOrEnum<T> );
-        STATIC_ASSERT( not IsFloatPoint<T> );
-        STATIC_ASSERT( sizeof(value) <= sizeof(ToUnsignedInteger<T>) );
+        StaticAssert( IsScalarOrEnum<T> );
+        StaticAssert( not IsFloatPoint<T> );
+        StaticAssert( sizeof(value) <= sizeof(ToUnsignedInteger<T>) );
 
         return static_cast< ToUnsignedInteger<T> >( value );
     }
@@ -32,11 +32,11 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, ToSignedInteger<T>>  ToNearInt (const T &value) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, ToSignedInteger<T>>  ToNearInt (const T value) __NE___
     {
-        STATIC_ASSERT( IsScalarOrEnum<T> );
-        STATIC_ASSERT( not IsFloatPoint<T> );
-        STATIC_ASSERT( sizeof(value) <= sizeof(ToSignedInteger<T>) );
+        StaticAssert( IsScalarOrEnum<T> );
+        StaticAssert( not IsFloatPoint<T> );
+        StaticAssert( sizeof(value) <= sizeof(ToSignedInteger<T>) );
 
         return static_cast< ToSignedInteger<T> >( value );
     }
@@ -49,11 +49,11 @@ namespace AE::Math
 =================================================
 */
     template <typename T1, typename T2>
-    ND_ constexpr bool  AllBits (const T1& lhs, const T2& rhs) __NE___
+    ND_ constexpr bool  AllBits (const T1 lhs, const T2 rhs) __NE___
     {
-        STATIC_ASSERT( IsScalarOrEnum< T1 > );
-        STATIC_ASSERT( IsScalarOrEnum< T2 > );
-        STATIC_ASSERT( not (IsEnum<T1> and IsEnum<T2>) or IsSameTypes<T1, T2> );
+        StaticAssert( IsScalarOrEnum< T1 > );
+        StaticAssert( IsScalarOrEnum< T2 > );
+        StaticAssert( not (IsEnum<T1> and IsEnum<T2>) or IsSameTypes<T1, T2> );
         //ASSERT( rhs != T2(0) );
 
         return ( ToNearUInt(lhs) & ToNearUInt(rhs) ) == ToNearUInt(rhs);
@@ -65,13 +65,13 @@ namespace AE::Math
 =================================================
 */
     template <typename T1, typename T2, typename T3>
-    ND_ constexpr bool  AllBits (const T1& lhs, const T2& rhs, const T3& mask) __NE___
+    ND_ constexpr bool  AllBits (const T1 lhs, const T2 rhs, const T3 mask) __NE___
     {
-        STATIC_ASSERT( IsScalarOrEnum< T1 > );
-        STATIC_ASSERT( IsScalarOrEnum< T2 > );
-        STATIC_ASSERT( IsScalarOrEnum< T3 > );
-        STATIC_ASSERT( not (IsEnum<T1> and IsEnum<T2>) or IsSameTypes<T1, T2> );
-        STATIC_ASSERT( not (IsEnum<T1> and IsEnum<T3>) or IsSameTypes<T1, T3> );
+        StaticAssert( IsScalarOrEnum< T1 > );
+        StaticAssert( IsScalarOrEnum< T2 > );
+        StaticAssert( IsScalarOrEnum< T3 > );
+        StaticAssert( not (IsEnum<T1> and IsEnum<T2>) or IsSameTypes<T1, T2> );
+        StaticAssert( not (IsEnum<T1> and IsEnum<T3>) or IsSameTypes<T1, T3> );
         ASSERT( mask != T2(0) );
 
         return ( ToNearUInt(lhs) & ToNearUInt(mask) ) == ( ToNearUInt(rhs) & ToNearUInt(mask) );
@@ -85,11 +85,11 @@ namespace AE::Math
 =================================================
 */
     template <typename T1, typename T2>
-    ND_ constexpr bool  AnyBits (const T1& lhs, const T2& rhs) __NE___
+    ND_ constexpr bool  AnyBits (const T1 lhs, const T2 rhs) __NE___
     {
-        STATIC_ASSERT( IsScalarOrEnum< T1 > );
-        STATIC_ASSERT( IsScalarOrEnum< T2 > );
-        STATIC_ASSERT( not (IsEnum<T1> and IsEnum<T2>) or IsSameTypes<T1, T2> );
+        StaticAssert( IsScalarOrEnum< T1 > );
+        StaticAssert( IsScalarOrEnum< T2 > );
+        StaticAssert( not (IsEnum<T1> and IsEnum<T2>) or IsSameTypes<T1, T2> );
         //ASSERT( rhs != T2(0) );
 
         return !!( ToNearUInt(lhs) & ToNearUInt(rhs) );
@@ -103,7 +103,7 @@ namespace AE::Math
     template <typename T>
     ND_ constexpr EnableIf<IsScalar<T>, T>  ExtractBit (INOUT T& value) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
         using U = ToUnsignedInteger<T>;
         ASSERT( U(value) > 0 );
@@ -126,9 +126,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, bool>  IsPowerOfTwo (const T &x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, bool>  IsPowerOfTwo (const T x) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
         using U = ToUnsignedInteger<T>;
 
@@ -141,7 +141,7 @@ namespace AE::Math
     }
 
     template <typename T>
-    ND_ constexpr bool  IsSingleBitSet (const T &x) __NE___
+    ND_ constexpr bool  IsSingleBitSet (const T x) __NE___
     {
         return IsPowerOfTwo( x );
     }
@@ -154,15 +154,15 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, int>  IntLog2 (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, int>  IntLog2 (const T x) __NE___
     {
-        STATIC_ASSERT( IsInteger<T> or IsEnum<T> );
+        StaticAssert( IsInteger<T> or IsEnum<T> );
 
-        constexpr int   INVALID_INDEX = MinValue<int>();
+        constexpr int   INVALID_INDEX = -1;
 
       #ifdef AE_cpp_lib_int_pow2
-        auto    c = std::bit_width( ToNearUInt( x ));
-        return c > 0 ? int(c) - 1 : INVALID_INDEX;
+        Unused( INVALID_INDEX );
+        return int(std::bit_width( ToNearUInt( x ))) - 1;
 
       #elif defined(AE_COMPILER_MSVC)
         unsigned long   index;
@@ -186,7 +186,7 @@ namespace AE::Math
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, int>  BitScanReverse (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, int>  BitScanReverse (const T x) __NE___
     {
         return IntLog2( x );
     }
@@ -199,7 +199,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, int>  CeilIntLog2 (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, int>  CeilIntLog2 (const T x) __NE___
     {
         int i = IntLog2( x );
         return i >= 0 ? i + int(not IsPowerOfTwo( x )) : MinValue<int>();
@@ -230,19 +230,19 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ EnableIf<IsScalar<T>, int>  BitScanForward (const T& x) __NE___
+    ND_ EnableIf<IsScalar<T>, int>  BitScanForward (const T x) __NE___
     {
-        STATIC_ASSERT( IsInteger<T> or IsEnum<T> );
+        StaticAssert( IsInteger<T> or IsEnum<T> );
 
     #ifdef AE_COMPILER_MSVC
-        constexpr int   INVALID_INDEX = MinValue<int>();
+        constexpr int   INVALID_INDEX = -1;
         unsigned long   index;
 
         if constexpr( sizeof(x) == 8 )
-            return _BitScanForward64( OUT &index, ulong(x) ) ? index : INVALID_INDEX;
+            return _BitScanForward64( OUT &index, ulong(x) ) ? int(index) : INVALID_INDEX;
         else
         if constexpr( sizeof(x) <= 4 )
-            return _BitScanForward( OUT &index, uint(x) ) ? index : INVALID_INDEX;
+            return _BitScanForward( OUT &index, uint(x) ) ? int(index) : INVALID_INDEX;
 
     #elif defined(AE_COMPILER_GCC) or defined(AE_COMPILER_CLANG)
         if constexpr( sizeof(x) == 8 )
@@ -265,9 +265,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, uint>  IntLog10 (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, uint>  IntLog10 (const T x) __NE___
     {
-        STATIC_ASSERT( IsInteger<T> or IsEnum<T> );
+        StaticAssert( IsInteger<T> or IsEnum<T> );
 
         using U = ToUnsignedInteger<T>;
         const U     uval    = U(x);
@@ -287,9 +287,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, usize>  BitCount (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, usize>  BitCount (const T x) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
       #ifdef __cpp_lib_bitops
         return usize( std::popcount( ToUnsignedInteger<T>(x) ));
@@ -324,9 +324,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, usize>  CountLZero (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, usize>  CountLZero (const T x) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
       #ifdef __cpp_lib_bitops
         return usize( std::countl_zero( ToUnsignedInteger<T>(x) ));
@@ -343,9 +343,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, usize>  CountLOne (const T& x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, usize>  CountLOne (const T x) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
       #ifdef __cpp_lib_bitops
         return usize( std::countl_one( ToUnsignedInteger<T>(x) ));
@@ -365,18 +365,18 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, T>  SafeLeftBitShift (const T& x, usize shift) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, T>  SafeLeftBitShift (const T x, const usize shift) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
         ASSERT( x >= T(0) );
 
         return T( ToNearUInt(x) << (shift & (CT_SizeofInBits(x) - 1)) );
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, T>  SafeRightBitShift (const T& x, usize shift) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, T>  SafeRightBitShift (const T x, const usize shift) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
         ASSERT( x >= T(0) );
 
         return T( ToNearUInt(x) >> (shift & (CT_SizeofInBits(x) - 1)) );
@@ -392,19 +392,17 @@ namespace AE::Math
     namespace _hidden_
     {
         template <typename T>
-        constexpr T _BitRotateLeft (T value, usize shift) __NE___
+        constexpr T _BitRotateLeft (const T x, const usize shift) __NE___
         {
-            constexpr usize mask = (CT_SizeofInBits(value) - 1);
-
-            shift &= mask;
-            return (value << shift) | (value >> ( ~(shift-1) & mask ));
+            constexpr usize mask = (CT_SizeofInBits(x) - 1);
+            return (x << (shift & mask)) | (x >> ( ~(shift-1) & mask ));
         }
     } // _hidden_
 
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, T>  BitRotateLeft (const T& x, usize shift) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, T>  BitRotateLeft (const T x, const usize shift) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
       #ifdef __cpp_lib_bitops
         return T( std::rotl( ToNearUInt(x), int(shift) ));
@@ -430,19 +428,17 @@ namespace AE::Math
     namespace _hidden_
     {
         template <typename T>
-        constexpr T _BitRotateRight (T value, usize shift) __NE___
+        constexpr T _BitRotateRight (const T x, const usize shift) __NE___
         {
-            constexpr usize mask = (CT_SizeofInBits(value) - 1);
-
-            shift &= mask;
-            return (value >> shift) | (value << ( ~(shift-1) & mask ));
+            constexpr usize mask = (CT_SizeofInBits(x) - 1);
+            return (x >> (shift & mask)) | (x << ( ~(shift-1) & mask ));
         }
     } // _hidden_
 
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, T>  BitRotateRight (const T& x, usize shift) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, T>  BitRotateRight (const T x, const usize shift) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
       #ifdef __cpp_lib_bitops
         return T( std::rotr( ToNearUInt(x), int(shift) ));
@@ -458,13 +454,36 @@ namespace AE::Math
       #endif
     }
 
+/*
+=================================================
+    ShuffleBitScan
+----
+    returns < 0 if x == 0
+=================================================
+*/
+    template <typename T>
+    ND_ EnableIf<IsScalar<T>, int>  ShuffleBitScan (const T x, const usize shuffle) __NE___
+    {
+        StaticAssert( IsInteger<T> or IsEnum<T> );
+        ASSERT( shuffle >= 0 );
+
+        int off = int(shuffle & (CT_SizeofInBits(x) - 1));
+        int idx = BitScanForward( BitRotateLeft( x, shuffle ));
+
+        return  idx >= 0 ?
+                (idx >= off ?
+                    idx - off :
+                    int(CT_SizeofInBits(x)) - (off - idx)) :
+                -1;
+    }
+
 /*
 =================================================
     ToBitMask
 =================================================
 */
     template <typename R, typename T>
-    ND_ constexpr EnableIf<IsUnsignedInteger<R>, R>  ToBitMask (T count) __NE___
+    ND_ constexpr EnableIf<IsUnsignedInteger<R>, R>  ToBitMask (const T count) __NE___
     {
         if constexpr( IsUnsignedInteger<T> )
         {
@@ -480,7 +499,7 @@ namespace AE::Math
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsUnsignedInteger<T>, T>  ToBitMask (usize firstBit, usize count) __NE___
+    ND_ constexpr EnableIf<IsUnsignedInteger<T>, T>  ToBitMask (const usize firstBit, const usize count) __NE___
     {
         ASSERT( firstBit < CT_SizeOfInBits<T> );
         return SafeLeftBitShift( ToBitMask<T>( count ), firstBit );
@@ -492,7 +511,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsUnsignedInteger<T>, bool>  HasBit (const T &x, usize index) __NE___
+    ND_ constexpr EnableIf<IsUnsignedInteger<T>, bool>  HasBit (const T x, const usize index) __NE___
     {
         return (x & (T{1} << index)) != 0;
     }
@@ -503,13 +522,13 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsUnsignedInteger<T>, T>  ToBit (usize index) __NE___
+    ND_ constexpr EnableIf<IsUnsignedInteger<T>, T>  ToBit (const usize index) __NE___
     {
         return T{1} << index;
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsUnsignedInteger<T>, T>  ToBit (bool bit, usize index) __NE___
+    ND_ constexpr EnableIf<IsUnsignedInteger<T>, T>  ToBit (const bool bit, const usize index) __NE___
     {
         return T{bit} << index;
     }
@@ -533,9 +552,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ EnableIf<IsScalar<T>, T>  ByteSwap (const T &x) __NE___
+    ND_ EnableIf<IsScalar<T>, T>  ByteSwap (const T x) __NE___
     {
-        STATIC_ASSERT( IsEnum<T> or IsInteger<T> );
+        StaticAssert( IsEnum<T> or IsInteger<T> );
 
         if constexpr( sizeof(x) == 1 )
             return x;
@@ -613,7 +632,7 @@ namespace AE::Math
     enum class EnabledBitCount : uint {};
 
     template <typename T>
-    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const T &lhs, const T &rhs, const EnabledBitCount bitCount) __NE___
+    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const T lhs, const T rhs, const EnabledBitCount bitCount) __NE___
     {
         ASSERT( uint(bitCount) < sizeof(T)*8 );
 
@@ -631,7 +650,7 @@ namespace AE::Math
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const T &lhs, const T &rhs) __NE___
+    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const T lhs, const T rhs) __NE___
     {
         if constexpr( IsSameTypes< T, float >)
             return BitEqual( lhs, rhs, EnabledBitCount(28) );
diff --git a/AE/engine/src/base/Math/Bool32.h b/AE/engine/src/base/Math/Bool32.h
index 4fdaa61c..f25501d7 100644
--- a/AE/engine/src/base/Math/Bool32.h
+++ b/AE/engine/src/base/Math/Bool32.h
@@ -16,11 +16,43 @@ namespace AE::Math
     private:
         uint    _value  = 0;
 
+    private:
+        constexpr explicit Bool32 (uint val)                __NE___ : _value{val} {}
+
     public:
-        constexpr Bool32 ()             __NE___ {}
-        constexpr Bool32 (bool val)     __NE___ : _value{uint(val)} {}
+        constexpr Bool32 ()                                 __NE___ = default;
+        constexpr Bool32 (bool val)                         __NE___ : _value{uint(val)} {}
+
+        constexpr Bool32 (Bool32 &&)                        __NE___ = default;
+        constexpr Bool32 (const Bool32 &)                   __NE___ = default;
+
+        constexpr Bool32&  operator = (Bool32 &&)           __NE___ = default;
+        constexpr Bool32&  operator = (const Bool32 &)      __NE___ = default;
+        constexpr Bool32&  operator = (bool rhs)            __NE___ { _value = uint(rhs);  return *this; }
+
+        ND_ constexpr Bool32  operator not ()               C_NE___ { return Bool32{ ~_value }; }
+
+        ND_ constexpr Bool32  operator | (Bool32 rhs)       C_NE___ { return Bool32{ _value | rhs._value }; }
+        ND_ constexpr Bool32  operator & (Bool32 rhs)       C_NE___ { return Bool32{ _value & rhs._value }; }
+        ND_ constexpr Bool32  operator ^ (Bool32 rhs)       C_NE___ { return Bool32{ _value ^ rhs._value }; }
 
-        ND_ constexpr operator bool ()  C_NE___ { return _value != 0; }
+        ND_ constexpr Bool32  operator || (Bool32 rhs)      C_NE___ { return Bool32{ _value || rhs._value }; }
+        ND_ constexpr Bool32  operator && (Bool32 rhs)      C_NE___ { return Bool32{ _value && rhs._value }; }
+
+        ND_ constexpr Bool32&  operator |= (Bool32 rhs)     __NE___ { _value |= rhs._value;  return *this; }
+        ND_ constexpr Bool32&  operator &= (Bool32 rhs)     __NE___ { _value &= rhs._value;  return *this; }
+        ND_ constexpr Bool32&  operator ^= (Bool32 rhs)     __NE___ { _value ^= rhs._value;  return *this; }
+
+        ND_ constexpr operator bool ()                      C_NE___ { return _value != 0; }
     };
 
 } // AE::Math
+
+
+namespace AE::Base
+{
+    template <> struct TMemCopyAvailable< Bool32 >      { static constexpr bool  value = true; };
+    template <> struct TZeroMemAvailable< Bool32 >      { static constexpr bool  value = true; };
+    template <> struct TTriviallySerializable< Bool32 > { static constexpr bool  value = true; };
+
+} // AE::Base
diff --git a/AE/engine/src/base/Math/Bytes.h b/AE/engine/src/base/Math/Bytes.h
index 02b886c6..5aa03cfc 100644
--- a/AE/engine/src/base/Math/Bytes.h
+++ b/AE/engine/src/base/Math/Bytes.h
@@ -13,30 +13,33 @@ namespace AE::Math
     //
 
     template <typename T>
-    struct TBytes
+    struct TByte
     {
-        STATIC_ASSERT( IsInteger<T> and IsScalar<T>, "must be integer scalar" );
+        StaticAssert( IsInteger<T> and IsScalar<T>, "must be integer scalar" );
 
     // types
     public:
         using Value_t   = T;
-        using Self      = TBytes<T>;
+        using Self      = TByte<T>;
 
         struct SizeAndAlign
         {
             Self    size;
             Self    align;
 
-            constexpr SizeAndAlign ()                               __NE___ {}
-            constexpr SizeAndAlign (const SizeAndAlign &)           __NE___ = default;
+            constexpr SizeAndAlign ()                                                   __NE___ {}
+            constexpr SizeAndAlign (const SizeAndAlign &)                               __NE___ = default;
+            constexpr SizeAndAlign (SizeAndAlign &&)                                    __NE___ = default;
 
             template <typename B1, typename B2>
-            constexpr explicit SizeAndAlign (B1 inSize, B2 inAlign) __NE___ : size{inSize}, align{inAlign} {}
+            constexpr explicit SizeAndAlign (B1 inSize, B2 inAlign)                     __NE___ : size{inSize}, align{inAlign} {}
 
             template <typename B>
-            constexpr explicit SizeAndAlign (const B &other)        __NE___ : size{other.size}, align{other.align} {}
+            constexpr explicit SizeAndAlign (const B &other)                            __NE___ : size{other.size}, align{other.align} {}
 
-            constexpr SizeAndAlign  operator * (usize count)        C_NE___ { SizeAndAlign tmp{*this};  tmp.size *= count;  return tmp; }
+            constexpr explicit SizeAndAlign (std::size_t size, std::align_val_t align)  __NE___ : size{size}, align{align} {}
+
+            constexpr SizeAndAlign  operator * (usize count)                            C_NE___ { SizeAndAlign tmp{*this};  tmp.size *= count;  return tmp; }
         };
 
 
@@ -47,15 +50,15 @@ namespace AE::Math
 
     // methods
     public:
-        constexpr TBytes ()                                             __NE___ : _value{0} {}
-        constexpr TBytes (Base::_hidden_::_UMax)                        __NE___ : _value{UMax} {}
+        constexpr TByte ()                                              __NE___ : _value{0} {}
+        constexpr TByte (Base::_hidden_::_UMax)                         __NE___ : _value{UMax} {}
 
-        explicit constexpr TBytes (T value)                             __NE___ : _value{value} {}
-        explicit constexpr TBytes (std::align_val_t val)                __NE___ : _value{usize(val)} {}
-        explicit constexpr TBytes (const void* ptr)                     __NE___ : _value{BitCast<usize>(ptr)} {}
+        explicit constexpr TByte (T value)                              __NE___ : _value{value} {}
+        explicit constexpr TByte (std::align_val_t val)                 __NE___ : _value{usize(val)} {}
+        explicit constexpr TByte (const void* ptr)                      __NE___ : _value{BitCast<usize>(ptr)} {}
 
         template <typename B>
-        constexpr TBytes (const TBytes<B> &other)                       __NE___ : _value{CheckCast<T>(other)} {}
+        constexpr TByte (const TByte<B> &other)                         __NE___ : _value{CheckCast<T>(other)} {}
 
         ND_ explicit constexpr operator sbyte ()                        C_NE___ { return static_cast<sbyte >(_value); }
         ND_ explicit constexpr operator sshort ()                       C_NE___ { return static_cast<sshort>(_value); }
@@ -90,21 +93,21 @@ namespace AE::Math
         ND_ static constexpr Self   FromGb (T value)                    __NE___ { return Self( value << 30 ); }
 
 
-        template <typename B>   ND_ static constexpr Self           SizeOf ()                   __NE___ { STATIC_ASSERT( not IsVoid<B> );  return Self( sizeof(B) ); }
-        template <typename B>   ND_ static constexpr Self           SizeOf (const B &)          __NE___ { STATIC_ASSERT( not IsVoid<B> );  return Self( sizeof(B) ); }
+        template <typename B>   ND_ static constexpr Self           SizeOf ()                   __NE___ { StaticAssert( not IsVoid<B> );  return Self( sizeof(B) ); }
+        template <typename B>   ND_ static constexpr Self           SizeOf (const B &)          __NE___ { StaticAssert( not IsVoid<B> );  return Self( sizeof(B) ); }
 
-        template <typename B>   ND_ static constexpr Self           AlignOf ()                  __NE___ { STATIC_ASSERT( not IsVoid<B> );  return Self( alignof(B) ); }
-        template <typename B>   ND_ static constexpr Self           AlignOf (const B &)         __NE___ { STATIC_ASSERT( not IsVoid<B> );  return Self( alignof(B) ); }
+        template <typename B>   ND_ static constexpr Self           AlignOf ()                  __NE___ { StaticAssert( not IsVoid<B> );  return Self( alignof(B) ); }
+        template <typename B>   ND_ static constexpr Self           AlignOf (const B &)         __NE___ { StaticAssert( not IsVoid<B> );  return Self( alignof(B) ); }
 
         template <typename B>   ND_ static constexpr SizeAndAlign   SizeAndAlignOf ()           __NE___ { return SizeAndAlign{ SizeOf<B>(), AlignOf<B>() }; }
         template <typename B>   ND_ static constexpr SizeAndAlign   SizeAndAlignOf (const B &)  __NE___ { return SizeAndAlign{ SizeOf<B>(), AlignOf<B>() }; }
 
 
         // move any pointer
-        template <typename B>   ND_ friend B*  operator +  (B *lhs, const Self &rhs)    __NE___ { return BitCast<B *>( usize(lhs) + usize(rhs._value) ); }
-        template <typename B>   ND_ friend B*  operator -  (B *lhs, const Self &rhs)    __NE___ { return BitCast<B *>( usize(lhs) - usize(rhs._value) ); }
-        template <typename B>       friend B*& operator += (B* &lhs, const Self &rhs)   __NE___ { return (lhs = lhs + rhs); }
-        template <typename B>       friend B*& operator -= (B* &lhs, const Self &rhs)   __NE___ { return (lhs = lhs + rhs); }
+        template <typename B>   ND_ friend B*   operator +  (B* lhs, const Self &rhs)           __NE___ { return BitCast<B *>( usize(lhs) + usize(rhs._value) ); }
+        template <typename B>   ND_ friend B*   operator -  (B* lhs, const Self &rhs)           __NE___ { return BitCast<B *>( usize(lhs) - usize(rhs._value) ); }
+        template <typename B>       friend B*&  operator += (B* &lhs, const Self &rhs)          __NE___ { return (lhs = lhs + rhs); }
+        template <typename B>       friend B*&  operator -= (B* &lhs, const Self &rhs)          __NE___ { return (lhs = lhs + rhs); }
 
 
             constexpr Self& operator = (Base::_hidden_::_UMax)          __NE___ { _value = UMax;    return *this; }
@@ -185,18 +188,18 @@ namespace AE::Math
     };
 
 
-    using Bytes64u      = TBytes< ulong >;
-    using Bytes32u      = TBytes< uint >;
-    using Bytes16u      = TBytes< ushort >;
-    using Bytes8u       = TBytes< ubyte >;
-    using BytesUSize    = TBytes< usize >;
+    using Byte64u       = TByte< ulong >;
+    using Byte32u       = TByte< uint >;
+    using Byte16u       = TByte< ushort >;
+    using Byte8u        = TByte< ubyte >;
+    using ByteUSize     = TByte< usize >;
 
-    using Bytes64s      = TBytes< slong >;
-    using Bytes32s      = TBytes< int >;
-    using Bytes16s      = TBytes< short >;
-    using BytesSSize    = TBytes< ssize >;
+    using Byte64s       = TByte< slong >;
+    using Byte32s       = TByte< int >;
+    using Byte16s       = TByte< short >;
+    using ByteSSize     = TByte< ssize >;
 
-    using Bytes         = Bytes64u;
+    using Bytes         = Byte64u;
     using SizeAndAlign  = Bytes::SizeAndAlign;
 
     template <typename T>
@@ -232,7 +235,7 @@ namespace AE::Math
         };
 
         template <typename T>
-        struct _IsBytes< TBytes<T> > {
+        struct _IsBytes< TByte<T> > {
             static constexpr bool   value = true;
         };
     }
@@ -263,15 +266,15 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TBytes<T>  FloorPOT (const TBytes<T> x) __NE___
+    ND_ TByte<T>  FloorPOT (const TByte<T> x) __NE___
     {
-        return TBytes<T>{ FloorPOT( T{x} )};
+        return TByte<T>{ FloorPOT( T{x} )};
     }
 
     template <typename T>
-    ND_ TBytes<T>  CeilPOT (const TBytes<T> x) __NE___
+    ND_ TByte<T>  CeilPOT (const TByte<T> x) __NE___
     {
-        return TBytes<T>{ CeilPOT( T{x} )};
+        return TByte<T>{ CeilPOT( T{x} )};
     }
 
 /*
@@ -280,7 +283,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr bool  IsPowerOfTwo (const TBytes<T> x) __NE___
+    ND_ constexpr bool  IsPowerOfTwo (const TByte<T> x) __NE___
     {
         return IsPowerOfTwo( T{x} );
     }
@@ -290,27 +293,27 @@ namespace AE::Math
 
 namespace AE::Base
 {
-    template <typename T>   struct TMemCopyAvailable< TBytes<T> >       { static constexpr bool  value = IsMemCopyAvailable<T>; };
-    template <typename T>   struct TZeroMemAvailable< TBytes<T> >       { static constexpr bool  value = IsZeroMemAvailable<T>; };
-    template <typename T>   struct TTriviallySerializable< TBytes<T> >  { static constexpr bool  value = IsTriviallySerializable<T>; };
+    template <typename T>   struct TMemCopyAvailable< TByte<T> >        { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< TByte<T> >        { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< TByte<T> >   { static constexpr bool  value = IsTriviallySerializable<T>; };
 
 } // AE::Base
 
 
 template <typename T>
-struct std::hash< AE::Math::TBytes<T> >
+struct std::hash< AE::Math::TByte<T> >
 {
-    ND_ size_t  operator () (const AE::Math::TBytes<T> &value) C_NE___
+    ND_ size_t  operator () (const AE::Math::TByte<T> &value) C_NE___
     {
         return size_t(AE::Base::HashOf( T(value) ));
     }
 };
 
 template <typename T>
-class std::numeric_limits< AE::Math::TBytes<T> >
+class std::numeric_limits< AE::Math::TByte<T> >
 {
 private:
-    using Bytes = AE::Math::TBytes<T>;
+    using Bytes = AE::Math::TByte<T>;
     using Base  = std::numeric_limits<T>;
 
 public:
diff --git a/AE/engine/src/base/Math/Camera.h b/AE/engine/src/base/Math/Camera.h
index 9c49c1d2..d39362c8 100644
--- a/AE/engine/src/base/Math/Camera.h
+++ b/AE/engine/src/base/Math/Camera.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include "base/Math/Transformation.h"
-#include "base/Math/Radians.h"
 #include "base/Math/Rectangle.h"
 
 namespace AE::Math
@@ -23,7 +22,7 @@ namespace AE::Math
         using Quat_t        = typename Transform_t::Quat_t;
         using Rect_t        = Rectangle<T>;
         using Vec2_t        = Vec< T, 2 >;
-        using Radians_t     = TRadians<T>;
+        using Radians_t     = TRadian<T>;
         using Self          = TCamera<T>;
         using Value_t       = T;
 
diff --git a/AE/engine/src/base/Math/Color.h b/AE/engine/src/base/Math/Color.h
index f7a92ba9..5f251923 100644
--- a/AE/engine/src/base/Math/Color.h
+++ b/AE/engine/src/base/Math/Color.h
@@ -26,10 +26,10 @@ namespace AE::Math
         {
           #ifdef AE_COMPILETIME_OFFSETOF
             // check if supported cast from Color to array
-            STATIC_ASSERT( offsetof(Self, r) + sizeof(T) == offsetof(Self, g) );
-            STATIC_ASSERT( offsetof(Self, g) + sizeof(T) == offsetof(Self, b) );
-            STATIC_ASSERT( offsetof(Self, b) + sizeof(T) == offsetof(Self, a) );
-            STATIC_ASSERT( sizeof(T)*(size()-1) == (offsetof(Self, a) - offsetof(Self, r)) );
+            StaticAssert( offsetof(Self, r) + sizeof(T) == offsetof(Self, g) );
+            StaticAssert( offsetof(Self, g) + sizeof(T) == offsetof(Self, b) );
+            StaticAssert( offsetof(Self, b) + sizeof(T) == offsetof(Self, a) );
+            StaticAssert( sizeof(T)*(size()-1) == (offsetof(Self, a) - offsetof(Self, r)) );
           #endif
         }
 
@@ -88,7 +88,7 @@ namespace AE::Math
         ND_ constexpr bool  operator == (const DepthStencil &rhs)           C_NE___
         {
             constexpr float eps = 0.001f;
-            return Equals( depth, rhs.depth, eps ) & (stencil == rhs.stencil);
+            return Equal( depth, rhs.depth, eps ) & (stencil == rhs.stencil);
         }
 
         ND_ constexpr bool  operator != (const DepthStencil &rhs)           C_NE___ { return not (*this == rhs); }
@@ -313,6 +313,24 @@ namespace AE::Math
 
 
 
+/*
+=================================================
+    Rainbow / RainbowWrap
+=================================================
+*/
+    ND_ inline RGBA32f  Rainbow (const float factor) __NE___
+    {
+        return RGBA32f{ HSVColor{ Saturate( factor * 0.74f )}};
+    }
+
+    ND_ inline RGBA32f  RainbowWrap (const float factor) __NE___
+    {
+        return RGBA32f{ HSVColor{ Wrap( factor * 0.74f, 0.0f, 1.0f )}};
+    }
+//-----------------------------------------------------------------------------
+
+
+
 /*
 =================================================
     Min/Max/Clamp
@@ -338,34 +356,34 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals (RGBAColor)
+    Equal (RGBAColor)
 =================================================
 */
     template <typename T>
-    ND_ bool4  Equals (const RGBAColor<T> &lhs, const RGBAColor<T> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ bool4  Equal (const RGBAColor<T> &lhs, const RGBAColor<T> &rhs, const T err = Epsilon<T>()) __NE___
     {
-        return bool4{ Equals( lhs.r, rhs.r, err ), Equals( lhs.g, rhs.g, err ), Equals( lhs.b, rhs.b, err ), Equals( lhs.a, rhs.a, err )};
+        return bool4{ Equal( lhs.r, rhs.r, err ), Equal( lhs.g, rhs.g, err ), Equal( lhs.b, rhs.b, err ), Equal( lhs.a, rhs.a, err )};
     }
 
     template <typename T>
-    ND_ bool4  Equals (const RGBAColor<T> &lhs, const RGBAColor<T> &rhs, const Percent err) __NE___
+    ND_ bool4  Equal (const RGBAColor<T> &lhs, const RGBAColor<T> &rhs, const Percent err) __NE___
     {
-        return bool4{ Equals( lhs.r, rhs.r, err ), Equals( lhs.g, rhs.g, err ), Equals( lhs.b, rhs.b, err ), Equals( lhs.a, rhs.a, err )};
+        return bool4{ Equal( lhs.r, rhs.r, err ), Equal( lhs.g, rhs.g, err ), Equal( lhs.b, rhs.b, err ), Equal( lhs.a, rhs.a, err )};
     }
 
 /*
 =================================================
-    Equals (HSVColor)
+    Equal (HSVColor)
 =================================================
 */
-    ND_ inline bool3  Equals (const HSVColor &lhs, const HSVColor &rhs, const float err = Epsilon<float>()) __NE___
+    ND_ inline bool3  Equal (const HSVColor &lhs, const HSVColor &rhs, const float err = Epsilon<float>()) __NE___
     {
-        return bool3{ Equals( lhs.h, rhs.h, err ), Equals( lhs.s, rhs.s, err ), Equals( lhs.v, rhs.v, err )};
+        return bool3{ Equal( lhs.h, rhs.h, err ), Equal( lhs.s, rhs.s, err ), Equal( lhs.v, rhs.v, err )};
     }
 
-    ND_ inline bool3  Equals (const HSVColor &lhs, const HSVColor &rhs, const Percent err) __NE___
+    ND_ inline bool3  Equal (const HSVColor &lhs, const HSVColor &rhs, const Percent err) __NE___
     {
-        return bool3{ Equals( lhs.h, rhs.h, err ), Equals( lhs.s, rhs.s, err ), Equals( lhs.v, rhs.v, err )};
+        return bool3{ Equal( lhs.h, rhs.h, err ), Equal( lhs.s, rhs.s, err ), Equal( lhs.v, rhs.v, err )};
     }
 
 /*
diff --git a/AE/engine/src/base/Math/FPVCamera.h b/AE/engine/src/base/Math/FPVCamera.h
index 3907fb44..18cfde26 100644
--- a/AE/engine/src/base/Math/FPVCamera.h
+++ b/AE/engine/src/base/Math/FPVCamera.h
@@ -4,7 +4,6 @@
 
 #include "base/Math/Camera.h"
 #include "base/Math/Frustum.h"
-#include "base/Math/Radians.h"
 
 namespace AE::Math
 {
@@ -25,7 +24,7 @@ namespace AE::Math
         using Vec2_t        = typename Camera_t::Vec2_t;
         using Vec3_t        = typename Camera_t::Vec3_t;
         using Mat4_t        = typename Camera_t::Mat4_t;
-        using Rad_t         = TRadians<T>;
+        using Rad_t         = TRadian<T>;
         using Rad2_t        = RadianVec<T,2>;
         using Transform_t   = typename Camera_t::Transform_t;
 
@@ -68,7 +67,7 @@ namespace AE::Math
         ND_ Vec3_t  Transform3D (const Vec3_t &delta)                       C_NE___;    // free FPS camera
 
             Self&   SetPosition (const Vec3_t &pos)                         __NE___;
-            Self&   SetRotation (const Quat_t &q)                           __NE___;
+            Self&   ResetRotation ()                                        __NE___;
 
     private:
             void    _LimitRotation (INOUT Rad_t &horizontal, INOUT Rad_t &vertical);
@@ -202,13 +201,14 @@ namespace AE::Math
 
 /*
 =================================================
-    SetRotation
+    ResetRotation
 =================================================
 */
     template <typename T>
-    TFPVCamera<T>&  TFPVCamera<T>::SetRotation (const Quat_t &q) __NE___
+    TFPVCamera<T>&  TFPVCamera<T>::ResetRotation () __NE___
     {
-        _camera.transform.orientation = q;
+        _camera.transform.orientation   = Quat_t::Identity();
+        _vertAngle                      = Rad_t{};
         return *this;
     }
 
diff --git a/AE/engine/src/base/Math/FlightCamera.h b/AE/engine/src/base/Math/FlightCamera.h
index f3e20fe7..ded3683d 100644
--- a/AE/engine/src/base/Math/FlightCamera.h
+++ b/AE/engine/src/base/Math/FlightCamera.h
@@ -4,7 +4,6 @@
 
 #include "base/Math/Camera.h"
 #include "base/Math/Frustum.h"
-#include "base/Math/Radians.h"
 
 namespace AE::Math
 {
@@ -25,7 +24,7 @@ namespace AE::Math
         using Vec2_t        = typename Camera_t::Vec2_t;
         using Vec3_t        = typename Camera_t::Vec3_t;
         using Mat4_t        = typename Camera_t::Mat4_t;
-        using Rad_t         = TRadians<T>;
+        using Rad_t         = TRadian<T>;
         using Rad3_t        = RadianVec<T, 3>;
         using Transform_t   = typename Camera_t::Transform_t;
 
diff --git a/AE/engine/src/base/Math/Float16.h b/AE/engine/src/base/Math/Float16.h
index b8d2970c..2057c304 100644
--- a/AE/engine/src/base/Math/Float16.h
+++ b/AE/engine/src/base/Math/Float16.h
@@ -41,8 +41,8 @@ namespace AE::Math
             constexpr FloatBits () : f{0.f} {}
         };
 
-        STATIC_ASSERT( sizeof(glm::detail::hdata) == sizeof(HalfBits) );
-        STATIC_ASSERT( sizeof(glm::detail::hdata) == sizeof(ushort) );
+        StaticAssert( sizeof(glm::detail::hdata) == sizeof(HalfBits) );
+        StaticAssert( sizeof(glm::detail::hdata) == sizeof(ushort) );
 
 
     // variables
@@ -172,8 +172,8 @@ namespace AE::Math
             constexpr FloatBits () : f{0.f} {}
         };
 
-        STATIC_ASSERT( sizeof(ushort) == sizeof(HalfBits) );
-        STATIC_ASSERT( sizeof(float) == sizeof(FloatBits) );
+        StaticAssert( sizeof(ushort) == sizeof(HalfBits) );
+        StaticAssert( sizeof(float) == sizeof(FloatBits) );
 
 
     // variables
diff --git a/AE/engine/src/base/Math/Float8.h b/AE/engine/src/base/Math/Float8.h
index 1c76d4e0..727be605 100644
--- a/AE/engine/src/base/Math/Float8.h
+++ b/AE/engine/src/base/Math/Float8.h
@@ -57,7 +57,7 @@ namespace AE::Math
             constexpr FloatBits () : f{0.f} {}
         };
 
-        STATIC_ASSERT( sizeof(ubyte) == sizeof(Float8Bits) );
+        StaticAssert( sizeof(ubyte) == sizeof(Float8Bits) );
 
 
     // variables
diff --git a/AE/engine/src/base/Math/Fractional.h b/AE/engine/src/base/Math/Fractional.h
index fd3f018f..d04d50d9 100644
--- a/AE/engine/src/base/Math/Fractional.h
+++ b/AE/engine/src/base/Math/Fractional.h
@@ -15,15 +15,18 @@ namespace AE::Math
     struct Fractional
     {
     // types
+    public:
         using Self  = Fractional<T>;
 
 
     // variables
+    public:
         T   num {0};        // numerator
         T   den {1};        // denominator
 
 
     // methods
+    public:
         constexpr Fractional ()                                 __NE___ {}
 
         constexpr explicit Fractional (T inNum, T inDenom = T{1})   __NE___
diff --git a/AE/engine/src/base/Math/Frustum.h b/AE/engine/src/base/Math/Frustum.h
index 20a9eccc..5414be3e 100644
--- a/AE/engine/src/base/Math/Frustum.h
+++ b/AE/engine/src/base/Math/Frustum.h
@@ -141,7 +141,7 @@ namespace AE::Math
     inline void  TFrustum<T>::_SetPlane (EPlane type, T a, T b, T c, T d) __NE___
     {
         const T len     = Length(Vec3_t{ a, b, c });
-        const T inv_len = Equals( len, T{0}, _err ) ? T{1} : (T{1} / len); 
+        const T inv_len = Equal( len, T{0}, _err ) ? T{1} : (T{1} / len);
 
         _planes[ uint(type) ] = { Vec3_t{a, b, c} * inv_len, Abs(d) * inv_len };
     }
@@ -392,7 +392,7 @@ namespace AE::Math
         auto    dir = Cross( lp.norm, rp.norm );
         auto    len = LengthSq( dir );
 
-        if_unlikely( Equals( len, T{0}, _err ))
+        if_unlikely( Equal( len, T{0}, _err ))
             return false;
 
         result = dir * (T{1} / Sqrt(len));
diff --git a/AE/engine/src/base/Math/GLM.h b/AE/engine/src/base/Math/GLM.h
index 4906108b..823ac8b4 100644
--- a/AE/engine/src/base/Math/GLM.h
+++ b/AE/engine/src/base/Math/GLM.h
@@ -174,16 +174,14 @@
 #include "gtc/type_precision.hpp"
 #include "gtc/type_ptr.hpp"
 #include "gtc/ulp.hpp"
-#include "gtc/vec1.hpp"
 
 #include "gtx/matrix_decompose.hpp"
 #include "gtx/matrix_major_storage.hpp"
 #include "gtx/norm.hpp"
 #include "gtx/easing.hpp"
-
+#include "gtx/rotate_vector.hpp"
 #include "gtx/dual_quaternion.hpp"
 #include "gtx/intersect.hpp"
-
 #include "gtx/fast_exponential.hpp"
 #include "gtx/fast_square_root.hpp"
 #include "gtx/fast_trigonometry.hpp"
@@ -227,8 +225,17 @@ namespace AE::Base
     template <typename T, int I, glm::qualifier Q>
     struct TZeroMemAvailable< TVec<T,I,Q> > { static constexpr bool  value = IsZeroMemAvailable<T>; };
 
-    //template <typename T, int I, glm::qualifier Q>
-    //struct TTriviallySerializable< TVec<T,I,Q> > { static constexpr bool  value = IsTriviallySerializable<T>; };
+    // 'IsTriviallySerializable< TVec<> > = false' - because SIMD and packed types has different alignment
+
+    template <typename T, int I, glm::qualifier Q>
+    struct TNothrowCopyCtor< TVec<T,I,Q> > { static constexpr bool  value = true; };
+
+    template <typename T, int I, glm::qualifier Q>
+    struct TNothrowDefaultCtor< TVec<T,I,Q> > { static constexpr bool  value = true; };
+
+    template <typename T, int I, glm::qualifier Q, typename ...Args>
+    struct TNothrowCtor< TVec<T,I,Q>, Args... > { static constexpr bool  value = true; };
+
 
     template <typename T, glm::qualifier Q>
     struct TMemCopyAvailable< TQuat<T,Q> > { static constexpr bool  value = IsMemCopyAvailable<T>; };
@@ -236,8 +243,8 @@ namespace AE::Base
     template <typename T, glm::qualifier Q>
     struct TZeroMemAvailable< TQuat<T,Q> > { static constexpr bool  value = IsZeroMemAvailable<T>; };
 
-    //template <typename T, glm::qualifier Q>
-    //struct TTriviallySerializable< TQuat<T,Q> > { static constexpr bool  value = IsTriviallySerializable<T>; };
+    // 'IsTriviallySerializable< TQuat<> > = false' - because SIMD and packed types has different alignment
+
 
     template <typename T, uint Columns, uint Rows, glm::qualifier Q>
     struct TMemCopyAvailable< TMatrix<T, Columns, Rows, Q> > { static constexpr bool  value = IsMemCopyAvailable<T>; };
@@ -245,8 +252,7 @@ namespace AE::Base
     template <typename T, uint Columns, uint Rows, glm::qualifier Q>
     struct TZeroMemAvailable< TMatrix<T, Columns, Rows, Q> > { static constexpr bool  value = IsZeroMemAvailable<T>; };
 
-    //template <typename T, uint Columns, uint Rows, glm::qualifier Q>
-    //struct TTriviallySerializable< TMatrix<T, Columns, Rows, Q> > { static constexpr bool  value = IsTriviallySerializable<T>; };
+    // 'IsTriviallySerializable< TMatrix<> > = false' - because SIMD and packed types has different alignment
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Math/HashToColor.h b/AE/engine/src/base/Math/HashToColor.h
index 0cfc0b00..375abbd9 100644
--- a/AE/engine/src/base/Math/HashToColor.h
+++ b/AE/engine/src/base/Math/HashToColor.h
@@ -13,8 +13,8 @@ namespace _hidden_
     ND_ inline uint3  IWeylConst ()
     {
         return uint3{
-            0x3504f333u,    // W0 = 3*2309*128413 
-            0xf1bbcdcbu,    // W1 = 7*349*1660097 
+            0x3504f333u,    // W0 = 3*2309*128413
+            0xf1bbcdcbu,    // W1 = 7*349*1660097
             741103597u      // M  = 13*83*686843
         };
     }
@@ -80,21 +80,6 @@ namespace _hidden_
         return x;
     }
 
-/*
-=================================================
-    Rainbow / RainbowWrap
-=================================================
-*/
-    ND_ inline RGBA32f  Rainbow (const float factor) __NE___
-    {
-        return RGBA32f{ HSVColor{ Saturate( factor * 0.74f )}};
-    }
-
-    ND_ inline RGBA32f  RainbowWrap (const float factor) __NE___
-    {
-        return RGBA32f{ HSVColor{ Wrap( factor * 0.74f, 0.0f, 1.0f )}};
-    }
-
 /*
 =================================================
     StringToColor
@@ -133,7 +118,7 @@ namespace _hidden_
     template <typename C, typename T>
     void  IntToColor (OUT C &col, const T value) __NE___
     {
-        STATIC_ASSERT( IsInteger<T> );
+        StaticAssert( IsInteger<T> );
 
         HashVal u = HashOf( value );
         HashToColor( OUT col, u );
diff --git a/AE/engine/src/base/Math/Math.h b/AE/engine/src/base/Math/Math.h
index a6b3d2fc..9bbafbff 100644
--- a/AE/engine/src/base/Math/Math.h
+++ b/AE/engine/src/base/Math/Math.h
@@ -18,7 +18,7 @@ namespace AE::Math
     template <typename T1, typename T2>
     ND_ constexpr EnableIf<IsSignedInteger<T1> and IsSignedInteger<T2>, bool>  AdditionIsSafe (const T1 a, const T2 b) __NE___
     {
-        STATIC_ASSERT( IsScalar<T1> and IsScalar<T2> );
+        StaticAssert( IsScalar<T1> and IsScalar<T2> );
 
         using T = decltype(a + b);
 
@@ -40,7 +40,7 @@ namespace AE::Math
     template <typename T1, typename T2>
     ND_ constexpr EnableIf<IsUnsignedInteger<T1> and IsUnsignedInteger<T2>, bool>  AdditionIsSafe (const T1 a, const T2 b) __NE___
     {
-        STATIC_ASSERT( IsScalar<T1> and IsScalar<T2> );
+        StaticAssert( IsScalar<T1> and IsScalar<T2> );
 
         using T = decltype(a + b);
 
@@ -69,9 +69,9 @@ namespace AE::Math
     }
 
     template <typename T>
-    ND_ constexpr TBytes<T>  Average (TBytes<T> begin, TBytes<T> end) __NE___
+    ND_ constexpr TByte<T>  Average (TByte<T> begin, TByte<T> end) __NE___
     {
-        return TBytes<T>{ Average( T{begin}, T{end} )};
+        return TByte<T>{ Average( T{begin}, T{end} )};
     }
 
 /*
@@ -79,10 +79,15 @@ namespace AE::Math
     AlignDown
 =================================================
 */
-    template <typename T0, typename T1>
+    template <typename T0, typename T1,
+              ENABLEIF( IsScalar<T0> or IsBytes<T0> )
+             >
     ND_ constexpr auto  AlignDown (const T0 &value, const T1 &align) __NE___
     {
+        StaticAssert( (IsScalar<T0> or IsBytes<T0>) and (IsScalar<T1> or IsBytes<T1>) );
+        StaticAssert( not IsFloatPoint<T0> and not IsFloatPoint<T1> );
         ASSERT( align > 0 );
+
         if constexpr( IsPointer<T0> )
         {
             Bytes   byte_align{ align };
@@ -97,10 +102,15 @@ namespace AE::Math
     AlignUp
 =================================================
 */
-    template <typename T0, typename T1>
+    template <typename T0, typename T1,
+              ENABLEIF( IsScalar<T0> or IsBytes<T0> )
+             >
     ND_ constexpr auto  AlignUp (const T0 &value, const T1 &align) __NE___
     {
+        StaticAssert( (IsScalar<T0> or IsBytes<T0>) and (IsScalar<T1> or IsBytes<T1>) );
+        StaticAssert( not IsFloatPoint<T0> and not IsFloatPoint<T1> );
         ASSERT( align > 0 );
+
         if constexpr( IsPointer<T0> )
         {
             Bytes   byte_align{ align };
@@ -116,9 +126,12 @@ namespace AE::Math
 =================================================
 */
     template <typename T0, typename T1>
-    ND_ constexpr bool  IsMultipleOf (const T0 &value, const T1 &align) __NE___
+    ND_ constexpr EnableIf<IsScalar<T0> or IsBytes<T0>, bool>  IsMultipleOf (const T0 &value, const T1 &align) __NE___
     {
+        StaticAssert( (IsScalar<T0> or IsBytes<T0>) and (IsScalar<T1> or IsBytes<T1>) );
+        StaticAssert( not IsFloatPoint<T0> and not IsFloatPoint<T1> );
         ASSERT( align > 0 );
+
         if constexpr( IsPointer<T0> )
         {
             return BitCast<usize>(value) % Bytes{align} == 0;
@@ -188,11 +201,11 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals (scalar)
+    Equal (scalar)
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, bool>  Equals (const T &lhs, const T &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, bool>  Equal (const T &lhs, const T &rhs, const T err = Epsilon<T>()) __NE___
     {
         if constexpr( IsUnsignedInteger<T> )
         {
@@ -203,11 +216,11 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals (Optional)
+    Equal (Optional)
 =================================================
 */
     template <typename T>
-    ND_ constexpr bool  Equals (const Optional<T> &lhs, const Optional<T> &rhs) __NE___
+    ND_ constexpr bool  Equal (const Optional<T> &lhs, const Optional<T> &rhs) __NE___
     {
         return  lhs.has_value() == rhs.has_value()  and
                 (lhs.has_value() ? All( *lhs == *rhs ) : false);
@@ -221,7 +234,7 @@ namespace AE::Math
     template <typename T>
     ND_ constexpr EnableIf<IsScalar<T>, bool>  IsZero (const T &x) __NE___
     {
-        return Equals( x, T{0}, Epsilon<T>() );
+        return Equal( x, T{0}, Epsilon<T>() );
     }
 
     template <typename T>
@@ -232,11 +245,11 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, bool>  Equals (const T &lhs, const T &rhs, const Percent err) __NE___
+    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  Equal (const T &lhs, const T &rhs, const Percent err) __NE___
     {
         T   pct = std::abs( std::min( lhs, rhs ) / std::max( lhs, rhs ) - T{1});
 
@@ -285,7 +298,7 @@ namespace AE::Math
     template <typename T>
     ND_ auto  RoundToInt (const T& x) __NE___
     {
-        STATIC_ASSERT( IsFloatPoint<T> );
+        StaticAssert( IsFloatPoint<T> );
 
         if constexpr( sizeof(T) >= sizeof(slong) )
             return slong(std::round( x ));
@@ -297,7 +310,7 @@ namespace AE::Math
     template <typename T>
     ND_ auto  RoundToUint (const T& x) __NE___
     {
-        STATIC_ASSERT( IsFloatPoint<T> );
+        StaticAssert( IsFloatPoint<T> );
 
         if constexpr( sizeof(T) >= sizeof(ulong) )
             return ulong(std::round( x ));
@@ -319,6 +332,46 @@ namespace AE::Math
         return x - Floor( x );
     }
 
+/*
+=================================================
+    Wrap (float)
+=================================================
+*/
+    template <typename T>
+    ND_ constexpr EnableIf<IsFloatPoint<T>, T>  Wrap (const T& value, const T& minValue, const T& maxValue) __NE___
+    {
+        // check for NaN
+        if_unlikely( minValue >= maxValue )
+            return minValue;
+
+        T   result = T( minValue + std::fmod( value - minValue, maxValue - minValue ));
+
+        if ( result < minValue )
+            result += (maxValue - minValue);
+
+        return result;
+    }
+
+/*
+=================================================
+    Wrap (int)
+=================================================
+*/
+    template <typename T>
+    ND_ constexpr EnableIf<IsInteger<T>, T>  Wrap (const T& value, const T& minValue, const T& maxValue) __NE___
+    {
+        // check for div by zero
+        if_unlikely( minValue > maxValue )
+            return minValue;
+
+        T   result = T( minValue + ((value - minValue) % (maxValue - minValue + 1)) );
+
+        if ( result < minValue )
+            result += (maxValue - minValue + 1);
+
+        return result;
+    }
+
 /*
 =================================================
     IsIntersects
@@ -327,10 +380,12 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr bool  IsIntersects (const T& begin1, const T& end1,
-                                      const T& begin2, const T& end2) __NE___
+    ND_ constexpr bool  IsIntersects (const T begin1, const T end1,
+                                      const T begin2, const T end2) __NE___
     {
-        STATIC_ASSERT( IsScalar<T> or IsPointer<T> or IsBytes<T> );
+        StaticAssert( IsScalar<T> or IsPointer<T> or IsBytes<T> );
+        ASSERT( begin1 <= end1 );
+        ASSERT( begin2 <= end2 );
         return (end1 > begin2) & (begin1 < end2);
     }
 
@@ -343,7 +398,7 @@ namespace AE::Math
     ND_ constexpr bool  IsCompletelyInside (const T& largeBlockBegin, const T& largeBlockEnd,
                                             const T& smallBlockBegin, const T& smallBlockEnd) __NE___
     {
-        STATIC_ASSERT( IsScalar<T> or IsPointer<T> or IsBytes<T> );
+        StaticAssert( IsScalar<T> or IsPointer<T> or IsBytes<T> );
         return (smallBlockBegin >= largeBlockBegin) & (smallBlockEnd <= largeBlockEnd);
     }
 
@@ -357,7 +412,7 @@ namespace AE::Math
                                          const T& begin2, const T& end2,
                                          OUT T& outBegin, OUT T& outEnd) __NE___
     {
-        STATIC_ASSERT( IsScalar<T> or IsPointer<T> or IsBytes<T> );
+        StaticAssert( IsScalar<T> or IsPointer<T> or IsBytes<T> );
         outBegin = Max( begin1, begin2 );
         outEnd   = Min( end1, end2 );
         return outBegin < outEnd;
@@ -617,5 +672,80 @@ namespace AE::Math
         return unorm * T(2.0) - T(1.0);
     }
 
+/*
+=================================================
+    UIndexToUNormFloor / UIndexToUNormRound
+=================================================
+*/
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  UIndexToUNormFloor (const T index, const T count) __NE___
+    {
+        // range [0, 1]
+        using F = ToFloatPoint<T>;
+        return F(index) / F(count - T(1));
+    }
+
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  UIndexToUNormRound (const T index, const T count) __NE___
+    {
+        // range (0, 1)
+        using F = ToFloatPoint<T>;
+        return (F(index) + F(0.5)) / F(count);
+    }
+
+/*
+=================================================
+    UIndexToSNormFloor / UIndexToSNormRound
+=================================================
+*/
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  UIndexToSNormFloor (const T index, const T count) __NE___
+    {
+        return ToSNorm( UIndexToUNormFloor( index, count ));
+    }
+
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  UIndexToSNormRound (const T index, const T count) __NE___
+    {
+        return ToSNorm( UIndexToUNormRound( index, count ));
+    }
+
+/*
+=================================================
+    SIndexToUNormFloor / SIndexToUNormRound
+=================================================
+*/
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  SIndexToUNormFloor (const T index, const T min, const T max) __NE___
+    {
+        // range [-1 .. +1]
+        using F = ToFloatPoint<T>;
+        return F(index - min) / F(max - min - T(1));
+    }
+
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  SIndexToUNormRound (const T index, const T min, const T max) __NE___
+    {
+        // range (-1 .. +1)
+        using F = ToFloatPoint<T>;
+        return (F(index - min) + F(0.5)) / F(max - min);
+    }
+
+/*
+=================================================
+    SIndexToSNormFloor / SIndexToSNormRound
+=================================================
+*/
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  SIndexToSNormFloor (const T index, const T min, const T max) __NE___
+    {
+        return ToSNorm( SIndexToUNormFloor( index, min, max ));
+    }
+
+    template <typename T>
+    ND_ constexpr EnableIf<IsScalar<T>, ToFloatPoint<T>>  SIndexToSNormRound (const T index, const T min, const T max) __NE___
+    {
+        return ToSNorm( SIndexToUNormRound( index, min, max ));
+    }
 
 } // AE::Math
diff --git a/AE/engine/src/base/Math/Matrix.h b/AE/engine/src/base/Math/Matrix.h
index 01c59e69..ee3374f1 100644
--- a/AE/engine/src/base/Math/Matrix.h
+++ b/AE/engine/src/base/Math/Matrix.h
@@ -4,7 +4,7 @@
 
 #include "base/Math/Vec.h"
 #include "base/Math/Quat.h"
-#include "base/Math/Radians.h"
+#include "base/Math/Radian.h"
 #include "base/Math/Rectangle.h"
 
 namespace AE::Math
@@ -155,25 +155,25 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T, uint C, uint R, glm::qualifier Q>
-    ND_ bool  Equals (const TMatrix<T,C,R,Q> &lhs, const TMatrix<T,C,R,Q> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ bool  Equal (const TMatrix<T,C,R,Q> &lhs, const TMatrix<T,C,R,Q> &rhs, const T err = Epsilon<T>()) __NE___
     {
         uint    eq = 1;
         for (uint i = 0; i < C; ++i) {
-            eq &= All( Equals( lhs[i], rhs[i], err ));
+            eq &= All( Equal( lhs[i], rhs[i], err ));
         }
         return eq == 1;
     }
 
     template <typename T, uint C, uint R, glm::qualifier Q>
-    ND_ bool  Equals (const TMatrix<T,C,R,Q> &lhs, const TMatrix<T,C,R,Q> &rhs, const Percent err) __NE___
+    ND_ bool  Equal (const TMatrix<T,C,R,Q> &lhs, const TMatrix<T,C,R,Q> &rhs, const Percent err) __NE___
     {
         uint    eq = 1;
         for (uint i = 0; i < C; ++i) {
-            eq &= All( Equals( lhs[i], rhs[i], err ));
+            eq &= All( Equal( lhs[i], rhs[i], err ));
         }
         return eq == 1;
     }
diff --git a/AE/engine/src/base/Math/MatrixImpl.h b/AE/engine/src/base/Math/MatrixImpl.h
index dd1f4e93..020dcfb3 100644
--- a/AE/engine/src/base/Math/MatrixImpl.h
+++ b/AE/engine/src/base/Math/MatrixImpl.h
@@ -22,7 +22,7 @@ namespace AE::Math
         using Vec2_t        = TVec< T, 2, Q >;
         using Vec3_t        = TVec< T, 3, Q >;
         using Vec4_t        = TVec< T, 4, Q >;
-        using Rad_t         = TRadians<T>;
+        using Rad_t         = TRadian<T>;
 
 
     // variables
@@ -79,7 +79,7 @@ namespace AE::Math
         ND_ Self    operator - ()                                                       C_NE___ { return Self{ -_value }; }
 
             Self&   operator = (const Self &rhs)                                        __NE___ = default;
-            Self&   operator = (Self && rhs)                                            __NE___ = default;
+            Self&   operator = (Self &&rhs)                                             __NE___ = default;
 
         ND_ Self    operator +  (T rhs)                                                 C_NE___ { return Self{ _value + rhs }; }
         ND_ Self    operator -  (T rhs)                                                 C_NE___ { return Self{ _value - rhs }; }
@@ -110,16 +110,16 @@ namespace AE::Math
         ND_ Col_t const&            operator [] (usize c)                               C_NE___ { ASSERT( c < Columns );  return _value[ glm::length_t(c) ]; }
         ND_ Col_t&                  operator [] (usize c)                               __NE___ { ASSERT( c < Columns );  return _value[ glm::length_t(c) ]; }
 
-        template <uint C>           ND_ Col_t const&    get ()                          C_NE___ { STATIC_ASSERT( C < Columns );  return _value[C]; }
-        template <uint C>           ND_ Col_t &         get ()                          __NE___ { STATIC_ASSERT( C < Columns );  return _value[C]; }
+        template <uint C>           ND_ Col_t const&    get ()                          C_NE___ { StaticAssert( C < Columns );  return _value[C]; }
+        template <uint C>           ND_ Col_t &         get ()                          __NE___ { StaticAssert( C < Columns );  return _value[C]; }
 
 
         // return scalar
         ND_ const T                 operator () (usize c, usize r)                      C_NE___ { ASSERT( c < Columns and r < Rows );  return _value[glm::length_t(c)][glm::length_t(r)]; }
         ND_ T &                     operator () (usize c, usize r)                      __NE___ { ASSERT( c < Columns and r < Rows );  return _value[glm::length_t(c)][glm::length_t(r)]; }
 
-        template <uint C, uint R>   ND_ const T get ()                                  C_NE___ { STATIC_ASSERT( C < Columns and R < Rows );  return _value[C][R]; }
-        template <uint C, uint R>   ND_ T &     get ()                                  __NE___ { STATIC_ASSERT( C < Columns and R < Rows );  return _value[C][R]; }
+        template <uint C, uint R>   ND_ const T get ()                                  C_NE___ { StaticAssert( C < Columns and R < Rows );  return _value[C][R]; }
+        template <uint C, uint R>   ND_ T &     get ()                                  __NE___ { StaticAssert( C < Columns and R < Rows );  return _value[C][R]; }
 
 
         // access to array
@@ -352,7 +352,7 @@ namespace AE::Math
         result[2][3] = T(1);
         result[3][2] = - zNear;
         return result;
-    }   
+    }
 
 /*
 =================================================
diff --git a/AE/engine/src/base/Math/MatrixStorage.h b/AE/engine/src/base/Math/MatrixStorage.h
index 6cd1ab3b..a1467f05 100644
--- a/AE/engine/src/base/Math/MatrixStorage.h
+++ b/AE/engine/src/base/Math/MatrixStorage.h
@@ -89,7 +89,7 @@ namespace AE::Math
     template <typename T, uint Columns, uint Rows, usize Align>
     struct MatrixStorage< T, Columns, Rows, EMatrixOrder::ColumnMajor, Align >
     {
-        STATIC_ASSERT( IsAnyFloatPoint<T> );
+        StaticAssert( IsAnyFloatPoint<T> );
 
     // types
     public:
@@ -107,8 +107,8 @@ namespace AE::Math
     private:
         using _Columns_t    = StaticArray< _AlignedVec, Columns >;
 
-        STATIC_ASSERT( Align >= alignof(T) );
-        STATIC_ASSERT( sizeof(_Columns_t) == (AlignUp( sizeof(T) * Rows, Align ) * Columns) );
+        StaticAssert( Align >= alignof(T) );
+        StaticAssert( sizeof(_Columns_t) == (AlignUp( sizeof(T) * Rows, Align ) * Columns) );
 
 
     // variables
@@ -135,7 +135,7 @@ namespace AE::Math
             if constexpr( CountOf<Arg0, Args...>() == Columns )
                 _CopyColumns<0>( arg0, args... );
             else
-                STATIC_ASSERT(  (CountOf<Arg0, Args...>() == Columns * Rows) or
+                StaticAssert(  (CountOf<Arg0, Args...>() == Columns * Rows) or
                                 (CountOf<Arg0, Args...>() == Columns) );
         }
 
@@ -162,21 +162,21 @@ namespace AE::Math
         template <uint Columns2, uint Rows2, usize Align2>
         constexpr explicit MatrixStorage (const MatrixStorage< T, Columns2, Rows2, EMatrixOrder::ColumnMajor, Align2 > &other) __NE___
         {
-            STATIC_ASSERT( Columns != Columns2 or Rows != Rows2 );
+            StaticAssert( Columns != Columns2 or Rows != Rows2 );
             _CopyColumnMajor< Columns2, Rows2 >( other );
         }
 
         template <uint Columns2, uint Rows2, usize Align2>
         constexpr explicit MatrixStorage (const MatrixStorage< T, Rows2, Columns2, EMatrixOrder::RowMajor, Align2 > &other) __NE___
         {
-            STATIC_ASSERT( Columns != Columns2 or Rows != Rows2 );
+            StaticAssert( Columns != Columns2 or Rows != Rows2 );
             _CopyRowMajor< Columns2, Rows2 >( other );
         }
 
         template <uint Columns2, uint Rows2, glm::qualifier Q>
         explicit MatrixStorage (const TMatrix< T, Columns2, Rows2, Q > &other) __NE___
         {
-            STATIC_ASSERT( Columns != Columns2 or Rows != Rows2 );
+            StaticAssert( Columns != Columns2 or Rows != Rows2 );
             _CopyColumnMajor< Columns2, Rows2 >( other );
         }
 
@@ -209,15 +209,15 @@ namespace AE::Math
                 return Column_t{ d[0], d[1], d[2], d[3] };
         }
 
-        template <uint C>   ND_ const Column_t  get ()              C_NE___ { STATIC_ASSERT( C < Columns );  return (*this)[C]; }
+        template <uint C>   ND_ const Column_t  get ()              C_NE___ { StaticAssert( C < Columns );  return (*this)[C]; }
 
 
         // return scalar
         ND_ constexpr const T   operator () (usize c, usize r)      C_NE___ { ASSERT( c < Columns and r < Rows );  return _columns[c].data[r]; }
         ND_ constexpr T &       operator () (usize c, usize r)      __NE___ { ASSERT( c < Columns and r < Rows );  return _columns[c].data[r]; }
 
-        template <uint C, uint R>   ND_ constexpr const T   get ()  C_NE___ { STATIC_ASSERT( C < Columns and R < Rows );  return _columns[C].data[R]; }
-        template <uint C, uint R>   ND_ constexpr T &       get ()  __NE___ { STATIC_ASSERT( C < Columns and R < Rows );  return _columns[C].data[R]; }
+        template <uint C, uint R>   ND_ constexpr const T   get ()  C_NE___ { StaticAssert( C < Columns and R < Rows );  return _columns[C].data[R]; }
+        template <uint C, uint R>   ND_ constexpr T &       get ()  __NE___ { StaticAssert( C < Columns and R < Rows );  return _columns[C].data[R]; }
 
 
         template <uint Columns2, uint Rows2, glm::qualifier Q>
@@ -242,7 +242,7 @@ namespace AE::Math
         template <uint I, typename Arg0, typename ...Args>
         constexpr void  _CopyScalars (const Arg0 &arg0, const Args& ...args) __NE___
         {
-            STATIC_ASSERT( IsScalar<Arg0> );
+            StaticAssert( IsScalar<Arg0> );
             _columns[I / Rows].data[I % Rows] = arg0;
 
             if constexpr( I+1 < Columns * Rows )
@@ -252,7 +252,7 @@ namespace AE::Math
         template <uint I, typename Arg0, typename ...Args>
         constexpr void  _CopyColumns (const Arg0 &arg0, const Args& ...args) __NE___
         {
-            STATIC_ASSERT( IsSameTypes< Arg0, Column_t > );
+            StaticAssert( IsSameTypes< Arg0, Column_t > );
             std::memcpy( OUT _columns[I].data, &arg0.x, sizeof(T)*Rows );
 
             if constexpr( I+1 < Columns )
@@ -287,7 +287,7 @@ namespace AE::Math
     template <typename T, uint Rows, uint Columns, usize Align>
     struct MatrixStorage< T, Rows, Columns, EMatrixOrder::RowMajor, Align >
     {
-        STATIC_ASSERT( IsAnyFloatPoint<T> );
+        StaticAssert( IsAnyFloatPoint<T> );
 
     // types
     public:
@@ -306,8 +306,8 @@ namespace AE::Math
     private:
         using _Rows_t       = StaticArray< _AlignedVec, Rows >;
 
-        STATIC_ASSERT( Align >= alignof(T) );
-        STATIC_ASSERT( sizeof(_Rows_t) == (AlignUp( sizeof(T) * Columns, Align ) * Rows) );
+        StaticAssert( Align >= alignof(T) );
+        StaticAssert( sizeof(_Rows_t) == (AlignUp( sizeof(T) * Columns, Align ) * Rows) );
 
 
     // variables
@@ -337,7 +337,7 @@ namespace AE::Math
             if constexpr( CountOf<Arg0, Args...>() == Rows )
                 _CopyRows<0>( arg0, args... );
             else
-                STATIC_ASSERT(  (CountOf<Arg0, Args...>() == Columns * Rows) or
+                StaticAssert(  (CountOf<Arg0, Args...>() == Columns * Rows) or
                                 (CountOf<Arg0, Args...>() == Rows) );
         }
 
@@ -364,21 +364,21 @@ namespace AE::Math
         template <uint Columns2, uint Rows2, usize Align2>
         constexpr explicit MatrixStorage (const MatrixStorage< T, Rows2, Columns2, EMatrixOrder::RowMajor, Align2 > &other) __NE___
         {
-            STATIC_ASSERT( Columns != Columns2 or Rows != Rows2 );
+            StaticAssert( Columns != Columns2 or Rows != Rows2 );
             _CopyRowMajor< Columns2, Rows2 >( other );
         }
 
         template <uint Columns2, uint Rows2, usize Align2>
         constexpr explicit MatrixStorage (const MatrixStorage< T, Columns2, Rows2, EMatrixOrder::ColumnMajor, Align2 > &other) __NE___
         {
-            STATIC_ASSERT( Columns != Columns2 or Rows != Rows2 );
+            StaticAssert( Columns != Columns2 or Rows != Rows2 );
             _CopyColumnMajor< Columns2, Rows2 >( other );
         }
 
         template <uint Columns2, uint Rows2, glm::qualifier Q>
         explicit MatrixStorage (const TMatrix< T, Columns2, Rows2, Q > &other) __NE___
         {
-            STATIC_ASSERT( Columns != Columns2 or Rows != Rows2 );
+            StaticAssert( Columns != Columns2 or Rows != Rows2 );
             _CopyColumnMajor< Columns2, Rows2 >( other );
         }
 
@@ -410,15 +410,15 @@ namespace AE::Math
                 return Row_t{ d[0], d[1], d[2], d[3] };
         }
 
-        template <uint R>   ND_ const Row_t     get ()                  C_NE___ { STATIC_ASSERT( R < Rows );  return (*this)[R]; }
+        template <uint R>   ND_ const Row_t     get ()                  C_NE___ { StaticAssert( R < Rows );  return (*this)[R]; }
 
 
         // return scalar
         ND_ constexpr const T       operator () (usize r, usize c)      C_NE___ { ASSERT( c < Columns and r < Rows );  return _rows[r].data[c]; }
         ND_ constexpr T &           operator () (usize r, usize c)      __NE___ { ASSERT( c < Columns and r < Rows );  return _rows[r].data[c]; }
 
-        template <uint R, uint C>   ND_ constexpr const T   get ()      C_NE___ { STATIC_ASSERT( C < Columns and R < Rows );  return _rows[R].data[C]; }
-        template <uint R, uint C>   ND_ constexpr T &       get ()      __NE___ { STATIC_ASSERT( C < Columns and R < Rows );  return _rows[R].data[C]; }
+        template <uint R, uint C>   ND_ constexpr const T   get ()      C_NE___ { StaticAssert( C < Columns and R < Rows );  return _rows[R].data[C]; }
+        template <uint R, uint C>   ND_ constexpr T &       get ()      __NE___ { StaticAssert( C < Columns and R < Rows );  return _rows[R].data[C]; }
 
 
         template <uint Columns2, uint Rows2, glm::qualifier Q>
@@ -443,7 +443,7 @@ namespace AE::Math
         template <uint I, typename Arg0, typename ...Args>
         constexpr void  _CopyScalars (const Arg0 &arg0, const Args& ...args) __NE___
         {
-            STATIC_ASSERT( IsScalar<Arg0> );
+            StaticAssert( IsScalar<Arg0> );
             _rows[I / Columns].data[I % Columns] = arg0;
 
             if constexpr( I+1 < Columns * Rows )
@@ -453,7 +453,7 @@ namespace AE::Math
         template <uint I, typename Arg0, typename ...Args>
         constexpr void  _CopyRows (const Arg0 &arg0, const Args& ...args) __NE___
         {
-            STATIC_ASSERT( IsSameTypes< Arg0, Row_t > );
+            StaticAssert( IsSameTypes< Arg0, Row_t > );
             std::memcpy( OUT _rows[I].data, &arg0.x, sizeof(T)*Columns );
 
             if constexpr( I+1 < Rows )
@@ -486,11 +486,12 @@ namespace AE::Math
 namespace AE::Base
 {
     template <typename T, uint Columns, uint Rows, EMatrixOrder Order, usize Align>
-    struct TMemCopyAvailable< MatrixStorage< T, Columns, Rows, Order, Align >> { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    struct TMemCopyAvailable< MatrixStorage< T, Columns, Rows, Order, Align >>      { static constexpr bool  value = IsMemCopyAvailable<T>; };
 
     template <typename T, uint Columns, uint Rows, EMatrixOrder Order, usize Align>
-    struct TZeroMemAvailable< MatrixStorage< T, Columns, Rows, Order, Align >> { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    struct TZeroMemAvailable< MatrixStorage< T, Columns, Rows, Order, Align >>      { static constexpr bool  value = IsZeroMemAvailable<T>; };
 
+    // alignment is same on all platforms
     template <typename T, uint Columns, uint Rows, EMatrixOrder Order, usize Align>
     struct TTriviallySerializable< MatrixStorage< T, Columns, Rows, Order, Align >> { static constexpr bool  value = IsTriviallySerializable<T>; };
 
diff --git a/AE/engine/src/base/Math/OrbitalCamera.h b/AE/engine/src/base/Math/OrbitalCamera.h
index dc6a83d4..7c312e1d 100644
--- a/AE/engine/src/base/Math/OrbitalCamera.h
+++ b/AE/engine/src/base/Math/OrbitalCamera.h
@@ -4,7 +4,6 @@
 
 #include "base/Math/Camera.h"
 #include "base/Math/Frustum.h"
-#include "base/Math/Radians.h"
 
 namespace AE::Math
 {
@@ -25,7 +24,7 @@ namespace AE::Math
         using Vec2_t        = typename Camera_t::Vec2_t;
         using Vec3_t        = typename Camera_t::Vec3_t;
         using Mat4_t        = typename Camera_t::Mat4_t;
-        using Rad_t         = TRadians<T>;
+        using Rad_t         = TRadian<T>;
         using Rad2_t        = RadianVec<T,2>;
         using Transform_t   = typename Camera_t::Transform_t;
 
@@ -99,7 +98,7 @@ namespace AE::Math
 
         Quat_t&     q = _camera.transform.orientation;
 
-        q = Quat_t::RotateY( horizontal ) * q;
+        q = Quat_t::RotateY( -horizontal ) * q;
         q = Quat_t::Rotate( vertical, q * Vec3_t{ T{1}, T{0}, T{0} }) * q;
         q.Normalize();
 
diff --git a/AE/engine/src/base/Math/POTValue.h b/AE/engine/src/base/Math/POTValue.h
index de2fc995..7fe930ca 100644
--- a/AE/engine/src/base/Math/POTValue.h
+++ b/AE/engine/src/base/Math/POTValue.h
@@ -20,7 +20,7 @@ namespace AE::Math
     template <typename T>
     struct TPowerOf2Value
     {
-        STATIC_ASSERT( IsInteger<T> or IsBytes<T> );
+        StaticAssert( IsInteger<T> or IsBytes<T> );
 
     // types
     public:
@@ -69,7 +69,7 @@ namespace AE::Math
         ND_ constexpr uint      GetPOT ()                           C_NE___ { return _pot; }
 
         template <typename IT>
-        ND_ constexpr IT        BitMask ()                          C_NE___ { STATIC_ASSERT( IsUnsignedInteger<IT> );  return _pot < CT_SizeOfInBits<IT> ? (IT{1} << _pot) - 1 : ~IT{0}; }
+        ND_ constexpr IT        BitMask ()                          C_NE___ { StaticAssert( IsUnsignedInteger<IT> );  return _pot < CT_SizeOfInBits<IT> ? (IT{1} << _pot) - 1 : ~IT{0}; }
 
         template <typename IT>
         ND_ constexpr IT        InvBitMask ()                       C_NE___ { return ~BitMask(); }
@@ -132,10 +132,10 @@ namespace AE::Math
 
 
     template <typename T>
-    inline static constexpr POTValue    POTSizeOf       {PowerOfTwo( CT_IntLog2<sizeof(T)> )};
+    inline static constexpr POTBytes    POTSizeOf       {PowerOfTwo( CT_IntLog2<sizeof(T)> )};
 
     template <typename T>
-    inline static constexpr POTValue    POTAlignOf      {PowerOfTwo( CT_IntLog2<alignof(T)> )};
+    inline static constexpr POTBytes    POTAlignOf      {PowerOfTwo( CT_IntLog2<alignof(T)> )};
 
     template <auto X>
     inline static constexpr POTValue    POTValue_From   {PowerOfTwo( CT_IntLog2<X> )};
@@ -194,7 +194,7 @@ namespace AE::Math
     template <typename T, typename T1>
     ND_ constexpr auto  AlignDown (const T &value, const TPowerOf2Value<T1> alignPOT) __NE___
     {
-        STATIC_ASSERT( not IsPowerOf2Value<T> );
+        StaticAssert( not IsPowerOf2Value<T> );
 
         const auto  pot = alignPOT.GetPOT();
 
@@ -206,6 +206,9 @@ namespace AE::Math
         else
         if constexpr( IsInteger<T> )
             return (value >> pot) << pot;
+        else
+        if constexpr( IsIntegerVec<T> )
+            return (value >> pot) << pot;
     }
 
 /*
@@ -216,7 +219,7 @@ namespace AE::Math
     template <typename T, typename T1>
     ND_ constexpr auto  AlignUp (const T &value, const TPowerOf2Value<T1> alignPOT) __NE___
     {
-        STATIC_ASSERT( not IsPowerOf2Value<T> );
+        StaticAssert( not IsPowerOf2Value<T> );
 
         const auto  pot = alignPOT.GetPOT();
 
@@ -231,6 +234,11 @@ namespace AE::Math
             return T{ (value.get() + mask) & ~mask };
         }else
         if constexpr( IsInteger<T> )
+        {
+            const auto  mask = (T{1} << pot) - 1;
+            return (value + mask) & ~mask;
+        }else
+        if constexpr( IsIntegerVec<T> )
         {
             const auto  mask = (T{1} << pot) - 1;
             return (value + mask) & ~mask;
@@ -245,7 +253,7 @@ namespace AE::Math
     template <typename T, typename T1>
     ND_ constexpr bool  IsMultipleOf (const T &value, const TPowerOf2Value<T1> alignPOT) __NE___
     {
-        STATIC_ASSERT( not IsPowerOf2Value<T> );
+        StaticAssert( not IsPowerOf2Value<T> );
 
         const auto  pot = alignPOT.GetPOT();
 
@@ -260,3 +268,11 @@ namespace AE::Math
     }
 
 } // AE::Math
+
+namespace AE::Base
+{
+    template <typename T>   struct TMemCopyAvailable< TPowerOf2Value<T> >       { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< TPowerOf2Value<T> >       { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< TPowerOf2Value<T> >  { static constexpr bool  value = IsTriviallySerializable<T>; };
+
+} // AE::Base
diff --git a/AE/engine/src/base/Math/PackedInt.h b/AE/engine/src/base/Math/PackedInt.h
index 4ae6b278..165b3106 100644
--- a/AE/engine/src/base/Math/PackedInt.h
+++ b/AE/engine/src/base/Math/PackedInt.h
@@ -16,7 +16,7 @@ namespace AE::Math
     template <typename T>
     struct PackedInt
     {
-        STATIC_ASSERT( IsUnsignedInteger<T> );
+        StaticAssert( IsUnsignedInteger<T> );
 
     // types
     public:
@@ -24,7 +24,7 @@ namespace AE::Math
         using Value_t   = T;
         using HalfInt_t = ByteSizeToUInt< sizeof(T)/2 >;
 
-        STATIC_ASSERT( sizeof(Value_t) == sizeof(HalfInt_t)*2 );
+        StaticAssert( sizeof(Value_t) == sizeof(HalfInt_t)*2 );
 
         static constexpr uint   _Offset = CT_SizeOfInBits< HalfInt_t >;
         static constexpr uint   _Mask   = ToBitMask< HalfInt_t >( _Offset );
@@ -41,7 +41,7 @@ namespace AE::Math
         constexpr PackedInt ()              __NE___ {}
         constexpr PackedInt (const Self &)  __NE___ = default;
 
-        constexpr PackedInt (Value_t val)   __NE___ : 
+        constexpr PackedInt (Value_t val)   __NE___ :
             hi{HalfInt_t( val >> _Offset )},
             lo{HalfInt_t{ val & _Mask }}
         {}
@@ -62,3 +62,12 @@ namespace AE::Math
 
 
 } // AE::Math
+
+
+namespace AE::Base
+{
+    template <typename T>   struct TMemCopyAvailable< PackedInt<T> >        { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< PackedInt<T> >        { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< PackedInt<T> >   { static constexpr bool  value = IsTriviallySerializable<T>; };
+
+} // AE::Base
diff --git a/AE/engine/src/base/Math/Percent.h b/AE/engine/src/base/Math/Percent.h
index 379b71eb..a576bec1 100644
--- a/AE/engine/src/base/Math/Percent.h
+++ b/AE/engine/src/base/Math/Percent.h
@@ -50,3 +50,13 @@ namespace AE::Math
 
 
 } // AE::Math
+
+
+namespace AE::Base
+{
+    template <typename T>   struct TMemCopyAvailable< TPercent<T> >         { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< TPercent<T> >         { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< TPercent<T> >    { static constexpr bool  value = IsTriviallySerializable<T>; };
+
+} // AE::Base
+
diff --git a/AE/engine/src/base/Math/PhysicalDimension.h b/AE/engine/src/base/Math/PhysicalDimension.h
index 81fbb8cb..192a2a8b 100644
--- a/AE/engine/src/base/Math/PhysicalDimension.h
+++ b/AE/engine/src/base/Math/PhysicalDimension.h
@@ -24,15 +24,15 @@ namespace AE::Math
             >
     struct TPhysicalDimension
     {
-        STATIC_ASSERT( SecondsDenom     > 0 );
-        STATIC_ASSERT( KilogramsDenom   > 0 );
-        STATIC_ASSERT( MetersDenom      > 0 );
-        STATIC_ASSERT( AmperasDenom     > 0 );
-        STATIC_ASSERT( KelvinsDenom     > 0 );
-        STATIC_ASSERT( MolesDenom       > 0 );
-        STATIC_ASSERT( CandelasDenom    > 0 );
-        STATIC_ASSERT( CurrencyDenom    > 0 );
-        STATIC_ASSERT( BitsDenom        > 0 );
+        StaticAssert( SecondsDenom      > 0 );
+        StaticAssert( KilogramsDenom    > 0 );
+        StaticAssert( MetersDenom       > 0 );
+        StaticAssert( AmperasDenom      > 0 );
+        StaticAssert( KelvinsDenom      > 0 );
+        StaticAssert( MolesDenom        > 0 );
+        StaticAssert( CandelasDenom > 0 );
+        StaticAssert( CurrencyDenom > 0 );
+        StaticAssert( BitsDenom     > 0 );
 
         //              SI
         static constexpr FractionalI    seconds     { SecondsNum,   SecondsDenom };     // time
diff --git a/AE/engine/src/base/Math/PhysicalQuantity.h b/AE/engine/src/base/Math/PhysicalQuantity.h
index 1128b101..86bb132c 100644
--- a/AE/engine/src/base/Math/PhysicalQuantity.h
+++ b/AE/engine/src/base/Math/PhysicalQuantity.h
@@ -26,8 +26,8 @@ namespace AE::Math
              >
     struct PhysicalQuantity
     {
-        STATIC_ASSERT( IsScalar<ValueType> );
-        //STATIC_ASSERT( IsFloatPoint<ValueType> );
+        StaticAssert( IsScalar<ValueType> );
+        //StaticAssert( IsFloatPoint<ValueType> );
 
     // types
     public:
@@ -113,7 +113,7 @@ namespace AE::Math
         template <typename D, typename S>
         ND_ constexpr auto  operator /  (const PhysicalQuantity<Value_t,D,S> &rhs) C_NE___
         {
-            using Scale = PhysicalQuantity_Scale::template Div< Scale_t, S >; 
+            using Scale = PhysicalQuantity_Scale::template Div< Scale_t, S >;
             return PhysicalQuantity< Value_t, typename Dimension_t::template Div<D>, Scale >{ Scale::Get( _value, rhs.GetNonScaled() )};
         }
 
@@ -155,8 +155,8 @@ namespace AE::Math
              >
     struct PhysicalQuantity< ValueType, DefaultPhysicalDimensions::NonDimensional, ValueScale >
     {
-        STATIC_ASSERT( IsScalar<ValueType> );
-        //STATIC_ASSERT( IsFloatPoint<ValueType> );
+        StaticAssert( IsScalar<ValueType> );
+        //StaticAssert( IsFloatPoint<ValueType> );
 
     // types
     public:
@@ -277,31 +277,31 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T, typename Dimension, typename Scale>
-    ND_ constexpr bool  Equals (const PhysicalQuantity<T, Dimension, Scale> &a,
+    ND_ constexpr bool  Equal (const PhysicalQuantity<T, Dimension, Scale> &a,
                                 const PhysicalQuantity<T, Dimension, Scale> &b,
                                 const T err = Epsilon<T>()) __NE___
     {
-        return Math::Equals( a.GetNonScaled(), b.GetNonScaled(), err );
+        return Math::Equal( a.GetNonScaled(), b.GetNonScaled(), err );
     }
 
     template <typename T, typename Dimension, typename LhsScale, typename RhsScale, typename ErrScale>
-    ND_ constexpr bool  Equals (const PhysicalQuantity<T, Dimension, LhsScale> &a,
+    ND_ constexpr bool  Equal (const PhysicalQuantity<T, Dimension, LhsScale> &a,
                                 const PhysicalQuantity<T, Dimension, RhsScale> &b,
                                 const PhysicalQuantity<T, Dimension, ErrScale> &err) __NE___
     {
-        return Math::Equals( a.GetScaled(), b.GetScaled(), err.GetScaled() );   // TODO: average scale
+        return Math::Equal( a.GetScaled(), b.GetScaled(), err.GetScaled() );    // TODO: average scale
     }
 
     template <typename T, typename Dimension, typename LhsScale, typename RhsScale>
-    ND_ constexpr bool  Equals (const PhysicalQuantity<T, Dimension, LhsScale> &a,
+    ND_ constexpr bool  Equal (const PhysicalQuantity<T, Dimension, LhsScale> &a,
                                 const PhysicalQuantity<T, Dimension, RhsScale> &b,
                                 const Percent err) __NE___
     {
-        return Math::Equals( a.GetScaled(), b.GetScaled(), err );
+        return Math::Equal( a.GetScaled(), b.GetScaled(), err );
     }
 
 /*
@@ -426,6 +426,8 @@ namespace AE::Math
             struct BoltzmannConst           { static constexpr T  Value = T{1.380649e-23}; };           // J / K                    - SI
             struct LuminousEfficacyOf540THzRadiation
                                             { static constexpr T  Value = T{683}; };                    // lm / W                   - SI
+
+            struct Horsepower               { static constexpr T  Value = T(735.5); };
         };
 
 
@@ -532,6 +534,7 @@ namespace AE::Math
         using KiloWatt                  = PhysicalQuantity< T, Dim::Watt, typename Scale::Kilo >;               // KW
         using MegaWatt                  = PhysicalQuantity< T, Dim::Watt, typename Scale::Mega >;               // MW
         using GigaWatt                  = PhysicalQuantity< T, Dim::Watt, typename Scale::Giga >;               // GW
+        using Horsepower                = PhysicalQuantity< T, Dim::Watt, typename Scale::Horsepower >;
 
         using Bar                       = PhysicalQuantity< T, Dim::Pascal, typename Scale::Bar >;              // bar
         using Atmosphere                = PhysicalQuantity< T, Dim::Pascal, typename Scale::Atmosphere >;       // atm
@@ -581,10 +584,10 @@ namespace AE::Math
 namespace AE::Base
 {
     template <typename V, typename D, typename S>
-    struct TMemCopyAvailable< PhysicalQuantity< V, D, S >> { static constexpr bool  value = IsMemCopyAvailable<V>; };
+    struct TMemCopyAvailable< PhysicalQuantity< V, D, S >>      { static constexpr bool  value = IsMemCopyAvailable<V>; };
 
     template <typename V, typename D, typename S>
-    struct TZeroMemAvailable< PhysicalQuantity< V, D, S >> { static constexpr bool  value = IsZeroMemAvailable<V>; };
+    struct TZeroMemAvailable< PhysicalQuantity< V, D, S >>      { static constexpr bool  value = IsZeroMemAvailable<V>; };
 
     template <typename V, typename D, typename S>
     struct TTriviallySerializable< PhysicalQuantity< V, D, S >> { static constexpr bool  value = IsTriviallySerializable<V>; };
diff --git a/AE/engine/src/base/Math/PhysicalQuantityMatrix.h b/AE/engine/src/base/Math/PhysicalQuantityMatrix.h
index 62b04446..3d12adc9 100644
--- a/AE/engine/src/base/Math/PhysicalQuantityMatrix.h
+++ b/AE/engine/src/base/Math/PhysicalQuantityMatrix.h
@@ -165,3 +165,17 @@ namespace _hidden_
 */
 
 } // AE::Math
+
+
+namespace AE::Base
+{
+    template <typename Qt, uint C, uint R, glm::qualifier Ql>
+    struct TMemCopyAvailable< PhysicalQuantityMatrix<Qt,C,R,Ql> >       { static constexpr bool  value = IsMemCopyAvailable<Qt>; };
+
+    template <typename Qt, uint C, uint R, glm::qualifier Ql>
+    struct TZeroMemAvailable< PhysicalQuantityMatrix<Qt,C,R,Ql> >       { static constexpr bool  value = IsZeroMemAvailable<Qt>; };
+
+    // 'IsTriviallySerializable< PhysicalQuantityMatrix<> > = false' - because SIMD and packed types has different alignment
+
+} // AE::Base
+
diff --git a/AE/engine/src/base/Math/PhysicalQuantityMatrixImpl.h b/AE/engine/src/base/Math/PhysicalQuantityMatrixImpl.h
index 61e37e81..59ef5dcf 100644
--- a/AE/engine/src/base/Math/PhysicalQuantityMatrixImpl.h
+++ b/AE/engine/src/base/Math/PhysicalQuantityMatrixImpl.h
@@ -17,8 +17,8 @@ namespace AE::Math
         using Quantity_t    = Quantity;
         using Dimension_t   = typename Quantity::Dimension_t;
 
-        STATIC_ASSERT( IsPhysicalDimension< Dimension_t >);
-        STATIC_ASSERT( IsPhysicalQuantity< Quantity_t >);
+        StaticAssert( IsPhysicalDimension< Dimension_t >);
+        StaticAssert( IsPhysicalQuantity< Quantity_t >);
 
         using Self          = PhysicalQuantityMatrix< Quantity, Columns, Rows, Q >;
         using VQuat_t       = TQuat< Value_t, Q >;
@@ -29,9 +29,9 @@ namespace AE::Math
         using QCol_t        = PhysicalQuantity_FromVec< typename VMatrix_t::Col_t, Dimension_t, Scale_t >;  // PhysicalQuantityVec< Rows >
         using QRow_t        = PhysicalQuantity_FromVec< typename VMatrix_t::Row_t, Dimension_t, Scale_t >;  // PhysicalQuantityVec< Columns >
 
-        STATIC_ASSERT( sizeof(QMatrix_t) == sizeof(VMatrix_t) );
-        STATIC_ASSERT( sizeof(VCol_t) == sizeof(QCol_t) );
-        STATIC_ASSERT( sizeof(VRow_t) == sizeof(QRow_t) );
+        StaticAssert( sizeof(QMatrix_t) == sizeof(VMatrix_t) );
+        StaticAssert( sizeof(VCol_t) == sizeof(QCol_t) );
+        StaticAssert( sizeof(VRow_t) == sizeof(QRow_t) );
 
         using Inversed_t    = PhysicalQuantityMatrix< typename Quantity::Inversed_t, Columns, Rows, Q >;
         using _Dim_t        = typename VMatrix_t::Dim_t;
@@ -46,7 +46,7 @@ namespace AE::Math
     public:
         PhysicalQuantityMatrix ()                                               __NE___ {}
         PhysicalQuantityMatrix (const Self &other)                              __NE___ = default;
-        PhysicalQuantityMatrix (Self && other)                                  __NE___ = default;
+        PhysicalQuantityMatrix (Self &&other)                                   __NE___ = default;
 
         explicit PhysicalQuantityMatrix (const VMatrix_t &other)                __NE___ : _value{other} {}
         explicit PhysicalQuantityMatrix (const QMatrix_t &other)                __NE___ : _value{ reinterpret_cast< VMatrix_t const &>(other) } {}
@@ -110,7 +110,7 @@ namespace AE::Math
         ND_ Self                operator - ()                                   C_NE___ { return Self{ -_value }; }
 
             Self&               operator = (const Self &rhs)                    __NE___ = default;
-            Self&               operator = (Self && rhs)                        __NE___ = default;
+            Self&               operator = (Self &&rhs)                         __NE___ = default;
 
         // return column
         ND_ QCol_t const&       operator [] (usize c)                           C_NE___ { return reinterpret_cast< QCol_t const &>(_value[c]); }
diff --git a/AE/engine/src/base/Math/PhysicalQuantityVec.h b/AE/engine/src/base/Math/PhysicalQuantityVec.h
index 4e4534ea..feddac1d 100644
--- a/AE/engine/src/base/Math/PhysicalQuantityVec.h
+++ b/AE/engine/src/base/Math/PhysicalQuantityVec.h
@@ -55,7 +55,7 @@ namespace AE::Math
     template <typename Quantity, glm::qualifier Q>
     struct PhysicalQuantityVec <Quantity, 2, Q> : TVec< Quantity, 2, Q >
     {
-        STATIC_ASSERT( IsPhysicalQuantity< Quantity >);
+        StaticAssert( IsPhysicalQuantity< Quantity >);
 
     // types
         using Value_t       = typename Quantity::Value_t;
@@ -66,7 +66,7 @@ namespace AE::Math
         using ValVec_t      = TVec< Value_t,  2, Q >;
         using QVec_t        = TVec< Quantity, 2, Q >;
 
-        STATIC_ASSERT( sizeof(QVec_t) == sizeof(ValVec_t) );
+        StaticAssert( sizeof(QVec_t) == sizeof(ValVec_t) );
 
     // methods
         PhysicalQuantityVec ()                              __NE___ {}
@@ -92,7 +92,7 @@ namespace AE::Math
     template <typename Quantity, glm::qualifier Q>
     struct PhysicalQuantityVec <Quantity, 3, Q> : TVec< Quantity, 3, Q >
     {
-        STATIC_ASSERT( IsPhysicalQuantity< Quantity >);
+        StaticAssert( IsPhysicalQuantity< Quantity >);
 
     // types
         using Value_t       = typename Quantity::Value_t;
@@ -103,7 +103,7 @@ namespace AE::Math
         using ValVec_t      = TVec< Value_t,  3, Q >;
         using QVec_t        = TVec< Quantity, 3, Q >;
 
-        STATIC_ASSERT( sizeof(QVec_t) == sizeof(ValVec_t) );
+        StaticAssert( sizeof(QVec_t) == sizeof(ValVec_t) );
 
     // methods
         PhysicalQuantityVec ()                                      __NE___ {}
@@ -129,7 +129,7 @@ namespace AE::Math
     template <typename Quantity, glm::qualifier Q>
     struct PhysicalQuantityVec <Quantity, 4, Q> : TVec< Quantity, 4, Q >
     {
-        STATIC_ASSERT( IsPhysicalQuantity< Quantity >);
+        StaticAssert( IsPhysicalQuantity< Quantity >);
 
     // types
         using Value_t       = typename Quantity::Value_t;
@@ -140,7 +140,7 @@ namespace AE::Math
         using ValVec_t      = TVec< Value_t,  4, Q >;
         using QVec_t        = TVec< Quantity, 4, Q >;
 
-        STATIC_ASSERT( sizeof(QVec_t) == sizeof(ValVec_t) );
+        StaticAssert( sizeof(QVec_t) == sizeof(ValVec_t) );
 
     // methods
         PhysicalQuantityVec ()                                                  __NE___ {}
@@ -661,12 +661,11 @@ namespace _hidden_
 namespace AE::Base
 {
     template <typename Qt, int I, glm::qualifier Ql>
-    struct TMemCopyAvailable< PhysicalQuantityVec<Qt,I,Ql> > { static constexpr bool  value = IsMemCopyAvailable<Qt>; };
+    struct TMemCopyAvailable< PhysicalQuantityVec<Qt,I,Ql> >        { static constexpr bool  value = IsMemCopyAvailable<Qt>; };
 
     template <typename Qt, int I, glm::qualifier Ql>
-    struct TZeroMemAvailable< PhysicalQuantityVec<Qt,I,Ql> > { static constexpr bool  value = IsZeroMemAvailable<Qt>; };
+    struct TZeroMemAvailable< PhysicalQuantityVec<Qt,I,Ql> >        { static constexpr bool  value = IsZeroMemAvailable<Qt>; };
 
-    template <typename Qt, int I, glm::qualifier Ql>
-    struct TTriviallySerializable< PhysicalQuantityVec<Qt,I,Ql> > { static constexpr bool  value = IsTriviallySerializable<Qt>; };
+    // 'IsTriviallySerializable< PhysicalQuantityVec<> > = false' - because SIMD and packed types has different alignment
 
 } // AE::Base
diff --git a/AE/engine/src/base/Math/Quat.h b/AE/engine/src/base/Math/Quat.h
index 053dee24..477bbe9b 100644
--- a/AE/engine/src/base/Math/Quat.h
+++ b/AE/engine/src/base/Math/Quat.h
@@ -3,20 +3,19 @@
 #pragma once
 
 #include "base/Math/Vec.h"
-#include "base/Math/Radians.h"
-
-#ifdef AE_COMPILER_MSVC
-#   pragma warning (push)
-#   pragma warning (disable: 4201)
-#endif
+#include "base/Math/Radian.h"
 
 namespace AE::Math
 {
 
+    //
+    // Quaternion
+    //
+
     template <typename T, glm::qualifier Q>
     struct TQuat final
     {
-        STATIC_ASSERT( IsScalar<T> and IsFloatPoint<T> );
+        StaticAssert( IsScalar<T> and IsFloatPoint<T> );
 
     // types
     public:
@@ -26,7 +25,7 @@ namespace AE::Math
         using Vec2_t        = TVec< T, 2, Q >;
         using Vec3_t        = TVec< T, 3, Q >;
         using Vec4_t        = TVec< T, 4, Q >;
-        using Rad_t         = TRadians< T >;
+        using Rad_t         = TRadian< T >;
         using Rad3_t        = RadianVec< T, 3 >;
         using Mat3_t        = TMatrix< T, 3, 3, Q >;
         using Mat4_t        = TMatrix< T, 4, 4, Q >;
@@ -34,12 +33,7 @@ namespace AE::Math
 
     // variables
     public:
-        union {
-            _GLM_Quat_t     _value;
-            struct {
-                T           x, y, z, w;
-            };
-        };
+        _GLM_Quat_t     _value;
 
 
     // methods
@@ -52,7 +46,7 @@ namespace AE::Math
         template <typename B>
         explicit TQuat (const TQuat<B,Q> &other)                    __NE___ : _value{other._value} {}
 
-        TQuat (Self &&other)                                        __NE___ : _value{other._value} {} 
+        TQuat (Self &&other)                                        __NE___ : _value{other._value} {}
 
         TQuat (T w, T x, T y, T z)                                  __NE___ : _value{ w, x, y, z } {}
 
@@ -110,9 +104,7 @@ namespace AE::Math
         ND_ Vec3_t  AxisY ()                                        C_NE___;
         ND_ Vec3_t  AxisZ ()                                        C_NE___;
 
-        ND_ Self    Slerp (const Self &q, T a)                      C_NE___ { return Self{glm::mix( _value, q._value, a )}; }
-
-        ND_ static Self  Identity ()                                __NE___ { return Self{_GLM_Quat_t( T{1}, T{0}, T{0}, T{0} )}; }
+        ND_ static Self  Identity ()                                __NE___ { return Self{glm::quat_identity<T,Q>()}; }
 
         ND_ static Self  Rotate (Rad_t angle, const Vec3_t &axis)   __NE___ { return Self{glm::rotate( Identity()._value, T(angle), axis )}; }
         ND_ static Self  RotateX (Rad_t angle)                      __NE___ { return Rotate( angle, Vec3_t{T{1}, T{0}, T{0}} ); }
@@ -158,32 +150,35 @@ namespace AE::Math
     template <typename T, glm::qualifier Q>
     bool4  TQuat<T,Q>::operator == (const Self &rhs) C_NE___
     {
-        return bool4{ x == rhs.x, y == rhs.y, z == rhs.z, w == rhs.w };
+        return bool4{ _value.x == rhs._value.x,
+                      _value.y == rhs._value.y,
+                      _value.z == rhs._value.z,
+                      _value.w == rhs._value.w };
     }
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T, glm::qualifier Q>
-    ND_ bool4  Equals (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ bool4  Equal (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const T err = Epsilon<T>()) __NE___
     {
         return bool4{
-                Math::Equals( lhs.x, rhs.x, err ),
-                Math::Equals( lhs.y, rhs.y, err ),
-                Math::Equals( lhs.z, rhs.z, err ),
-                Math::Equals( lhs.w, rhs.w, err )};
+                Math::Equal( lhs._value.x, rhs._value.x, err ),
+                Math::Equal( lhs._value.y, rhs._value.y, err ),
+                Math::Equal( lhs._value.z, rhs._value.z, err ),
+                Math::Equal( lhs._value.w, rhs._value.w, err )};
     }
 
     template <typename T, glm::qualifier Q>
-    ND_ bool4  Equals (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const Percent err) __NE___
+    ND_ bool4  Equal (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const Percent err) __NE___
     {
         return bool4{
-                Math::Equals( lhs.x, rhs.x, err ),
-                Math::Equals( lhs.y, rhs.y, err ),
-                Math::Equals( lhs.z, rhs.z, err ),
-                Math::Equals( lhs.w, rhs.w, err )};
+                Math::Equal( lhs._value.x, rhs._value.x, err ),
+                Math::Equal( lhs._value.y, rhs._value.y, err ),
+                Math::Equal( lhs._value.z, rhs._value.z, err ),
+                Math::Equal( lhs._value.w, rhs._value.w, err )};
     }
 
 /*
@@ -195,47 +190,85 @@ namespace AE::Math
     ND_ bool4  BitEqual (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const EnabledBitCount bitCount) __NE___
     {
         return bool4{
-                Math::BitEqual( lhs.x, rhs.x, bitCount ),
-                Math::BitEqual( lhs.y, rhs.y, bitCount ),
-                Math::BitEqual( lhs.z, rhs.z, bitCount ),
-                Math::BitEqual( lhs.w, rhs.w, bitCount )};
+                Math::BitEqual( lhs._value.x, rhs._value.x, bitCount ),
+                Math::BitEqual( lhs._value.y, rhs._value.y, bitCount ),
+                Math::BitEqual( lhs._value.z, rhs._value.z, bitCount ),
+                Math::BitEqual( lhs._value.w, rhs._value.w, bitCount )};
     }
 
     template <typename T, glm::qualifier Q>
     ND_ bool4  BitEqual (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs) __NE___
     {
         return bool4{
-                Math::BitEqual( lhs.x, rhs.x ),
-                Math::BitEqual( lhs.y, rhs.y ),
-                Math::BitEqual( lhs.z, rhs.z ),
-                Math::BitEqual( lhs.w, rhs.w )};
+                Math::BitEqual( lhs._value.x, rhs._value.x ),
+                Math::BitEqual( lhs._value.y, rhs._value.y ),
+                Math::BitEqual( lhs._value.z, rhs._value.z ),
+                Math::BitEqual( lhs._value.w, rhs._value.w )};
     }
 
 /*
 =================================================
-    ToDirection
+    IsInfinity / IsNaN / IsFinite
 =================================================
 */
     template <typename T, glm::qualifier Q>
-    typename TQuat<T,Q>::Vec3_t  TQuat<T,Q>::ToDirection () C_NE___
+    ND_ bool4  IsInfinity (const TQuat<T,Q> &q) __NE___
+    {
+        return glm::isinf( q );
+    }
+
+    template <typename T, glm::qualifier Q>
+    ND_ bool4  IsNaN (const TQuat<T,Q> &q) __NE___
+    {
+        return glm::isnan( q );
+    }
+
+    template <typename T, glm::qualifier Q>
+    ND_ bool4  IsFinite (const TQuat<T,Q> &q) __NE___
     {
-        return Vec3_t{  T{2} * x * z + T{2} * y * w,
-                        T{2} * z * y - T{2} * x * w,
-                        T{1} - T{2} * x * x - T{2} * y * y };
+        return (q == q);
     }
 
 /*
 =================================================
-    FromDirection
+    Lerp / SLerp
 =================================================
 */
     template <typename T, glm::qualifier Q>
-    TQuat<T,Q>  TQuat<T,Q>::FromDirection (const Vec3_t &dir, const Vec3_t &up) __NE___
+    ND_ TQuat<T,Q>  Lerp (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const T factor) __NE___
     {
-        Vec3_t  hor = Math::Normalize( Cross( up, dir ));
-        Vec3_t  ver = Math::Normalize( Cross( dir, hor ));
+        return TQuat<T,Q>{glm::lerp( lhs._value, rhs._value, factor )};
+    }
 
-        return Self{glm::quat_cast( glm::tmat3x3<T>{ hor, ver, dir })}; // TODO: optimize
+    template <typename T, glm::qualifier Q>
+    ND_ TQuat<T,Q>  SLerp (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const T a) __NE___
+    {
+        return TQuat<T,Q>{glm::slerp( lhs._value, rhs._value, a )};
+    }
+
+    template <typename T, glm::qualifier Q>
+    ND_ TQuat<T,Q>  SLerp (const TQuat<T,Q> &lhs, const TQuat<T,Q> &rhs, const T a, const T k) __NE___
+    {
+        return TQuat<T,Q>{glm::slerp( lhs._value, rhs._value, a, k )};
+    }
+
+/*
+=================================================
+    ToDirection / FromDirection
+=================================================
+*/
+    template <typename T, glm::qualifier Q>
+    typename TQuat<T,Q>::Vec3_t  TQuat<T,Q>::ToDirection () C_NE___
+    {
+        return Vec3_t{  T{2} * _value.x * _value.z + T{2} * _value.y * _value.w,
+                        T{2} * _value.z * _value.y - T{2} * _value.x * _value.w,
+                        T{1} - T{2} * _value.x * _value.x - T{2} * _value.y * _value.y };
+    }
+
+    template <typename T, glm::qualifier Q>
+    TQuat<T,Q>  TQuat<T,Q>::FromDirection (const Vec3_t &dir, const Vec3_t &up) __NE___
+    {
+        return Self{glm::quatLookAt( dir, up )};
     }
 
 /*
@@ -257,17 +290,13 @@ namespace AE::Math
 
         Self            result;
 
-        result.x = scr[0] * cpcy - scr[1] * spsy;
-        result.y = scr[1] * spcy + scr[0] * cpsy;
-        result.z = scr[1] * cpsy - scr[0] * spcy;
-        result.w = scr[1] * cpcy + scr[0] * spsy;
+        result._value.x = scr[0] * cpcy - scr[1] * spsy;
+        result._value.y = scr[1] * spcy + scr[0] * cpsy;
+        result._value.z = scr[1] * cpsy - scr[0] * spcy;
+        result._value.w = scr[1] * cpcy + scr[0] * spsy;
 
         return result.Normalize();
     }
 
 
 } // AE::Math
-
-#ifdef AE_COMPILER_MSVC
-#   pragma warning (pop)
-#endif
diff --git a/AE/engine/src/base/Math/Radians.h b/AE/engine/src/base/Math/Radian.h
similarity index 72%
rename from AE/engine/src/base/Math/Radians.h
rename to AE/engine/src/base/Math/Radian.h
index 922babd5..7a6bd1b8 100644
--- a/AE/engine/src/base/Math/Radians.h
+++ b/AE/engine/src/base/Math/Radian.h
@@ -13,13 +13,13 @@ namespace AE::Math
     //
 
     template <typename T>
-    struct TRadians
+    struct TRadian
     {
-        STATIC_ASSERT( IsScalar<T> and IsFloatPoint<T> );
+        StaticAssert( IsScalar<T> and IsFloatPoint<T> );
 
     // types
     public:
-        using Self      = TRadians<T>;
+        using Self      = TRadian<T>;
         using Value_t   = T;
 
 
@@ -30,11 +30,11 @@ namespace AE::Math
 
     // methods
     public:
-        constexpr TRadians ()                                   __NE___ : _value{} {}
-        constexpr explicit TRadians (T val)                     __NE___ : _value{val} {}
+        constexpr TRadian ()                                    __NE___ : _value{} {}
+        constexpr explicit TRadian (T val)                      __NE___ : _value{val} {}
 
-        constexpr TRadians (const Self &)                       __NE___ = default;
-        constexpr TRadians (Self &&)                            __NE___ = default;
+        constexpr TRadian (const Self &)                        __NE___ = default;
+        constexpr TRadian (Self &&)                             __NE___ = default;
 
         ND_ constexpr explicit operator T ()                    C_NE___ { return _value; }
 
@@ -44,7 +44,7 @@ namespace AE::Math
         ND_ constexpr Self   operator - ()                      C_NE___ { return Self{ -_value }; }
 
         ND_ constexpr Self   WrapToPi ()                        C_NE___ { return Self{Wrap( _value, -Pi()._value, Pi()._value  )}; }
-        ND_ constexpr Self   WrapTo0_2Pi ()                     C_NE___ { return Self{Wrap( _value, 0, Pi2()._value  )}; }
+        ND_ constexpr Self   WrapTo0_2Pi ()                     C_NE___ { return Self{Wrap( _value, T{0}, Pi2()._value  )}; }
 
         ND_ constexpr T      ToDeg ()                           C_NE___ { return _value * RadToDeg(); }
 
@@ -81,24 +81,24 @@ namespace AE::Math
         ND_ friend constexpr Self  operator / (T lhs, Self rhs) __NE___ { return Self{ lhs / rhs._value }; }
 
 
-        ND_ static constexpr Self   Pi ()                       __NE___ { return Self{T( 3.14159265358979323846 )}; }
-        ND_ static constexpr Self   Pi2 ()                      __NE___ { return Pi() * T(2); }
-        ND_ static constexpr T      DegToRad ()                 __NE___ { return T(0.01745329251994329576923690768489); }
-        ND_ static constexpr T      RadToDeg ()                 __NE___ { return T(57.295779513082320876798154814105); }
+        ND_ static constexpr Self   Pi ()                       __NE___ { return Self{T( 3.1415926535897932384626433832795 )}; }
+        ND_ static constexpr Self   Pi2 ()                      __NE___ { return Self{T( 6.283185307179586476925286766559  )}; }
+        ND_ static constexpr Self   HalfPi ()                   __NE___ { return Self{T( 1.5707963267948966192313216916398 )}; }
+        ND_ static constexpr T      ReciprocalPi ()             __NE___ { return T( 0.31830988618379067153776752674503 ); }
+
+        ND_ static constexpr T      DegToRad ()                 __NE___ { return T( 0.01745329251994329576923690768489 ); }
+        ND_ static constexpr T      RadToDeg ()                 __NE___ { return T( 57.295779513082320876798154814105 ); }
 
         ND_ static constexpr Self   FromDeg (T value)           __NE___ { return Self{ DegToRad() * value }; }
     };
 
 
-    using Rad           = TRadians<float>;
-    using RadiansF      = TRadians<float>;
-    using RadiansD      = TRadians<double>;
-
-    template <typename T, int I, glm::qualifier Q>
-    using TRadianVec    = TVec< TRadians<T>, I, Q >;
-
     template <typename T, int I>
-    using RadianVec     = Vec< TRadians<T>, I >;
+    using RadianVec = Vec< TRadian<T>, I >;
+
+    using Rad       = TRadian<float>;
+    using Rad2      = RadianVec< float, 2 >;
+    using Rad3      = RadianVec< float, 3 >;
 
     inline static constexpr Rad  Pi = Rad::Pi();
 
@@ -115,9 +115,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  Abs (const TRadians<T>& x) __NE___
+    ND_ TRadian<T>  Abs (const TRadian<T>& x) __NE___
     {
-        return TRadians<T>{ std::abs( T(x) )};
+        return TRadian<T>{ std::abs( T(x) )};
     }
 
 /*
@@ -126,7 +126,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  Sin (const TRadians<T>& x) __NE___
+    ND_ T  Sin (const TRadian<T>& x) __NE___
     {
         return std::sin( T(x) );
     }
@@ -137,7 +137,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  Cos (const TRadians<T>& x) __NE___
+    ND_ T  Cos (const TRadian<T>& x) __NE___
     {
         return std::cos( T(x) );
     }
@@ -148,7 +148,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ Vec<T,2>  SinCos (const TRadians<T>& x) __NE___
+    ND_ Vec<T,2>  SinCos (const TRadian<T>& x) __NE___
     {
         return Vec<T,2>{ std::sin( T(x) ), std::cos( T(x) )};
     }
@@ -159,11 +159,11 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ASin (const T& x) __NE___
+    ND_ TRadian<T>  ASin (const T& x) __NE___
     {
         ASSERT( x >= T{-1} and x <= T{1} );
 
-        return TRadians<T>{std::asin( x )};
+        return TRadian<T>{std::asin( x )};
     }
 
 /*
@@ -172,11 +172,11 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ACos (const T& x) __NE___
+    ND_ TRadian<T>  ACos (const T& x) __NE___
     {
         ASSERT( x >= T{-1} and x <= T{1} );
 
-        return TRadians<T>{std::acos( x )};
+        return TRadian<T>{std::acos( x )};
     }
 
 /*
@@ -185,7 +185,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  SinH (const TRadians<T>& x) __NE___
+    ND_ T  SinH (const TRadian<T>& x) __NE___
     {
         return std::sinh( T(x) );
     }
@@ -196,7 +196,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  CosH (const TRadians<T>& x) __NE___
+    ND_ T  CosH (const TRadian<T>& x) __NE___
     {
         return std::cosh( T(x) );
     }
@@ -207,9 +207,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ASinH (const T& x) __NE___
+    ND_ TRadian<T>  ASinH (const T& x) __NE___
     {
-        return TRadians<T>( SignOrZero( x ) * Ln( x + Sqrt( (x*x) + T{1} )));
+        return TRadian<T>( SignOrZero( x ) * Ln( x + Sqrt( (x*x) + T{1} )));
     }
 
 /*
@@ -218,10 +218,10 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ACosH (const T& x) __NE___
+    ND_ TRadian<T>  ACosH (const T& x) __NE___
     {
         ASSERT( x >= T{1} );
-        return TRadians<T>{ Ln( x + Sqrt( (x*x) - T{1} ))};
+        return TRadian<T>{ Ln( x + Sqrt( (x*x) - T{1} ))};
     }
 
 /*
@@ -230,7 +230,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  Tan (const TRadians<T>& x) __NE___
+    ND_ T  Tan (const TRadian<T>& x) __NE___
     {
         return std::tan( T(x) );
     }
@@ -241,7 +241,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  CoTan (const TRadians<T>& x) __NE___
+    ND_ T  CoTan (const TRadian<T>& x) __NE___
     {
         return SafeDiv( T{1}, Tan( x ), T{0} );
     }
@@ -252,7 +252,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  TanH (const TRadians<T>& x) __NE___
+    ND_ T  TanH (const TRadian<T>& x) __NE___
     {
         return std::tanh( T(x) );
     }
@@ -263,7 +263,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ T  CoTanH (const TRadians<T>& x) __NE___
+    ND_ T  CoTanH (const TRadian<T>& x) __NE___
     {
         return SafeDiv( T{1}, TanH( x ), T{0} );
     }
@@ -274,9 +274,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ATan (const T& y_over_x) __NE___
+    ND_ TRadian<T>  ATan (const T& y_over_x) __NE___
     {
-        return TRadians<T>{ std::atan( y_over_x )};
+        return TRadian<T>{ std::atan( y_over_x )};
     }
 
 /*
@@ -285,9 +285,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ATan (const T& y, const T& x) __NE___
+    ND_ TRadian<T>  ATan (const T& y, const T& x) __NE___
     {
-        return TRadians<T>{ std::atan2( y, x )};
+        return TRadian<T>{ std::atan2( y, x )};
     }
 
 /*
@@ -296,9 +296,9 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ACoTan (const T& x) __NE___
+    ND_ TRadian<T>  ACoTan (const T& x) __NE___
     {
-        return TRadians<T>{ SafeDiv( T{1}, ATan( x ), T{0} )};
+        return TRadian<T>{ SafeDiv( T{1}, ATan( x ), T{0} )};
     }
 
 /*
@@ -322,26 +322,26 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ TRadians<T>  ACoTanH (const T& x) __NE___
+    ND_ TRadian<T>  ACoTanH (const T& x) __NE___
     {
-        return TRadians<T>{ SafeDiv( T{1}, ATanH( x ), T{0} )};
+        return TRadian<T>{ SafeDiv( T{1}, ATanH( x ), T{0} )};
     }
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T>
-    ND_ constexpr bool  Equals (const TRadians<T> &lhs, const TRadians<T> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ constexpr bool  Equal (const TRadian<T> &lhs, const TRadian<T> &rhs, const T err = Epsilon<T>()) __NE___
     {
-        return Equals( T{lhs}, T{rhs}, err );
+        return Equal( T{lhs}, T{rhs}, err );
     }
 
     template <typename T>
-    ND_ constexpr bool  Equals (const TRadians<T> &lhs, const TRadians<T> &rhs, const Percent err) __NE___
+    ND_ constexpr bool  Equal (const TRadian<T> &lhs, const TRadian<T> &rhs, const Percent err) __NE___
     {
-        return Equals( T{lhs}, T{rhs}, err );
+        return Equal( T{lhs}, T{rhs}, err );
     }
 
 /*
@@ -350,13 +350,13 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const TRadians<T> &lhs, const TRadians<T> &rhs, const EnabledBitCount bitCount) __NE___
+    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const TRadian<T> &lhs, const TRadian<T> &rhs, const EnabledBitCount bitCount) __NE___
     {
         return BitEqual( T{lhs}, T{rhs}, bitCount );
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const TRadians<T> &lhs, const TRadians<T> &rhs) __NE___
+    ND_ constexpr EnableIf<IsFloatPoint<T>, bool>  BitEqual (const TRadian<T> &lhs, const TRadian<T> &rhs) __NE___
     {
         return BitEqual( T{lhs}, T{rhs} );
     }
@@ -367,25 +367,36 @@ namespace AE::Math
 =================================================
 */
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, bool>  IsZero (const TRadians<T> &x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, bool>  IsZero (const TRadian<T> &x) __NE___
     {
         return IsZero( T{x} );
     }
 
     template <typename T>
-    ND_ constexpr EnableIf<IsScalar<T>, bool>  IsNotZero (const TRadians<T> &x) __NE___
+    ND_ constexpr EnableIf<IsScalar<T>, bool>  IsNotZero (const TRadian<T> &x) __NE___
     {
         return IsNotZero( T{x} );
     }
 
+/*
+=================================================
+    Lerp
+=================================================
+*/
+    template <typename T, typename B>
+    ND_ constexpr TRadian<T>  Lerp (const TRadian<T> &x, const TRadian<T> &y, const B& factor) __NE___
+    {
+        return TRadian<T>{ Math::Lerp( T{x}, T{y}, factor )};
+    }
+
 
 } // AE::Math
 
 
 namespace AE::Base
 {
-    template <typename T>   struct TMemCopyAvailable< TRadians<T> >     { static constexpr bool  value = IsMemCopyAvailable<T>; };
-    template <typename T>   struct TZeroMemAvailable< TRadians<T> >     { static constexpr bool  value = IsZeroMemAvailable<T>; };
-    template <typename T>   struct TTriviallySerializable< TRadians<T> >{ static constexpr bool  value = IsTriviallySerializable<T>; };
+    template <typename T>   struct TMemCopyAvailable< TRadian<T> >      { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< TRadian<T> >      { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< TRadian<T> > { static constexpr bool  value = IsTriviallySerializable<T>; };
 
 } // AE::Base
diff --git a/AE/engine/src/base/Math/Random.h b/AE/engine/src/base/Math/Random.h
index d4f87d89..9d6d0138 100644
--- a/AE/engine/src/base/Math/Random.h
+++ b/AE/engine/src/base/Math/Random.h
@@ -12,14 +12,14 @@ namespace _hidden_
     template <typename T, bool IsUnsigned>
     struct Random_Uniform_IntType2
     {
-        STATIC_ASSERT( IsUnsignedInteger<T> );
+        StaticAssert( IsUnsignedInteger<T> );
         using type = ByteSizeToUInt< Clamp( sizeof(T), 2u, 8u )>;
     };
 
     template <typename T>
     struct Random_Uniform_IntType2 <T, false>
     {
-        STATIC_ASSERT( IsSignedInteger<T> );
+        StaticAssert( IsSignedInteger<T> );
         using type = ByteSizeToInt< Clamp( sizeof(T), 2u, 8u )>;
     };
 
@@ -52,14 +52,14 @@ namespace _hidden_
         template <typename T>
         ND_ EnableIf<IsFloatPoint<T>, T>  Uniform (T min, T max)            __NE___
         {
-            STATIC_ASSERT( IsScalar<T> );
+            StaticAssert( IsScalar<T> );
             return std::uniform_real_distribution<T>{ min, max }( _gen );
         }
 
         template <typename T>
         ND_ EnableIf<IsInteger<T>, T>  Uniform (T min, T max)               __NE___
         {
-            STATIC_ASSERT( IsScalar<T> );
+            StaticAssert( IsScalar<T> );
             return std::uniform_int_distribution<T>{ min, max }( _gen );
         }
 
@@ -147,7 +147,7 @@ namespace _hidden_
     struct Random::_Binomial
     {
         friend struct Random;
-        STATIC_ASSERT( IsInteger<T> and IsScalar<T> );
+        StaticAssert( IsInteger<T> and IsScalar<T> );
 
     // variables
     private:
@@ -174,7 +174,7 @@ namespace _hidden_
     struct Random::_Binomial< Vec<T,I> >
     {
         friend struct Random;
-        STATIC_ASSERT( IsInteger<T> and IsScalar<T> );
+        StaticAssert( IsInteger<T> and IsScalar<T> );
 
     // variables
     private:
@@ -213,7 +213,7 @@ namespace _hidden_
     struct Random::_Normal
     {
         friend struct Random;
-        STATIC_ASSERT( IsFloatPoint<T> and IsScalar<T> );
+        StaticAssert( IsFloatPoint<T> and IsScalar<T> );
 
     // variables
     private:
@@ -240,7 +240,7 @@ namespace _hidden_
     struct Random::_Normal< Vec<T,I> >
     {
         friend struct Random;
-        STATIC_ASSERT( IsFloatPoint<T> and IsScalar<T> );
+        StaticAssert( IsFloatPoint<T> and IsScalar<T> );
 
     // variables
     private:
@@ -279,7 +279,7 @@ namespace _hidden_
     struct Random::_Normal2
     {
         friend struct Random;
-        STATIC_ASSERT( IsFloatPoint<T> and IsScalar<T> );
+        StaticAssert( IsFloatPoint<T> and IsScalar<T> );
 
     // variables
     private:
@@ -309,7 +309,7 @@ namespace _hidden_
             {
                 T ret = _dist( _rnd._gen );
 
-                if ( ret < _min or ret > _max )
+                if ( ret < _min or ret > _max ) // TODO: wtf?
                     continue;
 
                 return ret;
@@ -352,7 +352,7 @@ namespace _hidden_
             {
                 ret[i] = _dist( _rnd._gen );
 
-                if ( ret[i] < _min or ret[i] > _max )
+                if ( ret[i] < _min or ret[i] > _max )   // TODO: wtf?
                     continue;
 
                 ++i;
diff --git a/AE/engine/src/base/Math/Range.h b/AE/engine/src/base/Math/Range.h
index c8bec33d..1bab3512 100644
--- a/AE/engine/src/base/Math/Range.h
+++ b/AE/engine/src/base/Math/Range.h
@@ -15,7 +15,7 @@ namespace AE::Math
     template <typename T>
     struct Range
     {
-        //STATIC_ASSERT( IsScalar<T> or IsBytes<T> );
+        //StaticAssert( IsScalar<T> or IsBytes<T> );
 
     // types
     public:
@@ -34,7 +34,7 @@ namespace AE::Math
         {
           #ifdef AE_COMPILETIME_OFFSETOF
             // check if supported cast Rectangle to array
-            STATIC_ASSERT( offsetof(Self, begin) + sizeof(T) == offsetof(Self, end) );
+            StaticAssert( offsetof(Self, begin) + sizeof(T) == offsetof(Self, end) );
           #endif
         }
 
@@ -65,3 +65,12 @@ namespace AE::Math
     using RangeD    = Range<double>;
 
 } // AE::Math
+
+
+namespace AE::Base
+{
+    template <typename T>   struct TMemCopyAvailable< Range<T> >        { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< Range<T> >        { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< Range<T> >   { static constexpr bool  value = IsTriviallySerializable<T>; };
+
+} // AE::Base
diff --git a/AE/engine/src/base/Math/Rectangle.h b/AE/engine/src/base/Math/Rectangle.h
index b267956c..d466abdf 100644
--- a/AE/engine/src/base/Math/Rectangle.h
+++ b/AE/engine/src/base/Math/Rectangle.h
@@ -11,7 +11,7 @@ namespace AE::Math
     template <typename T>
     struct Rectangle
     {
-        STATIC_ASSERT( IsScalar<T> );
+        StaticAssert( IsScalar<T> );
 
     // types
     public:
@@ -33,10 +33,10 @@ namespace AE::Math
         {
           #ifdef AE_COMPILETIME_OFFSETOF
             // check if supported cast Rectangle to array
-            STATIC_ASSERT( offsetof(Self, left)  + sizeof(T) == offsetof(Self, top) );
-            STATIC_ASSERT( offsetof(Self, top)   + sizeof(T) == offsetof(Self, right) );
-            STATIC_ASSERT( offsetof(Self, right) + sizeof(T) == offsetof(Self, bottom) );
-            STATIC_ASSERT( sizeof(T[3]) == (offsetof(Self, bottom) - offsetof(Self, left)) );
+            StaticAssert( offsetof(Self, left)  + sizeof(T) == offsetof(Self, top) );
+            StaticAssert( offsetof(Self, top)   + sizeof(T) == offsetof(Self, right) );
+            StaticAssert( offsetof(Self, right) + sizeof(T) == offsetof(Self, bottom) );
+            StaticAssert( sizeof(T[3]) == (offsetof(Self, bottom) - offsetof(Self, left)) );
           #endif
         }
 
@@ -86,7 +86,7 @@ namespace AE::Math
         ND_ T const*            data ()                             C_NE___ { return std::addressof( left ); }
         ND_ T *                 data ()                             __NE___ { return std::addressof( left ); }
 
-        ND_ constexpr bool      IsEmpty ()                          C_NE___ { return Equals( left, right ) | Equals( top, bottom ); }
+        ND_ constexpr bool      IsEmpty ()                          C_NE___ { return Equal( left, right ) | Equal( top, bottom ); }
         ND_ constexpr bool      IsInvalid ()                        C_NE___ { return (right < left) | (bottom < top); }
         ND_ constexpr bool      IsValid ()                          C_NE___ { return (not IsEmpty()) & (not IsInvalid()); }
 
@@ -415,25 +415,25 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T>
-    ND_ bool4  Equals (const Rectangle<T> &lhs, const Rectangle<T> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ bool4  Equal (const Rectangle<T> &lhs, const Rectangle<T> &rhs, const T err = Epsilon<T>()) __NE___
     {
-        return bool4{ Math::Equals( lhs.left,   rhs.left,   err ),
-                      Math::Equals( lhs.top,    rhs.top,    err ),
-                      Math::Equals( lhs.right,  rhs.right,  err ),
-                      Math::Equals( lhs.bottom, rhs.bottom, err )};
+        return bool4{ Math::Equal( lhs.left,   rhs.left,   err ),
+                      Math::Equal( lhs.top,    rhs.top,    err ),
+                      Math::Equal( lhs.right,  rhs.right,  err ),
+                      Math::Equal( lhs.bottom, rhs.bottom, err )};
     }
 
     template <typename T>
-    ND_ bool4  Equals (const Rectangle<T> &lhs, const Rectangle<T> &rhs, const Percent err) __NE___
+    ND_ bool4  Equal (const Rectangle<T> &lhs, const Rectangle<T> &rhs, const Percent err) __NE___
     {
-        return bool4{ Math::Equals( lhs.left,   rhs.left,   err ),
-                      Math::Equals( lhs.top,    rhs.top,    err ),
-                      Math::Equals( lhs.right,  rhs.right,  err ),
-                      Math::Equals( lhs.bottom, rhs.bottom, err )};
+        return bool4{ Math::Equal( lhs.left,   rhs.left,   err ),
+                      Math::Equal( lhs.top,    rhs.top,    err ),
+                      Math::Equal( lhs.right,  rhs.right,  err ),
+                      Math::Equal( lhs.bottom, rhs.bottom, err )};
     }
 
 /*
diff --git a/AE/engine/src/base/Math/SIMD_Neon.h b/AE/engine/src/base/Math/SIMD_Neon.h
index 6fae881e..de2644b2 100644
--- a/AE/engine/src/base/Math/SIMD_Neon.h
+++ b/AE/engine/src/base/Math/SIMD_Neon.h
@@ -127,7 +127,7 @@ namespace AE::Math
         ND_ Self  FMSub  (const Self &b, const Self &c)     C_NE___ { return Self{ vfms_f16(   _value, b._value, c._value )}; }     // (a * b) - c
         ND_ Self  FMSub  (const Self &b, Value_t c)         C_NE___ { return Self{ vfms_n_f16( _value, b._value, c )}; }            //
 
-        template <uint Lane> ND_ Self  Mul (const Self &rhs)C_NE___ { STATIC_ASSERT( Lane < 4 );  return Self{ vmul_lane_f16( _value, rhs, Lane )}; }   // a * b[lane]
+        template <uint Lane> ND_ Self  Mul (const Self &rhs)C_NE___ { StaticAssert( Lane < 4 );  return Self{ vmul_lane_f16( _value, rhs, Lane )}; }    // a * b[lane]
 
         ND_ Bool4  operator == (const Self &rhs)            C_NE___ { return Equal( rhs ); }
         ND_ Bool4  operator != (const Self &rhs)            C_NE___ { return NotEqual( rhs ); }
@@ -156,7 +156,7 @@ namespace AE::Math
     template <typename IntType>
     struct SimdTInt64
     {
-        STATIC_ASSERT( IsInteger<IntType> );
+        StaticAssert( IsInteger<IntType> );
 
     // types
     public:
@@ -169,7 +169,7 @@ namespace AE::Math
                                     Conditional< IsSameTypes< IntType, ushort >, uint16x4_t,
                                         Conditional< IsSameTypes< IntType, sint >, int32x2_t,
                                             Conditional< IsSameTypes< IntType, uint >, uint32x2_t, void >>>>>>;
-        STATIC_ASSERT( CT_SizeOfInBits<Native_t> == 64 );
+        StaticAssert( CT_SizeOfInBits<Native_t> == 64 );
 
 
     // variables
@@ -194,9 +194,7 @@ namespace AE::Math
         explicit SimdTInt64 (Base::_hidden_::_UMax)     __NE___ : SimdTInt64{ ~IntType{0} } {}
         explicit SimdTInt64 (const Native_t &val)       __NE___ : _value{ val } {}
 
-        template <typename T,
-                  typename = EnableIf< IsSameTypes< T, IntType >>
-                 >
+        template <typename T, ENABLEIF( IsSameTypes< T, IntType >)>
         explicit SimdTInt64 (T val)                     __NE___
         {
             if constexpr( isU8 )    _value = vdup_n_u8(  val );
@@ -207,9 +205,7 @@ namespace AE::Math
             if constexpr( isI32 )   _value = vdup_n_s32( val );
         }
 
-        template <typename T,
-                  typename = EnableIf< IsSameTypes< T, IntType >>
-                 >
+        template <typename T, ENABLEIF( IsSameTypes< T, IntType >)>
         explicit SimdTInt64 (const T* ptr)              __NE___
         {
             ASSERT( ptr != null );
@@ -398,7 +394,7 @@ namespace AE::Math
     template <typename IntType>
     struct SimdTInt128
     {
-        STATIC_ASSERT( IsInteger<IntType> );
+        StaticAssert( IsInteger<IntType> );
 
     // types
     public:
@@ -413,7 +409,7 @@ namespace AE::Math
                                             Conditional< IsSameTypes< IntType, uint >, uint32x4_t,
                                                 Conditional< IsSameTypes< IntType, slong >, int64x2_t,
                                                     Conditional< IsSameTypes< IntType, ulong >, uint64x2_t, void >>>>>>>>;
-        STATIC_ASSERT( CT_SizeOfInBits<Native_t> == 128 );
+        StaticAssert( CT_SizeOfInBits<Native_t> == 128 );
 
 
     // variables
@@ -440,9 +436,7 @@ namespace AE::Math
         explicit SimdTInt128 (Base::_hidden_::_UMax)    __NE___ : SimdTInt128{ ~IntType{0} } {}
         explicit SimdTInt128 (const Native_t &val)      __NE___ : _value{ val } {}
 
-        template <typename T,
-                  typename = EnableIf< IsSameTypes< T, IntType >>
-                 >
+        template <typename T, ENABLEIF( IsSameTypes< T, IntType >)>
         explicit SimdTInt128 (T val)                    __NE___
         {
             if constexpr( isU8 )    _value = vdupq_n_u8(  val );
@@ -455,9 +449,7 @@ namespace AE::Math
             if constexpr( isI64 )   _value = vdupq_n_s64( val );
         }
 
-        template <typename T,
-                  typename = EnableIf< IsSameTypes< T, IntType >>
-                 >
+        template <typename T, ENABLEIF( IsSameTypes< T, IntType >)>
         explicit SimdTInt128 (const T* ptr)             __NE___
         {
             ASSERT( ptr != null );
@@ -796,7 +788,7 @@ namespace AE::Math
         ND_ Self  FMSub  (const Self &b, const Self &c)     C_NE___ { return Self{ vfmsq_f16(   _value, b._value, c._value )}; }    // (a * b) - c
         ND_ Self  FMSub  (const Self &b, Value_t c)         C_NE___ { return Self{ vfmsq_n_f16( _value, b._value, c )}; }           //
 
-        template <uint Lane> ND_ Self  Mul (const Self &rhs)C_NE___ { STATIC_ASSERT( Lane < 4 );  return Self{ vmulq_lane_f16( _value, rhs, Lane )}; }  // a * b[lane]
+        template <uint Lane> ND_ Self  Mul (const Self &rhs)C_NE___ { StaticAssert( Lane < 4 );  return Self{ vmulq_lane_f16( _value, rhs, Lane )}; }   // a * b[lane]
 
         ND_ Bool8  operator == (const Self &rhs)            C_NE___ { return Equal( rhs ); }
         ND_ Bool8  operator != (const Self &rhs)            C_NE___ { return NotEqual( rhs ); }
@@ -902,9 +894,9 @@ namespace AE::Math
         ND_ Self  FMSub  (const Self &b, Value_t c)     C_NE___ { return Self{ vfmsq_n_f32( _value, b._value, c )}; }           //
       #endif
 
-    //  template <uint Lane> ND_ Self  Mul (const Self &rhs)                            C_NE___ { STATIC_ASSERT( Lane < count );  return Self{ vmulq_lane_f32( _value, rhs, Lane )}; }                  // a * b[lane]
-    //  template <uint Lane> ND_ Self  MulAdd (const Self &b, const Self &c)            C_NE___ { STATIC_ASSERT( Lane < count );  return Self{ vmlaq_lane_f32( _value, b._value, c._value, Lane )}; }   // a + (b * c[Lane])
-    //  template <uint Lane> ND_ Self  MulSub (const Self &b, const Self &c)            C_NE___ { STATIC_ASSERT( Lane < count );  return Self{ vmlsq_lane_f32( _value, b._value, c._value, Lane )}; }   // a - (b * c[Lane])
+    //  template <uint Lane> ND_ Self  Mul (const Self &rhs)                            C_NE___ { StaticAssert( Lane < count );  return Self{ vmulq_lane_f32( _value, rhs, Lane )}; }                   // a * b[lane]
+    //  template <uint Lane> ND_ Self  MulAdd (const Self &b, const Self &c)            C_NE___ { StaticAssert( Lane < count );  return Self{ vmlaq_lane_f32( _value, b._value, c._value, Lane )}; }    // a + (b * c[Lane])
+    //  template <uint Lane> ND_ Self  MulSub (const Self &b, const Self &c)            C_NE___ { StaticAssert( Lane < count );  return Self{ vmlsq_lane_f32( _value, b._value, c._value, Lane )}; }    // a - (b * c[Lane])
 
     //  template <typename T> ND_ EnableIf< IsSameTypes<T,half>, SimdHalf4>  Cast ()    C_NE___;
         template <typename T> ND_ EnableIf< IsSameTypes<T,int>,  SimdInt4>   Cast ()    C_NE___;
diff --git a/AE/engine/src/base/Math/SIMD_SSE128.h b/AE/engine/src/base/Math/SIMD_SSE128.h
index 93c44454..3bd2c4c2 100644
--- a/AE/engine/src/base/Math/SIMD_SSE128.h
+++ b/AE/engine/src/base/Math/SIMD_SSE128.h
@@ -24,7 +24,7 @@ namespace AE::Math
         using Self      = SimdFloat4;
         using Array_t   = StaticArray< Value_t, 4 >;
 
-        STATIC_ASSERT( sizeof(Array_t) == sizeof(__m128) );
+        StaticAssert( sizeof(Array_t) == sizeof(__m128) );
 
 
         struct Bool4
@@ -193,7 +193,7 @@ namespace AE::Math
         using Self      = SimdDouble2;
         using Array_t   = StaticArray< Value_t, 2 >;
 
-        STATIC_ASSERT( sizeof(Array_t) == sizeof(__m128d) );
+        StaticAssert( sizeof(Array_t) == sizeof(__m128d) );
 
 
         struct Bool2
@@ -228,7 +228,7 @@ namespace AE::Math
     public:
         SimdDouble2 ()                                      __NE___ : _value{ _mm_setzero_pd() } {}
         explicit SimdDouble2 (double v)                     __NE___ : _value{ _mm_set1_pd( v )} {}
-        explicit SimdDouble2 (const double *v)              __NE___ : _value{ _mm_loadu_pd( v )} {}
+        explicit SimdDouble2 (const double* v)              __NE___ : _value{ _mm_loadu_pd( v )} {}
         explicit SimdDouble2 (const __m128d &v)             __NE___ : _value{ v } {}
         SimdDouble2 (double x, double y)                    __NE___ : _value{_mm_set_pd( x, y )} {}
 
@@ -328,10 +328,11 @@ namespace AE::Math
     //  ND_ Self  FastSqrt ()                               C_NE___ { return Self{ _mm_mul_pd( _value, _mm_rsqrt14_pd( _value ))}; }    // x / sqrt(x)
         ND_ Self  Scale (const Self &rhs)                   C_NE___ { return Self{ _mm_scalef_pd( _value, rhs._value )}; }              // a * 2^b
 
+        // fused multiply (FM) / fused negative multiply (FNM)
         ND_ Self  FMAdd (const Self &b, const Self &c)      C_NE___ { return Self{ _mm_fmadd_pd(    _value, b._value, c._value )}; }    // a * b + c
         ND_ Self  FMSub (const Self &b, const Self &c)      C_NE___ { return Self{ _mm_fmsub_pd(    _value, b._value, c._value )}; }    // a * b - c
-        ND_ Self  FMAddSub (const Self &b, const Self &c)   C_NE___ { return Self{ _mm_fmaddsub_pd( _value, b._value, c._value )}; }    // { a0 * b0 - c0, a1 * b1 + c1, a2 * b2 - c2, a3 * b3 + c3 }
-        ND_ Self  FMSubAdd (const Self &b, const Self &c)   C_NE___ { return Self{ _mm_fmaddsub_pd( _value, b._value, c._value )}; }    // { a0 * b0 + c0, a1 * b1 - c1, a2 * b2 + c2, a3 * b3 - c3 }
+        ND_ Self  FMAddSub (const Self &b, const Self &c)   C_NE___ { return Self{ _mm_fmaddsub_pd( _value, b._value, c._value )}; }    // { a0 * b0 - c0, a1 * b1 + c1 }
+        ND_ Self  FMSubAdd (const Self &b, const Self &c)   C_NE___ { return Self{ _mm_fmaddsub_pd( _value, b._value, c._value )}; }    // { a0 * b0 + c0, a1 * b1 - c1 }
         ND_ Self  FNMAdd (const Self &b, const Self &c)     C_NE___ { return Self{ _mm_fnmadd_pd(   _value, b._value, c._value )}; }    // -a * b + c
         ND_ Self  FNMSub (const Self &b, const Self &c)     C_NE___ { return Self{ _mm_fnmsub_pd(   _value, b._value, c._value )}; }    // -a * b - c
 
@@ -387,7 +388,7 @@ namespace AE::Math
         template <typename T>
         ND_ auto    ToArray ()                          C_NE___
         {
-            STATIC_ASSERT( IsInteger<T> );
+            StaticAssert( IsInteger<T> );
             struct m128i_no_attr { __m128i a; };
             StaticArray< T, sizeof(m128i_no_attr) / sizeof(T) > arr;
             //if constexpr( sizeof(T) == 1 )_mm_storeu_epi8(  OUT static_cast<void*>(arr.data()), _value );     // avx512
@@ -407,7 +408,7 @@ namespace AE::Math
     template <typename IntType>
     struct SimdTInt128
     {
-        STATIC_ASSERT( IsInteger<IntType> );
+        StaticAssert( IsInteger<IntType> );
 
     // types
     public:
@@ -418,7 +419,7 @@ namespace AE::Math
 
         static constexpr uint   count   = sizeof(Native_t) / sizeof(IntType);
         using Array_t                   = StaticArray< Value_t, count >;
-        STATIC_ASSERT( sizeof(Array_t) == sizeof(Native_t) );
+        StaticAssert( sizeof(Array_t) == sizeof(Native_t) );
 
 
     // variables
@@ -459,7 +460,7 @@ namespace AE::Math
         {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, ubyte > or IsSameTypes< T, sbyte >>
+                  ENABLEIF( IsSameTypes< T, ubyte > or IsSameTypes< T, sbyte >)
                  >
         SimdTInt128 (T v00, T v01, T v02, T v03,
                      T v04, T v05, T v06, T v07,
@@ -469,20 +470,20 @@ namespace AE::Math
                                   v08, v09, v10, v11, v12, v13, v14, v15 )} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, ushort > or IsSameTypes< T, sshort >>
+                  ENABLEIF( IsSameTypes< T, ushort > or IsSameTypes< T, sshort >)
                  >
         SimdTInt128 (T v0, T v1, T v2, T v3,
                      T v4, T v5, T v6, T v7)            __NE___ :
             _value{ _mm_set_epi16( v0, v1, v2, v3, v4, v5, v6, v7 )} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, uint > or IsSameTypes< T, sint >>
+                  ENABLEIF( IsSameTypes< T, uint > or IsSameTypes< T, sint >)
                  >
         SimdTInt128 (T v0, T v1, T v2, T v3)            __NE___ :
             _value{ _mm_set_epi32( v0, v1, v2, v3 )} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, ulong > or IsSameTypes< T, slong >>
+                  ENABLEIF( IsSameTypes< T, ulong > or IsSameTypes< T, slong >)
                  >
         SimdTInt128 (T v0, T v1)                        __NE___ :
             _value{ _mm_set_epi64x( v0, v1 )} {}
diff --git a/AE/engine/src/base/Math/SIMD_SSE256.h b/AE/engine/src/base/Math/SIMD_SSE256.h
index 558588ae..5484e88a 100644
--- a/AE/engine/src/base/Math/SIMD_SSE256.h
+++ b/AE/engine/src/base/Math/SIMD_SSE256.h
@@ -23,7 +23,7 @@ namespace AE::Math
         using Self      = SimdFloat8;
         using Array_t   = StaticArray< Value_t, 8 >;
 
-        STATIC_ASSERT( sizeof(Array_t) == sizeof(__m256) );
+        StaticAssert( sizeof(Array_t) == sizeof(__m256) );
 
 
         struct Bool8
@@ -136,7 +136,7 @@ namespace AE::Math
         ND_ Self  Round ()                                  C_NE___ { return Self{ _mm256_round_ps( _value, Mode )}; }
 
         template <uint Idx>
-        ND_ SimdFloat4  ToFloat4 ()                         C_NE___ { STATIC_ASSERT( Idx < 2 );  return SimdFloat4{ _mm256_extractf128_ps( _value, Idx )}; }
+        ND_ SimdFloat4  ToFloat4 ()                         C_NE___ { StaticAssert( Idx < 2 );  return SimdFloat4{ _mm256_extractf128_ps( _value, Idx )}; }
 
         ND_ Array_t     ToArray ()                          C_NE___ { Array_t arr;  _mm256_storeu_ps( OUT arr.data(), _value );  return arr; }
             void        ToArray (OUT Value_t* dst)          C_NE___ { _mm256_storeu_ps( OUT dst, _value ); }
@@ -159,7 +159,7 @@ namespace AE::Math
         using Self      = SimdDouble4;
         using Array_t   = StaticArray< Value_t, 4 >;
 
-        STATIC_ASSERT( sizeof(Array_t) == sizeof(__m256d) );
+        StaticAssert( sizeof(Array_t) == sizeof(__m256d) );
 
 
         struct Bool4
@@ -192,7 +192,7 @@ namespace AE::Math
     public:
         SimdDouble4 ()                                      __NE___ : _value{ _mm256_setzero_pd() } {}
         explicit SimdDouble4 (double v)                     __NE___ : _value{ _mm256_set1_pd( v )} {}
-        explicit SimdDouble4 (const double *v)              __NE___ : _value{ _mm256_loadu_pd( v )} {}
+        explicit SimdDouble4 (const double* v)              __NE___ : _value{ _mm256_loadu_pd( v )} {}
         explicit SimdDouble4 (const __m256d &v)             __NE___ : _value{ v } {}
         SimdDouble4 (double x, double y, double z, double w)__NE___ : _value{ _mm256_set_pd( x, y, z, w )} {}
 
@@ -281,7 +281,7 @@ namespace AE::Math
             __m256d xy3 = _mm256_mul_pd( x[3]._value, y[3]._value );
 
             // low to high: xy00+xy01 xy10+xy11 xy02+xy03 xy12+xy13
-            __m256d temp01  = _mm256_hadd_pd( xy0, xy1 );   
+            __m256d temp01  = _mm256_hadd_pd( xy0, xy1 );
 
             // low to high: xy20+xy21 xy30+xy31 xy22+xy23 xy32+xy33
             __m256d temp23  = _mm256_hadd_pd( xy2, xy3 );
@@ -296,7 +296,7 @@ namespace AE::Math
         }
 
         template <uint Idx>
-        ND_ SimdDouble2 ToDouble2 ()                        C_NE___ { STATIC_ASSERT( Idx < 2 );  return SimdDouble2{ _mm256_extractf128_pd( _value, Idx )}; }
+        ND_ SimdDouble2 ToDouble2 ()                        C_NE___ { StaticAssert( Idx < 2 );  return SimdDouble2{ _mm256_extractf128_pd( _value, Idx )}; }
 
         ND_ Array_t     ToArray ()                          C_NE___ { Array_t arr;  _mm256_storeu_pd( OUT arr.data(), _value );  return arr; }
             void        ToArray (OUT Value_t* dst)          C_NE___ { _mm256_storeu_pd( OUT dst, _value ); }
@@ -350,7 +350,7 @@ namespace AE::Math
         template <typename T>
         ND_ auto    ToArray ()                          C_NE___
         {
-            STATIC_ASSERT( IsInteger<T> );
+            StaticAssert( IsInteger<T> );
             StaticArray< T, sizeof(__m256i) / sizeof(T) >   arr;
             if constexpr( sizeof(T) == 1 )  _mm256_storeu_epi8(   OUT static_cast<void*>(arr.data()), _value );
             if constexpr( sizeof(T) == 2 )  _mm256_storeu_epi16(  OUT static_cast<void*>(arr.data()), _value );
@@ -368,7 +368,7 @@ namespace AE::Math
     template <typename IntType>
     struct SimdTInt256
     {
-        STATIC_ASSERT(( IsSameTypes<IntType, Int128b> or IsInteger<IntType> ));
+        StaticAssert(( IsSameTypes<IntType, Int128b> or IsInteger<IntType> ));
 
     // types
     public:
@@ -379,7 +379,7 @@ namespace AE::Math
 
         static constexpr uint   count   = sizeof(Native_t) / sizeof(IntType);
         using Array_t                   = StaticArray< Value_t, count >;
-        STATIC_ASSERT( sizeof(Array_t) == sizeof(Native_t) );
+        StaticAssert( sizeof(Array_t) == sizeof(Native_t) );
 
 
     // variables
@@ -434,7 +434,7 @@ namespace AE::Math
         }
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, ubyte > or IsSameTypes< T, sbyte >>
+                  ENABLEIF( IsSameTypes< T, ubyte > or IsSameTypes< T, sbyte >)
                  >
         SimdTInt256 (T v00, T v01, T v02, T v03,
                      T v04, T v05, T v06, T v07,
@@ -450,7 +450,7 @@ namespace AE::Math
                                      v24, v25, v26, v27, v28, v29, v30, v31)} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, ushort > or IsSameTypes< T, sshort >>
+                  ENABLEIF( IsSameTypes< T, ushort > or IsSameTypes< T, sshort >)
                  >
         SimdTInt256 (T v00, T v01, T v02, T v03,
                      T v04, T v05, T v06, T v07,
@@ -460,20 +460,20 @@ namespace AE::Math
                                       v08, v09, v10, v11, v12, v13, v14, v15 )} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, uint > or IsSameTypes< T, sint >>
+                  ENABLEIF( IsSameTypes< T, uint > or IsSameTypes< T, sint >)
                  >
         SimdTInt256 (T v0, T v1, T v2, T v3,
                      T v4, T v5, T v6, T v7)            __NE___ :
             _value{ _mm256_set_epi32( v0, v1, v2, v3, v4, v5, v6, v7 )} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, ulong > or IsSameTypes< T, slong >>
+                  ENABLEIF( IsSameTypes< T, ulong > or IsSameTypes< T, slong >)
                  >
         SimdTInt256 (T v0, T v1, T v2, T v3)            __NE___ :
             _value{ _mm256_set_epi64x( v0, v1, v2, v3 )} {}
 
         template <typename T,
-                  typename = EnableIf< IsSameTypes< T, __m128i >>
+                  ENABLEIF( IsSameTypes< T, __m128i >)
                  >
         SimdTInt256 (T v0, T v1)                        __NE___ :
             _value{ _mm256_set_m128( v0, v1 )} {}
diff --git a/AE/engine/src/base/Math/SIMD_SSE512.h b/AE/engine/src/base/Math/SIMD_SSE512.h
index 228b4341..66538000 100644
--- a/AE/engine/src/base/Math/SIMD_SSE512.h
+++ b/AE/engine/src/base/Math/SIMD_SSE512.h
@@ -136,7 +136,7 @@ namespace AE::Math
     template <typename IntType>
     struct SimdTInt512
     {
-        STATIC_ASSERT(( IsSameTypes<IntType, Int128b> or IsSameTypes<IntType, Int256b> or IsInteger<IntType> ));
+        StaticAssert(( IsSameTypes<IntType, Int128b> or IsSameTypes<IntType, Int256b> or IsInteger<IntType> ));
 
     // types
     public:
diff --git a/AE/engine/src/base/Math/Spherical.h b/AE/engine/src/base/Math/Spherical.h
index 890bd0c4..6996cd96 100644
--- a/AE/engine/src/base/Math/Spherical.h
+++ b/AE/engine/src/base/Math/Spherical.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "base/Math/Radians.h"
+#include "base/Math/Radian.h"
 
 namespace AE::Math
 {
@@ -14,32 +14,32 @@ namespace AE::Math
     template <typename T>
     struct TSpherical
     {
-        STATIC_ASSERT( IsFloatPoint<T> );
+        StaticAssert( IsFloatPoint<T> );
 
     // types
     public:
         using Value_t   = T;
-        using Angle_t   = TRadians< T >;
+        using Angle_t   = TRadian< T >;
         using Self      = TSpherical< T >;
         using Vec3_t    = Vec< T, 3 >;
 
 
     // variables
     public:
-        Angle_t     theta;      // polar angle (vertical)
-        Angle_t     phi;        // azimuthal angle (horizontal)
+        Angle_t     phi;        // azimuthal angle (horizontal - X)
+        Angle_t     theta;      // polar angle (vertical - Y)
 
 
     // methods
     public:
         constexpr TSpherical ()                                                 __NE___ {}
-        constexpr TSpherical (T theta, T phi)                                   __NE___ : theta{theta}, phi{phi} {}
-        constexpr TSpherical (Angle_t theta, Angle_t phi)                       __NE___ : theta{theta}, phi{phi} {}
-        constexpr explicit TSpherical (const Vec<T,2> &angle)                   __NE___ : theta{angle.x}, phi{angle.y} {}
-        constexpr explicit TSpherical (const Vec<Angle_t, 2> &angle)            __NE___ : theta{angle.x}, phi{angle.y} {}
+        constexpr TSpherical (T phi, T theta)                                   __NE___ : phi{phi}, theta{theta} {}
+        constexpr TSpherical (Angle_t phi, Angle_t theta)                       __NE___ : phi{phi}, theta{theta} {}
+        constexpr explicit TSpherical (const Vec<T,2> &angle)                   __NE___ : phi{angle.y}, theta{angle.x} {}
+        constexpr explicit TSpherical (const Vec<Angle_t, 2> &angle)            __NE___ : phi{angle.y}, theta{angle.x} {}
 
-        ND_ constexpr explicit operator Vec<T,2> ()                             C_NE___ { return Vec<T,2>{ T(theta), T(phi) }; }
-        ND_ constexpr explicit operator Vec<Angle_t,2> ()                       C_NE___ { return Vec<Angle_t,2>{ theta, phi }; }
+        ND_ constexpr explicit operator Vec<T,2> ()                             C_NE___ { return Vec<T,2>{ T{phi}, T{theta} }; }
+        ND_ constexpr explicit operator Vec<Angle_t,2> ()                       C_NE___ { return Vec<Angle_t,2>{ phi, theta }; }
 
         ND_ constexpr Self  operator + (const Self &rhs)                        C_NE___;
         ND_ constexpr Self  operator - (const Self &rhs)                        C_NE___;
@@ -50,7 +50,7 @@ namespace AE::Math
     };
 
 
-    using SphericalF    = TSpherical< float >;
+    using Spherical     = TSpherical< float >;
     using SphericalD    = TSpherical< double >;
 
 
@@ -64,14 +64,14 @@ namespace AE::Math
     constexpr TSpherical<T>  TSpherical<T>::operator + (const Self &rhs) C_NE___
     {
         // TODO: wrap?
-        return Self{ theta + rhs.theta, phi + rhs.phi };
+        return Self{ phi + rhs.phi, theta + rhs.theta };
     }
 
     template <typename T>
     constexpr TSpherical<T>  TSpherical<T>::operator - (const Self &rhs) C_NE___
     {
         // TODO: wrap?
-        return Self{ theta - rhs.theta, phi - rhs.phi };
+        return Self{ phi - rhs.phi, theta - rhs.theta };
     }
 
 /*
@@ -87,8 +87,8 @@ namespace AE::Math
         const auto  c       = cartesian / len;
 
         TSpherical<T>   spherical;
-        spherical.theta = ACos(Saturate( c.z ));
-        spherical.phi   = ATan( c.y, c.x ).WrapTo0_2Pi();
+        spherical.theta = ACos( c.y );
+        spherical.phi   = ATan( c.z, c.x );
 
         return { spherical, radius };
     }
@@ -102,12 +102,11 @@ namespace AE::Math
     Vec<T,3>  TSpherical<T>::ToCartesian () C_NE___
     {
         Vec<T,3>    cartesian;
+        const T     sin_t   = Sin( theta );
 
-        const T     sin_phi = Sin( phi );
-        cartesian.x = sin_phi * Cos( theta );
-        cartesian.y = sin_phi * Sin( theta );
-        cartesian.z = Cos( phi );
-
+        cartesian.x = sin_t * Cos( phi );
+        cartesian.y = Cos( theta );
+        cartesian.z = sin_t * Sin( phi );
         return cartesian;
     }
 
@@ -117,5 +116,61 @@ namespace AE::Math
         return ToCartesian() * radius;
     }
 
+/*
+=================================================
+    Lerp
+=================================================
+*/
+    template <typename T>
+    TSpherical<T>  Lerp (const TSpherical<T> &lhs, const TSpherical<T> &rhs, const T factor) __NE___
+    {
+        TSpherical<T>   result;
+        result.theta    = Math::Lerp( lhs.theta, rhs.theta, factor );
+        result.phi      = Math::Lerp( lhs.phi,   rhs.phi,   factor );
+        return result;
+    }
+
+/*
+=================================================
+    Equal / BitEqual
+=================================================
+*/
+    template <typename T>
+    ND_ bool2  Equal (const TSpherical<T> &lhs, const TSpherical<T> &rhs, const T err = Epsilon<T>()) __NE___
+    {
+        return bool2{ Math::Equal( lhs.phi, rhs.phi, err ),
+                      Math::Equal( lhs.theta, rhs.theta, err )};
+    }
+
+    template <typename T>
+    ND_ bool2  Equal (const TSpherical<T> &lhs, const TSpherical<T> &rhs, const Percent err) __NE___
+    {
+        return bool2{ Math::Equal( lhs.phi, rhs.phi, err ),
+                      Math::Equal( lhs.theta, rhs.theta, err )};
+    }
+
+    template <typename T>
+    ND_ bool2  BitEqual (const TSpherical<T> &lhs, const TSpherical<T> &rhs, const EnabledBitCount bitCount) __NE___
+    {
+        return bool2{ Math::BitEqual( lhs.phi, rhs.phi, bitCount ),
+                      Math::BitEqual( lhs.theta, rhs.theta, bitCount )};
+    }
+
+    template <typename T>
+    ND_ bool2  BitEqual (const TSpherical<T> &lhs, const TSpherical<T> &rhs) __NE___
+    {
+        return bool2{ Math::BitEqual( lhs.phi, rhs.phi ),
+                      Math::BitEqual( lhs.theta, rhs.theta )};
+    }
+
 
 } // AE::Math
+
+
+namespace AE::Base
+{
+    template <typename T>   struct TMemCopyAvailable< TSpherical<T> >       { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< TSpherical<T> >       { static constexpr bool  value = IsZeroMemAvailable<T>; };
+    template <typename T>   struct TTriviallySerializable< TSpherical<T> >  { static constexpr bool  value = IsTriviallySerializable<T>; };
+
+} // AE::Base
diff --git a/AE/engine/src/base/Math/Spline.h b/AE/engine/src/base/Math/Spline.h
new file mode 100644
index 00000000..e9d0d28a
--- /dev/null
+++ b/AE/engine/src/base/Math/Spline.h
@@ -0,0 +1,89 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "base/Math/Vec.h"
+
+namespace AE::Math
+{
+
+    //
+    // B-Spline
+    //
+    template <typename VecType>
+    struct BSpline
+    {
+    // types
+    public:
+        using Vec_t     = VecType;
+        using Value_t   = typename VecType::Value_t;
+    private:
+        using T         = Value_t;
+
+
+    // variables
+    private:
+        Vec_t   _c0, _c1, _c2, _c3;
+
+
+    // methods
+    public:
+        BSpline ()                                                                      __NE___ {}
+        BSpline (const Vec_t &p0, const Vec_t &p1, const Vec_t &p2, const Vec_t &p3)    __NE___ { Init( p0, p1, p2, p3 ); }
+
+        void  Init (const Vec_t &p0, const Vec_t &p1, const Vec_t &p2, const Vec_t &p3) __NE___
+        {
+            _c0 = (p0 + T(4.0) * p1 + p2) / T(6.0);
+            _c1 = (p2 - p0) / T(2.0);
+            _c2 = (p0 + p2) / T(2.0) - p1;
+            _c3 = (p3 - p0) / T(6.0) + (p1 - p2) / T(2.0);
+        }
+
+        ND_ Vec_t  operator () (const T a)                                              C_NE___
+        {
+            return _c0 + (_c1 * a) + (_c2 * a * a) + (_c3 * a * a * a);
+        }
+    };
+
+
+
+    //
+    // Chordal Catmull-Rom
+    //
+    template <typename VecType>
+    struct ChordalCatmullRom
+    {
+    // types
+    public:
+        using Vec_t     = VecType;
+        using Value_t   = typename VecType::Value_t;
+    private:
+        using T         = Value_t;
+
+
+    // variables
+    private:
+        Vec_t   _c0, _c1, _c2, _c3;
+
+
+    // methods
+    public:
+        ChordalCatmullRom ()                                                                    __NE___ {}
+        ChordalCatmullRom (const Vec_t &p0, const Vec_t &p1, const Vec_t &p2, const Vec_t &p3)  __NE___ { Init( p0, p1, p2, p3 ); }
+
+        void  Init (const Vec_t &p0, const Vec_t &p1, const Vec_t &p2, const Vec_t &p3)         __NE___
+        {
+            _c0 = ( T(2.0) * p1 );
+            _c1 = ( -p0 + p2 );
+            _c2 = ( T(2.0) * p0 - T(5.0) * p1 + T(4.0) * p2 - p3 );
+            _c3 = ( -p0 + T(3.0) * p1 - T(3.0) * p2 + p3 );
+        }
+
+        ND_ Vec_t  operator () (const T a)                                                      C_NE___
+        {
+            return T(0.5) * ((_c0) + (_c1 * a) + (_c2 * a * a) + (_c3 * a * a * a));
+        }
+    };
+
+
+} // AE::Math
diff --git a/AE/engine/src/base/Math/Transformation.h b/AE/engine/src/base/Math/Transformation.h
index ff0d3caf..7bb6b65d 100644
--- a/AE/engine/src/base/Math/Transformation.h
+++ b/AE/engine/src/base/Math/Transformation.h
@@ -16,7 +16,7 @@ namespace AE::Math
     template <typename T>
     struct TTransformation
     {
-        STATIC_ASSERT( IsFloatPoint<T> );
+        StaticAssert( IsFloatPoint<T> );
 
     // types
     public:
@@ -71,7 +71,7 @@ namespace AE::Math
         ND_ Mat4_t  ToRotationScaleMatrix ()                                            C_NE___ { return Mat4_t{ orientation } * Mat4_t::Scaled( scale ); } // view matrix
         ND_ Mat4_t  ToModelMatrix ()                                                    C_NE___ { return Mat4_t::Translated( position ); }
 
-        ND_ bool    IsIdentity ()                                                       C_NE___ { return Equals( *this, Self{} ); }
+        ND_ bool    IsIdentity ()                                                       C_NE___ { return Equal( *this, Self{} ); }
 
 
         // local space to global
@@ -98,7 +98,7 @@ namespace AE::Math
         bool        ok = glm::decompose( mat._value, OUT scale3, OUT orientation._value, OUT position, OUT skew, OUT perspective );
 
         ASSERT( ok );  Unused( ok );
-        ASSERT( Equals( scale3.x, scale3.y ) and Equals( scale3.x, scale3.z ));
+        ASSERT( Equal( scale3.x, scale3.y ) and Equal( scale3.x, scale3.z ));
         scale = scale3.x;
     }
 
@@ -142,23 +142,23 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T>
-    ND_ bool  Equals (const TTransformation<T> &lhs, const TTransformation<T> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ bool  Equal (const TTransformation<T> &lhs, const TTransformation<T> &rhs, const T err = Epsilon<T>()) __NE___
     {
-        return  All( Math::Equals( lhs.orientation, rhs.orientation, err )) &
-                All( Math::Equals( lhs.position, rhs.position, err ))       &
-                Math::Equals( lhs.scale, rhs.scale, err );
+        return  All( Math::Equal( lhs.orientation, rhs.orientation, err ))  &
+                All( Math::Equal( lhs.position, rhs.position, err ))        &
+                Math::Equal( lhs.scale, rhs.scale, err );
     }
 
     template <typename T>
-    ND_ bool  Equals (const TTransformation<T> &lhs, const TTransformation<T> &rhs, const Percent err) __NE___
+    ND_ bool  Equal (const TTransformation<T> &lhs, const TTransformation<T> &rhs, const Percent err) __NE___
     {
-        return  All( Math::Equals( lhs.orientation, rhs.orientation, err )) &
-                All( Math::Equals( lhs.position, rhs.position, err ))       &
-                Math::Equals( lhs.scale, rhs.scale, err );
+        return  All( Math::Equal( lhs.orientation, rhs.orientation, err ))  &
+                All( Math::Equal( lhs.position, rhs.position, err ))        &
+                Math::Equal( lhs.scale, rhs.scale, err );
     }
 
 /*
@@ -219,8 +219,9 @@ namespace AE::Math
 
 namespace AE::Base
 {
-    template <typename T>   struct TMemCopyAvailable< TTransformation<T> >      { static constexpr bool  value = IsMemCopyAvailable<T>; };
-    template <typename T>   struct TZeroMemAvailable< TTransformation<T> >      { static constexpr bool  value = IsZeroMemAvailable<T>; };
-    template <typename T>   struct TTriviallySerializable< TTransformation<T> > { static constexpr bool  value = IsTriviallySerializable<T>; };
+    template <typename T>   struct TMemCopyAvailable< TTransformation<T> >  { static constexpr bool  value = IsMemCopyAvailable<T>; };
+    template <typename T>   struct TZeroMemAvailable< TTransformation<T> >  { static constexpr bool  value = IsZeroMemAvailable<T>; };
+
+    // 'IsTriviallySerializable< TTransformation<> > = false' - because SIMD and packed types has different alignment
 
 } // AE::Base
diff --git a/AE/engine/src/base/Math/Vec.h b/AE/engine/src/base/Math/Vec.h
index 19f3b80c..c535eec5 100644
--- a/AE/engine/src/base/Math/Vec.h
+++ b/AE/engine/src/base/Math/Vec.h
@@ -533,7 +533,7 @@ namespace AE::Math
 
 /*
 =================================================
-    Lerp
+    Lerp / SLerp
 =================================================
 */
     template <typename T, int I, glm::qualifier Q>
@@ -542,6 +542,12 @@ namespace AE::Math
         return glm::mix( lhs, rhs, factor );
     }
 
+    template <typename T, glm::qualifier Q>
+    ND_ EnableIf<IsFloatPoint<T>, TVec<T,3,Q>>  SLerp (const TVec<T,3,Q> &lhs, const TVec<T,3,Q> &rhs, const T factor) __NE___
+    {
+        return glm::slerp( lhs, rhs, factor );
+    }
+
 /*
 =================================================
     Area
@@ -589,25 +595,25 @@ namespace AE::Math
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T, int I, glm::qualifier Q>
-    ND_ EnableIf<IsScalar<T>, TVec<bool,I,Q>>  Equals (const TVec<T,I,Q> &lhs, const TVec<T,I,Q> &rhs, const T err = Epsilon<T>()) __NE___
+    ND_ EnableIf<IsScalar<T>, TVec<bool,I,Q>>  Equal (const TVec<T,I,Q> &lhs, const TVec<T,I,Q> &rhs, const T err = Epsilon<T>()) __NE___
     {
         TVec<bool,I,Q>  res;
         for (int i = 0; i < I; ++i) {
-            res[i] = Equals( lhs[i], rhs[i], err );
+            res[i] = Equal( lhs[i], rhs[i], err );
         }
         return res;
     }
 
     template <typename T, int I, glm::qualifier Q>
-    ND_ EnableIf<IsScalar<T>, TVec<bool,I,Q>>  Equals (const TVec<T,I,Q> &lhs, const TVec<T,I,Q> &rhs, const Percent err) __NE___
+    ND_ EnableIf<IsScalar<T>, TVec<bool,I,Q>>  Equal (const TVec<T,I,Q> &lhs, const TVec<T,I,Q> &rhs, const Percent err) __NE___
     {
         TVec<bool,I,Q>  res;
         for (int i = 0; i < I; ++i) {
-            res[i] = Equals( lhs[i], rhs[i], err );
+            res[i] = Equal( lhs[i], rhs[i], err );
         }
         return res;
     }
@@ -645,7 +651,7 @@ namespace AE::Math
     template <typename T, int I, glm::qualifier Q>
     ND_ EnableIf<IsScalar<T>, TVec<bool,I,Q>>  IsZero (const TVec<T,I,Q> &x) __NE___
     {
-        return Equals( x, TVec<T,I,Q>{T{0}}, Epsilon<T>() );
+        return Equal( x, TVec<T,I,Q>{T{0}}, Epsilon<T>() );
     }
 
     template <typename T, int I, glm::qualifier Q>
@@ -665,25 +671,19 @@ namespace AE::Math
         return glm::min( lhs, rhs );
     }
 
-    template <typename T, int I, typename S, glm::qualifier Q,
-              typename = EnableIf<IsScalar<S>>
-             >
+    template <typename T, int I, typename S, glm::qualifier Q, ENABLEIF( IsScalar<S> )>
     ND_ TVec<T,I,Q>  Min (const TVec<T,I,Q> &lhs, const S &rhs) __NE___
     {
         return Min( lhs, TVec<T,I,Q>{rhs} );
     }
 
-    template <typename T, int I, typename S, glm::qualifier Q,
-              typename = EnableIf<IsScalar<S>>
-             >
+    template <typename T, int I, typename S, glm::qualifier Q, ENABLEIF( IsScalar<S> )>
     ND_ TVec<T,I,Q>  Min (const S &lhs, const TVec<T,I,Q> &rhs) __NE___
     {
         return Min( TVec<T,I,Q>{lhs}, rhs );
     }
 
-    template <typename LT, typename RT,
-              typename = EnableIf<not IsVec<LT> and not IsVec<RT>>
-             >
+    template <typename LT, typename RT, ENABLEIF( not IsVec<LT> and not IsVec<RT> )>
     ND_ constexpr auto  Min (const LT &lhs, const RT &rhs) __NE___
     {
         if constexpr( IsSameTypes<LT, RT> )
@@ -720,25 +720,19 @@ namespace AE::Math
         return glm::max( lhs, rhs );
     }
 
-    template <typename T, int I, typename S, glm::qualifier Q,
-              typename = EnableIf<IsScalar<S>>
-             >
+    template <typename T, int I, typename S, glm::qualifier Q, ENABLEIF( IsScalar<S> )>
     ND_ TVec<T,I,Q>  Max (const TVec<T,I,Q> &lhs, const S &rhs) __NE___
     {
         return Max( lhs, TVec<T,I,Q>{rhs} );
     }
 
-    template <typename T, int I, typename S, glm::qualifier Q,
-              typename = EnableIf<IsScalar<S>>
-             >
+    template <typename T, int I, typename S, glm::qualifier Q, ENABLEIF( IsScalar<S> )>
     ND_ auto  Max (const S &lhs, const TVec<T,I,Q> &rhs) __NE___
     {
         return Max( TVec<T,I,Q>{lhs}, rhs );
     }
 
-    template <typename LT, typename RT,
-              typename = EnableIf<not IsVec<LT> and not IsVec<RT>>
-             >
+    template <typename LT, typename RT, ENABLEIF( not IsVec<LT> and not IsVec<RT> )>
     ND_ constexpr auto  Max (const LT &lhs, const RT &rhs) __NE___
     {
         if constexpr( IsSameTypes<LT, RT> )
@@ -827,21 +821,6 @@ namespace AE::Math
     Wrap (float)
 =================================================
 */
-    template <typename T>
-    ND_ constexpr EnableIf<IsFloatPoint<T>, T>  Wrap (const T& value, const T& minValue, const T& maxValue) __NE___
-    {
-        // check for NaN
-        if_unlikely( minValue >= maxValue )
-            return minValue;
-
-        T   result = T( minValue + std::fmod( value - minValue, maxValue - minValue ));
-
-        if ( result < minValue )
-            result += (maxValue - minValue);
-
-        return result;
-    }
-
     template <typename T, int I, glm::qualifier Q>
     ND_ EnableIf<IsFloatPoint<T>, TVec<T,I,Q>>  Wrap (const TVec<T,I,Q>& v, const T& minValue, const T& maxValue) __NE___
     {
@@ -867,21 +846,6 @@ namespace AE::Math
     Wrap (int)
 =================================================
 */
-    template <typename T>
-    ND_ constexpr EnableIf<IsInteger<T>, T>  Wrap (const T& value, const T& minValue, const T& maxValue) __NE___
-    {
-        // check for div by zero
-        if_unlikely( minValue > maxValue )
-            return minValue;
-
-        T   result = T( minValue + ((value - minValue) % (maxValue - minValue + 1)) );
-
-        if ( result < minValue )
-            result += (maxValue - minValue + 1);
-
-        return result;
-    }
-
     template <typename T, int I, glm::qualifier Q>
     ND_ EnableIf<IsInteger<T>, TVec<T,I,Q>>  Wrap (const TVec<T,I,Q>& v, const T& minValue, const T& maxValue) __NE___
     {
@@ -1110,7 +1074,7 @@ namespace AE::Math
 =================================================
 */
     template <typename T1, typename T2, typename T3,
-              typename = EnableIf<IsScalarOrEnum<T1> and IsScalarOrEnum<T2> and IsScalarOrEnum<T3>>
+              ENABLEIF( IsScalarOrEnum<T1> and IsScalarOrEnum<T2> and IsScalarOrEnum<T3> )
              >
     ND_ constexpr auto  SafeDiv (const T1& lhs, const T2& rhs, const T3& defVal) __NE___
     {
@@ -1120,7 +1084,7 @@ namespace AE::Math
     }
 
     template <typename T1, typename T2,
-              typename = EnableIf<IsScalarOrEnum<T1> and IsScalarOrEnum<T2>>
+              ENABLEIF( IsScalarOrEnum<T1> and IsScalarOrEnum<T2> )
              >
     ND_ constexpr auto  SafeDiv (const T1& lhs, const T2& rhs) __NE___
     {
@@ -1138,15 +1102,14 @@ namespace AE::Math
     }
 
     template <typename T, int I, typename S1, typename S2, glm::qualifier Q,
-              typename = EnableIf<IsScalar<S1> and IsScalar<S2>>
+              ENABLEIF( IsScalar<S1> and IsScalar<S2> )
              >
     ND_ TVec<T,I,Q>  SafeDiv (const TVec<T,I,Q>& lhs, const S1& rhs, const S2& defVal) __NE___
     {
         return SafeDiv( lhs, TVec<T,I,Q>{rhs}, T(defVal) );
     }
 
-    template <typename T, int I, typename S1, glm::qualifier Q,
-              typename = EnableIf<IsScalar<S1>>
+    template <typename T, int I, typename S1, glm::qualifier Q, ENABLEIF( IsScalar<S1> )
              >
     ND_ TVec<T,I,Q>  SafeDiv (const TVec<T,I,Q>& lhs, const S1& rhs) __NE___
     {
@@ -1182,20 +1145,20 @@ namespace AE::Math
     template <typename T, typename A, typename B, typename C, glm::qualifier Q>
     ND_ auto  BaryLerp (const A& v0, const B& v1, const C& v2, const TVec<T,3,Q> &barycentrics) __NE___
     {
-        STATIC_ASSERT( IsFloatPoint<A> and IsFloatPoint<B> and IsFloatPoint<C> and IsFloatPoint<T> );
+        StaticAssert( IsFloatPoint<A> and IsFloatPoint<B> and IsFloatPoint<C> and IsFloatPoint<T> );
         return v0 * barycentrics.x + v1 * barycentrics.y + v2 * barycentrics.z;
     }
 
     template <typename T, typename A, typename B, typename C, glm::qualifier Q>
     ND_ auto  BaryLerp (const A& v0, const B& v1, const C& v2, const TVec<T,2,Q> &barycentrics) __NE___
     {
-        STATIC_ASSERT( IsFloatPoint<A> and IsFloatPoint<B> and IsFloatPoint<C> and IsFloatPoint<T> );
+        StaticAssert( IsFloatPoint<A> and IsFloatPoint<B> and IsFloatPoint<C> and IsFloatPoint<T> );
         return v0 + FusedMulAdd( barycentrics.x, (v1 - v0), barycentrics.y * (v2 - v0));
     }
 
 /*
 =================================================
-    BiLerp
+    BiLerp / BiSLerp
 ----
     bilinear interpolation
 =================================================
@@ -1207,6 +1170,13 @@ namespace AE::Math
                      Lerp( x1y2, x2y2, factor.x ), factor.y );
     }
 
+    template <typename T, typename Coord, glm::qualifier Q>
+    ND_ auto  BiSLerp (const Coord& x1y1, const Coord& x2y1, const Coord& x1y2, const Coord& x2y2, const TVec<T,2,Q> &factor) __NE___
+    {
+        return SLerp( SLerp( x1y1, x2y1, factor.x ),
+                      SLerp( x1y2, x2y2, factor.x ), factor.y );
+    }
+
 /*
 =================================================
     Remap
@@ -1527,6 +1497,25 @@ namespace AE::Math
             return pos.x + (pos.y * dim.x) + (pos.z * dim.x * dim.y) + (pos.w * dim.x * dim.y * dim.z);
     }
 
+/*
+=================================================
+    AlignDown / AlignUp
+=================================================
+*/
+    template <typename T0, typename T1, int I, glm::qualifier Q>
+    ND_ EnableIf<IsInteger<T0>, TVec<T0,I,Q>>  AlignDown (const TVec<T0,I,Q> &value, const T1 &align) __NE___
+    {
+        StaticAssert( IsEnum<T1> or IsInteger<T1> or IsIntegerVec<T1> );
+        return (value / align) * align;
+    }
+
+    template <typename T0, typename T1, int I, glm::qualifier Q>
+    ND_ EnableIf<IsInteger<T0>, TVec<T0,I,Q>>  AlignUp (const TVec<T0,I,Q> &value, const T1 &align) __NE___
+    {
+        StaticAssert( IsEnum<T1> or IsInteger<T1> or IsIntegerVec<T1> );
+        return ((value + (align - T1{1})) / align) * align;
+    }
+
 /*
 =================================================
     IsMultipleOf
@@ -1535,8 +1524,7 @@ namespace AE::Math
     template <typename T0, typename T1, int I, glm::qualifier Q>
     ND_ EnableIf<IsInteger<T0>, TVec<bool,I,Q>>  IsMultipleOf (const TVec<T0,I,Q> &value, const T1 &align) __NE___
     {
-        STATIC_ASSERT( IsEnum<T0> or IsInteger<T0> );
-        STATIC_ASSERT( IsEnum<T1> or IsInteger<T1> or IsIntegerVec<T1> );
+        StaticAssert( IsEnum<T1> or IsInteger<T1> or IsIntegerVec<T1> );
         return (value % align) == T0{0};
     }
 
@@ -1573,7 +1561,7 @@ namespace AE::Math
     template <typename T, int I, glm::qualifier Q, typename S>
     ND_ EnableIf<IsFloatPoint<T>, T>  LinearStep (const TVec<T,I,Q>& x, const S& edge0, const S& edge1) __NE___
     {
-        STATIC_ASSERT( IsVec<S> or IsScalar<S> );
+        StaticAssert( IsVec<S> or IsScalar<S> );
         ASSERT( All( edge0 < edge1 ));
 
         return Saturate( (x - edge0) / (edge1 - edge0) );
@@ -1582,7 +1570,7 @@ namespace AE::Math
     template <typename T, int I, glm::qualifier Q, typename S>
     ND_ EnableIf<IsFloatPoint<T>, T>  SmoothStep (const TVec<T,I,Q>& x, const S& edge0, const S& edge1) __NE___
     {
-        STATIC_ASSERT( IsVec<S> or IsScalar<S> );
+        StaticAssert( IsVec<S> or IsScalar<S> );
         ASSERT( All( edge0 < edge1 ));
 
         T t = Saturate( (x - edge0) / (edge1 - edge0) );
@@ -1592,7 +1580,7 @@ namespace AE::Math
     template <typename T, int I, glm::qualifier Q, typename S>
     ND_ EnableIf<IsFloatPoint<T>, T>  BumpStep (const TVec<T,I,Q>& x, const S& edge0, const S& edge1) __NE___
     {
-        STATIC_ASSERT( IsVec<S> or IsScalar<S> );
+        StaticAssert( IsVec<S> or IsScalar<S> );
         ASSERT( All( edge0 < edge1 ));
 
         return T(1) - Abs( Saturate( (x - edge0) / (edge1 - edge0) ) - T(0.5) ) * T(2);
@@ -1642,6 +1630,165 @@ namespace AE::Math
         return glm::reflect( incident, normal );
     }
 
+/*
+=================================================
+    UIndexToUNormFloor / UIndexToUNormRound
+=================================================
+*/
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToUNormFloor (const TVec<T,I,Q> &index, const T count) __NE___
+    {
+        // range [0, 1]
+        using V = TVec<ToFloatPoint<T>,I,Q>;
+        return V(index) / V(count - T(1));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToUNormFloor (const TVec<T,I,Q> &index, const TVec<T,I,Q> &count) __NE___
+    {
+        // range [0, 1]
+        using V = TVec<ToFloatPoint<T>,I,Q>;
+        return V(index) / V(count - T(1));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToUNormRound (const TVec<T,I,Q> &index, const T count) __NE___
+    {
+        // range (0, 1)
+        using F = ToFloatPoint<T>;
+        using V = TVec<F,I,Q>;
+        return (V(index) + F(0.5)) / V(count);
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToUNormRound (const TVec<T,I,Q> &index, const TVec<T,I,Q> &count) __NE___
+    {
+        // range (0, 1)
+        using F = ToFloatPoint<T>;
+        using V = TVec<F,I,Q>;
+        return (V(index) + F(0.5)) / V(count);
+    }
+
+/*
+=================================================
+    UIndexToSNormFloor / UIndexToSNormRound
+=================================================
+*/
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToSNormFloor (const TVec<T,I,Q> &index, const T count) __NE___
+    {
+        return ToSNorm( UIndexToUNormFloor( index, count ));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToSNormFloor (const TVec<T,I,Q> &index, const TVec<T,I,Q> &count) __NE___
+    {
+        return ToSNorm( UIndexToUNormFloor( index, count ));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToSNormRound (const TVec<T,I,Q> &index, const T count) __NE___
+    {
+        return ToSNorm( UIndexToUNormRound( index, count ));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  UIndexToSNormRound (const TVec<T,I,Q> &index, const TVec<T,I,Q> &count) __NE___
+    {
+        return ToSNorm( UIndexToUNormRound( index, count ));
+    }
+
+/*
+=================================================
+    SIndexToUNormFloor / SIndexToUNormRound
+=================================================
+*/
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToUNormFloor (const TVec<T,I,Q> &index, const T min, const T max) __NE___
+    {
+        // range [-1 .. +1]
+        using V = TVec<ToFloatPoint<T>,I,Q>;
+        return V(index - min) / V(max - min - T(1));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToUNormFloor (const TVec<T,I,Q> &index, const TVec<T,I,Q> &min, const TVec<T,I,Q> &max) __NE___
+    {
+        // range [-1 .. +1]
+        using V = TVec<ToFloatPoint<T>,I,Q>;
+        return V(index - min) / V(max - min - T(1));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToUNormRound (const TVec<T,I,Q> &index, const T min, const T max) __NE___
+    {
+        // range (-1 .. +1)
+        using F = ToFloatPoint<T>;
+        using V = TVec<F,I,Q>;
+        return (V(index - min) + F(0.5)) / V(max - min);
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToUNormRound (const TVec<T,I,Q> &index, const TVec<T,I,Q> &min, const TVec<T,I,Q> &max) __NE___
+    {
+        // range (-1 .. +1)
+        using F = ToFloatPoint<T>;
+        using V = TVec<F,I,Q>;
+        return (V(index - min) + F(0.5)) / V(max - min);
+    }
+
+/*
+=================================================
+    SIndexToSNormFloor / SIndexToSNormRound
+=================================================
+*/
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToSNormFloor (const TVec<T,I,Q> &index, const T min, const T max) __NE___
+    {
+        return ToSNorm( SIndexToUNormFloor( index, min, max ));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToSNormFloor (const TVec<T,I,Q> &index, const TVec<T,I,Q> &min, const TVec<T,I,Q> &max) __NE___
+    {
+        return ToSNorm( SIndexToUNormFloor( index, min, max ));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToSNormRound (const TVec<T,I,Q> &index, const T min, const T max) __NE___
+    {
+        return ToSNorm( SIndexToUNormRound( index, min, max ));
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsScalar<T>, TVec<ToFloatPoint<T>,I,Q>>  SIndexToSNormRound (const TVec<T,I,Q> &index, const TVec<T,I,Q> &min, const TVec<T,I,Q> &max) __NE___
+    {
+        return ToSNorm( SIndexToUNormRound( index, min, max ));
+    }
+
+/*
+=================================================
+    IsInfinity / IsNaN / IsFinite
+=================================================
+*/
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsFloatPoint<T>, TVec<bool,I,Q>>  IsInfinity (const TVec<T,I,Q> &v) __NE___
+    {
+        return glm::isinf( v );
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsFloatPoint<T>, TVec<bool,I,Q>>  IsNaN (const TVec<T,I,Q> &v) __NE___
+    {
+        return glm::isnan( v );
+    }
+
+    template <typename T, int I, glm::qualifier Q>
+    ND_ EnableIf<IsFloatPoint<T>, TVec<bool,I,Q>>  IsFinite (const TVec<T,I,Q> &v) __NE___
+    {
+        return (v == v);
+    }
+
 } // AE::Math
 
 
diff --git a/AE/engine/src/base/Math/VecSwizzle.h b/AE/engine/src/base/Math/VecSwizzle.h
index bab3f058..9b69d9d8 100644
--- a/AE/engine/src/base/Math/VecSwizzle.h
+++ b/AE/engine/src/base/Math/VecSwizzle.h
@@ -42,7 +42,7 @@ namespace AE::Math
 
         ND_ static constexpr VecSwizzle  VecDefault (usize size)                                __NE___;
 
-        friend constexpr VecSwizzle  operator "" _vecSwizzle (const char *str, const usize len) __NE___;
+        friend constexpr VecSwizzle  operator "" _vecSwizzle (const char* str, const usize len) __NE___;
 
 
     private:
@@ -74,7 +74,7 @@ namespace AE::Math
     operator ""
 =================================================
 */
-    ND_ constexpr VecSwizzle  operator "" _vecSwizzle (const char *str, const usize len) __NE___
+    ND_ constexpr VecSwizzle  operator "" _vecSwizzle (const char* str, const usize len) __NE___
     {
         ASSERT( len > 0 and len <= 4 );
 
diff --git a/AE/engine/src/base/Memory/AllocatorFwdDecl.h b/AE/engine/src/base/Memory/AllocatorFwdDecl.h
index 7e1d1bb0..c09fcefd 100644
--- a/AE/engine/src/base/Memory/AllocatorFwdDecl.h
+++ b/AE/engine/src/base/Memory/AllocatorFwdDecl.h
@@ -1,4 +1,9 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    There are 2 concepts:
+     - allocator as static object which doesn't add 8-byte overhead for pointer to allocator.
+     - allocator as RC<IAllocator>.
+*/
 
 #pragma once
 
@@ -22,7 +27,6 @@ namespace AE::Base
     template <typename AllocatorType = UntypedAllocator, uint MaxBlocks = 16, bool ThreadSafe = false>
     class StackAllocator;
 
-    class MtAllocator;
 
     template <typename AllocatorType>
     class AllocatorRef;
diff --git a/AE/engine/src/base/Memory/AllocatorHelper.h b/AE/engine/src/base/Memory/AllocatorHelper.h
index e96058e1..f402adee 100644
--- a/AE/engine/src/base/Memory/AllocatorHelper.h
+++ b/AE/engine/src/base/Memory/AllocatorHelper.h
@@ -41,20 +41,20 @@ namespace AE::Base
             Unused( ptr, sizeAndAlign );
         }
 
-        static void  OnDeallocate (void *ptr)                                   __NE___
+        static void  OnDeallocate (void* ptr)                                   __NE___
         {
             // TODO: profiler
             Unused( ptr );
         }
 
-        static void  OnDeallocate (void *ptr, Bytes size)                       __NE___
+        static void  OnDeallocate (void* ptr, Bytes size)                       __NE___
         {
             // TODO: profiler
             ASSERT( size > 0 );
             Unused( ptr, size );
         }
 
-        static void  OnDeallocate (void *ptr, const SizeAndAlign sizeAndAlign)  __NE___
+        static void  OnDeallocate (void* ptr, const SizeAndAlign sizeAndAlign)  __NE___
         {
             // TODO: profiler
             ASSERT( sizeAndAlign.size >= sizeAndAlign.align );
diff --git a/AE/engine/src/base/Memory/AllocatorRef.h b/AE/engine/src/base/Memory/AllocatorRef.h
deleted file mode 100644
index d0400b3e..00000000
--- a/AE/engine/src/base/Memory/AllocatorRef.h
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#include "base/Memory/AllocatorFwdDecl.h"
-#include "base/Math/Bytes.h"
-#include "base/Algorithms/Cast.h"
-#include "base/Utils/RefCounter.h"
-
-namespace AE::Base
-{
-
-    //
-    // Allocator Reference
-    //
-
-    template <typename AllocatorType>
-    class AllocatorRef
-    {
-    // types
-    public:
-        using Allocator_t       = AllocatorType;
-        using Self              = AllocatorRef< AllocatorType >;
-
-        template <typename T>
-        using StdAllocator_t    = StdAllocatorRef< T, AllocatorType* >;
-
-        static constexpr bool   IsThreadSafe = AllocatorType::IsThreadSafe;
-
-
-    // variables
-    private:
-        AllocatorType&  _alloc;
-
-
-    // methods
-    public:
-        AllocatorRef (Self &&other)                                         __NE___ : _alloc{other._alloc} {}
-        AllocatorRef (const Self &other)                                    __NE___ : _alloc{other._alloc} {}
-        AllocatorRef (AllocatorType &alloc)                                 __NE___ : _alloc{alloc} {}
-
-        ND_ void*  Allocate (Bytes size)                                    __NE___ { return _alloc.Allocate( size ); }
-        ND_ void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE___ { return _alloc.Allocate( sizeAndAlign ); }
-
-        template <typename T>
-        ND_ T*  Allocate (usize count = 1)                                  __NE___ { return Cast<T>( Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> })); }
-
-        void  Deallocate (void* ptr)                                        __NE___ { return _alloc.Deallocate( ptr ); }
-        void  Deallocate (void* ptr, Bytes size)                            __NE___ { return _alloc.Deallocate( ptr, size ); }
-        void  Deallocate (void* ptr, const SizeAndAlign sizeAndAlign)       __NE___ { return _alloc.Deallocate( ptr, sizeAndAlign ); }
-
-        ND_ AllocatorType&  GetAllocatorRef ()                              C_NE___ { return _alloc; }
-
-        ND_ bool  operator == (const Self &rhs)                             C_NE___ { return &_alloc == &rhs._alloc; }
-    };
-
-
-
-    //
-    // Allocator Reference
-    //
-
-    template <typename AllocatorType>
-    class AllocatorRef2
-    {
-    // types
-    public:
-        using Allocator_t       = AllocatorType;
-        using Self              = AllocatorRef2< AllocatorType >;
-
-        template <typename T>
-        using StdAllocator_t    = StdAllocatorRef< T, AllocatorType* >;
-
-        static constexpr bool   IsThreadSafe = AllocatorType::IsThreadSafe;
-        static constexpr Bytes  _BaseAlign  {sizeof(void*)};
-
-
-    // variables
-    private:
-        AllocatorType&  _alloc;
-
-
-    // methods
-    public:
-        AllocatorRef2 (Self &&other)                                        __NE___ : _alloc{other._alloc} {}
-        AllocatorRef2 (const Self &other)                                   __NE___ : _alloc{other._alloc} {}
-        AllocatorRef2 (AllocatorType &alloc)                                __NE___ : _alloc{alloc} {}
-
-        ND_ void*  Allocate (Bytes size)                                    __NE___ { return _alloc.Allocate( SizeAndAlign{ size, _BaseAlign }); }
-        ND_ void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE___ { return _alloc.Allocate( sizeAndAlign ); }
-
-        template <typename T>
-        ND_ T*  Allocate (usize count = 1)                                  __NE___ { return Cast<T>( Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> })); }
-
-        void  Deallocate (void* ptr)                                        __NE___ { return _alloc.Deallocate( ptr ); }
-        void  Deallocate (void* ptr, Bytes size)                            __NE___ { return _alloc.Deallocate( ptr, SizeAndAlign{ size, _BaseAlign }); }
-        void  Deallocate (void* ptr, const SizeAndAlign sizeAndAlign)       __NE___ { return _alloc.Deallocate( ptr, sizeAndAlign ); }
-
-        ND_ AllocatorType&  GetAllocatorRef ()                              C_NE___ { return _alloc; }
-
-        ND_ bool  operator == (const Self &rhs)                             C_NE___ { return &_alloc == &rhs._alloc; }
-    };
-
-
-
-    //
-    // Aligned Allocator Reference with base align
-    //
-
-    template <typename AllocatorType, usize BaseAlign>
-    class AlignedAllocatorRefBaseAlign
-    {
-    // types
-    public:
-        using Allocator_t       = AllocatorType;
-        using Self              = AlignedAllocatorRefBaseAlign< AllocatorType, BaseAlign >;
-
-        template <typename T>
-        using StdAllocator_t    = StdAllocatorRef< T, AllocatorType* >;
-
-        static constexpr usize  Align           = BaseAlign;
-        static constexpr bool   IsThreadSafe    = AllocatorType::IsThreadSafe;
-
-
-    // variables
-    private:
-        AllocatorType&  _alloc;
-
-
-    // methods
-    public:
-        AlignedAllocatorRefBaseAlign (Self &&other)         __NE___ : _alloc{other._alloc} {}
-        AlignedAllocatorRefBaseAlign (const Self &other)    __NE___ : _alloc{other._alloc} {}
-        AlignedAllocatorRefBaseAlign (AllocatorType &alloc) __NE___ : _alloc{alloc} {}
-
-        template <typename T>
-        ND_ T*      Allocate (usize count = 1)              __NE___ { STATIC_ASSERT( alignof(T) <= BaseAlign );  return Cast<T>( Allocate( SizeOf<T> * count )); }
-        ND_ void*   Allocate (Bytes size)                   __NE___ { return _alloc.Allocate( SizeAndAlign{ size, Bytes{BaseAlign} }); }
-
-        void  Deallocate (void* ptr, Bytes size)            __NE___ { return _alloc.Deallocate( ptr, SizeAndAlign{ size, Bytes{BaseAlign} }); }
-
-        ND_ AllocatorType&  GetAllocatorRef ()              C_NE___ { return _alloc; }
-
-        ND_ bool  operator == (const Self &rhs)             C_NE___ { return &_alloc == &rhs._alloc; }
-    };
-
-
-
-    //
-    // Std Allocator Reference
-    //
-
-    template <typename T, typename TAllocatorPtr>
-    class StdAllocatorRef
-    {
-    // types
-    public:
-        using value_type        = T;
-        using size_type         = usize;
-        using difference_type   = ssize;
-        using Self              = StdAllocatorRef< T, TAllocatorPtr >;
-
-        // removed in C++20
-        template <typename U>
-        struct rebind {
-            using other = StdAllocatorRef< U, TAllocatorPtr >;
-        };
-
-        STATIC_ASSERT( IsPointer<TAllocatorPtr> or IsRC<TAllocatorPtr> or IsSpecializationOf<TAllocatorPtr, Ptr> );
-
-
-    // variables
-    private:
-        TAllocatorPtr   _alloc;
-
-
-    // methods
-    public:
-        StdAllocatorRef (TAllocatorPtr alloc)               __NE___ : _alloc{FwdArg<TAllocatorPtr>(alloc)} {}
-        StdAllocatorRef (Self &&other)                      __NE___ : _alloc{RVRef(other._alloc)} {}
-        StdAllocatorRef (const Self &other)                 __NE___ : _alloc{other._alloc} {}
-
-        template <typename B>
-        StdAllocatorRef (const StdAllocatorRef<B,TAllocatorPtr>& other) __NE___ : _alloc{other.GetAllocatorPtr()} {}
-
-        Self&  operator = (const Self &)                            = delete;
-        Self&  operator = (Self &&)                         __NE___ = default;
-
-
-        // returns non-null pointer
-        ND_ T*  allocate (const usize count)                __Th___
-        {
-            T*  ptr = Cast<T>( _alloc->Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> }));
-            if_unlikely( ptr == null )
-                throw std::bad_alloc{};
-            return ptr;
-        }
-
-        void  deallocate (T * const ptr, const usize count) __NE___ { return _alloc->Deallocate( ptr, SizeAndAlign{ SizeOf<T> * count, AlignOf<T> }); }
-
-        ND_ Self  select_on_container_copy_construction ()  C_NE___ { return Self{ *_alloc }; }
-
-        // removed in C++20
-        ND_ usize  max_size ()                              C_NE___ { return usize(UMax) / sizeof(T); }
-
-        ND_ TAllocatorPtr   GetAllocatorPtr ()              C_NE___ { return _alloc; }
-
-        ND_ bool  operator == (const Self &rhs)             C_NE___ { return _alloc == rhs._alloc; }
-    };
-
-} // AE::Base
-
-
-namespace std {
-    template <typename T, typename A>
-    void  swap (AE::Base::StdAllocatorRef<T,A> &lhs, AE::Base::StdAllocatorRef<T,A> &rhs) __NE___
-    {
-        auto    tmp = AE::Base::RVRef(lhs);
-        lhs = AE::Base::RVRef(rhs);
-        rhs = AE::Base::RVRef(tmp);
-    }
-}
diff --git a/AE/engine/src/base/Memory/CopyPolicy.h b/AE/engine/src/base/Memory/CopyPolicy.h
index 02aa193b..f0888aee 100644
--- a/AE/engine/src/base/Memory/CopyPolicy.h
+++ b/AE/engine/src/base/Memory/CopyPolicy.h
@@ -34,40 +34,39 @@ struct CopyPolicy final : public Noninstanceable
     template <typename T, uint Flags>
     struct _DefaultImpl : public Noninstanceable
     {
-        static void  Create (OUT T *ptr, const usize count) __NE___
+        static void  Create (OUT T* ptr, const usize count) __NE___
         {
             ASSERT( (count == 0) or ((ptr != null) == (count != 0)) );
 
             if constexpr( !!(Flags & NonTrivialCtor) )
             {
                 for (usize i = 0; i < count; ++i)
-                    PlacementNew<T>( OUT ptr + i );     // nothrow
+                    PlacementNew<T>( OUT ptr + i );
             }
             else
             {
-                STATIC_ASSERT( IsZeroMemAvailable<T> );
+                StaticAssert( IsZeroMemAvailable<T> );
                 ZeroMem( OUT ptr, SizeOf<T> * count );
             }
         }
 
-        static void  Destroy (INOUT T *ptr, const usize count) __NE___
+        static void  Destroy (INOUT T* ptr, const usize count) __NE___
         {
             ASSERT( (count == 0) or ((ptr != null) == (count != 0)) );
 
             if constexpr( !!(Flags & NonTrivialDtor) )
             {
-                STATIC_ASSERT( IsNothrowDtor<T> );
                 for (usize i = 0; i < count; ++i)
                     ptr[i].~T();
             }
             else
             {
-                STATIC_ASSERT( IsZeroMemAvailable<T> or std::is_trivially_destructible_v<T> );
+                StaticAssert( IsTriviallyDestructible<T> );
             }
             DEBUG_ONLY( DbgInitMem( OUT ptr, SizeOf<T> * count ));
         }
 
-        static void  Copy (OUT T *dst, const T * const src, const usize count)  noexcept(IsNothrowCopyCtor<T>)
+        static void  Copy (OUT T* dst, const T * const src, const usize count)  NoExcept(IsNothrowCopyCtor<T>)
         {
             ASSERT( (count == 0) or ((dst != null) == (count != 0)) );
             ASSERT( (count == 0) or ((src != null) == (count != 0)) );
@@ -79,12 +78,12 @@ struct CopyPolicy final : public Noninstanceable
             }
             else
             {
-                STATIC_ASSERT( IsMemCopyAvailable<T> );
+                StaticAssert( IsMemCopyAvailable<T> );
                 MemCopy( OUT dst, src, SizeOf<T> * count );
             }
         }
 
-        static void  Move (OUT T *dst, INOUT T *src, const usize count) __NE___
+        static void  Move (OUT T* dst, INOUT T* src, const usize count) __NE___
         {
             ASSERT( (count == 0) or ((dst != null) == (count != 0)) );
             ASSERT( (count == 0) or ((src != null) == (count != 0)) );
@@ -92,16 +91,16 @@ struct CopyPolicy final : public Noninstanceable
             if constexpr( !!(Flags & NonTrivialMoveCtor) )
             {
                 for (usize i = 0; i < count; ++i)
-                    PlacementNew<T>( OUT dst+i, RVRef( src[i] ));   // nothrow
+                    PlacementNew<T>( OUT dst+i, RVRef( src[i] ));
             }
             else
             {
-                STATIC_ASSERT( IsMemCopyAvailable<T> );
+                StaticAssert( IsMemCopyAvailable<T> );
                 MemMove( OUT dst, src, SizeOf<T> * count );
             }
         }
 
-        static void  Replace (OUT T *dst, INOUT T *src, const usize count, bool inSingleMemBlock = false) __NE___
+        static void  Replace (OUT T* dst, INOUT T* src, const usize count, Bool inSingleMemBlock = False{}) __NE___
         {
             ASSERT( (count == 0) or ((dst != null) == (count != 0)) );
             ASSERT( (count == 0) or ((src != null) == (count != 0)) );
@@ -112,19 +111,18 @@ struct CopyPolicy final : public Noninstanceable
             {
                 for (usize i = 0; i < count; ++i)
                 {
-                    PlacementNew<T>( OUT dst+i, RVRef( src[i] ));   // nothrow
+                    PlacementNew<T>( OUT dst+i, RVRef( src[i] ));
 
                     if constexpr( !!(Flags & NonTrivialDtor) )
                     {
-                        STATIC_ASSERT( IsNothrowDtor<T> );
                         src[i].~T();
                     }else
-                        STATIC_ASSERT( IsZeroMemAvailable<T> or std::is_trivially_destructible_v<T> );
+                        StaticAssert( IsTriviallyDestructible<T> );
                 }
             }
             else
             {
-                STATIC_ASSERT( IsMemCopyAvailable<T> );
+                StaticAssert( IsMemCopyAvailable<T> );
                 MemMove( OUT dst, src, SizeOf<T> * count );
             }
 
@@ -138,7 +136,7 @@ struct CopyPolicy final : public Noninstanceable
             })
         }
 
-        static void  ReplaceRev (OUT T *dst, INOUT T *src, const usize count, bool inSingleMemBlock = false) __NE___
+        static void  ReplaceRev (OUT T* dst, INOUT T* src, const usize count, Bool inSingleMemBlock = False{}) __NE___
         {
             ASSERT( (count == 0) or ((dst != null) == (count != 0)) );
             ASSERT( (count == 0) or ((src != null) == (count != 0)) );
@@ -149,19 +147,19 @@ struct CopyPolicy final : public Noninstanceable
             {
                 for (usize i = count-1; i < count; --i)
                 {
-                    PlacementNew<T>( OUT dst+i, RVRef( src[i] ));   // nothrow
+                    PlacementNew<T>( OUT dst+i, RVRef( src[i] ));
 
                     if constexpr( !!(Flags & NonTrivialDtor) )
                     {
-                        STATIC_ASSERT( std::is_nothrow_destructible_v<T> );
+                        StaticAssert( std::is_nothrow_destructible_v<T> );
                         src[i].~T();
                     }else
-                        STATIC_ASSERT( IsZeroMemAvailable<T> or std::is_trivially_destructible_v<T> );
+                        StaticAssert( IsTriviallyDestructible<T> );
                 }
             }
             else
             {
-                STATIC_ASSERT( IsMemCopyAvailable<T> );
+                StaticAssert( IsMemCopyAvailable<T> );
                 MemMove( OUT dst, src, SizeOf<T> * count );
             }
 
@@ -179,9 +177,9 @@ struct CopyPolicy final : public Noninstanceable
     template <typename T>
     struct _AutoDetect
     {
-        static constexpr uint   Flags = (IsMemCopyAvailable<T>               ? 0 : (NonTrivialCopyCtor | NonTrivialMoveCtor))   |
-                                        (std::is_trivially_destructible_v<T> ? 0 : NonTrivialDtor)                              |
-                                        (IsZeroMemAvailable<T>               ? 0 : NonTrivialCtor);
+        static constexpr uint   Flags = (IsMemCopyAvailable<T>      ? 0 : (NonTrivialCopyCtor | NonTrivialMoveCtor))    |
+                                        (IsTriviallyDestructible<T> ? 0 : NonTrivialDtor)                               |
+                                        (IsZeroMemAvailable<T>      ? 0 : NonTrivialCtor);
         using type = _DefaultImpl< T, Flags >;
     };
 
diff --git a/AE/engine/src/base/Memory/IAllocator.cpp b/AE/engine/src/base/Memory/IAllocator.cpp
index 97bf172a..7cc3b467 100644
--- a/AE/engine/src/base/Memory/IAllocator.cpp
+++ b/AE/engine/src/base/Memory/IAllocator.cpp
@@ -9,21 +9,19 @@ namespace
 {
     struct DefaultAllocator
     {
-        using Alloc_t = AllocatorImpl< UntypedAllocator >;
+        using Alloc_t = IAllocatorAdaptor< UntypedAllocator >;
 
-        InPlace< Alloc_t >      alloc;
-        AtomicRC<IAllocator>    rc;
+        StaticRC< Alloc_t >     alloc;
+        AtomicRC<IAllocator>    rc;         // TODO: Atomic<IAllocator*> may be faster
 
         DefaultAllocator ()
         {
-            alloc.CustomCtor( &StaticRC::New<Alloc_t> );
-            rc = alloc->GetRC();
+            rc.store( alloc->GetRC() );
         }
 
         ~DefaultAllocator ()
         {
-            rc = null;
-            alloc.CustomDtor( &StaticRC::Delete<Alloc_t> );
+            rc.reset();
         }
     };
 
@@ -39,10 +37,10 @@ namespace AE
 
     void  SetDefaultAllocator (RC<IAllocator> value) __NE___
     {
-        if ( value )
-            Base::s_DefaultAllocator.rc = value;
+        if_likely( value )
+            Base::s_DefaultAllocator.rc.store( value );
         else
-            Base::s_DefaultAllocator.rc = Base::s_DefaultAllocator.alloc->GetRC();
+            Base::s_DefaultAllocator.rc.store( Base::s_DefaultAllocator.alloc->GetRC() );
     }
 
     RC<IAllocator>  GetDefaultAllocator () __NE___
@@ -50,4 +48,9 @@ namespace AE
         return Base::s_DefaultAllocator.rc.load();
     }
 
+    Ptr<IAllocator>  GetDefaultAllocatorPtr () __NE___
+    {
+        return Base::s_DefaultAllocator.rc.unsafe_get();
+    }
+
 } // AE
diff --git a/AE/engine/src/base/Memory/IAllocator.h b/AE/engine/src/base/Memory/IAllocator.h
index f01ec93a..cd6e6899 100644
--- a/AE/engine/src/base/Memory/IAllocator.h
+++ b/AE/engine/src/base/Memory/IAllocator.h
@@ -3,8 +3,9 @@
 #pragma once
 
 #include "base/Memory/AllocatorFwdDecl.h"
-#include "base/Memory/AllocatorRef.h"
+#include "base/Memory/AllocatorHelper.h"
 #include "base/Math/Bytes.h"
+#include "base/Math/POTValue.h"
 #include "base/Utils/RefCounter.h"
 
 namespace AE::Base
@@ -16,84 +17,220 @@ namespace AE::Base
     class IAllocator : public EnableRC<IAllocator>
     {
     public:
-        static constexpr bool   IsThreadSafe = false;   // TODO ?
+        template <typename T>   using StdAlloc_t = StdAllocatorRef< T, RC<IAllocator> >;
 
-        template <typename T>   using StdAlloc_t = StdAllocatorRef< T, IAllocator >;
+    public:
+        template <typename T>
+        ND_ T*              Allocate (usize count = 1)                              __NE___ { return Cast<T>( Allocate( SizeAndAlignOf<T> * count )); }
 
-            virtual ~IAllocator ()                                                  __NE___ {}
+        ND_ virtual void*   Allocate (Bytes size)                                   __NE___ { return Allocate( SizeAndAlign{ size, DefaultAllocatorAlign }); }
+            virtual void    Deallocate (void* ptr, Bytes size)                      __NE___ { return Deallocate( ptr, SizeAndAlign{ size, DefaultAllocatorAlign }); }
+            virtual void    Deallocate (void* ptr)                                  __NE___ = 0;
 
-        template <typename T>
-        ND_ T*             Allocate (usize count = 1)                               __NE___ { return Cast<T>( Allocate( SizeAndAlignOf<T> * count )); }
+        ND_ virtual void*   Allocate (const SizeAndAlign sizeAndAlign)              __NE___ = 0;
+            virtual void    Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE___ = 0;
 
-        ND_ virtual void*  Allocate (Bytes size)                                    __NE___ = 0;
-            virtual void   Deallocate (void *ptr, Bytes size)                       __NE___ = 0;
-            virtual void   Deallocate (void *ptr)                                   __NE___ = 0;
+        //ND_ virtual void* Allocate (POTBytes size)                                __NE___ { return Allocate( Bytes{size} ); }
+        //ND_ virtual void* Allocate (POTBytes size, POTBytes align)                __NE___ { return Allocate(SizeAndAlign{ size, align }); }
 
-        ND_ virtual void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE___ = 0;
-            virtual void   Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)  __NE___ = 0;
+        // TODO:
+        // virtual ECapabilities    GetCapabilities () = 0;
+        // virtual Bytes            GetMemoryUsage () = 0;
     };
 
 
 
+    //
+    // Thread-safe Allocator interface
+    //
+    class IAllocatorTS : public IAllocator
+    {};
+
+
+
+    //
+    // Is Thread-safe Allocator
+    //
+    namespace _hidden_
+    {
+        template <typename T, bool IsInterface>
+        struct _IsThreadSafeAllocator {
+            static constexpr bool   value = IsBaseOfNoQual< IAllocatorTS, T >;
+        };
+
+        template <typename T>
+        struct _IsThreadSafeAllocator< T, false > {
+            static constexpr bool   value = T::IsThreadSafe;
+        };
+
+        template <typename T>
+        struct _IsThreadSafeAllocator2 {
+            static constexpr bool   value = _IsThreadSafeAllocator< T, (IsBaseOf< IAllocator, T >) >::value;
+        };
+    }
+
     template <typename T>
-    class AllocatorImpl final : public IAllocator
+    static constexpr bool   IsThreadSafeAllocator = Base::_hidden_::_IsThreadSafeAllocator2< RemoveAllQualifiers<T> >::value;
+//-----------------------------------------------------------------------------
+
+
+
+    //
+    // Allocator Reference
+    //
+    template <typename AllocatorType>
+    class AllocatorRef
     {
+    // types
+    public:
+        using Allocator_t       = AllocatorType;
+        using Self              = AllocatorRef< AllocatorType >;
+
+        template <typename T>
+        using StdAllocator_t    = StdAllocatorRef< T, AllocatorType* >;
+
+        static constexpr bool   IsThreadSafe = IsThreadSafeAllocator< AllocatorType >;
+
+
     // variables
     private:
-        T   _alloc;
+        AllocatorType&  _alloc;
+
 
     // methods
     public:
-        AllocatorImpl ()                                                __NE___ {}
-        AllocatorImpl (AllocatorImpl && other)                          __NE___ : _alloc{ RVRef(other._alloc) } {}
+        AllocatorRef (Self &&other)                                         __NE___ : _alloc{other._alloc} {}
+        AllocatorRef (const Self &other)                                    __NE___ : _alloc{other._alloc} {}
+        AllocatorRef (AllocatorType &alloc)                                 __NE___ : _alloc{alloc} {}
 
-        template <typename ...Args>
-        explicit AllocatorImpl (Args&& ... args)                        __Th___ : _alloc{ FwdArg<Args>(args)... } {}
+        ND_ void*   Allocate (Bytes size)                                   __NE___ { return _alloc.Allocate( size ); }
+        ND_ void*   Allocate (const SizeAndAlign sizeAndAlign)              __NE___ { return _alloc.Allocate( sizeAndAlign ); }
 
-        ~AllocatorImpl ()                                               __NE_OV {}
+        template <typename T>
+        ND_ T*      Allocate (usize count = 1)                              __NE___ { return Cast<T>( Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> })); }
 
-        using IAllocator::Allocate;
+            void    Deallocate (void* ptr)                                  __NE___ { return _alloc.Deallocate( ptr ); }
+            void    Deallocate (void* ptr, Bytes size)                      __NE___ { return _alloc.Deallocate( ptr, size ); }
+            void    Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE___ { return _alloc.Deallocate( ptr, sizeAndAlign ); }
 
-        void*  Allocate (Bytes size)                                    __NE_OV { return _alloc.Allocate( size ); }
-        void   Deallocate (void *ptr, Bytes size)                       __NE_OV { return _alloc.Deallocate( ptr, size ); }
-        void   Deallocate (void *ptr)                                   __NE_OV { return _alloc.Deallocate( ptr ); }
+        ND_ bool    operator == (const Self &rhs)                           C_NE___ { return &_alloc == &rhs._alloc; }
 
-        void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE_OV { return _alloc.Allocate( sizeAndAlign ); }
-        void   Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)  __NE_OV { return _alloc.Deallocate( ptr, sizeAndAlign ); }
+        ND_ AllocatorType&  GetAllocatorRef ()                              C_NE___ { return _alloc; }
     };
 
 
-    template <typename T>
-    class AllocatorImpl< AllocatorRef<T> > final : public IAllocator
+
+    //
+    // Aligned Allocator Reference with base align
+    //
+    template <typename AllocatorType, usize BaseAlign>
+    class AllocatorRefBaseAlign
     {
+    // types
+    public:
+        using Allocator_t       = AllocatorType;
+        using Self              = AllocatorRefBaseAlign< AllocatorType, BaseAlign >;
+
+        template <typename T>
+        using StdAllocator_t    = StdAllocatorRef< T, AllocatorType* >;
+
+        static constexpr usize  Align           = BaseAlign;
+        static constexpr bool   IsThreadSafe    = IsThreadSafeAllocator< AllocatorType >;
+
+
     // variables
     private:
-        T   _alloc;
+        AllocatorType&  _alloc;
+
 
     // methods
     public:
-        AllocatorImpl ()                                                __NE___ {}
-        AllocatorImpl (AllocatorImpl && other)                          __NE___ : _alloc{ RVRef(other._alloc) } {}
-        explicit AllocatorImpl (const AllocatorRef<T> &ref)             __NE___ : _alloc{ ref.GetAllocatorRef() } {}
+        AllocatorRefBaseAlign (Self &&other)                __NE___ : _alloc{other._alloc} {}
+        AllocatorRefBaseAlign (const Self &other)           __NE___ : _alloc{other._alloc} {}
+        AllocatorRefBaseAlign (AllocatorType &alloc)        __NE___ : _alloc{alloc} {}
 
-        template <typename ...Args>
-        explicit AllocatorImpl (Args&& ... args)                        __Th___ : _alloc{ FwdArg<Args>(args)... } {}
+        template <typename T>
+        ND_ T*      Allocate (usize count = 1)              __NE___ { StaticAssert( alignof(T) <= BaseAlign );  return Cast<T>( Allocate( SizeOf<T> * count )); }
+        ND_ void*   Allocate (Bytes size)                   __NE___ { return _alloc.Allocate( SizeAndAlign{ size, Bytes{BaseAlign} }); }
 
-        ~AllocatorImpl ()                                               __NE_OV {}
+            void    Deallocate (void* ptr, Bytes size)      __NE___ { return _alloc.Deallocate( ptr, SizeAndAlign{ size, Bytes{BaseAlign} }); }
 
-        using IAllocator::Allocate;
+        ND_ bool    operator == (const Self &rhs)           C_NE___ { return &_alloc == &rhs._alloc; }
 
-        void*  Allocate (Bytes size)                                    __NE_OV { return _alloc.Allocate( size ); }
-        void   Deallocate (void *ptr, Bytes size)                       __NE_OV { return _alloc.Deallocate( ptr, size ); }
-        void   Deallocate (void *ptr)                                   __NE_OV { return _alloc.Deallocate( ptr ); }
+        ND_ AllocatorType&  GetAllocatorRef ()              C_NE___ { return _alloc; }
+    };
 
-        void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE_OV { return _alloc.Allocate( sizeAndAlign ); }
-        void   Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)  __NE_OV { return _alloc.Deallocate( ptr, sizeAndAlign ); }
+
+
+    //
+    // Std Allocator Reference
+    //
+    template <typename T, typename TAllocatorPtr>
+    class StdAllocatorRef
+    {
+    // types
+    public:
+        StaticAssert( IsPointer<TAllocatorPtr> or IsRC<TAllocatorPtr> or IsSpecializationOf<TAllocatorPtr, Ptr> );
+
+        using value_type        = T;
+        using size_type         = usize;
+        using difference_type   = ssize;
+        using Self              = StdAllocatorRef< T, TAllocatorPtr >;
+
+        // removed in C++20
+        template <typename U>
+        struct rebind {
+            using other = StdAllocatorRef< U, TAllocatorPtr >;
+        };
+
+
+    // variables
+    private:
+        TAllocatorPtr   _alloc;
+
+
+    // methods
+    public:
+        StdAllocatorRef (TAllocatorPtr alloc)                       __NE___ : _alloc{FwdArg<TAllocatorPtr>(alloc)} {}
+        StdAllocatorRef (Self &&other)                              __NE___ : _alloc{RVRef(other._alloc)} {}
+        StdAllocatorRef (const Self &other)                         __NE___ : _alloc{other._alloc} {}
+
+        template <typename B>
+        StdAllocatorRef (const StdAllocatorRef<B,TAllocatorPtr>& other) __NE___ : _alloc{other.GetAllocatorPtr()} {}
+
+            Self&   operator = (const Self &)                               = delete;
+            Self&   operator = (Self &&)                            __NE___ = default;
+
+
+        // returns non-null pointer
+        ND_ T*      allocate (const usize count)                    __Th___
+        {
+            T*  ptr = Cast<T>( _alloc->Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> }));
+            CHECK_THROW( ptr != null, std::bad_alloc{} );
+            return ptr;
+        }
+
+            void    deallocate (T * const ptr, const usize count)   __NE___ { return _alloc->Deallocate( ptr, SizeAndAlign{ SizeOf<T> * count, AlignOf<T> }); }
+
+        ND_ Self    select_on_container_copy_construction ()        C_NE___ { return Self{ *_alloc }; }
+
+        // removed in C++20
+        ND_ usize   max_size ()                                     C_NE___ { return usize(UMax) / sizeof(T); }
+
+        ND_ bool    operator == (const Self &rhs)                   C_NE___ { return _alloc == rhs._alloc; }
+
+        ND_ TAllocatorPtr   GetAllocatorPtr ()                      C_NE___ { return _alloc; }
     };
+//-----------------------------------------------------------------------------
 
 
+
+    //
+    // Allocator implementation
+    //
     template <typename T>
-    class AllocatorImpl2 final : public IAllocator
+    class IAllocatorAdaptor final :
+        public Conditional< IsThreadSafeAllocator<T>, IAllocatorTS, IAllocator >
     {
     // variables
     private:
@@ -101,27 +238,26 @@ namespace AE::Base
 
     // methods
     public:
-        AllocatorImpl2 ()                                               __NE___ {}
-        AllocatorImpl2 (AllocatorImpl2 && other)                        __NE___ : _alloc{ RVRef(other._alloc) } {}
+        IAllocatorAdaptor ()                                            __NE___ {}
+        IAllocatorAdaptor (IAllocatorAdaptor &&other)                   __NE___ : _alloc{ RVRef(other._alloc) } {}
 
         template <typename ...Args>
-        explicit AllocatorImpl2 (Args&& ... args)                       __Th___ : _alloc{ FwdArg<Args>(args)... } {}
-
-        ~AllocatorImpl2 ()                                              __NE_OV {}
+        explicit IAllocatorAdaptor (Args&& ... args)                    __Th___ : _alloc{ FwdArg<Args>(args)... } {}
 
         using IAllocator::Allocate;
 
-        void*  Allocate (Bytes size)                                    __NE_OV { return _alloc.Allocate( SizeAndAlign{ size, DefaultAllocatorAlign }); }
-        void   Deallocate (void *ptr, Bytes size)                       __NE_OV { return _alloc.Deallocate( ptr, SizeAndAlign{ size, DefaultAllocatorAlign }); }
-        void   Deallocate (void *ptr)                                   __NE_OV { return _alloc.Deallocate( ptr ); }
+        void*  Allocate (Bytes size)                                    __NE_OV { return _alloc.Allocate( size ); }
+        void   Deallocate (void* ptr, Bytes size)                       __NE_OV { return _alloc.Deallocate( ptr, size ); }
+        void   Deallocate (void* ptr)                                   __NE_OV { return _alloc.Deallocate( ptr ); }
 
         void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE_OV { return _alloc.Allocate( sizeAndAlign ); }
-        void   Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)  __NE_OV { return _alloc.Deallocate( ptr, sizeAndAlign ); }
+        void   Deallocate (void* ptr, const SizeAndAlign sizeAndAlign)  __NE_OV { return _alloc.Deallocate( ptr, sizeAndAlign ); }
     };
 
 
     template <typename T>
-    class AllocatorImpl2< AllocatorRef<T> > final : public IAllocator
+    class IAllocatorAdaptor< AllocatorRef<T> > final :
+        public Conditional< IsThreadSafeAllocator<T>, IAllocatorTS, IAllocator >
     {
     // variables
     private:
@@ -129,31 +265,44 @@ namespace AE::Base
 
     // methods
     public:
-        AllocatorImpl2 ()                                               __NE___ {}
-        AllocatorImpl2 (AllocatorImpl2 && other)                        __NE___ : _alloc{ RVRef(other._alloc) } {}
-        explicit AllocatorImpl2 (const AllocatorRef<T> &ref)            __NE___ : _alloc{ ref.GetAllocatorRef() } {}
+        IAllocatorAdaptor ()                                            __NE___ {}
+        IAllocatorAdaptor (IAllocatorAdaptor &&other)                   __NE___ : _alloc{ RVRef(other._alloc) } {}
+        explicit IAllocatorAdaptor (const AllocatorRef<T> &ref)         __NE___ : _alloc{ ref.GetAllocatorRef() } {}
 
         template <typename ...Args>
-        explicit AllocatorImpl2 (Args&& ... args)                       __Th___ : _alloc{ FwdArg<Args>(args)... } {}
-
-        ~AllocatorImpl2 ()                                              __NE_OV {}
+        explicit IAllocatorAdaptor (Args&& ... args)                    __Th___ : _alloc{ FwdArg<Args>(args)... } {}
 
         using IAllocator::Allocate;
 
-        void*  Allocate (Bytes size)                                    __NE_OV { return _alloc.Allocate( SizeAndAlign{ size, DefaultAllocatorAlign }); }
-        void   Deallocate (void *ptr, Bytes size)                       __NE_OV { return _alloc.Deallocate( ptr, SizeAndAlign{ size, DefaultAllocatorAlign }); }
-        void   Deallocate (void *ptr)                                   __NE_OV { return _alloc.Deallocate( ptr ); }
+        void*  Allocate (Bytes size)                                    __NE_OV { return _alloc.Allocate( size ); }
+        void   Deallocate (void* ptr, Bytes size)                       __NE_OV { return _alloc.Deallocate( ptr, size ); }
+        void   Deallocate (void* ptr)                                   __NE_OV { return _alloc.Deallocate( ptr ); }
 
         void*  Allocate (const SizeAndAlign sizeAndAlign)               __NE_OV { return _alloc.Allocate( sizeAndAlign ); }
-        void   Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)  __NE_OV { return _alloc.Deallocate( ptr, sizeAndAlign ); }
+        void   Deallocate (void* ptr, const SizeAndAlign sizeAndAlign)  __NE_OV { return _alloc.Deallocate( ptr, sizeAndAlign ); }
     };
 
 
 } // AE::Base
 
+
 namespace AE
 {
         void                        SetDefaultAllocator (Base::RC<Base::IAllocator>)    __NE___;
     ND_ Base::RC<Base::IAllocator>  GetDefaultAllocator ()                              __NE___;
+    ND_ Base::Ptr<Base::IAllocator> GetDefaultAllocatorPtr ()                           __NE___;
 
 } // AE
+
+
+namespace std
+{
+    template <typename T, typename A>
+    void  swap (AE::Base::StdAllocatorRef<T,A> &lhs, AE::Base::StdAllocatorRef<T,A> &rhs) __NE___
+    {
+        auto    tmp = AE::Base::RVRef(lhs);
+        lhs = AE::Base::RVRef(rhs);
+        rhs = AE::Base::RVRef(tmp);
+    }
+
+} // std
diff --git a/AE/engine/src/base/Memory/LinearAllocator.h b/AE/engine/src/base/Memory/LinearAllocator.h
index 000b8b1a..e4083873 100644
--- a/AE/engine/src/base/Memory/LinearAllocator.h
+++ b/AE/engine/src/base/Memory/LinearAllocator.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include "base/Memory/AllocatorFwdDecl.h"
-#include "base/Memory/AllocatorHelper.h"
+#include "base/Memory/IAllocator.h"
 #include "base/Containers/FixedArray.h"
 
 namespace AE::Base
@@ -14,15 +13,13 @@ namespace AE::Base
     //
 
     template <typename AllocatorType, uint MaxBlocks>
-    class LinearAllocator< AllocatorType, MaxBlocks, false > final : public MovableOnly
+    class LinearAllocator< AllocatorType, MaxBlocks, false > final : public IAllocator
     {
     // types
     public:
         using Allocator_t   = AllocatorType;
         using Self          = LinearAllocator< AllocatorType, MaxBlocks, false >;
 
-        static constexpr bool   IsThreadSafe = false;
-
     private:
         struct Block
         {
@@ -48,29 +45,31 @@ namespace AE::Base
 
     // methods
     public:
-        LinearAllocator ()                                      __NE___ {}
-        LinearAllocator (Self &&other)                          __NE___ ;
-        explicit LinearAllocator (const Allocator_t &alloc)     __NE___ : _alloc{alloc}             {}
-        explicit LinearAllocator (Bytes blockSize)              __NE___ : _blockSize{ blockSize }   {}
-        ~LinearAllocator ()                                     __NE___ { Release(); }
+        LinearAllocator ()                                          __NE___ {}
+        LinearAllocator (Self &&other)                              __NE___ ;
+        explicit LinearAllocator (const Allocator_t &alloc)         __NE___ : _alloc{alloc}             {}
+        explicit LinearAllocator (Bytes blockSize)                  __NE___ : _blockSize{ blockSize }   {}
+        ~LinearAllocator ()                                         __NE_OV { Release(); }
+
+            Self&   operator = (Self &&rhs)                         __NE___;
+
+            void    SetBlockSize (Bytes size)                       __NE___ { _blockSize = size; }
 
-        Self&  operator = (Self &&rhs)                          __NE___;
+            void    Discard ()                                      __NE___;
+            void    Release ()                                      __NE___;
 
-        void  SetBlockSize (Bytes size)                         __NE___ { _blockSize = size; }
+        ND_ Bytes               TotalSize ()                        C_NE___;
+        ND_ ArrayView<Block>    GetBlocks ()                        C_NE___ { return _blocks; }
 
-        template <typename T>
-        ND_ T*      Allocate (usize count = 1)                  __NE___ { return Cast<T>( Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> })); }
-        ND_ void*   Allocate (const SizeAndAlign)               __NE___;
 
-        void  Deallocate (void *ptr)                            __NE___ { Deallocate( ptr, 1_b ); }
-        void  Deallocate (void *ptr, Bytes size)                __NE___;
-        void  Deallocate (void *ptr, const SizeAndAlign sa)     __NE___ { Deallocate( ptr, sa.size ); }
+        // IAllocator //
+        ND_ void*   Allocate (const SizeAndAlign)                   __NE_OV;
 
-        void  Discard ()                                        __NE___;
-        void  Release ()                                        __NE___;
+            void    Deallocate (void* ptr)                          __NE_OV { Deallocate( ptr, 1_b ); }
+            void    Deallocate (void* ptr, Bytes size)              __NE_OV;
+            void    Deallocate (void* ptr, const SizeAndAlign sa)   __NE_OV { Deallocate( ptr, sa.size ); }
 
-        ND_ Bytes               TotalSize ()                    C_NE___;
-        ND_ ArrayView<Block>    GetBlocks ()                    C_NE___ { return _blocks; }
+            using IAllocator::Allocate;
     };
 
 
@@ -157,7 +156,7 @@ namespace AE::Base
 =================================================
 */
     template <typename A, uint MB>
-    void  LinearAllocator<A,MB,false>::Deallocate (void *ptr, Bytes size) __NE___
+    void  LinearAllocator<A,MB,false>::Deallocate (void* ptr, Bytes size) __NE___
     {
     #ifdef AE_DEBUG
         for (auto& block : _blocks)
diff --git a/AE/engine/src/base/Memory/MemChunkList.h b/AE/engine/src/base/Memory/MemChunkList.h
new file mode 100644
index 00000000..5d9b083e
--- /dev/null
+++ b/AE/engine/src/base/Memory/MemChunkList.h
@@ -0,0 +1,392 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "base/Math/Bytes.h"
+#include "base/Memory/MemUtils.h"
+#include "base/Memory/AllocatorFwdDecl.h"
+
+namespace AE::Base
+{
+
+    //
+    // List of Memory Chunks
+    //
+
+    class MemChunkList final
+    {
+    // types
+    public:
+        using Self  = MemChunkList;
+
+    private:
+      #if AE_PLATFORM_BITS == 64
+        static constexpr uint   _SizeBits   = 36;               // max: 64 Gb
+        static constexpr uint   _ChunkBits  = 64 - _SizeBits;   // * _Align, max: 16 Gb
+      #else
+        static constexpr uint   _SizeBits   = 32;               // max: 4 Gb
+        static constexpr uint   _ChunkBits  = 32;               // * _Align, max: 4 Gb
+      #endif
+        static constexpr usize  _Align      = AE_CACHE_LINE;
+
+
+        template <bool Const>
+        struct alignas(_Align) _Chunk
+        {
+            using Ptr_t = Conditional< Const, _Chunk<Const> const*, _Chunk<Const> * >;
+
+            Ptr_t   next = null;
+            ubyte   _data [1];
+
+            ND_ void*           Data ()     __NE___ { return _data; }
+            ND_ void const*     Data ()     C_NE___ { return _data; }
+        };
+
+
+    public:
+        using Chunk         = _Chunk<false>;
+        using ConstChunk    = _Chunk<true>;
+
+
+    // variables
+    private:
+        usize       _totalSize  : _SizeBits;
+        usize       _chunkSize  : _ChunkBits;
+        Chunk *     _first      = null;
+
+
+    // methods
+    public:
+        MemChunkList ()                                     __NE___ : _totalSize{0}, _chunkSize{0} {}
+        MemChunkList (const Self &)                         __NE___ = default;
+        MemChunkList (Self &&)                              __NE___ = default;
+        explicit MemChunkList (Bytes chunkSize)             __NE___;
+
+            Self&   operator = (const Self &)                   __NE___ = default;
+            Self&   operator = (Self &&)                        __NE___ = default;
+
+        template <typename Allocator>
+        ND_ Chunk*  AddChunk (Allocator &)                      __NE___;
+
+        template <typename Allocator>
+            void    Destroy (Allocator &)                       __NE___;
+
+        ND_ bool    Append (Self view)                          __NE___;
+
+            void    SetSize (Bytes newSize)                     __NE___ { ASSERT( newSize <= Capacity() );  _totalSize = usize{newSize}; }
+
+        ND_ Bytes   Size ()                                     C_NE___ { return Bytes{_totalSize}; }
+        ND_ Bytes   ChunkDataSize ()                            C_NE___ { return _ChunkSize() - sizeof(Chunk*); }
+        ND_ usize   ChunkCount ()                               C_NE___;
+        ND_ Bytes   Capacity ()                                 C_NE___ { return ChunkCount() * ChunkDataSize(); }
+
+        ND_ Chunk*              First ()                        __NE___ { return _first; }
+        ND_ ConstChunk const*   First ()                        C_NE___ { return BitCast< ConstChunk const* >(_first); }
+
+
+    // Read //
+        ND_ Bytes  Read (Bytes pos, OUT void* buffer, Bytes size)           C_NE___;
+
+        template <typename T, typename A,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, usize length, OUT BasicString<T,A> &str) C_NE___;
+
+        template <typename T, typename A,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, Bytes size, OUT BasicString<T,A> &str)   C_NE___;
+
+        template <typename T, typename A,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, usize count, OUT Array<T,A> &arr)        C_NE___;
+
+        template <typename T, typename A,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, Bytes size, OUT Array<T,A> &arr)         C_NE___;
+
+        template <typename T,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Read (Bytes pos, OUT T &data)                             C_NE___;
+
+
+    // Write //
+        ND_ Bytes  Write (Bytes pos, const void* buffer, Bytes size)        __NE___;
+
+        template <typename T,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, ArrayView<T> arr)                       __NE___;
+
+        template <typename T, typename A,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, const BasicString<T,A> str)             __NE___;
+
+        template <typename T,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, BasicStringView<T> str)                 __NE___;
+
+        template <typename T,
+                  ENABLEIF( IsTriviallySerializable<T> )>
+        ND_ bool  Write (Bytes pos, const T &data)                          __NE___;
+
+
+    private:
+            void    _Append (Chunk* newChunk)                   __NE___;
+        ND_ Bytes   _ChunkSize ()                               C_NE___ { return Bytes{_chunkSize} * _Align; }
+    };
+
+
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    inline MemChunkList::MemChunkList (Bytes chunkSize) __NE___ :
+        _totalSize{0},
+        _chunkSize{usize{ chunkSize / _Align }}
+    {
+        ASSERT( chunkSize == _ChunkSize() );
+    }
+
+/*
+=================================================
+    AddChunk
+=================================================
+*/
+    template <typename Allocator>
+    MemChunkList::Chunk*  MemChunkList::AddChunk (Allocator &alloc) __NE___
+    {
+        auto*   chunk = Cast<Chunk>( alloc.Allocate( SizeAndAlign{ _ChunkSize(), Bytes{_Align} }));
+        if_likely( chunk != null )
+        {
+            chunk->next = null;
+            _Append( chunk );
+        }
+        return chunk;
+    }
+
+/*
+=================================================
+    Destroy
+=================================================
+*/
+    template <typename Allocator>
+    void  MemChunkList::Destroy (Allocator &alloc) __NE___
+    {
+        Chunk*  chunk = _first;
+
+        for (; chunk != null;)
+        {
+            Chunk*  ptr = chunk;
+            chunk = chunk->next;
+
+            //ptr->~Chunk();  // not needed
+            alloc.Deallocate( ptr, SizeAndAlign{ _ChunkSize(), Bytes{_Align} });
+        }
+
+        _totalSize  = 0;
+        _chunkSize  = 0;
+        _first      = null;
+    }
+
+/*
+=================================================
+    Append
+=================================================
+*/
+    inline bool  MemChunkList::Append (MemChunkList view) __NE___
+    {
+        CHECK_ERR( _ChunkSize() == view._ChunkSize() );
+
+        _totalSize += view._totalSize;
+        _Append( view._first );
+
+        return true;
+    }
+
+    inline void  MemChunkList::_Append (Chunk* newChunk) __NE___
+    {
+        Chunk** next = &_first;
+        for (; *next != null; next = &(*next)->next) {}
+        *next = newChunk;
+    }
+
+/*
+=================================================
+    ChunkCount
+=================================================
+*/
+    inline usize  MemChunkList::ChunkCount () C_NE___
+    {
+        auto*   chunk   = First();
+        usize   count   = 0;
+
+        for (; chunk != null; chunk = chunk->next, ++count) {}
+        return count;
+    }
+
+/*
+=================================================
+    Read
+=================================================
+*/
+    inline Bytes  MemChunkList::Read (Bytes pos, OUT void* const dst, const Bytes dstSize) C_NE___
+    {
+        CHECK_ERR( _first != null );
+        CHECK_ERR( pos + dstSize <= Size() );
+        CHECK_ERR( dst != null );
+
+        auto*           chunk       = First();
+        const Bytes     chunk_size  = ChunkDataSize();
+        Bytes           dst_offset;
+
+        for (; (chunk != null) & (pos > chunk_size);)
+        {
+            pos     -= chunk_size;
+            chunk   = chunk->next;
+        }
+
+        ASSERT( chunk != null );
+        {
+            Bytes   size = Min( dstSize, chunk_size - pos );
+            MemCopy( OUT dst, chunk->Data() + pos, size );
+
+            chunk       = chunk->next;
+            dst_offset  = size;
+        }
+
+        for (; (chunk != null) & (dst_offset < dstSize);)
+        {
+            Bytes   size = Min( dstSize - dst_offset, chunk_size );
+            MemCopy( OUT dst + dst_offset, chunk->Data(), size );
+
+            dst_offset  += size;
+            chunk       = chunk->next;
+        }
+
+        return dst_offset;
+    }
+
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Read (const Bytes pos, const usize length, OUT BasicString<T,A> &str) C_NE___
+    {
+        NOTHROW_ERR( str.resize( length ));
+
+        const Bytes     expected_size   { sizeof(T) * length };
+        const Bytes     current_size    = Read( pos, OUT str.data(), expected_size );
+
+        NOTHROW_ERR( str.resize( usize(current_size / sizeof(T)) ));
+
+        return str.length() == length;
+    }
+
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Read (const Bytes pos, const Bytes size, OUT BasicString<T,A> &str) C_NE___
+    {
+        ASSERT( IsMultipleOf( size, sizeof(T) ));
+        return Read( pos, usize(size) / sizeof(T), OUT str );
+    }
+
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Read (const Bytes pos, const usize count, OUT Array<T,A> &arr) C_NE___
+    {
+        NOTHROW_ERR( arr.resize( count ));
+
+        const Bytes     expected_size   { sizeof(arr[0]) * arr.size() };
+        const Bytes     current_size    = Read( pos, OUT arr.data(), expected_size );
+
+        NOTHROW_ERR( arr.resize( usize(current_size / sizeof(arr[0])) ));
+
+        return arr.size() == count;
+    }
+
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Read (const Bytes pos, const Bytes size, OUT Array<T,A> &arr) C_NE___
+    {
+        ASSERT( IsMultipleOf( size, sizeof(T) ));
+        return Read( pos, usize(size) / sizeof(T), OUT arr );
+    }
+
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Read (const Bytes pos, OUT T &data) C_NE___
+    {
+        return Read( pos, OUT AddressOf(data), Sizeof(data) );
+    }
+
+/*
+=================================================
+    Write
+=================================================
+*/
+    inline Bytes  MemChunkList::Write (Bytes pos, const void* const src, const Bytes srcSize) __NE___
+    {
+        CHECK_ERR( _first != null );
+        CHECK_ERR( pos + srcSize <= Size() );
+        CHECK_ERR( src != null );
+
+        auto*           chunk       = First();
+        const Bytes     chunk_size  = ChunkDataSize();
+        Bytes           src_offset;
+
+        for (; (chunk != null) & (pos > chunk_size);)
+        {
+            pos     -= chunk_size;
+            chunk   = chunk->next;
+        }
+
+        ASSERT( chunk != null );
+        {
+            Bytes   size = Min( srcSize, chunk_size - pos );
+            MemCopy( OUT chunk->Data() + pos, src, size );
+
+            chunk       = chunk->next;
+            src_offset  = size;
+        }
+
+        for (; (chunk != null) & (src_offset < srcSize);)
+        {
+            Bytes   size = Min( srcSize - src_offset, chunk_size );
+            MemCopy( OUT chunk->Data(), src + src_offset, size );
+
+            src_offset  += size;
+            chunk       = chunk->next;
+        }
+
+        return src_offset;
+    }
+
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Write (const Bytes pos, ArrayView<T> arr) __NE___
+    {
+        if_unlikely( arr.empty() )
+            return true;
+
+        const Bytes     size { sizeof(arr[0]) * arr.size() };
+
+        return Write( pos, arr.data(), size ) == size;
+    }
+
+    template <typename T, typename A, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Write (const Bytes pos, const BasicString<T,A> str) __NE___
+    {
+        return Write( pos, BasicStringView<T>{ str });
+    }
+
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Write (const Bytes pos, BasicStringView<T> str) __NE___
+    {
+        if_unlikely( str.empty() )
+            return true;
+
+        const Bytes     size { sizeof(str[0]) * str.length() };
+
+        return Write( pos, str.data(), size ) == size;
+    }
+
+    template <typename T, ENABLEIF2( IsTriviallySerializable<T> )>
+    bool  MemChunkList::Write (const Bytes pos, const T &data) __NE___
+    {
+        return Write( pos, AddressOf(data), Sizeof(data) ) == Sizeof(data);
+    }
+
+
+} // AE::Base
diff --git a/AE/engine/src/base/Memory/MemUtils.h b/AE/engine/src/base/Memory/MemUtils.h
index d00181ac..f24113d9 100644
--- a/AE/engine/src/base/Memory/MemUtils.h
+++ b/AE/engine/src/base/Memory/MemUtils.h
@@ -87,31 +87,12 @@ namespace AE::Base
 =================================================
 */
     template <typename T, typename ...Args>
-    T*  PlacementNew (OUT void *ptr, Args&&... args) __Th___
+    T*  PlacementNew (OUT void* ptr, Args&&... args)  NoExcept(IsNothrowCtor< T, Args... >)
     {
         ASSERT( ptr != null );
         CheckPointerCast<T>( ptr );
-        return ( new(ptr) T{ FwdArg<Args>(args)... });  // throw
-    }
 
-/*
-=================================================
-    PlacementNewNE
-=================================================
-*
-    template <typename T, typename ...Args>
-    T*  PlacementNewNE (OUT void *ptr, Args&&... args) __NE___
-    {
-        if constexpr( sizeof...(Args) == 0 ) {
-            STATIC_ASSERT( IsNothrowDefaultCtor< T >);
-        }else{
-            STATIC_ASSERT( IsNothrowCtor< T, Args... >);
-            STATIC_ASSERT( IsNothrowCopyCtor< T >);
-            STATIC_ASSERT( IsNothrowMoveCtor< T >);
-        }
-        ASSERT( ptr != null );
-        CheckPointerCast<T>( ptr );
-        return ( new(ptr) T{ FwdArg<Args>(args)... });  // nothrow
+        return ( new(ptr) T{ FwdArg<Args>(args)... });
     }
 
 /*
@@ -122,6 +103,7 @@ namespace AE::Base
     template <typename T>
     void  PlacementDelete (INOUT T &val) __NE___
     {
+        StaticAssert( std::is_nothrow_destructible_v<T> );
         val.~T();
 
         DEBUG_ONLY( DbgFreeMem( val ));
@@ -133,14 +115,32 @@ namespace AE::Base
 =================================================
 */
     template <typename T, typename ...Args>
-    void  Reconstruct (INOUT T &value, Args&& ...args) __Th___
+    void  Reconstruct (INOUT T &value, Args&& ...args) __NE___
     {
         CheckPointerCast<T>( &value );
 
-        value.~T();
-        DEBUG_ONLY( DbgFreeMem( value ));
+        StaticAssert( std::is_nothrow_destructible_v<T> );
+
+        if constexpr( IsNothrowCtor< T, Args... >)
+        {
+            value.~T();
+            DEBUG_ONLY( DbgFreeMem( value ));
 
-        new(&value) T{ FwdArg<Args>(args)... };     // throw
+            new(&value) T{ FwdArg<Args>(args)... };
+        }
+        else
+        {
+            TRY{
+                value.~T();
+                DEBUG_ONLY( DbgFreeMem( value ));
+
+                new(&value) T{ FwdArg<Args>(args)... };
+            }
+            CATCH_ALL(
+                DBG_WARNING( "exception in ctor!" );
+                DEBUG_ONLY( DbgFreeMem( value ));
+            );
+        }
     }
 
 /*
@@ -153,16 +153,16 @@ namespace AE::Base
     template <typename T1, typename T2>
     void  MemCopy (OUT T1 &dst, const T2 &src) __NE___
     {
-        STATIC_ASSERT( sizeof(dst) >= sizeof(src) );
-        STATIC_ASSERT( IsMemCopyAvailable<T1> );
-        STATIC_ASSERT( IsMemCopyAvailable<T2> );
-        STATIC_ASSERT( not IsConst<T1> );
+        StaticAssert( sizeof(dst) >= sizeof(src) );
+        StaticAssert( IsMemCopyAvailable<T1> );
+        StaticAssert( IsMemCopyAvailable<T2> );
+        StaticAssert( not IsConst<T1> );
         ASSERT( static_cast<const void *>(&dst) != static_cast<const void *>(&src) );
 
         std::memcpy( OUT &dst, &src, sizeof(src) );
     }
 
-    inline void  MemCopy (OUT void *dst, const void *src, Bytes size) __NE___
+    inline void  MemCopy (OUT void* dst, const void* src, const Bytes size) __NE___
     {
         if_likely( size > 0 )
         {
@@ -173,7 +173,7 @@ namespace AE::Base
         }
     }
 
-    inline void  MemCopy (OUT void *dst, Bytes dstSize, const void *src, Bytes srcSize) __NE___
+    inline void  MemCopy (OUT void* dst, Bytes dstSize, const void* src, const Bytes srcSize) __NE___
     {
         if_likely( srcSize > 0 )
         {
@@ -185,6 +185,19 @@ namespace AE::Base
         }
     }
 
+    template <typename T>
+    inline void  MemCopy (OUT T* dst, const T* src, const usize count) __NE___
+    {
+        StaticAssert( IsMemCopyAvailable<T> );
+        if_likely( count > 0 )
+        {
+            ASSERT( (dst != null) and (src != null) );
+            ASSERT( not IsIntersects<const void *>( dst, dst + count, src, src + count ));
+
+            std::memcpy( OUT dst, src, sizeof(T)*count );
+        }
+    }
+
 /*
 =================================================
     MemMove
@@ -192,7 +205,7 @@ namespace AE::Base
     memory may intersects
 =================================================
 */
-    inline void  MemMove (OUT void *dst, const void *src, Bytes size) __NE___
+    inline void  MemMove (OUT void* dst, const void* src, Bytes size) __NE___
     {
         if_likely( size > 0 )
         {
@@ -202,7 +215,7 @@ namespace AE::Base
         }
     }
 
-    inline void  MemMove (OUT void *dst, Bytes dstSize, const void *src, Bytes srcSize) __NE___
+    inline void  MemMove (OUT void* dst, Bytes dstSize, const void* src, Bytes srcSize) __NE___
     {
         if_likely( srcSize > 0 )
         {
@@ -213,6 +226,18 @@ namespace AE::Base
         }
     }
 
+    template <typename T>
+    inline void  MemMove (OUT T* dst, const T* src, const usize count) __NE___
+    {
+        StaticAssert( IsMemCopyAvailable<T> );
+        if_likely( count > 0 )
+        {
+            ASSERT( (dst != null) and (src != null) );
+
+            std::memmove( OUT dst, src, sizeof(T)*count );
+        }
+    }
+
 /*
 =================================================
     ZeroMem
@@ -221,8 +246,8 @@ namespace AE::Base
     template <typename T>
     void  ZeroMem (OUT T& value) __NE___
     {
-        STATIC_ASSERT( IsZeroMemAvailable<T> );
-        STATIC_ASSERT( not IsPointer<T> );
+        StaticAssert( IsZeroMemAvailable<T> );
+        StaticAssert( not IsPointer<T> );
 
         std::memset( OUT &value, 0, sizeof(value) );
     }
@@ -236,7 +261,7 @@ namespace AE::Base
     template <typename T>
     void  ZeroMem (OUT T* ptr, usize count) __NE___
     {
-        STATIC_ASSERT( IsZeroMemAvailable<T> );
+        StaticAssert( IsZeroMemAvailable<T> );
         ASSERT( (count == 0) or ((ptr != null) == (count != 0)) );
 
         std::memset( OUT ptr, 0, sizeof(T) * count );
@@ -250,8 +275,8 @@ namespace AE::Base
     template <typename T>
     void  SecureZeroMem (OUT T& value) __NE___
     {
-        STATIC_ASSERT( IsZeroMemAvailable<T> );
-        STATIC_ASSERT( not IsPointer<T> );
+        StaticAssert( IsZeroMemAvailable<T> );
+        StaticAssert( not IsPointer<T> );
 
         SecureZeroMem( OUT &value, SizeOf<T> );
     }
@@ -270,7 +295,7 @@ namespace AE::Base
     template <usize S1, usize S2>
     void  CopyCString (OUT char (&dst)[S1], const char (&src)[S2])
     {
-        STATIC_ASSERT( S1 >= S2 );
+        StaticAssert( S1 >= S2 );
         #ifdef AE_COMPILER_MSVC
             Unused( ::strcpy_s( OUT dst, src ));
         #else
@@ -291,7 +316,23 @@ namespace AE::Base
     template <typename T>
     ND_ bool  MemEqual (const T &lhs, const T &rhs) __NE___
     {
-        return MemEqual( &lhs, &rhs, SizeOf<T> );
+        return std::memcmp( &lhs, &rhs, sizeof(T) ) == 0;
+    }
+
+/*
+=================================================
+    MemLess
+=================================================
+*/
+    ND_ inline bool  MemLess (const void* lhs, const void* rhs, Bytes size) __NE___
+    {
+        return std::memcmp( lhs, rhs, usize(size) ) < 0;
+    }
+
+    template <typename T>
+    ND_ bool  MemLess (const T &lhs, const T &rhs) __NE___
+    {
+        return std::memcmp( &lhs, &rhs, sizeof(T) ) < 0;
     }
 
 
diff --git a/AE/engine/src/base/Memory/MemWriter.h b/AE/engine/src/base/Memory/MemWriter.h
index a5f256bd..b090945b 100644
--- a/AE/engine/src/base/Memory/MemWriter.h
+++ b/AE/engine/src/base/Memory/MemWriter.h
@@ -3,7 +3,7 @@
     1. Without allocation:
         - Create 'MemWriter' with base align.
         - use only Reserve methods.
-        - get current size with 'AllocatedSize()' 
+        - get current size with 'AllocatedSize()'
 
     2. With allocation:
         - Create 'MemWriter' with preallocated memory.
@@ -36,7 +36,7 @@ namespace AE::Base
 
     // methods
     public:
-        MemWriter (void *ptr, Bytes size)                           __NE___;
+        MemWriter (void* ptr, Bytes size)                           __NE___;
         explicit MemWriter (Bytes align)                            __NE___;
 
             void    AlignTo (Bytes align)                           __NE___ { Unused( Reserve( 0_b, align )); }
@@ -51,18 +51,18 @@ namespace AE::Base
 
 
         template <typename T, typename ...Args>
-        ND_ T&      Emplace (Args&& ...args)                        __Th___;
+        ND_ T&      Emplace (Args&& ...args)                        __NE___;
 
         template <typename T, typename ...Args>
-        ND_ T&      EmplaceSized (Bytes size, Args&& ...args)       __Th___;
+        ND_ T&      EmplaceSized (Bytes size, Args&& ...args)       __NE___;
 
         template <typename T, typename ...Args>
-        ND_ T*      EmplaceArray (usize count, Args&& ...args)      __Th___;
+        ND_ T*      EmplaceArray (usize count, Args&& ...args)      __NE___;
 
 
             void    Clear ()                                        __NE___;
 
-        ND_ Bytes   OffsetOf (void *ptr, Bytes defaultValue = UMax) C_NE___;
+        ND_ Bytes   OffsetOf (void* ptr, Bytes defaultValue = UMax) C_NE___;
 
         ND_ bool    IsAllocated ()                                  C_NE___ { return Bytes{_ptr} > _MaxAlign; }
         ND_ Bytes   AllocatedSize ()                                C_NE___ { return Bytes{_offset}; }
@@ -77,7 +77,7 @@ namespace AE::Base
     constructor
 =================================================
 */
-    inline MemWriter::MemWriter (void *ptr, Bytes size) __NE___ :
+    inline MemWriter::MemWriter (void* ptr, Bytes size) __NE___ :
         _ptr{ptr}, _size{usize(size)}
     {
         ASSERT( Bytes{ptr} > _MaxAlign );
@@ -113,10 +113,10 @@ namespace AE::Base
 =================================================
 */
     template <typename T, typename ...Args>
-    T&  MemWriter::Emplace (Args&& ...args) __Th___
+    T&  MemWriter::Emplace (Args&& ...args) __NE___
     {
         ASSERT( IsAllocated() );
-        return *PlacementNew<T>( OUT &Reserve<T>(), FwdArg<Args>( args )... ); // throw
+        return *PlacementNew<T>( OUT &Reserve<T>(), FwdArg<Args>( args )... );
     }
 
 /*
@@ -125,11 +125,11 @@ namespace AE::Base
 =================================================
 */
     template <typename T, typename ...Args>
-    T&  MemWriter::EmplaceSized (Bytes size, Args&& ...args) __Th___
+    T&  MemWriter::EmplaceSized (Bytes size, Args&& ...args) __NE___
     {
         ASSERT( IsAllocated() );
         ASSERT( size >= SizeOf<T> );
-        return *PlacementNew<T>( OUT Reserve( size, AlignOf<T> ), FwdArg<Args>( args )... );  // throw
+        return *PlacementNew<T>( OUT Reserve( size, AlignOf<T> ), FwdArg<Args>( args )... );
     }
 
 /*
@@ -149,13 +149,13 @@ namespace AE::Base
 =================================================
 */
     template <typename T, typename ...Args>
-    T*  MemWriter::EmplaceArray (usize count, Args&& ...args) __Th___
+    T*  MemWriter::EmplaceArray (usize count, Args&& ...args) __NE___
     {
         ASSERT( IsAllocated() );
         T*  result = ReserveArray<T>( count );
 
         for (usize i = 0; i < count; ++i) {
-            PlacementNew<T>( OUT result + i, FwdArg<Args>( args )... );  // throw
+            PlacementNew<T>( OUT result + i, FwdArg<Args>( args )... );
         }
         return result;
     }
@@ -176,7 +176,7 @@ namespace AE::Base
     OffsetOf
 =================================================
 */
-    inline Bytes  MemWriter::OffsetOf (void *ptr, Bytes defaultValue) C_NE___
+    inline Bytes  MemWriter::OffsetOf (void* ptr, Bytes defaultValue) C_NE___
     {
         if_likely( ptr != null )
         {
diff --git a/AE/engine/src/base/Memory/ResizePolicy.h b/AE/engine/src/base/Memory/ResizePolicy.h
index 781e9cb0..7b2b153b 100644
--- a/AE/engine/src/base/Memory/ResizePolicy.h
+++ b/AE/engine/src/base/Memory/ResizePolicy.h
@@ -10,10 +10,10 @@ namespace AE::Base
 {
 
     //
-    // Resize Policy
+    // Default Resize Policy
     //
 
-    struct ResizePolicy
+    struct DefaultResizePolicy
     {
     private:
         static constexpr usize  _MinSize    = 16;
@@ -47,4 +47,18 @@ namespace AE::Base
         }
     };
 
+
+    //
+    // Resize Policy template
+    //
+
+    template <typename Allocator>
+    struct TResizePolicy {
+        using type = DefaultResizePolicy;
+    };
+
+    template <typename Allocator>
+    using ResizePolicy = typename TResizePolicy< Allocator >::type;
+
+
 } // AE::Base
diff --git a/AE/engine/src/base/Memory/SharedMem.h b/AE/engine/src/base/Memory/SharedMem.h
index d8a84779..0c07d5b8 100644
--- a/AE/engine/src/base/Memory/SharedMem.h
+++ b/AE/engine/src/base/Memory/SharedMem.h
@@ -1,4 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    SharedMem must be used only as RC object.
+*/
 
 #pragma once
 
@@ -34,52 +37,67 @@ namespace _hidden_
     {
     // types
     public:
-        using Allocator_t   = RC<IAllocator>;
-        using Self          = TSharedMem< ExtraDataType >;
+        using Self      = TSharedMem< ExtraDataType >;
 
     private:
-        using Extra_t       = Base::_hidden_::TSharedMem_Extra< ExtraDataType >;
+        using Extra_t   = Base::_hidden_::TSharedMem_Extra< ExtraDataType >;
 
         static constexpr bool   _HasExtra = not IsVoid< ExtraDataType >;
 
 
     // variables
     private:
-        Bytes32u        _size;
+        Byte32u         _size;
         POTBytes        _align;
         Extra_t         _extra;
-        Allocator_t     _allocator;
+        RC<IAllocator>  _allocator;
 
 
     // methods
     public:
-        ND_ void const*     Data ()         C_NE___ { return this + AlignUp( SizeOf<Self>, _align ); }
-        ND_ void*           Data ()         __NE___ { return this + AlignUp( SizeOf<Self>, _align ); }
-        ND_ Bytes           Size ()         C_NE___ { return _size; }
-        ND_ Bytes           Align ()        C_NE___ { return Bytes{ _align }; }
-        ND_ auto            Allocator ()    C_NE___ { return _allocator; }
+        ND_ void const*     Data ()                 C_NE___ { return this + AlignUp( SizeOf<Self>, _align ); }
+        ND_ void*           Data ()                 __NE___ { return this + AlignUp( SizeOf<Self>, _align ); }
+        ND_ Bytes           Size ()                 C_NE___ { return _size; }
+        ND_ Bytes           Align ()                C_NE___ { return Bytes{ _align }; }
+        ND_ IAllocator*     AllocatorPtr ()         C_NE___ { return _allocator.get(); }
+        ND_ RC<IAllocator>  AllocatorRC ()          C_NE___ { return _allocator; }
 
-        ND_ auto&           Extra ()        __NE___ { if constexpr( _HasExtra ) return &_extra.data; }
-        ND_ auto&           Extra ()        C_NE___ { if constexpr( _HasExtra ) return &_extra.data; }
+        ND_ auto&           Extra ()                __NE___ { if constexpr( _HasExtra ) return &_extra.data; }
+        ND_ auto&           Extra ()                C_NE___ { if constexpr( _HasExtra ) return &_extra.data; }
 
         ND_ bool            Contains (const void* ptr, Bytes size = 0_b) C_NE___;
 
         template <typename T>
-        ND_ ArrayView<T>    AsArray ()      C_NE___;
+        ND_ ArrayView<T>    AsArray ()              C_NE___;
+
+        template <typename T>
+        ND_ T&              As ()                   __NE___;
+
+        template <typename T>
+        ND_ T const&        As ()                   C_NE___;
 
         template <typename T>
-        ND_ T&              As ()           __NE___;
+        ND_ T*              Ptr (Bytes offset)      __NE___ { ASSERT( SizeOf<T> + offset <= Size() );  return Cast<T>( Data () + offset ); }
 
         template <typename T>
-        ND_ T const&        As ()           C_NE___;
+        ND_ T const*        Ptr (Bytes offset)      C_NE___ { ASSERT( SizeOf<T> + offset <= Size() );  return Cast<T>( Data () + offset ); }
+
+        template <typename T>
+        ND_ T&              Ref (Bytes offset)      __NE___ { return *Ptr<T>( offset ); }
+
+        template <typename T>
+        ND_ T const&        Ref (Bytes offset)      C_NE___ { return *Ptr<T>( offset ); }
+
 
+        ND_ static RC<Self>  Create (RC<IAllocator> alloc, const SizeAndAlign sizeAndAlign)                 __NE___;
+        ND_ static RC<Self>  Create (RC<IAllocator> alloc, Bytes size, Bytes align = DefaultAllocatorAlign) __NE___;
 
-        ND_ static RC<Self>  Create (Allocator_t alloc, const SizeAndAlign sizeAndAlign)                    __NE___;
-        ND_ static RC<Self>  Create (Allocator_t alloc, Bytes size, Bytes align = DefaultAllocatorAlign)    __NE___;
+        ND_ static void*  operator new (usize, void* where)     __NE___ { return where; }
+        //  static void   operator delete (void*, void*)        __NE___ {}
 
 
     private:
-        TSharedMem (Bytes size, POTBytes align, Allocator_t alloc)      __NE___;
+        TSharedMem (Bytes size, POTBytes align, RC<IAllocator> alloc)   __NE___;
         ~TSharedMem ()                                                  __NE_OV {}
 
         void  _ReleaseObject ()                                         __NE_OV;
@@ -97,7 +115,7 @@ namespace _hidden_
 =================================================
 */
     template <typename E>
-    TSharedMem<E>::TSharedMem (Bytes size, POTBytes align, Allocator_t alloc) __NE___ :
+    TSharedMem<E>::TSharedMem (const Bytes size, const POTBytes align, RC<IAllocator> alloc) __NE___ :
         _size{size}, _align{align}, _allocator{RVRef(alloc)}
     {
         DEBUG_ONLY( DbgInitMem( OUT Data(), Size() ));
@@ -109,7 +127,7 @@ namespace _hidden_
 =================================================
 */
     template <typename E>
-    bool  TSharedMem<E>::Contains (const void* ptr, Bytes size) C_NE___
+    bool  TSharedMem<E>::Contains (const void* ptr, const Bytes size) C_NE___
     {
         return IsIntersects<const void*>( Data(), Data() + _size, ptr, ptr + size );
     }
@@ -157,13 +175,13 @@ namespace _hidden_
 =================================================
 */
     template <typename E>
-    RC<TSharedMem<E>>  TSharedMem<E>::Create (Allocator_t alloc, const SizeAndAlign sizeAndAlign) __NE___
+    RC<TSharedMem<E>>  TSharedMem<E>::Create (RC<IAllocator> alloc, const SizeAndAlign sizeAndAlign) __NE___
     {
         return Create( RVRef(alloc), sizeAndAlign.size, sizeAndAlign.align );
     }
 
     template <typename E>
-    RC<TSharedMem<E>>  TSharedMem<E>::Create (Allocator_t alloc, Bytes size, Bytes align) __NE___
+    RC<TSharedMem<E>>  TSharedMem<E>::Create (RC<IAllocator> alloc, const Bytes size, const Bytes align) __NE___
     {
         if_likely( alloc and size > 0 )
         {
@@ -182,7 +200,7 @@ namespace _hidden_
 =================================================
 */
     template <typename E>
-    SizeAndAlign  TSharedMem<E>::_CalcSize (Bytes size, POTBytes align) __NE___
+    SizeAndAlign  TSharedMem<E>::_CalcSize (const Bytes size, const POTBytes align) __NE___
     {
         return SizeAndAlign{ AlignUp( SizeOf<Self>, align ) + size, Bytes{Max( POTAlignOf<Self>, align )} };
     }
diff --git a/AE/engine/src/base/Memory/StackAllocator.h b/AE/engine/src/base/Memory/StackAllocator.h
index 909e4545..34837da0 100644
--- a/AE/engine/src/base/Memory/StackAllocator.h
+++ b/AE/engine/src/base/Memory/StackAllocator.h
@@ -15,7 +15,7 @@ namespace AE::Base
     //
 
     template <typename AllocatorType, uint MaxBlocks>
-    class StackAllocator< AllocatorType, MaxBlocks, false > final : public Noncopyable
+    class StackAllocator< AllocatorType, MaxBlocks, false > final : public IAllocator
     {
     // types
     public:
@@ -24,8 +24,6 @@ namespace AE::Base
 
         enum class Bookmark : usize {};
 
-        static constexpr bool   IsThreadSafe = false;
-
         struct AutoReleaseBookmark
         {
             friend class StackAllocator;
@@ -72,21 +70,13 @@ namespace AE::Base
         StackAllocator (const Self &)                               = delete;
         explicit StackAllocator (const Allocator_t &alloc)          __NE___: _alloc{alloc} {}
 
-        ~StackAllocator ()                                          __NE___ { Release(); }
+        ~StackAllocator ()                                          __NE_OV { Release(); }
 
             Self&  operator = (const Self &)                        = delete;
             Self&  operator = (Self &&rhs)                          __NE___;
 
             void  SetBlockSize (Bytes size)                         __NE___ { _blockSize = size; }
 
-        template <typename T>
-        ND_ T*      Allocate (usize count = 1)                      __NE___ { return Cast<T>( Allocate( SizeAndAlign{ SizeOf<T> * count, AlignOf<T> })); }
-        ND_ void*   Allocate (const SizeAndAlign)                   __NE___;
-
-            void    Deallocate (void* ptr)                          __NE___ { Deallocate( ptr, 1_b ); }
-            void    Deallocate (void* ptr, Bytes size)              __NE___;
-            void    Deallocate (void* ptr, const SizeAndAlign sa)   __NE___ { Deallocate( ptr, sa.size ); }
-
             bool    Commit (Bookmark bm, Bytes size)                __NE___;
 
         ND_ auto    PushAuto ()                                     __NE___ { return AutoReleaseBookmark{ *this }; }
@@ -99,6 +89,16 @@ namespace AE::Base
 
         ND_ Bytes   TotalSize ()                                    C_NE___;
 
+
+        // IAllocator //
+        ND_ void*   Allocate (const SizeAndAlign)                   __NE_OV;
+
+            void    Deallocate (void* ptr)                          __NE_OV { Deallocate( ptr, 1_b ); }
+            void    Deallocate (void* ptr, Bytes size)              __NE_OV;
+            void    Deallocate (void* ptr, const SizeAndAlign sa)   __NE_OV { Deallocate( ptr, sa.size ); }
+
+            using IAllocator::Allocate;
+
     private:
         ND_ static Pair<usize, usize>  _UnpackBookmark (Bookmark bm) __NE___;
     };
@@ -124,7 +124,7 @@ namespace AE::Base
 =================================================
 */
     template <typename A, uint B>
-    StackAllocator<A,B,false>&  StackAllocator<A,B,false>::operator = (Self && rhs) __NE___
+    StackAllocator<A,B,false>&  StackAllocator<A,B,false>::operator = (Self &&rhs) __NE___
     {
         Release();
         _blocks     = RVRef(rhs._blocks);
diff --git a/AE/engine/src/base/Memory/UntypedAllocator.h b/AE/engine/src/base/Memory/UntypedAllocator.h
index e8332012..2bf20072 100644
--- a/AE/engine/src/base/Memory/UntypedAllocator.h
+++ b/AE/engine/src/base/Memory/UntypedAllocator.h
@@ -34,38 +34,41 @@ namespace AE::Base
         // with default alignment
         ND_ static void*  Allocate (Bytes size)                                 __NE___
         {
-            void*   ptr = ::operator new ( usize(size), std::nothrow_t{} );
+            void*   ptr = ::operator new( usize(size), std::nothrow );
             Helper_t::OnAllocate( ptr, size );
             return ptr;
         }
 
-        static void  Deallocate (void *ptr)                                     __NE___
+        static void  Deallocate (void* ptr)                                     __NE___
         {
             Helper_t::OnDeallocate( ptr );
-            ::operator delete ( ptr, std::nothrow_t() );
+            ::operator delete( ptr );
+            CheckNothrow( IsNoExcept( ::operator delete( ptr )));
         }
 
         // deallocation with explicit size may be faster
-        static void  Deallocate (void *ptr, Bytes size)                         __NE___
+        static void  Deallocate (void* ptr, Bytes size)                         __NE___
         {
             Helper_t::OnDeallocate( ptr, size );
-            ::operator delete ( ptr, usize(size) );
+            ::operator delete( ptr, usize(size) );
+            CheckNothrow( IsNoExcept( ::operator delete( ptr, usize(size) )));
         }
 
 
         // with custom alignment
         ND_ static void*  Allocate (const SizeAndAlign sizeAndAlign)            __NE___
         {
-            void*   ptr = ::operator new ( usize(sizeAndAlign.size), std::align_val_t(usize(sizeAndAlign.align)), std::nothrow_t{} );
+            void*   ptr = ::operator new( usize(sizeAndAlign.size), std::align_val_t(usize(sizeAndAlign.align)), std::nothrow );
             Helper_t::OnAllocate( ptr, sizeAndAlign );
             return ptr;
         }
 
         // deallocation with explicit size may be faster
-        static void  Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)    __NE___
+        static void  Deallocate (void* ptr, const SizeAndAlign sizeAndAlign)    __NE___
         {
             Helper_t::OnDeallocate( ptr, sizeAndAlign );
-            ::operator delete ( ptr, usize(sizeAndAlign.size), std::align_val_t(usize(sizeAndAlign.align)) );
+            ::operator delete( ptr, usize(sizeAndAlign.size), std::align_val_t(usize(sizeAndAlign.align)) );
+            CheckNothrow( IsNoExcept( ::operator delete( ptr, 0, std::align_val_t{0} )));
         }
 
         ND_ bool  operator == (const UntypedAllocator &)                        C_NE___
@@ -96,28 +99,30 @@ namespace AE::Base
         template <typename T>
         ND_ static T*     Allocate (usize count = 1)                            __NE___
         {
-            STATIC_ASSERT( alignof(T) <= BaseAlign );
+            StaticAssert( alignof(T) <= BaseAlign );
             return Cast<T>( Allocate( SizeOf<T> * count ));
         }
 
         ND_ static void*  Allocate (Bytes size)                                 __NE___
         {
-            void*   ptr = ::operator new ( usize(size), std::align_val_t(BaseAlign), std::nothrow_t{} );
+            void*   ptr = ::operator new( usize(size), std::align_val_t(BaseAlign), std::nothrow );
             Helper_t::OnAllocate( ptr, size );
             return ptr;
         }
 
-        static void  Deallocate (void *ptr)                                     __NE___
+        static void  Deallocate (void* ptr)                                     __NE___
         {
             Helper_t::OnDeallocate( ptr );
-            ::operator delete ( ptr, std::align_val_t(BaseAlign), std::nothrow_t() );
+            ::operator delete( ptr, std::align_val_t(BaseAlign) );
+            CheckNothrow( IsNoExcept( ::operator delete( ptr, std::align_val_t{0} )));
         }
 
         // deallocation with explicit size may be faster
-        static void  Deallocate (void *ptr, Bytes size)                         __NE___
+        static void  Deallocate (void* ptr, Bytes size)                         __NE___
         {
             Helper_t::OnDeallocate( ptr, size );
-            ::operator delete ( ptr, usize(size), std::align_val_t(BaseAlign) );
+            ::operator delete( ptr, usize(size), std::align_val_t(BaseAlign) );
+            CheckNothrow( IsNoExcept( ::operator delete( ptr, 0, std::align_val_t{0} )));
         }
 
         ND_ bool  operator == (const UntypedAllocatorBaseAlign<BaseAlign> &)    C_NE___
@@ -135,51 +140,58 @@ namespace AE::Base
 # ifdef AE_COMPILER_MSVC
 #   define AllocateOnStack2( _outPtr_, _sizeInBytes_ )                                              \
         {                                                                                           \
-            STATIC_ASSERT( IsBytes< decltype(_sizeInBytes_) >);                                     \
+            StaticAssert( IsBytes< decltype(_sizeInBytes_) >);                                      \
             ASSERT( (_sizeInBytes_) <= 1_Kb );          /* _ALLOCA_S_THRESHOLD */                   \
             _outPtr_ = Cast< RemovePointer<decltype(_outPtr_)> >(_alloca( usize(_sizeInBytes_) ));  \
-        }                                                                                           \
+            AllocatorHelper< EAllocatorType::OnStack >::OnAllocate( _outPtr_, _sizeInBytes_ );      \
+        }
 
 # elif 0
 #   define AllocateOnStack2( _outPtr_, _sizeInBytes_ )                                              \
         {                                                                                           \
+            StaticAssert( IsBytes< decltype(_sizeInBytes_) >);                                      \
             _outPtr_ = null;                                                                        \
             __try {                                                                                 \
                 ASSERT( _sizeInBytes_ <= 1_Kb );            /* _ALLOCA_S_THRESHOLD */               \
                 _outPtr_ = Cast< decltype(*_outPtr_) >(_alloca( usize(_sizeInBytes_) ));            \
+                AllocatorHelper< EAllocatorType::OnStack >::OnAllocate( _outPtr_, _sizeInBytes_ );  \
             }                                                                                       \
             __except( GetExceptionCode() == 0xC00000FDl ) { /* STATUS_STACK_OVERFLOW */             \
                 _resetstkoflw();                                                                    \
             }                                                                                       \
-        }                                                                                           \
+        }
 
 # else
 #   define AllocateOnStack2( _outPtr_, _sizeInBytes_ )                                              \
         {                                                                                           \
-            STATIC_ASSERT( IsBytes< decltype(_sizeInBytes_) >);                                     \
+            StaticAssert( IsBytes< decltype(_sizeInBytes_) >);                                      \
             ASSERT( (_sizeInBytes_) <= 1_Kb );          /* _ALLOCA_S_THRESHOLD */                   \
             _outPtr_ = Cast< RemovePointer<decltype(_outPtr_)> >(alloca( usize(_sizeInBytes_) ));   \
-        }                                                                                           \
+            AllocatorHelper< EAllocatorType::OnStack >::OnAllocate( _outPtr_, _sizeInBytes_ );      \
+        }
 
 # endif
 
 
 #   define AllocateOnStack( _outPtr_, _count_ )                                                     \
+        StaticAssert( IsInteger< decltype(_count_) >);                                              \
         AllocateOnStack2( _outPtr_, (SizeOf<RemovePointer<decltype(_outPtr_)>> * _count_) );
 
 #   define AllocateOnStack_WithCtor( _outPtr_, _count_ )                                            \
         {                                                                                           \
+            StaticAssert( IsInteger< decltype(_count_) >);                                          \
             AllocateOnStack2( _outPtr_, (SizeOf<RemovePointer<decltype(_outPtr_)>> * _count_) );    \
             for (usize i = 0, cnt = _count_; i < cnt; ++i) {                                        \
                 PlacementNew< RemovePointer<decltype(_outPtr_)> >( OUT _outPtr_ + i );              \
             }                                                                                       \
-        }                                                                                           \
+        }
 
 #   define AllocateOnStack_ZeroMem( _outPtr_, _count_ )                                             \
         {                                                                                           \
+            StaticAssert( IsInteger< decltype(_count_) >);                                          \
             AllocateOnStack2( _outPtr_, (SizeOf<RemovePointer<decltype(_outPtr_)>> * _count_) );    \
             ZeroMem( OUT _outPtr_, _count_ );                                                       \
-        }                                                                                           \
+        }
 
 
 } // AE::Base
diff --git a/AE/engine/src/base/ObjC/NS.h b/AE/engine/src/base/ObjC/NS.h
index f8e10520..1944fea2 100644
--- a/AE/engine/src/base/ObjC/NS.h
+++ b/AE/engine/src/base/ObjC/NS.h
@@ -27,10 +27,10 @@ namespace AE::NS
     public:
         Object ()                                   __NE___ = default;
         Object (const Object& other)                __NE___;
-        Object (Object && other)                    __NE___;
+        Object (Object &&other)                     __NE___;
 
-        Object& operator = (const Object& rhs)      __NE___;
-        Object& operator = (Object && rhs)          __NE___;
+        Object& operator = (const Object &rhs)      __NE___;
+        Object& operator = (Object &&rhs)           __NE___;
 
         virtual ~Object ()                          __NE___;
 
@@ -99,7 +99,7 @@ namespace AE::NS
     {
     // types
     public:
-        STATIC_ASSERT( Base::IsBaseOf< ObjectRef, T >);
+        StaticAssert( Base::IsBaseOf< ObjectRef, T >);
 
         using Self = ObjStrongPtr<T>;
 
diff --git a/AE/engine/src/base/ObjC/NS.mm b/AE/engine/src/base/ObjC/NS.mm
index 69dab867..048e93b0 100644
--- a/AE/engine/src/base/ObjC/NS.mm
+++ b/AE/engine/src/base/ObjC/NS.mm
@@ -20,7 +20,7 @@
 
 namespace AE::NS
 {
-    STATIC_ASSERT( sizeof(NS::UInteger) == sizeof(NSUInteger) );
+    StaticAssert( sizeof(NS::UInteger) == sizeof(NSUInteger) );
 
 
     Object::Object (const Object& other) __NE___ :
@@ -30,7 +30,7 @@
             CFRetain( _ptr );
     }
 
-    Object::Object (Object && other) __NE___ :
+    Object::Object (Object &&other) __NE___ :
         _ptr{ other._ptr }
     {
         other._ptr = null;
@@ -57,7 +57,7 @@
         return *this;
     }
 
-    Object&  Object::operator = (Object && rhs) __NE___
+    Object&  Object::operator = (Object &&rhs) __NE___
     {
         if ( rhs._ptr == _ptr )
             return *this;
@@ -233,7 +233,7 @@
     {
         Base::String    result;
         const usize     size_in_bytes = [(__bridge NSString *)Ptr() lengthOfBytesUsingEncoding : NSASCIIStringEncoding ];
-        CATCH_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
+        NOTHROW_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
 
         [(__bridge NSString *)Ptr() getCString : &result[0]
                                      maxLength : result.size() * sizeof(result[0])
@@ -245,7 +245,7 @@
     {
         Base::U8String  result;
         const usize     size_in_bytes = [(__bridge NSString *)Ptr() lengthOfBytesUsingEncoding : NSUTF8StringEncoding ];
-        CATCH_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
+        NOTHROW_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
 
         [(__bridge NSString *)Ptr() getCString : Base::Cast<char>(&result[0])
                                      maxLength : result.size() * sizeof(result[0])
@@ -257,7 +257,7 @@
     {
         Base::U16String result;
         const usize     size_in_bytes = [(__bridge NSString *)Ptr() lengthOfBytesUsingEncoding : NSUTF16StringEncoding ];
-        CATCH_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
+        NOTHROW_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
 
         [(__bridge NSString *)Ptr() getCString : Base::Cast<char>(&result[0])
                                      maxLength : result.size() * sizeof(result[0])
@@ -269,7 +269,7 @@
     {
         Base::U32String result;
         const usize     size_in_bytes = [(__bridge NSString *)Ptr() lengthOfBytesUsingEncoding : NSUTF32StringEncoding ];
-        CATCH_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
+        NOTHROW_ERR( result.resize( size_in_bytes / sizeof(result[0]) ));
 
         [(__bridge NSString *)Ptr() getCString : Base::Cast<char>(&result[0])
                                      maxLength : result.size() * sizeof(result[0])
diff --git a/AE/engine/src/base/Platforms/AndroidUtils.cpp b/AE/engine/src/base/Platforms/AndroidUtils.cpp
index 02f0304c..23a382fb 100644
--- a/AE/engine/src/base/Platforms/AndroidUtils.cpp
+++ b/AE/engine/src/base/Platforms/AndroidUtils.cpp
@@ -9,6 +9,7 @@
 # include <pthread.h>
 # include <sched.h>
 # include <sys/system_properties.h>
+# include <arm_acle.h>
 
 # include "base/Platforms/AndroidUtils.h"
 # include "base/Algorithms/ArrayUtils.h"
@@ -37,7 +38,7 @@ namespace AE::Base
 
         ASSERT( name.length() <= 16 );
         int res = prctl( PR_SET_NAME, (unsigned long) name.c_str(), 0, 0, 0 );
-        ASSERT( res == 0 );
+        ASSERT( res == 0 );  Unused( res );
     }
 
 /*
@@ -49,7 +50,7 @@ namespace AE::Base
     {
         char    buf [16];
         int     res = prctl( PR_GET_NAME, buf, 0, 0, 0 );
-        ASSERT( res == 0 );
+        ASSERT( res == 0 );  Unused( res );
         return String{buf};
     }
 /*
@@ -113,32 +114,6 @@ namespace AE::Base
         return ::sched_getcpu();
     }
 
-/*
-=================================================
-    ThreadPause
-----
-  ARM:
-    In a Symmetric Multi-Threading (SMT) design, a thread can use a Yield instruction
-    to give a hint to the processor that it is running on. The Yield hint indicates that whatever
-    the thread is currently doing is of low importance, and so could yield.
-    For example, the thread might be sitting in a spin-lock.
-    Similar behavior might be used to modify the arbitration priority of the snoop bus in a multiprocessor (MP) system.
-    Defining such an instruction permits binary compatibility between SMT and SMP systems.
-    ARMv7 defines a YIELD instruction as a specific NOP-hint instruction, see YIELD.
-=================================================
-*/
-    void  AndroidUtils::ThreadPause () __NE___
-    {
-    #if defined(AE_CPU_ARCH_ARM32) or defined(AE_CPU_ARCH_ARM64)
-        __builtin_arm_yield();
-        //__yield();
-        //asm volatile("yield")
-        //__wfe()   or __wfi()
-    #else
-        // TODO
-    #endif
-    }
-
 /*
 =================================================
     GetSDKVersion
diff --git a/AE/engine/src/base/Platforms/AndroidUtils.h b/AE/engine/src/base/Platforms/AndroidUtils.h
index 3ffb9b2f..328336af 100644
--- a/AE/engine/src/base/Platforms/AndroidUtils.h
+++ b/AE/engine/src/base/Platforms/AndroidUtils.h
@@ -15,26 +15,24 @@ namespace AE::Base
     struct AndroidUtils final : UnixUtils
     {
         // Thread //
-            static void     SetCurrentThreadName (NtStringView name)                                __NE___;
-        ND_ static String   GetCurrentThreadName ()                                                 __Th___;
+            static void     SetCurrentThreadName (NtStringView name)                        __NE___;
+        ND_ static String   GetCurrentThreadName ()                                         __Th___;
 
-        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                          __NE___;
+        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                  __NE___;
 
-            static bool     SetThreadAffinity (const ThreadHandle &handle, uint coreIdx)            __NE___;
-            static bool     SetThreadPriority (const ThreadHandle &handle, float priority)          __NE___;
+            static bool     SetThreadAffinity (const ThreadHandle &handle, uint coreIdx)    __NE___;
+            static bool     SetThreadPriority (const ThreadHandle &handle, float priority)  __NE___;
 
-            static bool     SetCurrentThreadAffinity (uint coreIdx)                                 __NE___;
-            static bool     SetCurrentThreadPriority (float priority)                               __NE___;
+            static bool     SetCurrentThreadAffinity (uint coreIdx)                         __NE___;
+            static bool     SetCurrentThreadPriority (float priority)                       __NE___;
 
-        ND_ static uint     GetProcessorCoreIndex ()                                                __NE___;    // current logical CPU core
-
-            static void     ThreadPause ()                                                          __NE___;
+        ND_ static uint     GetProcessorCoreIndex ()                                        __NE___;    // current logical CPU core
 
 
         // OS //
-        ND_ static Version3         GetOSVersion ()                                                 __NE___;
-        ND_ static uint             GetSDKVersion ()                                                __NE___;
-        ND_ static StringView       GetOSName ()                                                    __NE___ { return "Android"; }
+        ND_ static Version3         GetOSVersion ()                                         __NE___;
+        ND_ static uint             GetSDKVersion ()                                        __NE___;
+        ND_ static StringView       GetOSName ()                                            __NE___ { return "Android"; }
     };
 
 } // AE::Base
diff --git a/AE/engine/src/base/Platforms/AppleUtils.cpp b/AE/engine/src/base/Platforms/AppleUtils.cpp
index 27c35cdb..86ad4bd6 100644
--- a/AE/engine/src/base/Platforms/AppleUtils.cpp
+++ b/AE/engine/src/base/Platforms/AppleUtils.cpp
@@ -76,18 +76,14 @@ namespace AE::Base
         //return ::pthread_setaffinity_np( handle, sizeof(cpu_set_t), &cpuset ) == 0;
 
         Unused( handle, coreIdx );
-        return false;
+        return true;
     }
 
     bool  AppleUtils::SetCurrentThreadAffinity (uint coreIdx) __NE___
     {
         ASSERT_Lt( coreIdx, std::thread::hardware_concurrency() );
 
-        ::cpu_set_t  mask;
-        CPU_ZERO( OUT &mask );
-        CPU_SET( coreIdx, INOUT &mask );
-
-        return ::sched_setaffinity( 0, sizeof(mask), &mask ) == 0;
+        return true;
     }
 
 /*
@@ -116,32 +112,8 @@ namespace AE::Base
 */
     uint  AppleUtils::GetProcessorCoreIndex () __NE___
     {
-        return ::sched_getcpu();
-    }
-
-/*
-=================================================
-    ThreadPause
-=================================================
-*/
-    void  AppleUtils::ThreadPause () __NE___
-    {
-    #if defined(AE_CPU_ARCH_X86)
-        #if AE_SIMD_SSE >= 2
-            _mm_pause();    // requires SSE2
-        #endif
-    #elif defined(AE_CPU_ARCH_X64)
-        _mm_pause();        // SSE2 always supported on x64
-
-    #elif defined(AE_CPU_ARCH_ARM32) or defined(AE_CPU_ARCH_ARM64)
-        //__builtin_arm_yield();
-        //__yield();
-        asm volatile("yield");
-        //dispatch_hardware_pause();
-
-    #else
-        // TODO
-    #endif
+        return 0;
+        //return ::sched_getcpu();
     }
 
 
diff --git a/AE/engine/src/base/Platforms/AppleUtils.h b/AE/engine/src/base/Platforms/AppleUtils.h
index 34603b97..01eeadb5 100644
--- a/AE/engine/src/base/Platforms/AppleUtils.h
+++ b/AE/engine/src/base/Platforms/AppleUtils.h
@@ -31,42 +31,40 @@ namespace AE::Base
     // functions
 
         // Thread //
-            static void     SetCurrentThreadName (NtStringView name)                                            __NE___;
-        ND_ static String   GetCurrentThreadName ()                                                             __Th___;
+            static void     SetCurrentThreadName (NtStringView name)                        __NE___;
+        ND_ static String   GetCurrentThreadName ()                                         __Th___;
 
-        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                                      __NE___;
+        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                  __NE___;
 
-            static bool     SetThreadAffinity (const ThreadHandle &handle, uint coreIdx)                        __NE___;
-            static bool     SetThreadPriority (const ThreadHandle &handle, float priority)                      __NE___;
+            static bool     SetThreadAffinity (const ThreadHandle &handle, uint coreIdx)    __NE___;
+            static bool     SetThreadPriority (const ThreadHandle &handle, float priority)  __NE___;
 
-            static bool     SetCurrentThreadAffinity (uint coreIdx)                                             __NE___;
-            static bool     SetCurrentThreadPriority (float priority)                                           __NE___;
+            static bool     SetCurrentThreadAffinity (uint coreIdx)                         __NE___;
+            static bool     SetCurrentThreadPriority (float priority)                       __NE___;
 
-        ND_ static uint     GetProcessorCoreIndex ()                                                            __NE___;    // current logical CPU core
-
-            static void     ThreadPause ()                                                                      __NE___;
+        ND_ static uint     GetProcessorCoreIndex ()                                        __NE___;    // current logical CPU core
 
 
         // Memory //
-        ND_ static MemoryPageInfo   GetMemoryPageInfo ()                                                        __NE___;
-        ND_ static MemorySize       GetMemorySize ()                                                            __NE___;
+        ND_ static MemoryPageInfo   GetMemoryPageInfo ()                                    __NE___;
+        ND_ static MemorySize       GetMemorySize ()                                        __NE___;
 
 
         // OS //
-        ND_ static Version3         GetOSVersion ()                                                             __NE___;
+        ND_ static Version3         GetOSVersion ()                                         __NE___;
 
         #ifdef AE_PLATFORM_MACOS
-        ND_ static StringView       GetOSName ()                                                                __NE___ { return "MacOS"; }
+        ND_ static StringView       GetOSName ()                                            __NE___ { return "MacOS"; }
             static constexpr bool   Is_MacOS    = true;
             static constexpr bool   Is_iOS      = false;
         #endif
         #ifdef AE_PLATFORM_IOS
-        ND_ static StringView       GetOSName ()                                                                __NE___ { return "iOS"; }
+        ND_ static StringView       GetOSName ()                                            __NE___ { return "iOS"; }
             static constexpr bool   Is_MacOS    = false;
             static constexpr bool   Is_iOS      = true;
         #endif
 
-        ND_ static constexpr bool   VersionIsAtLeast (Version2 ver, Version2 macos, Version2 ios)               __NE___
+        ND_ static constexpr bool   VersionIsAtLeast (Version2 ver, Version2 macos, Version2 ios)   __NE___
         {
             if constexpr( Is_MacOS )    return ver >= macos;
             if constexpr( Is_iOS )      return ver >= ios;
diff --git a/AE/engine/src/base/Platforms/AppleUtils.mm b/AE/engine/src/base/Platforms/AppleUtils.mm
index ba552a28..931390e3 100644
--- a/AE/engine/src/base/Platforms/AppleUtils.mm
+++ b/AE/engine/src/base/Platforms/AppleUtils.mm
@@ -14,7 +14,7 @@
 namespace AE::Base
 {
 namespace
-{   
+{
 /*
 =================================================
     GetSystemMemorySize
diff --git a/AE/engine/src/base/Platforms/CPUInfo.cpp b/AE/engine/src/base/Platforms/CPUInfo.cpp
index 6227bb20..096aad4d 100644
--- a/AE/engine/src/base/Platforms/CPUInfo.cpp
+++ b/AE/engine/src/base/Platforms/CPUInfo.cpp
@@ -123,7 +123,8 @@ namespace
 */
     String  CpuArchInfo::Print () C_NE___
     {
-        try{
+    #ifdef AE_ENABLE_LOGS
+        TRY{
             String  str;
 
             str << "CPU features:";
@@ -188,9 +189,12 @@ namespace
 
             return str;
         }
-        catch (...)
-        {}
+        CATCH_ALL(
+            return Default;
+        )
+    #else
         return Default;
+    #endif
     }
 
 /*
diff --git a/AE/engine/src/base/Platforms/CPUInfo.h b/AE/engine/src/base/Platforms/CPUInfo.h
index 1216c837..5a939c7a 100644
--- a/AE/engine/src/base/Platforms/CPUInfo.h
+++ b/AE/engine/src/base/Platforms/CPUInfo.h
@@ -41,7 +41,7 @@ namespace AE::Base
 
     enum class ECoreType : ubyte
     {
-        // ARM: Cortex X1, X2
+        // ARM: Cortex X1, X2, X3
         HighPerformance,
 
         // ARM: Cortex A72 - A78
@@ -109,7 +109,7 @@ namespace AE::Base
         {
             uint        lineSize        : 16;   // bytes
             uint        associativity   : 16;
-            Bytes32u    size;
+            Byte32u     size;
 
             CacheGeom () : lineSize{0}, associativity{0} {}
         };
@@ -133,8 +133,8 @@ namespace AE::Base
             ECoreType       type            = Default;
             MHz_t           baseClock       = 0;
             MHz_t           maxClock        = 0;
-            CoreBits_t      logicalBits     = {};   //  |- in global space, must not intersects with other cores
-            CoreBits_t      physicalBits    = {};   // / 
+            CoreBits_t      logicalBits     = {};   // \__ in global space, must not intersects with other cores
+            CoreBits_t      physicalBits    = {};   // /
 
             Core ()                         __NE___ = default;
 
@@ -188,7 +188,7 @@ namespace AE::Base
 
 
     //
-    // CPU Performance Info 
+    // CPU Performance Info
     //
 
     struct CpuPerformance
diff --git a/AE/engine/src/base/Platforms/CPUInfo_LinuxARM.cpp b/AE/engine/src/base/Platforms/CPUInfo_LinuxARM.cpp
index 51ff2f03..4fe994da 100644
--- a/AE/engine/src/base/Platforms/CPUInfo_LinuxARM.cpp
+++ b/AE/engine/src/base/Platforms/CPUInfo_LinuxARM.cpp
@@ -460,19 +460,19 @@ namespace
         /*{
             cache.L1_Inst.lineSize      = ::getauxval( AT_L1I_CACHEGEOMETRY ) & 0xFFFF;
             cache.L1_Inst.associativity = ::getauxval( AT_L1I_CACHEGEOMETRY ) >> 16;
-            cache.L1_Inst.size          = Bytes32u{::getauxval( AT_L1I_CACHESIZE )};
+            cache.L1_Inst.size          = Byte32u{::getauxval( AT_L1I_CACHESIZE )};
 
             cache.L1_Data.lineSize      = ::getauxval( AT_L1D_CACHEGEOMETRY ) & 0xFFFF;
             cache.L1_Data.associativity = ::getauxval( AT_L1D_CACHEGEOMETRY ) >> 16;
-            cache.L1_Data.size          = Bytes32u{::getauxval( AT_L1D_CACHESIZE )};
+            cache.L1_Data.size          = Byte32u{::getauxval( AT_L1D_CACHESIZE )};
 
             cache.L2.lineSize           = ::getauxval( AT_L2_CACHEGEOMETRY ) & 0xFFFF;
             cache.L2.associativity      = ::getauxval( AT_L2_CACHEGEOMETRY ) >> 16;
-            cache.L2.size               = Bytes32u{::getauxval( AT_L2_CACHESIZE )};
+            cache.L2.size               = Byte32u{::getauxval( AT_L2_CACHESIZE )};
 
             cache.L3.lineSize           = ::getauxval( AT_L3_CACHEGEOMETRY ) & 0xFFFF;
             cache.L3.associativity      = ::getauxval( AT_L3_CACHEGEOMETRY ) >> 16;
-            cache.L3.size               = Bytes32u{::getauxval( AT_L3_CACHESIZE )};
+            cache.L3.size               = Byte32u{::getauxval( AT_L3_CACHESIZE )};
         }*/
 
         _Validate();
diff --git a/AE/engine/src/base/Platforms/CPUInfo_LinuxX64.cpp b/AE/engine/src/base/Platforms/CPUInfo_LinuxX64.cpp
index c7acb356..fd93bebf 100644
--- a/AE/engine/src/base/Platforms/CPUInfo_LinuxX64.cpp
+++ b/AE/engine/src/base/Platforms/CPUInfo_LinuxX64.cpp
@@ -44,19 +44,19 @@ namespace AE::Base
         {
             cache.L1_Inst.lineSize      = ::getauxval( AT_L1I_CACHEGEOMETRY ) & 0xFFFF;
             cache.L1_Inst.associativity = ::getauxval( AT_L1I_CACHEGEOMETRY ) >> 16;
-            cache.L1_Inst.size          = Bytes32u{uint(::getauxval( AT_L1I_CACHESIZE ))};
+            cache.L1_Inst.size          = Byte32u{uint(::getauxval( AT_L1I_CACHESIZE ))};
 
             cache.L1_Data.lineSize      = ::getauxval( AT_L1D_CACHEGEOMETRY ) & 0xFFFF;
             cache.L1_Data.associativity = ::getauxval( AT_L1D_CACHEGEOMETRY ) >> 16;
-            cache.L1_Data.size          = Bytes32u{uint(::getauxval( AT_L1D_CACHESIZE ))};
+            cache.L1_Data.size          = Byte32u{uint(::getauxval( AT_L1D_CACHESIZE ))};
 
             cache.L2.lineSize           = ::getauxval( AT_L2_CACHEGEOMETRY ) & 0xFFFF;
             cache.L2.associativity      = ::getauxval( AT_L2_CACHEGEOMETRY ) >> 16;
-            cache.L2.size               = Bytes32u{uint(::getauxval( AT_L2_CACHESIZE ))};
+            cache.L2.size               = Byte32u{uint(::getauxval( AT_L2_CACHESIZE ))};
 
             cache.L3.lineSize           = ::getauxval( AT_L3_CACHEGEOMETRY ) & 0xFFFF;
             cache.L3.associativity      = ::getauxval( AT_L3_CACHEGEOMETRY ) >> 16;
-            cache.L3.size               = Bytes32u{uint(::getauxval( AT_L3_CACHESIZE ))};
+            cache.L3.size               = Byte32u{uint(::getauxval( AT_L3_CACHESIZE ))};
         }
 
         _Validate();
diff --git a/AE/engine/src/base/Platforms/CPUInfo_WIndows2.cpp b/AE/engine/src/base/Platforms/CPUInfo_WIndows2.cpp
index 1393b0fe..7580e5e7 100644
--- a/AE/engine/src/base/Platforms/CPUInfo_WIndows2.cpp
+++ b/AE/engine/src/base/Platforms/CPUInfo_WIndows2.cpp
@@ -104,7 +104,7 @@ namespace
     // 0x0138 bytes in versions 3.10 to 6.0;
     // 0x0148 bytes in version 6.1;
     // 0x0158 bytes in version 6.2 and higher.
-    STATIC_ASSERT( sizeof(SystemPerfInfo) == 0x0158 );
+    StaticAssert( sizeof(SystemPerfInfo) == 0x0158 );
 //-----------------------------------------------------------------------------
 
 
@@ -118,7 +118,7 @@ namespace
         LONGLONG InterruptTime;
         ULONG InterruptCount;
     };
-    STATIC_ASSERT( sizeof(SystemProcessorPerfInfo) == 0x30 );
+    StaticAssert( sizeof(SystemProcessorPerfInfo) == 0x30 );
 //-----------------------------------------------------------------------------
 
 
diff --git a/AE/engine/src/base/Platforms/CPUInfo_Windows.cpp b/AE/engine/src/base/Platforms/CPUInfo_Windows.cpp
index 870e699a..0f549beb 100644
--- a/AE/engine/src/base/Platforms/CPUInfo_Windows.cpp
+++ b/AE/engine/src/base/Platforms/CPUInfo_Windows.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #if defined(AE_COMPILER_MSVC) and defined(AE_PLATFORM_WINDOWS)
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include <intrin.h>
 # include <powerbase.h>
 
@@ -106,7 +106,7 @@ namespace AE::Base
                     break;
             }
 
-            // TODO: _may_i_use_cpu_feature 
+            // TODO: _may_i_use_cpu_feature
         }
 
         if ( HasSubString( StringView{cpu_name}, "AMD" ))
@@ -141,7 +141,7 @@ namespace AE::Base
 
             fnGetSystemCpuSetInformation( null, 0, OUT &buf_size, process, 0 ); // win10
 
-            DynUntypedStorage<> info_data   { Bytes{buf_size}, AlignOf<SYSTEM_CPU_SET_INFORMATION> };
+            DynUntypedStorage   info_data   { Bytes{buf_size}, AlignOf<SYSTEM_CPU_SET_INFORMATION> };
             auto*               infos       = info_data.Ptr<SYSTEM_CPU_SET_INFORMATION>();
 
             CHECK( fnGetSystemCpuSetInformation( OUT infos, uint(info_data.Size()), OUT &buf_size, process, 0 ) != FALSE ); // win10
@@ -225,7 +225,7 @@ namespace AE::Base
             DWORD   buf_size    = 0;
             ::GetLogicalProcessorInformationEx( RelationCache, null, OUT &buf_size );   // win7
 
-            DynUntypedStorage<> info_data   { Bytes{buf_size}, AlignOf<SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX> };
+            DynUntypedStorage   info_data   { Bytes{buf_size}, AlignOf<SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX> };
             auto*               infos       = info_data.Ptr<SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX>();
 
             if ( ::GetLogicalProcessorInformationEx( RelationCache, OUT infos, INOUT &buf_size ) == TRUE )
@@ -241,22 +241,22 @@ namespace AE::Base
                     if ( info.Level == 1 and info.Type == CacheInstruction ) {
                         cache.L1_Inst.lineSize      = info.LineSize;
                         cache.L1_Inst.associativity = info.Associativity;
-                        cache.L1_Inst.size          = Bytes32u{info.CacheSize};
+                        cache.L1_Inst.size          = Byte32u{info.CacheSize};
                     }else
                     if ( info.Level == 1 and info.Type == CacheData ) {
                         cache.L1_Data.lineSize      = info.LineSize;
                         cache.L1_Data.associativity = info.Associativity;
-                        cache.L1_Data.size          = Bytes32u{info.CacheSize};
+                        cache.L1_Data.size          = Byte32u{info.CacheSize};
                     }else
                     if ( info.Level == 2 and info.Type == CacheData ) {
                         cache.L2.lineSize           = info.LineSize;
                         cache.L2.associativity      = info.Associativity;
-                        cache.L2.size               = Bytes32u{info.CacheSize};
+                        cache.L2.size               = Byte32u{info.CacheSize};
                     }else
                     if ( info.Level == 3 and info.Type == CacheData ) {
                         cache.L3.lineSize           = info.LineSize;
                         cache.L3.associativity      = info.Associativity;
-                        cache.L3.size               = Bytes32u{info.CacheSize};
+                        cache.L3.size               = Byte32u{info.CacheSize};
                     }
                 }
             }
diff --git a/AE/engine/src/base/Platforms/LinuxUtils.cpp b/AE/engine/src/base/Platforms/LinuxUtils.cpp
index ab0d2df7..e3eee729 100644
--- a/AE/engine/src/base/Platforms/LinuxUtils.cpp
+++ b/AE/engine/src/base/Platforms/LinuxUtils.cpp
@@ -122,39 +122,6 @@ namespace AE::Base
         return ::sched_getcpu();
     }
 
-/*
-=================================================
-    ThreadPause
-=================================================
-*/
-    void  LinuxUtils::ThreadPause () __NE___
-    {
-    #if defined(AE_CPU_ARCH_X86)
-        #if AE_SIMD_SSE >= 2
-            _mm_pause();    // requires SSE2
-        #endif
-    #elif defined(AE_CPU_ARCH_X64)
-        _mm_pause();        // SSE2 always supported on x64
-        // __builtin_ia32_pause 
-
-    #elif defined(AE_CPU_ARCH_ARM32) or defined(AE_CPU_ARCH_ARM64)
-        //__builtin_arm_yield();
-        __yield();
-        //asm volatile("yield")
-
-    #else
-        // TODO
-    #endif
-    }
-
-    // TODO:
-    //  pthread_getcpuclockid() - check (allow to get frequency per core?)
-    // https://gist.github.com/stevedoyle/1319053
-    // https://android.stackexchange.com/questions/19810/how-can-i-determine-max-cpu-speed-at-runtime
-    // http://www.java2s.com/Code/Android/Hardware/GetCPUFrequencyCurrent.htm
-    // https://stackoverflow.com/questions/3021054/how-to-read-cpu-frequency-on-android-device
-    //  all code also valid for MacOS/iOS/Android
-
 /*
 =================================================
     GetOSName
@@ -166,7 +133,7 @@ namespace AE::Base
         utsname     os_info = {};
         CHECK_ERR( ::uname( OUT &os_info ) == 0 );
 
-        CATCH_ERR(
+        NOTHROW_ERR(
             String  result;
             result  << os_info.sysname << ' '
                     << os_info.nodename << ' '
diff --git a/AE/engine/src/base/Platforms/LinuxUtils.h b/AE/engine/src/base/Platforms/LinuxUtils.h
index 26f6bef4..e5ac1ada 100644
--- a/AE/engine/src/base/Platforms/LinuxUtils.h
+++ b/AE/engine/src/base/Platforms/LinuxUtils.h
@@ -16,29 +16,27 @@ namespace AE::Base
     struct LinuxUtils final : UnixUtils
     {
         // Thread //
-            static void     SetCurrentThreadName (NtStringView name)                                __NE___;
-        ND_ static String   GetCurrentThreadName ()                                                 __Th___;
+            static void     SetCurrentThreadName (NtStringView name)                        __NE___;
+        ND_ static String   GetCurrentThreadName ()                                         __Th___;
 
-        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                          __NE___;
+        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                  __NE___;
 
-            static bool     SetThreadAffinity (const ThreadHandle &handle, uint coreIdx)            __NE___;
-            static bool     SetThreadPriority (const ThreadHandle &handle, float priority)          __NE___;
+            static bool     SetThreadAffinity (const ThreadHandle &handle, uint coreIdx)    __NE___;
+            static bool     SetThreadPriority (const ThreadHandle &handle, float priority)  __NE___;
 
-            static bool     SetCurrentThreadAffinity (uint coreIdx)                                 __NE___;
-            static bool     SetCurrentThreadPriority (float priority)                               __NE___;
+            static bool     SetCurrentThreadAffinity (uint coreIdx)                         __NE___;
+            static bool     SetCurrentThreadPriority (float priority)                       __NE___;
 
-        ND_ static uint     GetProcessorCoreIndex ()                                                __NE___;    // current logical CPU core
-
-            static void     ThreadPause ()                                                          __NE___;
+        ND_ static uint     GetProcessorCoreIndex ()                                        __NE___;    // current logical CPU core
 
 
         // OS //
-        ND_ static Version3     GetOSVersion ()                                                     __NE___;
+        ND_ static Version3     GetOSVersion ()                                             __NE___;
 
         #ifdef AE_RELEASE
-        ND_ static StringView   GetOSName ()                                                        __NE___ { return "Linux"; }
+        ND_ static StringView   GetOSName ()                                                __NE___ { return "Linux"; }
         #else
-        ND_ static String       GetOSName ()                                                        __NE___;
+        ND_ static String       GetOSName ()                                                __NE___;
         #endif
     };
 
diff --git a/AE/engine/src/base/Platforms/Platform.h b/AE/engine/src/base/Platforms/Platform.h
index 7385c55f..414f96cf 100644
--- a/AE/engine/src/base/Platforms/Platform.h
+++ b/AE/engine/src/base/Platforms/Platform.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "base/Platforms/ThreadUtils.h"
 #include "base/Platforms/CPUInfo.h"
 
 #if defined(AE_PLATFORM_WINDOWS)
@@ -68,3 +67,5 @@ namespace AE::Base
     #endif
 
 } // AE::Base
+
+#include "base/Platforms/ThreadUtils.h"
diff --git a/AE/engine/src/base/Platforms/ThreadUtils.cpp b/AE/engine/src/base/Platforms/ThreadUtils.cpp
deleted file mode 100644
index eb90deb6..00000000
--- a/AE/engine/src/base/Platforms/ThreadUtils.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "base/Platforms/Platform.h"
-
-namespace AE::Base
-{
-
-    bool  ThreadUtils::_NanoSleep (nanoseconds relativeTime)                    __NE___ { return PlatformUtils::NanoSleep( relativeTime ); }
-
-    void  ThreadUtils::SetName (NtStringView name)                              __NE___ { return PlatformUtils::SetCurrentThreadName( name ); }
-
-    String  ThreadUtils::GetName ()                                             __Th___ { return PlatformUtils::GetCurrentThreadName(); }
-
-    bool  ThreadUtils::_WaitIOms (milliseconds relativeTime)                    __NE___ { return PlatformUtils::WaitIO( relativeTime ); }
-
-    ThreadHandle    ThreadUtils::GetCurrentThreadHandle ()                      __NE___ { return PlatformUtils::GetCurrentThreadHandle(); }
-    bool            ThreadUtils::IsCurrentThread (const ThreadHandle &handle)   __NE___ { return handle == PlatformUtils::GetCurrentThreadHandle(); }
-
-    bool  ThreadUtils::SetAffinity (const ThreadHandle &handle, uint coreIdx)   __NE___ { return PlatformUtils::SetThreadAffinity( handle, coreIdx ); }
-    bool  ThreadUtils::SetPriority (const ThreadHandle &handle, float priority) __NE___ { return PlatformUtils::SetThreadPriority( handle, priority ); }
-
-    bool  ThreadUtils::SetAffinity (uint coreIdx)                               __NE___ { return PlatformUtils::SetCurrentThreadAffinity( coreIdx ); }
-    bool  ThreadUtils::SetPriority (float priority)                             __NE___ { return PlatformUtils::SetCurrentThreadPriority( priority ); }
-
-    uint  ThreadUtils::GetCoreIndex ()                                          __NE___ { return PlatformUtils::GetProcessorCoreIndex(); }
-
-    bool  ThreadUtils::Yield ()                                                 __NE___ { return PlatformUtils::ThreadYield(); }
-
-    void  ThreadUtils::Pause ()                                                 __NE___ { return PlatformUtils::ThreadPause(); }
-
-
-} // AE::Base
diff --git a/AE/engine/src/base/Platforms/ThreadUtils.h b/AE/engine/src/base/Platforms/ThreadUtils.h
index 21eb8f17..4f5212f5 100644
--- a/AE/engine/src/base/Platforms/ThreadUtils.h
+++ b/AE/engine/src/base/Platforms/ThreadUtils.h
@@ -6,6 +6,7 @@
 #include "base/Containers/NtStringView.h"
 #include "base/Utils/Helpers.h"
 #include "base/Utils/Threading.h"
+#include "base/Platforms/Platform.h"
 
 namespace AE::Base
 {
@@ -16,29 +17,43 @@ namespace AE::Base
 
     struct ThreadUtils : Noninstanceable
     {
-            static void     SetName (NtStringView name)                                     __NE___;
-        ND_ static String   GetName ()                                                      __Th___;
+        // Name //
+            static void     SetName (NtStringView name)                                     __NE___ { return PlatformUtils::SetCurrentThreadName( name ); }
+        ND_ static String   GetName ()                                                      __Th___ { return PlatformUtils::GetCurrentThreadName(); }
 
-        // interval ~10ms
-            template <typename R, typename P>
-            static void     Sleep (const std::chrono::duration<R,P>& relativeTime)          __NE___ { std::this_thread::sleep_for( relativeTime ); }
 
-            template <typename R, typename P>
-            static void     NanoSleep (const std::chrono::duration<R,P>& relativeTime)      __NE___ { _NanoSleep( relativeTime ); }
+        // Sleep //
+            static void     MilliSleep (milliseconds relativeTime)                          __NE___ { return PlatformUtils::ThreadMilliSleep( relativeTime ); }
+            static bool     MicroSleep (nanoseconds relativeTime)                           __NE___ { return PlatformUtils::ThreadMicroSleep( relativeTime ); }
+            static void     NanoSleep (nanoseconds relativeTime)                            __NE___ { return PlatformUtils::ThreadNanoSleep( relativeTime ); }
 
-            template <typename R, typename P>
-            static bool     WaitIO (const std::chrono::duration<R,P>& relativeTime)         __NE___ { return _WaitIOms( milliseconds{relativeTime} ); }
+            static void     ProgressiveSleep (uint)                                         __NE___;
 
-        ND_ static ThreadHandle  GetCurrentThreadHandle ()                                  __NE___;
-        ND_ static bool     IsCurrentThread (const ThreadHandle &)                          __NE___;
+            static void     Pause ()                                                        __NE___ { return PlatformUtils::ThreadPause(); }
+            static void     Sleep_1us ()                                                    __NE___ { return PlatformUtils::ThreadSleep_1us(); }
+            static void     Sleep_500us ()                                                  __NE___ { return PlatformUtils::ThreadSleep_500us(); }
+            static void     Sleep_15ms ()                                                   __NE___ { return PlatformUtils::ThreadSleep_15ms(); }
 
-            static bool     SetAffinity (const ThreadHandle &, uint coreIdx)                __NE___;
-            static bool     SetPriority (const ThreadHandle &, float priority)              __NE___;
+        ND_ static constexpr auto  NanoSleepTimeStep ()                                     __NE___ { return PlatformUtils::NanoSleepTimeStep(); }
+        ND_ static constexpr auto  MicroSleepTimeStep ()                                    __NE___ { return PlatformUtils::MicroSleepTimeStep(); }
+        ND_ static constexpr auto  MilliSleepTimeStep ()                                    __NE___ { return PlatformUtils::MilliSleepTimeStep(); }
 
-            static bool     SetAffinity (uint coreIdx)                                      __NE___;    // for current thread
-            static bool     SetPriority (float priority)                                    __NE___;    // for current thread
+        ND_ static constexpr uint  SpinBeforeLock ()                                        __NE___ { return 1'000; }
+
+
+        // Handle / Affinity / Priority //
+        ND_ static auto     GetHandle ()                                                    __NE___ { return PlatformUtils::GetCurrentThreadHandle(); }
+        ND_ static bool     IsCurrent (const ThreadHandle &handle)                          __NE___ { return handle == PlatformUtils::GetCurrentThreadHandle(); }
+
+            static bool     SetAffinity (const ThreadHandle &handle, uint coreIdx)          __NE___ { return PlatformUtils::SetThreadAffinity( handle, coreIdx ); }
+            static bool     SetPriority (const ThreadHandle &handle, float priority)        __NE___ { return PlatformUtils::SetThreadPriority( handle, priority ); }
+
+            static bool     SetAffinity (uint coreIdx)                                      __NE___ { return PlatformUtils::SetCurrentThreadAffinity( coreIdx ); }
+            static bool     SetPriority (float priority)                                    __NE___ { return PlatformUtils::SetCurrentThreadPriority( priority ); }
 
-        ND_ static uint     GetCoreIndex ()                                                 __NE___;    // current logical CPU core
+
+        // ID //
+        ND_ static uint     GetCoreIndex ()                                                 __NE___ { return PlatformUtils::GetProcessorCoreIndex(); }
 
         ND_ static auto     GetID ()                                                        __NE___ { return std::this_thread::get_id(); }
         ND_ static usize    GetIntID ()                                                     __NE___ { return usize(HashOf( std::this_thread::get_id() )); }
@@ -49,41 +64,32 @@ namespace AE::Base
         #endif
 
         ND_ static uint     MaxThreadCount ()                                               __NE___ { return std::thread::hardware_concurrency(); }
-
-        // returns 'true' if has been switched to another thread
-            static bool     Yield ()                                                        __NE___;
-
-            template <typename R, typename P>
-            static void     YieldOrSleep (const std::chrono::duration<R,P>& relativeTime)   __NE___;
-            static void     YieldOrSleep ()                                                 __NE___ { YieldOrSleep( milliseconds{1} ); }
-
-            static void     Pause ()                                                        __NE___;
-
-        ND_ static constexpr uint  SpinBeforeLock ()                                        __NE___ { return 1'000; }
-        ND_ static constexpr uint  LargeSpinBeforeLock ()                                   __NE___ { return 10'000; }
-
-    private:
-            static bool     _WaitIOms (milliseconds relativeTime)                           __NE___;
-            static bool     _NanoSleep (nanoseconds relativeTime)                           __NE___;
     };
 
 
-
 /*
 =================================================
-    YieldOrSleep
-----
-    should be used in spin-lock to avoid long time in spin-loop
+    ProgressiveSleep
 =================================================
 */
-    template <typename R, typename P>
-    void  ThreadUtils::YieldOrSleep (const std::chrono::duration<R,P>& relativeTime) __NE___
+    inline void  ThreadUtils::ProgressiveSleep (const uint iteration) __NE___
     {
-        if_unlikely( not Yield() )
+        if_likely( iteration < 8 )
         {
-            AE_LOG_DBG( "Sleep in SpinLock, it is bad for performance" );
-            Sleep( relativeTime );
+            Sleep_1us();
+            return;
         }
+
+        // power safe mode
+        if_likely( iteration < 16 )
+        {
+            Sleep_500us();
+            return;
+        }
+
+        // multiple threads at the same core is rare case
+        if ( not PlatformUtils::SwitchToPendingThread() )
+            Sleep_15ms();
     }
 
 
diff --git a/AE/engine/src/base/Platforms/UnixLibrary.h b/AE/engine/src/base/Platforms/UnixLibrary.h
index 1e518a31..74aae753 100644
--- a/AE/engine/src/base/Platforms/UnixLibrary.h
+++ b/AE/engine/src/base/Platforms/UnixLibrary.h
@@ -116,11 +116,9 @@ namespace AE::Base
 */
     inline Path  UnixLibrary::GetPath () C_NE___
     {
-    #ifdef AE_PLATFORM_ANDROID
+    #if defined(AE_PLATFORM_ANDROID) or defined(AE_PLATFORM_APPLE)
         // not supported
         return Default;
-    #elif defined(AE_PLATFORM_APPLE)
-        RETURN_ERR( "not supported" );
     #else
 
         CHECK_ERR( _handle != null );
@@ -128,7 +126,7 @@ namespace AE::Base
         char    buf [PATH_MAX] = {};
         CHECK_ERR( ::dlinfo( _handle, RTLD_DI_ORIGIN, buf ) == 0 );
 
-        CATCH_ERR( return Path{ buf };)
+        NOTHROW_ERR( return Path{ buf };)
     #endif
     }
 
diff --git a/AE/engine/src/base/Platforms/UnixProcess.cpp b/AE/engine/src/base/Platforms/UnixProcess.cpp
index 7c66e7b3..ade9c042 100644
--- a/AE/engine/src/base/Platforms/UnixProcess.cpp
+++ b/AE/engine/src/base/Platforms/UnixProcess.cpp
@@ -27,7 +27,7 @@ namespace AE::Base
         return true;
     }
 
-    bool  UnixProcess::Execute (const String &commandLine, INOUT String &output, Mutex *outputGuard, milliseconds timeout)
+    bool  UnixProcess::Execute (const String &commandLine, INOUT String &output, Mutex* outputGuard, milliseconds timeout)
     {
         Unused( timeout );
 
diff --git a/AE/engine/src/base/Platforms/UnixProcess.h b/AE/engine/src/base/Platforms/UnixProcess.h
index c25f126b..e464b546 100644
--- a/AE/engine/src/base/Platforms/UnixProcess.h
+++ b/AE/engine/src/base/Platforms/UnixProcess.h
@@ -35,7 +35,7 @@ namespace AE::Base
     // methods
     public:
         static bool  Execute (const String &commandLine, EFlags flags = EFlags::NoWindow, milliseconds timeout = _DefTimeout);
-        static bool  Execute (const String &commandLine, INOUT String &output, Mutex *outputGuard = null, milliseconds timeout = _DefTimeout);
+        static bool  Execute (const String &commandLine, INOUT String &output, Mutex* outputGuard = null, milliseconds timeout = _DefTimeout);
     };
 
     AE_BIT_OPERATORS( UnixProcess::EFlags );
diff --git a/AE/engine/src/base/Platforms/UnixUtils.cpp b/AE/engine/src/base/Platforms/UnixUtils.cpp
index c9186363..6fef42a2 100644
--- a/AE/engine/src/base/Platforms/UnixUtils.cpp
+++ b/AE/engine/src/base/Platforms/UnixUtils.cpp
@@ -29,8 +29,6 @@ namespace AE::Base
 /*
 =================================================
     CheckError
-----
-    strerrordesc_np(), strerror_r() is MT-safe
 =================================================
 */
     bool  UnixUtils::CheckError (StringView msg, const SourceLoc &loc, ELogLevel level) __NE___
@@ -67,6 +65,8 @@ namespace AE::Base
 /*
 =================================================
     _CheckError
+----
+    strerrordesc_np(), strerror_r() is MT-safe
 =================================================
 */
     bool  UnixUtils::_CheckError (int err, StringView msg, const SourceLoc &loc, ELogLevel level, ELogScope scope) __NE___
@@ -99,30 +99,71 @@ namespace AE::Base
 
 /*
 =================================================
-    NanoSleep
+    ThreadMicroSleep
+----
+    On MacOS: min 6us, 10us = 17us, 100us = 130us, min error: 10%.
 =================================================
 */
-    bool  UnixUtils::NanoSleep (nanoseconds relativeTime) __NE___
+    bool  UnixUtils::ThreadMicroSleep (nanoseconds relativeTime) __NE___
     {
-        ASSERT( relativeTime.count() <= 999999999 );
+        ASSERT( relativeTime >= nanoseconds{100} );
+        ASSERT( relativeTime.count() <= 999'999'999 );
 
-        struct timespec tim, tim2;
+        struct timespec tim;
         tim.tv_sec  = 0;
         tim.tv_nsec = relativeTime.count();
 
+        struct timespec tim2 = {};
+
         if_likely( nanosleep( &tim, OUT &tim2 ) == 0 )
             return true;
 
-        // TODO: check error
+        if_likely( nanosleep( &tim2, null ) == 0 )
+            return true;
+
         return false;
     }
 
 /*
 =================================================
-    WaitIO
+    ThreadSleep_500us
 =================================================
 */
-    bool  UnixUtils::WaitIO (milliseconds relativeTime) __NE___
+    void  UnixUtils::ThreadSleep_500us () __NE___
+    {
+        Unused( ThreadMicroSleep( nanoseconds{420'000} ));
+    }
+
+/*
+=================================================
+    ThreadSleep_15ms
+----
+    Used for compatibility with Windows timer step (1s/64).
+    On MacOS: sleep_for() has better accuracy, for time in ms it has error <1ms.
+=================================================
+*/
+    void  UnixUtils::ThreadSleep_15ms () __NE___
+    {
+        std::this_thread::sleep_for( milliseconds{15} );
+    }
+
+/*
+=================================================
+    ThreadMilliSleep
+=================================================
+*/
+    void  UnixUtils::ThreadMilliSleep (milliseconds relativeTime) __NE___
+    {
+        ASSERT( relativeTime.count() > 0 );
+        std::this_thread::sleep_for( relativeTime );
+    }
+
+/*
+=================================================
+    ThreadWaitIO
+=================================================
+*/
+    bool  UnixUtils::ThreadWaitIO (milliseconds relativeTime) __NE___
     {
         // TODO
         Unused( relativeTime );
@@ -131,7 +172,7 @@ namespace AE::Base
 
 /*
 =================================================
-    ThreadYield
+    SwitchToPendingThread
 ----
     Causes the calling thread to relinquish the CPU.
     The thread is moved to the end of the queue for its static
@@ -139,17 +180,124 @@ namespace AE::Base
 
     If the calling thread is the only thread in the highest priority
     list at that time, it will continue to run after a call to sched_yield().
+----
+    If not switched to another thread, this function call costs:
+      on MacOS:     1..3us
+      on Android:   ~2us
 =================================================
 */
-    bool  UnixUtils::ThreadYield () __NE___
+    bool  UnixUtils::SwitchToPendingThread () __NE___
     {
         return ::sched_yield() == 0;
     }
+//-----------------------------------------------------------------------------
 
 
-    // TODO
+#ifdef AE_CPU_ARCH_ARM64
+/*
+=================================================
+    ThreadNanoSleep
+----
+    Single 'wfe' call costs:
+      on Mac:       ~1.1us
+      on Android:   10-30us
+=================================================
+*/
+    void  UnixUtils::ThreadNanoSleep (nanoseconds relativeTime) __NE___
+    {
+    #ifdef AE_PLATFORM_APPLE
+        ASSERT( relativeTime <= nanoseconds{64*1024} );
+        const usize     cnt = Min( 64u, usize(relativeTime.count()+512) / 1024 );
+    #else
+        ASSERT( relativeTime <= nanoseconds{64*1024} );
+        const usize     cnt = Min( 4u, usize(relativeTime.count() + (8u<<10)) / (16u<<10) );
+    #endif
+
+        // loop of '__builtin_arm_yield' has no effect, so use only '__wfe'
+
+        for (usize i = 0; i < cnt; ++i)
+        {
+            __builtin_arm_wfe();
+        }
+    }
+
+#endif // ARM64
+
+#ifdef AE_CPU_ARCH_ARM32
+/*
+=================================================
+    ThreadNanoSleep
+----
+    'wfe' is not supported on arm32 and multiple call of 'yield' has no effect
+=================================================
+*/
+    void  UnixUtils::ThreadNanoSleep (nanoseconds) __NE___
+    {
+        __builtin_arm_yield();  // 1-3us
+    }
+
+#endif // ARM32
+//-----------------------------------------------------------------------------
+
+
+#if defined(AE_CPU_ARCH_X86) or defined(AE_CPU_ARCH_X64)
+/*
+=================================================
+    ThreadSleep_1us
+----
+    actual: 500ns
+=================================================
+*/
+    void  UnixUtils::ThreadSleep_1us () __NE___
+    {
+        for (uint i = 0; i < 5; ++i)
+        {
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();  // ~100ns
+        }
+    }
+
+/*
+=================================================
+    ThreadNanoSleep
+=================================================
+*/
+    void  UnixUtils::ThreadNanoSleep (nanoseconds relativeTime) __NE___
+    {
+        ASSERT( relativeTime >= nanoseconds{16} );
+        ASSERT( relativeTime <= nanoseconds{512*128} );
+
+        const usize     cnt2 = Min( 512u, usize(relativeTime.count()) / 128 );
+        const usize     cnt1 = (usize(relativeTime.count()) % 128 + 16) / 32;
+
+        for (usize i = 0; i < cnt1; ++i)
+        {
+            ThreadPause();
+        }
+
+        for (usize i = 0; i < cnt2; ++i)
+        {
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();
+            ThreadPause();      // ~130ns
+        }
+    }
+
+#endif // X86 / X64
+
+
+    // TODO:
+    //  prefetch: __builtin_arm_prefetch, __pld, __pldx
     //  clock_getres
-    //  poll, epoll, select - WaitIO
+
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Platforms/UnixUtils.h b/AE/engine/src/base/Platforms/UnixUtils.h
index 452938cf..9dea6d88 100644
--- a/AE/engine/src/base/Platforms/UnixUtils.h
+++ b/AE/engine/src/base/Platforms/UnixUtils.h
@@ -33,8 +33,8 @@ namespace AE::Base
     // functions
 
         // Errors //
-        ND_ static int   GetErrorCode ()            __NE___;
-        ND_ static int   GetNetworkErrorCode ()     __NE___;
+        ND_ static int   GetErrorCode ()                                                                                        __NE___;
+        ND_ static int   GetNetworkErrorCode ()                                                                                 __NE___;
 
             static bool  CheckError (StringView msg, const SourceLoc &loc, ELogLevel level = ELogLevel::Error)                  __NE___;
             static bool  CheckError (int err, StringView msg, const SourceLoc &loc, ELogLevel level = ELogLevel::Error)         __NE___;
@@ -44,22 +44,111 @@ namespace AE::Base
 
 
         // Memory //
-        ND_ static MemoryPageInfo  GetMemoryPageInfo () __NE___;
+        ND_ static MemoryPageInfo  GetMemoryPageInfo ()                                     __NE___;
 
 
         // Thread //
-            // interval > 4000ns
-            static bool     NanoSleep (nanoseconds relativeTime)    __NE___;
+        ND_ static constexpr auto  NanoSleepTimeStep ()                                     __NE___;
+        ND_ static constexpr auto  MicroSleepTimeStep ()                                    __NE___ { return nanoseconds{10'000}; }
+        ND_ static constexpr auto  MilliSleepTimeStep ()                                    __NE___ { return nanoseconds{100'000'000}; }
 
-            static bool     WaitIO (milliseconds relativeTime)      __NE___;
+            static void     ThreadNanoSleep (nanoseconds relativeTime)                      __NE___;
+            static bool     ThreadMicroSleep (nanoseconds relativeTime)                     __NE___;
+            static void     ThreadMilliSleep (milliseconds relativeTime)                    __NE___;
 
-            static bool     ThreadYield ()                          __NE___;
+            static void     ThreadPause ()                                                  __NE___;
+            static void     ThreadSleep_1us ()                                              __NE___;
+            static void     ThreadSleep_500us ()                                            __NE___;
+            static void     ThreadSleep_15ms ()                                             __NE___;
+
+            static bool     ThreadWaitIO (milliseconds relativeTime)                        __NE___;
+        ND_ static bool     SwitchToPendingThread ()                                        __NE___;
 
 
     private:
-        ND_ static bool  _CheckError (int err, StringView msg, const SourceLoc &loc, ELogLevel level, ELogScope scope) __NE___;
+        ND_ static bool  _CheckError (int err, StringView msg, const SourceLoc &loc, ELogLevel level, ELogScope scope)  __NE___;
     };
 
+
+
+/*
+=================================================
+    NanoSleepTimeStep
+=================================================
+*/
+#if defined(AE_CPU_ARCH_X86) or defined(AE_CPU_ARCH_X64)
+    inline constexpr auto  UnixUtils::NanoSleepTimeStep () __NE___
+    {
+        return nanoseconds{30};
+    }
+
+#elif defined(AE_CPU_ARCH_ARM32) or defined(AE_CPU_ARCH_ARM64)
+    inline constexpr auto  UnixUtils::NanoSleepTimeStep () __NE___
+    {
+        return nanoseconds{1'000};
+    }
+#endif
+
+
+#if defined(AE_CPU_ARCH_X86) or defined(AE_CPU_ARCH_X64)
+/*
+=================================================
+    ThreadPause
+=================================================
+*/
+    forceinline void  UnixUtils::ThreadPause () __NE___
+    {
+      #if defined(AE_CPU_ARCH_X64) or AE_SIMD_SSE >= 2
+        _mm_pause();        // SSE2 always supported on x64
+      #else
+        __builtin_ia32_pause();
+      #endif
+    }
+
+#elif defined(AE_CPU_ARCH_ARM32) or defined(AE_CPU_ARCH_ARM64)
+/*
+=================================================
+    ThreadPause
+----
+  ARM:
+    In a Symmetric Multi-Threading (SMT) design, a thread can use a Yield instruction
+    to give a hint to the processor that it is running on. The Yield hint indicates that whatever
+    the thread is currently doing is of low importance, and so could yield.
+    For example, the thread might be sitting in a spin-lock.
+    Similar behavior might be used to modify the arbitration priority of the snoop bus in a multiprocessor (MP) system.
+    Defining such an instruction permits binary compatibility between SMT and SMP systems.
+    ARMv7 defines a YIELD instruction as a specific NOP-hint instruction, see YIELD.
+----
+    Mac M1:                     ~30ns
+    Android Cortex A76, A78:    40-60ns
+    Android Cortex A53:         1-3us
+    Android Cortex A55:         90ns
+=================================================
+*/
+    forceinline void  UnixUtils::ThreadPause () __NE___
+    {
+        __builtin_arm_yield();
+    }
+
+/*
+=================================================
+    ThreadSleep_1us
+----
+    Mac M1:                         ~1.1us
+    Android Cortex A76, A78, A55:   10-30us
+    Android Cortex A53:             1-3us
+=================================================
+*/
+    forceinline void  UnixUtils::ThreadSleep_1us () __NE___
+    {
+    #ifdef AE_CPU_ARCH_ARM64
+        __builtin_arm_wfe();
+    #else
+        __builtin_arm_yield();
+    #endif
+    }
+#endif
+
 } // AE::Base
 
 #endif // AE_PLATFORM_UNIX_BASED
diff --git a/AE/engine/src/base/Platforms/WindowsHeader.h b/AE/engine/src/base/Platforms/WindowsHeader.cpp.h
similarity index 57%
rename from AE/engine/src/base/Platforms/WindowsHeader.h
rename to AE/engine/src/base/Platforms/WindowsHeader.cpp.h
index e747aa45..1c02824e 100644
--- a/AE/engine/src/base/Platforms/WindowsHeader.h
+++ b/AE/engine/src/base/Platforms/WindowsHeader.cpp.h
@@ -17,27 +17,30 @@
 #   pragma warning (push)
 #   pragma warning (disable: 4668)
 #   pragma warning (disable: 4005)
-#   include <Windows.h>
-#   include <WinSock2.h>
-#   include <ws2tcpip.h>
-#   include <processthreadsapi.h>
-#   include <timeapi.h>
-#   include <ntsecapi.h>
-#   include <ntstatus.h>
-#   include <Sddl.h>
-#   include <windowsx.h> 
-#   include <hidusage.h>
-#   include <VersionHelpers.h>
+# endif
+
+# include <Windows.h>
+# include <WinSock2.h>
+# include <ws2tcpip.h>
+# include <processthreadsapi.h>
+# include <timeapi.h>
+# include <ntsecapi.h>
+# include <ntstatus.h>
+# include <Sddl.h>
+# include <windowsx.h>
+# include <hidusage.h>
+# include <VersionHelpers.h>
     // Windows 8.1
-#   include <ShellScalingAPI.h>     
-    // Windows Vista 
-#   include <LowLevelMonitorConfigurationAPI.h>
-#   include <PhysicalMonitorEnumerationAPI.h>
+# include <ShellScalingAPI.h>
+    // Windows Vista
+# include <LowLevelMonitorConfigurationAPI.h>
+# include <PhysicalMonitorEnumerationAPI.h>
 //# include <HighLevelMonitorConfigurationAPI.h>
+
+# ifdef AE_COMPILER_MSVC
 #   pragma warning (pop)
 # endif
 
-
 # include "base/Defines/Undef.h"
 
 #endif // AE_PLATFORM_WINDOWS
diff --git a/AE/engine/src/base/Platforms/WindowsLibrary.cpp b/AE/engine/src/base/Platforms/WindowsLibrary.cpp
index 8058208e..922cb594 100644
--- a/AE/engine/src/base/Platforms/WindowsLibrary.cpp
+++ b/AE/engine/src/base/Platforms/WindowsLibrary.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_PLATFORM_WINDOWS
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "base/Platforms/WindowsLibrary.h"
 
 namespace AE::Base
@@ -72,7 +72,7 @@ namespace AE::Base
         wchar_t buf[MAX_PATH] = {};
         CHECK_ERR( ::GetModuleFileNameW( BitCast<HMODULE>(_handle), buf, DWORD(CountOf(buf)) ) != FALSE );
 
-        CATCH_ERR( return Path{ buf };)
+        NOTHROW_ERR( return Path{ buf };)
     }
 
 /*
diff --git a/AE/engine/src/base/Platforms/WindowsPageAllocator.cpp b/AE/engine/src/base/Platforms/WindowsPageAllocator.cpp
index cb76f629..db660198 100644
--- a/AE/engine/src/base/Platforms/WindowsPageAllocator.cpp
+++ b/AE/engine/src/base/Platforms/WindowsPageAllocator.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_PLATFORM_WINDOWS
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "base/Platforms/WindowsPageAllocator.h"
 # include "base/Platforms/WindowsUtils.h"
 # include "base/Algorithms/StringUtils.h"
diff --git a/AE/engine/src/base/Platforms/WindowsProcess.cpp b/AE/engine/src/base/Platforms/WindowsProcess.cpp
index 576ef28a..c21665eb 100644
--- a/AE/engine/src/base/Platforms/WindowsProcess.cpp
+++ b/AE/engine/src/base/Platforms/WindowsProcess.cpp
@@ -1,13 +1,13 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "base/Platforms/WindowsProcess.h"
-#include "base/Platforms/WindowsUtils.h"
+#ifdef AE_PLATFORM_WINDOWS
+# include "base/Platforms/WindowsHeader.cpp.h"
 
-#include "base/Algorithms/StringUtils.h"
-#include "base/Utils/Helpers.h"
+# include "base/Platforms/WindowsProcess.h"
+# include "base/Platforms/WindowsUtils.h"
 
-#ifdef AE_PLATFORM_WINDOWS
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Algorithms/StringUtils.h"
+# include "base/Utils/Helpers.h"
 
 namespace AE::Base
 {
@@ -29,7 +29,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    bool  WindowsProcess::_ExecuteAsync (BasicString<T> &commandLine, const Path *currentDir, EFlags flags)
+    bool  WindowsProcess::_ExecuteAsync (BasicString<T> &commandLine, const Path* currentDir, EFlags flags)
     {
         using STARTUPINFO_t = Conditional< IsSameTypes< T, char >, STARTUPINFOA, STARTUPINFOW >;
 
@@ -152,7 +152,7 @@ namespace AE::Base
         return result;
     }
 
-    bool  WindowsProcess::Execute (String &commandLine, INOUT String &output, Mutex *outputGuard, milliseconds timeout)
+    bool  WindowsProcess::Execute (String &commandLine, INOUT String &output, Mutex* outputGuard, milliseconds timeout)
     {
         WindowsProcess  proc;
         bool            result = true;
@@ -162,7 +162,7 @@ namespace AE::Base
         return result;
     }
 
-    bool  WindowsProcess::Execute (WString &commandLine, INOUT String &output, Mutex *outputGuard, milliseconds timeout)
+    bool  WindowsProcess::Execute (WString &commandLine, INOUT String &output, Mutex* outputGuard, milliseconds timeout)
     {
         WindowsProcess  proc;
         bool            result = true;
@@ -255,7 +255,7 @@ namespace AE::Base
     WaitAndClose
 =================================================
 */
-    bool  WindowsProcess::WaitAndClose (INOUT String &output, Mutex *outputGuard, milliseconds timeout)
+    bool  WindowsProcess::WaitAndClose (INOUT String &output, Mutex* outputGuard, milliseconds timeout)
     {
         if ( _thread == null or _process == null )
             return true;
diff --git a/AE/engine/src/base/Platforms/WindowsProcess.h b/AE/engine/src/base/Platforms/WindowsProcess.h
index d4aec127..49c3c372 100644
--- a/AE/engine/src/base/Platforms/WindowsProcess.h
+++ b/AE/engine/src/base/Platforms/WindowsProcess.h
@@ -26,6 +26,9 @@ namespace AE::Base
             Unknown         = None,
         };
 
+    private:
+        using Mutex = std::mutex;
+
 
     // variables
     private:
@@ -53,16 +56,16 @@ namespace AE::Base
         bool  Terminate (milliseconds timeout = _DefTimeout);
 
         bool  WaitAndClose (milliseconds timeout = _DefTimeout);
-        bool  WaitAndClose (INOUT String &output, Mutex *outputGuard = null, milliseconds timeout = _DefTimeout);
+        bool  WaitAndClose (INOUT String &output, Mutex* outputGuard = null, milliseconds timeout = _DefTimeout);
 
         static bool  Execute (String &commandLine, EFlags flags = EFlags::NoWindow, milliseconds timeout = _DefTimeout);
         static bool  Execute (WString &commandLine, EFlags flags = EFlags::NoWindow, milliseconds timeout = _DefTimeout);
-        static bool  Execute (String &commandLine, INOUT String &output, Mutex *outputGuard = null, milliseconds timeout = _DefTimeout);
-        static bool  Execute (WString &commandLine, INOUT String &output, Mutex *outputGuard = null, milliseconds timeout = _DefTimeout);
+        static bool  Execute (String &commandLine, INOUT String &output, Mutex* outputGuard = null, milliseconds timeout = _DefTimeout);
+        static bool  Execute (WString &commandLine, INOUT String &output, Mutex* outputGuard = null, milliseconds timeout = _DefTimeout);
 
     private:
         template <typename T>
-        bool  _ExecuteAsync (BasicString<T> &commandLine, const Path *currentDir, EFlags flags);
+        bool  _ExecuteAsync (BasicString<T> &commandLine, const Path* currentDir, EFlags flags);
     };
 
     AE_BIT_OPERATORS( WindowsProcess::EFlags );
diff --git a/AE/engine/src/base/Platforms/WindowsUtils.cpp b/AE/engine/src/base/Platforms/WindowsUtils.cpp
index 700e66c9..30282d55 100644
--- a/AE/engine/src/base/Platforms/WindowsUtils.cpp
+++ b/AE/engine/src/base/Platforms/WindowsUtils.cpp
@@ -1,8 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_PLATFORM_WINDOWS
-
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "base/Platforms/WindowsUtils.h"
 # include "base/Platforms/WindowsLibrary.h"
 # include "base/Algorithms/ArrayUtils.h"
@@ -129,19 +128,20 @@ namespace AE::Base
     _CheckError
 =================================================
 */
-    bool  WindowsUtils::_CheckError (uint err, StringView msg, const SourceLoc &loc, ELogLevel level, ELogScope scope) __NE___
+    bool  WindowsUtils::_CheckError (const uint err, StringView msg, const SourceLoc &loc, ELogLevel level, ELogScope scope) __NE___
     {
         if_likely( err == SO_ERROR )
             return true;
 
-        try {
+      #ifdef AE_ENABLE_LOGS
+        TRY{
             char    buf[128] = {};
             DWORD   dw_count = ::FormatMessageA(                        // winxp
                                         FORMAT_MESSAGE_FROM_SYSTEM |
                                         FORMAT_MESSAGE_IGNORE_INSERTS,
                                         null,
                                         err,
-                                        MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ),
+                                        MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ),
                                         LPSTR{buf},
                                         uint(CountOf( buf )),
                                         null );
@@ -156,8 +156,11 @@ namespace AE::Base
 
             AE_PRIVATE_LOGX( level, scope, str, loc.file, loc.line );
         }
-        catch (...)
-        {}
+        CATCH_ALL()
+      #else
+        Unused( msg, loc, level, scope );
+      #endif
+
         return false;
     }
 //-----------------------------------------------------------------------------
@@ -219,7 +222,7 @@ namespace
     #pragma pack(push,8)
     typedef struct tagTHREADNAME_INFO
     {
-        DWORD   dwType;         // Must be 0x1000.  
+        DWORD   dwType;         // Must be 0x1000.
         LPCSTR  szName;         // Pointer to name (in user addr space).
         DWORD   dwThreadID;     // Thread ID (-1=caller thread).
         DWORD   dwFlags;        // Reserved for future use, must be zero.
@@ -290,7 +293,7 @@ namespace
 
         name.reserve( 128 );    // throw
 
-        for (; *w_name; ++w_name) { 
+        for (; *w_name; ++w_name) {
             if ( (*w_name >= 0) & (*w_name < 128) )
                 name.push_back( char(*w_name) );
         }
@@ -431,10 +434,10 @@ namespace
 
 /*
 =================================================
-    WaitIO
+    ThreadWaitIO
 =================================================
 */
-    bool  WindowsUtils::WaitIO (milliseconds relativeTime) __NE___
+    bool  WindowsUtils::ThreadWaitIO (milliseconds relativeTime) __NE___
     {
         return ::SleepEx( CheckCast<uint>( relativeTime.count() ), TRUE ) == WAIT_IO_COMPLETION;    // winxp
     }
@@ -467,44 +470,128 @@ namespace
 
 /*
 =================================================
-    SetTimerResolution
+    ThreadSleep_1us
 ----
-    Set minimum resolution for periodic timers.
+    actual: 500ns
+=================================================
+*/
+    void  WindowsUtils::ThreadSleep_1us () __NE___
+    {
+        for (uint i = 0; i < 5; ++i)
+        {
+            YieldProcessor();   // winvista
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();   // ~100ns
+        }
+    }
 
-    Prior to Windows 10, version 2004, this function affects a global Windows setting.
-    For all processes Windows uses the lowest value (that is, highest resolution) requested by any process.
-    Starting with Windows 10, version 2004, this function no longer affects global timer resolution.
-    For processes which call this function, Windows uses the lowest value (that is, highest resolution) requested by any process.
+/*
+=================================================
+    ThreadNanoSleep
 =================================================
-*
-    bool  WindowsUtils::SetTimerResolution (milliseconds period) __NE___
+*/
+    void  WindowsUtils::ThreadNanoSleep (nanoseconds relativeTime) __NE___
     {
-        auto    err = ::timeBeginPeriod( UINT(period.count()) );
-        return (err == TIMERR_NOERROR);
+        ASSERT( relativeTime >= nanoseconds{16} );
+        ASSERT( relativeTime <= nanoseconds{512*128} );
+
+        const usize     cnt2 = Min( 512u, usize(relativeTime.count()) / 128 );
+        const usize     cnt1 = (usize(relativeTime.count()) % 128 + 16) / 32;
+
+        for (usize i = 0; i < cnt1; ++i)
+        {
+            YieldProcessor();   // winvista     // ~30ns
+        }
+
+        for (usize i = 0; i < cnt2; ++i)
+        {
+            YieldProcessor();   // winvista
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();
+            YieldProcessor();   // ~130 ns
+        }
     }
 
 /*
 =================================================
-    NanoSleep
+    _MicroSleepImpl
+----
+    step from docs: 100ns
+    from tests: 100-1000ns = ~10us, 10-100us = ~0.5ms, >0.5ms = exact +-0.5ms
 =================================================
 */
-    bool  WindowsUtils::NanoSleep (nanoseconds) __NE___
+    void  WindowsUtils::ThreadSleep_500us () __NE___
     {
-        // TODO: https://gist.github.com/Youka/4153f12cf2e17a77314c
-        //  or NtDelayExecution 
-        return false;
+        if_unlikely( not _MicroSleepImpl( nanoseconds{400'000}, true ))
+        {
+            ThreadNanoSleep( nanoseconds{500'000} );
+        }
+    }
+
+    bool  WindowsUtils::_MicroSleepImpl (nanoseconds relativeTime, bool isWin10v1803) __NE___
+    {
+        ASSERT( relativeTime >= nanoseconds{100} );
+
+        // CREATE_WAITABLE_TIMER_HIGH_RESOLUTION requires Windows 10, version 1803
+        auto    timer = ::CreateWaitableTimerExA( null, null, (isWin10v1803 ? CREATE_WAITABLE_TIMER_HIGH_RESOLUTION : 0), TIMER_ALL_ACCESS );   // winvista
+        if_unlikely( timer == null )
+            return false;
+
+        LARGE_INTEGER   li;
+        li.QuadPart = - Max( 1u, (relativeTime.count() + 50) / 100 );   // negative for relative time
+
+        if_unlikely( ::SetWaitableTimerEx( timer, &li, 0, null, null, FALSE, 0 ) == FALSE )  // win7
+        {
+            ::CloseHandle( timer );
+            return false;
+        }
+
+        ::WaitForSingleObject( timer, INFINITE );
+        ::CloseHandle( timer );
+
+        return true;
     }
 
 /*
 =================================================
-    ThreadYield
+    ThreadSleep_15ms
+----
+    depends on 'timeBeginPeriod' so set 15ms, by default it will be ~15.6ms
+=================================================
+*/
+    void  WindowsUtils::ThreadSleep_15ms () __NE___
+    {
+        ::Sleep( 14 );
+    }
+
+/*
+=================================================
+    ThreadMilliSleep
+=================================================
+*/
+    void  WindowsUtils::ThreadMilliSleep (milliseconds relativeTime) __NE___
+    {
+        ASSERT( relativeTime.count() > 0 );
+        ::Sleep( DWORD(relativeTime.count()) );
+    }
+
+/*
+=================================================
+    SwitchToPendingThread
 ----
     Causes the calling thread to yield execution to another thread
     that is ready to run on the current processor.
     The operating system selects the next thread to be executed.
+    If not switched it takes ~150ns.
 =================================================
 */
-    bool  WindowsUtils::ThreadYield () __NE___
+    bool  WindowsUtils::SwitchToPendingThread () __NE___
     {
         return ::SwitchToThread();  // winxp
     }
@@ -520,7 +607,7 @@ namespace
 */
     void  WindowsUtils::ThreadPause () __NE___
     {
-        // same as '_mm_pause()' on x64
+        // same as '_mm_pause()' on x64, '__builtin_ia32_pause()' for x86
         YieldProcessor();   // winvista
     }
 
@@ -571,7 +658,7 @@ namespace
             DWORD   size = sizeof(buf);
             if ( ::RegQueryValueExA( key, "ProductName", null, null, buf, INOUT &size ) == ERROR_SUCCESS )  // win2000
             {
-                CATCH_ERR(
+                NOTHROW_ERR(
                     return String{ Cast<char>(buf) };
                 )
             }
@@ -599,7 +686,7 @@ namespace
             auto*   text = Cast< typename DataType::value_type >( ::GlobalLock( data ));
             if_likely( text != null )
             {
-                CATCH(
+                NOTHROW(
                     outResult   = text;  // throw
                     result      = true;
                 )
@@ -675,10 +762,10 @@ namespace
 }
     bool  WindowsUtils::GetLocales (OUT Array<String> &outLocales) __NE___
     {
-        try{
+        TRY{
             return ::EnumUILanguagesA( &EnumUILanguagesProc, MUI_LANGUAGE_NAME, BitCast<LONG_PTR>( &outLocales )) == TRUE;  // win2000
-        }catch (...)
-        {}
+        }
+        CATCH_ALL( return false; )
     }
 
 /*
diff --git a/AE/engine/src/base/Platforms/WindowsUtils.h b/AE/engine/src/base/Platforms/WindowsUtils.h
index e9adcaed..e9c49da1 100644
--- a/AE/engine/src/base/Platforms/WindowsUtils.h
+++ b/AE/engine/src/base/Platforms/WindowsUtils.h
@@ -52,11 +52,23 @@ namespace AE::Base
 
 
         // Thread //
-            static bool     NanoSleep (nanoseconds relativeTime)                            __NE___;
-            static bool     WaitIO (milliseconds relativeTime)                              __NE___;
+            static void     ThreadPause ()                                                  __NE___;
+            static void     ThreadSleep_1us ()                                              __NE___;
+            static void     ThreadSleep_500us ()                                            __NE___;
+            static void     ThreadSleep_15ms ()                                             __NE___;
+
+            static void     ThreadNanoSleep (nanoseconds relativeTime)                      __NE___;
+            static bool     ThreadMicroSleep (nanoseconds relativeTime)                     __NE___ { return _MicroSleepImpl( relativeTime, true ); }
+            static void     ThreadMilliSleep (milliseconds relativeTime)                    __NE___;
+
+            static bool     ThreadWaitIO (milliseconds relativeTime)                        __NE___;
+        ND_ static bool     SwitchToPendingThread ()                                        __NE___;
 
             static bool     GetTimerResolution (OUT nanoseconds &period)                    __NE___;
-            static bool     SetTimerResolution (milliseconds period)                        __NE___;
+
+        ND_ static constexpr auto  NanoSleepTimeStep ()                                     __NE___ { return nanoseconds{30}; }
+        ND_ static constexpr auto  MicroSleepTimeStep ()                                    __NE___ { return nanoseconds{500'000}; }    // step from docs: 100ns, real step: 500us
+        ND_ static constexpr auto  MilliSleepTimeStep ()                                    __NE___ { return nanoseconds{1'000'000'000 / 64}; } // by default it is 64 context switch per second
 
         ND_ static ThreadHandle  GetCurrentThreadHandle ()                                  __NE___;
 
@@ -71,14 +83,10 @@ namespace AE::Base
 
         ND_ static uint     GetProcessorCoreIndex ()                                        __NE___;    // current logical CPU core
 
-            static bool     ThreadYield ()                                                  __NE___;
-            static void     ThreadPause ()                                                  __NE___;
-
-        ND_ static bool     IsUnderDebugger ()                                              __NE___;
-
 
         // OS //
         ND_ static Version3     GetOSVersion ()                                             __NE___;
+        ND_ static bool         IsUnderDebugger ()                                          __NE___;
 
         #ifdef AE_RELEASE
         ND_ static StringView   GetOSName ()                                                __NE___ { return "Windows"; }
@@ -88,7 +96,7 @@ namespace AE::Base
 
 
         // Locale //
-            static bool  GetLocales (OUT Array<String> &)                                   __NE___;
+            static bool     GetLocales (OUT Array<String> &)                                __NE___;
 
 
         // Clipboard //
@@ -105,6 +113,7 @@ namespace AE::Base
         ND_ static bool  _ClipboardExtract (OUT DataType &result, void* wnd)                        __NE___;
         ND_ static bool  _ClipboardPut (const void* data, Bytes dataSize, uint format, void* wnd)   __NE___;
 
+            static bool  _MicroSleepImpl (nanoseconds relativeTime, bool isWin10v1803)      __NE___;
 
     public:
         ND_ static void*  _GetSystemCpuSetInformationFn ()                                  __NE___;
diff --git a/AE/engine/src/base/Utils/Atomic.h b/AE/engine/src/base/Utils/Atomic.h
index 2f4dfe89..7085de30 100644
--- a/AE/engine/src/base/Utils/Atomic.h
+++ b/AE/engine/src/base/Utils/Atomic.h
@@ -58,9 +58,9 @@ namespace AE::Base
         static constexpr MO_t   OnSuccess   = Success;
         static constexpr MO_t   OnFailure   = Failure;
 
-        STATIC_ASSERT( StdAtomic<IT>::is_always_lock_free );
-        STATIC_ASSERT( IsInteger<IT> or IsEnum<IT> );
-        STATIC_ASSERT( sizeof(PublicType) == sizeof(InternalType) );
+        StaticAssert( StdAtomic<IT>::is_always_lock_free );
+        StaticAssert( IsInteger<IT> or IsEnum<IT> );
+        StaticAssert( sizeof(PublicType) == sizeof(InternalType) );
 
 
     // variables
@@ -178,8 +178,8 @@ namespace AE::Base
         static constexpr MO_t   OnSuccess   = Success;
         static constexpr MO_t   OnFailure   = Failure;
 
-        STATIC_ASSERT( StdAtomic<IT>::is_always_lock_free );
-        STATIC_ASSERT( IsUnion<T> or IsClass<T> );
+        StaticAssert( StdAtomic<IT>::is_always_lock_free );
+        StaticAssert( IsUnion<T> or IsClass<T> );
 
 
     // variables
@@ -292,9 +292,9 @@ namespace AE::Base
         static constexpr MO_t   OnSuccess   = Success;
         static constexpr MO_t   OnFailure   = Failure;
 
-        STATIC_ASSERT( StdAtomic<T>::is_always_lock_free );
-        STATIC_ASSERT( IsFloatPoint<T> );
-        STATIC_ASSERT( sizeof(IT) == sizeof(T) );
+        StaticAssert( StdAtomic<T>::is_always_lock_free );
+        StaticAssert( IsFloatPoint<T> );
+        StaticAssert( sizeof(IT) == sizeof(T) );
 
 
     // variables
@@ -356,11 +356,6 @@ namespace AE::Base
         T   Inc (MO_t memOrder)                             __NE___ { return Add( T{1}, memOrder ); }
         T   Dec (MO_t memOrder)                             __NE___ { return Sub( T{1}, memOrder ); }
 
-    //  Self&  operator += (T arg)                          __NE___ { fetch_add( arg );  return *this; }
-    //  Self&  operator -= (T arg)                          __NE___ { fetch_sub( arg );  return *this; }
-    //  Self&  operator ++ ()                               __NE___ { fetch_add( T{1} ); return *this; }
-    //  Self&  operator -- ()                               __NE___ { fetch_sub( T{1} ); return *this; }
-
         T   fetch_max (T arg)                               __NE___
         {
             T   exp = load();
@@ -401,7 +396,7 @@ namespace AE::Base
         static constexpr MO_t   OnSuccess   = Success;
         static constexpr MO_t   OnFailure   = Failure;
 
-        STATIC_ASSERT( StdAtomic<value_type>::is_always_lock_free );
+        StaticAssert( StdAtomic<value_type>::is_always_lock_free );
 
 
     // variables
@@ -443,8 +438,8 @@ namespace AE::Base
 
         T*  fetch_add (ssize arg, MO_t memOrder)                __NE___ { return _value.fetch_add( arg, memOrder ); }
         T*  fetch_sub (ssize arg, MO_t memOrder)                __NE___ { return _value.fetch_sub( arg, memOrder ); }
-        T*  Add (ssize arg, MO_t memOrder)                      __NE___ { return _value.fetch_add( arg, memOrder ) + Math::BytesSSize{arg}; }
-        T*  Sub (ssize arg, MO_t memOrder)                      __NE___ { return _value.fetch_sub( arg, memOrder ) - Math::BytesSSize{arg}; }
+        T*  Add (ssize arg, MO_t memOrder)                      __NE___ { return _value.fetch_add( arg, memOrder ) + Math::ByteSSize{arg}; }
+        T*  Sub (ssize arg, MO_t memOrder)                      __NE___ { return _value.fetch_sub( arg, memOrder ) - Math::ByteSSize{arg}; }
 
         T*  fetch_max (T* arg)                                  __NE___
         {
@@ -475,18 +470,52 @@ namespace AE::Base
     namespace _hidden_
     {
         template <typename T>
-        struct TBytesAtomic {
-            using type = TAtomic< Math::TBytes<T>, T, EMemoryOrder::Relaxed, EMemoryOrder::Relaxed >;
+        struct TAtomicByte {
+            using type = TAtomic< Math::TByte<T>, T, EMemoryOrder::Relaxed, EMemoryOrder::Relaxed >;
         };
 
         template <typename T>
-        struct TBytesAtomic< Math::TBytes<T> > {
-            using type = TAtomic< Math::TBytes<T>, T, EMemoryOrder::Relaxed, EMemoryOrder::Relaxed >;
+        struct TAtomicByte< Math::TByte<T> > {
+            using type = TAtomic< Math::TByte<T>, T, EMemoryOrder::Relaxed, EMemoryOrder::Relaxed >;
+        };
+    }
+
+    template <typename T>
+    using AtomicByte = typename Base::_hidden_::TAtomicByte<T>::type;
+
+
+    namespace _hidden_
+    {
+        template <typename T>
+        struct _IsAtomic {
+            static constexpr bool   value = false;
+            using type = void;
+        };
+
+        template <typename PublicType, typename InternalType, std::memory_order Success, std::memory_order Failure>
+        struct _IsAtomic< TAtomic< PublicType, InternalType, Success, Failure >> {
+            static constexpr bool   value = true;
+            using type = PublicType;
+        };
+
+        template <typename T, std::memory_order Success, std::memory_order Failure>
+        struct _IsAtomic< TBitAtomic< T, Success, Failure >> {
+            static constexpr bool   value = true;
+            using type = T;
+        };
+
+        template <typename T, std::memory_order Success, std::memory_order Failure>
+        struct _IsAtomic< TAtomicFloat< T, Success, Failure >> {
+            static constexpr bool   value = true;
+            using type = T;
         };
     }
 
     template <typename T>
-    using BytesAtomic = typename Base::_hidden_::TBytesAtomic<T>::type;
+    static constexpr bool  IsAtomic = Base::_hidden_::_IsAtomic< T >::value;
+
+    template <typename T>
+    using AtomicInternalType = typename Base::_hidden_::_IsAtomic< T >::type;
 
 
 } // AE::Base
diff --git a/AE/engine/src/base/Utils/Date.cpp b/AE/engine/src/base/Utils/Date.cpp
index 29a2aad2..d00881b3 100644
--- a/AE/engine/src/base/Utils/Date.cpp
+++ b/AE/engine/src/base/Utils/Date.cpp
@@ -4,23 +4,32 @@
 #include <ctime>
 
 #include "base/Utils/Date.h"
+#include "base/Utils/Threading.h"
 #include "base/Algorithms/Parser.h"
 #include "base/Algorithms/StringUtils.h"
 
+#include "base/Platforms/WindowsHeader.cpp.h"
+
 // 'localtime_s' in C has different signature
 #ifdef AE_COMPILER_MSVC
-#   define localtime2   localtime_s
+#   define localtime2( _outBuf_, _inTime_ )     (localtime_s( _outBuf_, _inTime_ ) == 0)
+#elif 1
+#   define localtime2( _outBuf_, _inTime_ )     (localtime_r( _inTime_, _outBuf_ ) != null)
 #else
 namespace
 {
-    ND_ static int  localtime2 (OUT struct tm* const Tm, time_t const* const Time)
+    ND_ static bool  localtime2 (OUT struct tm* const Tm, time_t const* const Time)
     {
+        // from specs:
+        //  This function may not be thread-safe.
+        //  The structure may be shared between std::gmtime, std::localtime, and std::ctime, and may be overwritten on each invocation.
+
         if ( const tm* res = std::localtime( Time ))
         {
             *Tm = *res;
-            return 0;
+            return true;
         }
-        return -1;
+        return false;
     }
 }
 #endif
@@ -90,7 +99,7 @@ namespace AE::Base
     _SetMilliseconds
 =================================================
 */
-    Date&  Date::_SetMilliseconds (uint startYear, ulong ms)
+    Date&  Date::_SetMilliseconds (const uint startYear, const ulong ms)
     {
         _millis     = uint(ms % MillisInSecond());
         _second     = (ms / MillisInSecond()) % 60;
@@ -123,30 +132,29 @@ namespace AE::Base
 /*
 =================================================
     ToString
+----
+    yy      - year short
+    yyyy    - year full
+    mm      - month
+    mmm     - month short name
+    mmmm... - month name
+    we      - week of year
+    dm      - day of month
+    de      - day of year
+    dee     - day of year aligned
+    dw      - day of week
+    dww     - day of week short name
+    dwww... - day of week full name
+    hh      - hour
+    mi      - minute
+    ss      - second
+    ms      - millisecond
 =================================================
 */
     String  Date::ToString (StringView fmt) C_NE___
     {
-        // yy - year short
-        // yyyy - year full
-        // mm - month
-        // mmm - month short name
-        // mmmm... - month name
-        // we - week of year
-        // dm - day of month
-        // de - day of year
-        // dee - day of year aligned
-        // dw - day of week
-        // dww - day of week short name
-        // dwww... - day of week full name
-        // hh - hour
-        // mi - minute
-        // ss - second
-        // ms - millisecond
-
-        String  str;
-
-        try{
+        TRY{
+            String              str;
             Array< StringView > tokens;
             Parser::DivideString_Words( fmt, OUT tokens );
 
@@ -159,7 +167,7 @@ namespace AE::Base
                     str << FormatAlignedI<10>( Year(), 4, '0' );
                 else
                 if ( t == "mm" )
-                    str << (_month+1 ? "0"s : ""s) << Base::ToString( _month+1 );
+                    str << (_month < 10 ? "0"s : ""s) << Base::ToString( _month+1 );
                 else
                 if ( t == "mmm" )
                     str << MonthName().substr( 0, 3 );
@@ -200,13 +208,14 @@ namespace AE::Base
                 if ( t == "ms" )
                     str << FormatAlignedI<10>( Milliseconds(), 3, '0' );
                 else
-                    // TODO: it may be unsuported token, need some way to detect it
+                    // TODO: it may be unsupported token, need some way to detect it
                     str << t;
             }
+            return str;
         }
-        catch (...){}
-
-        return str;
+        CATCH_ALL(
+            return Default;
+        )
     }
 
 /*
@@ -216,12 +225,12 @@ namespace AE::Base
 */
     bool  Date::operator == (const Date &other) C_NE___
     {
-        return  Year()          == other.Year()         and
-                DayOfYear()     == other.DayOfYear()    and
-                Hour()          == other.Hour()         and
-                Minute()        == other.Minute()       and
-                Second()        == other.Second()       and
-                Milliseconds()  == other.Milliseconds();
+        return  (Year()         == other.Year())        &
+                (DayOfYear()    == other.DayOfYear())   &
+                (Hour()         == other.Hour())        &
+                (Minute()       == other.Minute())      &
+                (Second()       == other.Second())      &
+                (Milliseconds() == other.Milliseconds());
     }
 
 /*
@@ -261,7 +270,7 @@ namespace AE::Base
 */
     bool  Date::_IsLeapYear (uint year)
     {
-        return ((year & 0x3) == 0 and year % 100 != 0);
+        return ((year % 4 == 0) and (year % 100 != 0)) or (year % 400 == 0);
     }
 
 /*
@@ -307,21 +316,9 @@ namespace AE::Base
 */
     uint  Date::_CalcDayOfWeek (uint year, uint month, uint dayOfMonth)
     {
-        int m = month;
-        int y = year;
-
-        if ( m <= 0 )
-        {
-            m += 12;
-            y--;
-        }
-
-        int n = (dayOfMonth + (13 * m - 1) / 5 + (y % 100) + (y / 100) / 4 + (y % 100) / 4 - 2 * (y / 100)) % 7;
-
-        if ( n < 0 )
-            n += 7;
-
-        return n == 0 ? 6 : n-1;
+        const ubyte t[] = { 0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4 };
+        year -= month < 2;
+        return (year + year/4 - year/100 + year/400 + t[month] + dayOfMonth) % 7;
     }
 
 /*
@@ -333,10 +330,10 @@ namespace AE::Base
     {
         uint days_in_month = _DaysInMonth( year, 0 );
 
-        for (month = 0; dayOfYear >= days_in_month; ++month)
+        for (month = 0; dayOfYear >= days_in_month;)
         {
             dayOfYear       -= days_in_month;
-            days_in_month    = _DaysInMonth( year, month );
+            days_in_month    = _DaysInMonth( year, ++month );
         }
 
         dayOfMonth = dayOfYear;
@@ -376,13 +373,13 @@ namespace AE::Base
         #if 1
         {
             std::time_t t   = std::time(0);
-            std::tm     now;
-            Unused( localtime2( OUT &now, &t ));    // TODO: check error?
+            std::tm     now = {};
+            Unused( localtime2( OUT &now, &t ));
 
             res._year       = now.tm_year + 1900;
             res._month      = now.tm_mon;
             res._dayOfMonth = now.tm_mday - 1;
-            res._dayOfWeek  = now.tm_wday;
+            res._dayOfWeek  = now.tm_wday == 0 ? 6 : now.tm_wday-1;
             res._dayOfYear  = now.tm_yday;
             res._hour       = now.tm_hour;
             res._minute     = now.tm_min;
@@ -409,10 +406,64 @@ namespace AE::Base
         }
         #endif
 
-        //ASSERT( res._dayOfWeek == _CalcDayOfWeek( res._year, res._month, res._dayOfMonth ));
+        ASSERT_Eq( res._dayOfWeek, _CalcDayOfWeek( res._year, res._month, res._dayOfMonth ));
         ASSERT_Eq( res._dayOfYear, _CalcDayOfYear( res._year, res._month, res._dayOfMonth ));
 
+        DEBUG_ONLY({
+            uint    m, dm;
+            _CalcMonthAndDayOfMonth( res._year, res._dayOfYear, OUT m, OUT dm );
+            CHECK( m == res._month );
+            CHECK( dm == res._dayOfMonth );
+        })
         return res;
     }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    Calc*
+=================================================
+*/
+    Date::Builder&  Date::Builder::CalcDayOfYear () __NE___
+    {
+        return DayOfYear( Date::_CalcDayOfYear( _date._year, _date._month, _date._dayOfMonth ));
+    }
+
+    Date::Builder&  Date::Builder::CalcDayOfWeek () __NE___
+    {
+        return DayOfWeek( Date::_CalcDayOfWeek( _date._year, _date._month, _date._dayOfMonth ));
+    }
+
+    Date::Builder&  Date::Builder::CalcMonthAndDayOfMonth () __NE___
+    {
+        uint    m, dm;
+        Date::_CalcMonthAndDayOfMonth( _date._year, _date._dayOfYear, OUT m, OUT dm );
+
+        _date._month        = m;
+        _date._dayOfMonth   = dm;
+        return *this;
+    }
+
+/*
+=================================================
+    AddDayOfYear
+=================================================
+*
+    Date::Builder&  Date::Builder::AddDayOfYear (uint value) __NE___
+    {
+        return *this;
+    }
+
+/*
+=================================================
+    SubDayOfYear
+=================================================
+*
+    Date::Builder&  Date::Builder::SubDayOfYear (uint value) __NE___
+    {
+    }
+*/
 
 } // AE::Base
diff --git a/AE/engine/src/base/Utils/Date.h b/AE/engine/src/base/Utils/Date.h
index 5ef91aa6..e6968221 100644
--- a/AE/engine/src/base/Utils/Date.h
+++ b/AE/engine/src/base/Utils/Date.h
@@ -44,6 +44,8 @@ namespace AE::Base
             _Count
         };
 
+        struct Builder;
+
 
     // variables
     private:
@@ -95,9 +97,6 @@ namespace AE::Base
         ND_ ulong   ToMillisecondsSinceEpoch ()         C_NE___ { return _ToMilliseconds( 0 ); }
             Date&   SetMillisecondsSinceEpoch (ulong ms)__NE___ { return _SetMilliseconds( 0, ms ); }
 
-            Date&   SetYear (uint value)                __NE___ { _year = value; return *this; }
-            Date&   SetMonth (uint value)               __NE___ { _month = value; return *this; }
-
 
         ND_ String  ToString (StringView fmt)           C_NE___;
 
@@ -122,4 +121,48 @@ namespace AE::Base
     };
 
 
+
+    //
+    // Date Builder
+    //
+
+    struct Date::Builder
+    {
+    // variables
+    private:
+        Date    _date;
+
+
+    // methods
+    public:
+        Builder ()                              __NE___ {}
+        explicit Builder (const Date &value)    __NE___ : _date{value} {}
+
+        Builder&  Year (uint value)             __NE___ { ASSERT( value < 65536 );                  _date._year         = value;        return *this; }
+        Builder&  Month (uint value)            __NE___ { ASSERT( value < 12 );                     _date._month        = value;        return *this; }
+        Builder&  Month (EMonth value)          __NE___ {                                           _date._month        = uint(value);  return *this; }
+        Builder&  DayOfMonth (uint value)       __NE___ { ASSERT( value < _date.DaysInMonth() );    _date._dayOfMonth   = value;        return *this; }
+        Builder&  DayOfYear (uint value)        __NE___ { ASSERT( value < _date.DaysInYear() );     _date._dayOfYear    = value;        return *this; }
+        Builder&  DayOfWeek (uint value)        __NE___ { ASSERT( value < 7 );                      _date._dayOfWeek    = value;        return *this; }
+        Builder&  DayOfWeek (EWeekDay value)    __NE___ {                                           _date._dayOfWeek    = uint(value);  return *this; }
+        Builder&  Hour (uint value)             __NE___ { ASSERT( value < 24 );                     _date._hour         = value;        return *this; }
+        Builder&  Minute (uint value)           __NE___ { ASSERT( value < 60 );                     _date._minute       = value;        return *this; }
+        Builder&  Second (uint value)           __NE___ { ASSERT( value < 60 );                     _date._second       = value;        return *this; }
+        Builder&  Milliseconds (uint value)     __NE___ { ASSERT( value < 1000 );                   _date._millis       = value;        return *this; }
+
+        Builder&  AddDayOfYear (uint value)     __NE___;
+        Builder&  SubDayOfYear (uint value)     __NE___;
+
+        Builder&  CalcDayOfYear ()              __NE___;    // requires: year, month, dayOfMonth
+        Builder&  CalcDayOfWeek ()              __NE___;    // requires: year, month, dayOfMonth
+        Builder&  CalcMonthAndDayOfMonth ()     __NE___;    // requires: year, dayOfYear
+
+        ND_ Date        Get ()                  C_NE___ { return _date; }
+        ND_ Date const* operator -> ()          C_NE___ { return &_date; }
+
+    private:
+        void  _ValidateYear ()                  __NE___;
+    };
+
+
 } // AE::Base
diff --git a/AE/engine/src/base/Utils/EnumBitSet.h b/AE/engine/src/base/Utils/EnumBitSet.h
index 3b4bac4e..f9087e4c 100644
--- a/AE/engine/src/base/Utils/EnumBitSet.h
+++ b/AE/engine/src/base/Utils/EnumBitSet.h
@@ -28,10 +28,10 @@ namespace AE::Base
         using BitArr_t  = StaticArray< Elem_t, _ArraySize >;
         using Index_t   = ByteSizeToUInt< Max( sizeof(E), sizeof(usize) )>;
 
-        STATIC_ASSERT( sizeof(E) <= sizeof(Index_t) );
-        STATIC_ASSERT( _BitCount <= _ElemSize * _ArraySize );
-        STATIC_ASSERT( _BitCount > 0 );
-        STATIC_ASSERT( _BitCount <= CT_SizeOfInBits<BitArr_t> );
+        StaticAssert( sizeof(E) <= sizeof(Index_t) );
+        StaticAssert( _BitCount <= _ElemSize * _ArraySize );
+        StaticAssert( _BitCount > 0 );
+        StaticAssert( _BitCount <= CT_SizeOfInBits<BitArr_t> );
 
 
         struct ConstIterator
@@ -281,7 +281,7 @@ namespace AE::Base
         Self    res;
         for (uint i = 0; i < _ArraySize - 1; ++i)
         {
-            res._bits[i] = ~_bits[i]; 
+            res._bits[i] = ~_bits[i];
         }
         res._bits.back() = (~_bits.back()) & _LastElemMask;
         return res;
@@ -564,6 +564,12 @@ namespace AE::Base
 
         return h;
     }
+//-----------------------------------------------------------------------------
+
+    template <typename E> struct TMemCopyAvailable< EnumBitSet<E> >     { static constexpr bool  value = true; };
+    template <typename E> struct TZeroMemAvailable< EnumBitSet<E> >     { static constexpr bool  value = true; };
+    template <typename E> struct TTriviallySerializable< EnumBitSet<E> >{ static constexpr bool  value = true; };
+    template <typename E> struct TTriviallyDestructible< EnumBitSet<E> >{ static constexpr bool  value = true; };
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Utils/FileSystem.cpp b/AE/engine/src/base/Utils/FileSystem.cpp
index 75edc4f5..835c7983 100644
--- a/AE/engine/src/base/Utils/FileSystem.cpp
+++ b/AE/engine/src/base/Utils/FileSystem.cpp
@@ -1,8 +1,8 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
+#include "base/Platforms/WindowsHeader.cpp.h"
 #include "base/Utils/FileSystem.h"
 #include "base/Algorithms/ArrayUtils.h"
-#include "base/Platforms/WindowsHeader.h"
 
 namespace AE::Base
 {
diff --git a/AE/engine/src/base/Utils/FileSystem.h b/AE/engine/src/base/Utils/FileSystem.h
index 9353b009..afbaafe0 100644
--- a/AE/engine/src/base/Utils/FileSystem.h
+++ b/AE/engine/src/base/Utils/FileSystem.h
@@ -133,7 +133,7 @@ namespace AE::Base
         static bool  Search (const Path &ref, uint backwardDepth, uint forwardDepth, OUT Path &result)                      __Th___;
         static bool  Search (const Path &base, const Path &ref, uint backwardDepth, uint forwardDepth, OUT Path &result)    __Th___;
 
-        // 
+        //
         static void  FindUnusedFilename (const Function< void (OUT Path &, usize idx) > &   buildName,
                                          const Function< bool (const Path &) > &            consume)                        __Th___;
 
@@ -179,7 +179,7 @@ namespace AE::Base
         ND_ DirectoryEntry const&   operator *  ()          C_NE___;
         ND_ DirectoryEntry const*   operator -> ()          C_NE___;
 
-            DirectoryIter &         operator ++ ()          __NE___ { std::error_code ec;  _it.increment( OUT ec );  return *this; }    // throw 'std::bad_alloc'
+            DirectoryIter &         operator ++ ()          __Th___ { std::error_code ec;  _it.increment( OUT ec );  return *this; }    // throw 'std::bad_alloc'
 
         ND_ bool  operator == (const DirectoryIter &rhs)    C_NE___ { return _it == rhs._it; }
     };
@@ -208,7 +208,7 @@ namespace AE::Base
         ND_ DirectoryEntry const&   operator *  ()                          C_NE___;
         ND_ DirectoryEntry const*   operator -> ()                          C_NE___;
 
-            RecursiveDirectoryIter& operator ++ ()                          __NE___ { std::error_code ec;  _it.increment( OUT ec );  return *this; }    // throw 'std::bad_alloc'
+            RecursiveDirectoryIter& operator ++ ()                          __Th___ { std::error_code ec;  _it.increment( OUT ec );  return *this; }    // throw 'std::bad_alloc'
 
         ND_ bool  operator == (const RecursiveDirectoryIter &rhs)           C_NE___ { return _it == rhs._it; }
     };
diff --git a/AE/engine/src/base/Utils/FrameUID.h b/AE/engine/src/base/Utils/FrameUID.h
index e55d4e3d..82fe5575 100644
--- a/AE/engine/src/base/Utils/FrameUID.h
+++ b/AE/engine/src/base/Utils/FrameUID.h
@@ -35,20 +35,20 @@ namespace AE::Base
         static constexpr uint   _MaxFrameBits   = _FrameBits + 1;
         static constexpr uint   _CounterBits    = CT_SizeOfInBits<Value_t> - _FrameBits - _MaxFrameBits;
 
-        STATIC_ASSERT( ToBit<uint>( _FrameBits ) == _MaxFrames );
-        STATIC_ASSERT( ToBitMask<uint>( _MaxFrameBits ) >= _MaxFrames );
+        StaticAssert( ToBit<uint>( _FrameBits ) == _MaxFrames );
+        StaticAssert( ToBitMask<uint>( _MaxFrameBits ) >= _MaxFrames );
 
         enum class _EFrameUID : Value_t {};
 
         struct _Bits
         {
-            Value_t     counter     : _CounterBits;     // unique frame index,                                          
+            Value_t     counter     : _CounterBits;     // unique frame index,
             Value_t     index       : _FrameBits;       // non-unique frame index in range [0 .. GraphicsCreateInfo::MaxFrames)
             Value_t     maxFrames   : _MaxFrameBits;    // value in range [0 .. GraphicsCreateInfo::MaxFrames]
         };
 
-        STATIC_ASSERT( sizeof(_Bits) == sizeof(Value_t) );
-        STATIC_ASSERT( _CounterBits >= 28 );
+        StaticAssert( sizeof(_Bits) == sizeof(Value_t) );
+        StaticAssert( _CounterBits >= 28 );
 
 
     // variables
@@ -82,7 +82,7 @@ namespace AE::Base
         ND_ bool  operator >=  (const FrameUID &rhs)            C_NE___ { return not (*this < rhs); }
 
 
-        ND_ _EFrameUID  Unique ()                               C_NE___ { return _EFrameUID(_bits.counter); }   // use 'ulong(f.Unique())' or other cast
+        ND_ Value_t     Unique ()                               C_NE___ { return _bits.counter; }
         ND_ uint        Index ()                                C_NE___ { return uint(_bits.index); }
         ND_ uint        PrevIndex ()                            C_NE___ { return uint((_bits.index - 1) % _bits.maxFrames); }
         ND_ uint        NextIndex ()                            C_NE___ { return uint((_bits.index + 1) % _bits.maxFrames); }
@@ -90,7 +90,7 @@ namespace AE::Base
         ND_ bool        IsValid ()                              C_NE___ { return _bits.maxFrames > 0; }
 
         ND_ FrameUID    Next ()                                 C_NE___ { return FrameUID{*this}.Inc(); }
-        ND_ FrameUID    NextCycle ()                            C_NE___ { return FrameUID{ _bits.counter + _bits.maxFrames, 0, MaxFrames() }; }
+        ND_ FrameUID    NextCycle ()                            C_NE___ { return FrameUID{ _bits.counter + _bits.maxFrames, _bits.index, MaxFrames() }; }
         ND_ SValue_t    Diff (FrameUID rhs)                     C_NE___ { return SValue_t(_bits.counter) - SValue_t(rhs._bits.counter); }
 
         template <typename T> ND_ T  Remap (T maxValue)         C_NE___ { return T(_bits.counter % maxValue); }
@@ -113,6 +113,7 @@ namespace AE::Base
             if_likely( _bits.counter >= delta )
             {
                 FrameUID    id{ _bits.counter - delta, 0, MaxFrames() };
+                id._bits.index = id._bits.counter % MaxFrames();
                 ASSERT( id.Unique() < Unique() );
                 return {id};
             }
@@ -132,6 +133,12 @@ namespace AE::Base
             return FrameUID{ 0, idx, maxFrames };
         }
 
+        ND_ static FrameUID  FromUnique (Value_t uid, uint maxFrames) __NE___
+        {
+            ASSERT( maxFrames <= _MaxFrames );
+            return FrameUID{ uid, uid % maxFrames, maxFrames };
+        }
+
         ND_ static FrameUID  Init (uint maxFrames)              __NE___
         {
             CHECK( maxFrames > 0 );
@@ -171,12 +178,12 @@ namespace AE::Base
 
         void  store (FrameUID value)                            __NE___
         {
-        #ifdef AE_DEBUG
+          #ifdef AE_DEBUG
             FrameUID    old = BitCast<FrameUID>( _value.exchange( BitCast<Value_t>( value )));
             ASSERT( value == Default or old.Unique() <= value.Unique() );
-        #else
+          #else
             _value.store( BitCast<Value_t>( value ));
-        #endif
+          #endif
         }
 
         // increase counter and return new value
diff --git a/AE/engine/src/base/Utils/HandleTmpl.h b/AE/engine/src/base/Utils/HandleTmpl.h
index 23ccea18..545701b4 100644
--- a/AE/engine/src/base/Utils/HandleTmpl.h
+++ b/AE/engine/src/base/Utils/HandleTmpl.h
@@ -212,6 +212,13 @@ namespace AE::Base
     };
 
 
+
+    template <usize IndexSize, usize GenerationSize, uint UID>
+    struct TTriviallySerializable< HandleTmpl<IndexSize, GenerationSize, UID> >
+    {
+        static constexpr bool   value = true;
+    };
+
 /*
 =================================================
     GetHash
diff --git a/AE/engine/src/base/Utils/Helpers.h b/AE/engine/src/base/Utils/Helpers.h
index 351f2995..cee76c3f 100644
--- a/AE/engine/src/base/Utils/Helpers.h
+++ b/AE/engine/src/base/Utils/Helpers.h
@@ -16,24 +16,25 @@ namespace AE::Base
         Function<void ()>   _fn;
 
     public:
-        explicit OnDestroy (Function<void ()> &&fn)     __NE___ : _fn{ RVRef(fn) } {}
-        ~OnDestroy ()                                   __NE___ { _fn(); }
+        explicit OnDestroy (Function<void ()> &&fn)         __NE___ : _fn{ RVRef(fn) } {}
+        ~OnDestroy ()                                       __NE___ { _fn(); }
     };
 
 
+
     //
     // Non-copyable
     //
     class Noncopyable
     {
     public:
-        Noncopyable ()                                  __NE___ = default;
+        Noncopyable ()                                      __NE___ = default;
 
-        Noncopyable (const Noncopyable &)                       = delete;
-        Noncopyable (Noncopyable &&)                            = delete;
+        Noncopyable (const Noncopyable &)                           = delete;
+        Noncopyable (Noncopyable &&)                                = delete;
 
-        Noncopyable& operator = (const Noncopyable &)           = delete;
-        Noncopyable& operator = (Noncopyable &&)                = delete;
+        Noncopyable& operator = (const Noncopyable &)               = delete;
+        Noncopyable& operator = (Noncopyable &&)                    = delete;
     };
 
 
@@ -44,13 +45,13 @@ namespace AE::Base
     class MovableOnly
     {
     public:
-        MovableOnly ()                                  __NE___ = default;
+        MovableOnly ()                                      __NE___ = default;
 
-        MovableOnly (MovableOnly &&)                    __NE___ = default;
-        MovableOnly& operator = (MovableOnly &&)        __NE___ = default;
+        MovableOnly (MovableOnly &&)                        __NE___ = default;
+        MovableOnly& operator = (MovableOnly &&)            __NE___ = default;
 
-        MovableOnly (const MovableOnly &)                       = delete;
-        MovableOnly& operator = (const MovableOnly &)           = delete;
+        MovableOnly (const MovableOnly &)                           = delete;
+        MovableOnly& operator = (const MovableOnly &)               = delete;
     };
 
 
@@ -61,17 +62,14 @@ namespace AE::Base
     class Noninstanceable
     {
     protected:
-        Noninstanceable ()                                      = delete;
-
-        //~Noninstanceable () = delete;
-
-        Noninstanceable (const Noninstanceable &)               = delete;
-
-        Noninstanceable (Noninstanceable &&)                    = delete;
+        Noninstanceable ()                                          = delete;
+        //~Noninstanceable ()                                       = delete;
 
-        Noninstanceable& operator = (const Noninstanceable &)   = delete;
+        Noninstanceable (const Noninstanceable &)                   = delete;
+        Noninstanceable (Noninstanceable &&)                        = delete;
 
-        Noninstanceable& operator = (Noninstanceable &&)        = delete;
+        Noninstanceable& operator = (const Noninstanceable &)       = delete;
+        Noninstanceable& operator = (Noninstanceable &&)            = delete;
     };
 
 
@@ -81,16 +79,38 @@ namespace AE::Base
     //
     class NonAllocatable
     {
+    private:
+        ND_ static void*  operator new   (usize)                                __NE___ { return null; }
+        ND_ static void*  operator new[] (usize)                                __NE___ { return null; }
+        ND_ static void*  operator new   (usize, std::align_val_t)              __NE___ { return null; }
+        ND_ static void*  operator new[] (usize, std::align_val_t)              __NE___ { return null; }
+
     public:
-        ND_ static void*    operator new   (usize)              __NE___ { return null; }
-        ND_ static void*    operator new[] (usize)              __NE___ { return null; }
+            static void   operator delete   (void*)                             __NE___ {}
+            static void   operator delete[] (void*)                             __NE___ {}
+            static void   operator delete   (void*, std::align_val_t)           __NE___ {}
+            static void   operator delete[] (void*, std::align_val_t)           __NE___ {}
+            static void   operator delete   (void*, usize)                      __NE___ {}
+            static void   operator delete[] (void*, usize)                      __NE___ {}
+            static void   operator delete   (void*, usize, std::align_val_t)    __NE___ {}
+            static void   operator delete[] (void*, usize, std::align_val_t)    __NE___ {}
+    };
 
-            static void     operator delete   (void*, usize)    __NE___ {}
-            static void     operator delete[] (void*, usize)    __NE___ {}
+
+
+    //
+    // Nothrow Allocatable
+    //
+    class NothrowAllocatable
+    {
+    public:
+        ND_ static void*  operator new   (usize size)                           __NE___ { return ::operator new( size, std::nothrow ); }
+        ND_ static void*  operator new[] (usize size)                           __NE___ { return ::operator new( size, std::nothrow ); }
+        ND_ static void*  operator new   (usize size, std::align_val_t align)   __NE___ { return ::operator new( size, align, std::nothrow ); }
+        ND_ static void*  operator new[] (usize size, std::align_val_t align)   __NE___ { return ::operator new( size, align, std::nothrow ); }
 
             // placement new
-        ND_ static void*    operator new (usize, void* where)   __NE___ { return where; }
-            static void     operator delete (void*, void*)      __NE___ {}
+        ND_ static void*  operator new (usize, void* where)                     __NE___ { return where; }
     };
 
 
@@ -102,8 +122,8 @@ namespace AE::Base
     class ScopedSet : public Noncopyable
     {
     private:
-        T &         _ref;
-        T           _finalValue;
+        T &     _ref;
+        T       _finalValue;
 
     public:
         ScopedSet (T& ref, T initial, T final)                  __NE___ :
@@ -134,7 +154,7 @@ namespace AE::Base
 
     public:
         template <typename B>
-        explicit AsPointer (B && val)                           __NE___ : _value{ FwdArg<B>(val) } {}
+        explicit AsPointer (B &&val)                            __NE___ : _value{ FwdArg<B>(val) } {}
 
         AsPointer ()                                                    = delete;
         AsPointer (AsPointer<T> &&)                             __NE___ = default;
@@ -207,4 +227,5 @@ namespace AE::Base
     struct AllCombinations : AllCombinationsInRange< decltype(AllBits){0}, AllBits >
     {};
 
+
 } // AE::Base
diff --git a/AE/engine/src/base/Utils/NamedID.h b/AE/engine/src/base/Utils/NamedID.h
index 28ce56e7..be51d6a6 100644
--- a/AE/engine/src/base/Utils/NamedID.h
+++ b/AE/engine/src/base/Utils/NamedID.h
@@ -42,7 +42,7 @@ namespace AE::Base
         constexpr NamedID ()                                __NE___ : _hash{_emptyHash}                                     {}
         explicit constexpr NamedID (HashVal32 hash)         __NE___ : _hash{hash}                                           {}
         explicit constexpr NamedID (StringView name)        __NE___ : _hash{CT_Hash( name.data(), name.length(), Seed )}    {}
-        explicit constexpr NamedID (const char *name)       __NE___ : _hash{CT_Hash( name, UMax, Seed )}                    {}
+        explicit constexpr NamedID (const char* name)       __NE___ : _hash{CT_Hash( name, UMax, Seed )}                    {}
 
         constexpr NamedID (Self &&)                         __NE___ = default;
         constexpr NamedID (const Self &)                    __NE___ = default;
@@ -105,7 +105,7 @@ namespace AE::Base
         constexpr NamedID ()                                    __NE___ : _hash{_emptyHash}                                                     {}
         explicit constexpr NamedID (HashVal32 hash)             __NE___ :  _hash{hash}                                                          {}
         explicit constexpr NamedID (StringView name)            __NE___ : _hash{ CT_Hash( name.data(), name.length(), Seed )}, _name{name}      {}
-        explicit constexpr NamedID (const char *name)           __NE___ : _hash{ CT_Hash( name, UMax, Seed )}, _name{name}                      {}
+        explicit constexpr NamedID (const char* name)           __NE___ : _hash{ CT_Hash( name, UMax, Seed )}, _name{name}                      {}
 
         template <usize StrSize>
         explicit constexpr NamedID (const FixedString<StrSize> &name) __NE___ : _hash{CT_Hash( name.data(), name.length(), Seed )}, _name{name} {}
@@ -153,10 +153,12 @@ namespace AE::Base
     template <usize Size, uint UID, uint Seed>  struct TMemCopyAvailable<       NamedID< Size, UID, true, Seed >>   { static constexpr bool  value = true;  };
     template <usize Size, uint UID, uint Seed>  struct TZeroMemAvailable<       NamedID< Size, UID, true, Seed >>   { static constexpr bool  value = false; };
     template <usize Size, uint UID, uint Seed>  struct TTriviallySerializable<  NamedID< Size, UID, true, Seed >>   { static constexpr bool  value = true;  };
+    template <usize Size, uint UID, uint Seed>  struct TTriviallyDestructible<  NamedID< Size, UID, true, Seed >>   { static constexpr bool  value = true;  };
 
     template <usize Size, uint UID, uint Seed>  struct TMemCopyAvailable<       NamedID< Size, UID, false, Seed >>  { static constexpr bool  value = true;  };
     template <usize Size, uint UID, uint Seed>  struct TZeroMemAvailable<       NamedID< Size, UID, false, Seed >>  { static constexpr bool  value = false; };
     template <usize Size, uint UID, uint Seed>  struct TTriviallySerializable<  NamedID< Size, UID, false, Seed >>  { static constexpr bool  value = false; };
+    template <usize Size, uint UID, uint Seed>  struct TTriviallyDestructible<  NamedID< Size, UID, false, Seed >>  { static constexpr bool  value = true;  };
 
 } // AE::Base
 
diff --git a/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.cpp b/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.cpp
index ee5ee2fa..9df33b30 100644
--- a/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.cpp
+++ b/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.cpp
@@ -23,7 +23,7 @@ namespace AE::Base
 */
     void  NamedID_HashCollisionCheck::CheckAndClear () __NE___
     {
-        try {
+        TRY{
             for (auto& id : _uidMap)
             {
                 if_unlikely( id.second.hasCollisions )
@@ -33,8 +33,7 @@ namespace AE::Base
                 }
             }
         }
-        catch (...)
-        {}
+        CATCH_ALL()
 
         _uidMap.clear();
     }
diff --git a/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.h b/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.h
index 22f35da8..626c995e 100644
--- a/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.h
+++ b/AE/engine/src/base/Utils/NamedID_HashCollisionCheck.h
@@ -77,7 +77,7 @@ namespace AE::Base
     template <usize Size, uint UID, bool Optimize, uint Seed>
     void  NamedID_HashCollisionCheck::Add (const NamedID<Size, UID, Optimize, Seed> &id, StringView name) __Th___
     {
-        STATIC_ASSERT( Size <= StString_t::capacity() );
+        StaticAssert( Size <= StString_t::capacity() );
 
         auto&       info     = _uidMap.emplace( UID, Info{Seed} ).first->second;    // throw
         const usize key      = usize(id.GetHash());
diff --git a/AE/engine/src/base/Utils/PackedPtr.h b/AE/engine/src/base/Utils/PackedPtr.h
new file mode 100644
index 00000000..40266d63
--- /dev/null
+++ b/AE/engine/src/base/Utils/PackedPtr.h
@@ -0,0 +1,107 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    ref: https://stackoverflow.com/questions/16198700/using-the-extra-16-bits-in-64-bit-pointers
+
+    With 64 byte align:
+    - x64 uses only 48 bits (47 for user space).
+    - minus 6 bits for 64 byte alignment.
+    - 41..42 bits for pointer, 22..23 bits for extra data which is 4M.
+*/
+
+#pragma once
+
+#include "base/Common.h"
+#include "base/CompileTime/Math.h"
+#include "base/Math/BitMath.h"
+#include "base/Math/Math.h"
+#include "base/Math/POTValue.h"
+
+namespace AE::Base
+{
+
+    //
+    // Packed Pointer
+    //
+
+    template <typename T,
+              usize Align_v>
+    class PackedPtr
+    {
+        StaticAssert( IsPowerOfTwo( Align_v ));
+
+    // types
+    public:
+        using Value_t   = T;
+        using Self      = PackedPtr< T, Align_v >;
+
+    private:
+        static constexpr uint   _MaxPtrBits = sizeof(void*) >= 8 ? 48 : 32;     // can be 47 bits
+        static constexpr uint   _AlignPOT   = uint(CT_IntLog2< Align_v >);
+        static constexpr uint   _PtrBits    = _MaxPtrBits - _AlignPOT;
+        static constexpr usize  _PtrMask    = (usize{1} << _PtrBits) - 1;
+        static constexpr uint   _ExtraBits  = CT_SizeOfInBits<usize> - _PtrBits;
+        static constexpr usize  _ExtraMax   = (usize{1} << _ExtraBits) - 1;     // mask without offset
+
+
+    // variables
+    private:
+        usize   _value  = 0;
+
+
+    // methods
+    public:
+        PackedPtr ()                                    __NE___ {}
+        PackedPtr (const Self &)                        __NE___ = default;
+        PackedPtr (Self &&)                             __NE___ = default;
+
+            Self&  operator = (const Self &)            __NE___ = default;
+            Self&  operator = (Self &&)                 __NE___ = default;
+
+        ND_ T*          Ptr ()                          __NE___ { return BitCast<T*>( (_value & _PtrMask) << _AlignPOT ); }
+        ND_ T const*    Ptr ()                          C_NE___ { return BitCast<T const*>( (_value & _PtrMask) << _AlignPOT ); }
+
+            void        Ptr (T* value)                  __NE___;
+
+        ND_ usize       Extra ()                        C_NE___ { return _value >> _PtrBits; }
+            void        Extra (usize value)             __NE___;
+
+        ND_ static constexpr usize      ExtraBits ()    __NE___ { return _ExtraBits; }
+        ND_ static constexpr usize      ExtraMax ()     __NE___ { return _ExtraMax; }
+        ND_ static constexpr POTBytes   Align ()        __NE___ { return POTBytes{ PowerOfTwo{ _AlignPOT }}; }
+    };
+
+
+/*
+=================================================
+    Ptr
+=================================================
+*/
+    template <typename T, usize A>
+    void  PackedPtr<T,A>::Ptr (T* value) __NE___
+    {
+        usize   v = usize(value);
+        ASSERT( IsMultipleOf( v, A ));
+
+        v >>= _AlignPOT;
+        ASSERT( v <= _PtrMask );
+
+        _value &= _PtrMask;
+        _value |= (v & _PtrMask);
+    }
+
+/*
+=================================================
+    Extra
+=================================================
+*/
+    template <typename T, usize A>
+    void  PackedPtr<T,A>::Extra (usize value) __NE___
+    {
+        ASSERT( value <= _ExtraMax );
+
+        _value &= ~_PtrMask;    // remove extra
+        _value |= value << _PtrBits;
+    }
+
+
+} // AE::Base
diff --git a/AE/engine/src/base/Utils/RefCounter.h b/AE/engine/src/base/Utils/RefCounter.h
index 69896925..1acaa88b 100644
--- a/AE/engine/src/base/Utils/RefCounter.h
+++ b/AE/engine/src/base/Utils/RefCounter.h
@@ -20,7 +20,7 @@ namespace AE::Base
     //
     // Enable Reference Counting
     //
-    class EnableRCBase : public Noncopyable
+    class EnableRCBase : public Noncopyable, public NothrowAllocatable
     {
         friend struct RefCounterUtils;
 
@@ -31,11 +31,14 @@ namespace AE::Base
 
     // methods
     public:
+        EnableRCBase ()                 __NE___ {}
         virtual ~EnableRCBase ()        __NE___ { ASSERT( _counter.load() == 0 ); }
 
     protected:
-        // this methods allows to catch object destruction and change behavior,
+
+        // This methods allows to catch object destruction and change behavior,
         // for example - add back to object pool.
+        //
         virtual void  _ReleaseObject () __NE___
         {
             // update cache before calling destructor
@@ -99,13 +102,28 @@ namespace AE::Base
         enum class DontIncRef {};
         explicit RC (T* ptr, DontIncRef)                __NE___ : _ptr{ptr}             {}
 
-        RC (T* ptr)                                     __NE___ : _ptr{ptr}             { _Inc(); }
-        RC (Ptr<T> ptr)                                 __NE___ : _ptr{ptr}             { _Inc(); }
+        RC (T* ptr)                                     __NE___ : _ptr{ptr}             { _IncSelf(); }
+        RC (Ptr<T> ptr)                                 __NE___ : _ptr{ptr}             { _IncSelf(); }
         RC (Self &&other)                               __NE___ : _ptr{other.release()} {}
-        RC (const Self &other)                          __NE___ : _ptr{other._ptr}      { _Inc(); }
+        RC (const Self &other)                          __NE___ : _ptr{other._ptr}      { _IncSelf(); }
+
+        template <typename B,
+                  ENABLEIF( IsBaseOfNotSame< T, B >)>
+        RC (RC<B> &&other)                              __NE___ : _ptr{other.release()} {}
+
+        template <typename B,
+                  ENABLEIF( IsBaseOfNotSame< T, B >)>
+        RC (const RC<B> &other)                         __NE___ : _ptr{other.get()}     { _IncSelf(); }
+
+
+        template <typename B,
+                  ENABLEIF( IsBaseOfNotSame< B, T >)>
+        explicit RC (RC<B> &&other)                     __NE___ : _ptr{static_cast<T*>(other.release())}    {}
+
+        template <typename B,
+                  ENABLEIF( IsBaseOfNotSame< B, T >)>
+        explicit RC (const RC<B> &other)                __NE___ : _ptr{static_cast<T*>(other.get())}        { _IncSelf(); }
 
-        template <typename B>   RC (RC<B> &&other)      __NE___ : _ptr{static_cast<T*>(other.release())}    {}
-        template <typename B>   RC (const RC<B> &other) __NE___ : _ptr{static_cast<T*>(other.get())}        { _Inc(); }
 
         ~RC ()                                          __NE___ { _Dec(); }
 
@@ -115,10 +133,12 @@ namespace AE::Base
         Self&  operator = (const Self &rhs)             __NE___ { _Inc( rhs._ptr );     _Dec();  _ptr = rhs._ptr;       return *this; }
         Self&  operator = (Self &&rhs)                  __NE___ {                       _Dec();  _ptr = rhs.release();  return *this; }
 
-        template <typename B>
+        template <typename B,
+                  ENABLEIF( IsBaseOfNotSame< T, B >)>
         Self&  operator = (RC<B> &&rhs)                 __NE___ { _Dec();  _ptr = static_cast<T*>(rhs.release());        return *this; }
 
-        template <typename B>
+        template <typename B,
+                  ENABLEIF( IsBaseOfNotSame< T, B >)>
         Self&  operator = (const RC<B> &rhs)            __NE___ { _Inc( static_cast<T*>(rhs.get()) );  _Dec();  _ptr = static_cast<T*>(rhs.get());  return *this; }
 
         ND_ bool  operator == (const T* rhs)            C_NE___ { return _ptr == rhs; }
@@ -150,7 +170,7 @@ namespace AE::Base
 
     private:
         static  void    _Inc (T* ptr)                   __NE___;
-                void    _Inc ()                         __NE___;
+                void    _IncSelf ()                     __NE___;
                 void    _Dec ()                         __NE___;
     };
 
@@ -165,100 +185,52 @@ namespace AE::Base
     {
     // methods
     public:
-        EnableRC ()             __NE___ {}
-
         ND_ RC<T>  GetRC ()     __NE___ { return RC<T>{ static_cast<T*>(this) }; }
 
         template <typename B>
-        ND_ RC<B>  GetRC ()     __NE___ { return RC<B>{ static_cast<B*>(this) }; }
+        ND_ RC<B>  GetRC ()     __NE___ { StaticAssert( IsBaseOf< T, B >);  return RC<B>{ static_cast<B*>(this) }; }
     };
 
 
 
     //
-    // Pointer which depends on RC (unused)
+    // Static Reference Counter
     //
-    /*
+
     template <typename T>
-    class WithRC
+    class StaticRC final
     {
-    // types
-    public:
-        using RC_t  = RC< EnableRCBase >;
-        using Self  = WithRC< T >;
-
-        STATIC_ASSERT( not IsBaseOf< EnableRCBase, T >);
-
-
     // variables
     private:
-        T *     _ptr    = null;
-        RC_t    _rc;
+        T   _value;
 
 
     // methods
     public:
-        WithRC ()                                           __NE___ {}
-        WithRC (Self &&)                                    __NE___ = default;
-        WithRC (const Self &)                               __NE___ = default;
-        template <typename B>   WithRC (T* ptr, RC<B> rc)   __NE___ : _ptr{ptr}, _rc{RVRef(rc)} { ASSERT( (_ptr != null) == bool{_rc} ); }
-
-            Self&   operator = (const Self &)               __NE___ = default;
-            Self&   operator = (Self &&)                    __NE___ = default;
-
-        ND_ bool    operator == (const T* rhs)              C_NE___ { return _ptr == rhs; }
-        ND_ bool    operator == (Ptr<T> rhs)                C_NE___ { return _ptr == rhs; }
-        ND_ bool    operator == (const Self &rhs)           C_NE___ { return _ptr == rhs._ptr; }
-        ND_ bool    operator == (std::nullptr_t)            C_NE___ { return _ptr == null; }
-
-        template <typename B>
-        ND_ bool    operator != (const B& rhs)              C_NE___ { return not (*this == rhs); }
-
-        ND_ bool    operator <  (const Self &rhs)           C_NE___ { return _ptr <  rhs._ptr; }
-        ND_ bool    operator >  (const Self &rhs)           C_NE___ { return _ptr >  rhs._ptr; }
-        ND_ bool    operator <= (const Self &rhs)           C_NE___ { return _ptr <= rhs._ptr; }
-        ND_ bool    operator >= (const Self &rhs)           C_NE___ { return _ptr >= rhs._ptr; }
-
-        ND_ T *     operator -> ()                          C_NE___ { ASSERT( _ptr != null );  return _ptr; }
-        ND_ T &     operator *  ()                          C_NE___ { ASSERT( _ptr != null );  return *_ptr; }
-        ND_ T *     get ()                                  C_NE___ { return _ptr; }
-
-        ND_ explicit operator bool ()                       C_NE___ { return _ptr != null; }
-
-        ND_ int     use_count ()                            C_NE___ { return _rc.use_count(); }
-    };*/
-
-
-
-    //
-    // Static Reference Counter
-    //
-
-    struct StaticRC final : Noninstanceable
-    {
-        template <typename T, typename ...Args>
-        static void  New (INOUT T& obj, Args&& ...args) __Th___
+        template <typename ...Args>
+        explicit StaticRC (Args&& ...args) __NE___ :
+            _value{ FwdArg<Args>( args )... }
         {
-            // warning: don't use 'GetRC()' inside ctor!
-            PlacementNew<T>( OUT &obj, FwdArg<Args>( args )... );   // throw
+            StaticAssert( IsBaseOf< EnableRCBase, T > );
+            CheckNothrow( IsNothrowCtor< T, Args... >);
 
-            const int   cnt = RefCounterUtils::IncRef( obj );
+            const int   cnt = RefCounterUtils::IncRef( _value );
             Unused( cnt );
             ASSERT( cnt == 0 );
         }
 
-        template <typename T>
-        static void  Delete (INOUT T& obj)              __NE___
+        ~StaticRC () __NE___
         {
-            const int   cnt = RefCounterUtils::DecRef( obj );
+            const int   cnt = RefCounterUtils::DecRef( _value );
             Unused( cnt );
             ASSERT( cnt == 1 );
+        }
 
-            // update cache before calling destructor
-            MemoryBarrier( EMemoryOrder::Acquire );
+        ND_ T *         operator -> ()  __NE___ { return &_value; }
+        ND_ T const*    operator -> ()  C_NE___ { return &_value; }
 
-            PlacementDelete( INOUT obj );
-        }
+        ND_ T &         operator * ()   __NE___ { return _value; }
+        ND_ T const&    operator * ()   C_NE___ { return _value; }
     };
 
 
@@ -285,22 +257,17 @@ namespace AE::Base
     // methods
     public:
         AtomicRC ()                                                 __NE___ {}
-        AtomicRC (RC_t && rc)                                       __NE___ { _ptr.store( rc.release().release() ); }
-        AtomicRC (const RC_t &rc)                                   __NE___ { _IncSet( rc.get() ); }
-
-        explicit AtomicRC (std::nullptr_t)                          __NE___ {}
-        explicit AtomicRC (T* ptr)                                  __NE___ { _IncSet( ptr ); }
-        explicit AtomicRC (Ptr<T> ptr)                              __NE___ { _IncSet( ptr.get() ); }
-
-        ~AtomicRC ()                                                __NE___ { _ResetDec();  STATIC_ASSERT( alignof(T) > 1 ); /* because first bit is used for lock bit */}
+        ~AtomicRC ()                                                __NE___ { _ResetDec();  StaticAssert( alignof(T) > 1, "first bit is used for lock bit" ); }
 
         ND_ T *     unsafe_get ()                                   C_NE___ { return _RemoveLockBit( _ptr.load() ); }
         ND_ RC_t    release ()                                      __NE___;
 
         ND_ RC_t    load ()                                         __NE___;
 
-            void    store (T* ptr)                                  __NE___;
-            void    store (RC_t ptr)                                __NE___ { store( ptr.get() ); }     // TODO: optimize
+            void    store (T* ptr)                                  __NE___ { _Inc( ptr );  _Dec( _Exchange( ptr )); }
+            void    store (RC_t ptr)                                __NE___ { _Dec( _Exchange( ptr.release() )); }
+
+            void    reset ()                                        __NE___ { _ResetDec(); }
 
         ND_ RC_t    exchange (T* desired)                           __NE___;
         ND_ RC_t    exchange (RC_t desired)                         __NE___;
@@ -309,15 +276,9 @@ namespace AE::Base
         ND_ bool    CAS_Loop (INOUT RC_t& expected, RC_t desired)   __NE___ { return _CAS<true>( INOUT expected, RVRef(desired) ); }
 
 
-        Self&  operator = (std::nullptr_t)                          __NE___ { _ResetDec();          return *this; }
-        Self&  operator = (T* rhs)                                  __NE___ { store( rhs );         return *this; }
-        Self&  operator = (Ptr<T> rhs)                              __NE___ { store( rhs );         return *this; }
-        Self&  operator = (const RC_t &rhs)                         __NE___ { store( rhs.get() );   return *this; }
-        Self&  operator = (RC_t && rhs)                             __NE___;
-
     private:
-        void  _IncSet (T *ptr)                                      __NE___;
-        void  _ResetDec ()                                          __NE___;
+            void    _IncSet (T* ptr)                                __NE___;
+            void    _ResetDec ()                                    __NE___ { _Dec( _Exchange( null )); }
 
         ND_ T*      _Lock ()                                        __NE___;
             void    _Unlock ()                                      __NE___;
@@ -326,13 +287,11 @@ namespace AE::Base
         template <bool IsStrong>
         ND_ bool    _CAS (INOUT RC_t& expected, RC_t desired)       __NE___;
 
-        static void  _Inc (T *ptr)                                  __NE___;
-        static void  _Dec (T *ptr)                                  __NE___;
+            static void _Inc (T* ptr)                               __NE___;
+            static void _Dec (T* ptr)                               __NE___;
 
         ND_ static bool _HasLockBit (T* ptr)                        __NE___ { return (usize(ptr) & usize{1}); }
-
         ND_ static T*   _SetLockBit (T* ptr)                        __NE___ { return reinterpret_cast< T *>((usize(ptr) | usize{1})); }
-
         ND_ static T*   _RemoveLockBit (T* ptr)                     __NE___ { return reinterpret_cast< T *>((usize(ptr) & ~usize{1})); }
     };
 
@@ -372,23 +331,24 @@ namespace AE::Base
 =================================================
 */
     template <typename T, typename ...Args>
-    ND_ RC<T>  MakeRC (Args&& ...args) __Th___
+    ND_ RC<T>  MakeRC (Args&& ...args) __NE___
     {
-        STATIC_ASSERT( not IsBaseOf< NonAllocatable, T >);
+        StaticAssert( not IsBaseOf< NonAllocatable, T >);
+        StaticAssert( IsBaseOf< EnableRCBase, T >);
 
-        return RC<T>{ new T{ FwdArg<Args>(args)... }};  // throw
+        CheckNothrow( IsNothrowCtor< T, Args... >);
+        //CheckNothrow( IsNoExcept( new T{ FwdArg<Args>(args)... }));
+
+        return RC<T>{ new T{ FwdArg<Args>(args)... }};
     }
 
     template <typename T, typename ...Args>
-    ND_ RC<T>  MakeRC_NE (Args&& ...args) __NE___
+    ND_ RC<T>  MakeRCTh (Args&& ...args) __Th___
     {
-        STATIC_ASSERT( not IsBaseOf< NonAllocatable, T >);
-        try {
-            return RC<T>{ new T{ FwdArg<Args>(args)... }};
-        }
-        catch(...) {
-            return null;
-        }
+        StaticAssert( not IsBaseOf< NonAllocatable, T >);
+        StaticAssert( IsBaseOf< EnableRCBase, T >);
+
+        return RC<T>{ new T{ FwdArg<Args>(args)... }};
     }
 
 /*
@@ -399,7 +359,7 @@ namespace AE::Base
     template <typename T>
     int  RefCounterUtils::DecRefAndRelease (INOUT T* &ptr) __NE___
     {
-        STATIC_ASSERT( sizeof(T) > 0 );
+        StaticAssert( sizeof(T) > 0 );
 
         if_likely( ptr != null )
         {
@@ -418,31 +378,31 @@ namespace AE::Base
 
 /*
 =================================================
-    _Inc
+    _Inc / _Dec
 =================================================
 */
     template <typename T>
     void  RC<T>::_Inc (T* ptr) __NE___
     {
+        StaticAssert( IsBaseOf< EnableRCBase, T >);
+
         if_likely( ptr != null )
             RefCounterUtils::IncRef( *ptr );
     }
 
     template <typename T>
-    void  RC<T>::_Inc () __NE___
+    void  RC<T>::_IncSelf () __NE___
     {
+        StaticAssert( IsBaseOf< EnableRCBase, T >);
+
         if_likely( _ptr != null )
             RefCounterUtils::IncRef( *_ptr );
     }
 
-/*
-=================================================
-    _Dec
-=================================================
-*/
     template <typename T>
     void  RC<T>::_Dec () __NE___
     {
+        StaticAssert( IsBaseOf< EnableRCBase, T >);
         RefCounterUtils::DecRefAndRelease( INOUT _ptr );
     }
 
@@ -460,41 +420,13 @@ namespace AE::Base
 
 
 
-/*
-=================================================
-    MakeAtomicRC
-=================================================
-*/
-    template <typename T, typename ...Args>
-    ND_ AtomicRC<T>  MakeAtomicRC (Args&& ...args) __Th___
-    {
-        return AtomicRC<T>{ new T{ FwdArg<Args>(args)... }};
-    }
-
-/*
-=================================================
-    operator =
-=================================================
-*/
-    template <typename T>
-    AtomicRC<T>&  AtomicRC<T>::operator = (RC_t &&rhs) __NE___
-    {
-        _ResetDec();
-
-        T*  old = _Exchange( rhs.release() );
-
-        // pointer may be changed in another thread
-        _Dec( old );
-        return *this;
-    }
-
 /*
 =================================================
     _Inc
 =================================================
 */
     template <typename T>
-    void  AtomicRC<T>::_Inc (T *ptr) __NE___
+    void  AtomicRC<T>::_Inc (T* ptr) __NE___
     {
         ASSERT( not _HasLockBit( ptr ));
 
@@ -508,7 +440,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    void  AtomicRC<T>::_Dec (T *ptr) __NE___
+    void  AtomicRC<T>::_Dec (T* ptr) __NE___
     {
         ASSERT( not _HasLockBit( ptr ));
 
@@ -521,7 +453,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    void  AtomicRC<T>::_IncSet (T *ptr) __NE___
+    void  AtomicRC<T>::_IncSet (T* ptr) __NE___
     {
         _Inc( ptr );
 
@@ -531,19 +463,6 @@ namespace AE::Base
         _Dec( old );
     }
 
-/*
-=================================================
-    _ResetDec
-=================================================
-*/
-    template <typename T>
-    void  AtomicRC<T>::_ResetDec () __NE___
-    {
-        T*  old = _Exchange( null );
-
-        _Dec( old );
-    }
-
 /*
 =================================================
     release
@@ -574,18 +493,6 @@ namespace AE::Base
         return res;
     }
 
-/*
-=================================================
-    store
-=================================================
-*/
-    template <typename T>
-    void  AtomicRC<T>::store (T* ptr) __NE___
-    {
-        _ResetDec();
-        _IncSet( ptr );
-    }
-
 /*
 =================================================
     exchange
@@ -648,24 +555,25 @@ namespace AE::Base
     template <typename T>
     T*  AtomicRC<T>::_Exchange (T* desired) __NE___
     {
-        T*  exp = _RemoveLockBit( _ptr.load() );
-
-        for (uint i = 0;
-             not _ptr.CAS( INOUT exp, desired );
-             ++i)
+        T*  exp = _ptr.load();
+        for (;;)
         {
-            if_unlikely( i > ThreadUtils::SpinBeforeLock() )
+            for (uint i = 0; i < ThreadUtils::SpinBeforeLock(); ++i)
             {
-                i = 0;
-                ThreadUtils::Yield();
+                exp = _RemoveLockBit( exp );
+
+                // wait until it unlocks, then set new value
+                if_likely( _ptr.CAS( INOUT exp, desired ))
+                {
+                    ASSERT( not _HasLockBit( exp ));
+                    return exp;
+                }
+
+                ThreadUtils::Pause();
             }
 
-            exp = _RemoveLockBit( exp );
-            ThreadUtils::Pause();
+            ThreadUtils::Sleep_1us();
         }
-
-        ASSERT( not _HasLockBit( exp ));
-        return exp;
     }
 
 /*
@@ -676,23 +584,25 @@ namespace AE::Base
     template <typename T>
     T*  AtomicRC<T>::_Lock () __NE___
     {
-        T*  exp = _RemoveLockBit( _ptr.load() );
-        for (uint i = 0;
-             not _ptr.CAS( INOUT exp, _SetLockBit( exp ));
-             ++i)
+        T*  exp = _ptr.load();
+        for (;;)
         {
-            if_unlikely( i > ThreadUtils::SpinBeforeLock() )
+            // spin until we can set the lock bit
+            for (uint i = 0; i < ThreadUtils::SpinBeforeLock(); ++i)
             {
-                i = 0;
-                ThreadUtils::Yield();
+                exp = _RemoveLockBit( exp );
+
+                if_likely( _ptr.CAS( INOUT exp, _SetLockBit( exp )) )
+                {
+                    ASSERT( not _HasLockBit( exp ));
+                    return exp;
+                }
+
+                ThreadUtils::Pause();
             }
 
-            exp = _RemoveLockBit( exp );
-            ThreadUtils::Pause();
+            ThreadUtils::Sleep_1us();
         }
-
-        ASSERT( not _HasLockBit( exp ));
-        return exp;
     }
 
 /*
@@ -711,6 +621,7 @@ namespace AE::Base
 //-----------------------------------------------------------------------------
 
 
+
 /*
 =================================================
     Cast
@@ -719,7 +630,7 @@ namespace AE::Base
     template <typename R, typename T>
     ND_ constexpr RC<R>  Cast (const RC<T> &value) __NE___
     {
-        STATIC_ASSERT( sizeof(R) > 0 );
+        StaticAssert( sizeof(R) > 0 );
         return RC<R>{ static_cast<R*>( value.get() )};
     }
 
diff --git a/AE/engine/src/base/Utils/SourceLoc.h b/AE/engine/src/base/Utils/SourceLoc.h
index 01f9f03e..edc98e4c 100644
--- a/AE/engine/src/base/Utils/SourceLoc.h
+++ b/AE/engine/src/base/Utils/SourceLoc.h
@@ -64,4 +64,7 @@ namespace AE::Base
     };
 
 
+
+    template <> struct TTriviallyDestructible< SourceLoc > { static constexpr bool  value = true; };
+
 } // AE::Base
diff --git a/AE/engine/src/base/Utils/StdFunctions.h b/AE/engine/src/base/Utils/StdFunctions.h
index 9d027e2a..d0596024 100644
--- a/AE/engine/src/base/Utils/StdFunctions.h
+++ b/AE/engine/src/base/Utils/StdFunctions.h
@@ -19,7 +19,7 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    ND_ constexpr std::reference_wrapper<T>  ArgRef (T& arg) __NE___
+    ND_ constexpr std::reference_wrapper<T>  ArgRef (T &arg) __NE___
     {
         return std::reference_wrapper<T>{ arg };
     }
@@ -30,9 +30,9 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    ND_ constexpr RemoveReference<T> &&  RVRef (T& arg) __NE___
+    ND_ constexpr RemoveReference<T>&&  RVRef (T &arg) __NE___
     {
-        return static_cast< RemoveReference<T> && >( arg );
+        return static_cast< RemoveReference<T>&& >( arg );
     }
 
 /*
@@ -41,16 +41,16 @@ namespace AE::Base
 =================================================
 */
     template <typename T>
-    ND_ constexpr T &&  FwdArg (RemoveReference<T>& arg) __NE___
+    ND_ constexpr T&&  FwdArg (RemoveReference<T> &arg) __NE___
     {
-        return static_cast<T &&>( arg );
+        return static_cast< T&& >( arg );
     }
 
     template <typename T>
-    ND_ constexpr T &&  FwdArg (RemoveReference<T>&& arg) __NE___
+    ND_ constexpr T&&  FwdArg (RemoveReference<T> &&arg) __NE___
     {
-        STATIC_ASSERT( not IsLValueRef<T> );
-        return static_cast<T &&>( arg );
+        StaticAssert( not IsLValueRef<T> );
+        return static_cast< T&& >( arg );
     }
 
 
diff --git a/AE/engine/src/base/Utils/Threading.h b/AE/engine/src/base/Utils/Threading.h
index 51b79d00..5ddfe02a 100644
--- a/AE/engine/src/base/Utils/Threading.h
+++ b/AE/engine/src/base/Utils/Threading.h
@@ -44,7 +44,7 @@ namespace AE::Base
 */
     forceinline void  MemoryBarrier (std::memory_order order) __NE___
     {
-        ASSERT( order != std::memory_order_relaxed );
+        ASSERT( order != EMemoryOrder::Relaxed );
         return std::atomic_thread_fence( order );
     }
 
@@ -59,7 +59,7 @@ namespace AE::Base
 */
     forceinline void  CompilerBarrier (std::memory_order order) __NE___
     {
-        ASSERT( order != std::memory_order_relaxed );
+        ASSERT( order != EMemoryOrder::Relaxed );
         return std::atomic_signal_fence( order );
     }
 
@@ -84,7 +84,7 @@ namespace AE::Base
     template <typename T>
     struct DeferExLock final : std::unique_lock<T>
     {
-        explicit DeferExLock (T &mtx) __NE___ : 
+        explicit DeferExLock (T &mtx) __NE___ :
             std::unique_lock<T>{ mtx, std::defer_lock } {}
     };
 
diff --git a/AE/engine/src/base/Utils/TimeProfiler.h b/AE/engine/src/base/Utils/TimeProfiler.h
index c7d54be3..8d3e24b8 100644
--- a/AE/engine/src/base/Utils/TimeProfiler.h
+++ b/AE/engine/src/base/Utils/TimeProfiler.h
@@ -27,16 +27,16 @@ namespace AE::Base
     public:
         TimeProfiler (StringView name) __NE___
         {
-            CATCH( _message = name; )
+            _message = name;
 
             CompilerBarrier( EMemoryOrder::Release );
         }
 
 
-        TimeProfiler (StringView name, const char *func, const SourceLoc &loc) __NE___ :
+        TimeProfiler (StringView name, const char* func, const SourceLoc &loc) __NE___ :
             _srcLoc{ loc }
         {
-            CATCH( _message << "time profiler: " << name << (name.empty() ? "" : ", ") << "function: " << func; )
+            _message << "time profiler: " << name << (name.empty() ? "" : ", ") << "function: " << func;
 
             CompilerBarrier( EMemoryOrder::Release );
         }
@@ -46,7 +46,7 @@ namespace AE::Base
         {
             CompilerBarrier( EMemoryOrder::Acquire );
 
-            CATCH( _message << "; TIME: " << ToString( Clock_t::now() - _startTime, 3 );)
+            _message << "; TIME: " << ToString( Clock_t::now() - _startTime, 3 );
 
             if ( not _srcLoc.file.empty() ) {
                 AE_PRIVATE_LOG_I( _message, _srcLoc.file, _srcLoc.line );
diff --git a/AE/engine/src/base/Utils/TypeId.h b/AE/engine/src/base/Utils/TypeId.h
index 1ee7ba2a..586705e9 100644
--- a/AE/engine/src/base/Utils/TypeId.h
+++ b/AE/engine/src/base/Utils/TypeId.h
@@ -26,7 +26,7 @@ namespace AE::Base::_hidden_
         ND_ constexpr bool  operator <= (StaticTypeID<UID> rhs)     C_NE___ { return _value <= rhs._value; }
 
         ND_ constexpr usize         Get ()                          C_NE___ { return _value; }
-        ND_ constexpr const char *  Name ()                         C_NE___ { return ""; }
+        ND_ constexpr StringView    Name ()                         C_NE___ { return ""; }
     };
 
     template <uint UID>
@@ -64,6 +64,8 @@ struct std::hash< AE::Base::_hidden_::StaticTypeID<UID> >
 //-----------------------------------------------------------------------------
 
 
+#ifdef AE_ENABLE_RTTI
+
 namespace AE::Base::_hidden_
 {
     //
@@ -88,7 +90,7 @@ namespace AE::Base::_hidden_
         ND_ bool  operator <= (StdTypeID rhs)       C_NE___ { return _value <= rhs._value; }
 
         ND_ std::type_index     Get ()              C_NE___ { return _value; }
-        ND_ const char *        Name ()             C_NE___ { return _value.name(); }
+        ND_ StringView          Name ()             C_NE___ { return _value.name(); }
     };
 
 
@@ -114,11 +116,9 @@ struct std::hash< AE::Base::_hidden_::StdTypeID >
 };
 
 
-#if 0
 namespace AE::Base
 {
-    using TypeId = Base::_hidden_::StaticTypeID<0>;
-
+    using TypeId = Base::_hidden_::StdTypeID;
 /*
 =================================================
     TypeIdOf
@@ -127,7 +127,7 @@ namespace AE::Base
     template <typename T>
     ND_ TypeId  TypeIdOf () __NE___
     {
-        return Base::_hidden_::StaticTypeIdOf<T,0>::Get();
+        return Base::_hidden_::StdTypeIdOf<T>::Get();
     }
 
     template <typename T>
@@ -139,9 +139,11 @@ namespace AE::Base
 } // AE::Base
 
 #else
+
 namespace AE::Base
 {
-    using TypeId = Base::_hidden_::StdTypeID;
+    using TypeId = Base::_hidden_::StaticTypeID<0>;
+
 /*
 =================================================
     TypeIdOf
@@ -150,7 +152,7 @@ namespace AE::Base
     template <typename T>
     ND_ TypeId  TypeIdOf () __NE___
     {
-        return Base::_hidden_::StdTypeIdOf<T>::Get();
+        return Base::_hidden_::StaticTypeIdOf<T,0>::Get();
     }
 
     template <typename T>
diff --git a/AE/engine/src/ecs-st/Common.h b/AE/engine/src/ecs-st/Common.h
index 00297afb..3de2eae4 100644
--- a/AE/engine/src/ecs-st/Common.h
+++ b/AE/engine/src/ecs-st/Common.h
@@ -13,7 +13,7 @@
 namespace AE::ECS::_hidden_
 {
     // tag: HandleTmpl UID
-    static constexpr uint   ECSIDs_Start    = 4 << 24;
+    static constexpr uint   ECSIDs_Start    = 8 << 24;
 
 } // AE::ECS::_hidden_
 
diff --git a/AE/engine/src/ecs-st/Core/Archetype.h b/AE/engine/src/ecs-st/Core/Archetype.h
index 29ff4976..15d41070 100644
--- a/AE/engine/src/ecs-st/Core/Archetype.h
+++ b/AE/engine/src/ecs-st/Core/Archetype.h
@@ -50,7 +50,7 @@ namespace AE::ECS
         ND_ bool        All (const ArchetypeDesc &)             C_NE___;
         ND_ bool        Any (const ArchetypeDesc &)             C_NE___;
         ND_ bool        AnyOrEmpty (const ArchetypeDesc &)      C_NE___;
-        ND_ bool        Equals (const ArchetypeDesc &)          C_NE___;
+        ND_ bool        Equal (const ArchetypeDesc &)           C_NE___;
         ND_ bool        Empty ()                                C_NE___;
         ND_ usize       Count ()                                C_NE___;
 
@@ -78,9 +78,9 @@ namespace AE::ECS
         ND_ HashVal                 Hash ()             C_NE___ { return _hash; }
         ND_ ArchetypeDesc const&    Desc ()             C_NE___ { return _desc; }
 
-        ND_ bool operator == (const Archetype &rhs)     C_NE___ { return Equals( rhs ); }
+        ND_ bool operator == (const Archetype &rhs)     C_NE___ { return Equal( rhs ); }
 
-        ND_ bool    Equals (const Archetype &rhs)       C_NE___ { return _desc.Equals( rhs._desc ); }
+        ND_ bool    Equal (const Archetype &rhs)        C_NE___ { return _desc.Equal( rhs._desc ); }
         ND_ bool    Contains (const Archetype &rhs)     C_NE___ { return _desc.All( rhs._desc ); }
         ND_ bool    Exists (ComponentID id)             C_NE___ { return _desc.Exists( id ); }
 
@@ -221,10 +221,10 @@ namespace AE::ECS
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
-    inline bool  ArchetypeDesc::Equals (const ArchetypeDesc &rhs) C_NE___
+    inline bool  ArchetypeDesc::Equal (const ArchetypeDesc &rhs) C_NE___
     {
         bool    result = true;
         for (usize i = 0; i < _bits.size(); ++i) {
@@ -274,10 +274,10 @@ namespace AE::ECS
         }
 
         #if AE_PLATFORM_BITS == 64
-            STATIC_ASSERT( sizeof(usize) == sizeof(h) );
+            StaticAssert( sizeof(usize) == sizeof(h) );
             return HashVal{ h };
         #else
-            STATIC_ASSERT( sizeof(usize) != sizeof(h) );
+            StaticAssert( sizeof(usize) != sizeof(h) );
             return HashVal{usize( h ^ (h >> 32) )};
         #endif
     }
@@ -331,9 +331,9 @@ namespace AE::ECS
 */
     inline bool  ArchetypeQueryDesc::operator == (const ArchetypeQueryDesc &rhs) C_NE___
     {
-        return  required.Equals( rhs.required )         &
-                subtractive.Equals( rhs.subtractive )   &
-                requireAny.Equals( rhs.requireAny );
+        return  required.Equal( rhs.required )          &
+                subtractive.Equal( rhs.subtractive )    &
+                requireAny.Equal( rhs.requireAny );
     }
 
 /*
diff --git a/AE/engine/src/ecs-st/Core/ArchetypeStorage.h b/AE/engine/src/ecs-st/Core/ArchetypeStorage.h
index 0829b2fd..d400428f 100644
--- a/AE/engine/src/ecs-st/Core/ArchetypeStorage.h
+++ b/AE/engine/src/ecs-st/Core/ArchetypeStorage.h
@@ -18,7 +18,7 @@ namespace AE::ECS
     public:
         enum class Index_t : uint { Unknown = ~0u };
 
-        DEBUG_ONLY(     
+        DEBUG_ONLY(
             class IComponentDbgView {
             public:
                 virtual ~IComponentDbgView () {}
@@ -32,8 +32,8 @@ namespace AE::ECS
         using Allocator_t   = UntypedAllocator;
         using Components_t  = FixedTupleArray< ECS_Config::MaxComponentsPerArchetype,
                                     /*0 - id    */ ComponentID,
-                                    /*1 - size  */ Bytes16u,
-                                    /*2 - align */ Bytes16u,
+                                    /*1 - size  */ Byte16u,
+                                    /*2 - align */ Byte16u,
                                     /*3 - ptr   */ void*,
                                     /*4 - ctor  */ void (*)(void*) >;
 
@@ -47,8 +47,8 @@ namespace AE::ECS
         const Archetype     _archetype;
         Components_t        _components;
         usize               _capacity;
-        Bytes32u            _maxAlign;
-        Bytes32u            _memSize;
+        Byte32u             _maxAlign;
+        Byte32u             _memSize;
 
         NO_UNIQUE_ADDRESS
          Allocator_t        _allocator;
@@ -98,8 +98,8 @@ namespace AE::ECS
         ND_ Bytes               GetMemorySize ()                    C_NE___ { return _memSize; }
 
         ND_ auto                GetComponentIDs ()                  C_NE___ -> ArrayView<ComponentID>   { return _components.get<0>(); }
-        ND_ auto                GetComponentSizes ()                C_NE___ -> ArrayView<Bytes16u>      { return _components.get<1>(); }
-        ND_ auto                GetComponentAligns ()               C_NE___ -> ArrayView<Bytes16u>      { return _components.get<2>(); }
+        ND_ auto                GetComponentSizes ()                C_NE___ -> ArrayView<Byte16u>       { return _components.get<1>(); }
+        ND_ auto                GetComponentAligns ()               C_NE___ -> ArrayView<Byte16u>       { return _components.get<2>(); }
         ND_ auto                GetComponentData ()                 __NE___ -> ArrayView<void*>         { return _components.get<3>(); }
 
         DEBUG_ONLY(
@@ -127,7 +127,7 @@ namespace AE::ECS
     template <typename T>
     inline T*  ArchetypeStorage::GetComponents () C_NE___
     {
-        STATIC_ASSERT( not IsEmpty<T> );
+        StaticAssert( not IsEmpty<T> );
         return Cast<T>( GetComponents( ComponentTypeInfo<T>::id ));
     }
 
@@ -153,7 +153,7 @@ namespace AE::ECS
     template <typename T>
     inline T*  ArchetypeStorage::GetComponent (Index_t idx) C_NE___
     {
-        STATIC_ASSERT( not IsEmpty<T> );
+        StaticAssert( not IsEmpty<T> );
         ASSERT( usize(idx) < Count() );
         ASSERT( _memory );
 
diff --git a/AE/engine/src/ecs-st/Core/ComponentAccessTypes.h b/AE/engine/src/ecs-st/Core/ComponentAccessTypes.h
index 8b4bb593..7eb15932 100644
--- a/AE/engine/src/ecs-st/Core/ComponentAccessTypes.h
+++ b/AE/engine/src/ecs-st/Core/ComponentAccessTypes.h
@@ -10,7 +10,7 @@ namespace AE::ECS
     template <typename T>
     struct WriteAccess
     {
-        STATIC_ASSERT( not IsEmpty<T> );
+        StaticAssert( not IsEmpty<T> );
     private:
         T*  _elements;
 
@@ -24,7 +24,7 @@ namespace AE::ECS
     template <typename T>
     struct ReadAccess
     {
-        STATIC_ASSERT( not IsEmpty<T> );
+        StaticAssert( not IsEmpty<T> );
     private:
         T const*  _elements;
 
@@ -38,7 +38,7 @@ namespace AE::ECS
     template <typename T>
     struct OptionalWriteAccess
     {
-        STATIC_ASSERT( not IsEmpty<T> );
+        StaticAssert( not IsEmpty<T> );
     private:
         T*  _elements;          // can be null
 
@@ -53,7 +53,7 @@ namespace AE::ECS
     template <typename T>
     struct OptionalReadAccess
     {
-        STATIC_ASSERT( not IsEmpty<T> );
+        StaticAssert( not IsEmpty<T> );
     private:
         T const*  _elements;    // can be null
 
diff --git a/AE/engine/src/ecs-st/Core/ComponentID.h b/AE/engine/src/ecs-st/Core/ComponentID.h
index 0a8f1417..cdd003c7 100644
--- a/AE/engine/src/ecs-st/Core/ComponentID.h
+++ b/AE/engine/src/ecs-st/Core/ComponentID.h
@@ -41,16 +41,16 @@ namespace AE::ECS
     template <typename Comp>
     struct ComponentTypeInfo
     {
-        //STATIC_ASSERT( std::is_trivially_destructible_v<Comp> );
-        //STATIC_ASSERT( std::is_trivially_copyable_v<Comp> );
-        STATIC_ASSERT( std::is_nothrow_destructible_v<Comp> );
+        //StaticAssert( std::is_trivially_destructible_v<Comp> );
+        //StaticAssert( std::is_trivially_copyable_v<Comp> );
+        StaticAssert( std::is_nothrow_destructible_v<Comp> );
 
         using type  = Comp;
         static inline const ComponentID     id      { CheckCast<ushort>( Base::_hidden_::StaticTypeIdOf< Comp, 0x1000 >::Get().Get() ) };
-        static constexpr Bytes16u           align   { IsEmpty<Comp> ? 0 : alignof(Comp) };
-        static constexpr Bytes16u           size    { IsEmpty<Comp> ? 0 : sizeof(Comp) };
+        static constexpr Byte16u            align   { IsEmpty<Comp> ? 0 : alignof(Comp) };
+        static constexpr Byte16u            size    { IsEmpty<Comp> ? 0 : sizeof(Comp) };
 
-        static void  Ctor (OUT void *comp) __NE___
+        static void  Ctor (OUT void* comp) __NE___
         {
             PlacementNew<Comp>( OUT comp );
         }
@@ -68,7 +68,7 @@ namespace AE::ECS
     template <typename Comp>
     struct MsgTagTypeInfo
     {
-        STATIC_ASSERT( IsEmpty<Comp> );
+        StaticAssert( IsEmpty<Comp> );
 
         using type  = Comp;
         static inline const MsgTagID    id {CheckCast<ushort>( Base::_hidden_::StaticTypeIdOf< Comp, 0x1002 >::Get().Get() )};
diff --git a/AE/engine/src/ecs-st/Core/EntityPool.h b/AE/engine/src/ecs-st/Core/EntityPool.h
index b75f29c9..3acbcdb8 100644
--- a/AE/engine/src/ecs-st/Core/EntityPool.h
+++ b/AE/engine/src/ecs-st/Core/EntityPool.h
@@ -83,7 +83,7 @@ namespace AE::ECS
         else
         {
             idx = Index_t(_entities.size());
-            CATCH_ERR( _entities.push_back( EntityRef{} ));
+            NOTHROW_ERR( _entities.push_back( EntityRef{} ));
         }
 
         id = EntityID{ idx, _entities[idx].generation };
@@ -105,7 +105,7 @@ namespace AE::ECS
         item.index   = InvalidIndex;
 
         ++item.generation;
-        CATCH_ERR( _available.push_back( id.Index() ));
+        NOTHROW_ERR( _available.push_back( id.Index() ));
         return true;
     }
 
diff --git a/AE/engine/src/ecs-st/Core/MessageBuilder.h b/AE/engine/src/ecs-st/Core/MessageBuilder.h
index 85615cd1..5c5905ae 100644
--- a/AE/engine/src/ecs-st/Core/MessageBuilder.h
+++ b/AE/engine/src/ecs-st/Core/MessageBuilder.h
@@ -121,11 +121,11 @@ namespace AE::ECS
         auto&   msg = iter->second;
 
         if ( msg.entities.empty() )
-            CATCH_ERR( _pending.push_back( &msg ));
+            NOTHROW_ERR( _pending.push_back( &msg ));
 
         ASSERT( msg.components.empty() );
 
-        CATCH_ERR( msg.entities.push_back( id ));
+        NOTHROW_ERR( msg.entities.push_back( id ));
         return true;
     }
 
@@ -147,15 +147,15 @@ namespace AE::ECS
         auto&   msg = iter->second;
 
         if ( msg.entities.empty() )
-            CATCH_ERR( _pending.push_back( &msg ));
+            NOTHROW_ERR( _pending.push_back( &msg ));
 
         ASSERT( msg.entities.empty() or not msg.components.empty() );
         ASSERT( comp.size() );
 
-        CATCH_ERR( msg.components.resize( (msg.entities.size() + 1) * comp.size() ));
+        NOTHROW_ERR( msg.components.resize( (msg.entities.size() + 1) * comp.size() ));
         MemCopy( OUT msg.components.data() + Bytes{msg.entities.size() * comp.size()}, comp.data(), ArraySizeOf( comp ));
 
-        CATCH_ERR( msg.entities.push_back( id ));
+        NOTHROW_ERR( msg.entities.push_back( id ));
         return true;
     }
 
@@ -187,9 +187,9 @@ namespace AE::ECS
 
         if constexpr( FI::args::Count == 1 )
         {
-            STATIC_ASSERT( IsSameTypes<typename FI::args::template Get<0>, ArrayView<EntityID>> );
-            //STATIC_ASSERT( not IsSameTypes< Tag, MsgTag_RemovedComponent >);
-            CATCH_ERR(
+            StaticAssert( IsSameTypes<typename FI::args::template Get<0>, ArrayView<EntityID>> );
+            //StaticAssert( not IsSameTypes< Tag, MsgTag_RemovedComponent >);
+            NOTHROW_ERR(
                 msg.listeners.push_back(
                     [fn = FwdArg<Fn>(fn)] (const MessageData &data)
                     {
@@ -200,9 +200,9 @@ namespace AE::ECS
 
         if constexpr( FI::args::Count == 2 )
         {
-            STATIC_ASSERT( IsSameTypes<typename FI::args::template Get<0>, ArrayView<EntityID>> );
-            STATIC_ASSERT( IsSameTypes<typename FI::args::template Get<1>, ArrayView<Comp>> );
-            CATCH_ERR(
+            StaticAssert( IsSameTypes<typename FI::args::template Get<0>, ArrayView<EntityID>> );
+            StaticAssert( IsSameTypes<typename FI::args::template Get<1>, ArrayView<Comp>> );
+            NOTHROW_ERR(
                 msg.listeners.push_back(
                     [fn = FwdArg<Fn>(fn)] (const MessageData &data)
                     {
@@ -232,17 +232,17 @@ namespace AE::ECS
         auto&   msg = iter->second;
 
         if ( msg.entities.empty() )
-            CATCH_ERR( _pending.push_back( &msg ));
+            NOTHROW_ERR( _pending.push_back( &msg ));
 
         ASSERT( msg.entities.empty() or not msg.components.empty() );
         ASSERT( compData.size() );
         ASSERT( ids.size() );
 
         const usize comp_size = compData.size() / ids.size();
-        CATCH_ERR( msg.components.resize( (msg.entities.size() + 1) * comp_size ));
+        NOTHROW_ERR( msg.components.resize( (msg.entities.size() + 1) * comp_size ));
         MemCopy( OUT msg.components.data() + Bytes{msg.entities.size() * comp_size}, compData.data(), ArraySizeOf( compData ));
 
-        CATCH_ERR( msg.entities.insert( msg.entities.end(), ids.begin(), ids.end() ));
+        NOTHROW_ERR( msg.entities.insert( msg.entities.end(), ids.begin(), ids.end() ));
         return true;
     }
 
@@ -264,11 +264,11 @@ namespace AE::ECS
         auto&   msg = iter->second;
 
         if ( msg.entities.empty() )
-            CATCH_ERR( _pending.push_back( &msg ));
+            NOTHROW_ERR( _pending.push_back( &msg ));
 
         ASSERT( msg.components.empty() );
 
-        CATCH_ERR( msg.entities.insert( msg.entities.end(), ids.begin(), ids.end() ));
+        NOTHROW_ERR( msg.entities.insert( msg.entities.end(), ids.begin(), ids.end() ));
         return true;
     }
 
diff --git a/AE/engine/src/ecs-st/Core/Registry.cpp b/AE/engine/src/ecs-st/Core/Registry.cpp
index 15837857..381f07b2 100644
--- a/AE/engine/src/ecs-st/Core/Registry.cpp
+++ b/AE/engine/src/ecs-st/Core/Registry.cpp
@@ -456,7 +456,7 @@ namespace AE::ECS
     _OnNewArchetype
 =================================================
 */
-    void  Registry::_OnNewArchetype (ArchetypePair_t *arch) __NE___
+    void  Registry::_OnNewArchetype (ArchetypePair_t* arch) __NE___
     {
         for (usize i = 0; i < _queries.size(); ++i)
         {
diff --git a/AE/engine/src/ecs-st/Core/Registry.h b/AE/engine/src/ecs-st/Core/Registry.h
index a2c0af0e..1f340dc8 100644
--- a/AE/engine/src/ecs-st/Core/Registry.h
+++ b/AE/engine/src/ecs-st/Core/Registry.h
@@ -40,8 +40,8 @@ namespace AE::ECS
             using Ctor_t = void (*) (void *);
 
             Ctor_t      ctor        = null;
-            Bytes16u    align;
-            Bytes16u    size;
+            Byte16u     align;
+            Byte16u     size;
             bool        created     = false;
 
             DEBUG_ONLY(
diff --git a/AE/engine/src/ecs-st/Core/Registry.inl.h b/AE/engine/src/ecs-st/Core/Registry.inl.h
index c65c853c..6955d503 100644
--- a/AE/engine/src/ecs-st/Core/Registry.inl.h
+++ b/AE/engine/src/ecs-st/Core/Registry.inl.h
@@ -88,7 +88,9 @@ DEBUG_ONLY(
     namespace _reg_detail_
     {
         template <typename T>
-        class ComponentDbgView final : public Registry::IComponentDbgView
+        class ComponentDbgView final :
+            public Registry::IComponentDbgView,
+            public NothrowAllocatable
         {
         private:
             ArrayView< T >          _comps;
@@ -127,7 +129,7 @@ DEBUG_ONLY(
             comp.created    = true;
 
             DEBUG_ONLY(
-              comp.dbgView  = [] (void *ptr, usize count) -> Unique<IComponentDbgView> {
+              comp.dbgView  = [] (void* ptr, usize count) __NE___ -> Unique<IComponentDbgView> {
                                     return MakeUnique< _reg_detail_::ComponentDbgView<T> >( Cast<T>(ptr), count );
                                 };
             )
@@ -262,7 +264,7 @@ DEBUG_ONLY(
     _DecreaseStorageSize
 =================================================
 */
-    inline void  Registry::_DecreaseStorageSize (ArchetypeStorage *storage) __NE___
+    inline void  Registry::_DecreaseStorageSize (ArchetypeStorage* storage) __NE___
     {
         if ( storage->Count()*4 < storage->Capacity() )
         {
@@ -275,7 +277,7 @@ DEBUG_ONLY(
     _IncreaseStorageSize
 =================================================
 */
-    inline void  Registry::_IncreaseStorageSize (ArchetypeStorage *storage, usize addCount) __NE___
+    inline void  Registry::_IncreaseStorageSize (ArchetypeStorage* storage, usize addCount) __NE___
     {
         const usize new_size = storage->Count() + addCount;
 
@@ -357,7 +359,7 @@ DEBUG_ONLY(
     template <typename ...Types>
     void  Registry::RemoveComponents (QueryID query) __NE___
     {
-        STATIC_ASSERT( CountOf<Types...>() > 0 );
+        StaticAssert( CountOf<Types...>() > 0 );
 
         ArchetypeDesc   desc;
         (desc.Add<Types>(), ...);
@@ -394,11 +396,11 @@ DEBUG_ONLY(
     {
         DRC_EXLOCK( _drCheck );
 
-        STATIC_ASSERT( not IsEmpty<T> );
-        STATIC_ASSERT( std::is_standard_layout_v<T> );
-        STATIC_ASSERT( std::is_trivially_copyable_v<T> );
-        STATIC_ASSERT( std::is_trivially_destructible_v<T> );
-        STATIC_ASSERT( std::is_nothrow_destructible_v<T> );
+        StaticAssert( not IsEmpty<T> );
+        StaticAssert( std::is_standard_layout_v<T> );
+        StaticAssert( std::is_trivially_copyable_v<T> );
+        StaticAssert( IsTriviallyDestructible<T> );
+        StaticAssert( std::is_nothrow_destructible_v<T> );
 
         auto&   comp = _singleComponents[ TypeIdOf<T>() ];
         if ( not comp.data )
@@ -601,7 +603,7 @@ DEBUG_ONLY(
         template <typename ...Types>
         struct CheckForDuplicateComponents< Subtractive<Types...> >
         {
-            STATIC_ASSERT( CountOf<Types...>() > 0 );
+            StaticAssert( CountOf<Types...>() > 0 );
 
             template <usize I, typename ArgsList>
             static constexpr bool  Test () __NE___ {
@@ -612,7 +614,7 @@ DEBUG_ONLY(
         template <typename ...Types>
         struct CheckForDuplicateComponents< Require<Types...> >
         {
-            STATIC_ASSERT( CountOf<Types...>() > 0 );
+            StaticAssert( CountOf<Types...>() > 0 );
 
             template <usize I, typename ArgsList>
             static constexpr bool  Test () __NE___ {
@@ -623,7 +625,7 @@ DEBUG_ONLY(
         template <typename ...Types>
         struct CheckForDuplicateComponents< RequireAny<Types...> >
         {
-            STATIC_ASSERT( CountOf<Types...>() > 0 );
+            StaticAssert( CountOf<Types...>() > 0 );
 
             template <usize I, typename ArgsList>
             static constexpr bool  Test () __NE___ {
@@ -638,7 +640,7 @@ DEBUG_ONLY(
             if constexpr( I < ArgsList::Count )
             {
                 constexpr bool is_valid = CheckForDuplicateComponents< typename ArgsList::template Get<I> >::template Test< I, ArgsList >();
-                STATIC_ASSERT( is_valid );
+                StaticAssert( is_valid );
 
                 CheckForDuplicates< ArgsList, I+1 >();
             }
@@ -703,7 +705,7 @@ DEBUG_ONLY(
             if constexpr( I < ArgsList::Count )
             {
                 constexpr bool is_valid = SC_CheckForDuplicateComponents< typename ArgsList::template Get<I> >::template Test< ArgsList, I >();
-                STATIC_ASSERT( is_valid );
+                StaticAssert( is_valid );
 
                 SC_CheckForDuplicates< ArgsList, I+1 >();
             }
@@ -727,14 +729,14 @@ DEBUG_ONLY(
         {
             // check components
             using ChunkArray = typename Args::template Get<0>;
-            STATIC_ASSERT( IsSpecializationOf< ChunkArray, ArrayView >);
+            StaticAssert( IsSpecializationOf< ChunkArray, ArrayView >);
 
             using Chunk = typename ChunkArray::value_type;
-            STATIC_ASSERT( IsSpecializationOf< Chunk, Tuple >);
+            StaticAssert( IsSpecializationOf< Chunk, Tuple >);
 
             using ChunkTL = TypeList< Chunk >;
-            STATIC_ASSERT( ChunkTL::Count > 1 );
-            STATIC_ASSERT( IsSameTypes< typename ChunkTL::template Get<0>, usize >);
+            StaticAssert( ChunkTL::Count > 1 );
+            StaticAssert( IsSameTypes< typename ChunkTL::template Get<0>, usize >);
 
             using CompOnly = typename ChunkTL::PopFront::type;
             using SCTuple  = Tuple<>;
@@ -743,10 +745,10 @@ DEBUG_ONLY(
         template <typename Args>
         struct _SystemFnInfoImpl< Args, 2 > : _SystemFnInfoImpl< Args, 1 >
         {
-            STATIC_ASSERT( Args::Count == 2 );
+            StaticAssert( Args::Count == 2 );
 
             using SCTuple = typename Args::template Get<1>;
-            STATIC_ASSERT( IsSpecializationOf< SCTuple, Tuple >);
+            StaticAssert( IsSpecializationOf< SCTuple, Tuple >);
         };
 
         template <typename Fn>
@@ -801,7 +803,7 @@ DEBUG_ONLY(
     void  Registry::Execute (QueryID query, Fn &&fn) __NE___
     {
         using Args = typename FunctionInfo<Fn>::args;
-        STATIC_ASSERT( Args::Count > 0 );
+        StaticAssert( Args::Count > 0 );
 
         DRC_EXLOCK( _drCheck );
 
@@ -1037,7 +1039,7 @@ DEBUG_ONLY(
         template <typename ...Types>
         struct ArchetypeCompatibility< Subtractive<Types...> >
         {
-            STATIC_ASSERT( CountOf<Types...>() > 0 );
+            StaticAssert( CountOf<Types...>() > 0 );
 
             static bool  Test (const Archetype &arch) __NE___ {
                 return _Test<Types...>( arch );
@@ -1056,7 +1058,7 @@ DEBUG_ONLY(
         template <typename ...Types>
         struct ArchetypeCompatibility< Require<Types...> >
         {
-            STATIC_ASSERT( CountOf<Types...>() > 0 );
+            StaticAssert( CountOf<Types...>() > 0 );
 
             static bool  Test (const Archetype &arch) __NE___ {
                 return _Test<Types...>( arch );
@@ -1075,7 +1077,7 @@ DEBUG_ONLY(
         template <typename ...Types>
         struct ArchetypeCompatibility< RequireAny<Types...> >
         {
-            STATIC_ASSERT( CountOf<Types...>() > 0 );
+            StaticAssert( CountOf<Types...>() > 0 );
 
             static bool  Test (const Archetype &arch) __NE___ {
                 return _Test<Types...>( arch );
@@ -1256,7 +1258,7 @@ DEBUG_ONLY(
     void  Registry::AddEventListener (Fn &&fn) __NE___
     {
         DRC_EXLOCK( _drCheck );
-        STATIC_ASSERT( IsEmpty<Ev> );
+        StaticAssert( IsEmpty<Ev> );
 
         _eventListeners.insert({ TypeIdOf<Ev>(), EventListener_t{ FwdArg<Fn>(fn) }});
     }
@@ -1270,7 +1272,7 @@ DEBUG_ONLY(
     void  Registry::EnqueEvent () __NE___
     {
         DRC_EXLOCK( _drCheck );
-        STATIC_ASSERT( IsEmpty<Ev> );
+        StaticAssert( IsEmpty<Ev> );
 
         _pendingEvents.push_back( [this]()
         {
diff --git a/AE/engine/src/graphics/CMakeLists.txt b/AE/engine/src/graphics/CMakeLists.txt
index 2ee5910d..4f7b2893 100644
--- a/AE/engine/src/graphics/CMakeLists.txt
+++ b/AE/engine/src/graphics/CMakeLists.txt
@@ -19,16 +19,12 @@ if (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_METAL} OR ${AE_ENABLE_REMOTE_GRAPHICS})
         endif()
     endif()
 
-    if (APPLE AND NOT ${AE_ENABLE_METAL})
-        message( FATAL_ERROR "AE_ENABLE_METAL must be enabled" )
-    endif()
-
     if (${AE_ENABLE_METAL} OR (MSVC AND NOT ${AE_ENABLE_REMOTE_GRAPHICS}))
         file( GLOB_RECURSE METAL_HPP_SOURCES "Metal/*.h" )
         if (NOT (DEFINED ENGINE_LIBS_PATH))
             file( GLOB_RECURSE METAL_CPP_SOURCES "Metal/*.cpp" )
+            file( GLOB_RECURSE METAL_OBJC_SOURCES "Metal/*.mm" )
         endif()
-        file( GLOB_RECURSE METAL_OBJC_SOURCES "Metal/*.mm" )
     endif()
 
     if (MSVC OR ${AE_ENABLE_REMOTE_GRAPHICS})
@@ -110,6 +106,9 @@ if (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_METAL} OR ${AE_ENABLE_REMOTE_GRAPHICS})
         if (TARGET "RenderDoc-lib")
             target_link_libraries( "Graphics" PUBLIC "RenderDoc-lib" )
         endif()
+        if (WIN32 AND TARGET "NVPerf-lib")
+            target_link_libraries( "Graphics" PUBLIC "NVPerf-lib" )
+        endif()
 
         if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
             set( AE_VK_TIMELINE_SEMAPHORE OFF CACHE BOOL "Use Vulkan timeline semaphore" )
@@ -122,6 +121,15 @@ if (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_METAL} OR ${AE_ENABLE_REMOTE_GRAPHICS})
         else()
             target_compile_definitions( "Graphics" PUBLIC AE_VK_TIMELINE_SEMAPHORE=0 )
         endif()
+
+        if (APPLE)
+            if (NOT EXISTS "/usr/local/lib/libMoltenVK.dylib")
+                message( FATAL_ERROR "'/usr/local/lib/libMoltenVK.dylib' is not exists, instal VulkanSDK with MoltenVk and try again" )
+            endif()
+            if (NOT EXISTS "/usr/local/lib/libvulkan.dylib")
+                message( FATAL_ERROR "'/usr/local/lib/libvulkan.dylib' is not exists, instal VulkanSDK with MoltenVk and try again" )
+            endif()
+        endif()
     endif()
 
     if (${AE_ENABLE_METAL} OR MSVC)
@@ -131,12 +139,15 @@ if (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_METAL} OR ${AE_ENABLE_REMOTE_GRAPHICS})
             set_target_properties( "Graphics" PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO )
         else()
             set_source_files_properties( ${METAL_OBJC_SOURCES} PROPERTIES HEADER_FILE_ONLY TRUE )
+            set_source_files_properties( ${METAL_CPP_SOURCES}  PROPERTIES HEADER_FILE_ONLY TRUE )
         endif()
     endif()
 
     if (${AE_ENABLE_REMOTE_GRAPHICS})
         target_link_libraries( "Graphics" PUBLIC "Networking" )
-        target_compile_definitions( "Graphics" PRIVATE AE_ENABLE_REMOTE_GRAPHICS )
+        target_compile_definitions( "Graphics" PUBLIC AE_ENABLE_REMOTE_GRAPHICS )
+    else()
+        set_source_files_properties( ${REMOTE_CPP_SOURCES} PROPERTIES HEADER_FILE_ONLY TRUE )
     endif()
 
     EnablePCH( "Graphics" )
diff --git a/AE/engine/src/graphics/Private/AccumBarriers.h b/AE/engine/src/graphics/Private/AccumBarriers.h
new file mode 100644
index 00000000..9a88206f
--- /dev/null
+++ b/AE/engine/src/graphics/Private/AccumBarriers.h
@@ -0,0 +1,116 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#if defined(AE_ENABLE_VULKAN)
+#   define ACCUMBARRIER     VAccumBarriers
+#   define ACCUMDRAWBARRIER VAccumDrawBarriers
+
+#elif defined(AE_ENABLE_METAL)
+#   define ACCUMBARRIER     MAccumBarriers
+#   define ACCUMDRAWBARRIER MAccumDrawBarriers
+
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define ACCUMBARRIER     RAccumBarriers
+#   define ACCUMDRAWBARRIER RAccumDrawBarriers
+
+#else
+#   error not implemented
+#endif
+//-----------------------------------------------------------------------------
+
+
+namespace AE::Graphics::_hidden_
+{
+
+    //
+    // Accumulate Context Barriers
+    //
+    template <typename Ctx>
+    class ACCUMBARRIER final
+    {
+        friend Ctx;
+
+    // types
+    private:
+        using Self  = ACCUMBARRIER< Ctx >;
+
+    // variables
+    private:
+        Ctx &   _ctx;
+
+    // methods
+    private:
+        ACCUMBARRIER (Ctx &ctx)         __NE___ : _ctx{ctx} {}
+
+    public:
+        ACCUMBARRIER ()                         = delete;
+        ACCUMBARRIER (const Self &)             = delete;
+        ACCUMBARRIER (Self &&)          __NE___ = default;
+        ~ACCUMBARRIER ()                __Th___ { _ctx.CommitBarriers(); }
+
+        Self&&  BufferBarrier (BufferID buffer, EResourceState srcState, EResourceState dstState)                                                           rvTh___ { _ctx.BufferBarrier( buffer, srcState, dstState );             return RVRef(*this); }
+
+        Self&&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState)                                                              rvTh___ { _ctx.ImageBarrier( image, srcState, dstState );               return RVRef(*this); }
+        Self&&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState, const ImageSubresourceRange &subRes)                         rvTh___ { _ctx.ImageBarrier( image, srcState, dstState, subRes );       return RVRef(*this); }
+
+        Self&&  MemoryBarrier (EResourceState srcState, EResourceState dstState)                                                                            rvTh___ { _ctx.MemoryBarrier( srcState, dstState );                     return RVRef(*this); }
+        Self&&  MemoryBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                            rvTh___ { _ctx.MemoryBarrier( srcScope, dstScope );                     return RVRef(*this); }
+        Self&&  MemoryBarrier ()                                                                                                                            rvTh___ { _ctx.MemoryBarrier();                                         return RVRef(*this); }
+
+        Self&&  ExecutionBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                         rvTh___ { _ctx.ExecutionBarrier( srcScope, dstScope );                  return RVRef(*this); }
+        Self&&  ExecutionBarrier ()                                                                                                                         rvTh___ { _ctx.ExecutionBarrier();                                      return RVRef(*this); }
+
+        Self&&  AcquireBufferOwnership (BufferID buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                             rvTh___ { _ctx.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return RVRef(*this); }
+        Self&&  ReleaseBufferOwnership (BufferID buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                             rvTh___ { _ctx.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return RVRef(*this); }
+
+        Self&&  AcquireImageOwnership (ImageID image, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                                rvTh___ { _ctx.AcquireImageOwnership( image, srcQueue, srcState, dstState );                return RVRef(*this); }
+        Self&&  ReleaseImageOwnership (ImageID image, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                                rvTh___ { _ctx.ReleaseImageOwnership( image, srcState, dstState, dstQueue );                return RVRef(*this); }
+
+
+    #ifdef AE_ENABLE_VULKAN
+        Self&&  BufferBarrier (VkBuffer buffer, EResourceState srcState, EResourceState dstState)                                                           rvTh___ { _ctx.BufferBarrier( buffer, srcState, dstState );             return RVRef(*this); }
+
+        Self&&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, VkImageAspectFlags aspectMask)                               rvTh___ { _ctx.ImageBarrier( image, srcState, dstState, aspectMask );   return RVRef(*this); }
+        Self&&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, const VkImageSubresourceRange &subRes)                       rvTh___ { _ctx.ImageBarrier( image, srcState, dstState, subRes );       return RVRef(*this); }
+
+        Self&&  AcquireBufferOwnership (VkBuffer buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                             rvTh___ { _ctx.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return RVRef(*this); }
+        Self&&  ReleaseBufferOwnership (VkBuffer buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                             rvTh___ { _ctx.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return RVRef(*this); }
+
+        Self&&  AcquireImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EQueueType srcQueue, EResourceState srcState, EResourceState dstState) rvTh___ { _ctx.AcquireImageOwnership( image, aspectMask, srcQueue, srcState, dstState );    return RVRef(*this); }
+        Self&&  ReleaseImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EResourceState srcState, EResourceState dstState, EQueueType dstQueue) rvTh___ { _ctx.ReleaseImageOwnership( image, aspectMask, srcState, dstState, dstQueue );    return RVRef(*this); }
+    #endif
+    };
+
+
+
+    //
+    // Accumulate Draw Context Barriers
+    //
+    template <typename Ctx>
+    class ACCUMDRAWBARRIER final
+    {
+        friend Ctx;
+
+    // types
+    private:
+        using Self  = ACCUMDRAWBARRIER< Ctx >;
+
+    // variables
+    private:
+        Ctx &   _ctx;
+
+    // methods
+    private:
+        ACCUMDRAWBARRIER (Ctx &ctx)         __NE___ : _ctx{ctx} {}
+
+    public:
+        ACCUMDRAWBARRIER ()                         = delete;
+        ACCUMDRAWBARRIER (const Self &)             = delete;
+        ACCUMDRAWBARRIER (Self &&)          __NE___ = default;
+        ~ACCUMDRAWBARRIER ()                __Th___ { _ctx.CommitBarriers(); }
+
+        Self&&  AttachmentBarrier (AttachmentName name, EResourceState srcState, EResourceState dstState)   rvTh___ { _ctx.AttachmentBarrier( name, srcState, dstState ); return RVRef(*this); }
+    };
+
+
+} // AE::Graphics::_hidden_
+
diff --git a/AE/engine/src/graphics/Private/AccumDeferredBarriers.h b/AE/engine/src/graphics/Private/AccumDeferredBarriers.h
new file mode 100644
index 00000000..63948341
--- /dev/null
+++ b/AE/engine/src/graphics/Private/AccumDeferredBarriers.h
@@ -0,0 +1,154 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#if defined(AE_ENABLE_VULKAN)
+#   define COMMANDBATCH                 VCommandBatch
+#   define BARRIERMANAGER               VBarrierManager
+#   define ACCUMDEFERREDBARRIERS        VAccumDeferredBarriers
+#   define ACCUMDEFERREDBARRIERSFORCTX  VAccumDeferredBarriersForCtx
+#   define ACCUMBARRIERSFORTASK         VAccumBarriersForTask
+
+#elif defined(AE_ENABLE_METAL)
+#   define COMMANDBATCH                 MCommandBatch
+#   define BARRIERMANAGER               MBarrierManager
+#   define ACCUMDEFERREDBARRIERS        MAccumDeferredBarriers
+#   define ACCUMDEFERREDBARRIERSFORCTX  MAccumDeferredBarriersForCtx
+#   define ACCUMBARRIERSFORTASK         MAccumBarriersForTask
+
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define COMMANDBATCH                 RCommandBatch
+#   define BARRIERMANAGER               RBarrierManager
+#   define ACCUMDEFERREDBARRIERS        RAccumDeferredBarriers
+#   define ACCUMDEFERREDBARRIERSFORCTX  RAccumDeferredBarriersForCtx
+#   define ACCUMBARRIERSFORTASK         RAccumBarriersForTask
+
+#else
+#   error not implemented
+#endif
+//-----------------------------------------------------------------------------
+
+
+namespace AE::Graphics
+{
+namespace _hidden_
+{
+
+
+    //
+    // Accumulate Deferred Barriers
+    //
+    class ACCUMDEFERREDBARRIERS
+    {
+    // types
+    private:
+        using Self  = ACCUMDEFERREDBARRIERS;
+
+    // variables
+    protected:
+        BARRIERMANAGER      _mngr;
+
+    // methods
+    protected:
+        ACCUMDEFERREDBARRIERS (COMMANDBATCH &batch)     __NE___ : _mngr{batch} {}
+
+    public:
+        ACCUMDEFERREDBARRIERS ()                                = delete;
+        ACCUMDEFERREDBARRIERS (const Self &)                    = delete;
+        ACCUMDEFERREDBARRIERS (Self &&)                 __NE___ = default;
+        ~ACCUMDEFERREDBARRIERS ()                       __NE___ { ASSERT( _mngr.NoPendingBarriers() ); }
+
+        Self&  Merge (INOUT ACCUMDEFERREDBARRIERS &src)                                                                                                     __NE___ { _mngr.MergeBarriers( src._mngr );  src._mngr.ClearBarriers(); return *this; }
+
+        Self&  BufferBarrier (BufferID buffer, EResourceState srcState, EResourceState dstState)                                                            __NE___ { _mngr.BufferBarrier( buffer, srcState, dstState );            return *this; }
+
+        Self&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState)                                                               __NE___ { _mngr.ImageBarrier( image, srcState, dstState );              return *this; }
+        Self&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState, const ImageSubresourceRange &subRes)                          __NE___ { _mngr.ImageBarrier( image, srcState, dstState, subRes );      return *this; }
+
+        Self&  MemoryBarrier (EResourceState srcState, EResourceState dstState)                                                                             __NE___ { _mngr.MemoryBarrier( srcState, dstState );                    return *this; }
+        Self&  MemoryBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                             __NE___ { _mngr.MemoryBarrier( srcScope, dstScope );                    return *this; }
+        Self&  MemoryBarrier ()                                                                                                                             __NE___ { _mngr.MemoryBarrier();                                        return *this; }
+
+        Self&  ExecutionBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                          __NE___ { _mngr.ExecutionBarrier( srcScope, dstScope );                 return *this; }
+        Self&  ExecutionBarrier ()                                                                                                                          __NE___ { _mngr.ExecutionBarrier();                                     return *this; }
+
+        Self&  AcquireBufferOwnership (BufferID buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                              __NE___ { _mngr.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return *this; }
+        Self&  ReleaseBufferOwnership (BufferID buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                              __NE___ { _mngr.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return *this; }
+
+        Self&  AcquireImageOwnership (ImageID image, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                                 __NE___ { _mngr.AcquireImageOwnership( image, srcQueue, srcState, dstState );               return *this; }
+        Self&  ReleaseImageOwnership (ImageID image, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                                 __NE___ { _mngr.ReleaseImageOwnership( image, srcState, dstState, dstQueue );               return *this; }
+
+
+    #ifdef AE_ENABLE_VULKAN
+        Self&  BufferBarrier (VkBuffer buffer, EResourceState srcState, EResourceState dstState)                                                            __NE___ { _mngr.BufferBarrier( buffer, srcState, dstState );            return *this; }
+
+        Self&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, VkImageAspectFlags aspectMask)                                __NE___ { _mngr.ImageBarrier( image, srcState, dstState, aspectMask );  return *this; }
+        Self&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, const VkImageSubresourceRange &subRes)                        __NE___ { _mngr.ImageBarrier( image, srcState, dstState, subRes );      return *this; }
+
+        Self&  AcquireBufferOwnership (VkBuffer buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                              __NE___ { _mngr.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return *this; }
+        Self&  ReleaseBufferOwnership (VkBuffer buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                              __NE___ { _mngr.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return *this; }
+
+        Self&  AcquireImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)  __NE___ { _mngr.AcquireImageOwnership( image, aspectMask, srcQueue, srcState, dstState );   return *this; }
+        Self&  ReleaseImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)  __NE___ { _mngr.ReleaseImageOwnership( image, aspectMask, srcState, dstState, dstQueue );   return *this; }
+    #endif
+    };
+
+
+
+    //
+    // Accumulate Deferred Barriers for Context
+    //
+    template <typename Ctx>
+    class ACCUMDEFERREDBARRIERSFORCTX final : public ACCUMDEFERREDBARRIERS
+    {
+        friend Ctx;
+
+    // variables
+    private:
+        Ctx &   _ctx;
+
+    // methods
+    private:
+        ACCUMDEFERREDBARRIERSFORCTX (COMMANDBATCH &batch, Ctx &ctx) __NE___ : ACCUMDEFERREDBARRIERS{batch}, _ctx{ctx} {}
+    public:
+        void  Commit () __Th___
+        {
+            auto*   bar = _mngr.GetBarriers();
+            if_likely( bar != null )
+            {
+                _ctx.PipelineBarrier( *bar );
+                _mngr.ClearBarriers();
+            }
+        }
+    };
+
+
+
+    //
+    // Accumulate Barriers for Task
+    //
+    class ACCUMBARRIERSFORTASK final : public ACCUMDEFERREDBARRIERS
+    {
+    // methods
+    public:
+        explicit ACCUMBARRIERSFORTASK (COMMANDBATCH &batch) __NE___ : ACCUMDEFERREDBARRIERS{batch} {}
+
+        ACCUMBARRIERSFORTASK (ACCUMBARRIERSFORTASK &&)      __NE___ = default;
+
+        ND_ const auto*  Get ()                             __NE___ { return _mngr.AllocBarriers(); }
+    };
+
+
+} // _hidden_
+
+/*
+=================================================
+    DeferredBarriers
+=================================================
+*/
+    inline _hidden_::ACCUMBARRIERSFORTASK  COMMANDBATCH::DeferredBarriers () __NE___
+    {
+        ASSERT( IsRecording() );
+        return _hidden_::ACCUMBARRIERSFORTASK{ *this };
+    }
+
+
+} // AE::Graphics
diff --git a/AE/engine/src/graphics/Private/CommandBatch.cpp.h b/AE/engine/src/graphics/Private/CommandBatch.cpp.h
index 03b0fa59..50aee710 100644
--- a/AE/engine/src/graphics/Private/CommandBatch.cpp.h
+++ b/AE/engine/src/graphics/Private/CommandBatch.cpp.h
@@ -11,6 +11,10 @@
 #   define SUFFIX           M
 #   define CMDBATCH         MCommandBatch
 
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define SUFFIX           R
+#   define CMDBATCH         RCommandBatch
+
 #else
 #   error not implemented
 #endif
@@ -77,7 +81,7 @@
         })
 
         MemoryBarrier( EMemoryOrder::Release );
-        RenderTaskScheduler_t::CommandBatchApi::Recycle( _indexInPool );
+        RenderTaskScheduler::CommandBatchApi::Recycle( this );
     }
 
 /*
@@ -93,14 +97,16 @@
         CHECK_ERR( _cmdPool.IsReady() );
 
       #if defined(AE_ENABLE_VULKAN)
-        CHECK_ERR( _cmdPool.CommitIndirectBuffers( RenderTaskScheduler().GetCommandPoolManager(), GetQueueType(), GetCmdBufType() ));
+        CHECK_ERR( _cmdPool.CommitIndirectBuffers( GraphicsScheduler().GetCommandPoolManager(), GetQueueType(), GetCmdBufType() ));
       #elif defined(AE_ENABLE_METAL)
         CHECK_ERR( _cmdPool.CommitIndirectBuffers( GetQueueType(), GetCmdBufType() ));
+      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+        CHECK_ERR( _cmdPool.CommitIndirectBuffers( GetQueueType(), GetCmdBufType() ));
       #else
       # error not implemented
       #endif
 
-        RenderTaskScheduler_t::CommandBatchApi::Submit( *this, _submitMode );
+        RenderTaskScheduler::CommandBatchApi::Submit( *this, _submitMode );
         return true;
     }
 
@@ -237,6 +243,6 @@
 #if AE_DBG_GRAPHICS
     void  RenderTask::_DbgCheckFrameId () C_NE___
     {
-        RenderTaskScheduler().DbgCheckFrameId( GetFrameId(), DbgFullName() );
+        GraphicsScheduler().DbgCheckFrameId( GetFrameId(), DbgFullName() );
     }
 #endif
diff --git a/AE/engine/src/graphics/Private/CommandBatch.h b/AE/engine/src/graphics/Private/CommandBatch.h
index 35893efe..f09dbf6d 100644
--- a/AE/engine/src/graphics/Private/CommandBatch.h
+++ b/AE/engine/src/graphics/Private/CommandBatch.h
@@ -3,21 +3,21 @@
     Command batch allows to records multiple command buffers in parallel and submit them as a single batch.
     Software command buffers are supported to and will be automatically recorded to Vulkan command buffer before submitting.
 
-        Dependencies.
+    --- Dependencies ---
 
     Dependencies are added to the whole batch.
 
     Batch in graphics queue depends on batch in compute/transfer queue -> insert semaphore dependency.
     Batch depends on batch in the same queue -> use 'submitIdx' to manually reorder batches.
 
-        CmdBatchOnSubmit.
+    --- CmdBatchOnSubmit ---
 
     Used as AsyncTask input dependency to run task when command batch was submitted to the GPU.
     For example for present image in swapchain.
 
     Warning: don't use CmdBatchOnSubmit with deferred submission!
 
-        Resource state tracking.
+    --- Resource state tracking ---
 
     Use 'DeferredBarriers()' and 'initialBarriers' & 'finalBarriers' arguments in 'Run()' method
     to transit states in batch planning stage.
@@ -49,15 +49,20 @@ namespace AE::RG::_hidden_ { class RGCommandBatchPtr; }
 namespace AE::Threading::_hidden_ { class RenderTaskCoro; }
 #endif
 
+namespace AE::Graphics::_hidden_
+{
+    class AE_PRIVATE_UNITE_RAW( SUFFIX, AccumBarriersForTask );
+}
+
 namespace AE::Graphics
 {
 
     //
     // Command Batch
     //
-    class CMDBATCH final : public IDeviceToHostSync
+    class CMDBATCH final : public EnableRC< CMDBATCH >
     {
-        friend class AE_PRIVATE_UNITE_RAW( SUFFIX, RenderTaskScheduler );
+        friend class RenderTaskScheduler;
         friend class AE_PRIVATE_UNITE_RAW( SUFFIX, DrawCommandBatch );
         friend class RenderTask;
         friend struct CmdBatchOnSubmit;
@@ -137,8 +142,6 @@ namespace AE::Graphics
       # error not implemented
       #endif
 
-        using RenderTaskScheduler_t = AE_PRIVATE_UNITE_RAW( SUFFIX, RenderTaskScheduler );
-
 
         //
         // Submit Batch Task
@@ -173,7 +176,6 @@ namespace AE::Graphics
         // variables
         private:
             Atomic<bool>    _complete       {false};
-            ubyte           _indexInPool    = UMax;
             VkFence         _fence          = Default;
 
 
@@ -187,7 +189,7 @@ namespace AE::Graphics
             ND_ bool    IsCompleted (const VDevice &dev)                __NE___;
             ND_ bool    Wait (const VDevice &dev, nanoseconds timeout)  __NE___;
 
-            ND_ bool    Create (const VDevice &dev, uint indexInPool)   __NE___;
+            ND_ bool    Create (const VDevice &dev)                     __NE___;
 
                 void    _ReleaseObject ()                               __NE_OV;
         };
@@ -229,7 +231,6 @@ namespace AE::Graphics
 
         FrameUID                    _frameId;
         EQueueType                  _queueType      = Default;
-        const ubyte                 _indexInPool;
         ubyte                       _submitIdx      = UMax;
         ESubmitMode                 _submitMode     = ESubmitMode::Auto;
 
@@ -284,7 +285,8 @@ namespace AE::Graphics
 
     // methods
     public:
-        ~CMDBATCH ()                                                            __NE___;
+        CMDBATCH ()                                                             __NE___;
+        ~CMDBATCH ()                                                            __NE_OV;
 
 
     // user api (thread safe)
@@ -380,17 +382,12 @@ namespace AE::Graphics
             ND_ Ptr<IGraphicsProfiler>  GetProfiler ()                          C_NE___ { return _profiler.get(); }
         )
 
-
-    // IDeviceToHostSync
-    public:
-        ND_ bool  Wait (nanoseconds timeout)                                    __NE_OV;
-        ND_ bool  IsCompleted ()                                                __NE_OV { return _status.load() == EStatus::Completed; }
+        ND_ bool  Wait (nanoseconds timeout)                                    __NE___;
+        ND_ bool  IsCompleted ()                                                __NE___ { return _status.load() == EStatus::Completed; }
 
 
     // render task scheduler api
     private:
-        explicit CMDBATCH (uint indexInPool)                                    __NE___;
-
         ND_ bool  _Create (EQueueType queue, FrameUID frameId, uint submitIdx,
                            DebugLabel dbg, void* userData)                      __NE___;
             void  _OnSubmit2 ()                                                 __NE___;
@@ -484,7 +481,7 @@ namespace AE::Graphics
                                   const TaskBarriers_t* finalBarriers,
                                   Bool                  submitBatchAtTheEnd) __NE___
     {
-        STATIC_ASSERT( IsBaseOf< RenderTask, RemoveRC<TaskType> >);
+        StaticAssert( IsBaseOf< RenderTask, RemoveRC<TaskType> >);
         CHECK_ERR( IsRecording(), Scheduler().GetCanceledTask() );
 
         if_likely( task )
@@ -511,7 +508,7 @@ namespace AE::Graphics
                               Bool                  submitBatchAtTheEnd,
                               DebugLabel            dbg) __NE___
     {
-        STATIC_ASSERT( IsBaseOf< RenderTask, TaskType >);
+        StaticAssert( IsBaseOf< RenderTask, TaskType >);
         CHECK_ERR( IsRecording(), Scheduler().GetCanceledTask() );
 
         DBG_GRAPHICS_ONLY(
@@ -519,19 +516,16 @@ namespace AE::Graphics
                 dbg.color = _dbgColor;
         )
 
-        // RenderTask internally calls '_cmdPool.Acquire()' and throw exception on pool overflow.
-        // RenderTask internally creates command buffer and throw exception if can't.
-        try {
-            auto    task = ctorArgs.Apply([this, dbg] (auto&& ...args)
-                                          { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)..., GetRC(), dbg ); });   // throw
+        auto    task = ctorArgs.Apply([this, dbg] (auto&& ...args) __NE___
+                                      { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)..., GetRC(), dbg ); });
 
+        if_likely( task and task->IsValid() )
+        {
             _InitTask( *task, initialBarriers, finalBarriers, submitBatchAtTheEnd );
 
             if_likely( Scheduler().Run( task, deps ))
                 return task;
         }
-        catch(...) {}
-
         return Scheduler().GetCanceledTask();
     }
 
@@ -574,13 +568,10 @@ namespace AE::Graphics
                 dbg.color = _dbgColor;
         )
 
-        // RenderTask internally calls '_cmdPool.Acquire()' and return error on pool overflow.
-        // RenderTask internally creates command buffer and throw exception if can't.
-
-        auto&   rtask = coro.AsRenderTask();
-        CHECK_ERR( rtask._Init( GetRC<CMDBATCH>(), dbg ),  Scheduler().GetCanceledTask() );
+        auto&   task = coro.AsRenderTask();
+        CHECK_ERR( task._Init( GetRC<CMDBATCH>(), dbg ),  Scheduler().GetCanceledTask() );
 
-        _InitTask( rtask, initialBarriers, finalBarriers, submitBatchAtTheEnd );
+        _InitTask( task, initialBarriers, finalBarriers, submitBatchAtTheEnd );
 
         if_likely( Scheduler().Run( AsyncTask{coro}, deps ))
             return coro;
diff --git a/AE/engine/src/graphics/Private/ContextValidation.cpp b/AE/engine/src/graphics/Private/ContextValidation.cpp
index 269851e4..6e2c4542 100644
--- a/AE/engine/src/graphics/Private/ContextValidation.cpp
+++ b/AE/engine/src/graphics/Private/ContextValidation.cpp
@@ -16,7 +16,7 @@ namespace AE::Graphics::_hidden_
 namespace
 {
     ND_ static FeatureSet const&  _GetFeatureSet () __NE___ {
-        return RenderTaskScheduler().GetFeatureSet();
+        return GraphicsScheduler().GetFeatureSet();
     }
 
 /*
@@ -136,20 +136,20 @@ namespace
 
 #ifdef AE_ENABLE_VULKAN
     ND_ static auto const&  _GetDeviceExtensions () __NE___ {
-        return RenderTaskScheduler().GetDevice().GetVExtensions();
+        return GraphicsScheduler().GetDevice().GetVExtensions();
     }
 
     ND_ static auto const&  _GetVkDeviceProperties () __NE___ {
-        return RenderTaskScheduler().GetDevice().GetVProperties();
+        return GraphicsScheduler().GetDevice().GetVProperties();
     }
 #endif
 
     ND_ static auto const&  _GetRayTracingProps () __NE___ {
-        return RenderTaskScheduler().GetDevice().GetDeviceProperties().rayTracing;
+        return GraphicsScheduler().GetDevice().GetDeviceProperties().rayTracing;
     }
 
     ND_ static auto const&  _GetResourceProps () __NE___ {
-        return RenderTaskScheduler().GetDevice().GetDeviceProperties().res;
+        return GraphicsScheduler().GetDevice().GetDeviceProperties().res;
     }
 
 } // namespace
@@ -603,15 +603,16 @@ namespace
         ASSERT( not ranges.empty() );
         GCTX_CHECK( IsDeviceMemory( imgDesc ));
         GCTX_CHECK( AllBits( imgDesc.usage, EImageUsage::Transfer ));
+        GCTX_CHECK( imgDesc.maxLevel.Get() > 1 );
 
         for (auto& range : ranges)
         {
             GCTX_CHECK( AllBits( imgDesc.options, EImageOpt::BlitSrc | EImageOpt::BlitDst ));
             GCTX_CHECK( range.aspectMask == EPixelFormat_ToImageAspect( imgDesc.format ));
             GCTX_CHECK( range.baseLayer.Get() < imgDesc.arrayLayers.Get() );
-            GCTX_CHECK( range.layerCount <= (imgDesc.arrayLayers.Get() - range.baseLayer.Get()) );
+            GCTX_CHECK( range.layerCount + range.baseLayer.Get() <= imgDesc.arrayLayers.Get() );
             GCTX_CHECK( range.baseMipLevel.Get() < imgDesc.maxLevel.Get() );
-            GCTX_CHECK( range.mipmapCount <= (imgDesc.maxLevel.Get() - range.baseMipLevel.Get()) );
+            GCTX_CHECK( range.baseMipLevel.Get() + range.mipmapCount <= imgDesc.maxLevel.Get() );
         }
     }
 
@@ -647,7 +648,7 @@ namespace
     }
 
 # ifdef AE_ENABLE_VULKAN
-    void  ComputeContextValidation::PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    void  ComputeContextValidation::PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         GCTX_CHECK( size > 0 );
         GCTX_CHECK( IsMultipleOf( size, 4 ));
@@ -745,7 +746,7 @@ namespace
     }
 
 # ifdef AE_ENABLE_VULKAN
-    void  DrawContextValidation::PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    void  DrawContextValidation::PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         GCTX_CHECK( size > 0 );
         GCTX_CHECK( IsMultipleOf( size, 4 ));
@@ -1200,7 +1201,7 @@ namespace
     SetDepthBounds
 =================================================
 */
-    void  DrawContextValidation::SetDepthBounds (EPipelineDynamicState dynState) __Th___
+    void  DrawContextValidation::SetDepthBounds (EPipelineDynamicState) __Th___
     {
         GCTX_CHECK( DepthBoundsSupported() );
         //GCTX_CHECK( AllBits( dynState, EPipelineDynamicState::DepthBounds ));     // TODO
@@ -1458,7 +1459,7 @@ namespace
 # ifdef AE_ENABLE_VULKAN
     void  ASBuildContextValidation::ReadProperty (ERTASProperty property) __Th___
     {
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         BEGIN_ENUM_CHECKS();
         switch ( property )
@@ -1475,7 +1476,7 @@ namespace
 
     void  ASBuildContextValidation::WriteProperty (ERTASProperty property, const BufferDesc &dstBufferDesc, Bytes dstOffset, Bytes size) __Th___
     {
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         BEGIN_ENUM_CHECKS();
         switch ( property )
diff --git a/AE/engine/src/graphics/Private/Defines.h b/AE/engine/src/graphics/Private/Defines.h
index 463acb53..7fb4418a 100644
--- a/AE/engine/src/graphics/Private/Defines.h
+++ b/AE/engine/src/graphics/Private/Defines.h
@@ -6,7 +6,7 @@
 
 #ifdef AE_CFG_RELEASE
 #   define AE_DBG_GRAPHICS              0
-#   define DBG_GRAPHICS_ONLY( ... )     
+#   define DBG_GRAPHICS_ONLY( ... )
 #else
 #   define AE_DBG_GRAPHICS              1
 #   define DBG_GRAPHICS_ONLY( ... )     __VA_ARGS__
diff --git a/AE/engine/src/graphics/Private/DescriptorSetLayout.h b/AE/engine/src/graphics/Private/DescriptorSetLayout.h
index 2474aba9..f8080f59 100644
--- a/AE/engine/src/graphics/Private/DescriptorSetLayout.h
+++ b/AE/engine/src/graphics/Private/DescriptorSetLayout.h
@@ -30,7 +30,7 @@
         template <EDescriptorType DescType>
         ND_ Uniforms_t                  GetUniformRange ()      C_NE___
         {
-            STATIC_ASSERT(  DescType != EDescriptorType::ImmutableSampler and
+            StaticAssert(   DescType != EDescriptorType::ImmutableSampler and
                             DescType <  EDescriptorType::_Count );
 
             const bool      has_upd_tmpl = _uniforms.Get<3>() != null;
diff --git a/AE/engine/src/graphics/Private/DeviceProperties.cpp b/AE/engine/src/graphics/Private/DeviceProperties.cpp
index f3cd4463..c39b09b7 100644
--- a/AE/engine/src/graphics/Private/DeviceProperties.cpp
+++ b/AE/engine/src/graphics/Private/DeviceProperties.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "graphics/Public/DeviceProperties.h"
+#include "graphics/Private/EnumToString.h"
 
 #ifdef AE_ENABLE_VULKAN
 # include "graphics/Vulkan/VDevice.h"
@@ -131,7 +132,7 @@ namespace
 */
     bool  DeviceProperties::CompareWithConstant (AnyTypeCRef vkExt_mtlFS) C_NE___
     {
-        STATIC_ASSERT( sizeof(DeviceProperties) == 88 );
+        StaticAssert( sizeof(DeviceProperties) == 88 );
 
         const auto  CheckLimitLess = [] (auto curr, auto constant, const char* name)
         {{
@@ -171,7 +172,7 @@ namespace
 
         bool    result = true;
 
-        STATIC_ASSERT( sizeof(res) == 24 );
+        StaticAssert( sizeof(res) == 24 );
         {
             #undef CMP_L
             #undef CMP_G
@@ -194,7 +195,7 @@ namespace
             CMP_L( minBufferCopyRowPitchAlign );
         }
 
-        STATIC_ASSERT( sizeof(rayTracing) == 48 );
+        StaticAssert( sizeof(rayTracing) == 48 );
         if ( accel_struct )
         {
             #undef CMP_L
@@ -237,7 +238,7 @@ namespace
 
         // resource alignment
         {
-            STATIC_ASSERT( sizeof(res) == 24 );
+            StaticAssert( sizeof(res) == 24 );
 
             const auto&     limits  = vk_props.properties.limits;
 
@@ -271,7 +272,7 @@ namespace
 
         if ( vk_ext.accelerationStructure )
         {
-            STATIC_ASSERT( sizeof(rayTracing) == 48 );
+            StaticAssert( sizeof(rayTracing) == 48 );
 
             const auto&     ac_props    = vk_props.accelerationStructureProps;
             const auto&     rt_props    = vk_props.rayTracingPipelineProps;
@@ -296,7 +297,7 @@ namespace
 
         // shader HW
         {
-            STATIC_ASSERT( sizeof(shaderHW) == sizeof(uint)*3 );
+            StaticAssert( sizeof(shaderHW) == sizeof(uint)*3 );
 
             // AMD
             if ( vk_ext.shaderCorePropsAMD )
@@ -350,7 +351,7 @@ namespace
 
         // resource alignment
         {
-            STATIC_ASSERT( sizeof(res) == 24 );
+            StaticAssert( sizeof(res) == 24 );
 
             res.minUniformBufferOffsetAlign         = POTBytes{ mtl_props.minUniformBufferOffsetAlign };
             res.minStorageBufferOffsetAlign         = POTBytes{ mtl_props.minStorageBufferOffsetAlign };
@@ -360,7 +361,7 @@ namespace
             res.maxVerticesPerRenderPass            = POTValue{ UMax };     // not defined
             res.minVertexBufferOffsetAlign          = POTBytes{ 4_b };
             res.minVertexBufferElementsAlign        = 1;                    // TODO
-            res.maxUniformBufferRange               = LimitCast<Bytes32u>(mtl_props.maxBufferSize);
+            res.maxUniformBufferRange               = LimitCast<Byte32u>(mtl_props.maxBufferSize);
             res.maxBoundDescriptorSets              = 31;                   // minus VBcount
             res.minMemoryMapAlign                   = POTBytes{ Max( mtl_props.minUniformBufferOffsetAlign, mtl_props.minStorageBufferOffsetAlign )};
             res.minNonCoherentAtomSize              = POTBytes{ res.minMemoryMapAlign };
@@ -370,7 +371,7 @@ namespace
 
         if ( mtl_feats.accelerationStructure() )
         {
-            STATIC_ASSERT( sizeof(rayTracing) == 48 );
+            StaticAssert( sizeof(rayTracing) == 48 );
 
             const POTBytes      buf_align   {mtl_props.minStorageBufferOffsetAlign};
 
@@ -421,7 +422,7 @@ namespace
 
         // shader HW
         {
-            STATIC_ASSERT( sizeof(shaderHW) == sizeof(uint)*3 );
+            StaticAssert( sizeof(shaderHW) == sizeof(uint)*3 );
 
             if ( HasSubStringIC( devName, "Apple" ))
                 InitAppleShaderHWProperties( OUT shaderHW, devName );
@@ -437,12 +438,13 @@ namespace
 */
     void  DeviceProperties::Print () C_NE___
     {
-        try {
+    #ifdef AE_ENABLE_LOGS
+        TRY{
             String  str = "\nDeviceProperties:";
 
             // resource alignment
             {
-                STATIC_ASSERT( sizeof(res) == 24 );
+                StaticAssert( sizeof(res) == 24 );
                 str << "\n  ResourceAlignment:"
                     << "\n    minUniformBufferOffsetAlign: . . . " << ToString( Bytes{ res.minUniformBufferOffsetAlign })
                     << "\n    minStorageBufferOffsetAlign:       " << ToString( Bytes{ res.minStorageBufferOffsetAlign })
@@ -463,7 +465,7 @@ namespace
 
             // ray tracing
             {
-                STATIC_ASSERT( sizeof(rayTracing) == 48 );
+                StaticAssert( sizeof(rayTracing) == 48 );
                 str << "\n  RayTracingProperties:"
                     << "\n    vertexDataAlign: . . . . . . . . . " << ToString( Bytes{ rayTracing.vertexDataAlign })
                     << "\n    vertexStrideAlign:                 " << ToString( Bytes{ rayTracing.vertexStrideAlign })
@@ -484,7 +486,7 @@ namespace
 
             // shader HW
             {
-                STATIC_ASSERT( sizeof(shaderHW) == sizeof(uint)*3 );
+                StaticAssert( sizeof(shaderHW) == sizeof(uint)*3 );
                 str << "\n  ShaderHWProperties:"
                     << "\n    cores: . . . . . . . . . . . . . . " << ToString( shaderHW.cores )
                     << "\n    warpsPerCore:                      " << ToString( shaderHW.warpsPerCore )
@@ -495,8 +497,32 @@ namespace
             }
 
             AE_LOGI( str );
-        } catch(...)
-        {}
+        }
+        CATCH_ALL()
+    #endif
+    }
+
+/*
+=================================================
+    Print
+=================================================
+*/
+    void  DeviceResourceFlags::Print () C_NE___
+    {
+    #ifdef AE_ENABLE_LOGS
+        TRY{
+            String  str;
+
+            str << "memory types:";
+
+            for (EMemoryType mem : memTypes) {
+                str << "\n  " << ToString( mem );
+            }
+
+            AE_LOGI( str );
+        }
+        CATCH_ALL()
+    #endif
     }
 
 
diff --git a/AE/engine/src/graphics/Private/DrawCommandBatch.cpp.h b/AE/engine/src/graphics/Private/DrawCommandBatch.cpp.h
index f14d8b2d..62e5900e 100644
--- a/AE/engine/src/graphics/Private/DrawCommandBatch.cpp.h
+++ b/AE/engine/src/graphics/Private/DrawCommandBatch.cpp.h
@@ -47,7 +47,7 @@
         _scissors       = scissors;
 
         DBG_GRAPHICS_ONLY(
-            _profiler = RenderTaskScheduler().GetProfiler();
+            _profiler = GraphicsScheduler().GetProfiler();
             if ( _profiler )
                 _profiler->BeginDrawBatch( this, dbg.label );
 
@@ -92,5 +92,5 @@
             _profiler = null;
         )
         MemoryBarrier( EMemoryOrder::Release );
-        RenderTaskScheduler_t::DrawCommandBatchApi::Recycle( _indexInPool );
+        RenderTaskScheduler::DrawCommandBatchApi::Recycle( this );
     }
diff --git a/AE/engine/src/graphics/Private/DrawCommandBatch.h b/AE/engine/src/graphics/Private/DrawCommandBatch.h
index 8660b934..5f5a014a 100644
--- a/AE/engine/src/graphics/Private/DrawCommandBatch.h
+++ b/AE/engine/src/graphics/Private/DrawCommandBatch.h
@@ -31,13 +31,12 @@ namespace AE::Graphics
     class DRAWCMDBATCH final : public EnableRC< DRAWCMDBATCH >
     {
         friend class DrawTask;
-        friend class AE_PRIVATE_UNITE_RAW( SUFFIX, RenderTaskScheduler );
+        friend class RenderTaskScheduler;
 
     // types
     private:
         using CmdBufPool_t          = AE_PRIVATE_UNITE_RAW( SUFFIX, CommandBatch )::CmdBufPool;
         using PrimaryCmdBufState_t  = AE_PRIVATE_UNITE_RAW( SUFFIX, PrimaryCmdBufState );
-        using RenderTaskScheduler_t = AE_PRIVATE_UNITE_RAW( SUFFIX, RenderTaskScheduler );
 
       #if defined(AE_ENABLE_VULKAN)
         using Viewport_t            = VkViewport;
@@ -86,8 +85,6 @@ namespace AE::Graphics
         Encoder_t               _encoder;
       #endif
 
-        const ubyte             _indexInPool;
-
         PrimaryCmdBufState_t    _primaryState;
 
         Viewports_t             _viewports;
@@ -102,6 +99,7 @@ namespace AE::Graphics
 
     // methods
     public:
+        DRAWCMDBATCH ()                                         __NE___ {}
 
         template <typename TaskType, typename ...Ctor, typename ...Deps>
         AsyncTask   Run (Tuple<Ctor...> &&      ctor    = Default,
@@ -136,10 +134,6 @@ namespace AE::Graphics
 
     // render task scheduler api
     private:
-        explicit DRAWCMDBATCH (uint indexInPool)                __NE___ :
-            _indexInPool{ CheckCast<ubyte>( indexInPool )}
-        {}
-
         bool  _Create (const PrimaryCmdBufState_t &primaryState,
                        ArrayView<Viewport_t> viewports, ArrayView<Scissor_t> scissors,
                        DebugLabel dbg)                          __NE___;
@@ -206,7 +200,7 @@ namespace AE::Graphics
                                   const Tuple<Deps...>& deps,
                                   DebugLabel            dbg) __NE___
     {
-        STATIC_ASSERT( IsBaseOf< DrawTask, TaskType >);
+        StaticAssert( IsBaseOf< DrawTask, TaskType >);
         CHECK_ERR( IsRecording(), Scheduler().GetCanceledTask() );
 
         DBG_GRAPHICS_ONLY(
@@ -214,17 +208,14 @@ namespace AE::Graphics
                 dbg.color = _dbgColor;
         )
 
-        // DrawTask internally calls '_cmdPool.Acquire()' and throw exception on pool overflow.
-        // DrawTask internally creates command buffer and throw exception if can't.
-        try {
-            auto    task = ctorArgs.Apply([this, dbg] (auto&& ...args)
-                                          { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)..., GetRC(), dbg ); });   // throw
+        auto    task = ctorArgs.Apply([this, dbg] (auto&& ...args) __NE___
+                                      { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)..., GetRC(), dbg ); });
 
+        if_likely( task and task->IsValid() )
+        {
             if_likely( Scheduler().Run( task, deps ))
                 return task;
         }
-        catch(...) {}
-
         return Scheduler().GetCanceledTask();
     }
 
@@ -247,11 +238,8 @@ namespace AE::Graphics
                 dbg.color = _dbgColor;
         )
 
-        // DrawTask internally calls '_cmdPool.Acquire()' and return error on pool overflow.
-        // DrawTask internally creates command buffer and throw exception if can't.
-
-        auto&   dtask = coro.AsDrawTask();
-        CHECK_ERR( dtask._Init( GetRC<DRAWCMDBATCH>(), dbg ),  Scheduler().GetCanceledTask() );
+        auto&   task = coro.AsDrawTask();
+        CHECK_ERR( task._Init( GetRC<DRAWCMDBATCH>(), dbg ),  Scheduler().GetCanceledTask() );
 
         if_likely( Scheduler().Run( AsyncTask{coro}, deps ))
             return coro;
diff --git a/AE/engine/src/graphics/Private/DrawTask.h b/AE/engine/src/graphics/Private/DrawTask.h
index aaf8d753..f338993b 100644
--- a/AE/engine/src/graphics/Private/DrawTask.h
+++ b/AE/engine/src/graphics/Private/DrawTask.h
@@ -44,13 +44,13 @@ namespace AE::Graphics
 
     // methods
     protected:
-        DrawTask (RC<DRAWCMDBATCH> batch, DebugLabel dbg)       __Th___ :
+        DrawTask (RC<DRAWCMDBATCH> batch, DebugLabel dbg)       __NE___ :
             IAsyncTask{ ETaskQueue::Renderer },
             _batch{ RVRef(batch) },
             _drawIndex{ _GetPool().Acquire() }
             DBG_GRAPHICS_ONLY(, _dbgName{ dbg.label }, _dbgColor{ _ValidateDbgColor( dbg.color )})
         {
-            CHECK_THROW( IsValid() );   // command buffer pool overflow
+            ASSERT( IsValid() );    // command buffer pool overflow
             Unused( dbg );
         }
 
@@ -135,7 +135,7 @@ namespace AE::Graphics
     // methods
     public:
         template <typename Fn>
-        DrawTaskFn (Fn && fn, RC<DRAWCMDBATCH> batch, DebugLabel dbg) __Th___ :
+        DrawTaskFn (Fn &&fn, RC<DRAWCMDBATCH> batch, DebugLabel dbg) __NE___ :
             DrawTask{ RVRef(batch), dbg },
             _fn{ FwdArg<Fn>(fn) }
         {}
@@ -257,12 +257,12 @@ namespace AE::Threading::_hidden_
 
             ND_ DrawTaskCoro        get_return_object ()        __NE___ { return DrawTaskCoro{ *this }; }
 
-            ND_ std::suspend_always initial_suspend ()          C_NE___ { return {}; }          // delayed start
-            ND_ std::suspend_always final_suspend ()            C_NE___ { return {}; }          // must not be 'suspend_never'  // TODO: don't suspend
+            ND_ std::suspend_always initial_suspend ()          C_NE___ { return {}; }  // delayed start
+            ND_ std::suspend_always final_suspend ()            C_NE___ { return {}; }  // must not be 'suspend_never'
 
                 void                return_void ()              C_NE___ {}
 
-                void                unhandled_exception ()      C_Th___ { throw; }              // rethrow exceptions
+                void                unhandled_exception ()      C_Th___ { throw; }      // rethrow exceptions
 
         public:
                 void  Cancel ()                                 __NE___ { Unused( DrawTask::_SetCancellationState() ); }
diff --git a/AE/engine/src/graphics/Private/EnumToString.h b/AE/engine/src/graphics/Private/EnumToString.h
index 5a226594..b7bc8d51 100644
--- a/AE/engine/src/graphics/Private/EnumToString.h
+++ b/AE/engine/src/graphics/Private/EnumToString.h
@@ -57,6 +57,7 @@ namespace AE::Base
     using Graphics::ESamplerYcbcrModelConversion;
     using Graphics::ESamplerYcbcrRange;
     using Graphics::ImageSwizzle;
+    using Graphics::ESurfaceFormat;
 
 /*
 =================================================
@@ -454,8 +455,9 @@ namespace AE::Base
         switch ( value )
         {
             case ESamplerUsage::Default :                       return "Default";
-            case ESamplerUsage::Subsampled :                    return "Subsampled";
-            case ESamplerUsage::SubsampledCoarseReconstruction: return "SubsampledCoarseReconstruction";
+        //  case ESamplerUsage::Subsampled :                    return "Subsampled";
+        //  case ESamplerUsage::SubsampledCoarseReconstruction: return "SubsampledCoarseReconstruction";
+            case ESamplerUsage::NonSeamlessCubeMap :            return "NonSeamlessCubeMap";
             case ESamplerUsage::_Count :
             default :                                           break;
         }
@@ -763,6 +765,9 @@ namespace AE::Base
                 case EPipelineOpt::RT_NoNullIntersectionShaders :   str << "RT_NoNullIntersectionShaders";  break;
                 case EPipelineOpt::RT_SkipTriangles :               str << "RT_SkipTriangles";              break;
                 case EPipelineOpt::RT_SkipAABBs :                   str << "RT_SkipAABBs";                  break;
+                case EPipelineOpt::DontCompile :                    str << "DontCompile";                   break;
+                case EPipelineOpt::CaptureStatistics :              str << "CaptureStatistics";             break;
+                case EPipelineOpt::CaptureInternalRepresentation :  str << "CaptureInternalRepresentation"; break;
                 case EPipelineOpt::Unknown :
                 case EPipelineOpt::_Last :
                 case EPipelineOpt::All :
@@ -782,6 +787,13 @@ namespace AE::Base
 */
     ND_ inline String  ToString (EMemoryType values) __Th___
     {
+        switch ( values )
+        {
+            case EMemoryType::Unified :             return "Unified";
+            case EMemoryType::UnifiedCached :       return "UnifiedCached";
+            case EMemoryType::HostCachedCoherent :  return "HostCachedCoherent";
+        }
+
         String  str;
         for (auto t : BitfieldIterate( values ))
         {
@@ -1095,13 +1107,40 @@ namespace AE::Base
                     case EResourceState::RayTracingShaders :        str += "RayTracingShaders";         break;
                     default :                                       DBG_WARNING( "unknown resource state stage" );  break;
                 }
-                STATIC_ASSERT( uint(EResourceState::AllShaders) == 0x1F8000 );
+                StaticAssert( uint(EResourceState::AllShaders) == 0x1F8000 );
             }
         }
 
         return str;
     }
 
+/*
+=================================================
+    ToString (ESurfaceFormat)
+=================================================
+*/
+    ND_ inline StringView  ToString (ESurfaceFormat value)
+    {
+        BEGIN_ENUM_CHECKS();
+        switch ( value )
+        {
+            case ESurfaceFormat::BGRA8_sRGB_nonlinear :         return "BGRA8_sRGB_nonlinear";
+            case ESurfaceFormat::RGBA8_sRGB_nonlinear :         return "RGBA8_sRGB_nonlinear";
+            case ESurfaceFormat::BGRA8_BT709_nonlinear :        return "BGRA8_BT709_nonlinear";
+            case ESurfaceFormat::RGBA16F_Extended_sRGB_linear : return "RGBA16F_Extended_sRGB_linear";
+            case ESurfaceFormat::RGBA16F_sRGB_nonlinear :       return "RGBA16F_sRGB_nonlinear";
+            case ESurfaceFormat::RGBA16F_BT709_nonlinear :      return "RGBA16F_BT709_nonlinear";
+            case ESurfaceFormat::RGBA16F_HDR10_ST2084 :         return "RGBA16F_HDR10_ST2084";
+            case ESurfaceFormat::RGBA16F_BT2020_linear :        return "RGBA16F_BT2020_linear";
+            case ESurfaceFormat::RGB10A2_sRGB_nonlinear :       return "RGB10A2_sRGB_nonlinear";
+            case ESurfaceFormat::RGB10A2_HDR10_ST2084 :         return "RGB10A2_HDR10_ST2084";
+            case ESurfaceFormat::_Count :
+            case ESurfaceFormat::Unknown :                      break;
+        }
+        END_ENUM_CHECKS();
+        RETURN_ERR( "unknown surface format" );
+    }
+
 /*
 =================================================
     ToString (EnumBitSet)
diff --git a/AE/engine/src/graphics/Private/EnumUtils.cpp b/AE/engine/src/graphics/Private/EnumUtils.cpp
index 579b8d31..5717ae29 100644
--- a/AE/engine/src/graphics/Private/EnumUtils.cpp
+++ b/AE/engine/src/graphics/Private/EnumUtils.cpp
@@ -164,7 +164,7 @@ namespace AE::Graphics
     {
         EResourceState  result = Zero;
 
-        for (EShaderStages t = EShaderStages(1 << 0); t < EShaderStages::All; t = EShaderStages(uint(t) << 1)) 
+        for (EShaderStages t = EShaderStages(1 << 0); t < EShaderStages::All; t = EShaderStages(uint(t) << 1))
         {
             if ( not AllBits( values, t ))
                 continue;
@@ -468,7 +468,7 @@ namespace AE::Graphics
 
             { EPixelFormat::Unknown,                0,               0, EType::Unknown }
         };
-        STATIC_ASSERT( CountOf(fmt_infos) == uint(EPixelFormat::_Count)+1 );
+        StaticAssert( CountOf(fmt_infos) == uint(EPixelFormat::_Count)+1 );
 
         ASSERT( value < EPixelFormat::_Count );
 
@@ -916,7 +916,8 @@ namespace AE::Graphics
         switch ( id )
         {
             case EGraphicsDeviceID::VeriSilicon :   return EVendorID::VeriSilicon;
-            case EGraphicsDeviceID::V3D_4 :         return EVendorID::Broadcom;
+        //  case EGraphicsDeviceID::V3D_4 :
+        //  case EGraphicsDeviceID::V3D_6 :         return EVendorID::Broadcom;
         }
         return Default;
     }
@@ -959,7 +960,7 @@ namespace AE::Graphics
                 return EGraphicsDeviceID::Adreno_500;
 
             if ( HasSubString( name, " 643" )       or
-                 HasSubString( name, " 650" )       or 
+                 HasSubString( name, " 650" )       or
                  HasSubString( name, " 660" ))
                 return EGraphicsDeviceID::Adreno_600_QC5;
 
@@ -1158,9 +1159,6 @@ namespace AE::Graphics
             if ( HasSubStringIC( name, "VeriSilicon" ))
                 return EGraphicsDeviceID::VeriSilicon;
 
-            if ( HasSubStringIC( name, "V3D 4." ))
-                return EGraphicsDeviceID::V3D_4;
-
             if ( HasSubStringIC( name, "SwiftShader" ))
                 return EGraphicsDeviceID::SwiftShader;
         }
@@ -1207,7 +1205,7 @@ namespace AE::Graphics
 */
     ESurfaceFormat  ESurfaceFormat_Cast (EPixelFormat format, EColorSpace space) __NE___
     {
-        STATIC_ASSERT( uint(ESurfaceFormat::_Count) == 10 );
+        StaticAssert( uint(ESurfaceFormat::_Count) == 10 );
 
         if ( format == EPixelFormat::BGRA8_UNorm    and space == EColorSpace::sRGB_nonlinear )          return ESurfaceFormat::BGRA8_sRGB_nonlinear;
         if ( format == EPixelFormat::RGBA8_UNorm    and space == EColorSpace::sRGB_nonlinear )          return ESurfaceFormat::RGBA8_sRGB_nonlinear;
diff --git a/AE/engine/src/graphics/Private/EnumUtils.h b/AE/engine/src/graphics/Private/EnumUtils.h
index edae8bc4..2968db5e 100644
--- a/AE/engine/src/graphics/Private/EnumUtils.h
+++ b/AE/engine/src/graphics/Private/EnumUtils.h
@@ -75,7 +75,7 @@ namespace AE::Graphics
             4,
             5
         };
-        STATIC_ASSERT( CountOf(indices) == usize(EDescriptorType::_Count)+1 );
+        StaticAssert( CountOf(indices) == usize(EDescriptorType::_Count)+1 );
         return indices[ uint(type) ];
     }
 //-----------------------------------------------------------------------------
@@ -230,7 +230,7 @@ namespace AE::Graphics
             format{fmt}, aspectMask{aspect}, channels{0} {}
 
         PixelFormatInfo (EPixelFormat fmt, uint bpp, uint usedBPP, uint channels, EType type, EImageAspect aspect) __NE___ :
-            valueType{type}, bitsPerBlock{ CheckCast<ushort>( bpp )}, format{fmt}, aspectMask{aspect}, 
+            valueType{type}, bitsPerBlock{ CheckCast<ushort>( bpp )}, format{fmt}, aspectMask{aspect},
             channels{ CheckCast<ubyte>( channels )}, srcBitsPerPix{ CheckCast<ubyte>( usedBPP )} {}
 
         ND_ bool    IsValid ()                      C_NE___ { return format != Default; }
diff --git a/AE/engine/src/graphics/Private/FeatureSet.cpp b/AE/engine/src/graphics/Private/FeatureSet.cpp
index 48c53346..d594faf1 100644
--- a/AE/engine/src/graphics/Private/FeatureSet.cpp
+++ b/AE/engine/src/graphics/Private/FeatureSet.cpp
@@ -31,6 +31,83 @@ struct std::hash< AE::Graphics::FeatureSet::VRSTexelSize > :
 {};
 
 
+namespace AE::Base
+{
+    using namespace AE::Graphics;
+
+
+    ND_ StringView  ToString (EFeature f)
+    {
+        switch ( f ) {
+            case EFeature::Ignore :         return "Ignore";
+            case EFeature::RequireFalse :   return "RequireFalse";
+            case EFeature::RequireTrue :    return "RequireTrue";
+        }
+        return "";
+    }
+
+    ND_ StringView  ToString (ESubgroupTypes)
+    {
+        return "";
+    }
+
+    ND_ String  ToString (FeatureSet::SampleCountBits bits)
+    {
+        return Base::ToString<16>( uint(bits) );
+    }
+
+    ND_ String  ToString (const FeatureSet::VRSTexelSize &size)
+    {
+        return "min: "s << Base::ToString( size.Min() ) << " max: " << Base::ToString( size.Max() );
+    }
+
+    ND_ String  ToString (EShadingRate type)
+    {
+        return "size: "s << Base::ToString( EShadingRate_Size( type )) << " samples: " << Base::ToString<16>( EShadingRate_SampleBits( type ));
+    }
+
+    ND_ String  ToString (const FeatureSet::ShadingRateSet_t &set)
+    {
+        String  str;
+        for (auto& sr : set)    str << Base::ToString( sr );
+        return str;
+    }
+
+    ND_ StringView  ToString (FeatureSet::ShaderVersion)
+    {
+        return "";
+    }
+
+    ND_ StringView  ToString (const FeatureSet::PerDescriptorSet &ds)
+    {
+        return  "\n    maxInputAttachments: "s << Base::ToString( ds.maxInputAttachments ) <<
+                "\n    maxSampledImages:    " << Base::ToString( ds.maxSampledImages ) <<
+                "\n    maxSamplers:         " << Base::ToString( ds.maxSamplers ) <<
+                "\n    maxStorageBuffers:   " << Base::ToString( ds.maxStorageBuffers ) <<
+                "\n    maxStorageImages:    " << Base::ToString( ds.maxStorageImages ) <<
+                "\n    maxUniformBuffers:   " << Base::ToString( ds.maxUniformBuffers ) <<
+                "\n    maxAccelStructures:  " << Base::ToString( ds.maxAccelStructures ) <<
+                "\n    maxTotalResources:   " << Base::ToString( ds.maxTotalResources );
+    }
+
+    ND_ StringView  ToString (FeatureSet::Queues)
+    {
+        return "";
+    }
+
+    ND_ StringView  ToString (FeatureSet::VendorIDs_t)
+    {
+        return "";
+    }
+
+    ND_ StringView  ToString (FeatureSet::GraphicsDevices_t)
+    {
+        return "";
+    }
+
+} // AE::Base
+
+
 namespace AE::Graphics
 {
 namespace
@@ -363,7 +440,7 @@ namespace
         res.maxUniformBuffers   = FS_MergeMin( lhs.maxUniformBuffers,   rhs.maxUniformBuffers,  "maxUniformBuffers"     );
         res.maxAccelStructures  = FS_MergeMin( lhs.maxAccelStructures,  rhs.maxAccelStructures, "maxAccelStructures"    );
         res.maxTotalResources   = FS_MergeMin( lhs.maxTotalResources,   rhs.maxTotalResources,  "maxTotalResources"     );
-        STATIC_ASSERT( sizeof(FeatureSet::PerDescriptorSet) == sizeof(uint)*8 );
+        StaticAssert( sizeof(FeatureSet::PerDescriptorSet) == sizeof(uint)*8 );
         return res;
     }
 
@@ -937,6 +1014,12 @@ namespace
             // TODO
         }
 
+        if ( fEqual( cooperativeMatrix, EFeature::RequireTrue )) {
+            chNotEqual2( cooperativeMatrixStages, EShaderStages::Unknown, EShaderStages::Compute );
+        }else{
+            chEqual( cooperativeMatrixStages, EShaderStages::Unknown );
+        }
+
         chNotEqual2( queues.supported, EQueueMask::Unknown, EQueueMask::Graphics );
         chEqual2(    AnyBits( queues.required, ~queues.supported ),  false,  queues.required &= queues.supported );
 
@@ -1057,7 +1140,7 @@ namespace
 */
     bool  FeatureSet::IsSupported (const BufferDesc &desc) C_NE___
     {
-        STATIC_ASSERT( uint(EBufferOpt::All) == 0x1F );
+        StaticAssert( uint(EBufferOpt::All) == 0x1F );
 
         bool    result = true;
 
@@ -1093,8 +1176,8 @@ namespace
 */
     bool  FeatureSet::IsSupported (const BufferDesc &desc, const BufferViewDesc &view) C_NE___
     {
-        STATIC_ASSERT( uint(EBufferUsage::All) == 0x1FFF );
-        STATIC_ASSERT( uint(EBufferOpt::All) == 0x1F );
+        StaticAssert( uint(EBufferUsage::All) == 0x1FFF );
+        StaticAssert( uint(EBufferOpt::All) == 0x1F );
 
         bool    result = true;
 
@@ -1117,8 +1200,8 @@ namespace
 */
     bool  FeatureSet::IsSupported (const ImageDesc &desc) C_NE___
     {
-        STATIC_ASSERT( uint(EImageUsage::All) == 0xFF );
-        STATIC_ASSERT( uint(EImageOpt::All) == 0x1FFFF );
+        StaticAssert( uint(EImageUsage::All) == 0xFF );
+        StaticAssert( uint(EImageOpt::All) == 0x1FFFF );
 
         bool    result = true;
 
@@ -1263,7 +1346,12 @@ namespace
 
     bool  FeatureSet::DbgIsCompatible (const FeatureSet &rhs) C_NE___
     {
-        #define AE_FEATURE_SET_VISIT( _type_, _name_, _bits_ )  CHECK_ERR( FS_IsCompatible( _name_, rhs. _name_, AE_TOSTRING(_name_) ));
+        #define AE_FEATURE_SET_VISIT( _type_, _name_, _bits_ )                                                                          \
+            if ( not FS_IsCompatible( _name_, rhs. _name_, AE_TOSTRING(_name_) )) {                                                     \
+                AE_LOG_SE( String{AE_TOSTRING(_name_)} << "\n  lhs: " << ToString(_name_) << "\n  rhs: " << ToString(rhs. _name_) );    \
+                return false;                                                                                                           \
+            }
+
         AE_FEATURE_SET_FIELDS( AE_FEATURE_SET_VISIT )
         #undef AE_FEATURE_SET_VISIT
         return true;
@@ -1459,7 +1547,7 @@ namespace {
 */
     HashVal64  FeatureSet::GetHashOfFS_Precalculated () __NE___
     {
-        return HashVal64{0x92bc3d49423bcd36ull};
+        return HashVal64{0x150500622c548de0ull};
     }
 
 /*
diff --git a/AE/engine/src/graphics/Private/ImageDesc.cpp b/AE/engine/src/graphics/Private/ImageDesc.cpp
index 4982605f..b9b78a30 100644
--- a/AE/engine/src/graphics/Private/ImageDesc.cpp
+++ b/AE/engine/src/graphics/Private/ImageDesc.cpp
@@ -59,6 +59,39 @@ namespace AE::Graphics
         return *this;
     }
 
+/*
+=================================================
+    ImageDesc::ViewFormatListSize
+=================================================
+*/
+    usize  ImageDesc::ViewFormatListSize () C_NE___
+    {
+        usize   size = 0;
+        for (auto& dst : viewFormats)
+            size += (dst != Default);
+        return size;
+    }
+
+/*
+=================================================
+    ImageDesc::AddViewFormat
+=================================================
+*/
+    ImageDesc&  ImageDesc::AddViewFormat (EPixelFormat value) __NE___
+    {
+        for (auto& dst : viewFormats)
+        {
+            if ( dst == Default )
+            {
+                dst = value;
+                return *this;
+            }
+        }
+
+        DBG_WARNING( "'viewFormats' overflow" );
+        return *this;
+    }
+
 /*
 =================================================
     Validate
@@ -162,7 +195,7 @@ namespace AE::Graphics
             maxLevel = MipmapLevel( Clamp( maxLevel.Get(), 1u, ImageUtils::NumberOfMipmaps( dimension )));
         }
 
-        /*if ( viewFormats.size() > 1 )
+        /*if ( ViewFormatListSize() > 1 )
         {
             if ( not AllBits( options, EImageOpt::MutableFormat ))
             {
@@ -239,7 +272,7 @@ namespace AE::Graphics
 =================================================
     ImageViewDesc
 =================================================
-*/  
+*/
     ImageViewDesc::ImageViewDesc (EImage            viewType,
                                   EPixelFormat      format,
                                   MipmapLevel       baseMipmap,
diff --git a/AE/engine/src/graphics/Private/ImageMemView.cpp b/AE/engine/src/graphics/Private/ImageMemView.cpp
index 61227e40..774f9c67 100644
--- a/AE/engine/src/graphics/Private/ImageMemView.cpp
+++ b/AE/engine/src/graphics/Private/ImageMemView.cpp
@@ -34,7 +34,7 @@ namespace
         uint    r_m : 6;
         uint    r_e : 5;
     };
-    STATIC_ASSERT( CT_SizeOfInBits<RGBBits> == (11+11+10) );
+    StaticAssert( CT_SizeOfInBits<RGBBits> == (11+11+10) );
 
 
 /*
@@ -45,7 +45,7 @@ namespace
     template <uint Bits>
     forceinline static float  ScaleUNorm (uint value) __NE___
     {
-        STATIC_ASSERT( Bits <= 32 );
+        StaticAssert( Bits <= 32 );
 
         FloatBits   f;
         f.bits.e    = 127 + Bits - 1;
@@ -62,7 +62,7 @@ namespace
     template <uint Bits>
     forceinline static float  ScaleSNorm (uint value) __NE___
     {
-        STATIC_ASSERT( Bits <= 32 );
+        StaticAssert( Bits <= 32 );
 
         if constexpr( Bits > 0 )
         {
@@ -97,8 +97,8 @@ namespace
     template <uint Bits, uint OffsetBits>
     forceinline uint  ReadUIntScalar (const StaticArray<uint,4> &data) __NE___
     {
-        STATIC_ASSERT( Bits <= 32 );
-        STATIC_ASSERT( Bits + (OffsetBits & 31) <= 32 );
+        StaticAssert( Bits <= 32 );
+        StaticAssert( Bits + (OffsetBits & 31) <= 32 );
 
         if constexpr( Bits == 0 )
         {
@@ -276,7 +276,7 @@ namespace
     template <uint Bits>
     ND_ forceinline static uint  UNormToUInt (float value) __NE___
     {
-        STATIC_ASSERT( Bits <= 32 );
+        StaticAssert( Bits <= 32 );
         value = Clamp( value, 0.0f, 1.0f );
 
         FloatBits   f;
@@ -296,7 +296,7 @@ namespace
     {
         if constexpr( Bits > 0 )
         {
-            STATIC_ASSERT( Bits <= 32 );
+            StaticAssert( Bits <= 32 );
             value = Clamp( value, -1.0f, +1.0f );
 
             FloatBits   f;
@@ -324,8 +324,8 @@ namespace
     template <uint Bits, uint OffsetBits>
     forceinline static void  WriteUIntScalar (uint col, OUT StaticArray<uint,4> &data) __NE___
     {
-        STATIC_ASSERT( Bits <= 32 );
-        STATIC_ASSERT( Bits + (OffsetBits & 31) <= 32 );
+        StaticAssert( Bits <= 32 );
+        StaticAssert( Bits + (OffsetBits & 31) <= 32 );
 
         if constexpr( Bits == 0 )
         {
@@ -446,7 +446,7 @@ namespace
 
         if constexpr( R == 16 )
         {
-            STATIC_ASSERT( (G == 16 or G == 0) and (B == 16 or B == 0) and (A == 16 or A == 0) );
+            StaticAssert( (G == 16 or G == 0) and (B == 16 or B == 0) and (A == 16 or A == 0) );
 
             StaticArray< half, 4 >  dst = {};
 
@@ -458,7 +458,7 @@ namespace
         else
         if constexpr( R == 32 )
         {
-            STATIC_ASSERT( (G == 32 or G == 0) and (B == 32 or B == 0) and (A == 32 or A == 0) );
+            StaticAssert( (G == 32 or G == 0) and (B == 32 or B == 0) and (A == 32 or A == 0) );
 
             MemCopy( OUT row.ptr + Bytes{x * px_size}, result.data(), Bytes{px_size} );
         }
@@ -528,13 +528,13 @@ namespace
         if ( _rowPitch == 0 )
         {
             ASSERT( aspect <= EImageAspect::Stencil );  // calculation is valid for Color/Depth/Stencil
-            _rowPitch = CheckCast<Bytes32u>( MinRowSize() );
+            _rowPitch = CheckCast<Byte32u>( MinRowSize() );
         }
 
         if ( _slicePitch == 0 )
         {
             ASSERT( aspect <= EImageAspect::Stencil );  // calculation is valid for Color/Depth/Stencil
-            _slicePitch = CheckCast<Bytes32u>( MinSliceSize() );
+            _slicePitch = CheckCast<Byte32u>( MinSliceSize() );
         }
 
         ASSERT( BytesPerBlock() > 0_b );
@@ -548,7 +548,7 @@ namespace
         }
     }
 
-    ImageMemView::ImageMemView (void *content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___ :
+    ImageMemView::ImageMemView (void* content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___ :
         ImageMemView{ BufferMemView{content, contentSize}, off, dim, rowPitch, slicePitch, format, aspect }
     {}
 
@@ -887,7 +887,7 @@ namespace
         RWImageMemView{ ImageMemView{ content, off, dim, rowPitch, slicePitch, format, aspect }}
     {}
 
-    RWImageMemView::RWImageMemView (void *content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___ :
+    RWImageMemView::RWImageMemView (void* content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___ :
         RWImageMemView{ ImageMemView{ content, contentSize, off, dim, rowPitch, slicePitch, format, aspect }}
     {}
 
@@ -1524,11 +1524,11 @@ namespace
 =================================================
 */
     template <typename T>
-    bool  RWImageMemView::_Blit (const uint3 &dstOffset, const uint3 &srcOffset, const RWImageMemView &srcImage, 
+    bool  RWImageMemView::_Blit (const uint3 &dstOffset, const uint3 &srcOffset, const RWImageMemView &srcImage,
                                  const uint3 &dim, const Swizzle &swizzle, LoadPixelTFn_t<T> loadSrc, LoadPixelTFn_t<T> loadDst,
                                  StorePixelTFn_t<T> store, OUT Bytes &readn, OUT Bytes &written) __NE___
     {
-        STATIC_ASSERT( sizeof(T) == sizeof(PixStorage_t) );
+        StaticAssert( sizeof(T) == sizeof(PixStorage_t) );
 
         readn   = 0_b;
         written = 0_b;
diff --git a/AE/engine/src/graphics/Private/LfCmdBufferPool.h b/AE/engine/src/graphics/Private/LfCmdBufferPool.h
index a970b5e2..384b7a4b 100644
--- a/AE/engine/src/graphics/Private/LfCmdBufferPool.h
+++ b/AE/engine/src/graphics/Private/LfCmdBufferPool.h
@@ -19,7 +19,7 @@ namespace AE::Graphics
         using NativeCmdBuffer_t     = NativeCmdBufferType;
         using BakedCommands_t       = BakedCommandsType;
 
-        STATIC_ASSERT( sizeof(NativeCmdBuffer_t) >= sizeof(BakedCommands_t) );
+        StaticAssert( sizeof(NativeCmdBuffer_t) >= sizeof(BakedCommands_t) );
 
         union Cmdbuf
         {
@@ -95,7 +95,7 @@ namespace AE::Graphics
         if_likely( idx < _pool.size() )
             return idx;
 
-        DEV_WARNING( "counter overflow" );
+        DBG_WARNING( "counter overflow" );
         return UMax;
     }
 
@@ -140,7 +140,7 @@ namespace AE::Graphics
         {
             DRC_SHAREDLOCK( _drCheck );
 
-            PlacementNew<BakedCommands_t>( OUT &_pool[idx].baked, RVRef(ctx) );     // nothrow
+            PlacementNew<BakedCommands_t>( OUT &_pool[idx].baked, RVRef(ctx) );
             _cmdTypes.fetch_or( 1u << idx );
 
             uint    old_bits = _ready.fetch_or( 1u << idx, EMemoryOrder::Release );
diff --git a/AE/engine/src/graphics/Private/PipelinePack.cpp.h b/AE/engine/src/graphics/Private/PipelinePack.cpp.h
index 1e79d8f9..e54a8c21 100644
--- a/AE/engine/src/graphics/Private/PipelinePack.cpp.h
+++ b/AE/engine/src/graphics/Private/PipelinePack.cpp.h
@@ -6,6 +6,9 @@
 #elif defined(AE_ENABLE_METAL)
 #   define PPLNPACK         MPipelinePack
 
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define PPLNPACK         RPipelinePack
+
 #else
 #   error not implemented
 #endif
@@ -25,10 +28,10 @@ namespace AE::Graphics
 =================================================
     constructor
 =================================================
-*/      
-    PPLNPACK::RenderPassRefs::RenderPassRefs (Allocator_t *alloc) __Th___ :
-        specMap  { StdAllocatorRef< Pair< const RenderPassName::Optimized_t,        RenderPassID >, Allocator_t* >{ alloc }},
-        compatMap{ StdAllocatorRef< Pair< const CompatRenderPassName::Optimized_t,  RenderPassID >, Allocator_t* >{ alloc }}
+*/
+    PPLNPACK::RenderPassRefs::RenderPassRefs (IAllocatorTS* alloc) __Th___ :
+        specMap  { StdAlloc_t< Pair< const RenderPassName::Optimized_t,       RenderPassID >>{ alloc }},
+        compatMap{ StdAlloc_t< Pair< const CompatRenderPassName::Optimized_t, RenderPassID >>{ alloc }}
     {}
 //-----------------------------------------------------------------------------
 
@@ -40,7 +43,7 @@ namespace AE::Graphics
 */
     void  PPLNPACK::_Destroy (ResMngr_t &resMngr) __NE___
     {
-        if ( _allocator.CurrentSize() == 0 )
+        if ( _allocator == null )
             return;
 
         resMngr.ImmediatelyRelease( INOUT _parentPackId );
@@ -64,8 +67,8 @@ namespace AE::Graphics
 
         // release pipelines
         for (uint i = 0, cnt = _renTechs.Get<0>(); i < cnt; ++i) {
-            _renTechs.Get<1>()[i].Destroy( resMngr );
-            StaticRC::Delete( INOUT _renTechs.Get<1>()[i] );
+            _renTechs.Get<1>()[i]->Destroy( resMngr );
+            PlacementDelete( INOUT _renTechs.Get<1>()[i] );
         }
         _renTechs = Default;
 
@@ -105,7 +108,8 @@ namespace AE::Graphics
         _serCPplnSpec   = Default;
         _serRTPplnSpec  = Default;
 
-        _allocator.Release();
+        ASSERT( _allocator.use_count() == 1 );
+        _allocator = null;
 
         DEBUG_ONLY( _debugName.clear(); )
     }
@@ -120,14 +124,16 @@ namespace AE::Graphics
         CHECK_ERR( desc.stream );
         CHECK_ERR( desc.stream->IsOpen() );
 
-        _allocator.Discard();
-        _unsupportedFS  .Create( StdAllocatorRef< FeatureSetName::Optimized_t,                                             Allocator_t* >{ &_allocator });
-        _renTechMap     .Create( StdAllocatorRef< Pair< const RenderTechName::Optimized_t,      ushort                  >, Allocator_t* >{ &_allocator });
-        _pplnTemplMap   .Create( StdAllocatorRef< Pair< const PipelineTmplName::Optimized_t,    PipelineTemplUID        >, Allocator_t* >{ &_allocator });
-        _dsLayoutMap    .Create( StdAllocatorRef< Pair< const DescriptorSetName::Optimized_t,   DescriptorSetLayoutID   >, Allocator_t* >{ &_allocator });
-        _samplerRefs    .Create( StdAllocatorRef< Pair< const SamplerName::Optimized_t,         SamplerID               >, Allocator_t* >{ &_allocator });
-        _renderPassRefs .Create( &_allocator );
-        DEBUG_ONLY( _allFeatureSets.Create( StdAllocatorRef< FeatureSetName::Optimized_t, Allocator_t* >{ &_allocator }); )
+        ASSERT( not _allocator );
+        _allocator = MakeRC< LinearAllocator_t >();
+
+        _unsupportedFS  .CreateTh( StdAlloc_t< FeatureSetName::Optimized_t                                           >{ _allocator.get() });
+        _renTechMap     .CreateTh( StdAlloc_t< Pair< const RenderTechName::Optimized_t,     ushort                  >>{ _allocator.get() });
+        _pplnTemplMap   .CreateTh( StdAlloc_t< Pair< const PipelineTmplName::Optimized_t,   PipelineTemplUID        >>{ _allocator.get() });
+        _dsLayoutMap    .CreateTh( StdAlloc_t< Pair< const DescriptorSetName::Optimized_t,  DescriptorSetLayoutID   >>{ _allocator.get() });
+        _samplerRefs    .CreateTh( StdAlloc_t< Pair< const SamplerName::Optimized_t,        SamplerID               >>{ _allocator.get() });
+        _renderPassRefs .CreateTh( _allocator.get() );
+        DEBUG_ONLY( _allFeatureSets.CreateTh( StdAlloc_t< FeatureSetName::Optimized_t >{ _allocator.get() }); )
 
         EXLOCK( _fileGuard );
 
@@ -271,7 +277,7 @@ namespace AE::Graphics
         {
             ASSERT( idx < _renTechs.Get<0>() );
 
-            auto&   rt = _renTechs.Get<1>()[ idx ];
+            auto&   rt = *_renTechs.Get<1>()[ idx ];
             if ( rt.IsSupported() )
                 supported.push_back( RenderTechName{ name });   // throw
         }
@@ -372,7 +378,7 @@ namespace AE::Graphics
                                             *gppln, desc,
                                             _GetPipelineLayout( gppln->layout ),
                                             shaders, cacheId,
-                                            &_allocator
+                                            _allocator.get()
                                         });
     }
 
@@ -399,7 +405,7 @@ namespace AE::Graphics
                                             *mppln, desc,
                                             _GetPipelineLayout( mppln->layout ),
                                             shaders, cacheId,
-                                            &_allocator
+                                            _allocator.get()
                                         });
     }
 
@@ -431,7 +437,7 @@ namespace AE::Graphics
                                             *rtppln, desc,
                                             _GetPipelineLayout( rtppln->layout ),
                                             ArrayView< ShaderModuleRef >{ shaders, rtppln->shaderArr.size() }, cacheId,
-                                            &_allocator,
+                                            _allocator.get(),
                                             &allocator
                                         });
     }
@@ -489,7 +495,7 @@ namespace AE::Graphics
 
         CHECK_ERR( uint(iter->second) < _renTechs.Get<0>() );
 
-        auto&   rt = _renTechs.Get<1>()[ uint(iter->second) ];
+        auto&   rt = *_renTechs.Get<1>()[ uint(iter->second) ];
         return rt.LoadAsync( resMngr, cacheId );
     }
 
@@ -508,7 +514,7 @@ namespace AE::Graphics
 
         CHECK_ERR( uint(iter->second) < _renTechs.Get<0>() );
 
-        auto&   rt = _renTechs.Get<1>()[ uint(iter->second) ];
+        auto&   rt = *_renTechs.Get<1>()[ uint(iter->second) ];
         CHECK_ERR( rt.Load( resMngr, cacheId ));
 
         return rt.GetRC();
@@ -586,7 +592,7 @@ namespace AE::Graphics
             DEBUG_ONLY(
                 *_allFeatureSets = parent_pack->GetAllFS();                     // throw
                 _allFeatureSets->reserve( _allFeatureSets->size() + count );    // throw
-            )   
+            )
         }
         else
         {
@@ -657,7 +663,7 @@ namespace AE::Graphics
         CHECK_ERR( not des.stream.Empty() );
 
         // for feature set array
-        des.allocator = MakeRC< AllocatorImpl2< Allocator_t &>>( _allocator );  // TODO: optimize? temp allocator?
+        des.allocator = _allocator.get();
 
         uint    hdr_name    = 0;
         uint    version     = 0;
@@ -749,7 +755,7 @@ namespace AE::Graphics
         CHECK_ERR( not des.stream.Empty() );
 
         // for feature set array
-        des.allocator = MakeRC< AllocatorImpl2< Allocator_t &>>( _allocator );  // TODO: optimize? temp allocator?
+        des.allocator = _allocator.get();
 
         uint    hdr_name    = 0;
         uint    version     = 0;
@@ -839,7 +845,7 @@ namespace AE::Graphics
         if ( count == 0 )
             return true;
 
-        auto    rs_ptr = _allocator.Allocate< PipelineCompiler::SerializableRenderState >( count );
+        auto    rs_ptr = _allocator->Allocate< PipelineCompiler::SerializableRenderState >( count );
         CHECK_ERR( rs_ptr != null );
         _renderStates = Tuple{ count, rs_ptr };
 
@@ -878,7 +884,7 @@ namespace AE::Graphics
         if ( count == 0 )
             return true;
 
-        auto    ds_ptr = _allocator.Allocate< PipelineCompiler::SerializableDepthStencilState >( count );
+        auto    ds_ptr = _allocator->Allocate< PipelineCompiler::SerializableDepthStencilState >( count );
         CHECK_ERR( ds_ptr != null );
         _depthStencilStates = Tuple{ count, ds_ptr };
 
@@ -905,7 +911,7 @@ namespace AE::Graphics
 
         layoutMap.reserve( count );  // throw
 
-        _dsLayouts = Tuple{ count, _allocator.Allocate< Strong<DescriptorSetLayoutID> >( count )};
+        _dsLayouts = Tuple{ count, _allocator->Allocate< Strong<DescriptorSetLayoutID> >( count )};
         CHECK_ERR( _dsLayouts.Get<1>() != null );
 
         auto*   parent_pack = resMngr.GetResource( _parentPackId, False{"don't inc ref"}, True{"quiet"} );  // TODO: shared lock
@@ -971,9 +977,9 @@ namespace AE::Graphics
             }
 
             const bool  is_upd_tmpl = AllBits( usage, EDescSetUsage::UpdateTemplate );  // Vulkan only
-            auto*       un_names    = _allocator.Allocate< UniformName::Optimized_t >( uniform_count );
-            auto*       un_data     = _allocator.Allocate< Uniform_t >( uniform_count );
-            auto*       un_offsets  = is_upd_tmpl ? _allocator.Allocate< Bytes16u >( uniform_count ) : null;
+            auto*       un_names    = _allocator->Allocate< UniformName::Optimized_t >( uniform_count );
+            auto*       un_data     = _allocator->Allocate< Uniform_t >( uniform_count );
+            auto*       un_offsets  = is_upd_tmpl ? _allocator->Allocate< Byte16u >( uniform_count ) : null;
             bool        result      = true;
             CHECK_ERR( un_names != null and un_data != null );
 
@@ -1026,7 +1032,7 @@ namespace AE::Graphics
         if ( count == 0 )
             return true;
 
-        _pplnLayouts = Tuple{ count, _allocator.Allocate< Strong<PipelineLayoutID> >( count )};
+        _pplnLayouts = Tuple{ count, _allocator->Allocate< Strong<PipelineLayoutID> >( count )};
         CHECK_ERR( _pplnLayouts.Get<1>() != null );
 
         for (uint i = 0; i < count; ++i)
@@ -1051,6 +1057,8 @@ namespace AE::Graphics
                     binding.vkIndex = src.second.vkIndex;
                 #elif defined(AE_ENABLE_METAL)
                     binding.mtlIndex = src.second.mtlIndex;
+                #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+                    binding.vkIndex = src.second.vkIndex;
                 #else
                 #   error not implemented
                 #endif
@@ -1123,7 +1131,7 @@ namespace AE::Graphics
         if ( count == 0 )
             return true;
 
-        auto    ptr = _allocator.Allocate<T>( count );
+        auto    ptr = _allocator->Allocate<T>( count );
         CHECK_ERR( ptr != null );
         arr = Tuple{ count, ptr };
 
@@ -1153,19 +1161,19 @@ namespace AE::Graphics
 
         _renTechMap->reserve( count );  // throw
 
-        _renTechs = Tuple{ count, _allocator.Allocate<RenderTech>( count )};
+        _renTechs = Tuple{ count, _allocator->Allocate< StaticRC<RenderTech> >( count )};
         CHECK_ERR( _renTechs.Get<1>() != null );
 
         bool    result = true;
         for (uint i = 0; result & (i < count); ++i)
         {
             auto&   rt = _renTechs.Get<1>()[i];
-            StaticRC::New( OUT rt, *this );
+            PlacementNew< StaticRC<RenderTech> >( &rt, *this );
 
-            result = rt.Deserialize( resMngr, des );    // throw
+            result = rt->Deserialize( resMngr, des );   // throw
 
-            if ( rt.IsSupported() )
-                _renTechMap->emplace( rt.Name(), ushort(i) );   // throw
+            if ( rt->IsSupported() )
+                _renTechMap->emplace( rt->Name(), ushort(i) );  // throw
         }
         return result;
     }
@@ -1184,7 +1192,7 @@ namespace AE::Graphics
         if ( count == 0 )
             return true;
 
-        auto    ptr = _allocator.Allocate< PipelineCompiler::SerializableRTShaderBindingTable >( count );
+        auto    ptr = _allocator->Allocate< PipelineCompiler::SerializableRTShaderBindingTable >( count );
         CHECK_ERR( ptr != null );
         _serRTSBTs = SerRTSBTs_t{ count, ptr };
 
@@ -1214,10 +1222,10 @@ namespace AE::Graphics
         if ( count == 0 )
             return true;
 
-        _shaders = Tuple{ count, _allocator.Allocate< ShaderModule >( count )};
+        _shaders = Tuple{ count, _allocator->Allocate< ShaderModule >( count )};
         CHECK_ERR( _shaders.Get<1>() != null );
 
-        const Bytes32u  total_size {_shaderDataSize};
+        const Byte32u   total_size {_shaderDataSize};
 
         bool    result = true;
         for (uint i = 0; result & (i < count); ++i)
@@ -1236,6 +1244,7 @@ namespace AE::Graphics
                             sh.shaderTypeIdx == Types_t::Index<SpirvWithTrace> );
             #elif defined(AE_ENABLE_METAL)
                 CHECK_ERR(  sh.shaderTypeIdx == Types_t::Index<MetalBytecode_t> );
+            #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
             #else
             #   error not implemented
             #endif
@@ -1252,11 +1261,11 @@ namespace AE::Graphics
     constructor
 =================================================
 */
-    PPLNPACK::RenderTech::RenderTech (PPLNPACK& pack) __Th___ :
+    PPLNPACK::RenderTech::RenderTech (PPLNPACK& pack) __NE___ :
         _pack{ pack },
         _isSupported{ false },  _isLoaded{ false },     _wasAttampToLoad{ false },
-        _pipelines{ StdAllocatorRef< Pair< const PipelineName::Optimized_t, PipelineInfo >, Allocator_t* >{ &pack._allocator }},
-        _rtSbtMap{ StdAllocatorRef< Pair< const RTShaderBindingName::Optimized_t, SBTInfo >, Allocator_t* >{ &pack._allocator }}
+        _pipelines{ StdAlloc_t< Pair< const PipelineName::Optimized_t, PipelineInfo >>{ pack._allocator.get() }},
+        _rtSbtMap{ StdAlloc_t< Pair< const RTShaderBindingName::Optimized_t, SBTInfo >>{ pack._allocator.get() }}
     {}
 
     PPLNPACK::RenderTech::~RenderTech () __NE___
@@ -1288,6 +1297,9 @@ namespace AE::Graphics
 
                 supported &= (not _pack._unsupportedFS->contains( fs_name ));
                 DEBUG_ONLY(
+                    if ( _pack._unsupportedFS->contains( fs_name ))
+                        AE_LOG_DBG( "Render technique '"s << resMngr.HashToName( _name ) << "' requires '" << resMngr.HashToName( fs_name ) << "' FeatureSet" );
+
                     if ( not _pack._allFeatureSets->contains( fs_name ))
                         AE_LOG_SE( "FeatureSet '"s << resMngr.HashToName( fs_name ) << "' is not exists" );
                 )
@@ -1307,7 +1319,7 @@ namespace AE::Graphics
             CHECK_ERR( des( OUT pass_count ) and pass_count > 0 );
             CHECK_ERR( pass_count <= SerializableRenderTechnique::MaxPassCount );
 
-            _passes = Tuple{ pass_count, _pack._allocator.Allocate< SerializableRenderTechnique::Pass >( pass_count )};
+            _passes = Tuple{ pass_count, _pack._allocator->Allocate< SerializableRenderTechnique::Pass >( pass_count )};
 
             bool    result = true;
             for (uint i = 0; result & (i < pass_count); ++i)
@@ -1377,7 +1389,7 @@ namespace AE::Graphics
             RC<RenderTech>  rtech;
             ResMngr_t &     resMngr;
 
-            PreloadShadersTask (RC<RenderTech> rt, ResMngr_t& rm) :
+            PreloadShadersTask (RC<RenderTech> rt, ResMngr_t& rm) __NE___ :
                 IAsyncTask{ ETaskQueue::Background }, rtech{rt}, resMngr{rm} {}
 
             void        Run ()      __Th_OV { CHECK_TE( rtech->_PreloadShaders( resMngr )); }
@@ -1393,7 +1405,7 @@ namespace AE::Graphics
             PplnSpecIter_t      beginIt;
             PplnSpecIter_t      endIt;
 
-            CompilePipelinesTask (RC<RenderTech> rt, ResMngr_t& rm, PipelineCacheID cache, PplnSpecIter_t begin, PplnSpecIter_t end) :
+            CompilePipelinesTask (RC<RenderTech> rt, ResMngr_t& rm, PipelineCacheID cache, PplnSpecIter_t begin, PplnSpecIter_t end) __NE___ :
                 IAsyncTask{ ETaskQueue::Background }, rtech{rt}, resMngr{rm}, cacheId{cache}, beginIt{begin}, endIt{end} {}
 
             void        Run ()      __Th_OV { CHECK_TE( rtech->_CompilePipelines( resMngr, cacheId, beginIt, endIt )); }
@@ -1406,7 +1418,7 @@ namespace AE::Graphics
             RC<RenderTech>  rtech;
             ResMngr_t &     resMngr;
 
-            CreateSBTsTask (RC<RenderTech> rt, ResMngr_t& rm) :
+            CreateSBTsTask (RC<RenderTech> rt, ResMngr_t& rm) __NE___ :
                 IAsyncTask{ ETaskQueue::Background }, rtech{rt}, resMngr{rm} {}
 
             void        Run ()      __Th_OV { CHECK_TE( rtech->_PreloadShaders( resMngr )); }
@@ -1782,7 +1794,7 @@ namespace AE::Graphics
                                                 tmpl, spec.desc,
                                                 _pack._GetPipelineLayout( tmpl.layout ),
                                                 shaders, cacheId,
-                                                &_pack._allocator
+                                                _pack._allocator.get()
                                             }).Release();
         return PipelineID{ id.Index(), id.Generation() };
     }
@@ -1813,7 +1825,7 @@ namespace AE::Graphics
                                                 tmpl, spec.desc,
                                                 _pack._GetPipelineLayout( tmpl.layout ),
                                                 shaders, cacheId,
-                                                &_pack._allocator
+                                                _pack._allocator.get()
                                             }).Release();
         return PipelineID{ id.Index(), id.Generation() };
     }
@@ -1895,7 +1907,7 @@ namespace AE::Graphics
                                                 tmpl, spec.desc,
                                                 _pack._GetPipelineLayout( tmpl.layout ),
                                                 ArrayView< ShaderModuleRef >{ shaders, tmpl.shaderArr.size() }, cacheId,
-                                                &_pack._allocator,
+                                                _pack._allocator.get(),
                                                 &allocator
                                             }).Release();
         return PipelineID{ id.Index(), id.Generation() };
@@ -1909,7 +1921,7 @@ namespace AE::Graphics
     void  PPLNPACK::RenderTech::_PrintPipelines (const PipelineName &reqName, PipelineSpecUID mask) C_NE___
     {
     #ifdef AE_DEBUG
-        const auto& res_mngr = RenderTaskScheduler().GetResourceManager();
+        const auto& res_mngr = GraphicsScheduler().GetResourceManager();
         String      str;
 
         for (auto& [name, ppln] : _pipelines)
@@ -2058,7 +2070,7 @@ namespace AE::Graphics
     void  PPLNPACK::RenderTech::_PrintSBTs (const RTShaderBindingName &reqName) C_NE___
     {
     #ifdef AE_DEBUG
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         String  str;
 
         for (auto& [name, info] : _rtSbtMap) {
@@ -2120,7 +2132,7 @@ namespace AE::Graphics
         const auto  pass = GetPass( passName );
         if ( pass.IsDefined() )
         {
-            auto&           res_mngr = RenderTaskScheduler().GetResourceManager();
+            auto&           res_mngr = GraphicsScheduler().GetResourceManager();
             RenderPassID    rp_id    = res_mngr.GetRenderPass( pass.packId, RenderPassName{pass.renderPass} );
 
             if ( rp_id != Default )
@@ -2159,7 +2171,7 @@ namespace AE::Graphics
         const auto  req_name = _passes.Get<1>()[ idx ].name;
         if_unlikely( req_name != pass )
         {
-            auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+            auto&   res_mngr = GraphicsScheduler().GetResourceManager();
             AE_LOG_DBG( "Render technique pass '"s << res_mngr.HashToName( pass ) << "' is not the (" << ToString(idx) << ") pass, '" <<
                         res_mngr.HashToName( req_name ) << "' is required" );
             return false;
diff --git a/AE/engine/src/graphics/Private/PipelinePack.h b/AE/engine/src/graphics/Private/PipelinePack.h
index 6bf2dfbe..179eddfb 100644
--- a/AE/engine/src/graphics/Private/PipelinePack.h
+++ b/AE/engine/src/graphics/Private/PipelinePack.h
@@ -57,8 +57,8 @@ namespace AE::Graphics
         struct alignas(AE_CACHE_LINE) ShaderModule
         {
             Threading::RWSpinLock                                       guard;      // protects 'module', 'dbgTrace', 'constants'
-            Bytes32u                                                    offset;
-            Bytes32u                                                    dataSize;
+            Byte32u                                                     offset;
+            Byte32u                                                     dataSize;
             ubyte                                                       shaderTypeIdx   = UMax;
 
             // initialized in '_GetShader()':
@@ -66,7 +66,7 @@ namespace AE::Graphics
             mutable Unique< PipelineCompiler::ShaderTrace >             dbgTrace;
             mutable PipelineCompiler::ShaderBytecode::OptSpecConst_t    constants;
         };
-        STATIC_ASSERT( sizeof(ShaderModule) == 128 );
+        StaticAssert( sizeof(ShaderModule) == 128 );
 
     #elif defined(AE_ENABLE_METAL)
 
@@ -89,13 +89,13 @@ namespace AE::Graphics
         struct alignas(AE_CACHE_LINE) ShaderModule
         {
             Threading::RWSpinLock                                       guard;      // protects 'module', 'dbgTrace', 'constants'
-            Bytes32u                                                    offset;
-            Bytes32u                                                    dataSize;
+            Byte32u                                                     offset;
+            Byte32u                                                     dataSize;
             ubyte                                                       shaderTypeIdx   = UMax;
             mutable MetalLibraryRC                                      lib;
             mutable PipelineCompiler::ShaderBytecode::OptSpecConst_t    constants;
         };
-        STATIC_ASSERT( sizeof(ShaderModule) == 128 );
+        StaticAssert( sizeof(ShaderModule) == 128 );
 
     #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
 
@@ -105,7 +105,7 @@ namespace AE::Graphics
             PipelineCompiler::ShaderBytecode::OptSpecConst_t const* shaderConstants = null;
             ShaderTracePtr                                          dbgTrace;
 
-            ND_ bool        IsValid ()  C_NE___;
+            ND_ bool        IsValid ()  C_NE___ { return true; }
             ND_ const char* Entry ()    C_NE___ { return "Main"; }
         };
 
@@ -117,24 +117,25 @@ namespace AE::Graphics
         struct alignas(AE_CACHE_LINE) ShaderModule
         {
             Threading::RWSpinLock                                       guard;      // protects 'module', 'dbgTrace', 'constants'
-            Bytes32u                                                    offset;
-            Bytes32u                                                    dataSize;
+            Byte32u                                                     offset;
+            Byte32u                                                     dataSize;
             ubyte                                                       shaderTypeIdx   = UMax;
         //  mutable VkShaderModule                                      module          = Default;
             mutable Unique< PipelineCompiler::ShaderTrace >             dbgTrace;
             mutable PipelineCompiler::ShaderBytecode::OptSpecConst_t    constants;
         };
-        //STATIC_ASSERT( sizeof(ShaderModule) == 128 );
+        //StaticAssert( sizeof(ShaderModule) == 128 );
 
     #else
     #   error not implemented
     #endif
 
 
-    public:
-        using Allocator_t = Threading::LfLinearAllocator< usize(SmallAllocationSize * 16), 16 >;
-
     private:
+        template <typename T>
+        using StdAlloc_t            = StdAllocatorRef< T, IAllocatorTS* >;
+        using LinearAllocator_t     = Threading::LfLinearAllocator< usize(SmallAllocationSize * 16), usize{16_b} >;
+
         using Device_t              = AE_PRIVATE_UNITE_RAW( SUFFIX, Device              );
         using ResMngr_t             = AE_PRIVATE_UNITE_RAW( SUFFIX, ResourceManager     );
         using TempLinearAllocator_t = AE_PRIVATE_UNITE_RAW( SUFFIX, TempLinearAllocator );
@@ -154,19 +155,19 @@ namespace AE::Graphics
         struct RenderPassRefs
         {
             template <typename K, typename V>
-            using THashMap = FlatHashMap< K, V, std::hash<K>, std::equal_to<K>, StdAllocatorRef< Pair<const K, V>, Allocator_t* >>;
+            using THashMap = FlatHashMap< K, V, std::hash<K>, std::equal_to<K>, StdAlloc_t< Pair<const K, V> >>;
 
             THashMap< RenderPassName::Optimized_t,       Strong<RenderPassID> > specMap;
             THashMap< CompatRenderPassName::Optimized_t, Strong<RenderPassID> > compatMap;
 
-            explicit RenderPassRefs (Allocator_t *alloc);
+            explicit RenderPassRefs (IAllocatorTS* alloc) __Th___;
         };
 
         template <typename K, typename V>
-        using THashMap              = FlatHashMap< K, V, std::hash<K>, std::equal_to<K>, StdAllocatorRef< Pair<const K, V>, Allocator_t* >>;
+        using THashMap              = FlatHashMap< K, V, std::hash<K>, std::equal_to<K>, StdAlloc_t< Pair<const K, V> >>;
 
         template <typename T>
-        using THashSet              = FlatHashSet< T, std::hash<T>, std::equal_to<T>, StdAllocatorRef< T, Allocator_t* >>;
+        using THashSet              = FlatHashSet< T, std::hash<T>, std::equal_to<T>, StdAlloc_t<T> >;
 
         using PipelineLayoutDesc    = PipelineCompiler::PipelineLayoutDesc;
         using PipelineStorage       = PipelineCompiler::PipelineStorage;
@@ -174,7 +175,7 @@ namespace AE::Graphics
         using SpecConstants_t       = PipelineCompiler::ShaderBytecode::SpecConstants_t;
         using Uniform_t             = PipelineCompiler::DescriptorSetLayoutDesc::Uniform;
         using UniformOffsets_t      = PipelineCompiler::DescriptorSetLayoutDesc::UniformOffsets_t;
-        using Uniforms_t            = Tuple< uint, UniformName::Optimized_t const*, Uniform_t const*, Bytes16u* >;
+        using Uniforms_t            = Tuple< uint, UniformName::Optimized_t const*, Uniform_t const*, Byte16u* >;
 
         using DSLayouts_t           = Tuple< uint, Strong< DescriptorSetLayoutID > *>;
         using PplnLayouts_t         = Tuple< uint, Strong< PipelineLayoutID > *     >;
@@ -251,7 +252,7 @@ namespace AE::Graphics
 
         // methods
         public:
-            explicit RenderTech (PPLNPACK& pack)                                                                    __Th___;
+            explicit RenderTech (PPLNPACK& pack)                                                                    __NE___;
             ~RenderTech ()                                                                                          __NE_OV;
 
             ND_ bool  Deserialize (ResMngr_t &, Serializing::Deserializer &)                                        __Th___;
@@ -300,7 +301,7 @@ namespace AE::Graphics
         };
 
     private:
-        using RenTechs_t    = Tuple< uint, RenderTech * >;
+        using RenTechs_t    = Tuple< uint, StaticRC<RenderTech> * >;
         using RenTechMap_t  = THashMap< RenderTechName::Optimized_t, ushort >;
 
 
@@ -309,7 +310,7 @@ namespace AE::Graphics
         mutable Mutex               _fileGuard;
         RC<RStream>                 _file;
 
-        mutable Allocator_t         _allocator;
+        RC<IAllocatorTS>            _allocator;
 
         InPlace< FeatureNames_t >   _unsupportedFS;
 
diff --git a/AE/engine/src/graphics/Private/RayTracingDesc.cpp b/AE/engine/src/graphics/Private/RayTracingDesc.cpp
index 134a9a74..aa92a379 100644
--- a/AE/engine/src/graphics/Private/RayTracingDesc.cpp
+++ b/AE/engine/src/graphics/Private/RayTracingDesc.cpp
@@ -55,7 +55,7 @@ namespace AE::Graphics
             this->options = uint(MEnumCast( value ));
 
         #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-            this->flags = uint(value);
+            this->options = uint(value);
 
         #else
         #   error not implemented
@@ -74,7 +74,7 @@ namespace AE::Graphics
         ASSERT( id );
         ASSERT( inst.rtas == Default );
 
-        auto*   geom = RenderTaskScheduler().GetResourceManager().GetResource( id, False{"don't inc ref"}, True{"quiet"} );
+        auto*   geom = GraphicsScheduler().GetResourceManager().GetResource( id, False{"don't inc ref"}, True{"quiet"} );
         if_likely( geom != null )
         {
             CHECK( uniqueGeoms.insert( id ).first != null );
diff --git a/AE/engine/src/graphics/Private/RenderState.cpp b/AE/engine/src/graphics/Private/RenderState.cpp
index 672233e0..1224b085 100644
--- a/AE/engine/src/graphics/Private/RenderState.cpp
+++ b/AE/engine/src/graphics/Private/RenderState.cpp
@@ -118,7 +118,7 @@ namespace AE::Graphics
     bool  RenderState::StencilBufferState::operator == (const StencilBufferState &rhs) C_NE___
     {
         return  (enabled    == rhs.enabled) &
-                (enabled ? 
+                (enabled ?
                     ((front == rhs.front)   &
                      (back  == rhs.back))   : true);
     }
@@ -210,9 +210,9 @@ namespace AE::Graphics
     bool  RenderState::RasterizationState::operator == (const RasterizationState &rhs) C_NE___
     {
         return  (polygonMode                ==  rhs.polygonMode)            &
-                Equals( depthBiasConstFactor,   rhs.depthBiasConstFactor )  &
-                Equals( depthBiasClamp,         rhs.depthBiasClamp )        &
-                Equals( depthBiasSlopeFactor,   rhs.depthBiasSlopeFactor )  &
+                Equal(  depthBiasConstFactor,   rhs.depthBiasConstFactor )  &
+                Equal(  depthBiasClamp,         rhs.depthBiasClamp )        &
+                Equal(  depthBiasSlopeFactor,   rhs.depthBiasSlopeFactor )  &
                 (depthBias                  ==  rhs.depthBias)              &
                 (depthClamp                 ==  rhs.depthClamp)             &
                 (rasterizerDiscard          ==  rhs.rasterizerDiscard)      &
@@ -251,7 +251,7 @@ namespace AE::Graphics
     {
         return  (sampleMask             ==  rhs.sampleMask)         &
                 (samples                ==  rhs.samples)            &
-                Equals( minSampleShading,   rhs.minSampleShading )  &
+                Equal(  minSampleShading,   rhs.minSampleShading )  &
                 (sampleShading          ==  rhs.sampleShading)      &
                 (alphaToCoverage        ==  rhs.alphaToCoverage)    &
                 (alphaToOne             ==  rhs.alphaToOne);
diff --git a/AE/engine/src/graphics/Private/RenderTask.h b/AE/engine/src/graphics/Private/RenderTask.h
index d55266d1..8d820687 100644
--- a/AE/engine/src/graphics/Private/RenderTask.h
+++ b/AE/engine/src/graphics/Private/RenderTask.h
@@ -37,7 +37,7 @@ namespace AE::Graphics
 
     // methods
     protected:
-        RenderTask (RC<CMDBATCH> batch, DebugLabel dbg) __Th___;
+        RenderTask (RC<CMDBATCH> batch, DebugLabel dbg) __NE___;
 
         enum class _DelayedInit {};
         explicit RenderTask (_DelayedInit)              __NE___ :
@@ -138,7 +138,7 @@ namespace AE::Graphics
     // methods
     public:
         template <typename Fn>
-        RenderTaskFn (Fn && fn, RC<CMDBATCH> batch, DebugLabel dbg) __Th___ :
+        RenderTaskFn (Fn &&fn, RC<CMDBATCH> batch, DebugLabel dbg) __Th___ :
             RenderTask{ RVRef(batch), dbg },
             _fn{ FwdArg<Fn>(fn) }
         {}
@@ -164,7 +164,7 @@ namespace AE::Graphics
     constructor
 =================================================
 */
-    inline RenderTask::RenderTask (RC<CMDBATCH> batch, DebugLabel dbg) __Th___ :
+    inline RenderTask::RenderTask (RC<CMDBATCH> batch, DebugLabel dbg) __NE___ :
         IAsyncTask{ ETaskQueue::Renderer },
         _batch{ RVRef(batch) },
         _exeIndex{ _GetPool().Acquire() }
@@ -172,7 +172,7 @@ namespace AE::Graphics
             _dbgName{ dbg.label },
             _dbgColor{ _ValidateDbgColor( GetQueueType(), dbg.color )})
     {
-        CHECK_THROW( IsValid() );   // command buffer pool overflow
+        ASSERT( IsValid() );    // command buffer pool overflow
         Unused( dbg );
     }
 
@@ -206,10 +206,13 @@ namespace AE::Graphics
         ASSERT( not IsValid() );
         ASSERT( not GetBatchPtr()->IsSubmitted() );
 
-        if ( _submit )
+        if_unlikely( _submit )
         {
             _submit = false;
-            CHECK_THROW( GetBatchPtr()->_Submit() );    // throw
+            if_unlikely( not GetBatchPtr()->_Submit() )
+            {
+                OnFailure();
+            }
         }
 
         DBG_GRAPHICS_ONLY( _DbgCheckFrameId();)
@@ -280,7 +283,7 @@ namespace AE::Graphics
                 case EQueueType::Graphics :         return DebugLabel::ColorTable::GraphicsQueue;
                 case EQueueType::AsyncCompute :     return DebugLabel::ColorTable::AsyncComputeQueue;
                 case EQueueType::AsyncTransfer :    return DebugLabel::ColorTable::AsyncTransfersQueue;
-                case EQueueType::VideoEncode :      
+                case EQueueType::VideoEncode :
                 case EQueueType::VideoDecode :
                 case EQueueType::Unknown :
                 case EQueueType::_Count :           break;
@@ -323,12 +326,12 @@ namespace AE::Threading::_hidden_
 
             ND_ RenderTaskCoro      get_return_object ()        __NE___ { return RenderTaskCoro{ *this }; }
 
-            ND_ std::suspend_always initial_suspend ()          C_NE___ { return {}; }          // delayed start
-            ND_ std::suspend_always final_suspend ()            C_NE___ { return {}; }          // must not be 'suspend_never'  // TODO: don't suspend
+            ND_ std::suspend_always initial_suspend ()          C_NE___ { return {}; }  // delayed start
+            ND_ std::suspend_always final_suspend ()            C_NE___ { return {}; }  // must not be 'suspend_never'
 
                 void                return_void ()              C_NE___ {}
 
-                void                unhandled_exception ()      C_Th___ { throw; }              // rethrow exceptions
+                void                unhandled_exception ()      C_Th___ { throw; }      // rethrow exceptions
 
         public:
                 void  Cancel ()                                 __NE___ { Unused( RenderTask::_SetCancellationState() ); }
diff --git a/AE/engine/src/graphics/Private/RenderTaskScheduler.cpp.h b/AE/engine/src/graphics/Private/RenderTaskScheduler.cpp.h
index 6235a70f..8073f587 100644
--- a/AE/engine/src/graphics/Private/RenderTaskScheduler.cpp.h
+++ b/AE/engine/src/graphics/Private/RenderTaskScheduler.cpp.h
@@ -2,10 +2,10 @@
 
 #if defined(AE_ENABLE_VULKAN)
 #   define CMDPOOLMNGR      VCommandPoolManager
-#   define RTSCHEDULER      VRenderTaskScheduler
 
 #elif defined(AE_ENABLE_METAL)
-#   define RTSCHEDULER      MRenderTaskScheduler
+
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
 
 #else
 #   error not implemented
@@ -18,10 +18,10 @@
     Recycle
 =================================================
 */
-    void  RTSCHEDULER::CommandBatchApi::Recycle (uint indexInPool) __NE___
+    void  RenderTaskScheduler::CommandBatchApi::Recycle (CommandBatch_t* ptr) __NE___
     {
-        auto&   rts = RenderTaskScheduler();
-        rts._batchPool.Unassign( indexInPool );
+        auto&   rts = GraphicsScheduler();
+        CHECK( rts._batchPool.Unassign( ptr ));
     }
 
 /*
@@ -29,9 +29,11 @@
     Submit
 =================================================
 */
-    void  RTSCHEDULER::CommandBatchApi::Submit (CommandBatch_t &batch, ESubmitMode mode) __NE___
+    void  RenderTaskScheduler::CommandBatchApi::Submit (CommandBatch_t &batch, const ESubmitMode mode) __NE___
     {
-        auto&       rts         = RenderTaskScheduler();
+        // TODO: return AsyncMutex instead of lock per-queue mutex
+
+        auto&       rts         = GraphicsScheduler();
         const uint  submit_idx  = batch.GetSubmitIndex();
 
         // should never happen
@@ -55,7 +57,7 @@
         {
             case ESubmitMode::Auto :
             case ESubmitMode::Deferred :
-                break;  // TODO ?
+                break;
 
             // try to submit
             case ESubmitMode::Immediately :
@@ -74,10 +76,10 @@
     Recycle
 =================================================
 */
-    void  RTSCHEDULER::DrawCommandBatchApi::Recycle (uint indexInPool) __NE___
+    void  RenderTaskScheduler::DrawCommandBatchApi::Recycle (DrawCommandBatch_t* ptr) __NE___
     {
-        auto&   rts = RenderTaskScheduler();
-        rts._drawBatchPool.Unassign( indexInPool );
+        auto&   rts = GraphicsScheduler();
+        CHECK( rts._drawBatchPool.Unassign( ptr ));
     }
 //-----------------------------------------------------------------------------
 
@@ -88,7 +90,7 @@
     Resolve
 =================================================
 */
-    bool  RTSCHEDULER::BatchSubmitDepsManager::Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex) __NE___
+    bool  RenderTaskScheduler::BatchSubmitDepsManager::Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex) __NE___
     {
         if_likely( auto* batch_pp = dep.GetIf< CmdBatchOnSubmit >() )
         {
@@ -108,9 +110,9 @@
 =================================================
 */
 #ifdef AE_DEBUG
-    void  RTSCHEDULER::BatchSubmitDepsManager::DbgDetectDeadlock (const CheckDepFn_t &fn) __NE___
+    void  RenderTaskScheduler::BatchSubmitDepsManager::DbgDetectDeadlock (const CheckDepFn_t &fn) __NE___
     {
-        RenderTaskScheduler().DbgForEachBatch( fn, True{"pending only"} );
+        GraphicsScheduler().DbgForEachBatch( fn, True{"pending only"} );
     }
 #endif
 //-----------------------------------------------------------------------------
@@ -122,7 +124,7 @@
     Resolve
 =================================================
 */
-    bool  RTSCHEDULER::BatchCompleteDepsManager::Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex) __NE___
+    bool  RenderTaskScheduler::BatchCompleteDepsManager::Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex) __NE___
     {
         if_likely( auto* batch_pp = dep.GetIf< RC<CommandBatch_t> >() )
         {
@@ -132,18 +134,6 @@
             CHECK_ERR( (**batch_pp)._AddOnCompleteDependency( RVRef(task), INOUT bitIndex ));
             return true;
         }
-        else
-        if ( auto* fence = dep.GetIf< DeviceToHostSyncPtr >() )
-        {
-            if_unlikely( *fence == null )
-                return true;
-
-            if_likely( auto batch2_p = DynCast<CommandBatch_t>( *fence ))
-            {
-                CHECK_ERR( (*batch2_p)._AddOnCompleteDependency( RVRef(task), INOUT bitIndex ));
-                return true;
-            }
-        }
         return false;
     }
 
@@ -153,119 +143,21 @@
 =================================================
 */
 #ifdef AE_DEBUG
-    void  RTSCHEDULER::BatchCompleteDepsManager::DbgDetectDeadlock (const CheckDepFn_t &fn) __NE___
+    void  RenderTaskScheduler::BatchCompleteDepsManager::DbgDetectDeadlock (const CheckDepFn_t &fn) __NE___
     {
-        RenderTaskScheduler().DbgForEachBatch( fn, False{"submitted only"} );
+        GraphicsScheduler().DbgForEachBatch( fn, False{"submitted only"} );
     }
 #endif
 //-----------------------------------------------------------------------------
 
 
 
-/*
-=================================================
-    BeginFrameTask::Run
-=================================================
-*/
-    void  RTSCHEDULER::BeginFrameTask::Run () __Th___
-    {
-        if_unlikely( not _RunImpl() )
-        {
-            _ResetStates();
-            CHECK_TE( false, "BeginFrame - failed" );
-        }
-    }
-
-/*
-=================================================
-    BeginFrameTask::_RunImpl
-=================================================
-*/
-    bool  RTSCHEDULER::BeginFrameTask::_RunImpl () __Th___
-    {
-        auto&   rts = RenderTaskScheduler();
-
-        // check frame UID
-        CHECK_ERR_MSG( rts._perFrameUID[ _frameId.Index() ].load() == _frameId,
-                        "Invalid frame UID, task will be canceled" );
-
-        if_unlikely( not rts._IsFrameCompleted( _frameId ))
-        {
-            Continue();
-            return true;
-        }
-
-        CHECK_ERR_MSG( rts._SetState( EState::BeginFrame, EState::RecordFrame ),
-                        "incorrect render task scheduler state, must be 'EState::BeginFrame'" );
-
-        // update frame time
-        {
-            auto    cur_time    = TimePoint_t::clock::now();
-            auto    last_update = rts._lastUpdate.exchange( cur_time );
-
-            rts._timeDelta.store( TimeCast<secondsf>( cur_time - last_update ).count() );
-        }
-
-        rts._resMngr->OnBeginFrame( _frameId, _config );
-
-      #ifdef AE_ENABLE_VULKAN
-        CHECK( rts._cmdPoolMngr->NextFrame( _frameId ));
-
-        // release expired resources before next frame
-        const uint  frame_offset = _frameId.MaxFrames() + ResourceManager_t::ExpiredResFrameOffset;
-
-        if_likely( auto prev_id = _frameId.Sub( frame_offset );  prev_id.has_value() )
-        {
-            AsyncTask   task = MakeRC< ResourceManager_t::VReleaseExpiredResourcesTask >( *prev_id );
-            if_likely( Scheduler().Run( task ))
-                rts.AddNextFrameDeps( RVRef(task) );
-        }
-      #endif
-
-        DBG_GRAPHICS_ONLY(
-            if ( auto prof = rts.GetProfiler() )
-                prof->NextFrame( _frameId );
-
-            rts._dbgFrameId.store( _frameId );
-        )
-
-        return true;
-    }
-
-/*
-=================================================
-    BeginFrameTask::OnCancel
-=================================================
-*/
-    void  RTSCHEDULER::BeginFrameTask::OnCancel () __NE___
-    {
-        _ResetStates();
-    }
-
-/*
-=================================================
-    BeginFrameTask::_ResetStates
-=================================================
-*/
-    inline void  RTSCHEDULER::BeginFrameTask::_ResetStates() __NE___
-    {
-        auto&   rts = RenderTaskScheduler();
-
-        // check frame UID
-        CHECK_MSG( rts._perFrameUID[ _frameId.Index() ].load() == _frameId, "Invalid frame UID" );
-
-        rts._SetState( EState::Idle );
-    }
-//-----------------------------------------------------------------------------
-
-
-
 /*
 =================================================
     EndFrameTask::Run
 =================================================
 */
-    void  RTSCHEDULER::EndFrameTask::Run () __Th___
+    void  RenderTaskScheduler::EndFrameTask::Run () __Th___
     {
         if_unlikely( not _RunImpl() )
         {
@@ -281,9 +173,9 @@
     EndFrameTask::_RunImpl
 =================================================
 */
-    bool  RTSCHEDULER::EndFrameTask::_RunImpl () __Th___
+    bool  RenderTaskScheduler::EndFrameTask::_RunImpl () __Th___
     {
-        auto&   rts = RenderTaskScheduler();
+        auto&   rts = GraphicsScheduler();
 
         // check frame UID
         CHECK_ERR_MSG( rts._perFrameUID[ _frameId.Index() ].load() == _frameId,
@@ -326,7 +218,7 @@
     EndFrameTask::OnCancel
 =================================================
 */
-    void  RTSCHEDULER::EndFrameTask::OnCancel () __NE___
+    void  RenderTaskScheduler::EndFrameTask::OnCancel () __NE___
     {
         _ResetStates();
     }
@@ -336,9 +228,9 @@
     EndFrameTask::_ResetStates
 =================================================
 */
-    inline void  RTSCHEDULER::EndFrameTask::_ResetStates () __NE___
+    inline void  RenderTaskScheduler::EndFrameTask::_ResetStates () __NE___
     {
-        auto&   rts = RenderTaskScheduler();
+        auto&   rts = GraphicsScheduler();
 
         // check frame UID
         CHECK_MSG( rts._perFrameUID[ _frameId.Index() ].load() == _frameId, "Invalid frame UID" );
@@ -349,7 +241,7 @@
             q.pending.fill( Default );
         }
 
-        rts._SetState( EState::Idle );
+        Unused( rts._SetState( EState::Idle ));
     }
 //-----------------------------------------------------------------------------
 
@@ -360,7 +252,7 @@
     constructor
 =================================================
 */
-    RTSCHEDULER::RTSCHEDULER (const Device_t &dev) __NE___ :
+    RenderTaskScheduler::RenderTaskScheduler (const Device_t &dev) __NE___ :
         _device{ dev },
         _submitDepMngr{ MakeRC<BatchSubmitDepsManager>() },
         _completeDepMngr{ MakeRC<BatchCompleteDepsManager>() }
@@ -373,7 +265,7 @@
     destructor
 =================================================
 */
-    RTSCHEDULER::~RTSCHEDULER () __NE___
+    RenderTaskScheduler::~RenderTaskScheduler () __NE___
     {
         Deinitialize();
     }
@@ -383,31 +275,26 @@
     _Instance
 =================================================
 */
-    INTERNAL_LINKAGE( InPlace<RTSCHEDULER>  s_RenderTaskScheduler );
+    INTERNAL_LINKAGE( InPlace<RenderTaskScheduler>  s_RenderTaskScheduler );
 
-    RTSCHEDULER&  RTSCHEDULER::_Instance () __NE___
+    RenderTaskScheduler&  RenderTaskScheduler::_Instance () __NE___
     {
         return s_RenderTaskScheduler.AsRef();
     }
 
 /*
 =================================================
-    CreateInstance
+    InstanceCtor
 =================================================
 */
-    void  RTSCHEDULER::CreateInstance (const Device_t &dev) __NE___
+    void  RenderTaskScheduler::InstanceCtor::Create (const Device_t &dev) __NE___
     {
         s_RenderTaskScheduler.Create( dev );
 
         MemoryBarrier( EMemoryOrder::Release );
     }
 
-/*
-=================================================
-    DestroyInstance
-=================================================
-*/
-    void  RTSCHEDULER::DestroyInstance () __NE___
+    void  RenderTaskScheduler::InstanceCtor::Destroy () __NE___
     {
         MemoryBarrier( EMemoryOrder::Acquire );
 
@@ -421,7 +308,7 @@
     Initialize
 =================================================
 */
-    bool  RTSCHEDULER::Initialize (const GraphicsCreateInfo &info) __NE___
+    bool  RenderTaskScheduler::Initialize (const GraphicsCreateInfo &info) __NE___
     {
         CHECK_ERR( _SetState( EState::Initial, EState::Initialization ));
 
@@ -442,6 +329,8 @@
         # endif
         #elif defined(AE_ENABLE_METAL)
             // MTLSharedEvent must be supported
+        #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+            // TODO
         #else
         #   error not implemented
         #endif
@@ -458,9 +347,7 @@
       #endif
 
         Scheduler().RegisterDependency< CmdBatchOnSubmit >( _submitDepMngr );
-
         Scheduler().RegisterDependency< RC<CommandBatch_t> >( _completeDepMngr );
-        Scheduler().RegisterDependency< DeviceToHostSyncPtr >( _completeDepMngr );
 
         if ( info.useRenderGraph )
             _rg.reset( new RenderGraph_t{} );
@@ -474,11 +361,14 @@
     Deinitialize
 =================================================
 */
-    void  RTSCHEDULER::Deinitialize () __NE___
+    void  RenderTaskScheduler::Deinitialize () __NE___
     {
-        CHECK_ERRV( _SetState( EState::Idle, EState::Destroyed ));
+        const auto  state = _state.exchange( EState::Destroyed );
+        if ( AnyEqual( state, EState::Destroyed, EState::Initial ))
+            return;
 
-        CHECK( _WaitAll( seconds{10} ));
+        CHECK( state == EState::Idle );
+        CHECK( _WaitAll( seconds{1} ));
 
         _rg.reset();
 
@@ -496,7 +386,108 @@
 
         Scheduler().UnregisterDependency< CmdBatchOnSubmit >();
         Scheduler().UnregisterDependency< RC<CommandBatch_t> >();
-        Scheduler().UnregisterDependency< DeviceToHostSyncPtr >();
+    }
+
+/*
+=================================================
+    WaitNextFrame
+=================================================
+*/
+    bool  RenderTaskScheduler::WaitNextFrame (const EThreadArray &threads, nanoseconds timeout) __NE___
+    {
+        ASSERT( timeout != Default );
+
+        using TimePoint2_t          = Threading::TaskScheduler::TimePoint_t;
+        const auto  end_time        = TimePoint2_t::clock::now() + timeout;
+        const uint  tasks_per_tick  = 6;
+
+        // wait for 'EndFrameTask' and other dependencies
+        const auto  frame_id = _frameId.load().Inc();
+        {
+            auto    begin_deps2 = _beginDeps.WriteNoLock();
+            EXLOCK( begin_deps2 );
+
+            auto&   begin_deps = (*begin_deps2)[ frame_id.Index() ];
+
+            if_unlikely( not Scheduler().Wait( begin_deps, threads, end_time, tasks_per_tick ))
+                return false;  // time is out
+
+            begin_deps.clear();
+        }
+
+        ASSERT( _GetState() == EState::Idle );
+
+        // wait for GPU frame completion
+        for (;;)
+        {
+            if ( _IsFrameCompleted( frame_id ))
+                break;
+
+            if_unlikely( TimePoint2_t::clock::now() > end_time )
+                return false;  // time is out
+
+            if_unlikely( not Scheduler().ProcessTasks( threads, Threading::EThreadSeed(usize(this) & 0xF), tasks_per_tick ))
+            {
+                Scheduler().DbgDetectDeadlock();
+                ThreadUtils::Sleep_500us();
+            }
+        }
+        return true;
+    }
+
+/*
+=================================================
+    BeginFrame
+=================================================
+*/
+    bool  RenderTaskScheduler::BeginFrame (const BeginFrameConfig &cfg) __NE___
+    {
+        CHECK_ERR_MSG( _SetState( EState::Idle, EState::BeginFrame ),
+                        "incorrect render task scheduler state, must be 'Idle'." );
+
+        const auto  frame_id = _frameId.Inc();
+
+        ASSERT( _beginDeps->at( frame_id.Index() ).empty() );
+
+        // update frame time
+        {
+            _perFrameUID[ frame_id.Index() ].store( frame_id );
+            Unused( _SetState( EState::BeginFrame ));
+
+            auto    cur_time    = TimePoint_t::clock::now();
+            auto    last_update = _lastUpdate.exchange( cur_time );
+
+            _timeDelta.store( TimeCast<secondsf>( cur_time - last_update ).count() );
+        }
+
+        // recycle per-frame memory
+        MemoryManager().GetGraphicsFrameAllocator().BeginFrame( frame_id );
+
+        _resMngr->OnBeginFrame( frame_id, cfg );
+
+      #ifdef AE_ENABLE_VULKAN
+        CHECK( _cmdPoolMngr->NextFrame( frame_id ));
+
+        // release expired resources before next frame
+        const uint  frame_offset = frame_id.MaxFrames() + ResourceManager_t::ExpiredResFrameOffset;
+
+        if_likely( auto prev_id = frame_id.Sub( frame_offset );  prev_id.has_value() )
+        {
+            AsyncTask   task = MakeRC< ResourceManager_t::VReleaseExpiredResourcesTask >( *prev_id );
+            if_likely( Scheduler().Run( task ))
+                AddNextFrameDeps( RVRef(task) );
+        }
+      #endif
+
+        DBG_GRAPHICS_ONLY(
+            if ( auto prof = GetProfiler() )
+                prof->NextFrame( frame_id );
+
+            _dbgFrameId.store( frame_id );
+        )
+
+        CHECK( _SetState( EState::BeginFrame, EState::RecordFrame ));
+        return true;
     }
 
 /*
@@ -504,7 +495,7 @@
     AddFrameDeps
 =================================================
 */
-    void  RTSCHEDULER::AddFrameDeps (FrameUID frameId, ArrayView<AsyncTask> deps) __NE___
+    void  RenderTaskScheduler::AddFrameDeps (const FrameUID frameId, ArrayView<AsyncTask> deps) __NE___
     {
         ASSERT( frameId > GetFrameId() );
         ASSERT( frameId <= GetFrameId().NextCycle() );
@@ -535,11 +526,11 @@
             }
 
             if_likely( dep )
-                begin_deps.push_back( dep );    // nothrow
+                begin_deps.push_back( dep );
         }
     }
 
-    void  RTSCHEDULER::AddFrameDeps (FrameUID frameId, AsyncTask dep) __NE___
+    void  RenderTaskScheduler::AddFrameDeps (FrameUID frameId, AsyncTask dep) __NE___
     {
         if ( not dep )
             return;
@@ -547,36 +538,12 @@
         return AddFrameDeps( frameId, ArrayView<AsyncTask>{ dep });
     }
 
-/*
-=================================================
-    WaitFrame
-=================================================
-*/
-    AsyncTask  RTSCHEDULER::WaitFrame (FrameUID frameId) __NE___
-    {
-        ASSERT( frameId > GetFrameId() );
-        ASSERT( frameId <= GetFrameId().NextCycle() );
-
-        auto    begin_deps2 = _beginDeps.WriteNoLock();
-        EXLOCK( begin_deps2 );
-
-        auto&   begin_deps = (*begin_deps2)[ frameId.Index() ];
-
-        if ( begin_deps.empty() )
-            return null;
-
-        BeginDepsArray_t    temp {RVRef(begin_deps)};
-        begin_deps.clear();
-
-        return Scheduler().WaitAsync( ETaskQueue::Renderer, Tuple{ ArrayView<AsyncTask>{ temp }} );
-    }
-
 /*
 =================================================
     _FlushQueue
 =================================================
 */
-    bool  RTSCHEDULER::_FlushQueue (EQueueType queueType, FrameUID frameId, bool forceFlush)
+    bool  RenderTaskScheduler::_FlushQueue (const EQueueType queueType, const FrameUID frameId, const bool forceFlush)
     {
         TempBatches_t   pending;
 
@@ -653,6 +620,9 @@
             # endif
             #elif defined(AE_ENABLE_METAL)
                 CHECK_ERR( _FlushQueue2( queueType, pending ));
+
+            #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+                // TODO
             #else
             #   error not implemented
             #endif
@@ -674,7 +644,7 @@
     SkipCmdBatches
 =================================================
 */
-    void  RTSCHEDULER::SkipCmdBatches (EQueueType queue, uint bits) __NE___
+    void  RenderTaskScheduler::SkipCmdBatches (const EQueueType queue, uint bits) __NE___
     {
         constexpr uint  mask = ToBitMask<uint>( _MaxPendingBatches );
 
@@ -694,7 +664,7 @@
             desired.packed.required = exp.packed.required | bits;
             desired.packed.pending  = exp.packed.pending  | (bits & ~exp.packed.required);
 
-            if ( packed_bits.CAS( INOUT exp.value, desired.value ))
+            if_likely( packed_bits.CAS( INOUT exp.value, desired.value ))
                 return;
 
             ThreadUtils::Pause();
@@ -708,7 +678,7 @@
     returns 'null' on error
 =================================================
 */
-    RC<RTSCHEDULER::CommandBatch_t>  RTSCHEDULER::BeginCmdBatch (EQueueType queue, uint submitIdx, DebugLabel dbg, void* userData) __NE___
+    RC<RenderTaskScheduler::CommandBatch_t>  RenderTaskScheduler::BeginCmdBatch (EQueueType queue, const uint submitIdx, DebugLabel dbg, void* userData) __NE___
     {
         CHECK_ERR( submitIdx < _MaxPendingBatches );
         CHECK_ERR( AnyEqual( _GetState(), EState::Idle, EState::BeginFrame, EState::RecordFrame ));
@@ -727,7 +697,7 @@
         }
 
         uint    index;
-        CHECK_ERR( _batchPool.Assign( OUT index, [](auto* ptr, uint idx) { new (ptr) CommandBatch_t{ idx }; }));
+        CHECK_ERR( _batchPool.Assign( OUT index ));
 
         auto&   batch = _batchPool[ index ];
 
@@ -747,9 +717,13 @@
     only for debugging!
 =================================================
 */
-    bool  RTSCHEDULER::WaitAll (milliseconds timeout) __NE___
+    bool  RenderTaskScheduler::WaitAll (nanoseconds timeout) __NE___
     {
-        CHECK_ERR( AnyEqual( _GetState(), EState::Idle, EState::BeginFrame, EState::RecordFrame ));
+        const auto  state = _GetState();
+        if ( state == EState::Destroyed )
+            return true;
+
+        CHECK( AnyEqual( state, EState::Idle, EState::BeginFrame, EState::RecordFrame ));
 
         return _WaitAll( timeout );
     }
@@ -759,12 +733,11 @@
     _WaitAll
 =================================================
 */
-    bool  RTSCHEDULER::_WaitAll (milliseconds timeout)
+    bool  RenderTaskScheduler::_WaitAll (const nanoseconds timeout)
     {
         using Clock_t = std::chrono::high_resolution_clock;
 
-        const auto  sleep_time  = milliseconds{10};
-        const auto  start       = Clock_t::now();
+        const auto  end_time    = Clock_t::now() + timeout;
         const auto  q_mask      = _device.GetAvailableQueues();
 
         for (;;)
@@ -783,15 +756,14 @@
                 if_unlikely( not _IsFrameCompleted( frame_id ))
                 {
                     complete = false;
-                    ThreadUtils::Sleep( sleep_time );
+                    ThreadUtils::Sleep_15ms();
                 }
             }
 
             if ( complete )
                 return true;
 
-            auto    dt = Clock_t::now() - start;
-            if ( dt > timeout )
+            if ( Clock_t::now() > end_time )
                 return false;
         }
     }
@@ -801,10 +773,10 @@
     SetProfiler
 =================================================
 */
-    void  RTSCHEDULER::SetProfiler (RC<IGraphicsProfiler> profiler) __NE___
+    void  RenderTaskScheduler::SetProfiler (RC<IGraphicsProfiler> profiler) __NE___
     {
     DBG_GRAPHICS_ONLY(
-        _profiler = RVRef(profiler);
+        _profiler.store( profiler );
 
         if ( not profiler )
             return;
@@ -820,13 +792,13 @@
 =================================================
 */
 #if AE_DBG_GRAPHICS
-    void  RTSCHEDULER::DbgCheckFrameId (const FrameUID expected, StringView taskName) C_NE___
+    void  RenderTaskScheduler::DbgCheckFrameId (const FrameUID expected, StringView taskName) C_NE___
     {
         const FrameUID  cur = DbgFrameId();
         CHECK_MSG( cur == expected,
-            "Current frame ("s << ToString(ulong(cur.Unique())) << ") dosn't match expected frame (" <<
-            ToString(ulong(expected.Unique())) << ") in task '" << taskName << "'.\n"
-            "This may happens when RenderTask doesn't depends on 'BeginFrame' task or 'EndFrame' happens before current task is started/completed." );
+            "Current frame ("s << ToString(cur.Unique()) << ") doesn't match expected frame (" <<
+            ToString(expected.Unique()) << ") in task '" << taskName << "'.\n"
+            "This may happens when 'EndFrame' happens before current task is started/completed." );
     }
 #endif
 
@@ -836,7 +808,7 @@
 =================================================
 */
 #ifdef AE_DEBUG
-    void  RTSCHEDULER::DbgForEachBatch (const Threading::ITaskDependencyManager::CheckDepFn_t &fn, Bool) __NE___
+    void  RenderTaskScheduler::DbgForEachBatch (const Threading::ITaskDependencyManager::CheckDepFn_t &fn, Bool) __NE___
     {
         using EStatus = CommandBatch_t::EStatus;
 
diff --git a/AE/engine/src/graphics/Private/RenderTaskScheduler.h b/AE/engine/src/graphics/Private/RenderTaskScheduler.h
index 2f664eab..cda141d6 100644
--- a/AE/engine/src/graphics/Private/RenderTaskScheduler.h
+++ b/AE/engine/src/graphics/Private/RenderTaskScheduler.h
@@ -3,25 +3,22 @@
 #if defined(AE_ENABLE_VULKAN)
 #   define SUFFIX           V
 #   define CMDPOOLMNGR      VCommandPoolManager
-#   define RTSCHEDULER      VRenderTaskScheduler
 #   if not AE_VK_TIMELINE_SEMAPHORE
 #     define ENABLE_VK_TIMELINE_SEMAPHORE
 #   endif
 
 #elif defined(AE_ENABLE_METAL)
 #   define SUFFIX           M
-#   define RTSCHEDULER      MRenderTaskScheduler
 
 #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
 #   define SUFFIX           R
-#   define RTSCHEDULER      RRenderTaskScheduler
 
 #else
 #   error not implemented
 #endif
 //-----------------------------------------------------------------------------
 
-namespace AE { Graphics::RTSCHEDULER&  RenderTaskScheduler () __NE___; }
+namespace AE { Graphics::RenderTaskScheduler&  GraphicsScheduler () __NE___; }
 namespace AE::RG::_hidden_ { class RenderGraph; }
 
 namespace AE::Graphics
@@ -31,9 +28,9 @@ namespace AE::Graphics
     // Render Task Scheduler
     //
 
-    class RTSCHEDULER final
+    class RenderTaskScheduler final
     {
-        friend struct InPlace<RTSCHEDULER>;
+        friend struct InPlace<RenderTaskScheduler>;
 
     // types
     private:
@@ -45,28 +42,33 @@ namespace AE::Graphics
 
 
     public:
+        class InstanceCtor {
+        public:
+            static void  Create (const Device_t &dev)   __NE___;
+            static void  Destroy ()                     __NE___;
+        };
+
         class CommandBatchApi : Noninstanceable
         {
             friend class AE_PRIVATE_UNITE_RAW( SUFFIX, CommandBatch );
-            static void  Recycle (uint indexInPool)                 __NE___;
+            static void  Recycle (CommandBatch_t*)                  __NE___;
             static void  Submit (CommandBatch_t&, ESubmitMode mode) __NE___;
         };
 
         class DrawCommandBatchApi : Noninstanceable
         {
             friend class AE_PRIVATE_UNITE_RAW( SUFFIX, DrawCommandBatch );
-            static void  Recycle (uint indexInPool)                 __NE___;
+            static void  Recycle (DrawCommandBatch_t*)              __NE___;
         };
 
         #ifdef ENABLE_VK_TIMELINE_SEMAPHORE
         class VirtualFenceApi : Noninstanceable
         {
             friend class CommandBatch_t::VirtualFence;
-            static void  Recycle (uint indexInPool)                 __NE___;
+            static void  Recycle (CommandBatch_t::VirtualFence*)    __NE___;
         };
         #endif
 
-        static constexpr auto   DefaultWaitTime         = seconds{10};
     private:
         static constexpr uint   _MaxPendingBatches      = GraphicsConfig::MaxPendingCmdBatches;
         static constexpr uint   _MaxSubmittedBatches    = 32;
@@ -74,7 +76,7 @@ namespace AE::Graphics
         static constexpr uint   _BatchPerChunk          = 64;
         static constexpr uint   _ChunkCount             = (_MaxPendingBatches * GraphicsConfig::MaxFrames + _BatchPerChunk - 1) / _BatchPerChunk;
 
-        STATIC_ASSERT( _MaxPendingBatches*2 <= _MaxSubmittedBatches );
+        StaticAssert( _MaxPendingBatches*2 <= _MaxSubmittedBatches );
 
         using TempBatches_t = FixedArray< RC<CommandBatch_t>, _MaxPendingBatches >;
 
@@ -96,7 +98,7 @@ namespace AE::Graphics
                 }       packed;
                 ulong   value   = 0;
             };
-            STATIC_ASSERT( sizeof(Bitfield) == sizeof(ulong) );
+            StaticAssert( sizeof(Bitfield) == sizeof(ulong) );
 
             Atomic<ulong>   bits        {0};    // 1 - required/pending/submitted, 0 - empty
             BatchArray_t    pending     {};
@@ -115,8 +117,8 @@ namespace AE::Graphics
         using FrameUIDs_t   = StaticArray< AtomicFrameUID, GraphicsConfig::MaxFrames >;
 
 
-        using BatchPool_t       = Threading::LfIndexedPool2< CommandBatch_t,        uint, _BatchPerChunk, _ChunkCount >;
-        using DrawBatchPool_t   = Threading::LfIndexedPool2< DrawCommandBatch_t,    uint, _BatchPerChunk, _ChunkCount >;
+        using BatchPool_t       = Threading::LfIndexedPool< CommandBatch_t,     uint, _BatchPerChunk, _ChunkCount, GlobalLinearAllocatorRef >;
+        using DrawBatchPool_t   = Threading::LfIndexedPool< DrawCommandBatch_t, uint, _BatchPerChunk, _ChunkCount, GlobalLinearAllocatorRef >;
 
         using BeginDepsArray_t  = FixedArray< AsyncTask, _MaxBeginFrameDeps >;
         using BeginDepsFrames_t = StaticArray< BeginDepsArray_t, GraphicsConfig::MaxFrames >;
@@ -128,7 +130,6 @@ namespace AE::Graphics
         class BatchSubmitDepsManager;
         class BatchCompleteDepsManager;
 
-        class BeginFrameTask;
         class EndFrameTask;
 
         enum class EState : uint
@@ -151,8 +152,8 @@ namespace AE::Graphics
         FrameUIDs_t                         _perFrameUID    = {};
 
         // CPU side time
-        BitAtomic<TimePoint_t>              _lastUpdate;            // -|-- changed in 'BeginFrameTask'
-        FAtomic<float>                      _timeDelta      {0.f};  // -/
+        BitAtomic<TimePoint_t>              _lastUpdate;            // \__ changed in 'BeginFrame()'
+        FAtomic<float>                      _timeDelta      {0.f};  // /
 
         alignas(AE_CACHE_LINE)
           BatchPool_t                       _batchPool;
@@ -179,31 +180,26 @@ namespace AE::Graphics
           BeginDepsSync_t                   _beginDeps;
 
         DBG_GRAPHICS_ONLY(
-            AtomicFrameUID                  _dbgFrameId;            // valid between 'BeginFrameTask::Run()' and 'EndFrameTask::Run()'
+            AtomicFrameUID                  _dbgFrameId;            // valid between 'BeginFrame()' and 'EndFrameTask::Run()'
             AtomicRC<IGraphicsProfiler>     _profiler;
         )
 
 
     // methods
     public:
-            static void  CreateInstance (const Device_t &dev)                           __NE___;
-            static void  DestroyInstance ()                                             __NE___;
-
         ND_ bool        Initialize (const GraphicsCreateInfo &)                         __NE___;
             void        Deinitialize ()                                                 __NE___;
             void        SetProfiler (RC<IGraphicsProfiler> profiler)                    __NE___;
 
-        template <typename ...Deps>
-        ND_ AsyncTask   BeginFrame (const BeginFrameConfig& cfg  = Default,
-                                    const Tuple<Deps...>  & deps = Default)             __Th___;
+        ND_ bool        WaitNextFrame (const EThreadArray & threads,
+                                       nanoseconds          timeout)                    __NE___;
 
-        template <typename ...Deps>
-        ND_ AsyncTask   EndFrame (const Tuple<Deps...> &deps = Default)                 __Th___;
+        ND_ bool        BeginFrame (const BeginFrameConfig &cfg = Default)              __NE___;
 
-        ND_ AsyncTask   WaitFrame (FrameUID)                                            __NE___;
-        ND_ AsyncTask   WaitNextFrame ()                                                __NE___ { return WaitFrame( GetFrameId().Inc() ); }
+        template <typename ...Deps>
+        ND_ AsyncTask   EndFrame (const Tuple<Deps...> &deps = Default)                 __NE___;
 
-        ND_ bool        WaitAll (milliseconds timeout = DefaultWaitTime)                __NE___;
+        ND_ bool        WaitAll (nanoseconds timeout)                                   __NE___;
 
             void        AddFrameDeps (FrameUID, ArrayView<AsyncTask> deps)              __NE___;
             void        AddFrameDeps (FrameUID, AsyncTask dep)                          __NE___;
@@ -249,7 +245,7 @@ namespace AE::Graphics
         ND_ RC<IGraphicsProfiler>   GetProfiler ()                                      __NE___ { return _profiler.load(); }
 
         ND_ FrameUID                DbgFrameId ()                                       C_NE___ { return _dbgFrameId.load(); }
-            void                    DbgCheckFrameId (FrameUID, StringView name)         C_NE___;
+            void                    DbgCheckFrameId (FrameUID, StringView taskName)     C_NE___;
       #endif
 
         DEBUG_ONLY(
@@ -257,21 +253,21 @@ namespace AE::Graphics
 
 
     private:
-        explicit RTSCHEDULER (const Device_t &dev)                                      __NE___;
-        ~RTSCHEDULER ()                                                                 __NE___;
+        explicit RenderTaskScheduler (const Device_t &dev)                              __NE___;
+        ~RenderTaskScheduler ()                                                         __NE___;
 
-        ND_ static RTSCHEDULER& _Instance ()                                            __NE___;
-        friend RTSCHEDULER&     AE::RenderTaskScheduler ()                              __NE___;
+        ND_ static RenderTaskScheduler& _Instance ()                                    __NE___;
+        friend RenderTaskScheduler&     AE::GraphicsScheduler ()                        __NE___;
 
             bool    _FlushQueue (EQueueType q, FrameUID frameId, bool forceFlush);
 
         // returns 'false' if not complete
         ND_ bool    _IsFrameCompleted (FrameUID frameId);
 
-        ND_ bool    _WaitAll (milliseconds timeout);
+        ND_ bool    _WaitAll (nanoseconds timeout);
 
         ND_ bool    _SetState (EState expected, EState newState)                        __NE___ { return _state.CAS_Loop( INOUT expected, newState ); }
-            void    _SetState (EState newState)                                         __NE___ { _state.store( newState ); }
+        ND_ EState  _SetState (EState newState)                                         __NE___ { return _state.exchange( newState ); }
         ND_ EState  _GetState ()                                                        __NE___ { return _state.load(); }
 
 
@@ -316,7 +312,7 @@ namespace AE::Graphics
     // methods
     private:
         ND_ RC<MDrawCommandBatch>  _CreateDrawBatch (MetalParallelRenderCommandEncoderRC encoder, const MPrimaryCmdBufState &primaryState,
-                                                     ArrayView<RenderPassDesc::Viewport> viewports, DebugLabel dbg)                         __NE___;
+                                                     ArrayView<RenderPassDesc::Viewport> viewports, DebugLabel dbg) __NE___;
 
         ND_ bool    _FlushQueue2 (EQueueType queueType, TempBatches_t &pending);
 
@@ -324,7 +320,7 @@ namespace AE::Graphics
     //-----------------------------------------------------
     #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
 
-        // TODO
+        class GraphicsContextApi;
 
     //-----------------------------------------------------
     #else
@@ -342,17 +338,13 @@ namespace AE::Graphics
         class _VIndirectGraphicsCtx;
     }
 
-    class VRenderTaskScheduler::GraphicsContextApi : Noninstanceable
+    class RenderTaskScheduler::GraphicsContextApi : Noninstanceable
     {
         friend class _hidden_::_VDirectGraphicsCtx;
         friend class _hidden_::_VIndirectGraphicsCtx;
 
-        ND_ static RC<VDrawCommandBatch>  CreateFirstPassBatch (VRenderTaskScheduler &rts,
-                                                                const VPrimaryCmdBufState &primaryState, const RenderPassDesc &desc,
-                                                                DebugLabel dbg)                                                     __NE___;
-
-        ND_ static RC<VDrawCommandBatch>  CreateNextPassBatch (VRenderTaskScheduler &rts,
-                                                               const VDrawCommandBatch &prevBatch, DebugLabel dbg)                  __NE___;
+        ND_ static RC<VDrawCommandBatch>  CreateFirstPassBatch (RenderTaskScheduler &, const VPrimaryCmdBufState &, const RenderPassDesc &, DebugLabel) __NE___;
+        ND_ static RC<VDrawCommandBatch>  CreateNextPassBatch  (RenderTaskScheduler &, const VDrawCommandBatch &, DebugLabel)                           __NE___;
     };
 
 # elif defined(AE_ENABLE_METAL)
@@ -363,33 +355,34 @@ namespace AE::Graphics
         class _MIndirectGraphicsCtx;
     }
 
-    class MRenderTaskScheduler::DirectGraphicsContextApi : Noninstanceable
+    class RenderTaskScheduler::DirectGraphicsContextApi : Noninstanceable
     {
         friend class _hidden_::_MDirectGraphicsCtx;
 
-        ND_ static RC<MDrawCommandBatch>  CreateFirstPassBatch (MRenderTaskScheduler &rts,
-                                                                MetalParallelRenderCommandEncoderRC encoder, const MPrimaryCmdBufState &primaryState,
-                                                                ArrayView<RenderPassDesc::Viewport> viewports, DebugLabel dbg)                      __NE___;
+        ND_ static RC<MDrawCommandBatch>  CreateFirstPassBatch (RenderTaskScheduler &, MetalParallelRenderCommandEncoderRC,
+                                                                const MPrimaryCmdBufState &, ArrayView<RenderPassDesc::Viewport>, DebugLabel)   __NE___;
 
-        ND_ static RC<MDrawCommandBatch>  CreateNextPassBatch (MRenderTaskScheduler &rts,
-                                                                MetalParallelRenderCommandEncoderRC encoder, const MPrimaryCmdBufState &primaryState,
-                                                                ArrayView<RenderPassDesc::Viewport> viewports, DebugLabel dbg)                      __NE___;
+        ND_ static RC<MDrawCommandBatch>  CreateNextPassBatch (RenderTaskScheduler &, MetalParallelRenderCommandEncoderRC,
+                                                               const MPrimaryCmdBufState &, ArrayView<RenderPassDesc::Viewport>, DebugLabel)    __NE___;
     };
 
-    class MRenderTaskScheduler::IndirectGraphicsContextApi : Noninstanceable
+    class RenderTaskScheduler::IndirectGraphicsContextApi : Noninstanceable
     {
         friend class _hidden_::_MIndirectGraphicsCtx;
 
-        ND_ static RC<MDrawCommandBatch>  CreateFirstPassBatch (MRenderTaskScheduler &rts, const MPrimaryCmdBufState &primaryState,
-                                                                ArrayView<RenderPassDesc::Viewport> viewports, DebugLabel dbg)                      __NE___;
-
-        ND_ static RC<MDrawCommandBatch>  CreateNextPassBatch (MRenderTaskScheduler &rts, const MPrimaryCmdBufState &primaryState,
-                                                                ArrayView<RenderPassDesc::Viewport> viewports, DebugLabel dbg)                      __NE___;
+        ND_ static RC<MDrawCommandBatch>  CreateFirstPassBatch (RenderTaskScheduler &, const MPrimaryCmdBufState &, ArrayView<RenderPassDesc::Viewport>, DebugLabel)__NE___;
+        ND_ static RC<MDrawCommandBatch>  CreateNextPassBatch (RenderTaskScheduler &, const MPrimaryCmdBufState &, ArrayView<RenderPassDesc::Viewport>, DebugLabel) __NE___;
     };
 
 # elif defined(AE_ENABLE_REMOTE_GRAPHICS)
 
-    // TODO
+    class RenderTaskScheduler::GraphicsContextApi : Noninstanceable
+    {
+        friend class RGraphicsCtx;
+
+        ND_ static RC<RDrawCommandBatch>  CreateFirstPassBatch (RenderTaskScheduler &, const RPrimaryCmdBufState &, const RenderPassDesc &, DebugLabel) __NE___;
+        ND_ static RC<RDrawCommandBatch>  CreateNextPassBatch  (RenderTaskScheduler &, const RDrawCommandBatch &, DebugLabel)                           __NE___;
+    };
 
 #else
 #   error not implemented
@@ -401,7 +394,7 @@ namespace AE::Graphics
     // Batch Complete Dependency Manager
     //
 
-    class RTSCHEDULER::BatchCompleteDepsManager final : public Threading::ITaskDependencyManager
+    class RenderTaskScheduler::BatchCompleteDepsManager final : public Threading::ITaskDependencyManager
     {
     // methods
     public:
@@ -419,7 +412,7 @@ namespace AE::Graphics
     // Batch Submit Dependency Manager
     //
 
-    class RTSCHEDULER::BatchSubmitDepsManager final : public Threading::ITaskDependencyManager
+    class RenderTaskScheduler::BatchSubmitDepsManager final : public Threading::ITaskDependencyManager
     {
     // methods
     public:
@@ -433,38 +426,11 @@ namespace AE::Graphics
 
 
 
-    //
-    // Begin Frame Task
-    //
-
-    class RTSCHEDULER::BeginFrameTask final : public Threading::IAsyncTask
-    {
-    private:
-        const FrameUID          _frameId;       // new frame id
-        const BeginFrameConfig  _config;
-
-    public:
-        BeginFrameTask (FrameUID frameId, const BeginFrameConfig &cfg) __NE___ :
-            IAsyncTask{ETaskQueue::Renderer}, _frameId{frameId}, _config{cfg}
-        {}
-
-        void  Run ()            __Th_OV;
-        void  OnCancel ()       __NE_OV;
-
-        StringView  DbgName ()  C_NE_OF { return "BeginFrame"; }
-
-    private:
-        bool  _RunImpl ()       __Th___;
-        void  _ResetStates()    __NE___;
-    };
-
-
-
     //
     // End Frame Task
     //
 
-    class RTSCHEDULER::EndFrameTask final : public Threading::IAsyncTask
+    class RenderTaskScheduler::EndFrameTask final : public Threading::IAsyncTask
     {
     private:
         const FrameUID  _frameId;       // current frame id
@@ -487,59 +453,18 @@ namespace AE::Graphics
 
 
 
-/*
-=================================================
-    BeginFrame
-=================================================
-*/
-    template <typename ...Deps>
-    inline AsyncTask  RTSCHEDULER::BeginFrame (const BeginFrameConfig &cfg, const Tuple<Deps...> &deps) __Th___
-    {
-        CHECK_ERR( _SetState( EState::Idle, EState::BeginFrame ),
-                   Scheduler().GetCanceledTask() );
-
-        FrameUID    frame_id = _frameId.Inc();
-        _perFrameUID[ frame_id.Index() ].store( frame_id );
-
-        AsyncTask   task = MakeRC< RTSCHEDULER::BeginFrameTask >( frame_id, cfg );  // throw    // TODO: catch
-
-        DBG_GRAPHICS_ONLY(
-            if ( auto prof = GetProfiler() )
-                prof->RequestNextFrame( frame_id );
-        )
-
-        // recycle per-frame memory
-        MemoryManager().GetGraphicsFrameAllocator().BeginFrame( frame_id );
-
-        auto    begin_deps2 = _beginDeps.WriteNoLock();
-        EXLOCK( begin_deps2 );
-
-        auto&   begin_deps = (*begin_deps2)[ frame_id.Index() ];
-
-        if_likely( Scheduler().Run( task, TupleConcat( Tuple{ ArrayView<AsyncTask>{ begin_deps }}, deps )))
-        {
-            begin_deps.clear();
-            return task;
-        }
-        else
-        {
-            CHECK( _SetState( EState::BeginFrame, EState::Idle ));
-            return Scheduler().GetCanceledTask();
-        }
-    }
-
 /*
 =================================================
     EndFrame
 =================================================
 */
     template <typename ...Deps>
-    inline AsyncTask  RTSCHEDULER::EndFrame (const Tuple<Deps...> &deps) __Th___
+    inline AsyncTask  RenderTaskScheduler::EndFrame (const Tuple<Deps...> &deps) __NE___
     {
         CHECK_ERR( AnyEqual( _GetState(), EState::BeginFrame, EState::RecordFrame ),
                    Scheduler().GetCanceledTask() );
 
-        AsyncTask   task = MakeRC< RTSCHEDULER::EndFrameTask >( GetFrameId() ); // throw    // TODO: catch
+        AsyncTask   task = MakeRC< RenderTaskScheduler::EndFrameTask >( GetFrameId() );
 
         if_likely( Scheduler().Run( task, deps ))
         {
@@ -559,7 +484,7 @@ namespace AE::Graphics
     void  GAutorelease< HandleTmpl< IndexSize, GenerationSize, UID >>::_ReleaseRef () __NE___
     {
         if ( _id )
-            RenderTaskScheduler().GetResourceManager().DelayedRelease( INOUT _id );
+            GraphicsScheduler().GetResourceManager().DelayedRelease( INOUT _id );
 
         ASSERT( not _id.IsValid() );
     }
@@ -571,12 +496,12 @@ namespace AE
 {
 /*
 =================================================
-    RenderTaskScheduler
+    GraphicsScheduler
 =================================================
 */
-    ND_ inline Graphics::RTSCHEDULER&  RenderTaskScheduler () __NE___
+    ND_ inline Graphics::RenderTaskScheduler&  GraphicsScheduler () __NE___
     {
-        return Graphics::RTSCHEDULER::_Instance();
+        return Graphics::RenderTaskScheduler::_Instance();
     }
 
 } // AE
@@ -585,4 +510,4 @@ namespace AE
 #undef SUFFIX
 #undef CMDPOOLMNGR
 #undef ENABLE_VK_TIMELINE_SEMAPHORE
-#undef RTSCHEDULER
+#undef RenderTaskScheduler
diff --git a/AE/engine/src/graphics/Private/ResourceBase.h b/AE/engine/src/graphics/Private/ResourceBase.h
index d2ae13ae..59a94586 100644
--- a/AE/engine/src/graphics/Private/ResourceBase.h
+++ b/AE/engine/src/graphics/Private/ResourceBase.h
@@ -11,12 +11,12 @@ namespace AE::Graphics
     // Resource Wrapper
     //
 
-    template <typename ResType>
+    template <typename ResType, typename ID>
     class alignas(AE_CACHE_LINE) ResourceBase final
     {
     // types
     private:
-        enum class EState : uint
+        enum class EState : ubyte
         {
             Destroyed   = 0,
             Failed,
@@ -24,15 +24,15 @@ namespace AE::Graphics
         };
 
     public:
-        using Self          = ResourceBase< ResType >;
+        using Self          = ResourceBase< ResType, ID >;
         using Resource_t    = ResType;
-        using Generation_t  = BufferID::Generation_t;
+        using Generation_t  = typename ID::Generation_t;
 
 
     // variables
     private:
         // instance counter used to detect deprecated handles
-        Atomic<uint>            _generation {0};
+        Atomic<Generation_t>    _generation {0};
 
         Atomic<EState>          _state      {EState::Destroyed};
 
@@ -45,11 +45,11 @@ namespace AE::Graphics
     public:
         ResourceBase ()                                 __NE___ {}
 
-        ResourceBase (Self &&)                          = delete;
-        ResourceBase (const Self &)                     = delete;
+        ResourceBase (Self &&)                                  = delete;
+        ResourceBase (const Self &)                             = delete;
 
-        Self& operator = (Self &&)                      = delete;
-        Self& operator = (const Self &)                 = delete;
+        Self& operator = (Self &&)                              = delete;
+        Self& operator = (const Self &)                         = delete;
 
         ~ResourceBase ()                                __NE___ { ASSERT( IsDestroyed() ); }
 
@@ -60,7 +60,7 @@ namespace AE::Graphics
         ND_ bool            IsCreated ()                C_NE___ { return _GetState() == EState::Created; }
         ND_ bool            IsDestroyed ()              C_NE___ { return _GetState() == EState::Destroyed; }
 
-        ND_ Generation_t    GetGeneration ()            C_NE___ { return Generation_t(_generation.load()); }
+        ND_ Generation_t    GetGeneration ()            C_NE___ { return _generation.load(); }
         ND_ int             GetRefCount ()              C_NE___ { return _refCounter.load(); }
 
         ND_ ResType&        Data ()                     __NE___ { return _data; }
@@ -96,11 +96,13 @@ namespace AE::Graphics
             _refCounter.store( 0 );
             _state.store( EState::Destroyed );
 
-            constexpr uint  max_gen = BufferID::MaxGeneration();
+            constexpr Generation_t  max_gen = ID::MaxGeneration();
 
-            for (uint exp = _generation.load();
-                 not _generation.CAS( INOUT exp, (exp < max_gen ? exp + 1 : 0) );)
+            for (Generation_t exp = _generation.load();;)
             {
+                if_likely( _generation.CAS( INOUT exp, (exp < max_gen ? exp + 1 : 0) ))
+                    break;
+
                 ThreadUtils::Pause();
             }
         }
diff --git a/AE/engine/src/graphics/Private/ResourceManager.cpp.h b/AE/engine/src/graphics/Private/ResourceManager.cpp.h
index 818bdf35..337d34f6 100644
--- a/AE/engine/src/graphics/Private/ResourceManager.cpp.h
+++ b/AE/engine/src/graphics/Private/ResourceManager.cpp.h
@@ -6,6 +6,9 @@
 #elif defined(AE_ENABLE_METAL)
 #   define SUFFIX       M
 
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define SUFFIX       R
+
 #else
 #   error not implemented
 #endif
@@ -22,10 +25,10 @@ namespace {
     destroy previous resource instance and construct new instance
 =================================================
 */
-    template <typename ResType, typename ...Args>
-    inline void  Replace (INOUT ResourceBase<ResType> &target, Args&& ...args) __NE___
+    template <typename ResType, typename ID, typename ...Args>
+    inline void  Replace (INOUT ResourceBase<ResType,ID> &target, Args&& ...args) __NE___
     {
-        Reconstruct<ResType>( target.Data(), FwdArg<Args>( args )... );
+        Reconstruct<ResType>( INOUT target.Data(), FwdArg<Args>( args )... );
     }
 
 /*
@@ -36,7 +39,7 @@ namespace {
     template <typename PoolT>
     inline void  DestroyResources (RESMNGR* resMngr, INOUT PoolT &pool) __NE___
     {
-        pool.UnassignAll( [resMngr] (auto& res)
+        pool.UnassignAll( [resMngr] (auto& res) __NE___
             {
                 ASSERT( res.IsCreated() );  // all assigned resources should be created
 
@@ -53,7 +56,7 @@ namespace {
     template <typename PoolT>
     inline void  LogAssignedResourcesAndDestroy (RESMNGR* resMngr, INOUT PoolT &pool) __NE___
     {
-        pool.UnassignAll( [resMngr] (auto& res)
+        pool.UnassignAll( [resMngr] (auto& res) __NE___
             {
                 ASSERT( res.IsCreated() );  // all assigned resources should be created
 
@@ -121,7 +124,7 @@ namespace {
     void  RESMNGR::AddHashToName (const PipelineCompiler::HashToName &value) __NE___
     {
         EXLOCK( _hashToNameGuard );
-        CATCH( _hashToName.Merge( value ));
+        NOTHROW( _hashToName.Merge( value ));
     }
 # endif
 
@@ -174,40 +177,40 @@ namespace {
     constructor
 =================================================
 */
-    RESMNGR::RESMNGR (const Device_t &dev) __Th___ :
+    RESMNGR::RESMNGR (const Device_t &dev) __NE___ :
         _device{ dev },
         _stagingMngr{ *this },
         _queryMngr{}
     {
         _device.InitFeatureSet( OUT _featureSet );
 
-        STATIC_ASSERT( BufferID::MaxIndex()             >= BufferPool_t::capacity() );
-        STATIC_ASSERT( ImageID::MaxIndex()              >= ImagePool_t::capacity() );
-        STATIC_ASSERT( MemoryID::MaxIndex()             >= MemObjPool_t::capacity() );
-        STATIC_ASSERT( BufferViewID::MaxIndex()         >= BufferViewPool_t::capacity() );
-        STATIC_ASSERT( ImageViewID::MaxIndex()          >= ImageViewPool_t::capacity() );
-        STATIC_ASSERT( DescriptorSetLayoutID::MaxIndex()>= DSLayoutPool_t::capacity() );
-        STATIC_ASSERT( GraphicsPipelineID::MaxIndex()   >= GPipelinePool_t::capacity() );
-        STATIC_ASSERT( ComputePipelineID::MaxIndex()    >= CPipelinePool_t::capacity() );
-        STATIC_ASSERT( MeshPipelineID::MaxIndex()       >= MPipelinePool_t::capacity() );
-        STATIC_ASSERT( RayTracingPipelineID::MaxIndex() >= RTPipelinePool_t::capacity() );
-        STATIC_ASSERT( TilePipelineID::MaxIndex()       >= TPipelinePool_t::capacity() );
-        STATIC_ASSERT( DescriptorSetID::MaxIndex()      >= DescSetPool_t::capacity() );
-        STATIC_ASSERT( RTGeometryID::MaxIndex()         >= RTGeomPool_t::capacity() );
-        STATIC_ASSERT( RTSceneID::MaxIndex()            >= RTScenePool_t::capacity() );
-        STATIC_ASSERT( PipelineLayoutID::MaxIndex()     >= PplnLayoutPool_t::capacity() );
-        STATIC_ASSERT( RTShaderBindingID::MaxIndex()    >= SBTPool_t::capacity() );
-        STATIC_ASSERT( SamplerID::MaxIndex()            >= SamplerPool_t::capacity() );
-        STATIC_ASSERT( RenderPassID::MaxIndex()         >= RenderPassPool_t::capacity() );
-        STATIC_ASSERT( PipelineCacheID::MaxIndex()      >= PipelineCachePool_t::capacity() );
-        STATIC_ASSERT( PipelinePackID::MaxIndex()       >= PipelinePackPool_t::capacity() );
-        STATIC_ASSERT( IsSameTypes< AllResourceIDs_t::Back::type, MemoryID >);
+        StaticAssert( BufferID::MaxIndex()              >= BufferPool_t::capacity() );
+        StaticAssert( ImageID::MaxIndex()               >= ImagePool_t::capacity() );
+        StaticAssert( MemoryID::MaxIndex()              >= MemObjPool_t::capacity() );
+        StaticAssert( BufferViewID::MaxIndex()          >= BufferViewPool_t::capacity() );
+        StaticAssert( ImageViewID::MaxIndex()           >= ImageViewPool_t::capacity() );
+        StaticAssert( DescriptorSetLayoutID::MaxIndex() >= DSLayoutPool_t::capacity() );
+        StaticAssert( GraphicsPipelineID::MaxIndex()    >= GPipelinePool_t::capacity() );
+        StaticAssert( ComputePipelineID::MaxIndex()     >= CPipelinePool_t::capacity() );
+        StaticAssert( MeshPipelineID::MaxIndex()        >= MPipelinePool_t::capacity() );
+        StaticAssert( RayTracingPipelineID::MaxIndex()  >= RTPipelinePool_t::capacity() );
+        StaticAssert( TilePipelineID::MaxIndex()        >= TPipelinePool_t::capacity() );
+        StaticAssert( DescriptorSetID::MaxIndex()       >= DescSetPool_t::capacity() );
+        StaticAssert( RTGeometryID::MaxIndex()          >= RTGeomPool_t::capacity() );
+        StaticAssert( RTSceneID::MaxIndex()             >= RTScenePool_t::capacity() );
+        StaticAssert( PipelineLayoutID::MaxIndex()      >= PplnLayoutPool_t::capacity() );
+        StaticAssert( RTShaderBindingID::MaxIndex()     >= SBTPool_t::capacity() );
+        StaticAssert( SamplerID::MaxIndex()             >= SamplerPool_t::capacity() );
+        StaticAssert( RenderPassID::MaxIndex()          >= RenderPassPool_t::capacity() );
+        StaticAssert( PipelineCacheID::MaxIndex()       >= PipelineCachePool_t::capacity() );
+        StaticAssert( PipelinePackID::MaxIndex()        >= PipelinePackPool_t::capacity() );
+        StaticAssert( IsSameTypes< AllResourceIDs_t::Back::type, MemoryID >);
 
         #ifdef AE_ENABLE_VULKAN
-        STATIC_ASSERT( VideoBufferID::MaxIndex()        >= VideoBufferPool_t::capacity() );
-        STATIC_ASSERT( VideoImageID::MaxIndex()         >= VideoImagePool_t::capacity() );
-        STATIC_ASSERT( VideoSessionID::MaxIndex()       >= VideoSessionPool_t::capacity() );
-        STATIC_ASSERT( VFramebufferID::MaxIndex()       >= FramebufferPool_t::capacity() );
+        StaticAssert( VideoBufferID::MaxIndex()     >= VideoBufferPool_t::capacity() );
+        StaticAssert( VideoImageID::MaxIndex()          >= VideoImagePool_t::capacity() );
+        StaticAssert( VideoSessionID::MaxIndex()        >= VideoSessionPool_t::capacity() );
+        StaticAssert( VFramebufferID::MaxIndex()        >= FramebufferPool_t::capacity() );
 
         _InitReleaseResourceByIDFns();
         #endif
@@ -251,7 +254,7 @@ namespace {
     Initialize
 =================================================
 */
-    bool  RESMNGR::Initialize (const GraphicsCreateInfo &info) __Th___
+    bool  RESMNGR::Initialize (const GraphicsCreateInfo &info) __NE___
     {
         CHECK_ERR( _CreateEmptyDescriptorSetLayout() );
         CHECK_ERR( _CreateDefaultSampler() );
@@ -263,11 +266,11 @@ namespace {
 
       #ifdef AE_ENABLE_VULKAN
         if ( not _defaultMemAlloc )
-            _defaultMemAlloc = MakeRC< VUniMemAllocator >();    // throw
+            _defaultMemAlloc = MakeRC< VUniMemAllocator >();
       #endif
 
         if ( not _defaultDescAlloc )
-            _defaultDescAlloc = MakeRC< AE_PRIVATE_UNITE_RAW( SUFFIX, DefaultDescriptorAllocator )>();  // throw
+            _defaultDescAlloc = MakeRC< AE_PRIVATE_UNITE_RAW( SUFFIX, DefaultDescriptorAllocator )>();
 
         return true;
     }
@@ -282,16 +285,12 @@ namespace {
         _stagingMngr.Deinitialize();
         _queryMngr.Deinitialize();
 
-        ForceReleaseResources();
-
-        ImmediatelyRelease( _defaultSampler );
-        ImmediatelyRelease( _emptyDSLayout );
-        ForceReleaseResources();
-
       #ifdef AE_ENABLE_VULKAN
         DestroyResources( this, INOUT _resPool.framebuffers );
-        ForceReleaseResources();
       #endif
+        ImmediatelyRelease( _defaultSampler );
+        ImmediatelyRelease( _emptyDSLayout );
+        ForceReleaseResources();
 
         { auto tmp = _defaultPack.Release();  ImmediatelyRelease( tmp ); }
         LogAssignedResourcesAndDestroy( this, INOUT _resPool.pipelinePacks );
@@ -791,7 +790,7 @@ namespace {
         auto*   ppln = GetResource( pplnId );
         CHECK_ERR( ppln );
 
-        auto*   ppln_layout = GetResource( ppln->LayoutID() );
+        auto*   ppln_layout = GetResource( ppln->LayoutId() );
         CHECK_ERR( ppln_layout );
 
         DescriptorSetLayoutID   layout_id;
@@ -889,7 +888,7 @@ namespace {
         auto*   ppln = GetResource( pplnId );
         CHECK_ERR( ppln != null );
 
-        auto*   layout = GetResource( ppln->LayoutID() );
+        auto*   layout = GetResource( ppln->LayoutId() );
         CHECK_ERR( layout != null );
 
         auto&   pc = layout->GetPushConstants();
@@ -904,6 +903,9 @@ namespace {
         #elif defined(AE_ENABLE_METAL)
             return PushConstantIndex{ it->second.metalBufferId, it->second.stage, it->second.typeName, it->second.size };
 
+        #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+            return PushConstantIndex{ it->second.vulkanOffset, it->second.stage, it->second.typeName, it->second.size };    // TODO
+
         #else
         #   error not implemented
         #endif
@@ -1053,7 +1055,7 @@ namespace {
             log << "\nPool: " << name;
 
             auto&   pool = resMngr._GetResourcePool( T{} );
-            pool.ForEachAssigned( [this] (auto& res) { log << "\n  '" << res.Data().GetDebugName() << "', rc: " << ToString(res.GetRefCount()); } );
+            pool.ForEachAssigned( [this] (auto& res) __NE___ { log << "\n  '" << res.Data().GetDebugName() << "', rc: " << ToString(res.GetRefCount()); } );
         }
     };
 #endif
@@ -1066,13 +1068,12 @@ namespace {
     void  RESMNGR::PrintAllResources () __NE___
     {
     #ifdef AE_DEBUG
-        try {
+        TRY{
             String  log;
             AllResourceIDs_t::Visit( _ResourcePrinter{ *this, log });
             AE_LOGI( log );
         }
-        catch (...)
-        {}
+        CATCH_ALL();
     #endif
     }
 //-----------------------------------------------------------------------------
diff --git a/AE/engine/src/graphics/Private/ResourceManager.h b/AE/engine/src/graphics/Private/ResourceManager.h
index b3b3b799..72327a35 100644
--- a/AE/engine/src/graphics/Private/ResourceManager.h
+++ b/AE/engine/src/graphics/Private/ResourceManager.h
@@ -27,15 +27,15 @@ namespace AE::Graphics
 
     class RESMNGR final : public IResourceManager
     {
-        friend class AE_PRIVATE_UNITE_RAW( SUFFIX, RenderTaskScheduler );
+        friend class RenderTaskScheduler;
 
     // types
     private:
         template <typename T, typename ID, usize ChunkSize, usize MaxChunks>
-        using PoolTmpl      = Threading::LfIndexedPool3< ResourceBase<T>, typename ID::Index_t, ChunkSize, MaxChunks, GlobalLinearAllocatorRef >;
+        using PoolTmpl      = Threading::LfIndexedPool< ResourceBase<T,ID>, typename ID::Index_t, ChunkSize, MaxChunks, GlobalLinearAllocatorRef >;
 
         template <typename T, typename ID, usize PoolSize>
-        using StPoolTmpl    = Threading::LfStaticIndexedPool< ResourceBase<T>, typename ID::Index_t, PoolSize, GlobalLinearAllocatorRef >;
+        using StPoolTmpl    = Threading::LfStaticIndexedPool< ResourceBase<T,ID>, typename ID::Index_t, PoolSize, GlobalLinearAllocatorRef >;
 
         // chunk size
         static constexpr uint   MaxImages       = 1u << 10;
@@ -223,9 +223,9 @@ namespace AE::Graphics
 
     // methods
     private:
-        explicit RESMNGR (const Device_t &)                                                                                                         __Th___;
+        explicit RESMNGR (const Device_t &)                                                                                                         __NE___;
 
-        ND_ bool  Initialize (const GraphicsCreateInfo &)                                                                                           __Th___;
+        ND_ bool  Initialize (const GraphicsCreateInfo &)                                                                                           __NE___;
             void  Deinitialize ()                                                                                                                   __NE___;
 
 
@@ -339,7 +339,7 @@ namespace AE::Graphics
         ND_ Strong<RayTracingPipelineID>CreateRayTracingPipeline (PipelinePackID packId, const PipelineTmplName &name, const RayTracingPipelineDesc &desc, PipelineCacheID cache = Default) __NE_OV;
         ND_ Strong<TilePipelineID>      CreateTilePipeline       (PipelinePackID packId, const PipelineTmplName &name, const TilePipelineDesc       &desc, PipelineCacheID cache = Default) __NE_OV;
 
-            bool    GetMemoryInfo (ImageID id, OUT NativeMemObjInfo_t &info)                            C_NE_OV;
+            bool    GetMemoryInfo (ImageID  id, OUT NativeMemObjInfo_t &info)                           C_NE_OV;
             bool    GetMemoryInfo (BufferID id, OUT NativeMemObjInfo_t &info)                           C_NE_OV;
             bool    GetMemoryInfo (MemoryID id, OUT NativeMemObjInfo_t &info)                           C_NE___;
 
@@ -560,11 +560,11 @@ namespace AE::Graphics
         ND_ StringView  _GetResourcePoolName (const VFramebufferID &)           __NE___ { return "framebuffers"; }
       #endif
 
-    // 
+    //
         template <typename ID>  ND_ bool   _Assign (OUT ID &id)                 __NE___;
         template <typename ID>      void   _Unassign (ID id)                    __NE___;
 
-    // 
+    //
         template <typename ID>
         ND_ auto const&         _GetDescription (ID id)                         C_NE___;
 
@@ -686,7 +686,7 @@ namespace AE::Graphics
     template <typename ID>
     void  RESMNGR::_DelayedReleaseResource2 (ID id) __NE___
     {
-        STATIC_ASSERT( AllVkResources_t::HasType<ID> );
+        StaticAssert( AllVkResources_t::HasType<ID> );
         ASSERT( id != Default );
 
         VExpiredResource    expired;
@@ -745,6 +745,7 @@ namespace AE::Graphics
     int  RESMNGR::_DelayedReleaseResource (ID id, uint refCount) __NE___
     {
         // TODO: delayed destruction required for untracked resources
+        // TODO: different behaviour in Vulkan and Metal, in Metal it may cause data race, see 'GetResource()'
 
         return _ImmediatelyReleaseResource( id, refCount );
     }
@@ -754,6 +755,26 @@ namespace AE::Graphics
 
 
 
+#ifdef AE_ENABLE_REMOTE_GRAPHICS
+/*
+=================================================
+    _DelayedReleaseResource
+=================================================
+*/
+    template <typename ID>
+    int  RESMNGR::_DelayedReleaseResource (ID id, uint refCount) __NE___
+    {
+        // TODO: delayed destruction required for untracked resources
+        // TODO: different behaviour in Vulkan and Metal, in Metal it may cause data race, see 'GetResource()'
+
+        return _ImmediatelyReleaseResource( id, refCount );
+    }
+
+#endif // AE_ENABLE_REMOTE_GRAPHICS
+//-----------------------------------------------------------------------------
+
+
+
 /*
 =================================================
     GetResource
@@ -770,6 +791,12 @@ namespace AE::Graphics
         {
             if_likely( res->IsCreated() & (res->GetGeneration() == id.Generation()) )
             {
+                // Without ref increment access to the resource is not safe,
+                // but resource is still alive because of delayed destruction.
+
+                // When used 'ImmediatelyReleaseResource()' user must take control on resource lifetime
+                // and must not use same ID in different threads.
+
                 if_unlikely( incRef )
                     res->AddRef();
 
diff --git a/AE/engine/src/graphics/Private/ResourceValidation.h b/AE/engine/src/graphics/Private/ResourceValidation.h
new file mode 100644
index 00000000..a9ca6f39
--- /dev/null
+++ b/AE/engine/src/graphics/Private/ResourceValidation.h
@@ -0,0 +1,274 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "graphics/Public/BufferDesc.h"
+#include "graphics/Public/ImageDesc.h"
+#include "graphics/Public/RayTracingDesc.h"
+#include "graphics/Public/IDevice.h"
+#include "graphics/Private/EnumUtils.h"
+
+namespace AE::Graphics
+{
+
+/*
+=================================================
+    Buffer_IsSupported
+=================================================
+*/
+    template <typename ResMngr>
+    ND_ bool  Buffer_IsSupported (const ResMngr &resMngr, const BufferDesc &desc) __NE___
+    {
+        if_unlikely( desc.size == 0 )
+            return false;
+
+        if_unlikely( desc.usage == Default or desc.memType == Default )
+            return false;
+
+        const auto&     res_flags = resMngr.GetDevice().GetResourceFlags();
+
+        // validate usage
+        if_unlikely( not AllBits( res_flags.bufferUsage, desc.usage ))
+            return false;
+
+        // validate options
+        if_unlikely( desc.options != Default and not AllBits( res_flags.bufferOptions, desc.options ))
+            return false;
+
+        // validate memory type
+        if_unlikely( not res_flags.memTypes.contains( desc.memType & ~EMemoryType::_External ))
+            return false;
+
+        // check supported features in FS
+        if_unlikely( not resMngr.GetFeatureSet().IsSupported( desc ))
+            return false;
+
+        return true;
+    }
+
+/*
+=================================================
+    BufferView_IsSupported
+=================================================
+*/
+    template <typename ResMngr>
+    ND_ bool  BufferView_IsSupported (const ResMngr &resMngr, const BufferDesc &desc, const BufferViewDesc &view) __NE___
+    {
+        StaticAssert( uint(EBufferUsage::All) == 0x1FFF );
+
+        constexpr auto  view_usage  = EBufferUsage::UniformTexel | EBufferUsage::StorageTexel;
+
+        if_unlikely( not AnyBits( desc.usage, view_usage ))
+            return false;
+
+        if_unlikely( view.format == Default or view.format >= EPixelFormat::_Count )
+            return false;
+
+        // check supported view formats in FS
+        if_unlikely( not resMngr.GetFeatureSet().IsSupported( desc, view ))
+            return false;
+
+        return true;
+    }
+
+/*
+=================================================
+    Image_IsSupported
+=================================================
+*/
+    template <typename ResMngr>
+    ND_ bool  Image_IsSupported (const ResMngr &resMngr, const ImageDesc &desc, Bool imageFormatList) __NE___
+    {
+        const auto&     res_flags = resMngr.GetDevice().GetResourceFlags();
+
+        if_unlikely( desc.imageDim == Default or desc.usage == Default or desc.format == Default or desc.memType == Default )
+            return false;
+
+        // validate options
+        {
+            if_unlikely( not AllBits( res_flags.imageOptions, desc.options ))
+                return false;
+
+            for (auto option : BitfieldIterate( desc.options ))
+            {
+                BEGIN_ENUM_CHECKS();
+                switch ( option )
+                {
+                    case EImageOpt::BlitSrc :                   if_unlikely( not AllBits( desc.usage, EImageUsage::TransferSrc )) return false;         break;
+                    case EImageOpt::BlitDst :                   if_unlikely( not AllBits( desc.usage, EImageUsage::TransferDst )) return false;         break;
+                    case EImageOpt::BlockTexelViewCompatible :  if_unlikely( not EPixelFormat_IsCompressed( desc.format )) return false;                break;
+
+                    case EImageOpt::StorageAtomic :
+                    case EImageOpt::VertexPplnStore :
+                    case EImageOpt::FragmentPplnStore :         if_unlikely( not AllBits( desc.usage, EImageUsage::Storage )) return false;             break;
+
+                    case EImageOpt::SampledLinear :
+                    case EImageOpt::SampledMinMax :             if_unlikely( not AllBits( desc.usage, EImageUsage::Sampled )) return false;             break;
+
+                    case EImageOpt::ColorAttachmentBlend :      if_unlikely( not AllBits( desc.usage, EImageUsage::ColorAttachment )) return false;     break;
+
+                    case EImageOpt::LossyRTCompression :
+                    case EImageOpt::SparseAliased :
+                    case EImageOpt::SparseResidencyAliased :
+                    case EImageOpt::SparseResidency :
+                    case EImageOpt::CubeCompatible :
+                    case EImageOpt::MutableFormat :
+                    case EImageOpt::Array2DCompatible :
+                    case EImageOpt::Alias :
+                    case EImageOpt::SampleLocationsCompatible : break;
+
+                    case EImageOpt::_Last :
+                    case EImageOpt::All :
+                    case EImageOpt::Unknown :
+                    default_unlikely :          DBG_WARNING( "unknown image option" );  break;
+                }
+                END_ENUM_CHECKS();
+            }
+        }
+
+        // validate memory type
+        if_unlikely( not res_flags.memTypes.contains( desc.memType & ~EMemoryType::_External ))
+            return false;
+
+        // validate format list
+        if ( imageFormatList and desc.HasViewFormatList() )
+        {
+            using EFmtType = PixelFormatInfo::EType;
+
+            if_unlikely( not AllBits( desc.options, EImageOpt::MutableFormat ) and desc.ViewFormatListSize() > 1 )
+                return false;
+
+            const auto&     origin_fmt_info = EPixelFormat_GetInfo( desc.format );
+            const bool      uncompress      = AllBits( desc.options, EImageOpt::BlockTexelViewCompatible ) and origin_fmt_info.IsCompressed();
+
+            for (EPixelFormat fmt : desc.viewFormats)
+            {
+                if ( fmt == Default )
+                    continue;
+
+                const auto&     fmt_info    = EPixelFormat_GetInfo( fmt );
+                bool            compatible  = fmt_info.bitsPerBlock     == origin_fmt_info.bitsPerBlock     and
+                                              fmt_info.bitsPerBlock2    == origin_fmt_info.bitsPerBlock2;
+
+                if ( uncompress and not fmt_info.IsCompressed() )
+                {
+                    compatible &= fmt_info.channels == origin_fmt_info.channels;
+                    compatible &= (fmt_info.valueType & (EFmtType::UNorm  | EFmtType::SNorm))  == (origin_fmt_info.valueType & (EFmtType::UNorm  | EFmtType::SNorm));
+                    compatible &= (fmt_info.valueType & (EFmtType::SFloat | EFmtType::UFloat)) == (origin_fmt_info.valueType & (EFmtType::SFloat | EFmtType::UFloat));
+                    compatible &= (fmt_info.valueType & (EFmtType::Int    | EFmtType::UInt))   == (origin_fmt_info.valueType & (EFmtType::Int    | EFmtType::UInt));
+                }
+                else
+                {
+                    compatible &= All( fmt_info.blockDim == origin_fmt_info.blockDim );
+                    compatible &= fmt_info.IsCompressed() == origin_fmt_info.IsCompressed();
+                }
+                if_unlikely( not compatible )
+                    return false;
+            }
+        }
+        else
+        if_unlikely( desc.HasViewFormatList() )
+            return false;
+
+        if_unlikely( not resMngr.GetFeatureSet().IsSupported( desc ))
+            return false;
+
+        return true;
+    }
+
+/*
+=================================================
+    ImageView_IsSupported
+=================================================
+*/
+    template <typename ResMngr>
+    ND_ bool  ImageView_IsSupported (const ResMngr &resMngr, const ImageDesc &desc, const ImageViewDesc &view) __NE___
+    {
+        StaticAssert( uint(EImageUsage::All) == 0xFF );
+        StaticAssert( uint(EImageOpt::All) == 0x1FFFF );
+
+        constexpr EImageUsage   view_usage  =
+            EImageUsage::Sampled | EImageUsage::Storage | EImageUsage::ColorAttachment | EImageUsage::DepthStencilAttachment |
+            EImageUsage::InputAttachment | EImageUsage::ShadingRate;
+
+        if_unlikely( not AnyBits( desc.usage, view_usage ))
+            return false;
+
+        if ( view.viewType == EImage_CubeArray )
+        {
+            if_unlikely( desc.imageDim != EImageDim_2D or (desc.imageDim == EImageDim_3D and AllBits( desc.options, EImageOpt::Array2DCompatible)) )
+                return false;
+
+            if_unlikely( not AllBits( desc.options, EImageOpt::CubeCompatible ))
+                return false;
+
+            if_unlikely( not IsMultipleOf( view.layerCount, 6 ))
+                return false;
+        }
+
+        if ( view.viewType == EImage_Cube )
+        {
+            if_unlikely( not AllBits( desc.options, EImageOpt::CubeCompatible ))
+                return false;
+
+            if_unlikely( view.layerCount != 6 )
+                return false;
+        }
+
+        if ( desc.imageDim == EImageDim_3D and view.viewType != EImage_3D )
+        {
+            if_unlikely( not AllBits( desc.options, EImageOpt::Array2DCompatible ))
+                return false;
+        }
+
+        if ( desc.HasViewFormatList() )
+        {
+            if_unlikely( not ArrayContains( ArrayView<EPixelFormat>{desc.viewFormats}, view.format ))
+                return false;
+        }
+
+        if ( view.format != Default and view.format != desc.format )
+        {
+            const auto&     required    = EPixelFormat_GetInfo( desc.format );
+            const auto&     origin      = EPixelFormat_GetInfo( view.format );
+            const bool      req_comp    = Any( required.TexBlockDim() > 1u );
+            const bool      orig_comp   = Any( origin.TexBlockDim() > 1u );
+
+            if_unlikely( not ArrayContains( ArrayView<EPixelFormat>{desc.viewFormats}, view.format ) and
+                         not AllBits( desc.options, EImageOpt::MutableFormat ))
+                return false;
+
+            // compressed to uncompressed
+            if ( AllBits( desc.options, EImageOpt::BlockTexelViewCompatible ) and orig_comp and not req_comp )
+            {
+                if_unlikely( required.bitsPerBlock != origin.bitsPerBlock )
+                    return false;
+            }
+            else
+            {
+                if_unlikely( req_comp != orig_comp )
+                    return false;
+
+                if_unlikely( Any( required.blockDim != origin.blockDim ))
+                    return false;
+
+                if ( view.aspectMask == EImageAspect::Stencil )
+                {
+                    if_unlikely( required.bitsPerBlock2 != origin.bitsPerBlock2 )
+                        return false;
+                }
+                else
+                {
+                    if_unlikely( required.bitsPerBlock != origin.bitsPerBlock )
+                        return false;
+                }
+            }
+        }
+
+        if_unlikely( not resMngr.GetFeatureSet().IsSupported( desc, view ))
+            return false;
+
+        return true;
+    }
+
+} // AE::Graphics
diff --git a/AE/engine/src/graphics/Private/ShaderDebugger.cpp b/AE/engine/src/graphics/Private/ShaderDebugger.cpp
index 2fb76ec3..b92e7888 100644
--- a/AE/engine/src/graphics/Private/ShaderDebugger.cpp
+++ b/AE/engine/src/graphics/Private/ShaderDebugger.cpp
@@ -29,7 +29,7 @@ namespace AE::Graphics
     {
         DRC_EXLOCK( _drCheck );
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         {
             auto    buffers = _buffers.WriteNoLock();
@@ -105,7 +105,7 @@ namespace AE::Graphics
             }
         }
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         // create allocator
         GfxMemAllocatorPtr  gfx_alloc = _gfxAlloc.load();
@@ -116,7 +116,7 @@ namespace AE::Graphics
                 gfx_alloc = new_alloc;
         }
 
-        // create new
+        // create new buffer
         {
             Buffer      buf;
             EMemoryType host_mem_type = EMemoryType::HostCachedCoherent;
@@ -162,7 +162,7 @@ namespace AE::Graphics
 */
 namespace {
     template <typename PplnType>
-    static bool  ParseShaderTrace (const void* ppln, const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result)
+    static bool  ParseShaderTrace (const void* ppln, const void* ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result)
     {
     #ifdef AE_ENABLE_VULKAN
         return Cast<PplnType>( ppln )->ParseShaderTrace( ptr, maxSize, format, OUT result );
@@ -220,7 +220,7 @@ namespace {
     template <typename PplnID>
     bool  ShaderDebugger::_GetPipeline (PplnID ppln, const DescriptorSetName &dsName, OUT Result &result)
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         if ( auto* res = res_mngr.GetResource( ppln ))
         {
@@ -283,7 +283,7 @@ namespace {
 
         if ( not ds_arr->empty() )
         {
-            auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+            auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
             for (auto& ds : *ds_arr) {
                 res_mngr.DelayedRelease( ds );
@@ -308,7 +308,7 @@ namespace {
             return false;
 
         const uint  data[4] = { globalID.x, globalID.y, globalID.z, 0 };
-        STATIC_ASSERT( _TraceHeaderSize == sizeof(data) );
+        StaticAssert( _TraceHeaderSize == sizeof(data) );
 
         _FillBuffer( result, ctx, Sizeof(data), data );
         return true;
@@ -335,7 +335,7 @@ namespace {
             return false;
 
         const uint  data[4] = { launchID.x, launchID.y, launchID.z, 0 };
-        STATIC_ASSERT( _TraceHeaderSize == sizeof(data) );
+        StaticAssert( _TraceHeaderSize == sizeof(data) );
 
         _FillBuffer( result, ctx, Sizeof(data), data );
         return true;
diff --git a/AE/engine/src/graphics/Private/SoftwareCmdBufBase.cpp b/AE/engine/src/graphics/Private/SoftwareCmdBufBase.cpp
index cff76e77..54f6c1b4 100644
--- a/AE/engine/src/graphics/Private/SoftwareCmdBufBase.cpp
+++ b/AE/engine/src/graphics/Private/SoftwareCmdBufBase.cpp
@@ -57,6 +57,8 @@ namespace AE::Graphics::_hidden_
 */
     void  SoftwareCmdBufBase::Deallocate (void* root) __NE___
     {
+        // TODO: not needed because used frame allocator
+
         Allocator_t::Allocator_t    alloc;
         Allocator_t                 alloc_ref{ alloc };
 
diff --git a/AE/engine/src/graphics/Private/SoftwareCmdBufBase.h b/AE/engine/src/graphics/Private/SoftwareCmdBufBase.h
index 2efc36cd..4e735dc4 100644
--- a/AE/engine/src/graphics/Private/SoftwareCmdBufBase.h
+++ b/AE/engine/src/graphics/Private/SoftwareCmdBufBase.h
@@ -24,7 +24,7 @@ namespace AE::Graphics::_hidden_
             Header *    next    = null;
             Bytes       size;
         };
-        STATIC_ASSERT( alignof(Header) <= BaseAlign );
+        StaticAssert( alignof(Header) <= BaseAlign );
 
 
         struct BaseCmd
@@ -38,7 +38,7 @@ namespace AE::Graphics::_hidden_
         };
 
     private:
-        using Allocator_t = AlignedAllocatorRefBaseAlign< Threading::GraphicsFrameAllocatorRef, BaseAlign >;
+        using Allocator_t = AllocatorRefBaseAlign< Threading::GraphicsFrameAllocatorRef, BaseAlign >;
 
 
     // variables
@@ -52,19 +52,19 @@ namespace AE::Graphics::_hidden_
 
     // methods
     public:
-        SoftwareCmdBufBase ()                   __NE___ {}
-        ~SoftwareCmdBufBase ()                  __NE___ { ASSERT( _root == null ); }
+        SoftwareCmdBufBase ()                                                           __NE___ {}
+        ~SoftwareCmdBufBase ()                                                          __NE___ { ASSERT( _root == null ); }
 
-        ND_ bool    IsValid ()                  C_NE___ { return true; }
+        ND_ bool    IsValid ()                                                          C_NE___ { return true; }
 
-        static void  Deallocate (void* root)    __NE___;
+        static void  Deallocate (void* root)                                            __NE___;
 
 
     protected:
-        ND_ void*  _Allocate (Bytes size)                       __Th___;
+        ND_ void*  _Allocate (Bytes size)                                               __Th___;
 
         template <typename CommandsList, typename CmdType, typename ...DynamicTypes>
-        ND_ CmdType&  _CreateCmd (usize dynamicArraySize = 0)   __Th___;
+        ND_ CmdType&  _CreateCmd (usize dynamicArraySize = 0)                           __Th___;
 
         template <usize I, typename TL>
         ND_ static constexpr Bytes  _CalcCmdSize (Bytes size, usize dynamicArraySize)   __NE___;
@@ -83,13 +83,13 @@ namespace AE::Graphics::_hidden_
     CmdType&  SoftwareCmdBufBase::_CreateCmd (usize dynamicArraySize) __Th___
     {
         constexpr auto  max_align = TypeList< CmdType, DynamicTypes... >::template ForEach_Max< TypeListUtils::GetTypeAlign >();
-        STATIC_ASSERT( max_align <= BaseAlign );
+        StaticAssert( max_align <= BaseAlign );
 
         Bytes   size    = AlignUp( _CalcCmdSize< 0, TypeList<DynamicTypes...> >( SizeOf<CmdType>, dynamicArraySize ), BaseAlign );
         auto*   cmd     = Cast<CmdType>( _Allocate( size ));    // throw
 
         DEBUG_ONLY( cmd->_magicNumber = BaseCmd::MAGIC; )
-        STATIC_ASSERT( CommandsList::template HasType< CmdType >);
+        StaticAssert( CommandsList::template HasType< CmdType >);
 
         cmd->_commandID = CheckCast<ushort>( CommandsList::template Index< CmdType >);
         cmd->_size      = CheckCast<ushort>( size );
@@ -107,7 +107,7 @@ namespace AE::Graphics::_hidden_
         if constexpr( I < TL::Count )
         {
             using T = typename TL::template Get<I>;
-            return _CalcCmdSize< I+1, TL >( AlignUp( size, alignof(T) ) + sizeof(T) * dynamicArraySize, dynamicArraySize ); 
+            return _CalcCmdSize< I+1, TL >( AlignUp( size, alignof(T) ) + sizeof(T) * dynamicArraySize, dynamicArraySize );
         }
         else
             return size;
diff --git a/AE/engine/src/graphics/Private/StagingBufferManager.cpp.h b/AE/engine/src/graphics/Private/StagingBufferManager.cpp.h
index 82e592c7..14651e4d 100644
--- a/AE/engine/src/graphics/Private/StagingBufferManager.cpp.h
+++ b/AE/engine/src/graphics/Private/StagingBufferManager.cpp.h
@@ -6,6 +6,9 @@
 #elif defined(AE_ENABLE_METAL)
 #   define STBUFMNGR        MStagingBufferManager
 
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define STBUFMNGR        RStagingBufferManager
+
 #else
 #   error not implemented
 #endif
@@ -20,7 +23,7 @@
     STBUFMNGR::STBUFMNGR (ResourceManager_t &resMngr) __NE___ :
         _resMngr{ resMngr }
     {
-        STATIC_ASSERT( SizePerQueue_t{}.max_size() == _QueueCount );
+        StaticAssert( SizePerQueue_t{}.max_size() == _QueueCount );
     }
 
 /*
@@ -33,12 +36,15 @@
       #if defined(AE_ENABLE_VULKAN)
         ASSERT( _static.memoryForWrite == Default );
         ASSERT( _static.memoryForRead  == Default );
+        ASSERT( _vstream.memory == Default );
 
         ASSERT( _memRanges.ranges.empty() );
 
       #elif defined(AE_ENABLE_METAL)
         ASSERT( not _static.memory );
 
+      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+
       #else
       # error not implemented
       #endif
@@ -61,6 +67,8 @@
     {
         Deinitialize();
 
+        _memSizeAlign = Byte16u{_resMngr.GetDevice().GetDeviceProperties().res.minNonCoherentAtomSize};
+
         // staging buffer for host to device requires coherent memory
         CHECK_ERR( _resMngr.IsSupported( EMemoryType::Unified ) or _resMngr.IsSupported( EMemoryType::HostCoherent ));
 
@@ -79,27 +87,9 @@
     void  STBUFMNGR::Deinitialize () __NE___
     {
       #ifdef AE_ENABLE_VULKAN
-        auto&   dev = _resMngr.GetDevice();
-
-        if ( _static.memoryForWrite != Default )
-        {
-            dev.vkUnmapMemory( dev.GetVkDevice(), _static.memoryForWrite );
-            dev.vkFreeMemory( dev.GetVkDevice(), _static.memoryForWrite, null );
-            _static.memoryForWrite = Default;
-        }
-        if ( _static.memoryForRead != Default )
-        {
-            dev.vkUnmapMemory( dev.GetVkDevice(), _static.memoryForRead );
-            dev.vkFreeMemory( dev.GetVkDevice(), _static.memoryForRead, null );
-            _static.memoryForRead       = Default;
-            _static.memoryFlagsForRead  = Zero;
-        }
-        if ( _vstream.memory != Default )
-        {
-            dev.vkUnmapMemory( dev.GetVkDevice(), _vstream.memory );
-            dev.vkFreeMemory( dev.GetVkDevice(), _vstream.memory, null );
-            _vstream.memory = Default;
-        }
+        _static.memoryForWrite  = Default;
+        _static.memoryForRead   = Default;
+        _vstream.memory         = Default;
         {
             EXLOCK( _memRanges.guard );
             _memRanges.ranges.clear();
@@ -109,6 +99,8 @@
         _static.memory = null;
         _vstream.memory = null;
 
+      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+
       #else
       # error not implemented
       #endif
@@ -210,13 +202,13 @@
 
       #ifdef AE_ENABLE_VULKAN
         // invalidate static staging buffer memory
-        if_unlikely( not AllBits( _static.memoryFlagsForRead, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ))
+        if_unlikely( not _static.isReadCoherent )
         {
             for (uint q = 0; q < _QueueCount; ++q)
             {
                 const uint  i = frameId.Index() * _QueueCount + q;
 
-                AcquireMappedMemory( frameId, _static.memoryForRead, 0_b, _static.buffersForRead[i].size.load() );
+                AcquireMappedMemory( frameId, _static.memoryForRead, 0_b, AlignUp( _static.buffersForRead[i].size.load(), _memSizeAlign ));
             }
         }
 
@@ -227,7 +219,7 @@
 
             for (auto& sb : _dynamic.read.buffers.current)
             {
-                AcquireMappedMemory( frameId, sb.memory, sb.memOffset, sb.size.load() );
+                AcquireMappedMemory( frameId, sb.memory, sb.memOffset, AlignUp( sb.size.load(), _memSizeAlign ));
             }
         }
       #endif
@@ -253,12 +245,12 @@
 
                 for (; not dyn.buffers.available.empty();)
                 {
-                    auto&   db = dyn.buffers.available.front();
+                    auto&   av_buf = dyn.buffers.available.front();
 
-                    if_likely( frameId.Diff( db.lastUsage ) < max_diff )
+                    if_likely( frameId.Diff( av_buf.lastUsage ) < max_diff )
                         break;
 
-                    _resMngr.ImmediatelyRelease( db.id );
+                    _resMngr.ImmediatelyRelease( av_buf.id );
                     dyn.buffers.available.pop_front();
                     ++num_released;
                 }
@@ -310,12 +302,12 @@
 =================================================
 */
     template <typename RangeType, typename BufferType>
-    bool  STBUFMNGR::_AllocStatic (const Bytes32u reqSize, const Bytes32u blockSize, const Bytes32u memOffsetAlign,
+    bool  STBUFMNGR::_AllocStatic (const Byte32u reqSize, const Byte32u blockSize, const Byte32u memOffsetAlign,
                                    INOUT RangeType &result, BufferType& sb)
     {
-        Bytes32u    expected    = 0_b;
-        Bytes32u    new_size    = 0_b;
-        Bytes32u    offset      = 0_b;
+        Byte32u     expected    = 0_b;
+        Byte32u     new_size    = 0_b;
+        Byte32u     offset      = 0_b;
 
         for (;;)
         {
@@ -341,6 +333,8 @@
         res.size            = new_size;
         res.mapped          = sb.mapped + res.bufferOffset;
 
+        ASSERT( IsMultipleOf( res.mapped, memOffsetAlign ));
+
         return true;
     }
 
@@ -367,8 +361,10 @@
 
           #if defined(AE_ENABLE_VULKAN)
             res.bufferImageHeight   = Max( 1u, CheckCast<uint>( (slicePitch * texelBlockSize.y) / rowPitch ));
-          #elif defined(AE_ENABLE_METAL)
+
+          #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
             res.bufferSlicePitch    = slicePitch;
+
           #else
           # error not implemented
           #endif
@@ -392,8 +388,10 @@
 
           #if defined(AE_ENABLE_VULKAN)
             res.bufferImageHeight   = y_size;
-          #elif defined(AE_ENABLE_METAL)
+
+          #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
             res.bufferSlicePitch    = slicePitch;
+
           #else
           # error not implemented
           #endif
@@ -432,12 +430,12 @@
 
         sb.size.store( 0_b );
         sb.capacity     = buf_desc.size;
-        sb.memOffset    = mem_desc.offset;
         sb.buffer       = RVRef(id);
         sb.bufferHandle = buf->Handle();
         sb.mapped       = mem_desc.mappedPtr;
 
-      #if defined(AE_ENABLE_VULKAN)
+      #ifdef AE_ENABLE_VULKAN
+        sb.memOffset    = mem_desc.offset;
         sb.memory       = mem_desc.memory;
       #endif
 
@@ -520,7 +518,7 @@
 
                 auto&   av_buf = db.available.front();
 
-                if_unlikely( frameId.Diff( av_buf.lastUsage ) < frameId.MaxFrames() )
+                if_unlikely( frameId.Diff( av_buf.lastUsage ) <= frameId.MaxFrames() )
                     break;
 
                 buf_id = RVRef(av_buf.id);
@@ -596,8 +594,10 @@
 
               #if defined(AE_ENABLE_VULKAN)
                 res.bufferImageHeight   = Max( 1u, CheckCast<uint>( (slicePitch * texelBlockSize.y) / rowPitch ));
-              #elif defined(AE_ENABLE_METAL)
+
+              #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
                 res.bufferSlicePitch    = slicePitch;
+
               #else
               # error not implemented
               #endif
@@ -630,8 +630,10 @@
 
               #if defined(AE_ENABLE_VULKAN)
                 res.bufferImageHeight   = y_size;
-              #elif defined(AE_ENABLE_METAL)
+
+              #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
                 res.bufferSlicePitch    = slicePitch;
+
               #else
               # error not implemented
               #endif
@@ -706,11 +708,11 @@
     {
         ASSERT( _frameId.load() == frameId );
 
-        auto&           vb          = _vstream.buffers[ frameId.Index() ];
-        const Bytes32u  offset_align = 64_b;        // TODO
-        Bytes32u        expected    = 0_b;
-        const Bytes32u  new_size    = reqSize;
-        Bytes32u        offset      = 0_b;
+        auto&           vb              = _vstream.buffers[ frameId.Index() ];
+        const Byte32u   offset_align    = 64_b;     // TODO
+        Byte32u         expected        = 0_b;
+        const Byte32u   new_size        = reqSize;
+        Byte32u         offset          = 0_b;
 
         for (;;)
         {
@@ -834,7 +836,7 @@
             _dynamic.gfxAllocator = MakeRC<VBlockMemAllocator>( _dynamic.blockSize, page_size );
             _memRanges.ranges.resize( info.maxFrames );
         }
-      #elif defined(AE_ENABLE_METAL)
+      #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
         // TODO: _dynamic.gfxAllocator = MakeRC<MBlockMemAllocator>();
 
       #else
diff --git a/AE/engine/src/graphics/Private/StagingBufferManager.h b/AE/engine/src/graphics/Private/StagingBufferManager.h
index 9ba91cf3..47e89b0c 100644
--- a/AE/engine/src/graphics/Private/StagingBufferManager.h
+++ b/AE/engine/src/graphics/Private/StagingBufferManager.h
@@ -1,4 +1,13 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    hint:
+        upload      - write (on host)   - from host to device
+        readback    - read  (on host)   - from device to host
+
+    Upload staging buffer must use coherent memory and doesn't require FlushMemoryRanges.
+    Readback staging buffer can use cached non-coherent memory.
+    Vertex buffer use unified memory and doesn't require FlushMemoryRanges.
+*/
 
 #if defined(AE_ENABLE_VULKAN)
 #   define STBUFMNGR        VStagingBufferManager
@@ -6,6 +15,9 @@
 #elif defined(AE_ENABLE_METAL)
 #   define STBUFMNGR        MStagingBufferManager
 
+#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+#   define STBUFMNGR        RStagingBufferManager
+
 #else
 #   error not implemented
 #endif
@@ -33,6 +45,11 @@ namespace AE::Graphics
         using ResourceManager_t     = MResourceManager;
         using NativeMemObjInfo_t    = MetalMemoryObjInfo;
 
+      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+        using NativeBuffer_t        = RmBufferID;
+        using ResourceManager_t     = RResourceManager;
+        using NativeMemObjInfo_t    = RemoteMemoryObjInfo;
+
       #else
       # error not implemented
       #endif
@@ -44,6 +61,8 @@ namespace AE::Graphics
             Bytes           bufferOffset;
             Bytes           size;
             void *          mapped      = null;
+
+            StagingBufferResult ()  __NE___ {}
         };
         using BufferRanges_t = FixedArray< StagingBufferResult, BufferMemView::Count >;
 
@@ -54,11 +73,12 @@ namespace AE::Graphics
             uint3           imageSize;
           #if defined(AE_ENABLE_VULKAN)
             uint            bufferImageHeight   = 0;    // in pixels, for BufferImageCopy::bufferImageHeight
-          #elif defined(AE_ENABLE_METAL)
+          #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
             Bytes           bufferSlicePitch;
           #else
           # error not implemented
           #endif
+            StagingImageResult ()   __NE___ {}
         };
         using ImageRanges_t = FixedArray< StagingImageResult, ImageMemView::Count >;
 
@@ -79,9 +99,11 @@ namespace AE::Graphics
 
         struct alignas(AE_CACHE_LINE) StaticBuffer
         {
-            BytesAtomic<uint>   size            {0_b};
-            Bytes32u            capacity;
-            Bytes32u            memOffset;
+            AtomicByte<uint>    size            {0_b};
+            Byte32u             capacity;
+          #ifdef AE_ENABLE_VULKAN
+            Byte32u             memOffset;
+          #endif
             Strong<BufferID>    buffer;
             NativeBuffer_t      bufferHandle    = Default;
             void*               mapped          = null;
@@ -101,11 +123,13 @@ namespace AE::Graphics
           #if defined(AE_ENABLE_VULKAN)
             VkDeviceMemory              memoryForWrite          = Default;
             VkDeviceMemory              memoryForRead           = Default;
-            VkMemoryPropertyFlagBits    memoryFlagsForRead      = Zero;
+            bool                        isReadCoherent          = false;
 
           #elif defined(AE_ENABLE_METAL)
             MetalMemoryRC               memory;
 
+          #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+
           #else
           # error not implemented
           #endif
@@ -125,7 +149,7 @@ namespace AE::Graphics
           #if defined(AE_ENABLE_VULKAN)
             VkDeviceMemory      memory  = Default;
 
-          #elif defined(AE_ENABLE_METAL)
+          #elif defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
           #else
           # error not implemented
           #endif
@@ -146,10 +170,10 @@ namespace AE::Graphics
         struct DynamicPerType
         {
             // mutable
-            BytesAtomic<uint>           maxPerFrame     {0_b};
-            mutable BytesAtomic<uint>   usedPerFrame    {0_b};
+            AtomicByte<uint>            maxPerFrame     {0_b};
+            mutable AtomicByte<uint>    usedPerFrame    {0_b};
             DynamicBuffers              buffers;
-            mutable BytesAtomic<ulong>  allocated       {0_b};
+            mutable AtomicByte<ulong>   allocated       {0_b};
 
             // immutable
             Bytes                       maxSize;
@@ -179,6 +203,8 @@ namespace AE::Graphics
           #elif defined(AE_ENABLE_METAL)
             MetalMemoryRC       memory;
 
+          #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+
           #else
           # error not implemented
           #endif
@@ -200,6 +226,12 @@ namespace AE::Graphics
             // TODO
         };
 
+      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+        struct alignas(AE_CACHE_LINE) MappedMemRanges
+        {
+            // TODO
+        };
+
       #else
       # error not implemented
       #endif
@@ -210,6 +242,8 @@ namespace AE::Graphics
         Static              _static;
         Dynamic             _dynamic;
         StaticVStream       _vstream;
+
+        Byte16u             _memSizeAlign   {1};
         MappedMemRanges     _memRanges;
 
         ResourceManager_t&  _resMngr;
@@ -238,7 +272,7 @@ namespace AE::Graphics
 
             bool  AllocVStream (FrameUID frameId, Bytes size, OUT VertexStream &result)                                         __NE___;
 
-        ND_ FrameStat_t  GetFrameStat (FrameUID frameId)                                                                        C_NE___; 
+        ND_ FrameStat_t  GetFrameStat (FrameUID frameId)                                                                        C_NE___;
 
       #if defined(AE_ENABLE_VULKAN)
             void  AcquireMappedMemory (FrameUID frameId, VkDeviceMemory memory, Bytes offset, Bytes size)                       __NE___;
@@ -253,7 +287,7 @@ namespace AE::Graphics
         ND_ Bytes  _CalcBlockSize (Bytes reqSize, EStagingHeapType heap, EQueueType queue, bool upload) const;
 
         template <typename RangeType, typename BufferType>
-        ND_ static bool  _AllocStatic (Bytes32u reqSize, Bytes32u blockSize, Bytes32u memOffsetAlign, INOUT RangeType &result, BufferType& sb);
+        ND_ static bool  _AllocStatic (Byte32u reqSize, Byte32u blockSize, Byte32u memOffsetAlign, INOUT RangeType &result, BufferType& sb);
 
         template <bool SingleAlloc, typename RangeType>
         ND_ bool  _AllocDynamic (FrameUID frameId, INOUT Bytes &reqSize, Bytes blockSize, Bytes memOffsetAlign, bool upload, INOUT RangeType& buffers, DynamicBuffers &db) const;
diff --git a/AE/engine/src/graphics/Private/TransferContextImpl.h b/AE/engine/src/graphics/Private/TransferContextImpl.h
index 8c4fe372..848048f8 100644
--- a/AE/engine/src/graphics/Private/TransferContextImpl.h
+++ b/AE/engine/src/graphics/Private/TransferContextImpl.h
@@ -1,32 +1,31 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #if defined(AE_ENABLE_VULKAN)
-#   define TRANSFER_CTX     _VTransferContextImpl
-#   define STAGINGBUF_MNGR  VStagingBufferManager
+#   define TRANSFER_CTX( _res_, _name_ )    template <typename C>  _res_  _VTransferContextImpl<C>::_name_
+#   define STAGINGBUF_MNGR                  VStagingBufferManager
+namespace AE::Graphics::_hidden_ {
 
 #elif defined(AE_ENABLE_METAL)
-#   define TRANSFER_CTX     _MTransferContextImpl
-#   define STAGINGBUF_MNGR  MStagingBufferManager
+#   define TRANSFER_CTX( _res_, _name_ )    template <typename C>  _res_  _MTransferContextImpl<C>::_name_
+#   define STAGINGBUF_MNGR                  MStagingBufferManager
+namespace AE::Graphics::_hidden_ {
 
 #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-#   define TRANSFER_CTX     _RTransferContextImpl
-#   define STAGINGBUF_MNGR  RStagingBufferManager
+#   define TRANSFER_CTX( _res_, _name_ )    _res_  RTransferContext::_name_
+#   define STAGINGBUF_MNGR                  RStagingBufferManager
+namespace AE::Graphics {
 
 #else
 #   error not implemented
 #endif
 
 
-namespace AE::Graphics::_hidden_
-{
-
 /*
 =================================================
     UploadBuffer
 =================================================
 */
-    template <typename C>
-    void  TRANSFER_CTX<C>::UploadBuffer (BufferID bufferId, const UploadBufferDesc &uploadDesc, OUT BufferMemView &memView) __Th___
+    TRANSFER_CTX( void, UploadBuffer )(BufferID bufferId, const UploadBufferDesc &uploadDesc, OUT BufferMemView &memView) __Th___
     {
         auto&       dst_buf         = _GetResourcesOrThrow( bufferId );
         const Bytes dst_buf_size    = dst_buf.Size();
@@ -39,7 +38,8 @@ namespace AE::Graphics::_hidden_
         STAGINGBUF_MNGR&                sbm = this->_mngr.GetStagingManager();
         STAGINGBUF_MNGR::BufferRanges_t buffers;
 
-        sbm.GetBufferRanges( OUT buffers, size, uploadDesc.blockSize, _StagingBufOffsetAlign, GetFrameId(), uploadDesc.heapType, this->_mngr.GetQueueType(), True{"upload"} );
+        sbm.GetBufferRanges( OUT buffers, size, uploadDesc.blockSize, GraphicsConfig::StagingBufferOffsetAlign,
+                             GetFrameId(), uploadDesc.heapType, this->_mngr.GetQueueType(), True{"upload"} );
 
         for (auto& src_buf : buffers)
         {
@@ -60,12 +60,11 @@ namespace AE::Graphics::_hidden_
     UploadBuffer
 =================================================
 */
-    template <typename C>
-    void  TRANSFER_CTX<C>::UploadBuffer (BufferStream &stream, OUT BufferMemView &memView) __Th___
+    TRANSFER_CTX( void, UploadBuffer )(BufferStream &stream, OUT BufferMemView &memView) __Th___
     {
         ASSERT( not stream.IsCompleted() );
 
-        auto&   dst_buf = _GetResourcesOrThrow( stream.Buffer() );
+        auto&   dst_buf = _GetResourcesOrThrow( stream.BufferId() );
         auto    handle  = dst_buf.Handle();
 
         VALIDATE_GCTX( UploadBuffer( dst_buf.Description(), stream.pos, stream.RemainSize(), memView ));
@@ -73,7 +72,8 @@ namespace AE::Graphics::_hidden_
         STAGINGBUF_MNGR&                sbm = this->_mngr.GetStagingManager();
         STAGINGBUF_MNGR::BufferRanges_t buffers;
 
-        sbm.GetBufferRanges( OUT buffers, stream.RemainSize(), stream.BlockSize(), _StagingBufOffsetAlign, GetFrameId(), stream.HeapType(), this->_mngr.GetQueueType(), True{"upload"} );
+        sbm.GetBufferRanges( OUT buffers, stream.RemainSize(), stream.BlockSize(), GraphicsConfig::StagingBufferOffsetAlign,
+                             GetFrameId(), stream.HeapType(), this->_mngr.GetQueueType(), True{"upload"} );
 
         for (auto& src_buf : buffers)
         {
@@ -94,8 +94,7 @@ namespace AE::Graphics::_hidden_
     UploadImage
 =================================================
 */
-    template <typename C>
-    void  TRANSFER_CTX<C>::UploadImage (ImageID imageId, const UploadImageDesc &uploadDesc, OUT ImageMemView &memView) __Th___
+    TRANSFER_CTX( void, UploadImage )(ImageID imageId, const UploadImageDesc &uploadDesc, OUT ImageMemView &memView) __Th___
     {
         auto&   dst_img = _GetResourcesOrThrow( imageId );
         VALIDATE_GCTX( UploadImage( dst_img.Description() ));
@@ -163,12 +162,11 @@ namespace AE::Graphics::_hidden_
     UploadImage
 =================================================
 */
-    template <typename C>
-    void  TRANSFER_CTX<C>::UploadImage (ImageStream &stream, OUT ImageMemView &memView) __Th___
+    TRANSFER_CTX( void, UploadImage )(ImageStream &stream, OUT ImageMemView &memView) __Th___
     {
         ASSERT( not stream.IsCompleted() );
 
-        auto&   dst_img = _GetResourcesOrThrow( stream.Image() );
+        auto&   dst_img = _GetResourcesOrThrow( stream.ImageId() );
         VALIDATE_GCTX( UploadImage( dst_img.Description() ));
 
         const ImageDesc&    img_desc    = dst_img.Description();
@@ -253,8 +251,7 @@ namespace AE::Graphics::_hidden_
     ReadbackBuffer
 =================================================
 */
-    template <typename C>
-    Promise<BufferMemView>  TRANSFER_CTX<C>::ReadbackBuffer (BufferID bufferId, const ReadbackBufferDesc &readDesc) __Th___
+    TRANSFER_CTX( Promise<BufferMemView>, ReadbackBuffer )(BufferID bufferId, const ReadbackBufferDesc &readDesc) __Th___
     {
         auto&       src_buf         = _GetResourcesOrThrow( bufferId );
         auto        handle          = src_buf.Handle();
@@ -266,7 +263,8 @@ namespace AE::Graphics::_hidden_
 
         STAGINGBUF_MNGR&                sbm = this->_mngr.GetStagingManager();
         STAGINGBUF_MNGR::BufferRanges_t buffers;
-        sbm.GetBufferRanges( OUT buffers, data_size, readDesc.blockSize, _StagingBufOffsetAlign, GetFrameId(), readDesc.heapType, this->_mngr.GetQueueType(), False{"readback"} );
+        sbm.GetBufferRanges( OUT buffers, data_size, readDesc.blockSize, GraphicsConfig::StagingBufferOffsetAlign,
+                             GetFrameId(), readDesc.heapType, this->_mngr.GetQueueType(), False{"readback"} );
 
         BufferMemView   mem_view;
         for (auto& dst_buf : buffers)
@@ -294,19 +292,19 @@ namespace AE::Graphics::_hidden_
     ReadbackBuffer
 =================================================
 */
-    template <typename C>
-    Promise<BufferMemView>  TRANSFER_CTX<C>::ReadbackBuffer (INOUT BufferStream &stream) __Th___
+    TRANSFER_CTX( Promise<BufferMemView>, ReadbackBuffer )(INOUT BufferStream &stream) __Th___
     {
         ASSERT( not stream.IsCompleted() );
 
-        auto&   src_buf = _GetResourcesOrThrow( stream.Buffer() );
+        auto&   src_buf = _GetResourcesOrThrow( stream.BufferId() );
         auto    handle  = src_buf.Handle();
 
         VALIDATE_GCTX( ReadbackBuffer( src_buf.Description(), stream.pos, stream.RemainSize() ));
 
         STAGINGBUF_MNGR&                sbm = this->_mngr.GetStagingManager();
         STAGINGBUF_MNGR::BufferRanges_t buffers;
-        sbm.GetBufferRanges( OUT buffers, stream.RemainSize(), stream.BlockSize(), _StagingBufOffsetAlign, GetFrameId(), stream.HeapType(), this->_mngr.GetQueueType(), False{"readback"} );
+        sbm.GetBufferRanges( OUT buffers, stream.RemainSize(), stream.BlockSize(), GraphicsConfig::StagingBufferOffsetAlign,
+                             GetFrameId(), stream.HeapType(), this->_mngr.GetQueueType(), False{"readback"} );
 
         BufferMemView   mem_view;
         for (auto& dst_buf : buffers)
@@ -334,8 +332,7 @@ namespace AE::Graphics::_hidden_
     ReadbackImage
 =================================================
 */
-    template <typename C>
-    Promise<ImageMemView>   TRANSFER_CTX<C>::ReadbackImage (ImageID imageId, const ReadbackImageDesc &readDesc) __Th___
+    TRANSFER_CTX( Promise<ImageMemView>, ReadbackImage )(ImageID imageId, const ReadbackImageDesc &readDesc) __Th___
     {
         auto&   src_img = _GetResourcesOrThrow( imageId );
         VALIDATE_GCTX( ReadbackImage( src_img.Description() ));
@@ -409,12 +406,11 @@ namespace AE::Graphics::_hidden_
     ReadbackImage
 =================================================
 */
-    template <typename C>
-    Promise<ImageMemView>  TRANSFER_CTX<C>::ReadbackImage (INOUT ImageStream &stream) __Th___
+    TRANSFER_CTX( Promise<ImageMemView>, ReadbackImage )(INOUT ImageStream &stream) __Th___
     {
         ASSERT( not stream.IsCompleted() );
 
-        auto&   src_img = _GetResourcesOrThrow( stream.Image() );
+        auto&   src_img = _GetResourcesOrThrow( stream.ImageId() );
         VALIDATE_GCTX( ReadbackImage( src_img.Description() ));
 
         const ImageDesc&    img_desc    = src_img.Description();
@@ -495,7 +491,7 @@ namespace AE::Graphics::_hidden_
     }
 
 
-} // AE::Graphics::_hidden_
+} // AE::Graphics (_hidden_)
 
 #undef TRANSFER_CTX
 #undef STAGINGBUF_MNGR
diff --git a/AE/engine/src/graphics/Public/BufferDesc.h b/AE/engine/src/graphics/Public/BufferDesc.h
index 09b8fc70..29ed9ce9 100644
--- a/AE/engine/src/graphics/Public/BufferDesc.h
+++ b/AE/engine/src/graphics/Public/BufferDesc.h
@@ -93,7 +93,7 @@ namespace AE::Graphics
         DeviceAddress       _addr   = Default;
 
     public:
-        constexpr TDeviceAddress ()                     __NE___ = default; 
+        constexpr TDeviceAddress ()                     __NE___ = default;
         constexpr TDeviceAddress (DeviceAddress addr)   __NE___ : _addr{addr} {}
     };
 
diff --git a/AE/engine/src/graphics/Public/BufferMemView.h b/AE/engine/src/graphics/Public/BufferMemView.h
index d731145b..8f6320b5 100644
--- a/AE/engine/src/graphics/Public/BufferMemView.h
+++ b/AE/engine/src/graphics/Public/BufferMemView.h
@@ -69,7 +69,7 @@ namespace AE::Graphics
         BufferMemView (const BufferMemView &)                               __NE___ = default;
         BufferMemView (BufferMemView &&)                                    __NE___ = default;
 
-        BufferMemView (void *ptr, Bytes size)                               __NE___ { PushBack( ptr, size ); }
+        BufferMemView (void* ptr, Bytes size)                               __NE___ { PushBack( ptr, size ); }
 
         template <typename T>
         explicit BufferMemView (Array<T> &arr)                              __NE___ : BufferMemView{ arr.data(), ArraySizeOf(arr) } {}
@@ -92,7 +92,7 @@ namespace AE::Graphics
 
             void    Clear ()                                                __NE___ { _parts.clear(); }
 
-            bool    PushBack (void *ptr, Bytes size)                        __NE___ { return _parts.try_push_back( Data{ ptr, size }); }
+            bool    PushBack (void* ptr, Bytes size)                        __NE___ { return _parts.try_push_back( Data{ ptr, size }); }
 
         ND_ Bytes   DataSize ()                                             C_NE___;
 
diff --git a/AE/engine/src/graphics/Public/CommandBuffer.h b/AE/engine/src/graphics/Public/CommandBuffer.h
index 2b6061c5..e10243de 100644
--- a/AE/engine/src/graphics/Public/CommandBuffer.h
+++ b/AE/engine/src/graphics/Public/CommandBuffer.h
@@ -57,7 +57,7 @@ namespace AE::Graphics
 
         virtual void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th___ = 0;
 
-        virtual void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th___ = 0;
+        virtual void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th___ = 0;
         template <typename T> void  PushConstant (const PushConstantIndex &idx, const T &data)                                      __Th___ { return PushConstant( idx, Sizeof(data), &data, T::TypeName ); }
 
     // dynamic states //
@@ -345,11 +345,14 @@ namespace AE::Graphics
         //      image:
         //          in: { src level: EResourceState::BlitSrc, dst levels: EResourceState::Unknown }
         //          out: EResourceState::BlitSrc
-        virtual void  GenerateMipmaps (ImageID image)                                                                   __Th___ = 0;
-        virtual void  GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges)                          __Th___ = 0;
+        virtual void  GenerateMipmaps (ImageID image, EResourceState state)                                             __Th___ = 0;
+        virtual void  GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges, EResourceState state)    __Th___ = 0;
 
 
     public:
+        template <typename T>   void  UpdateBuffer (BufferID buffer, Bytes offset, ArrayView<T> data)                   __Th___ { return UpdateBuffer( buffer, offset, ArraySizeOf(data), data.data() ); }
+        template <typename T>   void  UpdateBuffer (BufferID buffer, Bytes offset, const Array<T> &data)                __Th___ { return UpdateBuffer( buffer, offset, ArraySizeOf(data), data.data() ); }
+
         // only for host-visible memory
         template <typename T>   ND_ bool  UpdateHostBuffer (BufferID buffer, Bytes offset, ArrayView<T> data)           __Th___ { return UpdateHostBuffer( buffer, offset, ArraySizeOf(data), data.data() ); }
         template <typename T>   ND_ bool  UpdateHostBuffer (BufferID buffer, Bytes offset, const Array<T> &data)        __Th___ { return UpdateHostBuffer( buffer, offset, ArraySizeOf(data), data.data() ); }
@@ -378,7 +381,7 @@ namespace AE::Graphics
         virtual void  BindPipeline (ComputePipelineID ppln)                                                                         __Th___ = 0;
         virtual void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th___ = 0;
 
-        virtual void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th___ = 0;
+        virtual void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th___ = 0;
         template <typename T> void  PushConstant (const PushConstantIndex &idx, const T &data)                                      __Th___ { return PushConstant( idx, Sizeof(data), &data, T::TypeName ); }
 
         virtual void  Dispatch (const uint3 &groupCount)                                                                            __Th___ = 0;
@@ -430,7 +433,7 @@ namespace AE::Graphics
         virtual void  BindPipeline (RayTracingPipelineID ppln)                                                                      __Th___ = 0;
         virtual void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th___ = 0;
 
-        virtual void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th___ = 0;
+        virtual void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th___ = 0;
         template <typename T> void  PushConstant (const PushConstantIndex &idx, const T &data)                                      __Th___ { return PushConstant( idx, Sizeof(data), &data, T::TypeName ); }
 
 
diff --git a/AE/engine/src/graphics/Public/CommandBufferTypes.h b/AE/engine/src/graphics/Public/CommandBufferTypes.h
index a2d80ec9..f2c7ff2a 100644
--- a/AE/engine/src/graphics/Public/CommandBufferTypes.h
+++ b/AE/engine/src/graphics/Public/CommandBufferTypes.h
@@ -23,9 +23,9 @@ namespace AE::Graphics
     {
         EImageAspect    aspectMask      = Default;
         MipmapLevel     baseMipLevel;
-        uint            mipmapCount     = 1;
+        ushort          mipmapCount     = 1;
         ImageLayer      baseLayer;
-        uint            layerCount      = 1;
+        ushort          layerCount      = 1;
 
         ImageSubresourceRange ()                                                __NE___ = default;
 
@@ -37,8 +37,8 @@ namespace AE::Graphics
                                MipmapLevel baseMipLevel, uint mipmapCount,
                                ImageLayer baseLayer, uint layerCount)           __NE___ :
             aspectMask{aspectMask},
-            baseMipLevel{baseMipLevel}, mipmapCount{mipmapCount},
-            baseLayer{baseLayer}, layerCount{layerCount} {}
+            baseMipLevel{baseMipLevel}, mipmapCount{ushort(mipmapCount)},
+            baseLayer{baseLayer}, layerCount{ushort(layerCount)} {}
     };
 
 
@@ -47,14 +47,14 @@ namespace AE::Graphics
         EImageAspect    aspectMask      = Default;
         MipmapLevel     mipLevel;
         ImageLayer      baseLayer;
-        uint            layerCount      = 1;
+        ushort          layerCount      = 1;
 
         ImageSubresourceLayers ()                                               __NE___ = default;
 
         ImageSubresourceLayers (EImageAspect aspectMask, MipmapLevel mipLevel,
                                 ImageLayer baseLayer, uint layerCount = 1)      __NE___ :
             aspectMask{aspectMask}, mipLevel{mipLevel},
-            baseLayer{baseLayer}, layerCount{layerCount} {}
+            baseLayer{baseLayer}, layerCount{ushort(layerCount)} {}
     };
 
 
@@ -260,8 +260,8 @@ namespace AE::Graphics
     {
         packed_uint3    groupCount;
     };
-    STATIC_ASSERT( sizeof(DispatchIndirectCommand) == 12 );
-    STATIC_ASSERT( alignof(DispatchIndirectCommand) == 4 );
+    StaticAssert( sizeof(DispatchIndirectCommand) == 12 );
+    StaticAssert( alignof(DispatchIndirectCommand) == 4 );
 
 
     struct DrawIndirectCommand
@@ -271,8 +271,8 @@ namespace AE::Graphics
         uint    firstVertex;
         uint    firstInstance;              // non zero value requires 'FeatureSet::drawIndirectFirstInstance'
     };
-    STATIC_ASSERT( sizeof(DrawIndirectCommand) == 16 );
-    STATIC_ASSERT( alignof(DrawIndirectCommand) == 4 );
+    StaticAssert( sizeof(DrawIndirectCommand) == 16 );
+    StaticAssert( alignof(DrawIndirectCommand) == 4 );
 
 
     struct DrawIndexedIndirectCommand
@@ -283,24 +283,24 @@ namespace AE::Graphics
         int     vertexOffset;
         uint    firstInstance;              // non zero value requires 'FeatureSet::drawIndirectFirstInstance'
     };
-    STATIC_ASSERT( sizeof(DrawIndexedIndirectCommand) == 20 );
-    STATIC_ASSERT( alignof(DrawIndexedIndirectCommand) == 4 );
+    StaticAssert( sizeof(DrawIndexedIndirectCommand) == 20 );
+    StaticAssert( alignof(DrawIndexedIndirectCommand) == 4 );
 
 
     struct DrawMeshTasksIndirectCommand
     {
         packed_uint3    taskCount;
     };
-    STATIC_ASSERT( sizeof(DrawMeshTasksIndirectCommand) == 12 );
-    STATIC_ASSERT( alignof(DrawMeshTasksIndirectCommand) == 4 );
+    StaticAssert( sizeof(DrawMeshTasksIndirectCommand) == 12 );
+    StaticAssert( alignof(DrawMeshTasksIndirectCommand) == 4 );
 
 
     struct TraceRayIndirectCommand
     {
         packed_uint3    dim;
     };
-    STATIC_ASSERT( sizeof(TraceRayIndirectCommand) == 12 );
-    STATIC_ASSERT( alignof(TraceRayIndirectCommand) == 4 );
+    StaticAssert( sizeof(TraceRayIndirectCommand) == 12 );
+    StaticAssert( alignof(TraceRayIndirectCommand) == 4 );
 
 
     struct TraceRayIndirectCommand2
@@ -332,8 +332,8 @@ namespace AE::Graphics
       #endif
     };
     #ifdef AE_ENABLE_VULKAN
-      STATIC_ASSERT( sizeof(TraceRayIndirectCommand2) == 104 );
-      STATIC_ASSERT( alignof(TraceRayIndirectCommand2) == 8 );
+      StaticAssert( sizeof(TraceRayIndirectCommand2) == 104 );
+      StaticAssert( alignof(TraceRayIndirectCommand2) == 8 );
     #endif
 
 
@@ -346,8 +346,8 @@ namespace AE::Graphics
         uint        firstVertex;
         uint        transformOffset;
     };
-    STATIC_ASSERT( sizeof(ASBuildIndirectCommand) == 16 );
-    STATIC_ASSERT( alignof(ASBuildIndirectCommand) == 4 );
+    StaticAssert( sizeof(ASBuildIndirectCommand) == 16 );
+    StaticAssert( alignof(ASBuildIndirectCommand) == 4 );
 
 
 //-----------------------------------------------------------------------------
@@ -440,7 +440,7 @@ namespace AE::Graphics
         BufferStream&  SetBlockSize (Bytes value)               __NE___ { _desc.blockSize = value;  return *this; }
         BufferStream&  MaxBlockSize ()                          __NE___ { _desc.MaxBlockSize();     return *this; }
 
-        ND_ BufferID            Buffer ()                       C_NE___ { return _bufferId; }
+        ND_ BufferID            BufferId ()                     C_NE___ { return _bufferId; }
         ND_ Bytes               DataSize ()                     C_NE___ { return _desc.size; }
         ND_ Bytes               OffsetAndPos ()                 C_NE___ { return _desc.offset + pos; }
         ND_ Bytes               Begin ()                        C_NE___ { return _desc.offset; }
@@ -478,7 +478,7 @@ namespace AE::Graphics
 
         ImageStream&  SetHeapType (EStagingHeapType type)       __NE___ { _desc.heapType = type;  return *this; }
 
-        ND_ ImageID             Image ()                        C_NE___ { return _imageId; }
+        ND_ ImageID             ImageId ()                      C_NE___ { return _imageId; }
         ND_ uint3 const&        Begin ()                        C_NE___ { return _desc.imageOffset; }
         ND_ uint3               End ()                          C_NE___ { return _desc.imageOffset + _desc.imageSize; }
         ND_ uint3 const&        RegionSize ()                   C_NE___ { return _desc.imageSize; }
@@ -565,8 +565,8 @@ namespace AE::Graphics
     {
         // limit for dynamic staging buffers
         struct {
-            Bytes32u    write   {UMax};
-            Bytes32u    read    {UMax};
+            Byte32u     write   {UMax};
+            Byte32u     read    {UMax};
         }   stagingBufferPerFrameLimits;
 
         BeginFrameConfig () __NE___ = default;
diff --git a/AE/engine/src/graphics/Public/Common.h b/AE/engine/src/graphics/Public/Common.h
index 8aab3bec..52aaaae2 100644
--- a/AE/engine/src/graphics/Public/Common.h
+++ b/AE/engine/src/graphics/Public/Common.h
@@ -11,12 +11,13 @@ namespace AE::Graphics
 
     using AE::Threading::Promise;
     using AE::Threading::Atomic;
-    using AE::Threading::BytesAtomic;
+    using AE::Threading::AtomicByte;
     using AE::Threading::DeferExLock;
     using AE::Threading::DeferSharedLock;
     using AE::Threading::EMemoryOrder;
     using AE::Threading::MemoryBarrier;
     using AE::Threading::Synchronized;
+    using AE::Threading::EThreadArray;
 
 #   if AE_ENABLE_DATA_RACE_CHECK
     using AE::Threading::RWDataRaceCheck;
@@ -62,6 +63,8 @@ namespace AE::Graphics
 
         // staging buffer
         static constexpr uint   MaxStagingBufferParts   = 4;
+
+        static constexpr Bytes  StagingBufferOffsetAlign    {AE_CACHE_LINE};
     };
 
 
diff --git a/AE/engine/src/graphics/Public/DescriptorSet.h b/AE/engine/src/graphics/Public/DescriptorSet.h
index 2a753364..6cea43b6 100644
--- a/AE/engine/src/graphics/Public/DescriptorSet.h
+++ b/AE/engine/src/graphics/Public/DescriptorSet.h
@@ -180,13 +180,13 @@ namespace AE::Graphics
     // variables
     public:
         union {
-            Bytes16u    offset;
+            Byte16u     offset;
             ushort      bufferId;
         };
         EShader         stage   = Default;
 
         DEBUG_ONLY(
-            Bytes16u            dbgDataSize;
+            Byte16u             dbgDataSize;
             ShaderStructName    dbgTypeName;
         )
 
@@ -194,10 +194,10 @@ namespace AE::Graphics
     // methods
     public:
         explicit constexpr PushConstantIndex ()                                                 __NE___ {}
-        explicit constexpr PushConstantIndex (Bytes16u vulkanOffset, EShader stage)             __NE___ : offset{vulkanOffset}, stage{stage} {}
+        explicit constexpr PushConstantIndex (Byte16u vulkanOffset, EShader stage)              __NE___ : offset{vulkanOffset}, stage{stage} {}
         explicit constexpr PushConstantIndex (uint metalBufferId, EShader stage)                __NE___ : bufferId{ushort(metalBufferId)}, stage{stage} {}
 
-        explicit constexpr PushConstantIndex (Bytes16u vulkanOffset, EShader stage,
+        explicit constexpr PushConstantIndex (Byte16u vulkanOffset, EShader stage,
                                               const ShaderStructName &typeName, Bytes dataSize) __NE___ :
             offset{vulkanOffset}, stage{stage}
             DEBUG_ONLY(, dbgDataSize{dataSize}, dbgTypeName{typeName} )
diff --git a/AE/engine/src/graphics/Public/DeviceProperties.h b/AE/engine/src/graphics/Public/DeviceProperties.h
index afbdcb3d..3c982b88 100644
--- a/AE/engine/src/graphics/Public/DeviceProperties.h
+++ b/AE/engine/src/graphics/Public/DeviceProperties.h
@@ -4,7 +4,7 @@
     Use 'DeviceProperties'  for runtime limits like a alignment.
     Use 'DeviceLimits'      for compile time limits like a alignment.
 
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/DeviceProperties.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/DeviceProperties.md)
 */
 
 #pragma once
@@ -70,7 +70,7 @@ namespace AE::Graphics
             POTBytes    minVertexBufferOffsetAlign;
             uint        minVertexBufferElementsAlign    {1};
 
-            Bytes32u    maxUniformBufferRange           {1};
+            Byte32u     maxUniformBufferRange           {1};
 
             uint        maxBoundDescriptorSets          = 0;
 
@@ -122,6 +122,7 @@ namespace AE::Graphics
     //
     struct DeviceResourceFlags
     {
+    // variables
         // contains all available resource usage & options and memory types
 
         EBufferUsage    bufferUsage     = Default;
@@ -133,6 +134,10 @@ namespace AE::Graphics
         EnumBitSet<EDescriptorType> descrTypes;
 
         FixedSet<EMemoryType, 8>    memTypes;
+
+
+    // methods
+        void  Print ()  C_NE___;
     };
 
 
@@ -143,13 +148,16 @@ namespace AE::Graphics
     struct DeviceMemoryInfo
     {
         Bytes   deviceUsage;        // VRAM used by process
-        Bytes   deviceAvailable;    // VRAM totally available (used and free)
+        Bytes   deviceAvailable;    // VRAM available for allocation
+        Bytes   deviceTotal;        // VRAM heap size
 
         Bytes   hostUsage;          // RAM used by GPU process
-        Bytes   hostAvailable;      // RAM totally available (used and free)
+        Bytes   hostAvailable;      // RAM available for allocation
+        Bytes   hostTotal;          // RAM heap size
 
         Bytes   unifiedUsage;       // host visible VRAM used by process
-        Bytes   unifiedAvailable;   // host visible VRAM totally available (used and free)
+        Bytes   unifiedAvailable;   // host visible VRAM available for allocation
+        Bytes   unifiedTotal;       // host visible VRAM heap size
     };
 
 
@@ -163,9 +171,9 @@ namespace AE::Graphics
         {
             constexpr CT_DeviceProperties ()
             {
-                STATIC_ASSERT( sizeof(DeviceProperties) == 88 );
+                StaticAssert( sizeof(DeviceProperties) == 88 );
 
-                STATIC_ASSERT( sizeof(res) == 24 );
+                StaticAssert( sizeof(res) == 24 );
                 {
                     res.minUniformBufferOffsetAlign         = POTBytes_From< 256 >;     // nvidia - 64/256,  amd -  16,   intel -  64,   mali -  16,   adreno -  64,   apple - 16/32/256
                     res.minStorageBufferOffsetAlign         = POTBytes_From< 256 >;     // nvidia - 16,      amd -   4,   intel -  64,   mali - 256,   adreno -  64,   apple - 16
@@ -182,7 +190,7 @@ namespace AE::Graphics
                     res.minBufferCopyOffsetAlign            = POTBytes_From< 256 >;     // nvidia -  1,      amd -   1,   intel - 128,   mali -  64,   adreno -  64,   apple - 1           other - 256
                     res.minBufferCopyRowPitchAlign          = POTBytes_From< 256 >;     // nvidia -  1,      amd -   1,   intel - 128,   mali -  64,   adreno -  64,   apple - 256         other - 256
                 }
-                STATIC_ASSERT( sizeof(rayTracing) == 48 );
+                StaticAssert( sizeof(rayTracing) == 48 );
                 {
                     rayTracing.vertexDataAlign              = POTBytes_From< 4 >;       // vulkan - 4,  metal - 4
                     rayTracing.vertexStrideAlign            = POTBytes_From< 4 >;       // vulkan - 4,  metal - 4
@@ -211,5 +219,11 @@ namespace AE::Graphics
     }
     static constexpr Graphics::_hidden_::CT_DeviceProperties    DeviceLimits {};
 
-
 } // AE::Graphics
+
+
+namespace AE::Base
+{
+    template <> struct TTriviallySerializable< Graphics::DeviceProperties > { static constexpr bool  value = true; };
+    template <> struct TTriviallySerializable< Graphics::DeviceMemoryInfo > { static constexpr bool  value = true; };
+}
diff --git a/AE/engine/src/graphics/Public/DeviceToHostSync.h b/AE/engine/src/graphics/Public/DeviceToHostSync.h
deleted file mode 100644
index be26da6f..00000000
--- a/AE/engine/src/graphics/Public/DeviceToHostSync.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#include "graphics/Public/Common.h"
-
-namespace AE::Graphics
-{
-
-    //
-    // GPU to CPU Sync interface
-    //
-
-    class IDeviceToHostSync : public EnableRC< IDeviceToHostSync >
-    {
-    // interface
-    public:
-        // use only 0 timeout to avoid stalls
-        ND_ virtual bool  Wait (nanoseconds timeout)    __NE___ = 0;
-        ND_ virtual bool  IsCompleted ()                __NE___ = 0;
-    };
-
-    using DeviceToHostSyncPtr = RC< IDeviceToHostSync >;
-
-
-} // AE::Graphics
diff --git a/AE/engine/src/graphics/Public/EResourceState.h b/AE/engine/src/graphics/Public/EResourceState.h
index 07857be2..54125773 100644
--- a/AE/engine/src/graphics/Public/EResourceState.h
+++ b/AE/engine/src/graphics/Public/EResourceState.h
@@ -98,7 +98,7 @@ namespace AE::Graphics
         static constexpr uint   ComputeShader               = 1 << 19;
         static constexpr uint   RayTracingShaders           = 1 << 20;
 
-        STATIC_ASSERT( uint(_AccessCount) < Read );
+        StaticAssert( uint(_AccessCount) < Read );
     };
 
 
@@ -200,7 +200,7 @@ namespace AE::Graphics
         _InvalidState                           = ~0u,
     };
 
-    STATIC_ASSERT( sizeof(EResourceState) == sizeof(_EResState::EState) );
+    StaticAssert( sizeof(EResourceState) == sizeof(_EResState::EState) );
 
 
 /*
diff --git a/AE/engine/src/graphics/Public/FeatureSet.h b/AE/engine/src/graphics/Public/FeatureSet.h
index 23f024e1..e5b4927c 100644
--- a/AE/engine/src/graphics/Public/FeatureSet.h
+++ b/AE/engine/src/graphics/Public/FeatureSet.h
@@ -19,7 +19,7 @@
             max buffers per desc set limit      = Min( maxStorageBuffers, maxUniformBuffers, maxAccelStructures )
             max buffers per desc set            = maxStorageBuffers + maxUniformBuffers + maxAccelStructures
 
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/FeatureSet.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/FeatureSet.md)
 */
 
 #pragma once
@@ -96,7 +96,7 @@ namespace AE::Graphics
         static constexpr uint   MaxSpirvVersion = 160;
 
         static constexpr uint   MinMetalVersion = 200;
-        static constexpr uint   MaxMetalVersion = 300;
+        static constexpr uint   MaxMetalVersion = 310;
 
         struct ShaderVersion
         {
@@ -209,7 +209,8 @@ namespace AE::Graphics
         _visitor_( EFeature,            shaderSubgroupClock,                    : 2 )   /* GL_ARB_shader_clock                                                              */\
         _visitor_( EFeature,            shaderDeviceClock,                      : 2 )   /* GL_EXT_shader_realtime_clock                                                     */\
         /*  */\
-        _visitor_( EFeature,            cooperativeMatrix,                      : 2 )   /* GL_KHR_cooperative_matrix                                                        */\
+        _visitor_( EFeature,            cooperativeMatrix,                      : 2 )   /*\                                                                                 */\
+        _visitor_( EShaderStages,       cooperativeMatrixStages,                    )   /*-'-- GL_KHR_cooperative_matrix                                                    */\
         \
         \
     /*---- shader features/limits ----*/\
@@ -393,6 +394,7 @@ namespace AE::Graphics
         /*_visitor_( EFeature,          filterMinmaxSingleComponentFormats,     : 2 )*/\
         _visitor_( EFeature,            samplerMipLodBias,                      : 2 )\
         _visitor_( EFeature,            samplerYcbcrConversion,                 : 2 )   /* VK_KHR_sampler_ycbcr_conversion                                                  */\
+        _visitor_( EFeature,            nonSeamlessCubeMap,                     : 2 )   /* VK_EXT_non_seamless_cube_map                                                     */\
         _visitor_( float,               maxSamplerAnisotropy,                       )\
         _visitor_( float,               maxSamplerLodBias,                          )\
         /*_visitor_( SampleCountBits,   sampledImageColorSampleCounts,              )*/\
@@ -488,7 +490,7 @@ namespace AE::Graphics
         template <bool Mutable>
         bool  _Validate ()                                                          __NE___;
     };
-    STATIC_ASSERT( sizeof(FeatureSet) == 680 );
+    StaticAssert( sizeof(FeatureSet) == 688 );
 
 } // AE::Graphics
 
diff --git a/AE/engine/src/graphics/Public/FeatureSetEnums.h b/AE/engine/src/graphics/Public/FeatureSetEnums.h
index dd102f5c..84641285 100644
--- a/AE/engine/src/graphics/Public/FeatureSetEnums.h
+++ b/AE/engine/src/graphics/Public/FeatureSetEnums.h
@@ -199,7 +199,7 @@ namespace AE::Graphics
 
         _Count
     };
-    STATIC_ASSERT( uint(ESubgroupOperation::_Count) == 52 );
+    StaticAssert( uint(ESubgroupOperation::_Count) == 52 );
 
 
     //
@@ -238,6 +238,7 @@ namespace AE::Graphics
         _visit_( Adreno_600_QC5 )       /* 643, 650, 660                                    with quad channel LPDDR5                            */\
         _visit_( Adreno_700_SC3 )       /* 702                                              with single channel LPDDR3                          */\
         _visit_( Adreno_700_DC4_SC5 )   /* 730, 740                                         with dual channel LPDDR4 or single channel LPDDR5   */\
+        _visit_( Adreno_700_QC5X )      /* 740, 750                                         with quad channel LPDDR5X                           */\
         \
         /*---- AMD ----*/\
         _visit_( AMD_GCN1 )             /* 520, 610                                             */\
@@ -249,18 +250,19 @@ namespace AE::Graphics
         _visit_( AMD_RDNA1 )            /* 5300 - 5700                                          */\
         _visit_( AMD_RDNA2 )            /* N6: 6400 - 6500, N7: 6600 - 6900                     */\
         _visit_( AMD_RDNA2_APU )        /* PS5, SteamDeck, Ryzen 6xxx / 7x20 / 7x35 / 7x45 APU  */\
-        _visit_( AMD_RDNA3 )            /* N5/N6: 7900                                          */\
+        _visit_( AMD_RDNA3 )            /* N5/N6: 7600 - 7900                                   */\
         _visit_( AMD_RDNA3_APU )        /* Ryzen 7x40 APU, Z1                                   */\
         \
         /*---- Apple ----*/\
-        _visit_( Apple_A8 )             \
-        _visit_( Apple_A9_A10 )         /*                  (Hurricane / Zephyr)    */\
-        _visit_( Apple_A11 )            /*                  (Monsoon / Mistral)     */\
-        _visit_( Apple_A12 )            /* A12X, A12Z       (Vortex / Tempest)      */\
-        _visit_( Apple_A13 )            /*                  (Lightning / Thunder)   */\
-        _visit_( Apple_A14_M1 )         /* M1 Pro, M1 Max   (Firestorm / Icestorm)  */\
-        _visit_( Apple_A15_M2 )         /* M2 Pro, M2 Max   (Avalanche / Blizzard)  */\
-        _visit_( Apple_A16 )            /*                  (Everest / Sawtooth )   */\
+        _visit_( Apple_A8 )             /*                                          - Apple2 */\
+        _visit_( Apple_A9_A10 )         /*                  (Hurricane / Zephyr)    - Apple3 */\
+        _visit_( Apple_A11 )            /*                  (Monsoon / Mistral)     - Apple4 */\
+        _visit_( Apple_A12 )            /* A12X, A12Z       (Vortex / Tempest)      - Apple5 */\
+        _visit_( Apple_A13 )            /*                  (Lightning / Thunder)   - Apple6 */\
+        _visit_( Apple_A14_M1 )         /* M1 Pro, M1 Max   (Firestorm / Icestorm)  - Apple7 */\
+        _visit_( Apple_A15_M2 )         /* M2 Pro, M2 Max   (Avalanche / Blizzard)  - Apple8 */\
+        _visit_( Apple_A16 )            /*                  (Everest / Sawtooth)    - Apple8 */\
+        _visit_( Apple_A17_M3 )         /* A17, M3...       ( )                     - Apple9 */\
         \
         /*---- Mali ----*/\
         _visit_( Mali_Midgard_Gen2 )    /* T622, T624, T628, T678       */\
@@ -273,6 +275,7 @@ namespace AE::Graphics
         _visit_( Mali_Valhall_Gen2 )    /* G68, G78                     */\
         _visit_( Mali_Valhall_Gen3 )    /* G310, G510, G610, G710       */\
         _visit_( Mali_Valhall_Gen4 )    /* G615, G715                   */\
+        _visit_( Mali_Valhall_Gen5 )    /* G620, G720                   */\
         \
         /*---- NVidia ----*/\
         _visit_( NV_Maxwell )           /* GTX 9xx, Titan X, Quadro Mxxxx                       */\
@@ -292,6 +295,7 @@ namespace AE::Graphics
         _visit_( Intel_Gen9 )           /* UHD 620, 630                                 */\
         _visit_( Intel_Gen11 )          /* Iris Plus, Core 10xxx                        */\
         _visit_( Intel_Gen12 )          /* UHD Graphics 7xx, Iris Xe, Core 11xxx        */\
+        _visit_( Intel_Gen12_7 )        /* Arc 3/5/7                                    */\
         \
         /*---- PowerVR ----*/\
         _visit_( PowerVR_Series8XE )    /* GE8100, GE8200, GE8300, GE8310, GE8430           */\
@@ -301,7 +305,8 @@ namespace AE::Graphics
         \
         /*---- Other ----*/\
         _visit_( VeriSilicon )          /*  */\
-        _visit_( V3D_4 )                /* Raspberry Pi 4 */\
+        /*_visit_( V3D_4 )              / * Raspberry Pi 4 */\
+        /*_visit_( V3D_6 )              / * Raspberry Pi 5 */\
         _visit_( SwiftShader )          /* emulation */\
 
         #define AE_GRAPHICS_DEVICE_VISIT( _name_ )              _name_,
@@ -312,22 +317,22 @@ namespace AE::Graphics
         Unknown         = _Count,
 
         _Adreno_Begin   = Adreno_500,
-        _Adreno_End     = Adreno_700_DC4_SC5,
+        _Adreno_End     = Adreno_700_QC5X,
 
         _AMD_Begin      = AMD_GCN1,
         _AMD_End        = AMD_RDNA3_APU,
 
         _Apple_Begin    = Apple_A8,
-        _Apple_End      = Apple_A16,
+        _Apple_End      = Apple_A17_M3,
 
         _Mali_Begin     = Mali_Midgard_Gen2,
-        _Mali_End       = Mali_Valhall_Gen4,
+        _Mali_End       = Mali_Valhall_Gen5,
 
         _NV_Begin       = NV_Maxwell,
         _NV_End         = NV_Ada,
 
         _Intel_Begin    = Intel_Gen9,
-        _Intel_End      = Intel_Gen12,
+        _Intel_End      = Intel_Gen12_7,
 
         _PowerVR_Begin  = PowerVR_Series8XE,
         _PowerVR_End    = PowerVR_Series9XE,
@@ -335,21 +340,21 @@ namespace AE::Graphics
         _Other_Begin    = VeriSilicon,
     };
 
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Adreno_Begin)   == 0 );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Adreno_Begin)   <  uint(EGraphicsDeviceID::_Adreno_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Adreno_End)+1   == uint(EGraphicsDeviceID::_AMD_Begin) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_AMD_Begin)      <  uint(EGraphicsDeviceID::_AMD_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_AMD_End)+1      == uint(EGraphicsDeviceID::_Apple_Begin) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Apple_Begin)    <  uint(EGraphicsDeviceID::_Apple_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Apple_End)+1    == uint(EGraphicsDeviceID::_Mali_Begin) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Mali_Begin)     <  uint(EGraphicsDeviceID::_Mali_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Mali_End)+1     == uint(EGraphicsDeviceID::_NV_Begin) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_NV_Begin)       <  uint(EGraphicsDeviceID::_NV_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_NV_End)+1       == uint(EGraphicsDeviceID::_Intel_Begin) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Intel_Begin)    <  uint(EGraphicsDeviceID::_Intel_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_Intel_End)+1    == uint(EGraphicsDeviceID::_PowerVR_Begin) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_PowerVR_Begin)  <  uint(EGraphicsDeviceID::_PowerVR_End) );
-    STATIC_ASSERT( uint(EGraphicsDeviceID::_PowerVR_End)+1  == uint(EGraphicsDeviceID::_Other_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_Adreno_Begin)    == 0 );
+    StaticAssert( uint(EGraphicsDeviceID::_Adreno_Begin)    <  uint(EGraphicsDeviceID::_Adreno_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_Adreno_End)+1    == uint(EGraphicsDeviceID::_AMD_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_AMD_Begin)       <  uint(EGraphicsDeviceID::_AMD_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_AMD_End)+1       == uint(EGraphicsDeviceID::_Apple_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_Apple_Begin) <  uint(EGraphicsDeviceID::_Apple_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_Apple_End)+1 == uint(EGraphicsDeviceID::_Mali_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_Mali_Begin)      <  uint(EGraphicsDeviceID::_Mali_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_Mali_End)+1      == uint(EGraphicsDeviceID::_NV_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_NV_Begin)        <  uint(EGraphicsDeviceID::_NV_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_NV_End)+1        == uint(EGraphicsDeviceID::_Intel_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_Intel_Begin) <  uint(EGraphicsDeviceID::_Intel_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_Intel_End)+1 == uint(EGraphicsDeviceID::_PowerVR_Begin) );
+    StaticAssert( uint(EGraphicsDeviceID::_PowerVR_Begin)   <  uint(EGraphicsDeviceID::_PowerVR_End) );
+    StaticAssert( uint(EGraphicsDeviceID::_PowerVR_End)+1   == uint(EGraphicsDeviceID::_Other_Begin) );
 
 
 } // AE::Graphics
diff --git a/AE/engine/src/graphics/Public/GraphicsCreateInfo.h b/AE/engine/src/graphics/Public/GraphicsCreateInfo.h
index 9aaeca08..bd26104d 100644
--- a/AE/engine/src/graphics/Public/GraphicsCreateInfo.h
+++ b/AE/engine/src/graphics/Public/GraphicsCreateInfo.h
@@ -55,7 +55,7 @@ namespace AE::Graphics
         uint                    maxFrames   = 2;
 
         // staging buffers //
-        using SizePerQueue_t = StaticArray< Bytes32u, 5 >;
+        using SizePerQueue_t = StaticArray< Byte32u, uint(EQueueType::_Count) >;
         struct {
             // static staging buffers allocated at engine start
             SizePerQueue_t          writeStaticSize         = {};
@@ -63,30 +63,33 @@ namespace AE::Graphics
 
             // dynamic buffers will be allocated when needed and will be released after,
             // but total size can be limited
-            Bytes                   maxWriteDynamicSize     = 1_Gb;
-            Bytes                   maxReadDynamicSize      = 1_Gb;
+            //   expected FPS:           60
+            //   PCI-E 3 x16 bandwidth:  16 Gb/s
+            //   bandwidth per frame:   ~273 Mb
+            Bytes                   maxWriteDynamicSize     = 256_Mb;
+            Bytes                   maxReadDynamicSize      = 64_Mb;    // some GPUs has limited bandwidth for read access
 
             // granularity of the dynamic staging buffers
-            Bytes                   dynamicBlockSize        = 32_Mb;
+            Bytes                   dynamicBlockSize        = 16_Mb;
 
             // wait X frames before release dynamic buffer
             uint                    maxFramesToRelease      = 1 << 10;
 
             // vertex & index buffer size for single frame
-            Bytes32u                vstreamSize             = 4_Mb;
+            Byte32u                 vstreamSize             = 4_Mb;
 
             // total size of staging memory is:
             //   (writeStaticSize + readStaticSize) * maxFrames + (maxWriteDynamicSize + maxReadDynamicSize)
         }                       staging;
 
 
-        GfxMemAllocatorPtr      defaultGfxAllocator;
-        DescriptorAllocatorPtr  defaultDescAllocator;
+        IGfxMemAllocator *      defaultGfxAllocator     = null;
+        IDescriptorAllocator *  defaultDescAllocator    = null;
 
         struct
         {
-            String                  appName         = "Test";
-            String                  deviceName;     // keep empty for auto-detect
+            StringView              appName;
+            StringView              deviceName;     // keep empty for auto-detect
             EQueueMask              requiredQueues  = EQueueMask::Graphics;
             EQueueMask              optionalQueues  = Default;
             EDeviceValidation       validation      = EDeviceValidation::Enabled;
diff --git a/AE/engine/src/graphics/Public/GraphicsImpl.h b/AE/engine/src/graphics/Public/GraphicsImpl.h
index 025d24c1..ccb31d7d 100644
--- a/AE/engine/src/graphics/Public/GraphicsImpl.h
+++ b/AE/engine/src/graphics/Public/GraphicsImpl.h
@@ -9,6 +9,8 @@
     DirectCtx::Graphics
     DirectCtx::ASBuild
     DirectCtx::RayTracing
+    DirectCtx::VideoDecode
+    DirectCtx::VideoEncode
 
     IndirectCtx::CommandBuffer
     IndirectCtx::Transfer
@@ -17,6 +19,8 @@
     IndirectCtx::Graphics
     IndirectCtx::ASBuild
     IndirectCtx::RayTracing
+    IndirectCtx::VideoDecode
+    IndirectCtx::VideoEncode
 
     RenderTask
     RenderTaskCoro
@@ -64,6 +68,8 @@ namespace AE::Graphics
         using Graphics      = VDirectGraphicsContext;
         using ASBuild       = VDirectASBuildContext;
         using RayTracing    = VDirectRayTracingContext;
+    //  using VideoDecode   = VDirectVideoDecodeContext;
+    //  using VideoEncode   = VDirectVideoEncodeContext;
     };
 
     struct IndirectCtx
@@ -75,10 +81,10 @@ namespace AE::Graphics
         using Graphics      = VIndirectGraphicsContext;
         using ASBuild       = VIndirectASBuildContext;
         using RayTracing    = VIndirectRayTracingContext;
+    //  using VideoDecode   = VIndirectVideoDecodeContext;
+    //  using VideoEncode   = VIndirectVideoEncodeContext;
     };
 
-    using GRenderTaskScheduler  = VRenderTaskScheduler;
-
     using CommandBatch          = VCommandBatch;
     using CommandBatchPtr       = RC< CommandBatch >;
 
@@ -94,8 +100,123 @@ namespace AE::Graphics
 
 
 
+#if defined(AE_ENABLE_METAL) and not defined(AE_ENABLE_REMOTE_GRAPHICS)
+# include "graphics/Metal/Commands/MTransferContext.h"
+# include "graphics/Metal/Commands/MComputeContext.h"
+# include "graphics/Metal/Commands/MDrawContext.h"
+# include "graphics/Metal/Commands/MGraphicsContext.h"
+# include "graphics/Metal/Commands/MASBuildContext.h"
+# include "graphics/Metal/Commands/MRayTracingContext.h"
+
+# include "graphics/Metal/Descriptors/MDescriptorUpdater.h"
+
+# include "graphics/Metal/MRenderTaskScheduler.h"
+
+namespace AE::Graphics
+{
+    struct DirectCtx
+    {
+        using CommandBuffer = MCommandBuffer;
+        using Transfer      = MDirectTransferContext;
+        using Compute       = MDirectComputeContext;
+        using Draw          = MDirectDrawContext;
+        using Graphics      = MDirectGraphicsContext;
+        using ASBuild       = MDirectASBuildContext;
+        using RayTracing    = MDirectRayTracingContext;
+    //  using VideoDecode   = MDirectVideoDecodeContext;
+    //  using VideoEncode   = MDirectVideoEncodeContext;
+    };
+
+    struct IndirectCtx
+    {
+        using CommandBuffer = Graphics::_hidden_::MSoftwareCmdBufPtr;
+        using Transfer      = MIndirectTransferContext;
+        using Compute       = MIndirectComputeContext;
+        using Draw          = MIndirectDrawContext;
+        using Graphics      = MIndirectGraphicsContext;
+        using ASBuild       = MIndirectASBuildContext;
+        using RayTracing    = MIndirectRayTracingContext;
+    //  using VideoDecode   = MIndirectVideoDecodeContext;
+    //  using VideoEncode   = MIndirectVideoEncodeContext;
+    };
+
+    using CommandBatch          = MCommandBatch;
+    using CommandBatchPtr       = RC< CommandBatch >;
+
+    using DrawCommandBatch      = MDrawCommandBatch;
+    using DrawCommandBatchPtr   = RC< DrawCommandBatch >;
+
+    using DescriptorUpdater     = MDescriptorUpdater;
+
+} // AE::Graphics
+
+#endif // AE_ENABLE_METAL
+//-----------------------------------------------------------------------------
+
+
+
+#ifdef AE_ENABLE_REMOTE_GRAPHICS
+# include "graphics/Remote/Commands/RTransferContext.h"
+# include "graphics/Remote/Commands/RComputeContext.h"
+# include "graphics/Remote/Commands/RDrawContext.h"
+# include "graphics/Remote/Commands/RGraphicsContext.h"
+# include "graphics/Remote/Commands/RASBuildContext.h"
+# include "graphics/Remote/Commands/RRayTracingContext.h"
+
+# include "graphics/Remote/Descriptors/RDescriptorUpdater.h"
+
+# include "graphics/Remote/RRenderTaskScheduler.h"
+
+namespace AE::Graphics
+{
+    struct DirectCtx
+    {
+        using CommandBuffer = Graphics::_hidden_::RSoftwareCmdBufPtr;
+        using Transfer      = RTransferContext;
+        using Compute       = RComputeContext;
+        using Draw          = RDrawContext;
+        using Graphics      = RGraphicsContext;
+        using ASBuild       = RASBuildContext;
+        using RayTracing    = RRayTracingContext;
+    //  using VideoDecode   = RVideoDecodeContext;
+    //  using VideoEncode   = RVideoEncodeContext;
+    };
+
+    using IndirectCtx           = DirectCtx;
+
+    using CommandBatch          = RCommandBatch;
+    using CommandBatchPtr       = RC< CommandBatch >;
+
+    using DrawCommandBatch      = RDrawCommandBatch;
+    using DrawCommandBatchPtr   = RC< DrawCommandBatch >;
+
+    using DescriptorUpdater     = RDescriptorUpdater;
+
+} // AE::Graphics
+
+#endif // AE_ENABLE_REMOTE_GRAPHICS
+//-----------------------------------------------------------------------------
+
+
+
 #ifdef AE_CPP_DETECT_MISMATCH
 
+# ifdef AE_ENABLE_METAL
+#   pragma detect_mismatch( "AE_ENABLE_METAL", "1" )
+# else
+#   pragma detect_mismatch( "AE_ENABLE_METAL", "0" )
+# endif
+
+# ifdef AE_ENABLE_METAL
+#  if AE_METAL_NATIVE_DEBUGGER
+#   pragma detect_mismatch( "AE_METAL_NATIVE_DEBUGGER", "1" )
+#  else
+#   pragma detect_mismatch( "AE_METAL_NATIVE_DEBUGGER", "0" )
+#  endif
+# else
+#   pragma detect_mismatch( "AE_METAL_NATIVE_DEBUGGER", "0" )
+# endif
+
 # ifdef AE_ENABLE_VULKAN
 #   pragma detect_mismatch( "AE_ENABLE_VULKAN", "1" )
 # else
diff --git a/AE/engine/src/graphics/Public/GraphicsProfiler.h b/AE/engine/src/graphics/Public/GraphicsProfiler.h
index de801a10..32089c09 100644
--- a/AE/engine/src/graphics/Public/GraphicsProfiler.h
+++ b/AE/engine/src/graphics/Public/GraphicsProfiler.h
@@ -70,7 +70,6 @@ namespace AE::Graphics
       #endif
 
         // frames
-        virtual void  RequestNextFrame (FrameUID frameId)                                                                               __NE___ = 0;
         virtual void  NextFrame (FrameUID frameId)                                                                                      __NE___ = 0;
 
         // memory
diff --git a/AE/engine/src/graphics/Public/IDevice.h b/AE/engine/src/graphics/Public/IDevice.h
new file mode 100644
index 00000000..d2059723
--- /dev/null
+++ b/AE/engine/src/graphics/Public/IDevice.h
@@ -0,0 +1,54 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Device interface only used to be sure that all device implementations has the same methods.
+
+    Thread-safe:
+     - const methods are safe after device initialization and before destruction
+*/
+
+#pragma once
+
+#include "graphics/Public/DeviceProperties.h"
+#include "graphics/Public/ResourceEnums.h"
+#include "graphics/Public/FeatureSet.h"
+#include "graphics/Public/DescriptorSet.h"
+#include "graphics/Public/Queue.h"
+
+namespace AE::Graphics
+{
+
+    //
+    // Graphics Device interface
+    //
+
+    class IDevice : public Noncopyable
+    {
+    // types
+    public:
+        using ResourceFlags     = DeviceResourceFlags;
+        using DevMemoryInfoOpt  = Optional< DeviceMemoryInfo >;
+
+
+    // interface
+    public:
+        ND_ virtual ResourceFlags const&        GetResourceFlags ()                 C_NE___ = 0;
+        ND_ virtual DeviceProperties const&     GetDeviceProperties ()              C_NE___ = 0;
+
+        ND_ virtual EQueueMask                  GetAvailableQueues ()               C_NE___ = 0;
+        ND_ virtual StringView                  GetDeviceName ()                    C_NE___ = 0;
+
+        ND_ virtual DevMemoryInfoOpt            GetMemoryUsage ()                   C_NE___ = 0;
+
+        ND_ virtual bool                        IsInitialized ()                    C_NE___ = 0;
+        ND_ virtual bool                        IsUnderDebugger ()                  C_NE___ = 0;
+
+        ND_ virtual bool                        CheckConstantLimits ()              C_NE___ = 0;
+        ND_ virtual bool                        CheckExtensions ()                  C_NE___ = 0;
+
+    // TODO:
+        //ND_ virtual VQueuePtr                 GetQueue (EQueueType type)          C_NE___ = 0;
+        //ND_ virtual ArrayView<VQueue>         GetQueues ()                        C_NE___ = 0;
+    };
+
+
+} // AE::Graphics
diff --git a/AE/engine/src/graphics/Public/IDs.h b/AE/engine/src/graphics/Public/IDs.h
index ef4a5c0a..fa011b10 100644
--- a/AE/engine/src/graphics/Public/IDs.h
+++ b/AE/engine/src/graphics/Public/IDs.h
@@ -144,14 +144,14 @@ namespace AE::Graphics
     public:
         GAutorelease ()                         __NE___ {}
         GAutorelease (Strong<ID_t> id)          __NE___ : _id{ RVRef(id) }          {}
-        GAutorelease (Self && other)            __NE___ : _id{ RVRef(other._id) }   {}
+        GAutorelease (Self &&other)             __NE___ : _id{ RVRef(other._id) }   {}
         ~GAutorelease ()                        __NE___ { _ReleaseRef(); }
 
         GAutorelease (const Self &)             = delete;
         Self&  operator = (const Self &)        = delete;
 
         Self&  operator = (Strong<ID_t> rhs)    __NE___ { _ReleaseRef();  _id = RVRef(rhs);     return *this; }
-        Self&  operator = (Self && rhs)         __NE___ { _ReleaseRef();  _id = RVRef(rhs._id); return *this; }
+        Self&  operator = (Self &&rhs)          __NE___ { _ReleaseRef();  _id = RVRef(rhs._id); return *this; }
 
         ND_ ID_t            Get ()              C_NE___ { return _id.Get(); }
         ND_ Strong<ID_t>    Release ()          __NE___ { Strong<ID_t> tmp = RVRef(_id);  return tmp; }
diff --git a/AE/engine/src/graphics/Public/ImageDesc.h b/AE/engine/src/graphics/Public/ImageDesc.h
index 9ef1009d..7ab33391 100644
--- a/AE/engine/src/graphics/Public/ImageDesc.h
+++ b/AE/engine/src/graphics/Public/ImageDesc.h
@@ -18,7 +18,7 @@ namespace AE::Graphics
     struct ImageDesc
     {
     // types
-        using FormatList_t = FixedArray< EPixelFormat, 4 >;
+        using FormatList_t = StaticArray< EPixelFormat, 4 >;
 
 
     // variables
@@ -32,7 +32,7 @@ namespace AE::Graphics
         MultiSamples        samples;                // if > 1 then enabled multisampling
         EMemoryType         memType         = EMemoryType::DeviceLocal;
         EQueueMask          queues          = Default;
-        FormatList_t        viewFormats;
+        FormatList_t        viewFormats     { Default, Default, Default, Default };
 
 
     // methods
@@ -43,6 +43,8 @@ namespace AE::Graphics
 
         ND_ bool  operator == (const ImageDesc &rhs)        C_NE___;
         ND_ bool  IsExclusiveSharing ()                     C_NE___ { return queues == Default; }
+        ND_ bool  HasViewFormatList ()                      C_NE___ { return ViewFormatListSize() != 0; }
+        ND_ usize ViewFormatListSize ()                     C_NE___;
 
         ImageDesc&  SetType (EImage value)                  __NE___;
         ImageDesc&  SetType (EImageDim value)               __NE___ { imageDim      = value;                return *this; }
@@ -60,7 +62,7 @@ namespace AE::Graphics
         ImageDesc&  SetAllMipmaps ()                        __NE___ { maxLevel      = MipmapLevel::Max();   return *this; }
         ImageDesc&  SetQueues (EQueueMask value)            __NE___ { queues        = value;                return *this; }
         ImageDesc&  SetMemory (EMemoryType value)           __NE___ { memType       = value;                return *this; }
-        ImageDesc&  AddViewFormat (EPixelFormat value)      __NE___ { viewFormats.try_push_back( value );   return *this; }
+        ImageDesc&  AddViewFormat (EPixelFormat value)      __NE___;
 
         ND_ static ImageDesc  CreateColorAttachment (const uint2 &dim, EPixelFormat fmt, ImageLayer layers = 1_layer)   __NE___;
         ND_ static ImageDesc  CreateDepthAttachment (const uint2 &dim, EPixelFormat fmt, ImageLayer layers = 1_layer)   __NE___;
@@ -127,7 +129,7 @@ namespace AE::Base
     template <> struct TMemCopyAvailable< AE::Graphics::ImageViewDesc >     { static constexpr bool  value = true; };
     template <> struct TTriviallySerializable< AE::Graphics::ImageViewDesc >{ static constexpr bool  value = true; };
 
-    STATIC_ASSERT( sizeof(AE::Graphics::ImageDesc) == 48 );
-    STATIC_ASSERT( sizeof(AE::Graphics::ImageViewDesc) == 20 );
+    StaticAssert( sizeof(AE::Graphics::ImageDesc) == 48 );
+    StaticAssert( sizeof(AE::Graphics::ImageViewDesc) == 20 );
 
 } // AE::Base
diff --git a/AE/engine/src/graphics/Public/ImageLayer.h b/AE/engine/src/graphics/Public/ImageLayer.h
index 6ccb75bf..22f5e9bc 100644
--- a/AE/engine/src/graphics/Public/ImageLayer.h
+++ b/AE/engine/src/graphics/Public/ImageLayer.h
@@ -22,7 +22,7 @@ namespace AE::Graphics
     public:
         constexpr ImageLayer ()                                     __NE___ {}
 
-        template <typename T, typename = EnableIf<IsUnsignedInteger<T>> >
+        template <typename T, ENABLEIF( IsUnsignedInteger<T> )>
         explicit constexpr ImageLayer (T value)                     __NE___ : _value( CheckCast<ushort>(value)) {}
 
         ND_ constexpr uint  Get ()                                  C_NE___ { return _value; }
diff --git a/AE/engine/src/graphics/Public/ImageMemView.h b/AE/engine/src/graphics/Public/ImageMemView.h
index cd99a0d6..a64106dd 100644
--- a/AE/engine/src/graphics/Public/ImageMemView.h
+++ b/AE/engine/src/graphics/Public/ImageMemView.h
@@ -29,8 +29,8 @@ namespace AE::Graphics
     // variables
     protected:
         BufferMemView       _content;
-        Bytes32u            _rowPitch;
-        Bytes32u            _slicePitch;
+        Byte32u             _rowPitch;
+        Byte32u             _slicePitch;
         ushort3             _offset;
         ushort3             _dimension;
         ushort              _bitsPerBlock   = 0;
@@ -43,7 +43,7 @@ namespace AE::Graphics
     public:
         ImageMemView () __NE___ {}
         ImageMemView (const BufferMemView& content, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___;
-        ImageMemView (void *content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___;
+        ImageMemView (void* content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___;
 
         template <typename T>
         ImageMemView (Array<T> &content, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___ :
@@ -74,7 +74,7 @@ namespace AE::Graphics
         ND_ uint2           TexBlockDim ()                  C_NE___ { return uint2{_texBlockDim}; }
         ND_ uint2           TexelBlocks ()                  C_NE___ { return uint2{_dimension.x, _dimension.y} / TexBlockDim(); }
 
-            bool    PushBack (void *ptr, Bytes size)        __NE___ { return _content.PushBack( ptr, size ); }
+            bool    PushBack (void* ptr, Bytes size)        __NE___ { return _content.PushBack( ptr, size ); }
 
         ND_ Row_t   GetRow (uint y, uint z = 0)             __NE___;
         ND_ CRow_t  GetRow (uint y, uint z = 0)             C_NE___;
@@ -159,21 +159,21 @@ namespace AE::Graphics
         RWImageMemView ()                                           __NE___;
         RWImageMemView (const ImageMemView& other)                  __NE___;
         RWImageMemView (const BufferMemView& content, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___;
-        RWImageMemView (void *content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___;
+        RWImageMemView (void* content, Bytes contentSize, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___;
 
         template <typename T>
         RWImageMemView (Array<T> &content, const uint3 &off, const uint3 &dim, Bytes rowPitch, Bytes slicePitch, EPixelFormat format, EImageAspect aspect) __NE___ :
             RWImageMemView{ BufferMemView{content}, off, dim, rowPitch, slicePitch, format, aspect } {}
 
-        void  Load (const uint3 &point, OUT RGBA32f &col)           C_NE___ { ASSERT( _loadF4 != null );    _loadF4( GetRow( point.y, point.z ), point.x, OUT col ); }
-        void  Load (const uint3 &point, OUT RGBA32u &col)           C_NE___ { ASSERT( _loadU4 != null );    _loadU4( GetRow( point.y, point.z ), point.x, OUT col ); }
-        void  Load (const uint3 &point, OUT RGBA32i &col)           C_NE___ { ASSERT( _loadI4 != null );    _loadI4( GetRow( point.y, point.z ), point.x, OUT col ); }
-        void  Load (const uint3 &point, OUT DepthStencil &ds)       C_NE___ { ASSERT( _loadDS != null );    _loadDS( GetRow( point.y, point.z ), point.x, OUT ds ); }
+            void  Load (const uint3 &point, OUT RGBA32f &col)           C_NE___ { ASSERT( _loadF4 != null );    _loadF4( GetRow( point.y, point.z ), point.x, OUT col ); }
+            void  Load (const uint3 &point, OUT RGBA32u &col)           C_NE___ { ASSERT( _loadU4 != null );    _loadU4( GetRow( point.y, point.z ), point.x, OUT col ); }
+            void  Load (const uint3 &point, OUT RGBA32i &col)           C_NE___ { ASSERT( _loadI4 != null );    _loadI4( GetRow( point.y, point.z ), point.x, OUT col ); }
+            void  Load (const uint3 &point, OUT DepthStencil &ds)       C_NE___ { ASSERT( _loadDS != null );    _loadDS( GetRow( point.y, point.z ), point.x, OUT ds ); }
 
-        void  Store (const uint3 &point, const RGBA32f &col)        __NE___ { ASSERT( _storeF4 != null );   _storeF4( GetRow( point.y, point.z ), point.x, col ); }
-        void  Store (const uint3 &point, const RGBA32u &col)        __NE___ { ASSERT( _storeU4 != null );   _storeU4( GetRow( point.y, point.z ), point.x, col ); }
-        void  Store (const uint3 &point, const RGBA32i &col)        __NE___ { ASSERT( _storeI4 != null );   _storeI4( GetRow( point.y, point.z ), point.x, col ); }
-        void  Store (const uint3 &point, const DepthStencil &ds)    __NE___ { ASSERT( _storeDS != null );   _storeDS( GetRow( point.y, point.z ), point.x, ds ); }
+            void  Store (const uint3 &point, const RGBA32f &col)        __NE___ { ASSERT( _storeF4 != null );   _storeF4( GetRow( point.y, point.z ), point.x, col ); }
+            void  Store (const uint3 &point, const RGBA32u &col)        __NE___ { ASSERT( _storeU4 != null );   _storeU4( GetRow( point.y, point.z ), point.x, col ); }
+            void  Store (const uint3 &point, const RGBA32i &col)        __NE___ { ASSERT( _storeI4 != null );   _storeI4( GetRow( point.y, point.z ), point.x, col ); }
+            void  Store (const uint3 &point, const DepthStencil &ds)    __NE___ { ASSERT( _storeDS != null );   _storeDS( GetRow( point.y, point.z ), point.x, ds ); }
 
         // convert between different formats without filtering
         ND_ bool  Blit (const RWImageMemView &src)                                                                          __NE___;
diff --git a/AE/engine/src/graphics/Public/ImageSwizzle.h b/AE/engine/src/graphics/Public/ImageSwizzle.h
index b3c1e841..eba5a352 100644
--- a/AE/engine/src/graphics/Public/ImageSwizzle.h
+++ b/AE/engine/src/graphics/Public/ImageSwizzle.h
@@ -33,14 +33,14 @@ namespace AE::Graphics
         ND_ constexpr bool  operator == (const ImageSwizzle &rhs)                               C_NE___ { return _value == rhs._value; }
         ND_ constexpr bool  operator >  (const ImageSwizzle &rhs)                               C_NE___ { return _value >  rhs._value; }
 
-        ND_ static constexpr ImageSwizzle  FromString (const char *str, const usize len)        __NE___;
+        ND_ static constexpr ImageSwizzle  FromString (const char* str, const usize len)        __NE___;
         ND_ static constexpr ImageSwizzle  FromString (StringView str)                          __NE___ { return FromString( str.data(), str.size() ); }
 
         // 0..3 - src0
         // 4..7 - src1
         ND_ static uint4  Mix (ImageSwizzle src0, ImageSwizzle src1)                            __NE___;
 
-        friend constexpr ImageSwizzle  operator "" _swizzle (const char *str, const usize len)  __NE___;
+        friend constexpr ImageSwizzle  operator "" _swizzle (const char* str, const usize len)  __NE___;
 
 
     private:
@@ -53,7 +53,7 @@ namespace AE::Graphics
     operator ""
 =================================================
 */
-    ND_ constexpr ImageSwizzle  operator "" _swizzle (const char *str, const usize len) __NE___
+    ND_ constexpr ImageSwizzle  operator "" _swizzle (const char* str, const usize len) __NE___
     {
         return ImageSwizzle::FromString( str, len );
     }
@@ -103,7 +103,7 @@ namespace AE::Graphics
     FromString
 =================================================
 */
-    inline constexpr ImageSwizzle  ImageSwizzle::FromString (const char *str, const usize len) __NE___
+    inline constexpr ImageSwizzle  ImageSwizzle::FromString (const char* str, const usize len) __NE___
     {
         ASSERT( len <= 4 );
 
diff --git a/AE/engine/src/graphics/Public/MetalTypes.h b/AE/engine/src/graphics/Public/MetalTypes.h
index 61cffdb4..b4612bd1 100644
--- a/AE/engine/src/graphics/Public/MetalTypes.h
+++ b/AE/engine/src/graphics/Public/MetalTypes.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#ifdef AE_ENABLE_METAL
+#if defined(AE_PLATFORM_MACOS) or defined(AE_PLATFORM_IOS)
 
 # include "base/ObjC/NS.h"
 # include "graphics/Public/IDs.h"
@@ -267,7 +267,7 @@ namespace AE::Graphics
     // methods
         MetalSampleBufferAttachments ()                 __NE___ {}
         MetalSampleBufferAttachments (std::nullptr_t)   __NE___ {}
-        MetalSampleBufferAttachments (Self && other)    __NE___ : _obj{ RVRef(other._obj) }, _pass{other._pass} { other._pass = Default; }
+        MetalSampleBufferAttachments (Self &&other)     __NE___ : _obj{ RVRef(other._obj) }, _pass{other._pass} { other._pass = Default; }
 
         Self&  operator = (std::nullptr_t)              __NE___ { _obj = Default;  _pass = Default;  return *this; }
 
@@ -283,4 +283,4 @@ namespace AE::Graphics
 
 } // AE::Graphics
 
-#endif // AE_ENABLE_METAL
+#endif // AE_PLATFORM_MACOS or AE_PLATFORM_IOS
diff --git a/AE/engine/src/graphics/Public/MipmapLevel.h b/AE/engine/src/graphics/Public/MipmapLevel.h
index 49de23e5..6604ad33 100644
--- a/AE/engine/src/graphics/Public/MipmapLevel.h
+++ b/AE/engine/src/graphics/Public/MipmapLevel.h
@@ -22,7 +22,7 @@ namespace AE::Graphics
     public:
         constexpr MipmapLevel ()                                    __NE___ {}
 
-        template <typename T, typename = EnableIf<IsUnsignedInteger<T>> >
+        template <typename T, ENABLEIF( IsUnsignedInteger<T> )>
         explicit constexpr MipmapLevel (T value)                    __NE___ : _value( CheckCast<ushort>(value)) {}
 
         ND_ constexpr uint  Get ()                                  C_NE___ { return _value; }
diff --git a/AE/engine/src/graphics/Public/MultiSamples.h b/AE/engine/src/graphics/Public/MultiSamples.h
index 5de38ac7..03bc5d9d 100644
--- a/AE/engine/src/graphics/Public/MultiSamples.h
+++ b/AE/engine/src/graphics/Public/MultiSamples.h
@@ -24,7 +24,7 @@ namespace AE::Graphics
 
         explicit constexpr MultiSamples (PowerOfTwo pot)            __NE___ : _value{ubyte(pot)} {}
 
-        template <typename T, typename = EnableIf<IsUnsignedInteger<T>> >
+        template <typename T, ENABLEIF( IsUnsignedInteger<T> )>
         explicit MultiSamples (T samples)                           __NE___ : _value{ CheckCast<ubyte>(IntLog2( samples ))}
         {
             ASSERT( IsPowerOfTwo( samples ));
diff --git a/AE/engine/src/graphics/Public/NativeWindow.h b/AE/engine/src/graphics/Public/NativeWindow.h
index a5774dd5..977129f8 100644
--- a/AE/engine/src/graphics/Public/NativeWindow.h
+++ b/AE/engine/src/graphics/Public/NativeWindow.h
@@ -18,19 +18,34 @@ namespace AE::Graphics
             void*           hInstance       = null;     // HINSTANCE
             void*           hWnd            = null;     // HWND
 
+        ND_ explicit operator bool ()       C_NE___ { return hInstance != null and hWnd != null; }
+
+
         #elif defined(AE_PLATFORM_ANDROID)
             void*           nativeWindow    = null;     // ANativeWindow
 
+        ND_ explicit operator bool ()       C_NE___ { return nativeWindow != null; }
+
+
         #elif defined(AE_PLATFORM_LINUX)
             void*           x11Window       = null;     // X11 Window
             void*           x11Display      = null;     // X11 Display*
 
+        ND_ explicit operator bool ()       C_NE___ { return x11Window != null and x11Display != null; }
+
+
         #elif defined(AE_PLATFORM_APPLE)
+            MetalNSViewRC   nsView;                     // NSView*
             MetalCALayerRC  metalLayer;                 // CAMetalLayer*
 
+        ND_ explicit operator bool ()       C_NE___ { return bool{nsView} and bool{metalLayer}; }
+
+
         #else
         #   error Unsupported platform!
         #endif
+
+        NativeWindow () __NE___ {}
     };
 
 
diff --git a/AE/engine/src/graphics/Public/PipelineDesc.h b/AE/engine/src/graphics/Public/PipelineDesc.h
index 871743f8..7744af35 100644
--- a/AE/engine/src/graphics/Public/PipelineDesc.h
+++ b/AE/engine/src/graphics/Public/PipelineDesc.h
@@ -14,24 +14,34 @@ namespace AE::Graphics
     //
     // Pipeline Options
     //
-    enum class EPipelineOpt : ubyte
+    enum class EPipelineOpt : ushort
     {
-        Optimize                    = 1 << 0,
+        Optimize                        = 1 << 0,
 
         // compute only
-        CS_DispatchBase             = 1 << 1,       // Vulkan only
+        CS_DispatchBase                 = 1 << 1,       // Vulkan only
 
         // ray tracing only
-        RT_NoNullAnyHitShaders      = 1 << 2,
-        RT_NoNullClosestHitShaders  = 1 << 3,
-        RT_NoNullMissShaders        = 1 << 4,
-        RT_NoNullIntersectionShaders= 1 << 5,
-        RT_SkipTriangles            = 1 << 6,
-        RT_SkipAABBs                = 1 << 7,
+        RT_NoNullAnyHitShaders          = 1 << 2,
+        RT_NoNullClosestHitShaders      = 1 << 3,
+        RT_NoNullMissShaders            = 1 << 4,
+        RT_NoNullIntersectionShaders    = 1 << 5,
+        RT_SkipTriangles                = 1 << 6,
+        RT_SkipAABBs                    = 1 << 7,
+        //RT_AllowMotion
+        //RT_OpacityMicromap
+        //RT_DisplacementMicromap
+
+        // cache
+        DontCompile                     = 1 << 8,       // pipeline creation will fail if it is not exists in cache
+
+        // debug / profile
+        CaptureStatistics               = 1 << 9,
+        CaptureInternalRepresentation   = 1 << 10,
 
         _Last,
-        All                         = ((_Last - 1) << 1) - 1,
-        Unknown                     = 0,
+        All                             = ((_Last - 1) << 1) - 1,
+        Unknown                         = 0,
     };
     AE_BIT_OPERATORS( EPipelineOpt );
 
@@ -156,7 +166,7 @@ namespace AE::Graphics
         struct VertexInput
         {
             EVertexType     type            = Default;
-            Bytes16u        offset;
+            Byte16u         offset;
             ubyte           index           = UMax;     // attrib index in shader
             ubyte           bufferBinding   = UMax;     // index in 'vertexBuffers'
         };
@@ -167,11 +177,11 @@ namespace AE::Graphics
             ShaderStructName::Optimized_t   typeName;
             EVertexInputRate                rate        = Default;
             ubyte                           index       = UMax;         // for 'ctx.BindVertexBuffer()'
-            Bytes16u                        stride;
+            Byte16u                         stride;
             uint                            divisor     = 0;
         };
-        STATIC_ASSERT( sizeof(VertexInput) == 6 );
-        STATIC_ASSERT( sizeof(VertexBuffer) == 16 );
+        StaticAssert( sizeof(VertexInput) == 6 );
+        StaticAssert( sizeof(VertexBuffer) == 16 );
 
     // variables
         Ptr<const RenderState>              renderStatePtr;
@@ -215,8 +225,8 @@ namespace AE::Graphics
     struct RayTracingPipelineDesc : BasePipelineDesc
     {
         uint        maxRecursionDepth           = 1;
-        Bytes32u    maxPipelineRayPayloadSize;
-        Bytes32u    maxPipelineRayHitAttributeSize;
+        Byte32u     maxPipelineRayPayloadSize;
+        Byte32u     maxPipelineRayHitAttributeSize;
     };
 
 
diff --git a/AE/engine/src/graphics/Public/RayTracingDesc.h b/AE/engine/src/graphics/Public/RayTracingDesc.h
index 14181871..fe06d43e 100644
--- a/AE/engine/src/graphics/Public/RayTracingDesc.h
+++ b/AE/engine/src/graphics/Public/RayTracingDesc.h
@@ -50,7 +50,7 @@ namespace AE::Graphics
             BufferID        vertexData;         // requires EBufferUsage::ASBuild_ReadOnly, content: 'vertexFormat',    access: EResourceState::BuildRTAS_Read
             BufferID        indexData;          // requires EBufferUsage::ASBuild_ReadOnly, content: 'indexType',       access: EResourceState::BuildRTAS_Read
             BufferID        transformData;      // requires EBufferUsage::ASBuild_ReadOnly, content: RTMatrixStorage,   access: EResourceState::BuildRTAS_Read
-            Bytes32u        vertexStride;
+            Byte32u         vertexStride;
             Bytes           vertexDataOffset;
             Bytes           indexDataOffset;
             Bytes           transformDataOffset;
@@ -165,7 +165,7 @@ namespace AE::Graphics
                 Instance ()                                             __NE___;
                 Instance&  SetIdentity ()                               __NE___ { transform         = RTMatrixStorage::Identity();  return *this; }
                 Instance&  SetTransform (const RTMatrixStorage &value)  __NE___ { transform         = value;        return *this; }
-                Instance&  SetTransform (const float3x4 &value)         __NE___ { transform         = value;        return *this; }
+                Instance&  SetTransform (const float4x3 &value)         __NE___ { transform         = value;        return *this; }
                 Instance&  SetMask (uint value)                         __NE___ { mask              = value;        return *this; }
                 Instance&  SetInstanceOffset (uint value)               __NE___ { instanceSBTOffset = value;        return *this; }
                 Instance&  SetFlags (ERTInstanceOpt value)              __NE___;
@@ -174,7 +174,7 @@ namespace AE::Graphics
         #else
         #   error not implemented
         #endif
-        STATIC_ASSERT( sizeof(Instance) == 64 );
+        StaticAssert( sizeof(Instance) == 64 );
 
         // TODO: MTLAccelerationStructureUserIDInstanceDescriptor, MTLAccelerationStructureMotionInstanceDescriptor
 
diff --git a/AE/engine/src/graphics/Public/RemoteGraphicsTypes.h b/AE/engine/src/graphics/Public/RemoteGraphicsTypes.h
index 62c7efc6..2198831f 100644
--- a/AE/engine/src/graphics/Public/RemoteGraphicsTypes.h
+++ b/AE/engine/src/graphics/Public/RemoteGraphicsTypes.h
@@ -2,62 +2,101 @@
 
 #pragma once
 
-#ifdef AE_ENABLE_REMOTE_GRAPHICS
-# include "graphics/Public/IDs.h"
-# include "graphics/Public/Queue.h"
+#include "graphics/Public/IDs.h"
+#include "graphics/Public/Queue.h"
 
 namespace AE::Graphics
 {
 
-    using R_GraphicsPipelineID      = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  1 >;
-    using R_MeshPipelineID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  2 >;
-    using R_ComputePipelineID       = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  3 >;
-    using R_RayTracingPipelineID    = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  4 >;
-    using R_TilePipelineID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  5 >;
-    using R_PipelineCacheID         = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  6 >;
-    using R_PipelinePackID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  7 >;
-    using R_DescriptorSetID         = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  8 >;
-    using R_DescriptorSetLayoutID   = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  9 >;
-
-    using R_BufferID                = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 10 >;
-    using R_ImageID                 = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 11 >;
-    using R_BufferViewID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 12 >;
-    using R_ImageViewID             = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 13 >;
-    using R_RTGeometryID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 14 >;       // bottom-level AS
-    using R_RTSceneID               = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 15 >;       // top-level AS
-    using R_RTShaderBindingID       = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 16 >;       // shader binding table
+    using RmGraphicsPipelineID      = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  1 >;
+    using RmMeshPipelineID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  2 >;
+    using RmComputePipelineID       = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  3 >;
+    using RmRayTracingPipelineID    = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  4 >;
+    using RmTilePipelineID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  5 >;
+    using RmPipelineCacheID         = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  6 >;
+    using RmPipelinePackID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  7 >;
+    using RmDescriptorSetID         = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  8 >;
+    using RmDescriptorSetLayoutID   = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start +  9 >;
+
+    using RmBufferID                = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 10 >;
+    using RmImageID                 = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 11 >;
+    using RmBufferViewID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 12 >;
+    using RmImageViewID             = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 13 >;
+    using RmRTGeometryID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 14 >;       // bottom-level AS
+    using RmRTSceneID               = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 15 >;       // top-level AS
+    using RmRTShaderBindingID       = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 16 >;       // shader binding table
+    using RmMemoryID                = HandleTmpl< 32, 32, Graphics::_hidden_::RemoteIDs_Start + 17 >;
 
     // for internal usage
-    using R_SamplerID               = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 17 >;
-    using R_PipelineLayoutID        = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 18 >;
-    using R_RenderPassID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 19 >;
-    using R_MemoryID                = HandleTmpl< 32, 32, Graphics::_hidden_::RemoteIDs_Start + 20 >;
+    //using RmSamplerID             = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 18 >;
+    //using RmPipelineLayoutID      = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 19 >;
+    //using RmRenderPassID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 20 >;
+
+    using RmVideoSessionID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 40 >;
+    using RmVideoBufferID           = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 41 >;
+    using RmVideoImageID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 42 >;
+
 
-    //using R_MaterialID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 20 >;
-    using R_ImageInAtlasID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 30 >;
 
-    using R_VideoSessionID          = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 40 >;
-    using R_VideoBufferID           = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 41 >;
-    using R_VideoImageID            = HandleTmpl< 16, 16, Graphics::_hidden_::RemoteIDs_Start + 42 >;
 
 
     struct RemoteMemoryObjInfo
-    {};
+    {
+        void*   mappedPtr       = 0;
+    };
 
 
     struct RemoteSemaphore
     {
-        ulong   semaphoreId;
+        ulong   semaphoreId     = 0;
     };
 
     struct RemoteCmdBatchDependency
     {
-        ulong   semaphoreId;
+        ulong   semaphoreId     = 0;
 
-        ND_ explicit operator bool ()   C_NE___;
+        ND_ explicit operator bool ()   C_NE___ { return false; }
     };
 
-
 } // AE::Graphics
+//-----------------------------------------------------------------------------
+
+
+namespace AE::RemoteGraphics
+{
+    using namespace AE::Graphics;
+
+/*
+=================================================
+    IDCast
+=================================================
+*/
+    ND_ inline RmBufferID           IDCast (BufferID            id)     { return BitCast<RmBufferID>(id); }
+    ND_ inline BufferID             IDCast (RmBufferID          id)     { return BitCast<BufferID>(id); }
+
+    ND_ inline RmImageID            IDCast (ImageID             id)     { return BitCast<RmImageID>(id); }
+    ND_ inline ImageID              IDCast (RmImageID           id)     { return BitCast<ImageID>(id); }
+
+    ND_ inline RmBufferViewID       IDCast (BufferViewID        id)     { return BitCast<RmBufferViewID>(id); }
+    ND_ inline BufferViewID         IDCast (RmBufferViewID      id)     { return BitCast<BufferViewID>(id); }
+
+    ND_ inline RmImageViewID        IDCast (ImageViewID         id)     { return BitCast<RmImageViewID>(id); }
+    ND_ inline ImageViewID          IDCast (RmImageViewID       id)     { return BitCast<ImageViewID>(id); }
+
+    ND_ inline RmRTGeometryID       IDCast (RTGeometryID        id)     { return BitCast<RmRTGeometryID>(id); }
+    ND_ inline RTGeometryID         IDCast (RmRTGeometryID      id)     { return BitCast<RTGeometryID>(id); }
+
+    ND_ inline RmRTSceneID          IDCast (RTSceneID           id)     { return BitCast<RmRTSceneID>(id); }
+    ND_ inline RTSceneID            IDCast (RmRTSceneID         id)     { return BitCast<RTSceneID>(id); }
+
+    ND_ inline RmRTShaderBindingID  IDCast (RTShaderBindingID   id)     { return BitCast<RmRTShaderBindingID>(id); }
+    ND_ inline RTShaderBindingID    IDCast (RmRTShaderBindingID id)     { return BitCast<RTShaderBindingID>(id); }
+
+    ND_ inline RmMemoryID           IDCast (MemoryID            id)     { return BitCast<RmMemoryID>(id); }
+    ND_ inline MemoryID             IDCast (RmMemoryID          id)     { return BitCast<MemoryID>(id); }
+
+    ND_ inline RmPipelineCacheID    IDCast (PipelineCacheID     id)     { return BitCast<RmPipelineCacheID>(id); }
+    ND_ inline PipelineCacheID      IDCast (RmPipelineCacheID   id)     { return BitCast<PipelineCacheID>(id); }
+
 
-#endif // AE_ENABLE_REMOTE_GRAPHICS
+} // AE::RemoteGraphics
diff --git a/AE/engine/src/graphics/Public/RenderState.h b/AE/engine/src/graphics/Public/RenderState.h
index 9cbf6afd..c11c70f4 100644
--- a/AE/engine/src/graphics/Public/RenderState.h
+++ b/AE/engine/src/graphics/Public/RenderState.h
@@ -70,7 +70,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const ColorBuffer &rhs)    C_NE___;
             ND_ HashVal CalcHash ()                             C_NE___;
         };
-        STATIC_ASSERT( sizeof(ColorBuffer) == 8 );
+        StaticAssert( sizeof(ColorBuffer) == 8 );
 
 
         //
@@ -92,7 +92,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const ColorBuffersState &rhs)  C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(ColorBuffersState) == 84 );
+        StaticAssert( sizeof(ColorBuffersState) == 84 );
 
 
         //
@@ -115,7 +115,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const StencilFaceState &rhs)   C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(StencilFaceState) == 7 );
+        StaticAssert( sizeof(StencilFaceState) == 7 );
 
 
         //
@@ -134,7 +134,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const StencilBufferState &rhs) C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(StencilBufferState) == 15 );
+        StaticAssert( sizeof(StencilBufferState) == 15 );
 
 
         //
@@ -156,7 +156,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const DepthBufferState &rhs)   C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(DepthBufferState) == 12 );
+        StaticAssert( sizeof(DepthBufferState) == 12 );
 
 
         //
@@ -174,7 +174,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const InputAssemblyState &rhs) C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(InputAssemblyState) == 2 );
+        StaticAssert( sizeof(InputAssemblyState) == 2 );
 
 
         //
@@ -204,7 +204,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const RasterizationState &rhs) C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(RasterizationState) == 20 );
+        StaticAssert( sizeof(RasterizationState) == 20 );
 
 
         //
@@ -214,7 +214,7 @@ namespace AE::Graphics
         {
         // types
             //using SampleMask  = StaticArray< uint, GraphicsConfig::MaxSamples / CT_SizeOfInBits<uint> >;
-            STATIC_ASSERT( GraphicsConfig::MaxSamples / CT_SizeOfInBits<uint> == 1 );
+            StaticAssert( GraphicsConfig::MaxSamples / CT_SizeOfInBits<uint> == 1 );
 
         // variables
             uint                sampleMask          = UMax;
@@ -231,7 +231,7 @@ namespace AE::Graphics
             ND_ bool    operator == (const MultisampleState &rhs)   C_NE___;
             ND_ HashVal CalcHash ()                                 C_NE___;
         };
-        STATIC_ASSERT( sizeof(MultisampleState) == 12 );
+        StaticAssert( sizeof(MultisampleState) == 12 );
 
 
     // variables
@@ -254,7 +254,7 @@ namespace AE::Graphics
             void    Set (const MDepthStencilState &ds, const MDynamicRenderState &rs)   __NE___;
             void    SetDefault (EPipelineDynamicState)                                  __NE___;
     };
-    STATIC_ASSERT( sizeof(RenderState) == 148 );
+    StaticAssert( sizeof(RenderState) == 148 );
 
 
 
diff --git a/AE/engine/src/graphics/Public/ResourceEnums.h b/AE/engine/src/graphics/Public/ResourceEnums.h
index fbf5bed8..5ecf67a0 100644
--- a/AE/engine/src/graphics/Public/ResourceEnums.h
+++ b/AE/engine/src/graphics/Public/ResourceEnums.h
@@ -476,7 +476,7 @@ namespace AE::Graphics
 
         Unknown         = 0xFF,
     };
-    STATIC_ASSERT( uint(EPixelFormat::_Count) < uint(EPixelFormat::SwapchainColor) );
+    StaticAssert( uint(EPixelFormat::_Count) < uint(EPixelFormat::SwapchainColor) );
 
 
     enum class EShaderIO : ubyte
diff --git a/AE/engine/src/graphics/Public/ResourceManager.h b/AE/engine/src/graphics/Public/ResourceManager.h
index e9143e55..8114e487 100644
--- a/AE/engine/src/graphics/Public/ResourceManager.h
+++ b/AE/engine/src/graphics/Public/ResourceManager.h
@@ -14,7 +14,7 @@
 
     if AE_GRAPHICS_STRONG_VALIDATION enabled then 'IResourceManager::Create***()' may return error if resource description is not valid or not supported.
 
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/GraphicsResources.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/GraphicsResources.md)
 */
 
 #pragma once
@@ -240,10 +240,10 @@ namespace AE::Graphics
         using NativeMemObjInfo_t    = MetalMemoryObjInfo;
 
         #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        using NativeBuffer_t        = R_BufferID;
-        using NativeImage_t         = R_ImageID;
-        using NativeBufferView_t    = R_BufferViewID;
-        using NativeImageView_t     = R_ImageViewID;
+        using NativeBuffer_t        = RmBufferID;
+        using NativeImage_t         = RmImageID;
+        using NativeBufferView_t    = RmBufferViewID;
+        using NativeImageView_t     = RmImageViewID;
         using NativeImageDesc_t     = Noninstanceable;
         using NativeBufferDesc_t    = Noninstanceable;
         using NativeImageViewDesc_t = Noninstanceable;
diff --git a/AE/engine/src/graphics/Public/SamplerDesc.h b/AE/engine/src/graphics/Public/SamplerDesc.h
index 486b1de3..233d7a65 100644
--- a/AE/engine/src/graphics/Public/SamplerDesc.h
+++ b/AE/engine/src/graphics/Public/SamplerDesc.h
@@ -76,9 +76,16 @@ namespace AE::Graphics
     enum class ESamplerUsage : ubyte
     {
         Default         = 0,
-        Subsampled,
-        SubsampledCoarseReconstruction,
+
+        // extension: 'fragDensityMap'
+        //Subsampled,
+        //SubsampledCoarseReconstruction,
+
         //ArgumentBuffer,   // for Metal    // TODO
+
+        // extension: 'nonSeamlessCubeMap'
+        NonSeamlessCubeMap,
+
         _Count,
         Unknown         = Default,
     };
diff --git a/AE/engine/src/graphics/Public/ShaderDebugger.h b/AE/engine/src/graphics/Public/ShaderDebugger.h
index 9041e35a..961865da 100644
--- a/AE/engine/src/graphics/Public/ShaderDebugger.h
+++ b/AE/engine/src/graphics/Public/ShaderDebugger.h
@@ -1,5 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
+    Thread-safe:  no
+
     Exceptions only in fatal error:
         - transfer context exceptions (failed to allocate space for command).
         - Array allocation exceptions.
@@ -26,14 +28,14 @@ namespace AE::Graphics
         enum class ELogFormat : uint
         {
             Unknown,
-            Text,           // as plane text with part of source code 
+            Text,           // as plane text with part of source code
             VS_Console,     // compatible with VS output, allow navigation to code by click
             VS,             // click to file path will open shader source file
             VSCode,         // click to file path will open shader source file in specified line
             _Count
         };
 
-        using ParseTraceFn_t = bool (*) (const void* ppln, const void *ptr, Bytes maxSize, ELogFormat, OUT Array<String> &result);
+        using ParseTraceFn_t = bool (*) (const void* ppln, const void* ptr, Bytes maxSize, ELogFormat, OUT Array<String> &result);
 
         struct Result
         {
@@ -167,7 +169,7 @@ namespace AE::Graphics
             return false;
 
         const uint  data[4] = { fragCoord.x, fragCoord.y, 0, 0 };
-        STATIC_ASSERT( _TraceHeaderSize == sizeof(data) );
+        StaticAssert( _TraceHeaderSize == sizeof(data) );
 
         _FillBuffer( result, ctx, Sizeof(data), data );
         return true;
diff --git a/AE/engine/src/graphics/Public/SwapchainDesc.h b/AE/engine/src/graphics/Public/SwapchainDesc.h
index 58211475..ddcc9e8b 100644
--- a/AE/engine/src/graphics/Public/SwapchainDesc.h
+++ b/AE/engine/src/graphics/Public/SwapchainDesc.h
@@ -40,3 +40,10 @@ namespace AE::Graphics
 
 
 } // AE::Graphics
+
+
+namespace AE::Base
+{
+    template <> struct TTriviallySerializable< Graphics::SurfaceFormat >    { static constexpr bool  value = true; };
+    template <> struct TTriviallySerializable< Graphics::SwapchainDesc >    { static constexpr bool  value = true; };
+}
diff --git a/AE/engine/src/graphics/Public/VertexDesc.h b/AE/engine/src/graphics/Public/VertexDesc.h
index e83dfb5a..47fda309 100644
--- a/AE/engine/src/graphics/Public/VertexDesc.h
+++ b/AE/engine/src/graphics/Public/VertexDesc.h
@@ -126,7 +126,7 @@ namespace AE::Graphics
     struct VertexDesc < TVec<T,I,Q> >
     {
         using                           type    = TVec<T,I,Q>;
-        static constexpr EVertexType    value   = EVertexType( 
+        static constexpr EVertexType    value   = EVertexType(
                                                     (VertexDesc< T >::value & EVertexType::_TypeMask) |
                                                     EVertexType((I-1) << uint(EVertexType::_VecOffset)) );
     };
diff --git a/AE/engine/src/graphics/RenderGraph/RGCommandBatch.cpp b/AE/engine/src/graphics/RenderGraph/RGCommandBatch.cpp
index f91e6815..9b7041a7 100644
--- a/AE/engine/src/graphics/RenderGraph/RGCommandBatch.cpp
+++ b/AE/engine/src/graphics/RenderGraph/RGCommandBatch.cpp
@@ -94,24 +94,24 @@ namespace AE::RG::_hidden_
 */
     RGCommandBatchPtr::RenderTaskBuilder&&  RGCommandBatchPtr::RenderTaskBuilder::UseResource (ImageViewID id, EResourceState initial, EResourceState final) rvNE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         auto*   view     = res_mngr.GetResource( id );
         CHECK( view != null );
 
         if_likely( view != null )
-            return RVRef(*this).UseResource( view->Image(), initial, final );
+            return RVRef(*this).UseResource( view->ImageId(), initial, final );
 
         return RVRef(*this);
     }
 
     RGCommandBatchPtr::RenderTaskBuilder&&  RGCommandBatchPtr::RenderTaskBuilder::UseResource (BufferViewID id, EResourceState initial, EResourceState final) rvNE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         auto*   view     = res_mngr.GetResource( id );
         CHECK( view != null );
 
         if_likely( view != null )
-            return RVRef(*this).UseResource( view->Buffer(), initial, final );
+            return RVRef(*this).UseResource( view->BufferId(), initial, final );
 
         return RVRef(*this);
     }
@@ -133,7 +133,7 @@ namespace AE::RG::_hidden_
 
             for (const auto& [id, state] : rg_batch._batchStates)
             {
-                rs.map.emplace( id, InTaskState{ state.current, _last ? state.final : state.current });
+                rs.map.emplace( id, InTaskState{ state.current, _last ? state.final : state.current });  // throw
             }
         }
 
@@ -170,7 +170,7 @@ namespace AE::RG::_hidden_
     constructor
 =================================================
 */
-    RGCommandBatchPtr::RGBatchData::RGBatchData (RGBatchData && other) __NE___ :
+    RGCommandBatchPtr::RGBatchData::RGBatchData (RGBatchData &&other) __NE___ :
         _batchStates{ RVRef(other._batchStates) },
         _perTask{ RVRef(other._perTask) },
         _globalStates{ other._globalStates },
@@ -188,7 +188,7 @@ namespace AE::RG::_hidden_
     void  RGCommandBatchPtr::RGBatchData::SetRenderPassInitialStates (uint taskIdx, INOUT RenderPassDesc &desc) __Th___
     {
         constexpr auto  rs_mask     = EResourceState::Invalidate;   // keep only 'Invalidate' flag
-        auto&           res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&           res_mngr    = GraphicsScheduler().GetResourceManager();
         constexpr auto  new_state   = EResourceState::Unknown;      // disable transitions in render pass
 
         DRC_EXLOCK( _perTask[taskIdx].drCheck );
@@ -198,7 +198,7 @@ namespace AE::RG::_hidden_
             auto&   view = res_mngr.GetResourcesOrThrow( att.imageView );
 
             EResourceState  old_state;
-            if_likely( _ResourceState( taskIdx, ResourceKey{view.Image()}, new_state, OUT old_state ))
+            if_likely( _ResourceState( taskIdx, ResourceKey{view.ImageId()}, new_state, OUT old_state ))
             {
                 att.initial                 = old_state | (att.initial & rs_mask);
                 att.final                   = new_state;
@@ -248,7 +248,7 @@ namespace AE::RG::_hidden_
     _ResourceState
 =================================================
 */
-    bool  RGCommandBatchPtr::RGBatchData::_ResourceState (uint taskIdx, ResourceKey key, EResourceState newState, OUT EResourceState &oldState) __Th___
+    bool  RGCommandBatchPtr::RGBatchData::_ResourceState (uint taskIdx, ResourceKey key, EResourceState newState, OUT EResourceState &oldState) __NE___
     {
         auto&   rs = _perTask[ taskIdx ];
         DRC_EXLOCK( rs.drCheck );
@@ -265,7 +265,7 @@ namespace AE::RG::_hidden_
             auto [def_state, is_undef]  = _globalStates.GetDefaultState( key );
             EResourceState  current     = def_state | (is_undef and key.IsImage() ? EResourceState::Invalidate : Default);
 
-            it = rs.map.emplace( key, InTaskState{ current, def_state }).first;
+            it = rs.map.emplace( key, InTaskState{ current, def_state }).first;  // throw
         }
 
         oldState = it->second.current;
@@ -284,7 +284,7 @@ namespace AE::RG::_hidden_
     _CheckResourceState
 =================================================
 */
-    bool  RGCommandBatchPtr::RGBatchData::_CheckResourceState (uint taskIdx, ResourceKey key, const EResourceState state) C_Th___
+    bool  RGCommandBatchPtr::RGBatchData::_CheckResourceState (uint taskIdx, ResourceKey key, const EResourceState state) C_NE___
     {
         constexpr auto  mask1   = EResourceState(_EResState::AccessMask);
         constexpr auto  mask2   = EResourceState(~_EResState::AccessMask);
diff --git a/AE/engine/src/graphics/RenderGraph/RGCommandBatch.h b/AE/engine/src/graphics/RenderGraph/RGCommandBatch.h
index c1555c43..cc5ffd14 100644
--- a/AE/engine/src/graphics/RenderGraph/RGCommandBatch.h
+++ b/AE/engine/src/graphics/RenderGraph/RGCommandBatch.h
@@ -35,7 +35,7 @@ namespace AE::RG::_hidden_
 
         RGCommandBatchPtr&  operator = (std::nullptr_t)                 __NE___ { _cmdBatch = null;                 return *this; }
         RGCommandBatchPtr&  operator = (const RGCommandBatchPtr &rhs)   __NE___ { _cmdBatch = rhs._cmdBatch;        return *this; }
-        RGCommandBatchPtr&  operator = (RGCommandBatchPtr && rhs)       __NE___ { _cmdBatch = RVRef(rhs._cmdBatch); return *this; }
+        RGCommandBatchPtr&  operator = (RGCommandBatchPtr &&rhs)        __NE___ { _cmdBatch = RVRef(rhs._cmdBatch); return *this; }
 
         ND_ bool  operator == (const RGCommandBatchPtr &rhs)            C_NE___ { return _cmdBatch == rhs._cmdBatch; }
 
@@ -105,7 +105,7 @@ namespace AE::RG::_hidden_
             DRC_ONLY( RWDataRaceCheck   drCheck;)
 
             ResStateMap ()                      __NE___ {}
-            ResStateMap (ResStateMap && other)  __NE___ : map{RVRef(other.map)} {}
+            ResStateMap (ResStateMap &&other)   __NE___ : map{RVRef(other.map)} {}
         };
 
         using PerTaskStates_t   = StaticArray< ResStateMap, GraphicsConfig::MaxCmdBufPerBatch >;
@@ -113,7 +113,7 @@ namespace AE::RG::_hidden_
         using TaskArr_t         = FixedArray< AsyncTask, GraphicsConfig::MaxCmdBufPerBatch >;
         using AtomicBits_t      = Atomic< uint >;
 
-        STATIC_ASSERT( CT_SizeOfInBits<AtomicBits_t::value_type> >= GraphicsConfig::MaxCmdBufPerBatch );
+        StaticAssert( CT_SizeOfInBits<AtomicBits_t::value_type> >= GraphicsConfig::MaxCmdBufPerBatch );
 
 
     // variables
@@ -157,6 +157,9 @@ namespace AE::RG::_hidden_
             template <typename ID, typename Ctx>
             void  ResourceState (uint taskIdx, Ctx &ctx, ID id, EResourceState state)           __Th___;
 
+            template <typename ID>
+        ND_ auto  ResetResourceState (uint taskIdx, ID id, EResourceState state)                __NE___ -> EResourceState;
+
             template <typename Ctx>
             void  FinalBarriers (uint taskIdx, Ctx &ctx)                                        C_Th___;
 
@@ -165,8 +168,8 @@ namespace AE::RG::_hidden_
 
 
     private:
-        ND_ bool  _CheckResourceState (uint taskIdx, ResourceKey key, EResourceState state)                             C_Th___;
-        ND_ bool  _ResourceState (uint taskIdx, ResourceKey key, EResourceState newState, OUT EResourceState &oldState) __Th___;
+        ND_ bool  _CheckResourceState (uint taskIdx, ResourceKey key, EResourceState state)                             C_NE___;
+        ND_ bool  _ResourceState (uint taskIdx, ResourceKey key, EResourceState newState, OUT EResourceState &oldState) __NE___;
     };
 
 
@@ -276,6 +279,19 @@ namespace AE::RG::_hidden_
         }
     }
 
+/*
+=================================================
+    ResetResourceState
+=================================================
+*/
+    template <typename ID>
+    auto  RGCommandBatchPtr::RGBatchData::ResetResourceState (uint taskIdx, ID id, EResourceState newState) __NE___ -> EResourceState
+    {
+        EResourceState  old_state = Default;
+        Unused( _ResourceState( taskIdx, ResourceKey{id}, newState, OUT old_state ));
+        return old_state;
+    }
+
 /*
 =================================================
     CheckResourceState
@@ -349,7 +365,7 @@ namespace AE::RG::_hidden_
 =================================================
     ReadbackMemoryBarrier
 =================================================
-*/  
+*/
     inline bool  RGCommandBatchPtr::RGBatchData::HasReadbackMemoryBarrier (uint taskIdx, EResourceState srcState) __NE___
     {
         ASSERT( taskIdx < GraphicsConfig::MaxCmdBufPerBatch );
@@ -395,17 +411,13 @@ namespace AE::RG::_hidden_
     template <typename TaskType, typename ...Ctor>
     RGCommandBatchPtr::RenderTaskBuilder  RGCommandBatchPtr::Task (Tuple<Ctor...>&& ctorArgs, DebugLabel dbg) C_NE___
     {
-        RC<RenderTask>  task;
-
         DBG_GRAPHICS_ONLY(
             if ( dbg.color == DebugLabel::ColorTable::Undefined )
                 dbg.color = AsBatch()->DbgColor();
         )
-        try {
-            task = ctorArgs.Apply([this, dbg] (auto&& ...args)
-                                  { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)..., AsBatchRC(), dbg ); });   // throw
-        }
-        catch(...) {}
+
+        auto    task = ctorArgs.Apply([this, dbg] (auto&& ...args) __NE___
+                                      { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)..., AsBatchRC(), dbg ); });
 
         return RenderTaskBuilder{ *AsBatch(), RVRef(task) };
     }
diff --git a/AE/engine/src/graphics/RenderGraph/RGCommandContext.h b/AE/engine/src/graphics/RenderGraph/RGCommandContext.h
index b828bee4..b187e3b7 100644
--- a/AE/engine/src/graphics/RenderGraph/RGCommandContext.h
+++ b/AE/engine/src/graphics/RenderGraph/RGCommandContext.h
@@ -29,6 +29,9 @@ namespace AE::RG::_hidden_
         ND_ uint                            _ExeIdx ()                                                                           __NE___ { return _ctx._GetBarrierMngr().GetRenderTask().GetExecutionIndex(); } \
         ND_ auto&                           _ResMngr ()                                                                          C_NE___ { return _ctx._GetBarrierMngr().GetResourceManager(); } \
         \
+        ND_ auto  _SetResourceState (ImageID      id, EResourceState state)                                                      __NE___ { return _RGBatch().ResetResourceState( _ExeIdx(), id, state ); } \
+        ND_ auto  _SetResourceState (ImageViewID  id, EResourceState state)                                                      __NE___ { auto& v = _ResMngr().GetResourcesOrThrow( id );  return _RGBatch().ResetResourceState( _ExeIdx(), v.ImageId(),  state ); } \
+        \
     public: \
         void  CommitBarriers ()                                                                                                  __Th_OV { return _ctx.CommitBarriers(); } \
         \
@@ -53,8 +56,8 @@ namespace AE::RG::_hidden_
         \
         void  ResourceState (BufferID     id, EResourceState state)                                                              __Th___ { _RGBatch().ResourceState( _ExeIdx(), _ctx, id, state ); } \
         void  ResourceState (ImageID      id, EResourceState state)                                                              __Th___ { _RGBatch().ResourceState( _ExeIdx(), _ctx, id, state ); } \
-        void  ResourceState (ImageViewID  id, EResourceState state)                                                              __Th___ { auto& v = _ResMngr().GetResourcesOrThrow( id );  _RGBatch().ResourceState( _ExeIdx(), _ctx, v.Image(),  state ); } \
-        void  ResourceState (BufferViewID id, EResourceState state)                                                              __Th___ { auto& v = _ResMngr().GetResourcesOrThrow( id );  _RGBatch().ResourceState( _ExeIdx(), _ctx, v.Buffer(), state ); } \
+        void  ResourceState (ImageViewID  id, EResourceState state)                                                              __Th___ { auto& v = _ResMngr().GetResourcesOrThrow( id );  _RGBatch().ResourceState( _ExeIdx(), _ctx, v.ImageId(),  state ); } \
+        void  ResourceState (BufferViewID id, EResourceState state)                                                              __Th___ { auto& v = _ResMngr().GetResourcesOrThrow( id );  _RGBatch().ResourceState( _ExeIdx(), _ctx, v.BufferId(), state ); } \
         void  ResourceState (RTSceneID    id, EResourceState state)                                                              __Th___ { _RGBatch().ResourceState( _ExeIdx(), _ctx, id, state ); } \
         void  ResourceState (RTGeometryID id, EResourceState state)                                                              __Th___ { _RGBatch().ResourceState( _ExeIdx(), _ctx, id, state ); } \
         \
@@ -80,10 +83,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsTransferContext );
+        StaticAssert( IsBaseOf< ITransferContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext   = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsTransferContext   = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -132,8 +134,8 @@ namespace AE::RG::_hidden_
 
         void  BlitImage (ImageID srcImage, ImageID dstImage, EBlitFilter filter, ArrayView<ImageBlit> regions)  __Th_OV;
 
-        void  GenerateMipmaps (ImageID image)                                                                   __Th_OV;
-        void  GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges)                          __Th_OV;
+        void  GenerateMipmaps (ImageID image, EResourceState state = Default)                                                   __Th_OV;
+        void  GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges, EResourceState state = Default)          __Th_OV;
 
         using ITransferContext::UpdateHostBuffer;
         using ITransferContext::UploadBuffer;
@@ -162,10 +164,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsComputeContext );
+        StaticAssert( IsBaseOf< IComputeContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext   = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsComputeContext    = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -187,7 +188,7 @@ namespace AE::RG::_hidden_
         void  BindPipeline (ComputePipelineID ppln)                                                                         __Th_OV { return _ctx.BindPipeline( ppln ); }
         void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th_OV { return _ctx.BindDescriptorSet( index, ds, dynamicOffsets ); }
 
-        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th_OV { return _ctx.PushConstant( idx, size, values, typeName ); }
+        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th_OV { return _ctx.PushConstant( idx, size, values, typeName ); }
         using IComputeContext::PushConstant;
 
         using IComputeContext::Dispatch;
@@ -209,10 +210,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsDrawContext );
+        StaticAssert( IsBaseOf< IDrawContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext   = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsDrawContext       = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -225,7 +225,7 @@ namespace AE::RG::_hidden_
     // methods
     public:
         explicit DrawContext (const DrawTask &task)                                                                         __Th___ : _ctx{ task } {}
-        explicit DrawContext (BaseCtx && ctx)                                                                               __Th___ : _ctx{ RVRef(ctx) } {}
+        explicit DrawContext (BaseCtx &&ctx)                                                                                __Th___ : _ctx{ RVRef(ctx) } {}
 
         DrawContext ()                                                                                                      = delete;
         DrawContext (const DrawContext &)                                                                                   = delete;
@@ -238,7 +238,7 @@ namespace AE::RG::_hidden_
         void  BindPipeline (TilePipelineID ppln)                                                                            __Th_OV { return _ctx.BindPipeline( ppln ); }
         void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th_OV { return _ctx.BindDescriptorSet( index, ds, dynamicOffsets ); }
 
-        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th_OV { return _ctx.PushConstant( idx, size, values, typeName ); }
+        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th_OV { return _ctx.PushConstant( idx, size, values, typeName ); }
         using IDrawContext::PushConstant;
 
     // dynamic states //
@@ -378,10 +378,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsGraphicsContext );
+        StaticAssert( IsBaseOf< IGraphicsContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext   = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsGraphicsContext   = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using DrawCtx   = DrawContext< typename BaseCtx::DrawCtx >;
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
@@ -432,10 +431,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsRayTracingContext );
+        StaticAssert( IsBaseOf< IRayTracingContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext   = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsRayTracingContext = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -457,7 +455,7 @@ namespace AE::RG::_hidden_
         void  BindPipeline (RayTracingPipelineID ppln)                                                                      __Th_OV { return _ctx.BindPipeline( ppln ); }
         void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th_OV { return _ctx.BindDescriptorSet( index, ds, dynamicOffsets ); }
 
-        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th_OV { return _ctx.PushConstant( idx, size, values, typeName ); }
+        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th_OV { return _ctx.PushConstant( idx, size, values, typeName ); }
         using IRayTracingContext::PushConstant;
 
         void  SetStackSize (Bytes size)                                                                                     __Th_OV { return _ctx.SetStackSize( size ); }
@@ -487,10 +485,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsASBuildContext );
+        StaticAssert( IsBaseOf< IASBuildContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext   = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsASBuildContext    = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -556,10 +553,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsVideoDecodeContext );
+        StaticAssert( IsBaseOf< IVideoDecodeContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext       = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsVideoDecodeContext    = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -592,10 +588,9 @@ namespace AE::RG::_hidden_
     {
     // types
     public:
-        STATIC_ASSERT( BaseCtx::IsVideoEncodeContext );
+        StaticAssert( IsBaseOf< IVideoEncodeContext, BaseCtx >);
 
-        static constexpr bool   IsIndirectContext       = BaseCtx::IsIndirectContext;
-        static constexpr bool   IsVideoEncodeContext    = true;
+        static constexpr bool   IsIndirectContext = BaseCtx::IsIndirectContext;
 
         using CmdBuf_t  = typename BaseCtx::CmdBuf_t;
 
@@ -723,7 +718,7 @@ namespace AE::RG::_hidden_
     template <typename C>
     Promise<BufferMemView>  TransferContext<C>::ReadbackBuffer (INOUT BufferStream &stream) __Th___
     {
-        ResourceState( stream.Buffer(), EResourceState::CopySrc );
+        ResourceState( stream.BufferId(), EResourceState::CopySrc );
         ReadbackMemoryBarrier( EResourceState::CopyDst );
 
         _ctx.CommitBarriers();
@@ -743,7 +738,7 @@ namespace AE::RG::_hidden_
     template <typename C>
     Promise<ImageMemView>  TransferContext<C>::ReadbackImage (INOUT ImageStream &stream) __Th___
     {
-        ResourceState( stream.Image(), EResourceState::CopySrc );
+        ResourceState( stream.ImageId(), EResourceState::CopySrc );
         ReadbackMemoryBarrier( EResourceState::CopyDst );
 
         _ctx.CommitBarriers();
@@ -754,7 +749,7 @@ namespace AE::RG::_hidden_
     void  TransferContext<C>::UploadBuffer (INOUT BufferStream &stream, OUT BufferMemView &memView) __Th___
     {
         UploadMemoryBarrier( EResourceState::CopySrc );
-        ResourceState( stream.Buffer(), EResourceState::CopyDst );
+        ResourceState( stream.BufferId(), EResourceState::CopyDst );
 
         _ctx.CommitBarriers();
         _ctx.UploadBuffer( INOUT stream, OUT memView );
@@ -764,7 +759,7 @@ namespace AE::RG::_hidden_
     void  TransferContext<C>::UploadImage (INOUT ImageStream &stream, OUT ImageMemView &memView) __Th___
     {
         UploadMemoryBarrier( EResourceState::CopySrc );
-        ResourceState( stream.Image(), EResourceState::CopyDst );
+        ResourceState( stream.ImageId(), EResourceState::CopyDst );
 
         _ctx.CommitBarriers();
         _ctx.UploadImage( INOUT stream, OUT memView );
@@ -786,19 +781,25 @@ namespace AE::RG::_hidden_
     }
 
     template <typename C>
-    void  TransferContext<C>::GenerateMipmaps (ImageID image) __Th___
+    void  TransferContext<C>::GenerateMipmaps (ImageID image, EResourceState state) __Th___
     {
-        ResourceState( image, EResourceState::BlitSrc );
+        const EResourceState    prev_state = _SetResourceState( image, EResourceState::BlitSrc );
+        ASSERT( prev_state == state or state == Default );
+        Unused( state );
+
         _ctx.CommitBarriers();
-        _ctx.GenerateMipmaps( image );
+        _ctx.GenerateMipmaps( image, prev_state );
     }
 
     template <typename C>
-    void  TransferContext<C>::GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges) __Th___
+    void  TransferContext<C>::GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges, EResourceState state) __Th___
     {
-        ResourceState( image, EResourceState::BlitSrc );
+        const EResourceState    prev_state = _SetResourceState( image, EResourceState::BlitSrc );
+        ASSERT( prev_state == state or state == Default );
+        Unused( state );
+
         _ctx.CommitBarriers();
-        _ctx.GenerateMipmaps( image, ranges );
+        _ctx.GenerateMipmaps( image, ranges, prev_state );
     }
 
     template <typename C>
diff --git a/AE/engine/src/graphics/RenderGraph/RenderGraph.cpp b/AE/engine/src/graphics/RenderGraph/RenderGraph.cpp
index 840335db..094668d4 100644
--- a/AE/engine/src/graphics/RenderGraph/RenderGraph.cpp
+++ b/AE/engine/src/graphics/RenderGraph/RenderGraph.cpp
@@ -11,9 +11,9 @@ namespace AE::RG::_hidden_
 =================================================
 */
     RenderGraph::RenderGraph () __NE___ :
-        _rts{ RenderTaskScheduler() }
+        _rts{ GraphicsScheduler() }
     {
-        CATCH( _semToBatch.reserve( GraphicsConfig::MaxPendingCmdBatches );)
+        NOTHROW( _semToBatch.reserve( GraphicsConfig::MaxPendingCmdBatches );)
     }
 
 /*
@@ -50,7 +50,6 @@ namespace AE::RG::_hidden_
         _rgDataPool.clear();
         _semToBatch.clear();
         _outSurfaces.clear();
-        _beginFrame = null;
     }
 
 /*
@@ -58,7 +57,7 @@ namespace AE::RG::_hidden_
     _CmdBatch
 =================================================
 */
-    RGCommandBatchPtr  RenderGraph::_CmdBatch (EQueueType queue, DebugLabel dbg) __NE___
+    RGCommandBatchPtr  RenderGraph::_CmdBatch (const EQueueType queue, DebugLabel dbg) __NE___
     {
         DRC_EXLOCK( _drCheck );
         CHECK_ERR( _rgDataPool.size() < _rgDataPool.capacity() );   // overflow
@@ -95,6 +94,8 @@ namespace AE::RG::_hidden_
 /*
 =================================================
     BeginOnSurface
+----
+    always use 'ctx.AddSurfaceTargets()' to start image state tracking
 =================================================
 */
     AsyncTask  RenderGraph::BeginOnSurface (Ptr<App::IOutputSurface> surface, RGCommandBatchPtr batch) __NE___
@@ -111,7 +112,7 @@ namespace AE::RG::_hidden_
 
             batch.AsBatch()->SetSubmissionMode( ESubmitMode::Immediately );
 
-            it->second.acquireImageTask = surface->Begin( batch.AsBatchRC(), batch.AsBatchRC(), {_beginFrame} );
+            it->second.acquireImageTask = surface->Begin( batch.AsBatchRC(), batch.AsBatchRC(), Default );
             it->second.forBatch         = RVRef(batch);
         }
         else
@@ -229,6 +230,8 @@ namespace AE::RG::_hidden_
                 // so content of the resource may be invalidated
 
                 prev_state |= EResourceState::Invalidate;
+
+                AE_LOG_DBG( "source batch is not known, resource content will be invalidated" );
             }
         }
 
@@ -297,7 +300,7 @@ namespace AE::RG::_hidden_
         CHECK( view != null );
 
         if_likely( view != null )
-            return RVRef(*this).UseResource( view->Image(), initial, final );
+            return RVRef(*this).UseResource( view->ImageId(), initial, final );
 
         return RVRef(*this);
     }
@@ -309,7 +312,7 @@ namespace AE::RG::_hidden_
         CHECK( view != null );
 
         if_likely( view != null )
-            return RVRef(*this).UseResource( view->Buffer(), initial, final );
+            return RVRef(*this).UseResource( view->BufferId(), initial, final );
 
         return RVRef(*this);
     }
diff --git a/AE/engine/src/graphics/RenderGraph/RenderGraph.h b/AE/engine/src/graphics/RenderGraph/RenderGraph.h
index cb17749d..5d7ef73f 100644
--- a/AE/engine/src/graphics/RenderGraph/RenderGraph.h
+++ b/AE/engine/src/graphics/RenderGraph/RenderGraph.h
@@ -108,17 +108,14 @@ namespace AE::RG::_hidden_
             ND_ RGCommandBatchPtr   Begin ()                                                                    rvNE___ { return RVRef(_batch); }
         };
 
-        static constexpr auto   DefaultWaitTime = GRenderTaskScheduler::DefaultWaitTime;
-
 
     // variables
     private:
-        GRenderTaskScheduler&       _rts;
+        RenderTaskScheduler&        _rts;
         FrameUID                    _prevFrameId;
         Frames_t                    _frames;
 
         // data for current frame
-        AsyncTask                   _beginFrame;
         SemToBatch_t                _semToBatch;
         RGBatchDataPool_t           _rgDataPool;
         OutputSurfaces_t            _outSurfaces;
@@ -133,18 +130,22 @@ namespace AE::RG::_hidden_
 
 
     // frame scope //
+        ND_ bool        WaitNextFrame (const EThreadArray & threads,
+                                       nanoseconds          timeout)            __NE___ { return _rts.WaitNextFrame( threads, timeout ); }
 
-        template <typename ...Deps>
-        ND_ AsyncTask   BeginFrame (const BeginFrameConfig  &cfg    = Default,
-                                    const Tuple<Deps...>    &deps   = Default)  __Th___;
+        ND_ bool        BeginFrame (const BeginFrameConfig &cfg = Default)      __NE___;
 
         template <typename ...Deps>
-        ND_ AsyncTask   EndFrame (const Tuple<Deps...>  &deps)                  __Th___;
+        ND_ AsyncTask   EndFrame (const Tuple<Deps...>  &deps)                  __NE___;
+
+        // alternative version
+            void        OnBeginFrame (FrameUID prevFrameId)                     __NE___;
+            void        OnEndFrame ()                                           __NE___;
 
         ND_ FrameUID    GetPrevFrameId ()                                       C_NE___ { return _prevFrameId; }
         ND_ FrameUID    GetNextFrameId ()                                       C_NE___ { return _prevFrameId.Next(); }
 
-        ND_ bool        WaitAll (milliseconds timeout = DefaultWaitTime)        __NE___;
+        ND_ bool        WaitAll (milliseconds timeout)                          __NE___;
 
 
     // surface //
@@ -172,20 +173,26 @@ namespace AE::RG::_hidden_
     BeginFrame
 =================================================
 */
-    template <typename ...Deps>
-    AsyncTask  RenderGraph::BeginFrame (const BeginFrameConfig &cfg, const Tuple<Deps...> &deps) __Th___
+    inline bool  RenderGraph::BeginFrame (const BeginFrameConfig &cfg) __NE___
+    {
+        auto    fid = _rts.GetFrameId();
+        bool    res = _rts.BeginFrame( cfg );
+
+        OnBeginFrame( fid );
+        return res;
+    }
+
+    inline void  RenderGraph::OnBeginFrame (const FrameUID prevFrameId) __NE___
     {
         DRC_EXLOCK( _drCheck );
 
-        _prevFrameId = _rts.GetFrameId();
+        _prevFrameId = prevFrameId;
+        ASSERT( prevFrameId.Next() == _rts.GetFrameId() );
 
         for (auto& q : _CurrentFrame().queues) {
             q.submitIdx = 0;
         }
         _ClearCurrentFrame();
-
-        _beginFrame = _rts.BeginFrame( cfg, deps ); // throw
-        return _beginFrame;
     }
 
 /*
@@ -194,7 +201,7 @@ namespace AE::RG::_hidden_
 =================================================
 */
     template <typename ...Deps>
-    AsyncTask  RenderGraph::EndFrame (const Tuple<Deps...> &deps) __Th___
+    AsyncTask  RenderGraph::EndFrame (const Tuple<Deps...> &deps) __NE___
     {
         DRC_EXLOCK( _drCheck );
 
@@ -209,7 +216,7 @@ namespace AE::RG::_hidden_
                 present_tasks.push_back( task );
         }
 
-        AsyncTask   end_frame   = _rts.EndFrame( deps );    // throw
+        AsyncTask   end_frame   = _rts.EndFrame( deps );
         auto&       f           = _CurrentFrame();
 
         for (usize i = 0; i < f.queues.size(); ++i)
@@ -221,10 +228,34 @@ namespace AE::RG::_hidden_
         // start next frame only after present
         _rts.AddNextFrameDeps( present_tasks );
 
-        _beginFrame = null;
-
         return end_frame;
     }
+
+    inline void  RenderGraph::OnEndFrame () __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        // present output surfaces
+        FixedArray< AsyncTask, MaxOutSurfaces >     present_tasks;
+
+        for (auto [surface, info] : _outSurfaces)
+        {
+            ASSERT( info.acquireImageTask );
+
+            if_likely( auto task = surface->End( Default )) // will present after batch submission
+                present_tasks.push_back( task );
+        }
+
+        auto&   f = _CurrentFrame();
+        for (usize i = 0; i < f.queues.size(); ++i)
+        {
+            if ( f.queues[i].submitIdx > 0 )
+                _rts.SkipCmdBatches( EQueueType(i), UMax );
+        }
+
+        // start next frame only after present
+        _rts.AddNextFrameDeps( present_tasks );
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -267,7 +298,7 @@ namespace AE::RG::_hidden_
 =================================================
 */
     template <typename ID0, typename ...IDs>
-    RenderGraph::CmdBatchBuilder &&  RenderGraph::CmdBatchBuilder::UseResources (const ID0 &id0,const IDs& ...ids) rvNE___
+    RenderGraph::CmdBatchBuilder&&  RenderGraph::CmdBatchBuilder::UseResources (const ID0 &id0,const IDs& ...ids) rvNE___
     {
         _UseResource( ResourceKey{id0}, Default, Default );
 
diff --git a/AE/engine/src/graphics/RenderGraph/RenderGraphImpl.h b/AE/engine/src/graphics/RenderGraph/RenderGraphImpl.h
index a26503a5..3b702306 100644
--- a/AE/engine/src/graphics/RenderGraph/RenderGraphImpl.h
+++ b/AE/engine/src/graphics/RenderGraph/RenderGraphImpl.h
@@ -12,7 +12,7 @@
        * commands are not sorted.
      - Supported concurrent and explicit sharing between queue families.
 
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/RenderGraph.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/RenderGraph-ru.md)
 */
 
 #pragma once
diff --git a/AE/engine/src/graphics/RenderGraph/ResStateTracker.cpp b/AE/engine/src/graphics/RenderGraph/ResStateTracker.cpp
index c2bcb341..d172acc0 100644
--- a/AE/engine/src/graphics/RenderGraph/ResStateTracker.cpp
+++ b/AE/engine/src/graphics/RenderGraph/ResStateTracker.cpp
@@ -226,7 +226,7 @@ namespace AE::RG::_hidden_
 */
     IResourceManager&  ResStateTracker::_ResMngr () C_NE___
     {
-        return RenderTaskScheduler().GetResourceManager();
+        return GraphicsScheduler().GetResourceManager();
     }
 
 /*
diff --git a/AE/engine/src/graphics/RenderGraph/ResStateTracker.h b/AE/engine/src/graphics/RenderGraph/ResStateTracker.h
index 82513fd0..71c065b4 100644
--- a/AE/engine/src/graphics/RenderGraph/ResStateTracker.h
+++ b/AE/engine/src/graphics/RenderGraph/ResStateTracker.h
@@ -19,7 +19,7 @@ namespace AE::RG::_hidden_
         using Generation_t  = ImageID::Generation_t;
 
         static constexpr usize  _Size = TypeList_t::ForEach_Max< TypeListUtils::GetTypeSize >();
-        STATIC_ASSERT( _Size == sizeof(Value_t) );
+        StaticAssert( _Size == sizeof(Value_t) );
 
         static constexpr Value_t    _IndexMask  = Math::ToBitMask<Value_t>( CT_SizeOfInBits<Index_t> );
         static constexpr Value_t    _GenMask    = Math::ToBitMask<Value_t>( CT_SizeOfInBits<Generation_t> );
@@ -102,6 +102,7 @@ namespace AE::RG::_hidden_
         struct ResGlobalState
         {
             // TODO: separate default states for graphics & compute queues
+            // TODO: currentReadState, currentWriteState
             EResourceState          defaultState        = Default;  // must be supported in all queues where resource will be used
             EResourceState          currentState        = Default;
             CmdBatchDependency_t    lastBatch;
@@ -126,7 +127,7 @@ namespace AE::RG::_hidden_
             static constexpr uint   MaxChunks   = CT_FloorPOT< MaxValue<Index_t>() / ChunkSize >;
             using IDtoIdxChunk_t                = StaticArray< Atomic<Index_t>, ChunkSize >;
             using IDtoIdxChunkArr_t             = StaticArray< Atomic< IDtoIdxChunk_t *>, MaxChunks >;
-            using GlobalStates_t                = Threading::LfIndexedPool3< ResGlobalState2, Index_t, ChunkSize, MaxChunks, GlobalLinearAllocatorRef >;
+            using GlobalStates_t                = Threading::LfIndexedPool< ResGlobalState2, Index_t, ChunkSize, MaxChunks, GlobalLinearAllocatorRef >;
 
             struct SearchResult
             {
@@ -135,7 +136,7 @@ namespace AE::RG::_hidden_
 
             public:
                 explicit SearchResult (ResGlobalState2* res)        __NE___ : _result{res}              { ASSERT( _result == null or _result->guard.is_locked() ); }
-                SearchResult (SearchResult && other)                __NE___ : _result{other._result}    { other._result = null; }
+                SearchResult (SearchResult &&other)                 __NE___ : _result{other._result}    { other._result = null; }
                 ~SearchResult ()                                    __NE___ { if ( _result != null ) _result->guard.unlock(); }
 
                 ND_ explicit operator bool ()                       C_NE___ { return _result != null; }
@@ -151,7 +152,7 @@ namespace AE::RG::_hidden_
 
             public:
                 explicit CSearchResult (ResGlobalState2 const* res) __NE___ : _result{res}              { ASSERT( _result == null or _result->guard.is_shared_locked() ); }
-                CSearchResult (CSearchResult && other)              __NE___ : _result{other._result}    { other._result = null; }
+                CSearchResult (CSearchResult &&other)               __NE___ : _result{other._result}    { other._result = null; }
                 ~CSearchResult ()                                   __NE___ { if ( _result != null ) _result->guard.unlock_shared(); }
 
                 ND_ explicit operator bool ()                       C_NE___ { return _result != null; }
diff --git a/AE/engine/src/graphics/Scripting/GraphicsBindings.cpp b/AE/engine/src/graphics/Scripting/GraphicsBindings.cpp
index 9865c355..c76030b9 100644
--- a/AE/engine/src/graphics/Scripting/GraphicsBindings.cpp
+++ b/AE/engine/src/graphics/Scripting/GraphicsBindings.cpp
@@ -21,14 +21,23 @@ namespace
     {
         EnumBinder<EImage>  binder{ se };
         binder.Create();
-        binder.AddValue( "1D",          EImage::_1D );
-        binder.AddValue( "2D",          EImage::_2D );
-        binder.AddValue( "3D",          EImage::_3D );
-        binder.AddValue( "1DArray",     EImage::_1DArray );
-        binder.AddValue( "2DArray",     EImage::_2DArray );
-        binder.AddValue( "Cube",        EImage::Cube );
-        binder.AddValue( "CubeArray",   EImage::CubeArray );
-        STATIC_ASSERT( uint(EImage::_Count) == 7 );
+        BEGIN_ENUM_CHECKS();
+        switch ( EImage(0) )
+        {
+            #define BIND( _name_ )  case EImage_ ## _name_ : binder.AddValue( #_name_, EImage_ ## _name_ )
+            BIND( 1D );
+            BIND( 2D );
+            BIND( 3D );
+            BIND( 1DArray );
+            BIND( 2DArray );
+            BIND( Cube );
+            BIND( CubeArray );
+            case EImage::_Count :
+            case EImage::Unknown :
+            default :               break;
+            #undef BIND
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -42,7 +51,7 @@ namespace
         binder.Create();
         binder.AddValue( "UShort",      EIndex::UShort );
         binder.AddValue( "UInt",        EIndex::UInt );
-        STATIC_ASSERT( uint(EIndex::_Count) == 2 );
+        StaticAssert( uint(EIndex::_Count) == 2 );
     }
 
 /*
@@ -75,7 +84,7 @@ namespace
         binder.AddValue( "Load",        EAttachmentLoadOp::Load );
         binder.AddValue( "Clear",       EAttachmentLoadOp::Clear );
         binder.AddValue( "None",        EAttachmentLoadOp::None );
-        STATIC_ASSERT( uint(EAttachmentLoadOp::_Count) == 4 );
+        StaticAssert( uint(EAttachmentLoadOp::_Count) == 4 );
     }
 
 /*
@@ -90,7 +99,7 @@ namespace
         binder.AddValue( "Invalidate",  EAttachmentStoreOp::Invalidate );
         binder.AddValue( "Store",       EAttachmentStoreOp::Store );
         binder.AddValue( "None",        EAttachmentStoreOp::None );
-        STATIC_ASSERT( uint(EAttachmentStoreOp::_Count) == 4 );
+        StaticAssert( uint(EAttachmentStoreOp::_Count) == 4 );
     }
 
 /*
@@ -102,19 +111,28 @@ namespace
     {
         EnumBinder<ECompareOp>  binder{ se };
         binder.Create();
-        binder.AddValue( "Never",       ECompareOp::Never );
-        binder.AddValue( "Less",        ECompareOp::Less );
-        binder.AddValue( "Equal",       ECompareOp::Equal );
-        binder.AddValue( "LEqual",      ECompareOp::LEqual );
-        binder.AddValue( "Greater",     ECompareOp::Greater );
-        binder.AddValue( "NotEqual",    ECompareOp::NotEqual );
-        binder.AddValue( "GEqual",      ECompareOp::GEqual );
-        binder.AddValue( "Always",      ECompareOp::Always );
-        STATIC_ASSERT( uint(ECompareOp::_Count) == 8 );
-
-        // alias
-        binder.AddValue( "LessOrEqual",     ECompareOp::LEqual );
-        binder.AddValue( "GreaterOrEqual",  ECompareOp::GEqual );
+        BEGIN_ENUM_CHECKS();
+        switch ( ECompareOp(0) )
+        {
+            #define BIND( _name_ )  case ECompareOp::_name_ : binder.AddValue( #_name_, ECompareOp::_name_ )
+            BIND( Never );
+            BIND( Less );
+            BIND( Equal );
+            BIND( LEqual );
+            BIND( Greater );
+            BIND( NotEqual );
+            BIND( GEqual );
+            BIND( Always );
+            case ECompareOp::_Count :
+            case ECompareOp::Unknown :
+            default :
+                // alias
+                binder.AddValue( "LessOrEqual",     ECompareOp::LEqual );
+                binder.AddValue( "GreaterOrEqual",  ECompareOp::GEqual );
+                break;
+            #undef BIND
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -126,26 +144,35 @@ namespace
     {
         EnumBinder<EBlendFactor>    binder{ se };
         binder.Create();
-        binder.AddValue( "Zero",                EBlendFactor::Zero );
-        binder.AddValue( "One",                 EBlendFactor::One );
-        binder.AddValue( "SrcColor",            EBlendFactor::SrcColor );
-        binder.AddValue( "OneMinusSrcColor",    EBlendFactor::OneMinusSrcColor );
-        binder.AddValue( "DstColor",            EBlendFactor::DstColor );
-        binder.AddValue( "OneMinusDstColor",    EBlendFactor::OneMinusDstColor );
-        binder.AddValue( "SrcAlpha",            EBlendFactor::SrcAlpha );
-        binder.AddValue( "OneMinusSrcAlpha",    EBlendFactor::OneMinusSrcAlpha );
-        binder.AddValue( "DstAlpha",            EBlendFactor::DstAlpha );
-        binder.AddValue( "OneMinusDstAlpha",    EBlendFactor::OneMinusDstAlpha );
-        binder.AddValue( "ConstColor",          EBlendFactor::ConstColor );
-        binder.AddValue( "OneMinusConstColor",  EBlendFactor::OneMinusConstColor );
-        binder.AddValue( "ConstAlpha",          EBlendFactor::ConstAlpha );
-        binder.AddValue( "OneMinusConstAlpha",  EBlendFactor::OneMinusConstAlpha );
-        binder.AddValue( "SrcAlphaSaturate",    EBlendFactor::SrcAlphaSaturate );
-        binder.AddValue( "Src1Color",           EBlendFactor::Src1Color );
-        binder.AddValue( "OneMinusSrc1Color",   EBlendFactor::OneMinusSrc1Color );
-        binder.AddValue( "Src1Alpha",           EBlendFactor::Src1Alpha );
-        binder.AddValue( "OneMinusSrc1Alpha",   EBlendFactor::OneMinusSrc1Alpha );
-        STATIC_ASSERT( uint(EBlendFactor::_Count) == 19 );
+        BEGIN_ENUM_CHECKS();
+        switch ( EBlendFactor(0) )
+        {
+            #define BIND( _name_ )  case EBlendFactor::_name_ : binder.AddValue( #_name_, EBlendFactor::_name_ )
+            BIND( Zero );
+            BIND( One );
+            BIND( SrcColor );
+            BIND( OneMinusSrcColor );
+            BIND( DstColor );
+            BIND( OneMinusDstColor );
+            BIND( SrcAlpha );
+            BIND( OneMinusSrcAlpha );
+            BIND( DstAlpha );
+            BIND( OneMinusDstAlpha );
+            BIND( ConstColor );
+            BIND( OneMinusConstColor );
+            BIND( ConstAlpha );
+            BIND( OneMinusConstAlpha );
+            BIND( SrcAlphaSaturate );
+            BIND( Src1Color );
+            BIND( OneMinusSrc1Color );
+            BIND( Src1Alpha );
+            BIND( OneMinusSrc1Alpha );
+            case EBlendFactor::_Count :
+            case EBlendFactor::Unknown :
+            default : break;
+            #undef BIND
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -162,7 +189,7 @@ namespace
         binder.AddValue( "RevSub",  EBlendOp::RevSub );
         binder.AddValue( "Min",     EBlendOp::Min );
         binder.AddValue( "Max",     EBlendOp::Max );
-        STATIC_ASSERT( uint(EBlendOp::_Count) == 5 );
+        StaticAssert( uint(EBlendOp::_Count) == 5 );
     }
 
 /*
@@ -174,24 +201,33 @@ namespace
     {
         EnumBinder<ELogicOp>    binder{ se };
         binder.Create();
-        binder.AddValue( "None",        ELogicOp::None );
-        binder.AddValue( "Clear",       ELogicOp::Clear );
-        binder.AddValue( "Set",         ELogicOp::Set );
-        binder.AddValue( "Copy",        ELogicOp::Copy );
-        binder.AddValue( "CopyInverted",ELogicOp::CopyInverted );
-        binder.AddValue( "NoOp",        ELogicOp::NoOp );
-        binder.AddValue( "Invert",      ELogicOp::Invert );
-        binder.AddValue( "And",         ELogicOp::And );
-        binder.AddValue( "NotAnd",      ELogicOp::NotAnd );
-        binder.AddValue( "Or",          ELogicOp::Or );
-        binder.AddValue( "NotOr",       ELogicOp::NotOr );
-        binder.AddValue( "Xor",         ELogicOp::Xor );
-        binder.AddValue( "Equiv",       ELogicOp::Equiv );
-        binder.AddValue( "AndReverse",  ELogicOp::AndReverse );
-        binder.AddValue( "AndInverted", ELogicOp::AndInverted );
-        binder.AddValue( "OrReverse",   ELogicOp::OrReverse );
-        binder.AddValue( "OrInverted",  ELogicOp::OrInverted );
-        STATIC_ASSERT( uint(ELogicOp::_Count) == 17 );
+        BEGIN_ENUM_CHECKS();
+        switch ( ELogicOp(0) )
+        {
+            #define BIND( _name_ )  case ELogicOp::_name_ : binder.AddValue( #_name_, ELogicOp::_name_ )
+            BIND( None );
+            BIND( Clear );
+            BIND( Set );
+            BIND( Copy );
+            BIND( CopyInverted );
+            BIND( NoOp );
+            BIND( Invert );
+            BIND( And );
+            BIND( NotAnd );
+            BIND( Or );
+            BIND( NotOr );
+            BIND( Xor );
+            BIND( Equiv );
+            BIND( AndReverse );
+            BIND( AndInverted );
+            BIND( OrReverse );
+            BIND( OrInverted );
+            case ELogicOp::_Count :
+            case ELogicOp::Unknown :
+            default : break;
+            #undef BIND
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -211,7 +247,7 @@ namespace
         binder.AddValue( "Decr",        EStencilOp::Decr );
         binder.AddValue( "DecrWrap",    EStencilOp::DecrWrap );
         binder.AddValue( "Invert",      EStencilOp::Invert );
-        STATIC_ASSERT( uint(EStencilOp::_Count) == 8 );
+        StaticAssert( uint(EStencilOp::_Count) == 8 );
     }
 
 /*
@@ -226,7 +262,7 @@ namespace
         binder.AddValue( "Point",   EPolygonMode::Point );
         binder.AddValue( "Line",    EPolygonMode::Line );
         binder.AddValue( "Fill",    EPolygonMode::Fill );
-        STATIC_ASSERT( uint(EPolygonMode::_Count) == 3 );
+        StaticAssert( uint(EPolygonMode::_Count) == 3 );
     }
 
 /*
@@ -249,7 +285,7 @@ namespace
         binder.AddValue( "TriangleListAdjacency",   EPrimitive::TriangleListAdjacency );
         binder.AddValue( "TriangleStripAdjacency",  EPrimitive::TriangleStripAdjacency );
         binder.AddValue( "Patch",                   EPrimitive::Patch );
-        STATIC_ASSERT( uint(EPrimitive::_Count) == 11 );
+        StaticAssert( uint(EPrimitive::_Count) == 11 );
     }
 
 /*
@@ -265,7 +301,7 @@ namespace
         binder.AddValue( "Front",       ECullMode::Front );
         binder.AddValue( "Back",        ECullMode::Back );
         binder.AddValue( "FontAndBack", ECullMode::FontAndBack );
-        STATIC_ASSERT( uint(ECullMode::_Last) == 3 );
+        StaticAssert( uint(ECullMode::_Last) == 3 );
     }
 
 /*
@@ -277,16 +313,25 @@ namespace
     {
         EnumBinder<EPipelineDynamicState>   binder{ se };
         binder.Create();
-        binder.AddValue( "None",                EPipelineDynamicState::Unknown );
-        binder.AddValue( "StencilCompareMask",  EPipelineDynamicState::StencilCompareMask );
-        binder.AddValue( "StencilWriteMask",    EPipelineDynamicState::StencilWriteMask );
-        binder.AddValue( "StencilReference",    EPipelineDynamicState::StencilReference );
-        binder.AddValue( "DepthBias",           EPipelineDynamicState::DepthBias );
-        binder.AddValue( "BlendConstants",      EPipelineDynamicState::BlendConstants );
-        //binder.AddValue( "DepthBounds",       EPipelineDynamicState::DepthBounds );
-        binder.AddValue( "RTStackSize",         EPipelineDynamicState::RTStackSize );
-        binder.AddValue( "FragmentShadingRate", EPipelineDynamicState::FragmentShadingRate );
-        STATIC_ASSERT( uint(EPipelineDynamicState::_Last) == 129 );
+        BEGIN_ENUM_CHECKS();
+        switch ( EPipelineDynamicState::Unknown )
+        {
+            #define BIND( _name_ )  case EPipelineDynamicState::_name_ : binder.AddValue( #_name_, EPipelineDynamicState::_name_ )
+            case EPipelineDynamicState::Unknown :   binder.AddValue( "None", EPipelineDynamicState::Unknown );
+            BIND( StencilCompareMask );
+            BIND( StencilWriteMask );
+            BIND( StencilReference );
+            BIND( DepthBias );
+            BIND( BlendConstants );
+            BIND( RTStackSize );
+            BIND( FragmentShadingRate );
+            case EPipelineDynamicState::_Last :
+            case EPipelineDynamicState::All :
+            case EPipelineDynamicState::GraphicsPipelineMask :
+            default : break;
+            #undef BIND
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -305,7 +350,7 @@ namespace
         binder.AddValue( "Plane_0",     EImageAspect::Plane_0 );
         binder.AddValue( "Plane_1",     EImageAspect::Plane_1 );
         binder.AddValue( "Plane_2",     EImageAspect::Plane_2 );
-        STATIC_ASSERT( uint(EImageAspect::_Last) == 65 );
+        StaticAssert( uint(EImageAspect::_Last) == 65 );
     }
 
 /*
@@ -329,7 +374,7 @@ namespace
         binder.AddValue( "Depth",       EShaderIO::Depth );
         binder.AddValue( "Stencil",     EShaderIO::Stencil );
         binder.AddValue( "DepthStencil",EShaderIO::DepthStencil );
-        STATIC_ASSERT( uint(EShaderIO::_Count) == 13 );
+        StaticAssert( uint(EShaderIO::_Count) == 13 );
     }
 
 /*
@@ -347,7 +392,7 @@ namespace
         binder.AddValue( "Int16",   ESubgroupTypes::Int16 );
         binder.AddValue( "Int32",   ESubgroupTypes::Int32 );
         binder.AddValue( "Int64",   ESubgroupTypes::Int64 );
-        STATIC_ASSERT( uint(ESubgroupTypes::All) == 63 );
+        StaticAssert( uint(ESubgroupTypes::All) == 63 );
     }
 
 /*
@@ -436,7 +481,7 @@ namespace
         binder.AddValue( "_Clustered_End",          ESubgroupOperation::_Clustered_End );
         binder.AddValue( "_Quad_Begin",             ESubgroupOperation::_Quad_Begin );
         binder.AddValue( "_Quad_End",               ESubgroupOperation::_Quad_End );
-        STATIC_ASSERT( uint(ESubgroupOperation::_Count) == 52 );
+        StaticAssert( uint(ESubgroupOperation::_Count) == 52 );
     }
 
 /*
@@ -451,7 +496,7 @@ namespace
         binder.AddValue( "Ignore",          EFeature::Ignore );
         binder.AddValue( "RequireTrue",     EFeature::RequireTrue );
         binder.AddValue( "RequireFalse",    EFeature::RequireFalse );
-        STATIC_ASSERT( uint(EFeature::_Count) == 3 );
+        StaticAssert( uint(EFeature::_Count) == 3 );
     }
 
 /*
@@ -478,7 +523,7 @@ namespace
         binder.AddValue( "RayMiss",         EShader::RayMiss );
         binder.AddValue( "RayIntersection", EShader::RayIntersection );
         binder.AddValue( "RayCallable",     EShader::RayCallable );
-        STATIC_ASSERT( uint(EShader::_Count) == 15 );
+        StaticAssert( uint(EShader::_Count) == 15 );
     }
 
 /*
@@ -514,7 +559,7 @@ namespace
         binder.AddValue( "VertexProcessingStages",  EShaderStages::VertexProcessingStages );
         binder.AddValue( "PreRasterizationStages",  EShaderStages::PreRasterizationStages );
         binder.AddValue( "PostRasterizationStages", EShaderStages::PostRasterizationStages );
-        STATIC_ASSERT( uint(EShaderStages::All) == 0x7FFF );
+        StaticAssert( uint(EShaderStages::All) == 0x7FFF );
     }
 
 /*
@@ -538,7 +583,7 @@ namespace
         binder.AddValue( "Broadcom",    EVendorID::Broadcom );
         binder.AddValue( "Samsung",     EVendorID::Samsung );
         binder.AddValue( "VeriSilicon", EVendorID::VeriSilicon );
-        STATIC_ASSERT( uint(EVendorID::_Count) == 12 );
+        StaticAssert( uint(EVendorID::_Count) == 12 );
     }
 
 /*
@@ -582,7 +627,7 @@ namespace
         binder.Create();
         binder.AddValue( "Nearest",     EFilter::Nearest );
         binder.AddValue( "Linear",      EFilter::Linear );
-        STATIC_ASSERT( uint(EFilter::_Count) == 2 );
+        StaticAssert( uint(EFilter::_Count) == 2 );
     }
 
 /*
@@ -597,7 +642,7 @@ namespace
         binder.AddValue( "None",        EMipmapFilter::None );
         binder.AddValue( "Nearest",     EMipmapFilter::Nearest );
         binder.AddValue( "Linear",      EMipmapFilter::Linear );
-        STATIC_ASSERT( uint(EMipmapFilter::_Count) == 3 );
+        StaticAssert( uint(EMipmapFilter::_Count) == 3 );
     }
 
 /*
@@ -617,7 +662,7 @@ namespace
         // alias:
         binder.AddValue( "Clamp",               EAddressMode::ClampToEdge );
         binder.AddValue( "MirrorClamp",         EAddressMode::MirrorClampToEdge );
-        STATIC_ASSERT( uint(EAddressMode::_Count) == 5 );
+        StaticAssert( uint(EAddressMode::_Count) == 5 );
     }
 
 /*
@@ -635,7 +680,7 @@ namespace
         binder.AddValue( "IntTransparentBlack",     EBorderColor::IntTransparentBlack );
         binder.AddValue( "IntOpaqueBlack",          EBorderColor::IntOpaqueBlack );
         binder.AddValue( "IntOpaqueWhite",          EBorderColor::IntOpaqueWhite );
-        STATIC_ASSERT( uint(EBorderColor::_Count) == 6 );
+        StaticAssert( uint(EBorderColor::_Count) == 6 );
     }
 
 /*
@@ -650,7 +695,7 @@ namespace
         binder.AddValue( "Average", EReductionMode::Average );
         binder.AddValue( "Min",     EReductionMode::Min );
         binder.AddValue( "Max",     EReductionMode::Max );
-        STATIC_ASSERT( uint(EReductionMode::_Count) == 3 );
+        StaticAssert( uint(EReductionMode::_Count) == 3 );
     }
 
 /*
@@ -663,9 +708,10 @@ namespace
         EnumBinder<ESamplerUsage>       binder{ se };
         binder.Create();
         binder.AddValue( "Default",                         ESamplerUsage::Default );
-        binder.AddValue( "Subsampled",                      ESamplerUsage::Subsampled );
-        binder.AddValue( "SubsampledCoarseReconstruction",  ESamplerUsage::SubsampledCoarseReconstruction );
-        STATIC_ASSERT( uint(ESamplerUsage::_Count) == 3 );
+    //  binder.AddValue( "Subsampled",                      ESamplerUsage::Subsampled );
+    //  binder.AddValue( "SubsampledCoarseReconstruction",  ESamplerUsage::SubsampledCoarseReconstruction );
+        binder.AddValue( "NonSeamlessCubeMap",              ESamplerUsage::NonSeamlessCubeMap );
+        StaticAssert( uint(ESamplerUsage::_Count) == 2 );
     }
 
 /*
@@ -694,7 +740,7 @@ namespace
         binder.AddValue( "UpdateTemplate",      EDescSetUsage::UpdateTemplate );
         binder.AddValue( "ArgumentBuffer",      EDescSetUsage::ArgumentBuffer );
         binder.AddValue( "MutableArgBuffer",    EDescSetUsage::MutableArgBuffer );
-        STATIC_ASSERT( uint(EDescSetUsage::All) == 0xF );
+        StaticAssert( uint(EDescSetUsage::All) == 0xF );
     }
 
 /*
@@ -706,15 +752,28 @@ namespace
     {
         EnumBinder<EPipelineOpt>    binder{ se };
         binder.Create();
-        binder.AddValue( "Optimize",                        EPipelineOpt::Optimize                      );
-        binder.AddValue( "CS_DispatchBase",                 EPipelineOpt::CS_DispatchBase               );
-        binder.AddValue( "RT_NoNullAnyHitShaders",          EPipelineOpt::RT_NoNullAnyHitShaders        );
-        binder.AddValue( "RT_NoNullClosestHitShaders",      EPipelineOpt::RT_NoNullClosestHitShaders    );
-        binder.AddValue( "RT_NoNullMissShaders",            EPipelineOpt::RT_NoNullMissShaders          );
-        binder.AddValue( "RT_NoNullIntersectionShaders",    EPipelineOpt::RT_NoNullIntersectionShaders  );
-        binder.AddValue( "RT_SkipTriangles",                EPipelineOpt::RT_SkipTriangles              );
-        binder.AddValue( "RT_SkipAABBs",                    EPipelineOpt::RT_SkipAABBs                  );
-        STATIC_ASSERT( uint(EPipelineOpt::All) == 0xFF );
+        BEGIN_ENUM_CHECKS();
+        switch ( EPipelineOpt::Unknown )
+        {
+            #define BIND( _name_ )  case EPipelineOpt::_name_ : binder.AddValue( #_name_, EPipelineOpt::_name_ )
+            case EPipelineOpt::Unknown :
+            BIND( Optimize );
+            BIND( CS_DispatchBase );
+            BIND( RT_NoNullAnyHitShaders );
+            BIND( RT_NoNullClosestHitShaders );
+            BIND( RT_NoNullMissShaders );
+            BIND( RT_NoNullIntersectionShaders );
+            BIND( RT_SkipTriangles );
+            BIND( RT_SkipAABBs );
+            BIND( DontCompile );
+            BIND( CaptureStatistics );
+            BIND( CaptureInternalRepresentation );
+            case EPipelineOpt::_Last :
+            case EPipelineOpt::All :
+            default : break;
+            #undef BIND
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -731,7 +790,7 @@ namespace
         binder.AddValue( "AsyncTransfer",   EQueueMask::AsyncTransfer   );
         binder.AddValue( "VideoEncode",     EQueueMask::VideoEncode     );
         binder.AddValue( "VideoDecode",     EQueueMask::VideoDecode     );
-        STATIC_ASSERT( uint(EQueueMask::All) == 31 );
+        StaticAssert( uint(EQueueMask::All) == 31 );
     }
 
 /*
@@ -745,7 +804,7 @@ namespace
         binder.Create();
         binder.AddValue( "CositedEven",     ESamplerChromaLocation::CositedEven     );
         binder.AddValue( "Midpoint",        ESamplerChromaLocation::Midpoint        );
-        STATIC_ASSERT( uint(ESamplerChromaLocation::_Count) == 2 );
+        StaticAssert( uint(ESamplerChromaLocation::_Count) == 2 );
     }
 
 /*
@@ -762,7 +821,7 @@ namespace
         binder.AddValue( "Ycbcr_709",       ESamplerYcbcrModelConversion::Ycbcr_709     );
         binder.AddValue( "Ycbcr_601",       ESamplerYcbcrModelConversion::Ycbcr_601     );
         binder.AddValue( "Ycbcr_2020",      ESamplerYcbcrModelConversion::Ycbcr_2020    );
-        STATIC_ASSERT( uint(ESamplerYcbcrModelConversion::_Count) == 5 );
+        StaticAssert( uint(ESamplerYcbcrModelConversion::_Count) == 5 );
     }
 
 /*
@@ -776,7 +835,7 @@ namespace
         binder.Create();
         binder.AddValue( "ITU_Full",        ESamplerYcbcrRange::ITU_Full    );
         binder.AddValue( "ITU_Narrow",      ESamplerYcbcrRange::ITU_Narrow  );
-        STATIC_ASSERT( uint(ESamplerYcbcrRange::_Count) == 2 );
+        StaticAssert( uint(ESamplerYcbcrRange::_Count) == 2 );
     }
 
 /*
@@ -798,7 +857,7 @@ namespace
         binder.AddValue( "RGBA16F_BT2020_linear",           ESurfaceFormat::RGBA16F_BT2020_linear           );
         binder.AddValue( "RGB10A2_sRGB_nonlinear",          ESurfaceFormat::RGB10A2_sRGB_nonlinear          );
         binder.AddValue( "RGB10A2_HDR10_ST2084",            ESurfaceFormat::RGB10A2_HDR10_ST2084            );
-        STATIC_ASSERT( uint(ESurfaceFormat::_Count) == 10 );
+        StaticAssert( uint(ESurfaceFormat::_Count) == 10 );
     }
 
 /*
@@ -816,7 +875,7 @@ namespace
         binder.AddValue( "ForceNonOpaque",      ERTInstanceOpt::ForceNonOpaque      );
         binder.AddValue( "TriangleCullBack",    ERTInstanceOpt::TriangleCullBack    );
         binder.AddValue( "TriangleFrontCW",     ERTInstanceOpt::TriangleFrontCW     );
-        STATIC_ASSERT( uint(ERTInstanceOpt::All) == 15 );
+        StaticAssert( uint(ERTInstanceOpt::All) == 15 );
     }
 
 /*
@@ -835,7 +894,7 @@ namespace
         #define BIND( _name_ )\
             case EResourceState::_name_ :  binder.AddValue( AE_TOSTRING(_name_), EResourceState::_name_ );
 
-            case EResourceState::_InvalidState :    break;
+            case EResourceState::_InvalidState :
             BIND( Unknown );
             BIND( Preserve );
             BIND( ShaderStorage_Read );
@@ -952,36 +1011,6 @@ namespace
 
 
 
-/*
-=================================================
-    Bind_RenderState_ColorBuffer_ColorPair
-=================================================
-*
-    template <typename T>
-    static void  RenderState_ColorBuffer_ColorPair_Set1 (RenderState::ColorBuffer::ColorPair<T> &self, T value) {
-        self.color  = value;
-        self.alpha  = value;
-    }
-
-    template <typename T>
-    static void  RenderState_ColorBuffer_ColorPair_Set2 (RenderState::ColorBuffer::ColorPair<T> &self, T color, T alpha) {
-        self.color  = color;
-        self.alpha  = alpha;
-    }
-
-    template <typename T>
-    static void  Bind_RenderState_ColorBuffer_ColorPair (const ScriptEnginePtr &se) __Th___
-    {
-        using ColorPair = RenderState::ColorBuffer::ColorPair<T>;
-
-        ClassBinder<ColorPair>  binder{ se };
-        binder.CreateClassValue();
-        binder.AddProperty( &ColorPair::color, "color" );
-        binder.AddProperty( &ColorPair::alpha, "alpha" );
-        binder.AddMethodFromGlobal( &RenderState_ColorBuffer_ColorPair_Set1<T>, "set" );
-        binder.AddMethodFromGlobal( &RenderState_ColorBuffer_ColorPair_Set2<T>, "set" );
-    }
-
 /*
 =================================================
     Bind_RenderState_ColorBuffer_ColorMask
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VAutoreleaseMemory.h b/AE/engine/src/graphics/Vulkan/Allocators/VAutoreleaseMemory.h
index 40356c6f..e335e61d 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VAutoreleaseMemory.h
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VAutoreleaseMemory.h
@@ -36,16 +36,9 @@ namespace AE::Graphics
             return res;
         }
 
-        ND_ VkDeviceMemory*  operator & ()                  __NE___
-        {
-            CHECK( _mem == Default );
-            return &_mem;
-        }
-
-        ND_ VkDeviceMemory  Get ()                          C_NE___
-        {
-            return _mem;
-        }
+        ND_ VkDeviceMemory*     operator & ()               __NE___ { CHECK( _mem == Default );  return &_mem; }
+        ND_ VkDeviceMemory      Get ()                      C_NE___ { return _mem; }
+        ND_ VkDeviceMemory&     Ref ()                      __NE___ { return _mem; }
     };
 
 
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.cpp b/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.cpp
index 0ec853f7..4f455fc2 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.cpp
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.cpp
@@ -17,7 +17,7 @@ namespace AE::Graphics
     PageArr ctor
 =================================================
 */
-    VBlockMemAllocator::PageArr::PageArr ()
+    VBlockMemAllocator::PageArr::PageArr () __NE___
     {
         hiLevel.store( 0 ); // set empty & unallocated page bit
 
@@ -47,7 +47,7 @@ namespace AE::Graphics
     {
         EXLOCK( _pageMapGuard );
 
-        auto&               dev         = RenderTaskScheduler().GetDevice();
+        auto&               dev         = GraphicsScheduler().GetDevice();
         const       uint    low_mask    = ToBitMask<uint>( _bitsPerPage );
         constexpr   uint    hi_mask     = ToBitMask<uint>( _PageCount );
 
@@ -104,7 +104,7 @@ namespace AE::Graphics
                 {
                     const uint  low_lvl_bit = (1u << low_lvl_idx);
 
-                    if ( low_level.CAS( INOUT low_available, low_available | low_lvl_bit )) // 0 -> 1
+                    if_likely( low_level.CAS( INOUT low_available, low_available | low_lvl_bit ))   // 0 -> 1
                     {
                         // update high level
                         if_unlikely( low_available == (~low_lvl_bit & low_mask) )
@@ -179,7 +179,7 @@ namespace AE::Graphics
         {
             mem_alloc.memoryTypeIndex = type_idx;
 
-            if_likely( dev.vkAllocateMemory( dev.GetVkDevice(), &mem_alloc, null, OUT &memory ) == VK_SUCCESS )
+            if_likely( dev.AllocateMemory( mem_alloc, OUT memory.Ref() ) == VK_SUCCESS )
                 break;
         }
         CHECK_ERR( memory.Get() != Default );
@@ -281,7 +281,7 @@ namespace AE::Graphics
 */
     bool  VBlockMemAllocator::GetInfo (const Storage_t &data, OUT VulkanMemoryObjInfo &info) C_NE___
     {
-        auto&   dev         = RenderTaskScheduler().GetDevice();
+        auto&   dev         = GraphicsScheduler().GetDevice();
         auto&   mem_data    = _CastStorage( data );
         auto&   mem_props   = dev.GetVProperties().memoryProperties;
         CHECK_ERR( mem_data.page != null );
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.h b/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.h
index b3c126fc..2fb402b5 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.h
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VBlockMemAllocator.h
@@ -44,8 +44,8 @@ namespace AE::Graphics
 
             Page            pages [_PageCount];     // write access protected by 'allocated' bit in 'hiLevel'
 
-            PageArr ();
-            PageArr (const PageArr &other) : PageArr{} { ASSERT( other.hiLevel.load() == 0 );  Unused( other ); }
+            PageArr ()                      __NE___;
+            PageArr (const PageArr &other)  __NE___ : PageArr{} { ASSERT( other.hiLevel.load() == 0 );  Unused( other ); }
         };
 
         struct Data
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VDedicatedMemAllocator.cpp b/AE/engine/src/graphics/Vulkan/Allocators/VDedicatedMemAllocator.cpp
index 64682217..9f5dacc7 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VDedicatedMemAllocator.cpp
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VDedicatedMemAllocator.cpp
@@ -14,7 +14,7 @@ namespace AE::Graphics
 =================================================
 */
     VDedicatedMemAllocator::VDedicatedMemAllocator () __NE___ :
-        _supportDedicated{ RenderTaskScheduler().GetDevice().GetVExtensions().dedicatedAllocation }
+        _supportDedicated{ GraphicsScheduler().GetDevice().GetVExtensions().dedicatedAllocation }
     {}
 
 /*
@@ -37,7 +37,7 @@ namespace AE::Graphics
         CHECK_ERR( image != Default );
         CHECK_ERR( desc.memType != Default );
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         // get memory requirements
         VkImageMemoryRequirementsInfo2  mem_info        = {};
@@ -83,7 +83,7 @@ namespace AE::Graphics
         {
             mem_alloc.memoryTypeIndex = type_idx;
 
-            if_likely( dev.vkAllocateMemory( dev.GetVkDevice(), &mem_alloc, null, OUT &memory ) == VK_SUCCESS )
+            if_likely( dev.AllocateMemory( mem_alloc, OUT memory.Ref() ) == VK_SUCCESS )
                 break;
         }
         CHECK_ERR( memory.Get() != Default );
@@ -136,7 +136,7 @@ namespace AE::Graphics
         constexpr auto  dev_addr_mask = EBufferUsage::ShaderAddress | EBufferUsage::ShaderBindingTable |
                                         EBufferUsage::ASBuild_ReadOnly | EBufferUsage::ASBuild_Scratch;
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         // get memory requirements
         VkBufferMemoryRequirementsInfo2 mem_info        = {};
@@ -195,7 +195,7 @@ namespace AE::Graphics
         {
             mem_alloc.memoryTypeIndex = type_idx;
 
-            if_likely( dev.vkAllocateMemory( dev.GetVkDevice(), &mem_alloc, null, OUT &memory ) == VK_SUCCESS )
+            if_likely( dev.AllocateMemory( mem_alloc, OUT memory.Ref() ) == VK_SUCCESS )
                 break;
         }
         CHECK_ERR( memory.Get() != Default );
@@ -266,7 +266,7 @@ namespace AE::Graphics
 
         if ( mem_data.mem != Default )
         {
-            auto&   dev = RenderTaskScheduler().GetDevice();
+            auto&   dev = GraphicsScheduler().GetDevice();
 
             if ( mem_data.mapped != null )
                 dev.vkUnmapMemory( dev.GetVkDevice(), mem_data.mem );
@@ -287,7 +287,7 @@ namespace AE::Graphics
 */
     bool  VDedicatedMemAllocator::GetInfo (const Storage_t &data, OUT VulkanMemoryObjInfo &info) C_NE___
     {
-        auto&   dev         = RenderTaskScheduler().GetDevice();
+        auto&   dev         = GraphicsScheduler().GetDevice();
         auto&   mem_data    = _CastStorage( data );
         auto&   mem_props   = dev.GetVProperties().memoryProperties;
 
@@ -312,7 +312,7 @@ namespace AE::Graphics
 */
     Bytes  VDedicatedMemAllocator::MaxAllocationSize () C_NE___
     {
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
         return dev.GetVExtensions().maintenance3 ?
                     Bytes{dev.GetVProperties().maintenance3Props.maxMemoryAllocationSize} :
                     UMax;
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VGfxMemAllocatorUtils.inl.h b/AE/engine/src/graphics/Vulkan/Allocators/VGfxMemAllocatorUtils.inl.h
index 77ecf7e6..c2e08c3a 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VGfxMemAllocatorUtils.inl.h
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VGfxMemAllocatorUtils.inl.h
@@ -16,7 +16,7 @@ namespace AE::Graphics
         ASSERT_MSG( not AnyBits( desc.memType, EMemoryType::Dedicated ),
                     "Dedicated allocation is not supported" );
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         // get memory requirements
         VkMemoryRequirements    mem_req = {};
@@ -59,7 +59,7 @@ namespace AE::Graphics
         ASSERT_MSG( not AnyBits( desc.memType, EMemoryType::Dedicated ),
                     "Dedicated allocation is not supported" );
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         // get memory requirements
         VkMemoryRequirements    mem_req = {};
@@ -96,11 +96,11 @@ namespace AE::Graphics
     {
         CHECK_ERR( videoSession != Default );
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         // get memory requirements
-        VkVideoSessionMemoryRequirementsKHR     mem_reqs [VConfig::MaxVideoMaxReq]  = {};
-        uint                                    count                               = VConfig::MaxVideoMaxReq;
+        VkVideoSessionMemoryRequirementsKHR     mem_reqs [VConfig::MaxVideoMemReq]  = {};
+        uint                                    count                               = VConfig::MaxVideoMemReq;
         const uint                              membits_mask                        = dev.GetMemoryTypeBits( memType );
 
         VK_CHECK_ERR( dev.vkGetVideoSessionMemoryRequirementsKHR( dev.GetVkDevice(), videoSession, INOUT &count, OUT mem_reqs ));
@@ -129,7 +129,7 @@ namespace AE::Graphics
             RETURN_ERR( "failed to allocate memory for video session" );
         }
 
-        VkBindVideoSessionMemoryInfoKHR     bind_infos [VConfig::MaxVideoMaxReq] = {};
+        VkBindVideoSessionMemoryInfoKHR     bind_infos [VConfig::MaxVideoMemReq] = {};
 
         for (i = 0; i < count; ++i)
         {
@@ -166,7 +166,7 @@ namespace AE::Graphics
         CHECK_ERR( image != Default );
         CHECK_ERR( desc.memType != Default );
 
-        auto&       dev         = RenderTaskScheduler().GetDevice();
+        auto&       dev         = GraphicsScheduler().GetDevice();
         const uint  max_planes  = 3;
 
         const uint  plane_count = EPixelFormat_PlaneCount( desc.format );
@@ -226,7 +226,7 @@ namespace AE::Graphics
                 VkImageMemoryRequirementsInfo2      mem_info        = {};
                 VkMemoryRequirements2               mem_req         = {};
                 const VkImageAspectFlagBits         img_aspects []  = { VK_IMAGE_ASPECT_PLANE_0_BIT, VK_IMAGE_ASPECT_PLANE_1_BIT, VK_IMAGE_ASPECT_PLANE_2_BIT };
-                STATIC_ASSERT( CountOf(img_aspects) == max_planes );
+                StaticAssert( CountOf(img_aspects) == max_planes );
 
                 mem_req_plane.sType         = VK_STRUCTURE_TYPE_IMAGE_PLANE_MEMORY_REQUIREMENTS_INFO;
                 mem_req_plane.planeAspect   = img_aspects [plane];
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.cpp b/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.cpp
index 3501fd13..fef41582 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.cpp
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.cpp
@@ -12,15 +12,35 @@
 
 namespace AE::Graphics
 {
+namespace
+{
+    static constexpr Bytes  c_PageAlign         {4 << 10};
+    static constexpr Bytes  c_DefaultPageSize   {64 << 20};
+
+    ND_ static Bytes  ValidatePageSize (Bytes pageSize)
+    {
+        pageSize = (pageSize == 0 ? c_DefaultPageSize : pageSize);
+        pageSize = AlignUp( pageSize, c_PageAlign );
+
+        auto&   dev = GraphicsScheduler().GetDevice();
+        if ( dev.GetVExtensions().maintenance3 )
+        {
+            pageSize = Min( pageSize, Bytes{dev.GetVProperties().maintenance3Props.maxMemoryAllocationSize} );
+            ASSERT( pageSize > 0 );
+        }
+
+        return pageSize;
+    }
+}
+
 /*
 =================================================
     constructor
 =================================================
 */
-    VLinearMemAllocator::VLinearMemAllocator (Bytes pageSize) __NE___
-    {
-        SetPageSize( pageSize == 0 ? _DefaultPageSize : pageSize );
-    }
+    VLinearMemAllocator::VLinearMemAllocator (Bytes pageSize) __NE___ :
+        _pageSize{ ValidatePageSize( pageSize )}
+    {}
 
 /*
 =================================================
@@ -31,13 +51,13 @@ namespace AE::Graphics
     {
         EXLOCK( _pageGuard );
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         for (auto [key, pages] : _pages)
         {
             for (auto& page : pages)
             {
-                CHECK( page.counter.exchange( 0 ) == 0 );
+                CHECK( page.dbgCounter.exchange( 0 ) == 0 );
 
                 if ( page.mapped != null )
                     dev.vkUnmapMemory( dev.GetVkDevice(), page.memory );
@@ -48,24 +68,6 @@ namespace AE::Graphics
         }
     }
 
-/*
-=================================================
-    SetPageSize
-=================================================
-*/
-    void  VLinearMemAllocator::SetPageSize (Bytes size) __NE___
-    {
-        EXLOCK( _pageGuard );
-        ASSERT( size > 0 );
-
-        auto&   dev = RenderTaskScheduler().GetDevice();
-
-        size = AlignUp( size, _Align );
-        size = Min( size, Bytes{dev.GetVProperties().maintenance3Props.maxMemoryAllocationSize} );
-
-        _pageSize = size;
-    }
-
 /*
 =================================================
     Discard
@@ -79,7 +81,7 @@ namespace AE::Graphics
         {
             for (auto& page : pages)
             {
-                CHECK( page.counter.exchange( 0 ) == 0 );
+                CHECK( page.dbgCounter.exchange( 0 ) == 0 );
 
                 page.size = 0_b;
             }
@@ -115,7 +117,7 @@ namespace AE::Graphics
                     if_unlikely( offset + memSize <= page.capacity )
                     {
                         page.size = offset + memSize;
-                        page.counter.fetch_add( 1 );
+                        page.dbgCounter.fetch_add( 1 );
 
                         outData.page    = &page;
                         outData.offset  = offset;
@@ -133,7 +135,7 @@ namespace AE::Graphics
 
         mem_alloc.sType          = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
         mem_alloc.pNext          = shaderAddress ? &mem_flag : null;
-        mem_alloc.allocationSize = VkDeviceSize( Max( AlignUp( memSize*2, _Align ), _pageSize ));
+        mem_alloc.allocationSize = VkDeviceSize( Max( AlignUp( memSize*2, c_PageAlign ), _pageSize ));
 
         mem_flag.sType           = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_FLAGS_INFO;
         mem_flag.flags           = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT;
@@ -142,7 +144,7 @@ namespace AE::Graphics
         {
             mem_alloc.memoryTypeIndex = type_idx;
 
-            if_likely( dev.vkAllocateMemory( dev.GetVkDevice(), &mem_alloc, null, OUT &memory ) == VK_SUCCESS )
+            if_likely( dev.AllocateMemory( mem_alloc, OUT memory.Ref() ) == VK_SUCCESS )
                 break;
         }
         CHECK_ERR( memory.Get() != Default );
@@ -161,14 +163,15 @@ namespace AE::Graphics
         auto&   page_arr = _pages( key );
         CHECK_ERR( page_arr.size() < page_arr.capacity() );
 
-        auto&   page = page_arr.emplace_back();
+        auto&   page        = page_arr.emplace_back();
+        auto&   mem_props   = dev.GetVProperties().memoryProperties;
 
-        page.counter.fetch_add( 1 );
+        page.dbgCounter.fetch_add( 1 );
         page.memory         = memory.Release();
         page.capacity       = Bytes{mem_alloc.allocationSize};
         page.size           = memSize;
         page.mapped         = mapped_ptr;
-        page.memTypeIndex   = mem_alloc.memoryTypeIndex;
+        page.propertyFlags  = VkMemoryPropertyFlagBits(mem_props.memoryTypes[ mem_alloc.memoryTypeIndex ].propertyFlags);
 
         outData.page        = &page;
         outData.offset      = 0_b;
@@ -192,7 +195,7 @@ namespace AE::Graphics
         EXLOCK( _pageGuard );
         ASSERT( _IsValidPage( mem_data.page ));
 
-        CHECK( mem_data.page->counter.fetch_sub( 1 ) > 0 );
+        CHECK( mem_data.page->dbgCounter.fetch_sub( 1 ) > 0 );
         return true;
     }
 
@@ -203,19 +206,14 @@ namespace AE::Graphics
 */
     bool  VLinearMemAllocator::GetInfo (const Storage_t &data, OUT VulkanMemoryObjInfo &info) C_NE___
     {
-        auto&   dev         = RenderTaskScheduler().GetDevice();
-        auto&   mem_data    = _CastStorage( data );
-        auto&   mem_props   = dev.GetVProperties().memoryProperties;
+        auto&   mem_data = _CastStorage( data );
         CHECK_ERR( mem_data.page != null );
 
         SHAREDLOCK( _pageGuard );
         ASSERT( _IsValidPage( mem_data.page ));
 
-        CHECK_ERR( mem_data.page->memTypeIndex < mem_props.memoryTypeCount );
-        auto&   type = mem_props.memoryTypes[ mem_data.page->memTypeIndex ];
-
         info.memory     = mem_data.page->memory;
-        info.flags      = VkMemoryPropertyFlagBits(type.propertyFlags);
+        info.flags      = mem_data.page->propertyFlags;
         info.offset     = mem_data.offset;
         info.size       = mem_data.size;
         info.mappedPtr  = mem_data.page->mapped + mem_data.offset;
@@ -243,6 +241,29 @@ namespace AE::Graphics
         return false;
     }
 
+/*
+=================================================
+    GetStatistic
+=================================================
+*/
+    VLinearMemAllocator::Statistic  VLinearMemAllocator::GetStatistic () C_NE___
+    {
+        SHAREDLOCK( _pageGuard );
+
+        Statistic   result;
+        for (auto [key, pages] : _pages)
+        {
+            for (auto& page : pages)
+            {
+                result.totalAllocated   += page.capacity;
+                result.totalUsed        += page.size;
+                result.pageCount        ++;
+                result.refCount         += uint(Max( 0, page.dbgCounter.load() ));
+            }
+        }
+        return result;
+    }
+
 
 } // AE::Graphics
 
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.h b/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.h
index 7f104f67..2e48d96f 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.h
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VLinearMemAllocator.h
@@ -21,21 +21,30 @@ namespace AE::Graphics
     class VLinearMemAllocator final : public IGfxMemAllocator
     {
     // types
+    public:
+        struct Statistic
+        {
+            Bytes   totalAllocated;         // sum of page capacity
+            Bytes   totalUsed;              // sum of page size
+            uint    pageCount       = 0;
+            uint    refCount        = 0;
+        };
+
     private:
-        struct alignas(AE_CACHE_LINE) Page
+        struct Page
         {
-            Atomic<int>         counter         {0};        // reference counter, for debugging
-            VkDeviceMemory      memory          = Default;
-            Bytes               capacity;
-            Bytes               size;
-            void*               mapped          = null;
-            uint                memTypeIndex    = UMax;
+            VkDeviceMemory              memory          = Default;
+            Bytes                       capacity;
+            Bytes                       size;
+            void*                       mapped          = null;
+            Atomic<int>                 dbgCounter      {0};        // reference counter, for debugging
+            VkMemoryPropertyFlagBits    propertyFlags   = Zero;
 
-            Page ()                 __NE___ {}
+            Page ()             __NE___ {}
 
-            Page (Page && other)    __NE___ :
+            Page (Page &&other) __NE___ :
                 memory{ other.memory }, capacity{ other.capacity }, size{ other.size },
-                mapped{ other.mapped }, memTypeIndex{ other.memTypeIndex }
+                mapped{ other.mapped }, propertyFlags{ other.propertyFlags }
             {}
         };
 
@@ -49,25 +58,24 @@ namespace AE::Graphics
         using Key       = VGfxMemAllocatorUtils::Key;
         using PageMap_t = FixedMap< Key, FixedArray< Page, 8 >, 4 >;
 
-        static constexpr Bytes  _Align              {4 << 10};
-        static constexpr Bytes  _DefaultPageSize    {64 << 20};
-
 
     // variables
     private:
         mutable SharedMutex     _pageGuard;
-        Bytes                   _pageSize;
+        const Bytes             _pageSize;
         PageMap_t               _pages;
 
 
     // methods
     public:
-        explicit VLinearMemAllocator (Bytes pageSize = _DefaultPageSize)                        __NE___;
+        explicit VLinearMemAllocator (Bytes pageSize = 0_b)                                     __NE___;
         ~VLinearMemAllocator ()                                                                 __NE_OV;
 
-        void  SetPageSize (Bytes size)                                                          __NE___;
         void  Discard ()                                                                        __NE___;
 
+        ND_ Statistic  GetStatistic ()                                                          C_NE___;
+
+
       // IGfxMemAllocator //
         bool  AllocForImage (VkImage image, const ImageDesc &desc, OUT Storage_t &data)         __NE_OV;
         bool  AllocForBuffer (VkBuffer buffer, const BufferDesc &desc, OUT Storage_t &data)     __NE_OV;
diff --git a/AE/engine/src/graphics/Vulkan/Allocators/VUniMemAllocator.cpp b/AE/engine/src/graphics/Vulkan/Allocators/VUniMemAllocator.cpp
index 17ec00ea..318272ec 100644
--- a/AE/engine/src/graphics/Vulkan/Allocators/VUniMemAllocator.cpp
+++ b/AE/engine/src/graphics/Vulkan/Allocators/VUniMemAllocator.cpp
@@ -155,7 +155,7 @@ namespace {
 =================================================
 */
     VUniMemAllocator::VUniMemAllocator (Bytes pageSize) __NE___ :
-        _device{ RenderTaskScheduler().GetDevice() },
+        _device{ GraphicsScheduler().GetDevice() },
         _allocator{ null }
     {
         if ( pageSize == 0 )
@@ -197,10 +197,10 @@ namespace {
         info.pool           = Default;
         info.pUserData      = null;
         info.priority       = 0.f;
-        STATIC_ASSERT_64( sizeof(info) == 48 );
+        StaticAssert64( sizeof(info) == 48 );
 
       #if USE_AE_MEM_SELECTOR
-        info.memoryTypeBits = RenderTaskScheduler().GetDevice().GetMemoryTypeBits( desc.memType );
+        info.memoryTypeBits = GraphicsScheduler().GetDevice().GetMemoryTypeBits( desc.memType );
       #else
         info.requiredFlags  = VEnumCast( desc.memType );
       #endif
@@ -247,10 +247,10 @@ namespace {
         info.pool           = Default;
         info.pUserData      = null;
         info.priority       = 0.f;
-        STATIC_ASSERT_64( sizeof(info) == 48 );
+        StaticAssert64( sizeof(info) == 48 );
 
       #if USE_AE_MEM_SELECTOR
-        info.memoryTypeBits = RenderTaskScheduler().GetDevice().GetMemoryTypeBits( desc.memType );
+        info.memoryTypeBits = GraphicsScheduler().GetDevice().GetMemoryTypeBits( desc.memType );
       #else
         info.requiredFlags  = VEnumCast( desc.memType );
       #endif
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.cpp
index 508d25ed..56f0e94d 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.cpp
@@ -45,7 +45,7 @@ namespace AE::Graphics::_hidden_
 
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureBuildRangeInfoKHR*       ranges      = null;
-        AllocatorImpl2< VTempLinearAllocator >          allocator;
+        IAllocatorAdaptor< VTempLinearAllocator >       allocator;
 
         CHECK_THROW( VRTGeometry::ConvertBuildInfo( this->_mngr.GetResourceManager(), allocator, cmd, OUT ranges, OUT build_info ));
 
@@ -71,7 +71,7 @@ namespace AE::Graphics::_hidden_
 
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureBuildRangeInfoKHR*       ranges      = null;
-        AllocatorImpl2< VTempLinearAllocator >          allocator;
+        IAllocatorAdaptor< VTempLinearAllocator >       allocator;
 
         CHECK_THROW( VRTGeometry::ConvertBuildInfo( this->_mngr.GetResourceManager(), allocator, cmd, OUT ranges, OUT build_info ));
 
@@ -100,7 +100,7 @@ namespace AE::Graphics::_hidden_
                                       indirectStride ));
 
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
-        AllocatorImpl2< VTempLinearAllocator >          allocator;
+        IAllocatorAdaptor< VTempLinearAllocator >       allocator;
         uint*                                           max_prim_count  = null;
         const uint                                      stride          = uint(indirectStride);
 
@@ -319,7 +319,7 @@ namespace AE::Graphics::_hidden_
 
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureBuildRangeInfoKHR*       ranges      = null;
-        AllocatorImpl< GraphicsFrameAllocatorRef >      allocator   {_GetFrameId()};
+        IAllocatorAdaptor< GraphicsFrameAllocatorRef >  allocator   {_GetFrameId()};
 
         CHECK_THROW( VRTGeometry::ConvertBuildInfo( this->_mngr.GetResourceManager(), allocator, cmd, OUT ranges, OUT build_info ));
 
@@ -346,7 +346,7 @@ namespace AE::Graphics::_hidden_
 
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureBuildRangeInfoKHR*       ranges      = null;
-        AllocatorImpl< GraphicsFrameAllocatorRef >      allocator   {_GetFrameId()};
+        IAllocatorAdaptor< GraphicsFrameAllocatorRef >  allocator   {_GetFrameId()};
 
         CHECK_THROW( VRTGeometry::ConvertBuildInfo( this->_mngr.GetResourceManager(), allocator, cmd, OUT ranges, OUT build_info ));
 
@@ -373,7 +373,7 @@ namespace AE::Graphics::_hidden_
                               scratch_buf.Description(), cmd.scratch.offset,
                               inst_buf.Description(), cmd.instanceData.offset ));
 
-        AllocatorImpl< GraphicsFrameAllocatorRef >      allocator   {_GetFrameId()};
+        IAllocatorAdaptor< GraphicsFrameAllocatorRef >  allocator   {_GetFrameId()};
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureGeometryKHR*             geom        = allocator.Allocate< VkAccelerationStructureGeometryKHR >();
         VkAccelerationStructureBuildRangeInfoKHR*       range       = allocator.Allocate< VkAccelerationStructureBuildRangeInfoKHR >();
@@ -406,7 +406,7 @@ namespace AE::Graphics::_hidden_
                                scratch_buf.Description(), cmd.scratch.offset,
                                inst_buf.Description(), cmd.instanceData.offset ));
 
-        AllocatorImpl< GraphicsFrameAllocatorRef >      allocator   {_GetFrameId()};
+        IAllocatorAdaptor< GraphicsFrameAllocatorRef >  allocator   {_GetFrameId()};
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureGeometryKHR*             geom        = allocator.Allocate< VkAccelerationStructureGeometryKHR >();
         VkAccelerationStructureBuildRangeInfoKHR*       range       = allocator.Allocate< VkAccelerationStructureBuildRangeInfoKHR >();
@@ -478,7 +478,7 @@ namespace AE::Graphics::_hidden_
                                       indirectStride ));
 
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
-        AllocatorImpl< GraphicsFrameAllocatorRef >      allocator       {_GetFrameId()};
+        IAllocatorAdaptor< GraphicsFrameAllocatorRef >  allocator       {_GetFrameId()};
         uint*                                           max_prim_count  = null;
 
         CHECK_THROW( VRTGeometry::ConvertBuildInfo( this->_mngr.GetResourceManager(), allocator, cmd, OUT max_prim_count, OUT build_info ));
@@ -505,7 +505,7 @@ namespace AE::Graphics::_hidden_
                                       scratch_buf.Description(), cmd.scratch.offset,
                                       inst_buf.Description(), cmd.instanceData.offset ));
 
-        AllocatorImpl< GraphicsFrameAllocatorRef >      allocator       {_GetFrameId()};
+        IAllocatorAdaptor< GraphicsFrameAllocatorRef >  allocator       {_GetFrameId()};
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureGeometryKHR*             geom            = allocator.Allocate< VkAccelerationStructureGeometryKHR >();
         VkAccelerationStructureBuildRangeInfoKHR        range;
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.h b/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.h
index fe1bddf5..3fa62ef6 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VASBuildContext.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    ASBuildCtx -->  DirectASBuildCtx   --> BarrierMngr --> Vulkan device 
+    ASBuildCtx -->  DirectASBuildCtx   --> BarrierMngr --> Vulkan device
                 \-> IndirectASBuildCtx --> BarrierMngr --> Backed commands
 */
 
@@ -123,9 +123,6 @@ namespace AE::Graphics::_hidden_
     {
     // types
     public:
-        static constexpr bool   IsASBuildContext        = true;
-        static constexpr bool   IsVulkanASBuildContext  = true;
-
         using CmdBuf_t      = typename CtxImpl::CmdBuf_t;
     private:
         using RawCtx        = CtxImpl;
@@ -204,7 +201,7 @@ namespace AE::Graphics
 
 
 namespace AE::Graphics::_hidden_
-{   
+{
 /*
 =================================================
     Copy***
@@ -358,7 +355,7 @@ namespace AE::Graphics::_hidden_
 
         return Threading::MakePromise(  [query] () -> Threading::PromiseResult<Bytes>
                                         {
-                                            auto&   query_mngr  = RenderTaskScheduler().GetQueryManager();
+                                            auto&   query_mngr  = GraphicsScheduler().GetQueryManager();
                                             Bytes   size;
                                             CHECK_PE( query_mngr.GetRTASProperty( query, OUT &size, Sizeof(size) ));
                                             return size;
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VAccumBarriers.h b/AE/engine/src/graphics/Vulkan/Commands/VAccumBarriers.h
index 46909c00..7db58b3d 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VAccumBarriers.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VAccumBarriers.h
@@ -6,93 +6,7 @@
 # include "graphics/Public/CommandBuffer.h"
 # include "graphics/Vulkan/VCommon.h"
 
-namespace AE::Graphics::_hidden_
-{
-
-    //
-    // Accumulate Context Barriers
-    //
-    template <typename Ctx>
-    class VAccumBarriers final
-    {
-        friend Ctx;
-
-    // types
-    private:
-        using Self  = VAccumBarriers< Ctx >;
-
-    // variables
-    private:
-        Ctx &   _ctx;
-
-    // methods
-    private:
-        VAccumBarriers (Ctx &ctx)       __NE___ : _ctx{ctx} {}
-
-    public:
-        VAccumBarriers ()                       = delete;
-        VAccumBarriers (const Self &)           = delete;
-        VAccumBarriers (Self &&)        __NE___ = default;
-        ~VAccumBarriers ()              __Th___ { _ctx.CommitBarriers(); }
-
-        Self&&  BufferBarrier (BufferID buffer, EResourceState srcState, EResourceState dstState)                                                           rvTh___ { _ctx.BufferBarrier( buffer, srcState, dstState );             return RVRef(*this); }
-        Self&&  BufferBarrier (VkBuffer buffer, EResourceState srcState, EResourceState dstState)                                                           rvTh___ { _ctx.BufferBarrier( buffer, srcState, dstState );             return RVRef(*this); }
-
-        Self&&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState)                                                              rvTh___ { _ctx.ImageBarrier( image, srcState, dstState );               return RVRef(*this); }
-        Self&&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, VkImageAspectFlags aspectMask)                               rvTh___ { _ctx.ImageBarrier( image, srcState, dstState, aspectMask );   return RVRef(*this); }
-        Self&&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState, const ImageSubresourceRange &subRes)                         rvTh___ { _ctx.ImageBarrier( image, srcState, dstState, subRes );       return RVRef(*this); }
-        Self&&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, const VkImageSubresourceRange &subRes)                       rvTh___ { _ctx.ImageBarrier( image, srcState, dstState, subRes );       return RVRef(*this); }
-
-        Self&&  MemoryBarrier (EResourceState srcState, EResourceState dstState)                                                                            rvTh___ { _ctx.MemoryBarrier( srcState, dstState );                     return RVRef(*this); }
-        Self&&  MemoryBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                            rvTh___ { _ctx.MemoryBarrier( srcScope, dstScope );                     return RVRef(*this); }
-        Self&&  MemoryBarrier ()                                                                                                                            rvTh___ { _ctx.MemoryBarrier();                                         return RVRef(*this); }
-
-        Self&&  ExecutionBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                         rvTh___ { _ctx.ExecutionBarrier( srcScope, dstScope );                  return RVRef(*this); }
-        Self&&  ExecutionBarrier ()                                                                                                                         rvTh___ { _ctx.ExecutionBarrier();                                      return RVRef(*this); }
-
-        Self&&  AcquireBufferOwnership (BufferID buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                             rvTh___ { _ctx.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return RVRef(*this); }
-        Self&&  AcquireBufferOwnership (VkBuffer buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                             rvTh___ { _ctx.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return RVRef(*this); }
-        Self&&  ReleaseBufferOwnership (BufferID buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                             rvTh___ { _ctx.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return RVRef(*this); }
-        Self&&  ReleaseBufferOwnership (VkBuffer buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                             rvTh___ { _ctx.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return RVRef(*this); }
-
-        Self&&  AcquireImageOwnership (ImageID image, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                                rvTh___ { _ctx.AcquireImageOwnership( image, srcQueue, srcState, dstState );                return RVRef(*this); }
-        Self&&  AcquireImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EQueueType srcQueue, EResourceState srcState, EResourceState dstState) rvTh___ { _ctx.AcquireImageOwnership( image, aspectMask, srcQueue, srcState, dstState );    return RVRef(*this); }
-        Self&&  ReleaseImageOwnership (ImageID image, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                                rvTh___ { _ctx.ReleaseImageOwnership( image, srcState, dstState, dstQueue );                return RVRef(*this); }
-        Self&&  ReleaseImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EResourceState srcState, EResourceState dstState, EQueueType dstQueue) rvTh___ { _ctx.ReleaseImageOwnership( image, aspectMask, srcState, dstState, dstQueue );    return RVRef(*this); }
-    };
-
-
-
-    //
-    // Accumulate Draw Context Barriers
-    //
-    template <typename Ctx>
-    class VAccumDrawBarriers final
-    {
-        friend Ctx;
-
-    // types
-    private:
-        using Self  = VAccumDrawBarriers< Ctx >;
-
-    // variables
-    private:
-        Ctx &   _ctx;
-
-    // methods
-    private:
-        VAccumDrawBarriers (Ctx &ctx)       __NE___ : _ctx{ctx} {}
-
-    public:
-        VAccumDrawBarriers ()                       = delete;
-        VAccumDrawBarriers (const Self &)           = delete;
-        VAccumDrawBarriers (Self &&)        __NE___ = default;
-        ~VAccumDrawBarriers ()              __Th___ { _ctx.CommitBarriers(); }
-
-        Self&&  AttachmentBarrier (AttachmentName name, EResourceState srcState, EResourceState dstState)   rvTh___ { _ctx.AttachmentBarrier( name, srcState, dstState ); return RVRef(*this); }
-    };
-
-
-} // AE::Graphics::_hidden_
+// implementation
+# include "graphics/Private/AccumBarriers.h"
 
 #endif // AE_ENABLE_VULKAN
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VAccumDeferredBarriers.h b/AE/engine/src/graphics/Vulkan/Commands/VAccumDeferredBarriers.h
index 19e10392..037fa6a3 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VAccumDeferredBarriers.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VAccumDeferredBarriers.h
@@ -6,123 +6,7 @@
 # include "graphics/Public/CommandBuffer.h"
 # include "graphics/Vulkan/Commands/VBarrierManager.h"
 
-namespace AE::Graphics
-{
-namespace _hidden_
-{
-
-
-    //
-    // Accumulate Deferred Barriers
-    //
-    class VAccumDeferredBarriers
-    {
-    // types
-    private:
-        using Self  = VAccumDeferredBarriers;
-
-    // variables
-    protected:
-        VBarrierManager     _mngr;
-
-    // methods
-    protected:
-        VAccumDeferredBarriers (VCommandBatch &batch)   __NE___ : _mngr{batch} {}
-
-    public:
-        VAccumDeferredBarriers ()                               = delete;
-        VAccumDeferredBarriers (const Self &)                   = delete;
-        VAccumDeferredBarriers (Self &&)                __NE___ = default;
-        ~VAccumDeferredBarriers ()                      __NE___ { ASSERT( _mngr.NoPendingBarriers() ); }
-
-        Self&  Merge (INOUT VAccumDeferredBarriers &src)                                                                                                    __NE___ { _mngr.MergeBarriers( src._mngr );  src._mngr.ClearBarriers(); return *this; }
-
-        Self&  BufferBarrier (BufferID buffer, EResourceState srcState, EResourceState dstState)                                                            __NE___ { _mngr.BufferBarrier( buffer, srcState, dstState );            return *this; }
-        Self&  BufferBarrier (VkBuffer buffer, EResourceState srcState, EResourceState dstState)                                                            __NE___ { _mngr.BufferBarrier( buffer, srcState, dstState );            return *this; }
-
-        Self&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState)                                                               __NE___ { _mngr.ImageBarrier( image, srcState, dstState );              return *this; }
-        Self&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, VkImageAspectFlags aspectMask)                                __NE___ { _mngr.ImageBarrier( image, srcState, dstState, aspectMask );  return *this; }
-        Self&  ImageBarrier (ImageID image, EResourceState srcState, EResourceState dstState, const ImageSubresourceRange &subRes)                          __NE___ { _mngr.ImageBarrier( image, srcState, dstState, subRes );      return *this; }
-        Self&  ImageBarrier (VkImage image, EResourceState srcState, EResourceState dstState, const VkImageSubresourceRange &subRes)                        __NE___ { _mngr.ImageBarrier( image, srcState, dstState, subRes );      return *this; }
-
-        Self&  MemoryBarrier (EResourceState srcState, EResourceState dstState)                                                                             __NE___ { _mngr.MemoryBarrier( srcState, dstState );                    return *this; }
-        Self&  MemoryBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                             __NE___ { _mngr.MemoryBarrier( srcScope, dstScope );                    return *this; }
-        Self&  MemoryBarrier ()                                                                                                                             __NE___ { _mngr.MemoryBarrier();                                        return *this; }
-
-        Self&  ExecutionBarrier (EPipelineScope srcScope, EPipelineScope dstScope)                                                                          __NE___ { _mngr.ExecutionBarrier( srcScope, dstScope );                 return *this; }
-        Self&  ExecutionBarrier ()                                                                                                                          __NE___ { _mngr.ExecutionBarrier();                                     return *this; }
-
-        Self&  AcquireBufferOwnership (BufferID buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                              __NE___ { _mngr.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return *this; }
-        Self&  AcquireBufferOwnership (VkBuffer buffer, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                              __NE___ { _mngr.AcquireBufferOwnership( buffer, srcQueue, srcState, dstState ); return *this; }
-        Self&  ReleaseBufferOwnership (BufferID buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                              __NE___ { _mngr.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return *this; }
-        Self&  ReleaseBufferOwnership (VkBuffer buffer, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                              __NE___ { _mngr.ReleaseBufferOwnership( buffer, srcState, dstState, dstQueue ); return *this; }
-
-        Self&  AcquireImageOwnership (ImageID image, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)                                 __NE___ { _mngr.AcquireImageOwnership( image, srcQueue, srcState, dstState );               return *this; }
-        Self&  AcquireImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EQueueType srcQueue, EResourceState srcState, EResourceState dstState)  __NE___ { _mngr.AcquireImageOwnership( image, aspectMask, srcQueue, srcState, dstState );   return *this; }
-        Self&  ReleaseImageOwnership (ImageID image, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)                                 __NE___ { _mngr.ReleaseImageOwnership( image, srcState, dstState, dstQueue );               return *this; }
-        Self&  ReleaseImageOwnership (VkImage image, VkImageAspectFlags aspectMask, EResourceState srcState, EResourceState dstState, EQueueType dstQueue)  __NE___ { _mngr.ReleaseImageOwnership( image, aspectMask, srcState, dstState, dstQueue );   return *this; }
-    };
-
-
-
-    //
-    // Accumulate Deferred Barriers for Context
-    //
-    template <typename Ctx>
-    class VAccumDeferredBarriersForCtx final : public VAccumDeferredBarriers
-    {
-        friend Ctx;
-
-    // variables
-    private:
-        Ctx &   _ctx;
-
-    // methods
-    private:
-        VAccumDeferredBarriersForCtx (VCommandBatch &batch, Ctx &ctx) __NE___ : VAccumDeferredBarriers{batch}, _ctx{ctx} {}
-    public:
-        void  Commit () __Th___
-        {
-            auto*   bar = _mngr.GetBarriers();
-            if_likely( bar != null )
-            {
-                _ctx.PipelineBarrier( *bar );
-                _mngr.ClearBarriers();
-            }
-        }
-    };
-
-
-
-    //
-    // Accumulate Barriers for Task
-    //
-    class VAccumBarriersForTask final : public VAccumDeferredBarriers
-    {
-    // methods
-    public:
-        explicit VAccumBarriersForTask (VCommandBatch &batch)   __NE___ : VAccumDeferredBarriers{batch} {}
-
-        ND_ const VkDependencyInfo*  Get ()                     __NE___ { return _mngr.AllocBarriers(); }
-
-        VAccumBarriersForTask (VAccumBarriersForTask &&)        __NE___ = default;
-    };
-
-
-} // _hidden_
-
-/*
-=================================================
-    DeferredBarriers
-=================================================
-*/
-    inline _hidden_::VAccumBarriersForTask  VCommandBatch::DeferredBarriers () __NE___
-    {
-        ASSERT( IsRecording() );
-        return _hidden_::VAccumBarriersForTask{ *this };
-    }
-
-
-} // AE::Graphics
+// implementation
+# include "graphics/Private/AccumDeferredBarriers.h"
 
 #endif // AE_ENABLE_VULKAN
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VBakedCommands.h b/AE/engine/src/graphics/Vulkan/Commands/VBakedCommands.h
index 1c97cfa7..58c96e15 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VBakedCommands.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VBakedCommands.h
@@ -20,7 +20,6 @@ namespace AE::Graphics
         using Header    = Graphics::_hidden_::SoftwareCmdBufBase::Header;
 
 
-
     // variables
     protected:
         void *      _root   = null;
@@ -28,31 +27,13 @@ namespace AE::Graphics
 
     // methods
     public:
-        VBakedCommands ()                       __NE___
-        {}
-
-        explicit VBakedCommands (void* root)    __NE___ :
-            _root{ root }
-        {}
-
-        VBakedCommands (VBakedCommands &&other) __NE___ :
-            _root{ other._root }
-        {
-            other._root = null;
-        }
-
-        void  Destroy ()                        __NE___
-        {
-            Graphics::_hidden_::SoftwareCmdBufBase::Deallocate( _root );
-            _root = null;
-        }
+        VBakedCommands ()                                   __NE___ {}
+        explicit VBakedCommands (void* root)                __NE___ : _root{ root } {}
+        VBakedCommands (VBakedCommands &&other)             __NE___ : _root{ other._root }  { other._root = null; }
 
+            void  Destroy ()                                __NE___ { Graphics::_hidden_::SoftwareCmdBufBase::Deallocate( _root );  _root = null; }
         ND_ bool  Execute (VulkanDeviceFn, VkCommandBuffer) C_NE___;
-
-        ND_ bool  IsValid ()                    C_NE___
-        {
-            return _root != null;
-        }
+        ND_ bool  IsValid ()                                C_NE___ { return _root != null; }
     };
 
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VBarrierManager.cpp b/AE/engine/src/graphics/Vulkan/Commands/VBarrierManager.cpp
index b5c8af7b..cf86a163 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VBarrierManager.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VBarrierManager.cpp
@@ -17,7 +17,7 @@ namespace AE::Graphics::_hidden_
 =================================================
 */
     VBarrierManager::VBarrierManager (const RenderTask &task) __NE___ :
-        _resMngr{ RenderTaskScheduler().GetResourceManager() },
+        _resMngr{ GraphicsScheduler().GetResourceManager() },
         _batch{ *task.GetBatchPtr() },
         _task{ &task }
     {
@@ -27,7 +27,7 @@ namespace AE::Graphics::_hidden_
     }
 
     VBarrierManager::VBarrierManager (VCommandBatch &batch) __NE___ :
-        _resMngr{ RenderTaskScheduler().GetResourceManager() },
+        _resMngr{ GraphicsScheduler().GetResourceManager() },
         _batch{ batch },
         _task{ null }
     {
@@ -55,13 +55,13 @@ namespace AE::Graphics::_hidden_
     void  VBarrierManager::_AddBufferBarrier (const VkBufferMemoryBarrier2 &barrier) __NE___
     {
         ASSERT( barrier.pNext == null );
-        CATCH( _bufferBarriers.push_back( barrier ));
+        NOTHROW( _bufferBarriers.push_back( barrier ));
     }
 
     void  VBarrierManager::_AddImageBarrier (const VkImageMemoryBarrier2 &barrier) __NE___
     {
         ASSERT( barrier.pNext == null );
-        CATCH( _imageBarriers.push_back( barrier ));    // TODO: use fixed array and commit barriers on overflow
+        NOTHROW( _imageBarriers.push_back( barrier ));  // TODO: use fixed array and commit barriers on overflow
     }
 
 /*
@@ -207,7 +207,7 @@ namespace AE::Graphics::_hidden_
         auto*   view    = _resMngr.GetResource( viewId );
         CHECK_ERRV( view != null );
 
-        auto*   buffer  = _resMngr.GetResource( view->Buffer() );
+        auto*   buffer  = _resMngr.GetResource( view->BufferId() );
         CHECK_ERRV( buffer != null );
 
         BufferBarrier( buffer->Handle(), srcState, dstState );
@@ -292,7 +292,7 @@ namespace AE::Graphics::_hidden_
 
         auto&   desc    = view->Description();
 
-        auto*   image   = _resMngr.GetResource( view->Image() );
+        auto*   image   = _resMngr.GetResource( view->ImageId() );
         CHECK_ERRV( image != null );
 
         VkImageSubresourceRange subres;
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.cpp
index e2569b7e..740e7779 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.cpp
@@ -54,7 +54,7 @@ namespace AE::Graphics::_hidden_
             return RVRef(cmdbuf);
         }
 
-        auto&   rts = RenderTaskScheduler();
+        auto&   rts = GraphicsScheduler();
         cmdbuf = rts.GetCommandPoolManager().GetCommandBuffer(
                         batch.GetQueueType(),
                         batch.GetCmdBufType(),
@@ -84,7 +84,7 @@ namespace AE::Graphics::_hidden_
             return RVRef(cmdbuf);
         }
 
-        auto&   rts = RenderTaskScheduler();
+        auto&   rts = GraphicsScheduler();
         cmdbuf = rts.GetCommandPoolManager().GetCommandBuffer(
                         batch.GetQueueType(),
                         batch.GetCmdBufType(),
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.h b/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.h
index 16a3225c..f1c5745c 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VBaseDirectContext.h
@@ -105,7 +105,7 @@ namespace AE::Graphics::_hidden_
     {
         CHECK_THROW( _IsValid() );
 
-        VulkanDeviceFn_Init( RenderTaskScheduler().GetDevice() );
+        VulkanDeviceFn_Init( GraphicsScheduler().GetDevice() );
     }
 
 /*
@@ -147,7 +147,7 @@ namespace AE::Graphics::_hidden_
         DBG_GRAPHICS_ONLY(
             _mngr.ProfilerBeginContext( _cmdbuf.Get(), (dbg ? dbg : DebugLabel( task.DbgFullName(), task.DbgColor() )), ctxType );
 
-            RenderTaskScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );
+            GraphicsScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );
         )
         Unused( ctxType );
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.cpp
index e987e267..164f21fa 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.cpp
@@ -115,7 +115,7 @@ namespace AE::Graphics::_hidden_
     PushConstant
 =================================================
 */
-    void  VSoftwareCmdBuf::PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    void  VSoftwareCmdBuf::PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         auto&   cmd = CreateCmd< PushConstantCmd, ubyte >( usize(size) );   // throw
         auto*   dst = Cast<ubyte>( AlignUp( static_cast<void*>(&cmd + 1), AlignOf<ubyte> ));
@@ -688,7 +688,7 @@ namespace AE::Graphics::_hidden_
             fn.vkCmdTraceRaysIndirect2KHR( cmdbuf, cmd.indirectDeviceAddress );
         }
 
-        static void  Fn_RayTracingSetStackSizeCmd (VulkanDeviceFn fn, VkCommandBuffer cmdbuf, const RayTracingSetStackSizeCmd &cmd) 
+        static void  Fn_RayTracingSetStackSizeCmd (VulkanDeviceFn fn, VkCommandBuffer cmdbuf, const RayTracingSetStackSizeCmd &cmd)
         {
             fn.vkCmdSetRayTracingPipelineStackSizeKHR( cmdbuf, cmd.size );
         }
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.h b/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.h
index 64f6dc3c..57b6361f 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VBaseIndirectContext.h
@@ -122,7 +122,7 @@ namespace AE::Graphics::_hidden_
         {
             VkBuffer            buffer;
             Bytes               offset;
-            Bytes32u            size;
+            Byte32u             size;
             //ubyte             data[];
         };
 
@@ -198,7 +198,7 @@ namespace AE::Graphics::_hidden_
             uint                srcCount;
             VkBuffer            dstBuffer;
             Bytes               dstOffset;
-            Bytes32u            stride;
+            Byte32u             stride;
             VkQueryResultFlags  flags;
         };
 
@@ -573,7 +573,7 @@ namespace AE::Graphics::_hidden_
         using CmdContent_t  = TypeList<
                 // shared commands
                 uint, VkMemoryBarrier2, VkBufferMemoryBarrier2, VkImageMemoryBarrier2,
-                // transfer commands 
+                // transfer commands
                 VkImageSubresourceRange, VkBufferCopy, VkImageCopy, VkBufferImageCopy, VkImageBlit,
                 // compute commands
                 // graphics commands
@@ -609,7 +609,7 @@ namespace AE::Graphics::_hidden_
         void  BindPipeline (VkPipelineBindPoint bindPoint, VkPipeline ppln,
                             VkPipelineLayout layout)                                    __Th___;
         void  PushConstant (VkPipelineLayout layout, Bytes offset, Bytes size,
-                            const void *values, EShaderStages stages)                   __Th___;
+                            const void* values, EShaderStages stages)                   __Th___;
 
         void  ProfilerBeginContext (IGraphicsProfiler* prof, const void* batch,
                                     StringView taskName, RGBA8u color,
@@ -740,7 +740,7 @@ namespace AE::Graphics::_hidden_
         DBG_GRAPHICS_ONLY(
             _mngr.ProfilerBeginContext( *_cmdbuf, (dbg ? dbg : DebugLabel( task.DbgFullName(), task.DbgColor() )), ctxType );
 
-            RenderTaskScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );
+            GraphicsScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );
         )
         Unused( ctxType );
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.cpp b/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.cpp
index 21016dd9..a60bf2a7 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.cpp
@@ -164,7 +164,7 @@ namespace AE::Graphics
     {
         if ( _fence != Default )
         {
-            auto&   dev = RenderTaskScheduler().GetDevice();
+            auto&   dev = GraphicsScheduler().GetDevice();
 
             dev.vkDestroyFence( dev.GetVkDevice(), _fence, null );
         }
@@ -175,10 +175,9 @@ namespace AE::Graphics
     Create
 =================================================
 */
-    bool  VCommandBatch::VirtualFence::Create (const VDevice &dev, uint indexInPool) __NE___
+    bool  VCommandBatch::VirtualFence::Create (const VDevice &dev) __NE___
     {
         _complete.store( false );
-        _indexInPool    = ubyte(indexInPool);
 
         if_likely( _fence != Default )
         {
@@ -205,10 +204,7 @@ namespace AE::Graphics
 
         ASSERT( _fence == Default or _complete.load() );
 
-        const uint  idx = Exchange( INOUT _indexInPool, ubyte{UMax} );
-        MemoryBarrier( EMemoryOrder::Release );
-
-        VRenderTaskScheduler::VirtualFenceApi::Recycle( idx );
+        RenderTaskScheduler::VirtualFenceApi::Recycle( this );
     }
 
 /*
@@ -265,12 +261,11 @@ namespace AE::Graphics
     constructor
 =================================================
 */
-    VCommandBatch::VCommandBatch (uint indexInPool) __NE___ :
-        _indexInPool{ CheckCast<ubyte>( indexInPool )}
+    VCommandBatch::VCommandBatch () __NE___
     {
         #if AE_VK_TIMELINE_SEMAPHORE
         {
-            auto&   dev = RenderTaskScheduler().GetDevice();
+            auto&   dev = GraphicsScheduler().GetDevice();
 
             VkSemaphoreCreateInfo       sem_ci      = {};
             VkSemaphoreTypeCreateInfo   sem_type_ci = {};
@@ -297,7 +292,7 @@ namespace AE::Graphics
     VCommandBatch::~VCommandBatch () __NE___
     {
         #if AE_VK_TIMELINE_SEMAPHORE
-            auto&   dev = RenderTaskScheduler().GetDevice();
+            auto&   dev = GraphicsScheduler().GetDevice();
             dev.vkDestroySemaphore( dev.GetVkDevice(), _tlSemaphore, null );
         #endif
     }
@@ -324,7 +319,7 @@ namespace AE::Graphics
         _perTaskBarriers.fill( null );
 
         DBG_GRAPHICS_ONLY(
-            _profiler = RenderTaskScheduler().GetProfiler();
+            _profiler = GraphicsScheduler().GetProfiler();
             if ( _profiler )
                 _profiler->BeginBatch( frameId, this, dbg.label );
 
@@ -334,7 +329,7 @@ namespace AE::Graphics
         Unused( dbg );
 
         #if defined(AE_DEBUG) and AE_VK_TIMELINE_SEMAPHORE
-            RenderTaskScheduler().GetDevice().SetObjectName( _tlSemaphore, _dbgName, VK_OBJECT_TYPE_SEMAPHORE );
+            GraphicsScheduler().GetDevice().SetObjectName( _tlSemaphore, _dbgName, VK_OBJECT_TYPE_SEMAPHORE );
         #endif
 
         CHECK_ERR( _status.exchange( EStatus::Initial ) == EStatus::Destroyed );
@@ -351,7 +346,7 @@ namespace AE::Graphics
         if_likely( IsCompleted() )
             return true;
 
-        auto&   dev = RenderTaskScheduler().GetDevice();
+        auto&   dev = GraphicsScheduler().GetDevice();
 
         #if AE_VK_TIMELINE_SEMAPHORE
         {
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.h b/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.h
index 7c2b931a..052f01f7 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VCommandBatch.h
@@ -3,16 +3,10 @@
 #pragma once
 
 #ifdef AE_ENABLE_VULKAN
-# include "graphics/Public/DeviceToHostSync.h"
 # include "graphics/Vulkan/Commands/VCommandPoolManager.h"
 # include "graphics/Vulkan/Commands/VBakedCommands.h"
 # include "graphics/Private/LfCmdBufferPool.h"
 
-namespace AE::Graphics::_hidden_
-{
-    class VAccumBarriersForTask;
-}
-
 // implementation
 # include "graphics/Private/CommandBatch.h"
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.cpp b/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.cpp
index d0e0689d..d76e66e4 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.cpp
@@ -96,7 +96,7 @@ namespace AE::Graphics
         ASSERT( _guard.IsLocked() );
     }
 
-    VCommandBuffer::VCommandBuffer (VCommandBuffer && other) __NE___ :
+    VCommandBuffer::VCommandBuffer (VCommandBuffer &&other) __NE___ :
         _cmdbuf{ other._cmdbuf },
         _queueType{ other._queueType },
         _cmdType{ other._cmdType },
@@ -134,7 +134,7 @@ namespace AE::Graphics
 
             if_unlikely( _recording )
             {
-                auto&   dev = RenderTaskScheduler().GetDevice();
+                auto&   dev = GraphicsScheduler().GetDevice();
 
                 _recording = false;
                 VK_CHECK_ERR( dev.vkEndCommandBuffer( _cmdbuf ));
@@ -155,7 +155,7 @@ namespace AE::Graphics
     operator =
 =================================================
 */
-    VCommandBuffer&  VCommandBuffer::operator = (VCommandBuffer && rhs) __NE___
+    VCommandBuffer&  VCommandBuffer::operator = (VCommandBuffer &&rhs) __NE___
     {
         Unused( EndAndRelease() );
 
@@ -181,7 +181,7 @@ namespace AE::Graphics
 */
     VQueuePtr  VCommandBuffer::GetQueue () C_NE___
     {
-        return RenderTaskScheduler().GetDevice().GetQueue( _queueType );
+        return GraphicsScheduler().GetDevice().GetQueue( _queueType );
     }
 
 /*
@@ -243,7 +243,7 @@ namespace AE::Graphics
     void  VCommandBuffer::SetDebugName (NtStringView label) __NE___
     {
     #if AE_DBG_GRAPHICS
-        RenderTaskScheduler().GetDevice().SetObjectName( _cmdbuf, label, VK_OBJECT_TYPE_COMMAND_BUFFER );
+        GraphicsScheduler().GetDevice().SetObjectName( _cmdbuf, label, VK_OBJECT_TYPE_COMMAND_BUFFER );
     #else
         Unused( label );
     #endif
@@ -364,7 +364,7 @@ namespace AE::Graphics
     GetCommandBuffer
 =================================================
 */
-    VCommandBuffer  VCommandPoolManager::GetCommandBuffer (EQueueType queueType, ECommandBufferType cmdType, const VPrimaryCmdBufState *primaryState) __NE___
+    VCommandBuffer  VCommandPoolManager::GetCommandBuffer (EQueueType queueType, ECommandBufferType cmdType, const VPrimaryCmdBufState* primaryState) __NE___
     {
         auto&   per_frame_queues    = _perFrame[ _frameId.Index() ];
         auto&   queue               = per_frame_queues[ uint(queueType) ];
@@ -405,9 +405,9 @@ namespace AE::Graphics
                     inheritance_info.renderPass     = primaryState->renderPass->Handle();
                     inheritance_info.subpass        = primaryState->subpassIndex;
                     inheritance_info.framebuffer    = primaryState->framebuffer->Handle();  // can be null
-                    //inheritance_info.occlusionQueryEnable = 
-                    //inheritance_info.queryFlags           = 
-                    //inheritance_info.pipelineStatistics   = 
+                    //inheritance_info.occlusionQueryEnable =
+                    //inheritance_info.queryFlags           =
+                    //inheritance_info.pipelineStatistics   =
                     break;
 
                 case ECommandBufferType::_Count :
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.h b/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.h
index 8d1b9101..f7e45c63 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VCommandPoolManager.h
@@ -38,7 +38,7 @@ namespace _hidden_
         {
         private:
             static constexpr usize  _Mask = CT_ToBitMask< usize, CT_CeilIntLog2< GraphicsConfig::MaxCmdBuffersPerPool >>;
-            STATIC_ASSERT( _Mask <= alignof(CmdPoolPerQueue) );
+            StaticAssert( _Mask <= alignof(CmdPoolPerQueue) );
 
             usize   _ptr    = UMax;
 
@@ -46,10 +46,10 @@ namespace _hidden_
             CmdPoolGuard ()                                     __NE___ {}
             CmdPoolGuard (CmdPoolPerQueue &ref, usize idx)      __NE___ : _ptr{ usize(&ref) | idx } { ASSERT( _Ptr() == &ref );  ASSERT( idx == _BitIndex() ); }
             CmdPoolGuard (const CmdPoolGuard &)                 = delete;
-            CmdPoolGuard (CmdPoolGuard && other)                __NE___ : _ptr{other._ptr} { other._ptr = UMax; }
+            CmdPoolGuard (CmdPoolGuard &&other)                 __NE___ : _ptr{other._ptr} { other._ptr = UMax; }
 
             CmdPoolGuard&  operator = (const CmdPoolGuard&)     = delete;
-            CmdPoolGuard&  operator = (CmdPoolGuard && rhs)     __NE___ { ASSERT( not IsLocked() );  _ptr = rhs._ptr;  rhs._ptr = UMax;  return *this; }
+            CmdPoolGuard&  operator = (CmdPoolGuard &&rhs)      __NE___ { ASSERT( not IsLocked() );  _ptr = rhs._ptr;  rhs._ptr = UMax;  return *this; }
 
             ND_ bool            IsValid ()                      C_NE___ { return _ptr != UMax; }
             ND_ bool            IsLocked ()                     C_NE___ { return IsValid() and HasBit( _Ptr()->assignedBits.load(), _BitIndex() ); }
@@ -140,7 +140,7 @@ namespace _hidden_
         VCommandBuffer (VCommandBuffer &&)                      __NE___;
         ~VCommandBuffer ()                                      __NE___;
 
-        VCommandBuffer&  operator = (VCommandBuffer && rhs)     __NE___;
+        VCommandBuffer&  operator = (VCommandBuffer &&rhs)      __NE___;
 
         ND_ bool  EndAndRelease ()                              __NE___;
 
@@ -198,7 +198,7 @@ namespace _hidden_
         bool  NextFrame (FrameUID frameId)                  __NE___;
         bool  ReleaseResources (FrameUID frameId)           __NE___;
 
-        ND_ VCommandBuffer  GetCommandBuffer (EQueueType queue, ECommandBufferType type, const VPrimaryCmdBufState *primaryState) __NE___;
+        ND_ VCommandBuffer  GetCommandBuffer (EQueueType queue, ECommandBufferType type, const VPrimaryCmdBufState* primaryState) __NE___;
 
         ND_ VDevice const&  GetDevice ()                    C_NE___ { return _device; }
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VCommands.cpp.h b/AE/engine/src/graphics/Vulkan/Commands/VCommands.cpp.h
index 7653240c..7cd5f5e2 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VCommands.cpp.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VCommands.cpp.h
@@ -12,8 +12,8 @@ namespace AE::Graphics::_hidden_
 =================================================
     GenerateMipmapsImpl
 ----
-    src layout:  transfer_src (mip 0)
-    dst layout:  transfer_src (all mips)
+    src layout:  transfer_src (base mip)
+    dst layout:  transfer_src (all other mips)
 =================================================
 */
     static void  GenerateMipmapsImpl (VulkanDeviceFn fn, VkCommandBuffer cmdbuf,
@@ -42,6 +42,16 @@ namespace AE::Graphics::_hidden_
             subres.aspectMask       = VEnumCast( range.aspectMask );
             subres.baseArrayLayer   = range.baseLayer.Get();
             subres.layerCount       = range.layerCount;
+            subres.baseMipLevel     = range.baseMipLevel.Get()+1;
+            subres.levelCount       = range.mipmapCount-1;
+
+            // undefined -> transfer_dst
+            img_bar.oldLayout       = VK_IMAGE_LAYOUT_UNDEFINED;
+            img_bar.newLayout       = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
+            img_bar.srcAccessMask   = VK_ACCESS_2_NONE;
+            img_bar.dstAccessMask   = VK_ACCESS_2_TRANSFER_WRITE_BIT;
+            fn.vkCmdPipelineBarrier2KHR( cmdbuf, &barrier );
+
             subres.levelCount       = 1;
 
             for (uint mip = range.baseMipLevel.Get()+1; mip < range.mipmapCount; ++mip)
@@ -51,14 +61,6 @@ namespace AE::Graphics::_hidden_
                 const int3  src_size    = int3{Max( 1u, dimension >> src_mip )};
                 const int3  dst_size    = int3{Max( 1u, dimension >> dst_mip )};
 
-                // undefined -> transfer_dst
-                img_bar.oldLayout       = VK_IMAGE_LAYOUT_UNDEFINED;
-                img_bar.newLayout       = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
-                img_bar.srcAccessMask   = VK_ACCESS_2_NONE;
-                img_bar.dstAccessMask   = VK_ACCESS_2_TRANSFER_WRITE_BIT;
-                subres.baseMipLevel     = dst_mip;
-                fn.vkCmdPipelineBarrier2KHR( cmdbuf, &barrier );
-
                 VkImageBlit     region  = {};
                 region.srcOffsets[0]    = { 0, 0, 0 };
                 region.srcOffsets[1]    = { src_size.x, src_size.y, src_size.z };
@@ -75,6 +77,7 @@ namespace AE::Graphics::_hidden_
                 img_bar.newLayout       = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
                 img_bar.srcAccessMask   = VK_ACCESS_2_TRANSFER_WRITE_BIT;
                 img_bar.dstAccessMask   = VK_ACCESS_2_TRANSFER_READ_BIT;
+                subres.baseMipLevel     = dst_mip;
                 fn.vkCmdPipelineBarrier2KHR( cmdbuf, &barrier );
             }
         }
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.cpp
index d9cb5a31..61ecb059 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.cpp
@@ -11,7 +11,7 @@ namespace AE::Graphics::_hidden_
     _PushComputeConstant
 =================================================
 */
-    void  _VDirectComputeCtx::_PushComputeConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages)
+    void  _VDirectComputeCtx::_PushComputeConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages)
     {
         VALIDATE_GCTX( PushConstant( _states.pplnLayout, offset, size, values, stages ));
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.h b/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.h
index 12822a69..5a2bf050 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VComputeContext.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    ComputeCtx  --> DirectComputeCtx   --> BarrierMngr --> Vulkan device 
+    ComputeCtx  --> DirectComputeCtx   --> BarrierMngr --> Vulkan device
                 \-> IndirectComputeCtx --> BarrierMngr --> Backed commands
 */
 
@@ -51,7 +51,7 @@ namespace AE::Graphics::_hidden_
         void  _Dispatch (const uint3 &groupCount)                                                                   __Th___;
         void  _DispatchBase (const uint3 &baseGroup, const uint3 &groupCount)                                       __Th___;
         void  _BindComputePipeline (VkPipeline ppln, VkPipelineLayout layout);
-        void  _PushComputeConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages);
+        void  _PushComputeConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages);
     };
 
 
@@ -92,7 +92,7 @@ namespace AE::Graphics::_hidden_
         void  _Dispatch (const uint3 &groupCount)                                                                   __Th___;
         void  _DispatchBase (const uint3 &baseGroup, const uint3 &groupCount)                                       __Th___;
         void  _BindComputePipeline (VkPipeline ppln, VkPipelineLayout layout);
-        void  _PushComputeConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages);
+        void  _PushComputeConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages);
     };
 
 
@@ -106,9 +106,6 @@ namespace AE::Graphics::_hidden_
     {
     // types
     public:
-        static constexpr bool   IsComputeContext        = true;
-        static constexpr bool   IsVulkanComputeContext  = true;
-
         using CmdBuf_t      = typename CtxImpl::CmdBuf_t;
     private:
         static constexpr uint   _LocalArraySize         = 16;
@@ -131,7 +128,7 @@ namespace AE::Graphics::_hidden_
         void  BindPipeline (ComputePipelineID ppln)                                                                         __Th_OV;
         void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th_OV;
 
-        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th_OV;
+        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th_OV;
         using IComputeContext::PushConstant;
 
         using IComputeContext::Dispatch;
@@ -205,7 +202,7 @@ namespace AE::Graphics::_hidden_
 =================================================
 */
     template <typename C>
-    void  _VComputeContextImpl<C>::PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th___
+    void  _VComputeContextImpl<C>::PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th___
     {
         VALIDATE_GCTX( PushConstant( idx, size, typeName ));
         Unused( typeName );
@@ -323,7 +320,7 @@ namespace AE::Graphics::_hidden_
     _PushComputeConstant
 =================================================
 */
-    inline void  _VIndirectComputeCtx::_PushComputeConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages)
+    inline void  _VIndirectComputeCtx::_PushComputeConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages)
     {
         VALIDATE_GCTX( PushConstant( _states.pplnLayout, offset, size, values, stages ));
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VDrawBarrierManager.cpp b/AE/engine/src/graphics/Vulkan/Commands/VDrawBarrierManager.cpp
index a1a43fe7..5759c6cc 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VDrawBarrierManager.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VDrawBarrierManager.cpp
@@ -18,7 +18,7 @@ namespace AE::Graphics::_hidden_
     VDrawBarrierManager::VDrawBarrierManager (Ptr<VDrawCommandBatch> batch) __Th___ :
         _primaryState{ batch->GetPrimaryCtxState() },
         _batch{ batch },
-        _resMngr{ RenderTaskScheduler().GetResourceManager() }
+        _resMngr{ GraphicsScheduler().GetResourceManager() }
     {
         GCTX_CHECK( _batch->GetQueueType() == GetQueueType() );
         GCTX_CHECK( _primaryState.IsValid() );
@@ -28,7 +28,7 @@ namespace AE::Graphics::_hidden_
 
     VDrawBarrierManager::VDrawBarrierManager (const VPrimaryCmdBufState &primaryState) __Th___ :
         _primaryState{ primaryState },
-        _resMngr{ RenderTaskScheduler().GetResourceManager() }
+        _resMngr{ GraphicsScheduler().GetResourceManager() }
     {
         GCTX_CHECK( _primaryState.IsValid() );
         GCTX_CHECK( not _primaryState.useSecondaryCmdbuf );
@@ -44,7 +44,7 @@ namespace AE::Graphics::_hidden_
     {
         _barrier.sType = VK_STRUCTURE_TYPE_DEPENDENCY_INFO_KHR;
 
-        _barrier.dependencyFlags = 
+        _barrier.dependencyFlags =
             // for better performance on TBDR architectures
             VK_DEPENDENCY_BY_REGION_BIT |
 
@@ -71,7 +71,7 @@ namespace AE::Graphics::_hidden_
         auto*   view    = _resMngr.GetResource( fb_attach[ att_iter->second.Index() ]);
         CHECK_ERRV( view != null );
 
-        auto*   image   = _resMngr.GetResource( view->Image() );
+        auto*   image   = _resMngr.GetResource( view->ImageId() );
         CHECK_ERRV( image != null );
 
         VkImageMemoryBarrier2KHR&   barrier = _imageBarriers.emplace_back();
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VDrawCommandBatch.cpp b/AE/engine/src/graphics/Vulkan/Commands/VDrawCommandBatch.cpp
index df2752dc..e05b656b 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VDrawCommandBatch.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VDrawCommandBatch.cpp
@@ -23,7 +23,7 @@ namespace AE::Graphics
         _cmdPool.Lock();
         CHECK_ERR( _cmdPool.IsReady() );
 
-        auto&   rts = RenderTaskScheduler();
+        auto&   rts = GraphicsScheduler();
         CHECK_ERR( _cmdPool.CommitIndirectBuffers( rts.GetCommandPoolManager(), GetQueueType(), GetCmdBufType(), &GetPrimaryCtxState() ));
 
         _cmdPool.GetCommands( cmdbufs.data(), OUT count, uint(cmdbufs.size()) );
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.cpp
index c4b2ee4c..7addf66d 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.cpp
@@ -19,14 +19,14 @@ namespace AE::Graphics::_hidden_
     {
         CHECK_THROW( task.IsValid() );
 
-        DBG_GRAPHICS_ONLY( RenderTaskScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );)
+        DBG_GRAPHICS_ONLY( GraphicsScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );)
     }
 
     _VDirectDrawCtx::_VDirectDrawCtx (const VPrimaryCmdBufState &state, VCommandBuffer cmdbuf) __Th___ :
         _VBaseDirectContext{ RVRef(cmdbuf) },   // throw
         _mngr{ state }                          // throw
     {
-        DBG_GRAPHICS_ONLY( RenderTaskScheduler().DbgCheckFrameId( _mngr.GetFrameId(), "DrawTask" );)
+        DBG_GRAPHICS_ONLY( GraphicsScheduler().DbgCheckFrameId( _mngr.GetFrameId(), "DrawTask" );)
     }
 
 /*
@@ -75,7 +75,7 @@ namespace AE::Graphics::_hidden_
         _VBaseIndirectContext{ RVRef(cmdbuf) }, // throw
         _mngr{ state }                          // throw
     {
-        DBG_GRAPHICS_ONLY( RenderTaskScheduler().DbgCheckFrameId( _mngr.GetFrameId(), "DrawTask" );)
+        DBG_GRAPHICS_ONLY( GraphicsScheduler().DbgCheckFrameId( _mngr.GetFrameId(), "DrawTask" );)
     }
 
     _VIndirectDrawCtx::_VIndirectDrawCtx (const DrawTask &task) __Th___ :
@@ -84,7 +84,7 @@ namespace AE::Graphics::_hidden_
     {
         CHECK_THROW( task.IsValid() );
 
-        DBG_GRAPHICS_ONLY( RenderTaskScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );)
+        DBG_GRAPHICS_ONLY( GraphicsScheduler().DbgCheckFrameId( _mngr.GetFrameId(), task.DbgFullName() );)
     }
 
 /*
@@ -173,7 +173,7 @@ namespace AE::Graphics::_hidden_
     _PushGraphicsConstant
 =================================================
 */
-    void  _VIndirectDrawCtx::_PushGraphicsConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    void  _VIndirectDrawCtx::_PushGraphicsConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         VALIDATE_GCTX( PushConstant( _states.pplnLayout, offset, size, values, stages ));
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.h b/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.h
index 57c4bbda..7c343afa 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VDrawContext.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    DrawCtx --> DirectDrawCtx   --> BarrierMngr --> Vulkan device 
+    DrawCtx --> DirectDrawCtx   --> BarrierMngr --> Vulkan device
             \-> IndirectDrawCtx --> BarrierMngr --> Backed commands
 */
 
@@ -102,7 +102,7 @@ namespace AE::Graphics::_hidden_
         _VDirectDrawCtx (const VPrimaryCmdBufState &state, VCommandBuffer cmdbuf)                                   __Th___;
 
         void  _BindPipeline (VkPipelineBindPoint bindPoint, VkPipeline ppln, VkPipelineLayout layout, EPipelineDynamicState dynStates);
-        void  _PushGraphicsConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages);
+        void  _PushGraphicsConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages);
 
         void  _SetDepthBias (float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor);
         void  _SetDepthBounds (float minDepthBounds, float maxDepthBounds);
@@ -223,7 +223,7 @@ namespace AE::Graphics::_hidden_
         _VIndirectDrawCtx (const VPrimaryCmdBufState &state, VSoftwareCmdBufPtr cmdbuf)                             __Th___;
 
         void  _BindPipeline (VkPipelineBindPoint bindPoint, VkPipeline ppln, VkPipelineLayout layout, EPipelineDynamicState dynStates);
-        void  _PushGraphicsConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages);
+        void  _PushGraphicsConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages);
 
         void  _SetDepthBias (float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor)       __Th___;
         void  _SetDepthBounds (float minDepthBounds, float maxDepthBounds)                                          __Th___;
@@ -272,9 +272,6 @@ namespace AE::Graphics::_hidden_
     {
     // types
     public:
-        static constexpr bool   IsDrawContext       = true;
-        static constexpr bool   IsVulkanDrawContext = true;
-
         using CmdBuf_t      = typename CtxImpl::CmdBuf_t;
     private:
         using RawCtx        = CtxImpl;
@@ -286,7 +283,7 @@ namespace AE::Graphics::_hidden_
     public:
         _VDrawContextImpl (const VPrimaryCmdBufState &state, CmdBuf_t cmdbuf)                                               __Th___;
         explicit _VDrawContextImpl (const DrawTask &task)                                                                   __Th___;
-        explicit _VDrawContextImpl (_VDrawContextImpl && other)                                                             __Th___;
+        explicit _VDrawContextImpl (_VDrawContextImpl &&other)                                                              __Th___;
 
         _VDrawContextImpl ()                                                                                                = delete;
         _VDrawContextImpl (const _VDrawContextImpl &)                                                                       = delete;
@@ -299,7 +296,7 @@ namespace AE::Graphics::_hidden_
         using RawCtx::BindDescriptorSet;
 
         void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th_OV;
-        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th_OV;
+        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th_OV;
         using IDrawContext::PushConstant;
 
         // dynamic states
@@ -460,7 +457,7 @@ namespace AE::Graphics::_hidden_
     {}
 
     template <typename C>
-    _VDrawContextImpl<C>::_VDrawContextImpl (_VDrawContextImpl && other) __Th___ :
+    _VDrawContextImpl<C>::_VDrawContextImpl (_VDrawContextImpl &&other) __Th___ :
         RawCtx{ other.GetPrimaryCtxState(), RVRef(other._cmdbuf) }  // throw
     {}
 
@@ -529,7 +526,7 @@ namespace AE::Graphics::_hidden_
 =================================================
 */
     template <typename C>
-    void  _VDrawContextImpl<C>::PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th___
+    void  _VDrawContextImpl<C>::PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th___
     {
         VALIDATE_GCTX( PushConstant( idx, size, typeName ));
         Unused( typeName );
@@ -745,7 +742,7 @@ namespace AE::Graphics::_hidden_
     template <typename C>
     void  _VDrawContextImpl<C>::BindVertexBuffers (uint firstBinding, ArrayView<BufferID> buffers, ArrayView<Bytes> offsets) __Th___
     {
-        STATIC_ASSERT( sizeof(Bytes) == sizeof(VkDeviceSize) );
+        StaticAssert( sizeof(Bytes) == sizeof(VkDeviceSize) );
         VALIDATE_GCTX( BindVertexBuffers( firstBinding, buffers, offsets ));
 
         StaticArray< VkBuffer, GraphicsConfig::MaxVertexBuffers >   dst_buffers;
@@ -1025,7 +1022,7 @@ namespace AE::Graphics::_hidden_
     _PushGraphicsConstant
 =================================================
 */
-    inline void  _VDirectDrawCtx::_PushGraphicsConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    inline void  _VDirectDrawCtx::_PushGraphicsConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         VALIDATE_GCTX( PushConstant( _states.pplnLayout, offset, size, values, stages ));
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.cpp
index 804d0ff0..2b429308 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.cpp
@@ -146,12 +146,12 @@ namespace
 */
     RC<VDrawCommandBatch>  _VDirectGraphicsCtx::_BeginFirstAsyncPass (const VPrimaryCmdBufState &primaryState, const RenderPassDesc &desc, DebugLabel dbg)
     {
-        return VRenderTaskScheduler::GraphicsContextApi::CreateFirstPassBatch( RenderTaskScheduler(), primaryState, desc, dbg );
+        return RenderTaskScheduler::GraphicsContextApi::CreateFirstPassBatch( GraphicsScheduler(), primaryState, desc, dbg );
     }
 
     RC<VDrawCommandBatch>  _VDirectGraphicsCtx::_BeginNextAsyncPass (const VDrawCommandBatch &prevPassBatch, DebugLabel dbg)
     {
-        return VRenderTaskScheduler::GraphicsContextApi::CreateNextPassBatch( RenderTaskScheduler(), prevPassBatch, dbg );
+        return RenderTaskScheduler::GraphicsContextApi::CreateNextPassBatch( GraphicsScheduler(), prevPassBatch, dbg );
     }
 
 /*
@@ -243,12 +243,12 @@ namespace
 */
     RC<VDrawCommandBatch>  _VIndirectGraphicsCtx::_BeginFirstAsyncPass (const VPrimaryCmdBufState &primaryState, const RenderPassDesc &desc, DebugLabel dbg)
     {
-        return VRenderTaskScheduler::GraphicsContextApi::CreateFirstPassBatch( RenderTaskScheduler(), primaryState, desc, dbg );
+        return RenderTaskScheduler::GraphicsContextApi::CreateFirstPassBatch( GraphicsScheduler(), primaryState, desc, dbg );
     }
 
     RC<VDrawCommandBatch>  _VIndirectGraphicsCtx::_BeginNextAsyncPass (const VDrawCommandBatch &prevPassBatch, DebugLabel dbg)
     {
-        return VRenderTaskScheduler::GraphicsContextApi::CreateNextPassBatch( RenderTaskScheduler(), prevPassBatch, dbg );
+        return RenderTaskScheduler::GraphicsContextApi::CreateNextPassBatch( GraphicsScheduler(), prevPassBatch, dbg );
     }
 
 /*
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.h b/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.h
index 0fd72009..0202cf6a 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VGraphicsContext.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    GraphicsCtx --> DirectGraphicsCtx   --> BarrierMngr --> Vulkan device 
+    GraphicsCtx --> DirectGraphicsCtx   --> BarrierMngr --> Vulkan device
                 \-> IndirectGraphicsCtx --> BarrierMngr --> Backed commands
 */
 
@@ -89,9 +89,6 @@ namespace AE::Graphics::_hidden_
     {
     // types
     public:
-        static constexpr bool   IsGraphicsContext       = true;
-        static constexpr bool   IsVulkanGraphicsContext = true;
-
         using DrawCtx       = typename CtxImpl::_DrawCtx;
         using CmdBuf_t      = typename CtxImpl::CmdBuf_t;
     private:
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VRayTracingContext.h b/AE/engine/src/graphics/Vulkan/Commands/VRayTracingContext.h
index e4baa955..25404cd1 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VRayTracingContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VRayTracingContext.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    RayTracingCtx --> DirectRayTracingCtx   --> BarrierMngr --> Vulkan device 
+    RayTracingCtx --> DirectRayTracingCtx   --> BarrierMngr --> Vulkan device
                   \-> IndirectRayTracingCtx --> BarrierMngr --> Backed commands
 */
 
@@ -53,7 +53,7 @@ namespace AE::Graphics::_hidden_
         _VDirectRayTracingCtx (const RenderTask &task, VCommandBuffer cmdbuf, DebugLabel dbg)                       __Th___ : VBaseDirectContext{ task, RVRef(cmdbuf), dbg, ECtxType::RayTracing } {}
 
         void  _BindPipeline (VkPipeline ppln, VkPipelineLayout layout);
-        void  _PushConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages);
+        void  _PushConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages);
         void  _SetStackSize (Bytes size);
 
         void  _TraceRaysIndirect2 (VkDeviceAddress indirectDeviceAddress);
@@ -104,7 +104,7 @@ namespace AE::Graphics::_hidden_
         _VIndirectRayTracingCtx (const RenderTask &task, VSoftwareCmdBufPtr cmdbuf, DebugLabel dbg)                 __Th___ : VBaseIndirectContext{ task, RVRef(cmdbuf), dbg, ECtxType::RayTracing } {}
 
         void  _BindPipeline (VkPipeline ppln, VkPipelineLayout layout);
-        void  _PushConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages);
+        void  _PushConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages);
         void  _SetStackSize (Bytes size);
 
         void  _TraceRaysIndirect2 (VkDeviceAddress indirectDeviceAddress);
@@ -126,9 +126,6 @@ namespace AE::Graphics::_hidden_
     {
     // types
     public:
-        static constexpr bool   IsRayTracingContext         = true;
-        static constexpr bool   IsVulkanRayTracingContext   = true;
-
         using CmdBuf_t      = typename CtxImpl::CmdBuf_t;
     private:
         using RawCtx        = CtxImpl;
@@ -149,7 +146,7 @@ namespace AE::Graphics::_hidden_
         void  BindPipeline (RayTracingPipelineID ppln)                                                                      __Th_OV;
         void  BindDescriptorSet (DescSetBinding index, DescriptorSetID ds, ArrayView<uint> dynamicOffsets = Default)        __Th_OV;
 
-        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th_OV;
+        void  PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th_OV;
         using IRayTracingContext::PushConstant;
 
         void  SetStackSize (Bytes size)                                                                                     __Th_OV { RawCtx::_SetStackSize( size ); }
@@ -228,7 +225,7 @@ namespace AE::Graphics::_hidden_
 =================================================
 */
     template <typename C>
-    void  _VRayTracingContextImpl<C>::PushConstant (const PushConstantIndex &idx, Bytes size, const void *values, const ShaderStructName &typeName) __Th___
+    void  _VRayTracingContextImpl<C>::PushConstant (const PushConstantIndex &idx, Bytes size, const void* values, const ShaderStructName &typeName) __Th___
     {
         VALIDATE_GCTX( PushConstant( idx, size, typeName ));
         Unused( typeName );
@@ -393,7 +390,7 @@ namespace AE::Graphics::_hidden_
     _PushConstant
 =================================================
 */
-    inline void  _VDirectRayTracingCtx::_PushConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    inline void  _VDirectRayTracingCtx::_PushConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         VALIDATE_GCTX( PushConstant( _states.pplnLayout, offset, size, values, stages ));
 
@@ -443,7 +440,7 @@ namespace AE::Graphics::_hidden_
     _PushConstant
 =================================================
 */
-    inline void  _VIndirectRayTracingCtx::_PushConstant (Bytes offset, Bytes size, const void *values, EShaderStages stages) __Th___
+    inline void  _VIndirectRayTracingCtx::_PushConstant (Bytes offset, Bytes size, const void* values, EShaderStages stages) __Th___
     {
         VALIDATE_GCTX( PushConstant( _states.pplnLayout, offset, size, values, stages ));
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.cpp b/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.cpp
index 49799f4e..ba01f1c8 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.cpp
+++ b/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.cpp
@@ -119,7 +119,7 @@ namespace AE::Graphics::_hidden_
         auto*   dst = static_cast< void *>(&cmd + 1);
         cmd.buffer  = buffer;
         cmd.offset  = offset;
-        cmd.size    = CheckCast< Bytes32u >( size );
+        cmd.size    = CheckCast< Byte32u >( size );
         MemCopy( OUT dst, data, size );
     }
 
diff --git a/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.h b/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.h
index fcb6924b..f4a250ce 100644
--- a/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.h
+++ b/AE/engine/src/graphics/Vulkan/Commands/VTransferContext.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    TransferCtx --> DirectTransferCtx   --> BarrierMngr --> Vulkan device 
+    TransferCtx --> DirectTransferCtx   --> BarrierMngr --> Vulkan device
                 \-> IndirectTransferCtx --> BarrierMngr --> Backed commands
 */
 
@@ -102,13 +102,9 @@ namespace AE::Graphics::_hidden_
     {
     // types
     public:
-        static constexpr bool   IsTransferContext       = true;
-        static constexpr bool   IsVulkanTransferContext = true;
-
         using CmdBuf_t          = typename CtxImpl::CmdBuf_t;
     private:
         static constexpr uint   _LocalArraySize         = 16;
-        static constexpr Bytes  _StagingBufOffsetAlign  = 4_b;
 
         using RawCtx            = CtxImpl;
         using AccumBar          = VAccumBarriers< _VTransferContextImpl< CtxImpl >>;
@@ -134,9 +130,6 @@ namespace AE::Graphics::_hidden_
         using RawCtx::UpdateBuffer;
         void  UpdateBuffer (BufferID buffer, Bytes offset, Bytes size, const void* data)                                        __Th_OV;
 
-        template <typename T>   void  UpdateBuffer (BufferID buffer, Bytes offset, ArrayView<T> data)                           __Th___ { return UpdateBuffer( buffer, offset, ArraySizeOf(data), data.data() ); }
-        template <typename T>   void  UpdateBuffer (BufferID buffer, Bytes offset, const Array<T> &data)                        __Th___ { return UpdateBuffer( buffer, offset, ArraySizeOf(data), data.data() ); }
-
         using RawCtx::FillBuffer;
         void  FillBuffer (BufferID buffer, Bytes offset, Bytes size, uint data)                                                 __Th_OV;
 
@@ -180,12 +173,13 @@ namespace AE::Graphics::_hidden_
 
         using RawCtx::GenerateMipmaps;
 
-        void  GenerateMipmaps (ImageID image)                                                                                   __Th_OV;
-        void  GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges)                                          __Th_OV;
+        void  GenerateMipmaps (ImageID image, EResourceState state)                                                             __Th_OV;
+        void  GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges, EResourceState state)                    __Th_OV;
 
         using ITransferContext::UpdateHostBuffer;
         using ITransferContext::UploadBuffer;
         using ITransferContext::UploadImage;
+        using ITransferContext::UpdateBuffer;
 
         uint3  MinImageTransferGranularity ()                                                                                   C_NE_OF;
 
@@ -707,27 +701,45 @@ namespace AE::Graphics::_hidden_
 =================================================
 */
     template <typename C>
-    void  _VTransferContextImpl<C>::GenerateMipmaps (ImageID image) __Th___
+    void  _VTransferContextImpl<C>::GenerateMipmaps (ImageID image, EResourceState state) __Th___
     {
         auto&                   img = _GetResourcesOrThrow( image );
         ImageDesc const&        desc = img.Description();
         ImageSubresourceRange   range;
 
-        range.aspectMask        = EPixelFormat_ToImageAspect( desc.format );
-        range.baseMipLevel      = 0_mipmap;
-        range.mipmapCount       = desc.maxLevel.Get();
-        range.baseLayer         = 0_layer;
-        range.layerCount        = desc.arrayLayers.Get();
+        range.aspectMask    = EPixelFormat_ToImageAspect( desc.format );
+        range.baseMipLevel  = 0_mipmap;
+        range.baseLayer     = 0_layer;
+        range.layerCount    = ushort(desc.arrayLayers.Get());
+
+        if ( state != Default and state != EResourceState::BlitSrc )
+        {
+            range.mipmapCount = 1;
+            this->ImageBarrier( image, state, EResourceState::BlitSrc, range );
+            this->CommitBarriers();
+        }
+
+        range.mipmapCount = ushort(desc.maxLevel.Get());
 
         VALIDATE_GCTX( GenerateMipmaps( img.Description(), {range} ));
         RawCtx::GenerateMipmaps( img.Handle(), desc.dimension, {range} );
     }
 
     template <typename C>
-    void  _VTransferContextImpl<C>::GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges) __Th___
+    void  _VTransferContextImpl<C>::GenerateMipmaps (ImageID image, ArrayView<ImageSubresourceRange> ranges, EResourceState state) __Th___
     {
         auto&               img = _GetResourcesOrThrow( image );
         ImageDesc const&    desc = img.Description();
+
+        if ( state != Default and state != EResourceState::BlitSrc )
+        {
+            for (auto range : ranges) {
+                range.mipmapCount = 1;
+                this->ImageBarrier( image, state, EResourceState::BlitSrc, range );
+            }
+            this->CommitBarriers();
+        }
+
         VALIDATE_GCTX( GenerateMipmaps( img.Description(), ranges ));
         RawCtx::GenerateMipmaps( img.Handle(), desc.dimension, ranges );
     }
diff --git a/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.cpp b/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.cpp
index bc758c7e..fac6fdbf 100644
--- a/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.cpp
+++ b/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.cpp
@@ -6,6 +6,15 @@
 
 namespace AE::Graphics
 {
+namespace
+{
+    static constexpr uint   c_MaxPoolAllocFails     = 4;
+    static constexpr uint   c_MaxDescriptorPoolSize = 1u << 11;
+    static constexpr uint   c_MaxDescriptorSets     = 1u << 10;
+    static constexpr uint   c_MaxChunks             = 1024;
+    static constexpr uint   c_MaxPoolAllocPerDS     = 1;
+    static constexpr uint   c_MaxDSAllocFails       = 30;
+}
 
 /*
 =================================================
@@ -14,7 +23,7 @@ namespace AE::Graphics
 */
     VDefaultDescriptorAllocator::~VDefaultDescriptorAllocator () __NE___
     {
-        VDevice const&  dev     = RenderTaskScheduler().GetDevice();
+        VDevice const&  dev     = GraphicsScheduler().GetDevice();
         Chunk*          chunk   = &_firstChunk;
 
         for (; chunk != null;)
@@ -46,7 +55,7 @@ namespace AE::Graphics
 */
     bool  VDefaultDescriptorAllocator::Allocate (DescriptorSetLayoutID layoutId, OUT Storage &ds) __NE___
     {
-        const auto&     res_mngr    = RenderTaskScheduler().GetResourceManager();
+        const auto&     res_mngr    = GraphicsScheduler().GetResourceManager();
         VDevice const&  dev         = res_mngr.GetDevice();
         const auto*     ds_layout   = res_mngr.GetResource( layoutId );
         CHECK_ERR( ds_layout != null );
@@ -59,10 +68,12 @@ namespace AE::Graphics
         info.pSetLayouts        = &layout;
 
         // search in chunks
-        Chunk*  chunk   = &_firstChunk;
-        auto*   next    = &chunk->next;
+        Chunk*  chunk           = &_firstChunk;
+        auto*   next            = &chunk->next;
+        uint    new_pool_count  = 0;
+        uint    fail_count      = 0;
 
-        for (uint chunk_idx = 0; chunk_idx < MaxChunks; ++chunk_idx)
+        for (uint chunk_idx = 0; chunk_idx < c_MaxChunks; ++chunk_idx)
         {
             ASSERT( chunk != null );
             next = &chunk->next;
@@ -75,32 +86,51 @@ namespace AE::Graphics
                     if ( bits.test( i ))
                         continue;
 
-                    auto&       pool = chunk->pools[i];
-                    DeferExLock lock{ pool.guard };
+                    auto&   pool = chunk->pools[i];
 
+                    if_unlikely( pool.allocFails.load() > c_MaxPoolAllocFails )
+                    {
+                        bits.set( i );
+                        continue;
+                    }
+
+                    DeferExLock lock{ pool.guard };
                     if_unlikely( not lock.try_lock() )
+                    {
+                        ThreadUtils::Pause();
                         continue;
+                    }
 
                     bits.set( i );
 
-                    if_unlikely( pool.allocFails > MaxAllocFails )
-                        continue;
-
                     if_unlikely( pool.handle == Default )
-                        CHECK_ERR( _CreateDSPool( dev, MaxDescriptorPoolSize, MaxDescriptorSets, OUT pool.handle ));
+                    {
+                        CHECK_ERR( new_pool_count < c_MaxPoolAllocPerDS );
+                        CHECK_ERR( _CreateDSPool( dev, c_MaxDescriptorPoolSize, c_MaxDescriptorSets, OUT pool.handle ));
+                        ++new_pool_count;
+                    }
 
                     info.descriptorPool = pool.handle;
-                    if_unlikely( dev.vkAllocateDescriptorSets( dev.GetVkDevice(), &info, OUT &ds.handle ) != VK_SUCCESS )
+
+                    auto    err = dev.vkAllocateDescriptorSets( dev.GetVkDevice(), &info, OUT &ds.handle );
+                    switch ( err )
                     {
-                        ++pool.allocFails;
-                        continue;
-                    }
+                        case_likely VK_SUCCESS :
+                            ds.data.Ref<uint>() = chunk_idx * PoolsPerChunk + uint(i);
+                            return true;
+
+                        case VK_ERROR_OUT_OF_POOL_MEMORY :
+                            fail_count += 10u - Min( pool.allocFails.fetch_add(1), 10u );   // 0 fails -> +10
+                            break;
 
-                    ds.data.Ref<uint>() = chunk_idx * PoolsPerChunk + uint(i);
-                    return true;
+                        default :
+                            VK_CHECK( err );    break;
+                    }
                 }
             }
 
+            CHECK_ERR_MSG( fail_count < c_MaxDSAllocFails, "too mush attempts to allocate DS" );
+
             chunk = next->load();
             if_likely( chunk != null )
                 continue;
@@ -108,7 +138,9 @@ namespace AE::Graphics
             // allocate new chunk
             auto*   new_chunk = new Chunk{};
 
-            if_unlikely( not next->CAS_Loop( INOUT chunk, new_chunk ))
+            if_likely( next->CAS_Loop( INOUT chunk, new_chunk ))
+                chunk = new_chunk;
+            else
                 delete new_chunk;
         }
         return false;
@@ -123,11 +155,11 @@ namespace AE::Graphics
     {
         CHECK_ERRV( ds.handle != Default );
 
-        auto&       dev         = RenderTaskScheduler().GetDevice();
+        auto&       dev         = GraphicsScheduler().GetDevice();
         Chunk*      chunk       = &_firstChunk;
         const uint  chunk_idx   = ds.data.Ref<uint>() / PoolsPerChunk;
 
-        for (uint c = 0; (c < MaxChunks) & (chunk != null); ++c)
+        for (uint c = 0; (c < c_MaxChunks) & (chunk != null); ++c)
         {
             if_likely( c != chunk_idx )
             {
@@ -136,12 +168,12 @@ namespace AE::Graphics
             }
 
             auto&   pool = chunk->pools[ ds.data.Ref<uint>() % PoolsPerChunk ];
-            EXLOCK( pool.guard );   
+            EXLOCK( pool.guard );
 
             VK_CHECK( dev.vkFreeDescriptorSets( dev.GetVkDevice(), pool.handle, 1, &ds.handle ));   // TODO: delayed destroy
 
-            pool.allocFails = 0;    // allow to try allocate
-            ds.handle       = Default;
+            pool.allocFails.store( 0 ); // allow to try allocate
+            ds.handle = Default;
             return;
         }
 
@@ -172,20 +204,20 @@ namespace AE::Graphics
             switch ( EDescriptorType(t) )
             {
                 case EDescriptorType::UniformBuffer :
-                    size.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
-                    size.descriptorCount *= 4;
+                    size.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
                     pool_sizes.emplace( size.type, size );
 
-                    size.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
+                    size.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
+                    size.descriptorCount *= 4;
                     pool_sizes.emplace( size.type, size );
                     break;
 
                 case EDescriptorType::StorageBuffer :
-                    size.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
-                    size.descriptorCount *= 2;
+                    size.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC;
                     pool_sizes.emplace( size.type, size );
 
-                    size.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC;
+                    size.type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER;
+                    size.descriptorCount *= 4;
                     pool_sizes.emplace( size.type, size );
                     break;
 
@@ -201,11 +233,13 @@ namespace AE::Graphics
 
                 case EDescriptorType::StorageImage :
                     size.type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
+                    size.descriptorCount *= 2;
                     pool_sizes.emplace( size.type, size );
                     break;
 
                 case EDescriptorType::SampledImage :
                     size.type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
+                    size.descriptorCount *= 4;
                     pool_sizes.emplace( size.type, size );
                     break;
 
@@ -217,16 +251,19 @@ namespace AE::Graphics
 
                 case EDescriptorType::SubpassInput :
                     size.type = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
+                    size.descriptorCount /= 2;
                     pool_sizes.emplace( size.type, size );
                     break;
 
                 case EDescriptorType::Sampler :
-                    size.type = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
+                    size.type = VK_DESCRIPTOR_TYPE_SAMPLER;
+                    size.descriptorCount /= 2;
                     pool_sizes.emplace( size.type, size );
                     break;
 
                 case EDescriptorType::RayTracingScene :
                     size.type = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
+                    size.descriptorCount /= 2;
                     pool_sizes.emplace( size.type, size );
                     break;
 
diff --git a/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.h b/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.h
index ca544eee..f24bd1fd 100644
--- a/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.h
+++ b/AE/engine/src/graphics/Vulkan/Descriptors/VDefaultDescriptorAllocator.h
@@ -18,16 +18,12 @@ namespace AE::Graphics
     {
     // types
     private:
-        static constexpr uint   PoolsPerChunk           = 8;
-        static constexpr uint   MaxDescriptorPoolSize   = 1u << 11;
-        static constexpr uint   MaxDescriptorSets       = 1u << 10;
-        static constexpr uint   MaxAllocFails           = 2;
-        static constexpr uint   MaxChunks               = 1024;
+        static constexpr uint   PoolsPerChunk   = 8;
 
         struct DSPool
         {
             SpinLock            guard;
-            uint                allocFails  = 0;
+            Atomic<uint>        allocFails  {0};
             VkDescriptorPool    handle      = Default;
         };
 
diff --git a/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.cpp b/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.cpp
index 1a4199ff..864fa6b3 100644
--- a/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.cpp
+++ b/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.cpp
@@ -48,7 +48,7 @@ namespace
 =================================================
 */
     VDescriptorUpdater::VDescriptorUpdater () __NE___ :
-        _resMngr{RenderTaskScheduler().GetResourceManager()}
+        _resMngr{GraphicsScheduler().GetResourceManager()}
     {}
 
 /*
@@ -118,7 +118,7 @@ namespace
         _descSetId.Attach( descrSetId );
         _dsHandle = desc_set->Handle();
 
-        auto*   ds_layout = _resMngr.GetResource( desc_set->LayoutID(), False{"don't inc ref"}, True{"quiet"} );
+        auto*   ds_layout = _resMngr.GetResource( desc_set->LayoutId(), False{"don't inc ref"}, True{"quiet"} );
         CHECK_ERR( ds_layout != null );
         _dsLayout = ds_layout;
 
@@ -200,7 +200,7 @@ namespace
 =================================================
 */
     template <EDescriptorType DescType>
-    Tuple< const VDescriptorUpdater::Uniform_t*, const Bytes16u* >
+    Tuple< const VDescriptorUpdater::Uniform_t*, const Byte16u* >
         VDescriptorUpdater::_FindUniform (const UniformName &name) const
     {
         const auto  uniforms    = _dsLayout->GetUniformRange<DescType>();
@@ -244,32 +244,32 @@ namespace
 
     uint  VDescriptorUpdater::ImageCount (const UniformName &name) C_NE___
     {
-        return _GetArraySize<EDescriptorType::StorageImage>( name );
+        return _GetArraySize<DT::StorageImage>( name );
     }
 
     uint  VDescriptorUpdater::TextureCount (const UniformName &name) C_NE___
     {
-        return _GetArraySize<EDescriptorType::StorageImage>( name );
+        return _GetArraySize<DT::StorageImage>( name );
     }
 
     uint  VDescriptorUpdater::SamplerCount (const UniformName &name) C_NE___
     {
-        return _GetArraySize<EDescriptorType::Sampler>( name );
+        return _GetArraySize<DT::Sampler>( name );
     }
 
     uint  VDescriptorUpdater::BufferCount (const UniformName &name) C_NE___
     {
-        return _GetArraySize<EDescriptorType::UniformBuffer>( name );
+        return _GetArraySize<DT::UniformBuffer>( name );
     }
 
     uint  VDescriptorUpdater::TexelBufferCount (const UniformName &name) C_NE___
     {
-        return _GetArraySize<EDescriptorType::UniformTexelBuffer>( name );
+        return _GetArraySize<DT::UniformTexelBuffer>( name );
     }
 
     uint  VDescriptorUpdater::RayTracingSceneCount (const UniformName &name) C_NE___
     {
-        return _GetArraySize<EDescriptorType::RayTracingScene>( name );
+        return _GetArraySize<DT::RayTracingScene>( name );
     }
 
 /*
@@ -302,7 +302,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::StorageImage>( name );
+        auto [un, off] = _FindUniform<DT::StorageImage>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( AnyEqual( un->type, DT::StorageImage, DT::SampledImage, DT::CombinedImage_ImmutableSampler, DT::SubpassInput ));
@@ -325,10 +325,10 @@ namespace
             VkWriteDescriptorSet&   wds = _updDesc.descriptors[ _updDesc.index++ ];
             wds = {};
             wds.sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            wds.descriptorType  = un->type == EDescriptorType::StorageImage ?   VK_DESCRIPTOR_TYPE_STORAGE_IMAGE :
-                                  un->type == EDescriptorType::SampledImage ?   VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE :
-                                  un->type == EDescriptorType::SubpassInput ?   VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT :
-                                  un->type == EDescriptorType::CombinedImage_ImmutableSampler ? VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER :
+            wds.descriptorType  = un->type == DT::StorageImage ?    VK_DESCRIPTOR_TYPE_STORAGE_IMAGE :
+                                  un->type == DT::SampledImage ?    VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE :
+                                  un->type == DT::SubpassInput ?    VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT :
+                                  un->type == DT::CombinedImage_ImmutableSampler ? VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER :
                                                                                 VK_DESCRIPTOR_TYPE_MAX_ENUM;
             wds.dstArrayElement = firstIndex;
             wds.descriptorCount = uint(images.size());
@@ -345,13 +345,13 @@ namespace
                 CHECK_ERR( view != null );
 
                 DEBUG_ONLY(
-                    auto*   img = _resMngr.GetResource( view->Image() );
+                    auto*   img = _resMngr.GetResource( view->ImageId() );
                     CHECK_ERR( img != null );
 
                     const auto& desc        = img->Description();
-                    const bool  is_sampled  = un->type == EDescriptorType::SampledImage and un->type == EDescriptorType::CombinedImage_ImmutableSampler;
-                    const bool  is_storage  = un->type == EDescriptorType::StorageImage;
-                    const bool  is_sp_input = un->type == EDescriptorType::SubpassInput;
+                    const bool  is_sampled  = un->type == DT::SampledImage and un->type == DT::CombinedImage_ImmutableSampler;
+                    const bool  is_storage  = un->type == DT::StorageImage;
+                    const bool  is_sp_input = un->type == DT::SubpassInput;
                     const auto  img_type    = GetImageType( desc, view->Description() );
 
                     ASSERT( not is_sampled  or is_sampled  == AllBits( desc.usage, EImageUsage::Sampled ));
@@ -426,7 +426,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::StorageImage>( name );
+        auto [un, off] = _FindUniform<DT::StorageImage>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( un->type == DT::CombinedImage );
@@ -468,7 +468,7 @@ namespace
                 CHECK_ERR( view != null );
 
                 DEBUG_ONLY(
-                    auto*   img = _resMngr.GetResource( view->Image() );
+                    auto*   img = _resMngr.GetResource( view->ImageId() );
                     CHECK_ERR( img != null );
 
                     const auto& desc        = img->Description();
@@ -533,7 +533,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::Sampler>( name );
+        auto [un, off] = _FindUniform<DT::Sampler>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( un->type == DT::Sampler );
@@ -621,7 +621,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::UniformBuffer>( name );
+        auto [un, off] = _FindUniform<DT::UniformBuffer>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( AnyEqual( un->type, DT::UniformBuffer, DT::StorageBuffer ));
@@ -630,8 +630,8 @@ namespace
         CHECK_ERR( typeName == Default or typeName == un->buffer.typeName );
 
         DEBUG_ONLY(
-            const bool  is_uniform  = un->type == EDescriptorType::UniformBuffer;
-            const bool  is_storage  = un->type == EDescriptorType::StorageBuffer;
+            const bool  is_uniform  = un->type == DT::UniformBuffer;
+            const bool  is_storage  = un->type == DT::StorageBuffer;
             const auto& props       = _resMngr.GetDevice().GetDeviceProperties().res;
             const auto  max_size    = is_uniform ? Bytes{props.maxUniformBufferRange} : UMax;
         )
@@ -653,8 +653,8 @@ namespace
             VkWriteDescriptorSet&   wds = _updDesc.descriptors[ _updDesc.index++ ];
             wds = {};
             wds.sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            wds.descriptorType  = un->type == EDescriptorType::UniformBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER) :
-                                  un->type == EDescriptorType::StorageBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_STORAGE_BUFFER) :
+            wds.descriptorType  = un->type == DT::UniformBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER) :
+                                  un->type == DT::StorageBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_STORAGE_BUFFER) :
                                                                                 VK_DESCRIPTOR_TYPE_MAX_ENUM;
             wds.dstArrayElement = firstIndex;
             wds.descriptorCount = uint(buffers.size());
@@ -708,7 +708,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::UniformBuffer>( name );
+        auto [un, off] = _FindUniform<DT::UniformBuffer>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( AnyEqual( un->type, DT::UniformBuffer, DT::StorageBuffer ));
@@ -716,8 +716,8 @@ namespace
         CHECK_ERR( typeName == Default or typeName == un->buffer.typeName );
 
         DEBUG_ONLY(
-            const bool  is_uniform  = un->type == EDescriptorType::UniformBuffer;
-            const bool  is_storage  = un->type == EDescriptorType::StorageBuffer;
+            const bool  is_uniform  = un->type == DT::UniformBuffer;
+            const bool  is_storage  = un->type == DT::StorageBuffer;
             const auto& props       = _resMngr.GetDevice().GetDeviceProperties().res;
             const auto  min_align   = Bytes{ is_uniform ? props.minUniformBufferOffsetAlign : props.minStorageBufferOffsetAlign };
             const auto  max_size    = is_uniform ? Bytes{props.maxUniformBufferRange} : UMax;
@@ -740,8 +740,8 @@ namespace
             VkWriteDescriptorSet&   wds = _updDesc.descriptors[ _updDesc.index++ ];
             wds = {};
             wds.sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            wds.descriptorType  = un->type == EDescriptorType::UniformBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER) :
-                                  un->type == EDescriptorType::StorageBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_STORAGE_BUFFER) :
+            wds.descriptorType  = un->type == DT::UniformBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER) :
+                                  un->type == DT::StorageBuffer ? (is_dynamic ? VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_STORAGE_BUFFER) :
                                                                                 VK_DESCRIPTOR_TYPE_MAX_ENUM;
             wds.dstArrayElement = elementIndex;
             wds.descriptorCount = 1;
@@ -803,7 +803,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::UniformBuffer>( name );
+        auto [un, off] = _FindUniform<DT::UniformBuffer>( name );
         CHECK_ERR( un != null );
 
         return un->buffer.typeName;
@@ -839,7 +839,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::UniformTexelBuffer>( name );
+        auto [un, off] = _FindUniform<DT::UniformTexelBuffer>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( AnyEqual( un->type, DT::UniformTexelBuffer, DT::StorageTexelBuffer ));
@@ -861,8 +861,8 @@ namespace
             VkWriteDescriptorSet&   wds = _updDesc.descriptors[ _updDesc.index++ ];
             wds = {};
             wds.sType           = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
-            wds.descriptorType  = un->type == EDescriptorType::UniformTexelBuffer ? VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER :
-                                  un->type == EDescriptorType::StorageTexelBuffer ? VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER :
+            wds.descriptorType  = un->type == DT::UniformTexelBuffer ? VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER :
+                                  un->type == DT::StorageTexelBuffer ? VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER :
                                                                                     VK_DESCRIPTOR_TYPE_MAX_ENUM;
             wds.dstArrayElement = firstIndex;
             wds.descriptorCount = uint(views.size());
@@ -879,12 +879,12 @@ namespace
                 CHECK_ERR( view != null );
 
                 DEBUG_ONLY(
-                    auto*   buf = _resMngr.GetResource( view->Buffer() );
+                    auto*   buf = _resMngr.GetResource( view->BufferId() );
                     CHECK_ERR( buf != null );
 
                     const auto& desc        = buf->Description();
-                    const bool  is_uniform  = un->type == EDescriptorType::UniformTexelBuffer;
-                    const bool  is_storage  = un->type == EDescriptorType::StorageTexelBuffer;
+                    const bool  is_uniform  = un->type == DT::UniformTexelBuffer;
+                    const bool  is_storage  = un->type == DT::StorageTexelBuffer;
                     const auto  img_type    = GetImageType( view->Description() );
 
                     ASSERT( not is_uniform or is_uniform == AllBits( desc.usage, EBufferUsage::UniformTexel ));
@@ -942,7 +942,7 @@ namespace
     {
         DRC_SHAREDLOCK( _drCheck );
 
-        auto [un, off] = _FindUniform<EDescriptorType::RayTracingScene>( name );
+        auto [un, off] = _FindUniform<DT::RayTracingScene>( name );
 
         CHECK_ERR( un != null );
         CHECK_ERR( un->type == DT::RayTracingScene );
diff --git a/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.h b/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.h
index 835eb44c..e693b25c 100644
--- a/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.h
+++ b/AE/engine/src/graphics/Vulkan/Descriptors/VDescriptorUpdater.h
@@ -43,7 +43,7 @@ namespace AE::Graphics
     private:
         VResourceManager &              _resMngr;
         Ptr<const VDescriptorSetLayout> _dsLayout;      // strong ref in '_descSetId'
-        VkDescriptorSet                 _dsHandle       = Default;  
+        VkDescriptorSet                 _dsHandle       = Default;
 
         EDescUpdateMode                 _mode           = Default;
         union {
@@ -137,7 +137,7 @@ namespace AE::Graphics
         ND_ bool  _UseUpdateTemplate () const   { return _mode == EDescUpdateMode::UpdateTemplate; }
 
         template <EDescriptorType DescType>
-        ND_ Tuple< const Uniform_t*, const Bytes16u* >  _FindUniform (const UniformName &name) const;
+        ND_ Tuple< const Uniform_t*, const Byte16u* >  _FindUniform (const UniformName &name) const;
 
         template <EDescriptorType DescType>
         ND_ uint  _GetArraySize (const UniformName &name) const;
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VBuffer.cpp b/AE/engine/src/graphics/Vulkan/Resources/VBuffer.cpp
index d0210e77..899cef8e 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VBuffer.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VBuffer.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_ENABLE_VULKAN
+# include "graphics/Private/ResourceValidation.h"
 # include "graphics/Vulkan/Resources/VBuffer.h"
 # include "graphics/Vulkan/VResourceManager.h"
 # include "graphics/Vulkan/VEnumCast.h"
@@ -35,7 +36,6 @@ namespace AE::Graphics
 
         _desc = desc;
         _desc.Validate();
-
         GRES_CHECK( IsSupported( resMngr, _desc ));
 
         auto&   dev = resMngr.GetDevice();
@@ -205,34 +205,7 @@ namespace AE::Graphics
 */
     bool  VBuffer::IsSupported (const VResourceManager &resMngr, const BufferDesc &desc) __NE___
     {
-        STATIC_ASSERT( uint(EBufferOpt::All) == 0x1F );
-
-        const auto&     dev         = resMngr.GetDevice();
-        const auto&     res_flags   = dev.GetResourceFlags();
-
-        if_unlikely( desc.size == 0 )
-            return false;
-
-        if_unlikely( desc.usage == Default or desc.memType == Default )
-            return false;
-
-        // validate usage
-        if_unlikely( not AllBits( res_flags.bufferUsage, desc.usage ))
-            return false;
-
-        // validate options
-        if_unlikely( desc.options != Default and not AllBits( res_flags.bufferOptions, desc.options ))
-            return false;
-
-        // validate memory type
-        if_unlikely( not res_flags.memTypes.contains( desc.memType & ~EMemoryType::_External ))
-            return false;
-
-        // check supported features in FS
-        if_unlikely( not resMngr.GetFeatureSet().IsSupported( desc ))
-            return false;
-
-        return true;
+        return Buffer_IsSupported( resMngr, desc );
     }
 
 /*
@@ -243,18 +216,14 @@ namespace AE::Graphics
     bool  VBuffer::IsSupported (const VResourceManager &resMngr, const BufferViewDesc &view) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
-        STATIC_ASSERT( uint(EBufferUsage::All) == 0x1FFF );
-        STATIC_ASSERT( uint(EBufferOpt::All) == 0x1F );
+        StaticAssert( uint(EBufferUsage::All) == 0x1FFF );
+        StaticAssert( uint(EBufferOpt::All) == 0x1F );
 
-        const auto&     dev         = resMngr.GetDevice();
-        constexpr auto  view_usage  = EBufferUsage::UniformTexel | EBufferUsage::StorageTexel;
-        const auto&     props       = dev.GetDeviceProperties();
-
-        if_unlikely( not AnyBits( _desc.usage, view_usage ))
+        if_unlikely( not BufferView_IsSupported( resMngr, _desc, view ))
             return false;
 
-        if_unlikely( view.format == Default or view.format >= EPixelFormat::_Count )
-            return false;
+        const auto&     dev     = resMngr.GetDevice();
+        const auto&     props   = dev.GetDeviceProperties();
 
         VkFormatProperties  fmt_props = {};
         vkGetPhysicalDeviceFormatProperties( dev.GetVkPhysicalDevice(), VEnumCast( view.format ), OUT &fmt_props );
@@ -285,10 +254,6 @@ namespace AE::Graphics
                      not IsMultipleOf( view.offset, props.res.minStorageTexelBufferOffsetAlign ))
             return false;
 
-        // check supported view formats in FS
-        if_unlikely( not resMngr.GetFeatureSet().IsSupported( _desc, view ))
-            return false;
-
         return true;
     }
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VBuffer.h b/AE/engine/src/graphics/Vulkan/Resources/VBuffer.h
index 1b7d41df..1a0d24d3 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VBuffer.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VBuffer.h
@@ -34,9 +34,9 @@ namespace AE::Graphics
         VBuffer ()                                      __NE___ {}
         ~VBuffer ()                                     __NE___;
 
-        ND_ bool  Create (VResourceManager &, const BufferDesc &desc, GfxMemAllocatorPtr allocator, StringView dbgName)         __NE___;
-        ND_ bool  Create (VResourceManager &, const VulkanBufferDesc &desc, GfxMemAllocatorPtr allocator, StringView dbgName)   __NE___;
-            void  Destroy (VResourceManager &)                                                                                  __NE___;
+        ND_ bool  Create (VResourceManager &, const BufferDesc &, GfxMemAllocatorPtr, StringView dbgName)       __NE___;
+        ND_ bool  Create (VResourceManager &, const VulkanBufferDesc &, GfxMemAllocatorPtr, StringView dbgName) __NE___;
+            void  Destroy (VResourceManager &)                                                                  __NE___;
 
         ND_ VulkanBufferDesc    GetNativeDescription () C_NE___;
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VBufferView.cpp b/AE/engine/src/graphics/Vulkan/Resources/VBufferView.cpp
index 0ed45acf..191ae230 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VBufferView.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VBufferView.cpp
@@ -33,6 +33,7 @@ namespace AE::Graphics
         CHECK_ERR( buffer != null );
 
         _bufferId = Strong<BufferID>{bufferId};
+        _canBeDestroyed = true;
 
         _desc = desc;
         _desc.Validate( buffer->Description() );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VBufferView.h b/AE/engine/src/graphics/Vulkan/Resources/VBufferView.h
index c87b8835..1a2f4908 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VBufferView.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VBufferView.h
@@ -31,13 +31,13 @@ namespace AE::Graphics
         VBufferView ()                                  __NE___ {}
         ~VBufferView ()                                 __NE___;
 
-        ND_ bool  Create (VResourceManager &, const BufferViewDesc &desc, BufferID bufferId, StringView dbgName)        __NE___;
-        ND_ bool  Create (VResourceManager &, const VulkanBufferViewDesc &desc, BufferID bufferId, StringView dbgName)  __NE___;
-            void  Destroy (VResourceManager &)                                                                          __NE___;
+        ND_ bool  Create (VResourceManager &, const BufferViewDesc &, BufferID, StringView dbgName)         __NE___;
+        ND_ bool  Create (VResourceManager &, const VulkanBufferViewDesc &, BufferID, StringView dbgName)   __NE___;
+            void  Destroy (VResourceManager &)                                                              __NE___;
 
         ND_ VkBufferView            Handle ()           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _bufferView; }
         ND_ BufferViewDesc const&   Description ()      C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _desc; }
-        ND_ BufferID                Buffer ()           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _bufferId; }
+        ND_ BufferID                BufferId ()         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _bufferId; }
 
         DEBUG_ONLY(  ND_ StringView  GetDebugName ()    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.cpp b/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.cpp
index 9e5b0d65..58e3c1e5 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.cpp
@@ -152,7 +152,7 @@ namespace AE::Graphics
     ParseShaderTrace
 =================================================
 */
-    bool  VComputePipeline::ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
+    bool  VComputePipeline::ParseShaderTrace (const void* ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
         return _dbgTrace and _dbgTrace->ParseShaderTrace( ptr, maxSize, ConvertLogFormat(format), OUT result );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.h b/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.h
index 891a0541..b7c00b7e 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VComputePipeline.h
@@ -44,23 +44,27 @@ namespace AE::Graphics
 
     // methods
     public:
-        VComputePipeline ()                                         __NE___ {}
-        ~VComputePipeline ()                                        __NE___;
-
-        ND_ bool  Create (VResourceManager &, const CreateInfo &ci) __NE___;
-            void  Destroy (VResourceManager &)                      __NE___;
-
-        ND_ bool  ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat, OUT Array<String> &result) C_NE___;
-
-        ND_ VkPipeline              Handle ()                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
-        ND_ VkPipelineLayout        Layout ()                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
-        ND_ VkPipelineBindPoint     BindPoint ()                    C_NE___ { return VK_PIPELINE_BIND_POINT_COMPUTE; }
-        ND_ PipelineLayoutID        LayoutID ()                     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
-        ND_ uint3                   LocalSize ()                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint3{_localSize}; }
-        ND_ EPipelineDynamicState   DynamicState ()                 C_NE___ { return Default; }
-        ND_ bool                    AllowDispatchBase ()            C_NE___ { DRC_SHAREDLOCK( _drCheck );  return AllBits( _options, EPipelineOpt::CS_DispatchBase ); }
-
-        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
+        VComputePipeline ()                                                 __NE___ {}
+        ~VComputePipeline ()                                                __NE___;
+
+        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)         __NE___;
+            void  Destroy (VResourceManager &)                              __NE___;
+
+        ND_ bool  ParseShaderTrace (const void*                 ptr,
+                                    Bytes                       maxSize,
+                                    ShaderDebugger::ELogFormat  logFmt,
+                                    OUT Array<String>           &result)    C_NE___;
+
+        ND_ VkPipeline              Handle ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
+        ND_ VkPipelineLayout        Layout ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
+        ND_ VkPipelineBindPoint     BindPoint ()                            C_NE___ { return VK_PIPELINE_BIND_POINT_COMPUTE; }
+        ND_ PipelineLayoutID        LayoutId ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
+        ND_ uint3                   LocalSize ()                            C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint3{_localSize}; }
+        ND_ EPipelineDynamicState   DynamicState ()                         C_NE___ { return Default; }
+        ND_ EPipelineOpt            Options ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _options; }
+        ND_ bool                    AllowDispatchBase ()                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return AllBits( _options, EPipelineOpt::CS_DispatchBase ); }
+
+        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
 
 } // AE::Graphics
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSet.h b/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSet.h
index 72f1a7c2..fb386418 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSet.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSet.h
@@ -41,7 +41,7 @@ namespace AE::Graphics
             void  Destroy (VResourceManager &)                                                                                      __NE___;
 
         ND_ VkDescriptorSet         Handle ()       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _descrSet.handle; }
-        ND_ DescriptorSetLayoutID   LayoutID ()     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
+        ND_ DescriptorSetLayoutID   LayoutId ()     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
 
         DEBUG_ONLY( ND_ StringView  GetDebugName () C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.cpp b/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.cpp
index 52988e30..a5a43f04 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.cpp
@@ -133,7 +133,7 @@ namespace AE::Graphics
     _AddUniform
 =================================================
 */
-    bool  VDescriptorSetLayout::_AddUniform (const Uniform_t &un, ArrayView<VkSampler> samplerStorage, OUT Bytes16u* offset, INOUT DescriptorBinding &binding) C_NE___
+    bool  VDescriptorSetLayout::_AddUniform (const Uniform_t &un, ArrayView<VkSampler> samplerStorage, OUT Byte16u* offset, INOUT DescriptorBinding &binding) C_NE___
     {
         static constexpr Bytes  align = Max( Max( AlignOf<VkDescriptorBufferInfo>, AlignOf<VkBufferView> ),
                                              Max( AlignOf<VkDescriptorImageInfo>, AlignOf<VkWriteDescriptorSetAccelerationStructureKHR> ));
@@ -257,7 +257,7 @@ namespace AE::Graphics
         const bool  is_dynamic = buf.dynamicOffsetIndex != UMax;
 
         if ( is_dynamic ) {
-            bind.descriptorType = 
+            bind.descriptorType =
                 bind.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER ? VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC :
                 bind.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ? VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC : VK_DESCRIPTOR_TYPE_MAX_ENUM;
         }
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.h b/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.h
index 74b63dcb..f19fd359 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VDescriptorSetLayout.h
@@ -21,7 +21,7 @@ namespace AE::Graphics
     public:
         using UniformOffsets_t  = PipelineCompiler::DescriptorSetLayoutDesc::UniformOffsets_t;
         using Uniform_t         = PipelineCompiler::DescriptorSetLayoutDesc::Uniform;
-        using Uniforms_t        = Tuple< uint, UniformName::Optimized_t const*, Uniform_t const*, Bytes16u* >;
+        using Uniforms_t        = Tuple< uint, UniformName::Optimized_t const*, Uniform_t const*, Byte16u* >;
 
         struct CreateInfo
         {
@@ -49,7 +49,7 @@ namespace AE::Graphics
         VkDescriptorUpdateTemplate  _updateTmpl     = Default;
 
         uint                        _bindCount      = 0;
-        Bytes32u                    _updateTmplSize;
+        Byte32u                     _updateTmplSize;
 
         #include "graphics/Private/DescriptorSetLayout.h"
 
@@ -70,7 +70,7 @@ namespace AE::Graphics
 
 
     private:
-        ND_ bool  _AddUniform (const Uniform_t &un, ArrayView<VkSampler> samplerStorage, OUT Bytes16u* offset, INOUT DescriptorBinding &binding)C_NE___;
+        ND_ bool  _AddUniform (const Uniform_t &un, ArrayView<VkSampler> samplerStorage, OUT Byte16u* offset, INOUT DescriptorBinding &binding)C_NE___;
             void  _AddBuffer (const Buffer &buf, INOUT VkDescriptorSetLayoutBinding &bind, INOUT DescriptorBinding &binding)                    C_NE___;
     };
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VFramebuffer.cpp b/AE/engine/src/graphics/Vulkan/Resources/VFramebuffer.cpp
index 077d9449..b73f3ebd 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VFramebuffer.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VFramebuffer.cpp
@@ -111,11 +111,11 @@ namespace AE::Graphics
 
             image_views[ idx ]  = view->Handle();
             _attachments[ idx ] = att.imageView;
-            _images[ idx ]      = view->Image();
+            _images[ idx ]      = view->ImageId();
 
             #ifdef AE_DEBUG
             {
-                const auto  att_fmt = resMngr.GetDescription( view->Image() ).format;
+                const auto  att_fmt = resMngr.GetDescription( view->ImageId() ).format;
                 const auto  rp_fmt  = ren_pass->GetPixelFormat( idx );
 
                 if ( att_fmt != rp_fmt )
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.cpp b/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.cpp
index 64bb72b3..8a6e03af 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.cpp
@@ -179,7 +179,7 @@ namespace AE::Graphics
     ParseShaderTrace
 =================================================
 */
-    bool  VGraphicsPipeline::ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
+    bool  VGraphicsPipeline::ParseShaderTrace (const void* ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
     {
         result.clear();
         DRC_SHAREDLOCK( _drCheck );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.h b/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.h
index a9581523..1cb1fdf3 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VGraphicsPipeline.h
@@ -24,7 +24,7 @@ namespace AE::Graphics
             PipelineLayoutID                                        layoutId;
             ArrayView< VPipelinePack::ShaderModuleRef >             shaders;
             PipelineCacheID                                         cacheId;
-            VPipelinePack::Allocator_t *                            allocator   = null;
+            IAllocator *                                            allocator   = null;
         };
 
     private:
@@ -54,26 +54,30 @@ namespace AE::Graphics
 
     // methods
     public:
-        VGraphicsPipeline ()                                            __NE___ {}
-        ~VGraphicsPipeline ()                                           __NE___;
-
-        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)     __NE___;
-            void  Destroy (VResourceManager &)                          __NE___;
-
-        ND_ uint  GetVertexBufferIndex (const VertexBufferName &name)   C_NE___;
-
-        ND_ bool  ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat, OUT Array<String> &result) C_NE___;
-
-        ND_ VkPipeline              Handle ()                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
-        ND_ VkPipelineLayout        Layout ()                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
-        ND_ VkPipelineBindPoint     BindPoint ()                        C_NE___ { return VK_PIPELINE_BIND_POINT_GRAPHICS; }
-        ND_ PipelineLayoutID        LayoutID ()                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
-        ND_ EPipelineDynamicState   DynamicState ()                     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _dynamicState; }
-        ND_ EPrimitive              Topology ()                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _topology; }
-        ND_ uint                    RenderPassSubpassIndex ()           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _subpassIndex; }
-        ND_ VBArray_t               GetVertexBuffers ()                 C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _vertexBuffers.GetKeyArray(); }
-
-        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
+        VGraphicsPipeline ()                                                __NE___ {}
+        ~VGraphicsPipeline ()                                               __NE___;
+
+        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)         __NE___;
+            void  Destroy (VResourceManager &)                              __NE___;
+
+        ND_ uint  GetVertexBufferIndex (const VertexBufferName &name)       C_NE___;
+
+        ND_ bool  ParseShaderTrace (const void*                 ptr,
+                                    Bytes                       maxSize,
+                                    ShaderDebugger::ELogFormat  logFmt,
+                                    OUT Array<String>           &result)    C_NE___;
+
+        ND_ VkPipeline              Handle ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
+        ND_ VkPipelineLayout        Layout ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
+        ND_ VkPipelineBindPoint     BindPoint ()                            C_NE___ { return VK_PIPELINE_BIND_POINT_GRAPHICS; }
+        ND_ PipelineLayoutID        LayoutId ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
+        ND_ EPipelineDynamicState   DynamicState ()                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _dynamicState; }
+        ND_ EPrimitive              Topology ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _topology; }
+        ND_ uint                    RenderPassSubpassIndex ()               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _subpassIndex; }
+        ND_ VBArray_t               GetVertexBuffers ()                     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _vertexBuffers.GetKeyArray(); }
+        ND_ EPipelineOpt            Options ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _options; }
+
+        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
 
 } // AE::Graphics
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VImage.cpp b/AE/engine/src/graphics/Vulkan/Resources/VImage.cpp
index ab371763..663b1f02 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VImage.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VImage.cpp
@@ -1,9 +1,9 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_ENABLE_VULKAN
+# include "graphics/Private/ResourceValidation.h"
 # include "graphics/Vulkan/Resources/VImage.h"
 # include "graphics/Vulkan/VEnumCast.h"
-# include "graphics/Private/EnumUtils.h"
 # include "graphics/Vulkan/VResourceManager.h"
 
 namespace AE::Graphics
@@ -199,9 +199,10 @@ namespace {
 
 
         // VK_KHR_image_format_list
-        FixedArray< VkFormat, ImageDesc::FormatList_t::capacity() >     fmt_list;
+        FixedArray< VkFormat, ImageDesc::FormatList_t{}.max_size() >        fmt_list;
         for (auto fmt : _desc.viewFormats) {
-            fmt_list.try_push_back( VEnumCast( fmt ));
+            if ( fmt != Default )
+                fmt_list.push_back( VEnumCast( fmt ));
         }
         VkImageFormatListCreateInfo     fmt_list_info = {};
         fmt_list_info.sType             = VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO;
@@ -341,15 +342,14 @@ namespace {
 */
     bool  VImage::IsSupported (const VResourceManager &resMngr, const ImageDesc &desc) __NE___
     {
-        STATIC_ASSERT( uint(EImageOpt::All) == 0x1FFFF );
+        StaticAssert( uint(EImageOpt::All) == 0x1FFFF );
 
         const auto&     dev         = resMngr.GetDevice();
-        const auto&     res_flags   = dev.GetResourceFlags();
         const auto&     dev_props   = dev.GetVProperties();
         const bool      opt_tiling  = AllBits( desc.memType, EMemoryType::DeviceLocal );
         const VkFormat  format      = VEnumCast( desc.format );
 
-        if_unlikely( desc.imageDim == Default or desc.usage == Default or desc.format == Default or desc.memType == Default )
+        if_unlikely( not Image_IsSupported( resMngr, desc, Bool{dev.GetVExtensions().imageFormatList} ))
             return false;
 
         // check format features
@@ -357,83 +357,70 @@ namespace {
             return false;
 
         // validate options
+        for (auto option : BitfieldIterate( desc.options ))
         {
-            if_unlikely( not AllBits( res_flags.imageOptions, desc.options ))
-                return false;
-
-            for (auto option : BitfieldIterate( desc.options ))
+            BEGIN_ENUM_CHECKS();
+            switch ( option )
             {
-                BEGIN_ENUM_CHECKS();
-                switch ( option )
-                {
-                    case EImageOpt::BlitSrc :                   if_unlikely( not AllBits( desc.usage, EImageUsage::TransferSrc )) return false;         break;
-                    case EImageOpt::BlitDst :                   if_unlikely( not AllBits( desc.usage, EImageUsage::TransferDst )) return false;         break;
-                    case EImageOpt::BlockTexelViewCompatible :  if_unlikely( not EPixelFormat_IsCompressed( desc.format )) return false;                break;
-
-                    case EImageOpt::StorageAtomic :
-                    case EImageOpt::VertexPplnStore :
-                    case EImageOpt::FragmentPplnStore :         if_unlikely( not AllBits( desc.usage, EImageUsage::Storage )) return false;             break;
-
-                    case EImageOpt::SampledLinear :
-                    case EImageOpt::SampledMinMax :             if_unlikely( not AllBits( desc.usage, EImageUsage::Sampled )) return false;             break;
-
-                    case EImageOpt::ColorAttachmentBlend :      if_unlikely( not AllBits( desc.usage, EImageUsage::ColorAttachment )) return false;     break;
-
-                    case EImageOpt::LossyRTCompression :        return false;
-
-                    case EImageOpt::SparseAliased :             if_unlikely( not dev_props.features.sparseBinding ) return false;                       break;
-                    case EImageOpt::SparseResidencyAliased :    if_unlikely( not dev_props.features.sparseResidencyAliased ) return false;              break;
-                    case EImageOpt::SparseResidency : {
-                        switch ( desc.imageDim )
-                        {
-                            case EImageDim_1D :
+                case EImageOpt::LossyRTCompression :        return false;
+
+                case EImageOpt::SparseAliased :             if_unlikely( not dev_props.features.sparseBinding ) return false;                       break;
+                case EImageOpt::SparseResidencyAliased :    if_unlikely( not dev_props.features.sparseResidencyAliased ) return false;              break;
+                case EImageOpt::SparseResidency : {
+                    switch ( desc.imageDim )
+                    {
+                        case EImageDim_1D :
+                            return false;
+
+                        case EImageDim_2D :
+                            if_unlikely( not dev_props.features.sparseResidencyImage2D )
                                 return false;
 
-                            case EImageDim_2D :
-                                if_unlikely( not dev_props.features.sparseResidencyImage2D )
-                                    return false;
-
-                                switch ( desc.samples.Get() )
-                                {
-                                    case 1 :            break;
-                                    case 2 :            if_unlikely( not dev_props.features.sparseResidency2Samples )  return false;    break;
-                                    case 4 :            if_unlikely( not dev_props.features.sparseResidency4Samples )  return false;    break;
-                                    case 8 :            if_unlikely( not dev_props.features.sparseResidency8Samples )  return false;    break;
-                                    case 16 :           if_unlikely( not dev_props.features.sparseResidency16Samples ) return false;    break;
-                                    default_unlikely :  DBG_WARNING( "unsupported sample count" );  return false;
-                                }
-                                break;
-
-                            case EImageDim_3D :
-                                if_unlikely( not dev_props.features.sparseResidencyImage3D )
-                                    return false;
-                                break;
-
-                            case EImageDim::Unknown :
-                            default_unlikely :          DBG_WARNING( "unknown image dimension" );   return false;
-                        }
-                        break;
-                    }
-
-                    case EImageOpt::CubeCompatible :
-                    case EImageOpt::MutableFormat :
-                    case EImageOpt::Array2DCompatible :
-                    case EImageOpt::Alias :
-                    case EImageOpt::SampleLocationsCompatible : break;
+                            switch ( desc.samples.Get() )
+                            {
+                                case 1 :            break;
+                                case 2 :            if_unlikely( not dev_props.features.sparseResidency2Samples )  return false;    break;
+                                case 4 :            if_unlikely( not dev_props.features.sparseResidency4Samples )  return false;    break;
+                                case 8 :            if_unlikely( not dev_props.features.sparseResidency8Samples )  return false;    break;
+                                case 16 :           if_unlikely( not dev_props.features.sparseResidency16Samples ) return false;    break;
+                                default_unlikely :  DBG_WARNING( "unsupported sample count" );  return false;
+                            }
+                            break;
+
+                        case EImageDim_3D :
+                            if_unlikely( not dev_props.features.sparseResidencyImage3D )
+                                return false;
+                            break;
 
-                    case EImageOpt::_Last :
-                    case EImageOpt::All :
-                    case EImageOpt::Unknown :
-                    default_unlikely :          DBG_WARNING( "unknown image option" );  break;
+                        case EImageDim::Unknown :
+                        default_unlikely :          DBG_WARNING( "unknown image dimension" );   return false;
+                    }
+                    break;
                 }
-                END_ENUM_CHECKS();
+
+                case EImageOpt::BlitSrc :
+                case EImageOpt::BlitDst :
+                case EImageOpt::BlockTexelViewCompatible :
+                case EImageOpt::StorageAtomic :
+                case EImageOpt::VertexPplnStore :
+                case EImageOpt::FragmentPplnStore :
+                case EImageOpt::SampledLinear :
+                case EImageOpt::SampledMinMax :
+                case EImageOpt::ColorAttachmentBlend :
+                case EImageOpt::CubeCompatible :
+                case EImageOpt::MutableFormat :
+                case EImageOpt::Array2DCompatible :
+                case EImageOpt::Alias :
+                case EImageOpt::SampleLocationsCompatible : break;
+
+                case EImageOpt::_Last :
+                case EImageOpt::All :
+                case EImageOpt::Unknown :
+                default_unlikely :          DBG_WARNING( "unknown image option" );  break;
             }
+            END_ENUM_CHECKS();
         }
 
-        // validate memory type
-        if_unlikely( not res_flags.memTypes.contains( desc.memType & ~EMemoryType::_External ))
-            return false;
-
         // check image properties
         {
             VkImageFormatProperties props = {};
@@ -456,46 +443,6 @@ namespace {
                 return false;
         }
 
-        // validate format list
-        if ( dev.GetVExtensions().imageFormatList and not desc.viewFormats.empty() )
-        {
-            using EFmtType = PixelFormatInfo::EType;
-
-            if_unlikely( not AllBits( desc.options, EImageOpt::MutableFormat ) and desc.viewFormats.size() > 1 )
-                return false;
-
-            const auto&     origin_fmt_info = EPixelFormat_GetInfo( desc.format );
-            const bool      uncompress      = AllBits( desc.options, EImageOpt::BlockTexelViewCompatible ) and origin_fmt_info.IsCompressed();
-
-            for (EPixelFormat fmt : desc.viewFormats)
-            {
-                const auto&     fmt_info    = EPixelFormat_GetInfo( fmt );
-                bool            compatible  = fmt_info.bitsPerBlock     == origin_fmt_info.bitsPerBlock     and
-                                              fmt_info.bitsPerBlock2    == origin_fmt_info.bitsPerBlock2;
-
-                if ( uncompress and not fmt_info.IsCompressed() )
-                {
-                    compatible &= fmt_info.channels == origin_fmt_info.channels;
-                    compatible &= (fmt_info.valueType & (EFmtType::UNorm  | EFmtType::SNorm))  == (origin_fmt_info.valueType & (EFmtType::UNorm  | EFmtType::SNorm));
-                    compatible &= (fmt_info.valueType & (EFmtType::SFloat | EFmtType::UFloat)) == (origin_fmt_info.valueType & (EFmtType::SFloat | EFmtType::UFloat));
-                    compatible &= (fmt_info.valueType & (EFmtType::Int    | EFmtType::UInt))   == (origin_fmt_info.valueType & (EFmtType::Int    | EFmtType::UInt));
-                }
-                else
-                {
-                    compatible &= All( fmt_info.blockDim == origin_fmt_info.blockDim );
-                    compatible &= fmt_info.IsCompressed() == origin_fmt_info.IsCompressed();
-                }
-                if_unlikely( not compatible )
-                    return false;
-            }
-        }
-        else
-        if_unlikely( not desc.viewFormats.empty() )
-            return false;
-
-        if_unlikely( not resMngr.GetFeatureSet().IsSupported( desc ))
-            return false;
-
         return true;
     }
 
@@ -507,89 +454,11 @@ namespace {
     bool  VImage::IsSupported (const VResourceManager &resMngr, const ImageViewDesc &view) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
-        STATIC_ASSERT( uint(EImageOpt::All) == 0x1FFFF );
 
-        const auto&             dev         = resMngr.GetDevice();
-        constexpr EImageUsage   view_usage  =
-            EImageUsage::Sampled | EImageUsage::Storage | EImageUsage::ColorAttachment | EImageUsage::DepthStencilAttachment |
-            EImageUsage::InputAttachment | EImageUsage::ShadingRate;
-
-        if_unlikely( not AnyBits( _desc.usage, view_usage ))
+        if_unlikely( not ImageView_IsSupported( resMngr, _desc, view ))
             return false;
 
-        if ( view.viewType == EImage_CubeArray )
-        {
-            if_unlikely( not dev.GetVProperties().features.imageCubeArray )
-                return false;
-
-            if_unlikely( _desc.imageDim != EImageDim_2D or (_desc.imageDim == EImageDim_3D and AllBits( _desc.options, EImageOpt::Array2DCompatible)) )
-                return false;
-
-            if_unlikely( not AllBits( _desc.options, EImageOpt::CubeCompatible ))
-                return false;
-
-            if_unlikely( not IsMultipleOf( view.layerCount, 6 ))
-                return false;
-        }
-
-        if ( view.viewType == EImage_Cube )
-        {
-            if_unlikely( not AllBits( _desc.options, EImageOpt::CubeCompatible ))
-                return false;
-
-            if_unlikely( view.layerCount != 6 )
-                return false;
-        }
-
-        if ( _desc.imageDim == EImageDim_3D and view.viewType != EImage_3D )
-        {
-            if_unlikely( not AllBits( _desc.options, EImageOpt::Array2DCompatible ))
-                return false;
-        }
-
-        if ( not _desc.viewFormats.empty() )
-        {
-            if_unlikely( not ArrayContains( ArrayView<EPixelFormat>{_desc.viewFormats}, view.format ))
-                return false;
-        }
-
-        if ( view.format != Default and view.format != _desc.format )
-        {
-            const auto&     required    = EPixelFormat_GetInfo( _desc.format );
-            const auto&     origin      = EPixelFormat_GetInfo( view.format );
-            const bool      req_comp    = Any( required.TexBlockDim() > 1u );
-            const bool      orig_comp   = Any( origin.TexBlockDim() > 1u );
-
-            if_unlikely( not ArrayContains( ArrayView<EPixelFormat>{_desc.viewFormats}, view.format ) and
-                         not AllBits( _desc.options, EImageOpt::MutableFormat ))
-                return false;
-
-            // compressed to uncompressed
-            if ( AllBits( _desc.options, EImageOpt::BlockTexelViewCompatible ) and orig_comp and not req_comp )
-            {
-                if_unlikely( required.bitsPerBlock != origin.bitsPerBlock )
-                    return false;
-            }
-            else
-            {
-                if_unlikely( req_comp != orig_comp )
-                    return false;
-
-                if_unlikely( Any( required.blockDim != origin.blockDim ))
-                    return false;
-
-                if ( view.aspectMask == EImageAspect::Stencil )
-                {
-                    if_unlikely( required.bitsPerBlock2 != origin.bitsPerBlock2 )
-                        return false;
-                }
-                else
-                {
-                    if_unlikely( required.bitsPerBlock != origin.bitsPerBlock )
-                        return false;
-                }
-            }
-        }
+        const auto&     dev = resMngr.GetDevice();
 
         if ( view.extUsage != Default )
         {
@@ -600,9 +469,6 @@ namespace {
                 return false;
         }
 
-        if_unlikely( not resMngr.GetFeatureSet().IsSupported( _desc, view ))
-            return false;
-
         return true;
     }
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VImage.h b/AE/engine/src/graphics/Vulkan/Resources/VImage.h
index ca0b8c44..bd1ad0d5 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VImage.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VImage.h
@@ -36,9 +36,9 @@ namespace AE::Graphics
         VImage ()                                           __NE___ {}
         ~VImage ()                                          __NE___;
 
-        ND_ bool  Create (VResourceManager &, const ImageDesc &desc, GfxMemAllocatorPtr allocator, StringView dbgName)          __NE___;
-        ND_ bool  Create (VResourceManager &dev, const VulkanImageDesc &desc, GfxMemAllocatorPtr allocator, StringView dbgName) __NE___;
-            void  Destroy (VResourceManager &)                                                                                  __NE___;
+        ND_ bool  Create (VResourceManager &, const ImageDesc &, GfxMemAllocatorPtr, StringView dbgName)        __NE___;
+        ND_ bool  Create (VResourceManager &, const VulkanImageDesc &, GfxMemAllocatorPtr, StringView dbgName)  __NE___;
+            void  Destroy (VResourceManager &)                                                                  __NE___;
 
         ND_ VulkanImageDesc     GetNativeDescription ()     C_NE___;
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VImageView.h b/AE/engine/src/graphics/Vulkan/Resources/VImageView.h
index 54aa65e6..9baede9d 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VImageView.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VImageView.h
@@ -31,13 +31,13 @@ namespace AE::Graphics
         VImageView ()                                   __NE___ {}
         ~VImageView ()                                  __NE___;
 
-        ND_ bool  Create (VResourceManager &, const ImageViewDesc &desc, ImageID imageId, StringView dbgName)       __NE___;
-        ND_ bool  Create (VResourceManager &, const VulkanImageViewDesc &desc, ImageID imageId, StringView dbgName) __NE___;
-            void  Destroy (VResourceManager &)                                                                      __NE___;
+        ND_ bool  Create (VResourceManager &, const ImageViewDesc &, ImageID, StringView dbgName)       __NE___;
+        ND_ bool  Create (VResourceManager &, const VulkanImageViewDesc &, ImageID, StringView dbgName) __NE___;
+            void  Destroy (VResourceManager &)                                                          __NE___;
 
         ND_ VkImageView             Handle ()           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _imageView; }
         ND_ ImageViewDesc const&    Description ()      C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _desc; }
-        ND_ ImageID                 Image ()            C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _imageId; }
+        ND_ ImageID                 ImageId ()          C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _imageId; }
 
         DEBUG_ONLY(  ND_ StringView  GetDebugName ()    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.cpp b/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.cpp
index 097614e6..b4dbff43 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.cpp
@@ -249,7 +249,7 @@ namespace AE::Graphics
     ParseShaderTrace
 =================================================
 */
-    bool  VMeshPipeline::ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
+    bool  VMeshPipeline::ParseShaderTrace (const void* ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
     {
         result.clear();
         DRC_SHAREDLOCK( _drCheck );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.h b/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.h
index ed8c4bd1..eb5dce23 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VMeshPipeline.h
@@ -27,7 +27,7 @@ namespace AE::Graphics
             PipelineLayoutID                                    layoutId;
             ArrayView< VPipelinePack::ShaderModuleRef >         shaders;
             PipelineCacheID                                     cacheId;
-            VPipelinePack::Allocator_t *                        allocator       = null;
+            IAllocator *                                        allocator       = null;
         };
 
 
@@ -52,25 +52,29 @@ namespace AE::Graphics
 
     // methods
     public:
-        VMeshPipeline ()                                            __NE___ {}
-        ~VMeshPipeline ()                                           __NE___;
+        VMeshPipeline ()                                                    __NE___ {}
+        ~VMeshPipeline ()                                                   __NE___;
 
-        ND_ bool  Create (VResourceManager &, const CreateInfo &ci) __NE___;
-            void  Destroy (VResourceManager &)                      __NE___;
+        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)         __NE___;
+            void  Destroy (VResourceManager &)                              __NE___;
 
-        ND_ bool  ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat, OUT Array<String> &result) C_NE___;
+        ND_ bool  ParseShaderTrace (const void*                 ptr,
+                                    Bytes                       maxSize,
+                                    ShaderDebugger::ELogFormat  logFmt,
+                                    OUT Array<String>           &result)    C_NE___;
 
-        ND_ VkPipeline              Handle ()                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
-        ND_ VkPipelineLayout        Layout ()                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
-        ND_ VkPipelineBindPoint     BindPoint ()                    C_NE___ { return VK_PIPELINE_BIND_POINT_GRAPHICS; }
-        ND_ PipelineLayoutID        LayoutID ()                     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
-        ND_ EPipelineDynamicState   DynamicState ()                 C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _dynamicState; }
-        ND_ uint                    RenderPassSubpassIndex ()       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _subpassIndex; }
+        ND_ VkPipeline              Handle ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
+        ND_ VkPipelineLayout        Layout ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
+        ND_ VkPipelineBindPoint     BindPoint ()                            C_NE___ { return VK_PIPELINE_BIND_POINT_GRAPHICS; }
+        ND_ PipelineLayoutID        LayoutId ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
+        ND_ EPipelineDynamicState   DynamicState ()                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _dynamicState; }
+        ND_ uint                    RenderPassSubpassIndex ()               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _subpassIndex; }
+        ND_ EPipelineOpt            Options ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _options; }
 
-        ND_ uint3                   TaskLocalSize ()                C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint3{_taskLocalSize}; }
-        ND_ uint3                   MeshLocalSize ()                C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint3{_meshLocalSize}; }
+        ND_ uint3                   TaskLocalSize ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint3{_taskLocalSize}; }
+        ND_ uint3                   MeshLocalSize ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint3{_meshLocalSize}; }
 
-        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
+        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
 
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VPipelineHelper.inl.h b/AE/engine/src/graphics/Vulkan/Resources/VPipelineHelper.inl.h
index 360834d4..ca9419ed 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VPipelineHelper.inl.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VPipelineHelper.inl.h
@@ -493,7 +493,7 @@ namespace
 =================================================
 */
     bool  CopyShaderTrace (ArrayView< VPipelinePack::ShaderModuleRef >  shaders,
-                           VPipelinePack::Allocator_t *                 allocator,
+                           IAllocator *                                 allocator,
                            OUT ArrayView<ShaderTracePtr>                &dbgTrace) __NE___
     {
         dbgTrace = Default;
@@ -529,11 +529,11 @@ namespace
     {
         using ELogFormat = PipelineCompiler::ShaderTrace::ELogFormat;
 
-        STATIC_ASSERT( uint(ELogFormat::_Count)     == uint(ShaderDebugger::ELogFormat::_Count) );
-        STATIC_ASSERT( uint(ELogFormat::Text)       == uint(ShaderDebugger::ELogFormat::Text)   );
-        STATIC_ASSERT( uint(ELogFormat::VS_Console) == uint(ShaderDebugger::ELogFormat::VS_Console) );
-        STATIC_ASSERT( uint(ELogFormat::VS)         == uint(ShaderDebugger::ELogFormat::VS) );
-        STATIC_ASSERT( uint(ELogFormat::VSCode)     == uint(ShaderDebugger::ELogFormat::VSCode) );
+        StaticAssert( uint(ELogFormat::_Count)      == uint(ShaderDebugger::ELogFormat::_Count) );
+        StaticAssert( uint(ELogFormat::Text)        == uint(ShaderDebugger::ELogFormat::Text)   );
+        StaticAssert( uint(ELogFormat::VS_Console)  == uint(ShaderDebugger::ELogFormat::VS_Console) );
+        StaticAssert( uint(ELogFormat::VS)          == uint(ShaderDebugger::ELogFormat::VS) );
+        StaticAssert( uint(ELogFormat::VSCode)      == uint(ShaderDebugger::ELogFormat::VSCode) );
 
         return ELogFormat(fmt);
     }
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VPipelinePack.cpp b/AE/engine/src/graphics/Vulkan/Resources/VPipelinePack.cpp
index eafa32ec..161e0efc 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VPipelinePack.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VPipelinePack.cpp
@@ -24,7 +24,7 @@ namespace AE::Graphics
     {
         DRC_EXLOCK( _drCheck );
 
-        CATCH_ERR(
+        NOTHROW_ERR(
             _sbtAllocator = desc.sbtAllocator;
 
             return _Create( resMngr, desc );
@@ -373,9 +373,9 @@ namespace AE::Graphics
         CHECK_ERR( offset == sbt_size );
 
         RTShaderBindingDesc     sbt_desc;
-        sbt_desc.maxRayTypes    = Max( desc.numRayTypes, desc.miss.size() );
+        sbt_desc.maxRayTypes    = uint(Max( desc.numRayTypes, desc.miss.size() ));
         sbt_desc.maxInstances   = uint(SafeDiv( desc.hit.size(), desc.numRayTypes ));
-        sbt_desc.maxCallable    = desc.callable.size();
+        sbt_desc.maxCallable    = uint(desc.callable.size());
 
         ASSERT( desc.hit.empty() or IsMultipleOf( desc.hit.size(), desc.numRayTypes ));
         ASSERT( sbt_desc.maxRayTypes == Max( desc.numRayTypes, desc.miss.size() )); // overflow
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.cpp b/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.cpp
index ddfbb2f0..852f5a3f 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.cpp
@@ -13,7 +13,7 @@ namespace AE::Graphics
 =================================================
 */
     VQueryManager::VQueryManager () __NE___ :
-        _device{ RenderTaskScheduler().GetDevice() },
+        _device{ GraphicsScheduler().GetDevice() },
         _hostReset{false}, _perfQuery{false}, _calibratedTs{false}
     {}
 
@@ -52,11 +52,11 @@ namespace AE::Graphics
         _timestampPeriod    = _device.GetVProperties().properties.limits.timestampPeriod;
         _timestampAllowed   = Default;
 
-        for (auto q : _device.GetQueues())
+        for (auto& q : _device.GetQueues())
         {
             if ( q.timestampValidBits == 0 ) continue;
             _timestampAllowed |= q.type;
-            _tsBits[ uint(q.type) ] = q.timestampValidBits; 
+            _tsBits[ uint(q.type) ] = q.timestampValidBits;
         }
 
         if ( _timestampAllowed != Default and _timestampPeriod > 0.f )
@@ -95,12 +95,12 @@ namespace AE::Graphics
 
         if ( _device.GetVProperties().features.pipelineStatisticsQuery )
         {
-            static constexpr auto   StatBits = 
+            static constexpr auto   StatBits =
                 //VK_QUERY_PIPELINE_STATISTIC_INPUT_ASSEMBLY_PRIMITIVES_BIT |
                 VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT        |   // before clipping
                 VK_QUERY_PIPELINE_STATISTIC_CLIPPING_PRIMITIVES_BIT         |   // after clipping
                 VK_QUERY_PIPELINE_STATISTIC_FRAGMENT_SHADER_INVOCATIONS_BIT;
-            STATIC_ASSERT( sizeof(PipelineStatistic) == sizeof(ulong) * CT_BitCount< StatBits >);
+            StaticAssert( sizeof(PipelineStatistic) == sizeof(ulong) * CT_BitCount< StatBits >);
 
             auto&   pool = _poolArr [uint(EQueryType::PipelineStatistic)];
             pool.maxCount = VConfig::PipelineStatQueryPerFrame;
@@ -121,7 +121,7 @@ namespace AE::Graphics
             vk_counters.reserve( 128 );
             vk_counter_desc.reserve( 128 );
 
-            for (auto q : _device.GetQueues())
+            for (auto& q : _device.GetQueues())
             {
                 uint    count = 0;
                 VK_CHECK_ERR( vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR(
@@ -401,7 +401,7 @@ The second synchronization scope includes all commands which reference the queri
     bool  VQueryManager::_GetTimestamp (const Query &q, OUT T* result, Bytes size) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
-        STATIC_ASSERT( sizeof(*result) == sizeof(ulong) );
+        StaticAssert( sizeof(*result) == sizeof(ulong) );
 
         CHECK_ERR( q and result != null );
         CHECK_ERR( size >= (SizeOf<ulong> * q.count) );
@@ -456,7 +456,7 @@ The second synchronization scope includes all commands which reference the queri
     bool  VQueryManager::_GetTimestampCalibrated (const Query &q, OUT T* result, OUT T* maxDeviation, Bytes size) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
-        STATIC_ASSERT( sizeof(*result) == sizeof(ulong) );
+        StaticAssert( sizeof(*result) == sizeof(ulong) );
 
         CHECK_ERR( q and result != null and maxDeviation != null );
         CHECK_ERR( _calibratedTs );
@@ -548,7 +548,7 @@ The second synchronization scope includes all commands which reference the queri
     bool  VQueryManager::GetPipelineStatistic (const Query &q, OUT PipelineStatistic* result, Bytes size) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
-        STATIC_ASSERT( IsMultipleOf( sizeof(*result), sizeof(ulong) ));
+        StaticAssert( IsMultipleOf( sizeof(*result), sizeof(ulong) ));
 
         CHECK_ERR( q and result != null );
         CHECK_ERR( size >= (SizeOf<PipelineStatistic> * q.count) );
@@ -576,13 +576,13 @@ The second synchronization scope includes all commands which reference the queri
     GetRTASProperty
 =================================================
 */
-    bool  VQueryManager::GetRTASProperty (const Query &q, OUT Bytes64u* result, Bytes size) C_NE___
+    bool  VQueryManager::GetRTASProperty (const Query &q, OUT Byte64u* result, Bytes size) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
-        STATIC_ASSERT( sizeof(*result) == sizeof(ulong) );
+        StaticAssert( sizeof(*result) == sizeof(ulong) );
 
         CHECK_ERR( q and result != null );
-        CHECK_ERR( size >= (SizeOf<Bytes64u> * q.count) );
+        CHECK_ERR( size >= (SizeOf<Byte64u> * q.count) );
 
         ASSERT( q.type == EQueryType::AccelStructCompactedSize      or
                 q.type == EQueryType::AccelStructSerializationSize  or
@@ -599,7 +599,7 @@ The second synchronization scope includes all commands which reference the queri
         bool    available = true;
         for (uint i = 0, cnt = q.count; i < cnt; ++i)
         {
-            result[i]  = Bytes64u{ tmp[i].result };
+            result[i]  = Byte64u{ tmp[i].result };
             available &= tmp[i].IsAvailable();
         }
         return err == VK_SUCCESS and available;
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.h b/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.h
index 13bfd973..03f4f1de 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VQueryManager.h
@@ -139,7 +139,7 @@ namespace AE::Graphics
 
         //  bool  GetPerformanceCounter (const Query &q, OUT VkPerformanceCounterResultKHR* result, Bytes size)     C_NE___;
             bool  GetPipelineStatistic (const Query &q, OUT PipelineStatistic* result, Bytes size)                  C_NE___;
-            bool  GetRTASProperty (const Query &q, OUT Bytes64u* result, Bytes size)                                C_NE___;
+            bool  GetRTASProperty (const Query &q, OUT Byte64u* result, Bytes size)                                 C_NE___;
 
     private:
         static void  _ResetPoolOnHost (const VDevice &, uint idx, QueryPool &pool, uint count)                      __NE___;
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.cpp b/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.cpp
index d2a44c71..f7c91a04 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.cpp
@@ -259,7 +259,7 @@ namespace AE::Graphics
     {
         GRES_CHECK( IsSupported( resMngr, desc ));
 
-        AllocatorImpl2< VTempLinearAllocator >          allocator;
+        IAllocatorAdaptor< VTempLinearAllocator >       allocator;
         VkAccelerationStructureBuildGeometryInfoKHR     build_info;
         VkAccelerationStructureBuildSizesInfoKHR        size_info   = {};
         VkAccelerationStructureBuildRangeInfoKHR *      ranges      = null;
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.h b/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.h
index 71dc1ede..7bb51a17 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VRTGeometry.h
@@ -35,7 +35,7 @@ namespace AE::Graphics
         VRTGeometry ()                                                                                                      __NE___ {}
         ~VRTGeometry ()                                                                                                     __NE___;
 
-        ND_ bool  Create (VResourceManager &, const RTGeometryDesc &desc, GfxMemAllocatorPtr allocator, StringView dbgName) __NE___;
+        ND_ bool  Create (VResourceManager &, const RTGeometryDesc &, GfxMemAllocatorPtr, StringView dbgName)               __NE___;
             void  Destroy (VResourceManager &)                                                                              __NE___;
 
         ND_ VkAccelerationStructureKHR  Handle ()                                                                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _accelStruct; }
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VRTScene.h b/AE/engine/src/graphics/Vulkan/Resources/VRTScene.h
index e0e5f0d9..8fed433c 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VRTScene.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VRTScene.h
@@ -32,32 +32,32 @@ namespace AE::Graphics
 
     // methods
     public:
-        VRTScene ()                                                                                                     __NE___ {}
-        ~VRTScene ()                                                                                                    __NE___;
+        VRTScene ()                                                                                                 __NE___ {}
+        ~VRTScene ()                                                                                                __NE___;
 
-        ND_ bool  Create (VResourceManager &, const RTSceneDesc &desc, GfxMemAllocatorPtr allocator, StringView dbgName)__NE___;
-            void  Destroy (VResourceManager &)                                                                          __NE___;
+        ND_ bool  Create (VResourceManager &, const RTSceneDesc &, GfxMemAllocatorPtr, StringView dbgName)          __NE___;
+            void  Destroy (VResourceManager &)                                                                      __NE___;
 
-        ND_ VkAccelerationStructureKHR  Handle ()                                                                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _accelStruct; }
-        ND_ DeviceAddress               GetDeviceAddress ()                                                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _address; }
-        ND_ RTSceneDesc const&          Description ()                                                                  C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _desc; }
-        ND_ MemoryID                    MemoryId ()                                                                     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _memoryId; }
-        ND_ bool                        IsExclusiveSharing ()                                                           C_NE___ { return false; }
+        ND_ VkAccelerationStructureKHR  Handle ()                                                                   C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _accelStruct; }
+        ND_ DeviceAddress               GetDeviceAddress ()                                                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _address; }
+        ND_ RTSceneDesc const&          Description ()                                                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _desc; }
+        ND_ MemoryID                    MemoryId ()                                                                 C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _memoryId; }
+        ND_ bool                        IsExclusiveSharing ()                                                       C_NE___ { return false; }
 
-        DEBUG_ONLY(  ND_ StringView     GetDebugName ()                                                                 C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
+        DEBUG_ONLY(  ND_ StringView     GetDebugName ()                                                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
 
 
-        ND_ static bool             IsSerializedMemoryCompatible (const VDevice &dev, const void* ptr, Bytes size)      __NE___;
+        ND_ static bool             IsSerializedMemoryCompatible (const VDevice &dev, const void* ptr, Bytes size)  __NE___;
 
-        ND_ static RTASBuildSizes   GetBuildSizes (const VResourceManager &, const RTSceneBuild &desc)                  __NE___;
+        ND_ static RTASBuildSizes   GetBuildSizes (const VResourceManager &, const RTSceneBuild &desc)              __NE___;
 
         ND_ static bool             ConvertBuildInfo (const VResourceManager &, const RTSceneBuild &desc,
                                                       OUT VkAccelerationStructureGeometryKHR &geom,
                                                       OUT VkAccelerationStructureBuildRangeInfoKHR &range,
-                                                      OUT VkAccelerationStructureBuildGeometryInfoKHR &buildInfo)       __NE___;
+                                                      OUT VkAccelerationStructureBuildGeometryInfoKHR &buildInfo)   __NE___;
 
-        ND_ static bool             IsSupported (const VResourceManager &, const RTSceneDesc &desc)                     __NE___;
-        ND_ static bool             IsSupported (const VResourceManager &, const RTSceneBuild &build)                   __NE___;
+        ND_ static bool             IsSupported (const VResourceManager &, const RTSceneDesc &desc)                 __NE___;
+        ND_ static bool             IsSupported (const VResourceManager &, const RTSceneBuild &build)               __NE___;
     };
 
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VRTShaderBindingTable.h b/AE/engine/src/graphics/Vulkan/Resources/VRTShaderBindingTable.h
index 3bb6e417..07bb2e0f 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VRTShaderBindingTable.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VRTShaderBindingTable.h
@@ -49,8 +49,8 @@ namespace AE::Graphics
             void  Destroy (VResourceManager &)                      __NE___;
 
         ND_ RTShaderBindingTable const& GetSBT ()                   C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _sbt; }
-        ND_ BufferID                    GetBufferID ()              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _bufferId; }
-        ND_ RayTracingPipelineID        GetRTPipelineId ()          C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _pipelineId; }
+        ND_ BufferID                    BufferId ()                 C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _bufferId; }
+        ND_ RayTracingPipelineID        RTPipelineId ()             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _pipelineId; }
 
         ND_ RTShaderBindingDesc const&  Description ()              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _desc; }
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.cpp b/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.cpp
index 90bd57d2..1ba33b86 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.cpp
@@ -65,15 +65,15 @@ namespace AE::Graphics
         CHECK_ERR( SetDynamicState( OUT dynamic_state_info, ci.specCI.dynamicState, false, *ci.tempAllocator ));
         CHECK_ERR( SetShaderStages( OUT pipeline_info.pStages, OUT pipeline_info.stageCount, ci.shaders, ci.specCI.specialization, *ci.tempAllocator ));
 
-        try {
+        TRY{
             const auto  ToGroupIndex = [] (auto* lhs, auto* rhs)
             {{
                 ssize   d = Distance( lhs, rhs );
                 return CheckCast<uint>( d );
             }};
 
-            _nameToHandle.Create( NameToHandleAlloc_t{ ci.allocator });
-            _nameToHandle->reserve( group_count );  // throw
+            _nameToHandle.CreateTh( NameToHandleAlloc_t{ ci.allocator });   // throw
+            _nameToHandle->reserve( group_count );                          // throw
 
             for (auto& gen : ci.templCI.generalShaders)
             {
@@ -130,9 +130,9 @@ namespace AE::Graphics
             }
             GRES_CHECK( groups == pipeline_info.pGroups + pipeline_info.groupCount );
         }
-        catch (...) {
+        CATCH_ALL(
             RETURN_ERR( "failed to allocate '_nameToHandle' hash map" );
-        }
+        )
 
         auto&   dev = resMngr.GetDevice();
         VK_CHECK_ERR( dev.vkCreateRayTracingPipelinesKHR( dev.GetVkDevice(), Default, ppln_cache, 1, &pipeline_info, null, OUT &_handle ));
@@ -192,7 +192,7 @@ namespace AE::Graphics
     ParseShaderTrace
 =================================================
 */
-    bool  VRayTracingPipeline::ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
+    bool  VRayTracingPipeline::ParseShaderTrace (const void* ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
     {
         result.clear();
         DRC_SHAREDLOCK( _drCheck );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.h b/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.h
index f0a28b47..4ed73993 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VRayTracingPipeline.h
@@ -26,14 +26,14 @@ namespace AE::Graphics
             PipelineLayoutID                                        layoutId;
             ArrayView< VPipelinePack::ShaderModuleRef >             shaders;
             PipelineCacheID                                         cacheId;
-            VPipelinePack::Allocator_t *                            allocator       = null;
+            IAllocator *                                            allocator       = null;
             VTempLinearAllocator *                                  tempAllocator   = null;
         };
 
     private:
         template <typename K, typename V>
-        using THashMap              = FlatHashMap< K, V, std::hash<K>, std::equal_to<K>, StdAllocatorRef< Pair<const K, V>, VPipelinePack::Allocator_t* >>;
-        using NameToHandleAlloc_t   = StdAllocatorRef< Pair<const RayTracingGroupName::Optimized_t, uint>, VPipelinePack::Allocator_t* >;
+        using THashMap              = FlatHashMap< K, V, std::hash<K>, std::equal_to<K>, StdAllocatorRef< Pair<const K, V>, IAllocator* >>;
+        using NameToHandleAlloc_t   = StdAllocatorRef< Pair<const RayTracingGroupName::Optimized_t, uint>, IAllocator* >;
         using NameToHandle_t        = THashMap< RayTracingGroupName::Optimized_t, uint >;   // name to index in '_groupHandles'
 
 
@@ -56,26 +56,40 @@ namespace AE::Graphics
 
     // methods
     public:
-        VRayTracingPipeline ()                                          __NE___ {}
-        ~VRayTracingPipeline ()                                         __NE___;
+        VRayTracingPipeline ()                                              __NE___ {}
+        ~VRayTracingPipeline ()                                             __NE___;
 
-        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)     __NE___;
-            void  Destroy (VResourceManager &)                          __NE___;
+        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)         __NE___;
+            void  Destroy (VResourceManager &)                              __NE___;
 
-        ND_ bool  ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat, OUT Array<String> &result)  C_NE___;
+        ND_ bool  ParseShaderTrace (const void*                 ptr,
+                                    Bytes                       maxSize,
+                                    ShaderDebugger::ELogFormat  logFmt,
+                                    OUT Array<String>           &result)    C_NE___;
 
-        ND_ Bytes  GetShaderGroupStackSize (const VDevice &, const RayTracingGroupName &name, VkShaderGroupShaderKHR type)  C_NE___;
+        ND_ Bytes  GetShaderGroupStackSize (const VDevice             &dev,
+                                            const RayTracingGroupName &name,
+                                            VkShaderGroupShaderKHR    type) C_NE___;
 
-            bool  CopyHandle (const VDevice &, const RayTracingGroupName &name, OUT void* dst, Bytes dstSize)               C_NE___;
-            bool  CopyHandle (const VDevice &, uint index, OUT void* dst, Bytes dstSize)                                    C_NE___;
+            bool  CopyHandle (const VDevice             &,
+                              const RayTracingGroupName &,
+                              OUT void*                 dst,
+                              Bytes                     dstSize)            C_NE___;
 
-        ND_ VkPipeline              Handle ()               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
-        ND_ VkPipelineLayout        Layout ()               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
-        ND_ VkPipelineBindPoint     BindPoint ()            C_NE___ { return VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR; }
-        ND_ PipelineLayoutID        LayoutID ()             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
-        ND_ EPipelineDynamicState   DynamicState ()         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _dynamicState; }
+            bool  CopyHandle (const VDevice             &,
+                              uint                      index,
+                              OUT void*                 dst,
+                              Bytes                     dstSize)            C_NE___;
 
-        DEBUG_ONLY(  ND_ StringView  GetDebugName ()        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
+
+        ND_ VkPipeline              Handle ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
+        ND_ VkPipelineLayout        Layout ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
+        ND_ VkPipelineBindPoint     BindPoint ()                            C_NE___ { return VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR; }
+        ND_ PipelineLayoutID        LayoutId ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
+        ND_ EPipelineDynamicState   DynamicState ()                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _dynamicState; }
+        ND_ EPipelineOpt            Options ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _options; }
+
+        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
 
 } // AE::Graphics
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VSampler.cpp b/AE/engine/src/graphics/Vulkan/Resources/VSampler.cpp
index 92b966f4..a9731d77 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VSampler.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VSampler.cpp
@@ -25,7 +25,7 @@ namespace AE::Graphics
     Create
 =================================================
 */
-    bool  VSampler::Create (const VResourceManager &resMngr, const VkSamplerCreateInfo &ci, const VkSamplerYcbcrConversionCreateInfo *convCI, StringView dbgName) __NE___
+    bool  VSampler::Create (const VResourceManager &resMngr, const VkSamplerCreateInfo &ci, const VkSamplerYcbcrConversionCreateInfo* convCI, StringView dbgName) __NE___
     {
         DRC_EXLOCK( _drCheck );
         CHECK_ERR( _sampler == Default );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VSampler.h b/AE/engine/src/graphics/Vulkan/Resources/VSampler.h
index adc6b22c..1b541679 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VSampler.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VSampler.h
@@ -21,23 +21,23 @@ namespace AE::Graphics
         VkSamplerYcbcrConversion    _ycbcrConversion    = Default;
         VkFormat                    _ycbcrFormat        = VK_FORMAT_UNDEFINED;
 
-        DRC_ONLY( RWDataRaceCheck   _drCheck;   )
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
 
 
     // methods
     public:
-        VSampler ()                                                                             __NE___ {}
-        ~VSampler ()                                                                            __NE___;
+        VSampler ()                                                                         __NE___ {}
+        ~VSampler ()                                                                        __NE___;
 
-        ND_ bool  Create (const VResourceManager &resMngr, const VkSamplerCreateInfo &,
-                          const VkSamplerYcbcrConversionCreateInfo *, StringView dbgName)       __NE___;
-            void  Destroy (VResourceManager &)                                                  __NE___;
+        ND_ bool  Create (const VResourceManager &, const VkSamplerCreateInfo &,
+                          const VkSamplerYcbcrConversionCreateInfo *, StringView dbgName)   __NE___;
+            void  Destroy (VResourceManager &)                                              __NE___;
 
-        ND_ VkSampler                   Handle ()                                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _sampler; }
-        ND_ VkSamplerYcbcrConversion    YcbcrConversion ()                                      C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _ycbcrConversion; }
-        ND_ VkFormat                    YcbcrFormat ()                                          C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _ycbcrFormat; }
+        ND_ VkSampler                   Handle ()                                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _sampler; }
+        ND_ VkSamplerYcbcrConversion    YcbcrConversion ()                                  C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _ycbcrConversion; }
+        ND_ VkFormat                    YcbcrFormat ()                                      C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _ycbcrFormat; }
 
-        DEBUG_ONLY( ND_ StringView      GetDebugName ()                                         C_NE___ { return Default; })
+        DEBUG_ONLY( ND_ StringView      GetDebugName ()                                     C_NE___ { return Default; })
 
 
             static void  ConvertSampler (const SamplerDesc &desc, OUT VkSamplerCreateInfo &info)                                    __NE___;
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.cpp b/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.cpp
index 7f88c15f..744f095f 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.cpp
@@ -5,6 +5,7 @@
 # include "graphics/Private/EnumUtils.h"
 # include "graphics/Vulkan/Resources/VStagingBufferManager.h"
 # include "graphics/Vulkan/Allocators/VBlockMemAllocator.h"
+# include "graphics/Vulkan/Allocators/VLinearMemAllocator.h"
 # include "graphics/Vulkan/VResourceManager.h"
 # include "graphics/Vulkan/VEnumCast.h"
 
@@ -25,6 +26,7 @@ namespace AE::Graphics
         if_unlikely( size == 0_b )
             return;
 
+        ASSERT( IsMultipleOf( size, _memSizeAlign ));
         ASSERT( memory != Default );
 
         VkMappedMemoryRange range;
@@ -38,58 +40,6 @@ namespace AE::Graphics
         _memRanges.ranges[ frameId.Index() ].push_back( range );
     }
 
-/*
-=================================================
-    _CheckHostVisibleMemory
-=================================================
-*
-    bool  VStagingBufferManager::_CheckHostVisibleMemory (OUT Bytes& totalHostMem) const
-    {
-        auto&   dev     = _resMngr.GetDevice();
-        auto&   props   = dev.GetVProperties().memoryProperties;
-
-        VkMemoryRequirements    mem_req = {};
-        {
-            VkBuffer            id;
-            VkBufferCreateInfo  info = {};
-            info.sType          = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-            info.flags          = 0;
-            info.usage          = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
-            info.size           = 64 << 10;
-            info.sharingMode    = VK_SHARING_MODE_EXCLUSIVE;
-
-            VK_CHECK_ERR( dev.vkCreateBuffer( dev.GetVkDevice(), &info, null, OUT &id ));
-            dev.vkGetBufferMemoryRequirements( dev.GetVkDevice(), id, OUT &mem_req );
-            dev.vkDestroyBuffer( dev.GetVkDevice(), id, null );
-        }
-
-        BitSet<VK_MAX_MEMORY_HEAPS>     cached_heaps;
-        BitSet<VK_MAX_MEMORY_HEAPS>     coherent_heaps;
-
-        for (uint i = 0; i < props.memoryTypeCount; ++i)
-        {
-            auto&   mt = props.memoryTypes[i];
-
-            if ( AllBits( mem_req.memoryTypeBits, 1u << i ))
-            {
-                if ( AllBits( mt.propertyFlags, VK_MEMORY_PROPERTY_HOST_CACHED_BIT ))
-                    cached_heaps[ mt.heapIndex ] = true;
-                else
-                if ( AllBits( mt.propertyFlags, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ))
-                    coherent_heaps[ mt.heapIndex ] = true;
-            }
-        }
-
-        totalHostMem = 0_b;
-        for (uint i = 0; i < props.memoryHeapCount; ++i)
-        {
-            if ( cached_heaps[i] or coherent_heaps[i] )
-                totalHostMem += props.memoryHeaps[i].size;      // TOD: separate read/write ?
-        }
-
-        return true;
-    }
-
 /*
 =================================================
     _CreateStaticBuffers
@@ -97,8 +47,9 @@ namespace AE::Graphics
 */
     bool  VStagingBufferManager::_CreateStaticBuffers (const GraphicsCreateInfo &info)
     {
-        auto&       dev     = _resMngr.GetDevice();
-        const auto  q_mask  = dev.GetAvailableQueues();
+        auto&       dev         = _resMngr.GetDevice();
+        auto&       mem_types   = dev.GetResourceFlags().memTypes;
+        const auto  q_mask      = dev.GetAvailableQueues();
 
         _static.writeSize   = info.staging.writeStaticSize;
         _static.readSize    = info.staging.readStaticSize;
@@ -106,121 +57,108 @@ namespace AE::Graphics
         _static.buffersForWrite.resize( info.maxFrames * _QueueCount );
         _static.buffersForRead.resize( info.maxFrames * _QueueCount );
 
-        VkBufferCreateInfo      buf_info = {};
-        buf_info.sType          = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-        buf_info.flags          = 0;
-        buf_info.usage          = VEnumCast( EBufferUsage::Transfer );
-        buf_info.size           = 1 << 10;
-        buf_info.sharingMode    = VK_SHARING_MODE_EXCLUSIVE;
-
-        VkMemoryRequirements    mem_req = {};
+        Bytes   mem_align;
         {
-            VkBuffer    buf = Default;
-            VK_CHECK_ERR( dev.vkCreateBuffer( dev.GetVkDevice(), &buf_info, null, OUT &buf ));
+            VkBufferCreateInfo      buf_info = {};
+            buf_info.sType          = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+            buf_info.flags          = 0;
+            buf_info.usage          = VEnumCast( EBufferUsage::Transfer );
+            buf_info.size           = 1 << 10;
+            buf_info.sharingMode    = VK_SHARING_MODE_EXCLUSIVE;
+
+            VkMemoryRequirements2   mem_req2 = {};
+            mem_req2.sType  = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
 
-            dev.vkGetBufferMemoryRequirements( dev.GetVkDevice(), buf, &mem_req );
-            dev.vkDestroyBuffer( dev.GetVkDevice(), buf, null );
+            CHECK_ERR( dev.GetMemoryRequirements( buf_info, OUT &mem_req2 ));
+
+            mem_align = Bytes{mem_req2.memoryRequirements.alignment};
         }
 
         Bytes   total_write_size;
         Bytes   total_read_size;
-        void*   mapped_write_mem    = null;
-        void*   mapped_read_mem     = null;
-        uint    write_mem_idx       = UMax;
-        uint    read_mem_idx        = UMax;
+
+        for (uint i = 0; i < _QueueCount; ++i)
         {
-            for (uint i = 0; i < _QueueCount; ++i)
-            {
-                if ( not AllBits( q_mask, EQueueMask(1u << i) ))
-                    continue;
-
-                total_write_size = AlignUp( total_write_size + _static.writeSize[i], mem_req.alignment );
-                total_read_size  = AlignUp( total_read_size  + _static.readSize[i],  mem_req.alignment );
-            }
-            total_write_size *= info.maxFrames;
-            total_read_size  *= info.maxFrames;
-
-            VkMemoryAllocateInfo    alloc_info = {};
-            alloc_info.sType            = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
-            alloc_info.allocationSize   = VkDeviceSize( total_write_size );
-            CHECK_ERR( dev.GetMemoryTypeIndex( mem_req.memoryTypeBits,
-                                               NAMED_ARG( includeFlags, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT ),  NAMED_ARG( optIncludeFlags, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ),
-                                               NAMED_ARG( excludeFlags, Zero ),                                 NAMED_ARG( optExcludeFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT ),
-                                               OUT write_mem_idx ));
-            alloc_info.memoryTypeIndex = write_mem_idx;
-
-            VK_CHECK_ERR( dev.vkAllocateMemory( dev.GetVkDevice(), &alloc_info, null, OUT &_static.memoryForWrite ));
-            VK_CHECK_ERR( dev.vkMapMemory( dev.GetVkDevice(), _static.memoryForWrite, 0, alloc_info.allocationSize, 0, OUT &mapped_write_mem ));
-
-            // host to device memory must be coherent, because flush memory is not used
-            auto    mem_flags_for_write = VkMemoryPropertyFlagBits( dev.GetVProperties().memoryProperties.memoryTypes[alloc_info.memoryTypeIndex].propertyFlags );
-            CHECK_ERR( AllBits( mem_flags_for_write, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT ) or
-                       AllBits( mem_flags_for_write, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ));
-
-            alloc_info.allocationSize   = VkDeviceSize( total_read_size );
-            CHECK_ERR( dev.GetMemoryTypeIndex( mem_req.memoryTypeBits,
-                                               NAMED_ARG( includeFlags, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT ),  NAMED_ARG( optIncludeFlags, VK_MEMORY_PROPERTY_HOST_CACHED_BIT ),
-                                               NAMED_ARG( excludeFlags, Zero ),                                 NAMED_ARG( optExcludeFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT ),
-                                               OUT read_mem_idx ));
-            alloc_info.memoryTypeIndex = read_mem_idx;
-
-            VK_CHECK_ERR( dev.vkAllocateMemory( dev.GetVkDevice(), &alloc_info, null, OUT &_static.memoryForRead ));
-            VK_CHECK_ERR( dev.vkMapMemory( dev.GetVkDevice(), _static.memoryForRead, 0, alloc_info.allocationSize, 0, OUT &mapped_read_mem ));
-            _static.memoryFlagsForRead = VkMemoryPropertyFlagBits( dev.GetVProperties().memoryProperties.memoryTypes[alloc_info.memoryTypeIndex].propertyFlags );
+            if ( not AllBits( q_mask, EQueueMask(1u << i) ))
+                continue;
+
+            total_write_size = AlignUp( total_write_size + _static.writeSize[i], mem_align );
+            total_read_size  = AlignUp( total_read_size  + _static.readSize[i],  mem_align );
         }
+        total_write_size *= info.maxFrames;
+        total_read_size  *= info.maxFrames;
 
         if ( total_write_size == 0_b and total_read_size == 0_b )
             return true;
 
-        const auto  CreateStaticBuffer = [this, &dev, &buf_info, &mem_req, q_mask]
-                                         (OUT StaticBuffer& sb, INOUT Bytes& offset, Bytes size, VkDeviceMemory mem, void* mapped, usize idx, uint memIdx, const char* name) -> bool
+        auto        w_allocator = MakeRC<VLinearMemAllocator>( total_write_size );
+        auto        r_allocator = MakeRC<VLinearMemAllocator>( total_read_size );
+        EMemoryType mem_type;
+
+        const auto  CreateStaticBuffer = [this, q_mask, &mem_type]
+                                         (OUT StaticBuffer& sb, INOUT VkDeviceMemory &mem, Bytes size, usize idx, GfxMemAllocatorPtr alloc, const char* name) -> bool
         {{
             const auto  q_idx = (idx % _QueueCount);
 
             if ( not AllBits( q_mask, EQueueMask(1u << q_idx) ) or size == 0 )
                 return true;    // skip
 
-            VkBuffer    buf = Default;
-            buf_info.size = VkDeviceSize(size);
-            VK_CHECK_ERR( dev.vkCreateBuffer( dev.GetVkDevice(), &buf_info, null, OUT &buf ));
-
-            offset = AlignUp( offset, mem_req.alignment );
-            VK_CHECK_ERR( dev.vkBindBufferMemory( dev.GetVkDevice(), buf, mem, VkDeviceSize(offset) ));
+            BufferDesc  desc;
+            desc.usage      = EBufferUsage::Transfer;
+            desc.size       = size;
+            desc.memType    = mem_type;
 
-            VulkanBufferDesc    desc;
-            desc.buffer         = buf;
-            desc.size           = size;
-            desc.usage          = VkBufferUsageFlagBits( buf_info.usage );
-            desc.memFlags       = VkMemoryPropertyFlagBits( dev.GetVProperties().memoryProperties.memoryTypes[memIdx].propertyFlags );
-            desc.canBeDestroyed = true;
+            String  dbg_name;
+            DEBUG_ONLY( dbg_name = String{name} << " {f:" << ToString(idx / _QueueCount) << "} {q:" << ToString(EQueueType(q_idx)) << "}";)
 
-            sb.buffer = _resMngr.CreateBuffer( desc, String{name} << " {f:" << ToString(idx / _QueueCount) << "} {q:" << ToString(EQueueType(q_idx)) << "}" );
+            sb.buffer = _resMngr.CreateBuffer( desc, dbg_name, RVRef(alloc) );
             CHECK_ERR( sb.buffer );
 
+            auto*   buf = _resMngr.GetResource( sb.buffer );
+
+            VulkanMemoryObjInfo mem_info;
+            CHECK_ERR( _resMngr.GetMemoryInfo( buf->MemoryId(), OUT mem_info ));
+
             sb.size.store( 0_b );
             sb.capacity     = size;
-            sb.memOffset    = offset;
-            sb.bufferHandle = _resMngr.GetResource( sb.buffer )->Handle();
-            sb.mapped       = mapped + offset;
+            sb.memOffset    = mem_info.offset;
+            sb.bufferHandle = buf->Handle();
+            sb.mapped       = mem_info.mappedPtr;
+
+            if ( mem == Default )
+                mem = mem_info.memory;
+            else
+                CHECK( mem == mem_info.memory );
 
-            offset += size;
             return true;
         }};
 
-        Bytes   write_mem_offset;
-        Bytes   read_mem_offset;
-
-        for (usize i = 0; i < _static.buffersForWrite.size(); ++i)
+        if ( total_write_size > 0 )
         {
-            if ( total_write_size > 0 )
-                CHECK_ERR( CreateStaticBuffer( OUT _static.buffersForWrite[i], INOUT write_mem_offset, _static.writeSize[i % _QueueCount], _static.memoryForWrite, mapped_write_mem, i, write_mem_idx, "SSWB" ));
+            // host to device memory must be coherent, because memory flush is not used
+            mem_type = EMemoryType::HostCoherent;
+            CHECK( mem_types.contains( EMemoryType::HostCoherent ));
 
-            if ( total_read_size > 0 )
-                CHECK_ERR( CreateStaticBuffer( OUT _static.buffersForRead[i],  INOUT read_mem_offset,  _static.readSize[i % _QueueCount],  _static.memoryForRead,  mapped_read_mem,  i, read_mem_idx, "SSRB" ));
+            for (usize i = 0; i < _static.buffersForWrite.size(); ++i)
+                CHECK_ERR( CreateStaticBuffer( OUT _static.buffersForWrite[i], INOUT _static.memoryForWrite, _static.writeSize[i % _QueueCount], i, w_allocator, "SSWB" ));
         }
 
-        ASSERT( total_write_size == write_mem_offset );
-        ASSERT( total_read_size  == read_mem_offset  );
+        if ( total_read_size > 0 )
+        {
+            if ( mem_types.contains( EMemoryType::HostCached ))
+                mem_type = EMemoryType::HostCached; // better performance for read access on host
+            else
+            if ( mem_types.contains( EMemoryType::HostCachedCoherent ))
+                mem_type = EMemoryType::HostCachedCoherent;
+            else
+                mem_type = EMemoryType::HostCoherent;
+
+            for (usize i = 0; i < _static.buffersForWrite.size(); ++i)
+                CHECK_ERR( CreateStaticBuffer( OUT _static.buffersForRead[i],  INOUT _static.memoryForRead,  _static.readSize[i % _QueueCount],  i, r_allocator, "SSRB" ));
+        }
+
+        CHECK( w_allocator->GetStatistic().pageCount == 1 );
+        CHECK( r_allocator->GetStatistic().pageCount == 1 );
 
         return true;
     }
@@ -235,77 +173,53 @@ namespace AE::Graphics
         if ( info.staging.vstreamSize == 0 )
             return true;
 
-        auto&   dev = _resMngr.GetDevice();
+        auto&       dev     = _resMngr.GetDevice();
+        BufferDesc  desc;
+        desc.usage  = EBufferUsage::Vertex | EBufferUsage::Index;
 
-        VkBufferCreateInfo      buf_info = {};
-        buf_info.sType          = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
-        buf_info.flags          = 0;
-        buf_info.usage          = VEnumCast( EBufferUsage::Vertex | EBufferUsage::Index );
-        buf_info.size           = 1 << 10;
-        buf_info.sharingMode    = VK_SHARING_MODE_EXCLUSIVE;
+        if ( dev.GetResourceFlags().memTypes.contains( EMemoryType::Unified ))
+            desc.memType = EMemoryType::Unified;    // better performance for read access on device
+        else
+            desc.memType = EMemoryType::HostCoherent;
 
-        VkMemoryRequirements    mem_req = {};
         {
-            VkBuffer    buf = Default;
-            VK_CHECK_ERR( dev.vkCreateBuffer( dev.GetVkDevice(), &buf_info, null, OUT &buf ));
+            VkBufferCreateInfo      buf_info = {};
+            buf_info.sType          = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
+            buf_info.flags          = 0;
+            buf_info.usage          = VEnumCast( desc.usage );
+            buf_info.size           = 1 << 10;
+            buf_info.sharingMode    = VK_SHARING_MODE_EXCLUSIVE;
 
-            dev.vkGetBufferMemoryRequirements( dev.GetVkDevice(), buf, &mem_req );
-            dev.vkDestroyBuffer( dev.GetVkDevice(), buf, null );
-        }
+            VkMemoryRequirements2   mem_req2 = {};
+            mem_req2.sType  = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2;
 
-        const Bytes             per_frame_size  = AlignUp( info.staging.vstreamSize, Bytes{mem_req.alignment} );
-        VkMemoryAllocateInfo    alloc_info      = {};
-        alloc_info.sType            = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
-        alloc_info.allocationSize   = VkDeviceSize( per_frame_size * info.maxFrames );
+            CHECK_ERR( dev.GetMemoryRequirements( buf_info, OUT &mem_req2 ));
 
-        // search for unified memory
-        if ( not dev.GetMemoryTypeIndex( mem_req.memoryTypeBits,
-                                         NAMED_ARG( includeFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ),
-                                         NAMED_ARG( optIncludeFlags, Zero ), NAMED_ARG( excludeFlags, Zero ), NAMED_ARG( optExcludeFlags, Zero ),
-                                         OUT alloc_info.memoryTypeIndex ))
-        {
-            // search for host coherent memory
-            CHECK_ERR( dev.GetMemoryTypeIndex( mem_req.memoryTypeBits,
-                                               NAMED_ARG( includeFlags, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT ),   NAMED_ARG( optIncludeFlags, Zero ),
-                                               NAMED_ARG( excludeFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT ),                                          NAMED_ARG( optExcludeFlags, Zero ),
-                                               OUT alloc_info.memoryTypeIndex ));
+            desc.size = AlignUp( info.staging.vstreamSize, Bytes{mem_req2.memoryRequirements.alignment} );
         }
-        VK_CHECK_ERR( dev.vkAllocateMemory( dev.GetVkDevice(), &alloc_info, null, OUT &_vstream.memory ));
-
-        void*   mapped = null;
-        VK_CHECK_ERR( dev.vkMapMemory( dev.GetVkDevice(), _vstream.memory, 0, alloc_info.allocationSize, 0, OUT &mapped ));
 
-        const auto  prop_flags = dev.GetVProperties().memoryProperties.memoryTypes[ alloc_info.memoryTypeIndex ].propertyFlags;
-        Bytes       offset;
+        auto    allocator = MakeRC<VLinearMemAllocator>( desc.size * info.maxFrames );
 
         for (uint i = 0; i < info.maxFrames; ++i)
         {
-            auto&       vb  = _vstream.buffers[i];
-            VkBuffer    buf = Default;
+            auto&   vb  = _vstream.buffers[i];
 
-            buf_info.size = VkDeviceSize(per_frame_size);
-            VK_CHECK_ERR( dev.vkCreateBuffer( dev.GetVkDevice(), &buf_info, null, OUT &buf ));
-
-            VK_CHECK_ERR( dev.vkBindBufferMemory( dev.GetVkDevice(), buf, _vstream.memory, VkDeviceSize(offset) ));
+            vb.buffer = _resMngr.CreateBuffer( desc, "vstream", allocator );
+            CHECK_ERR( vb.buffer );
 
-            VulkanBufferDesc    desc;
-            desc.buffer         = buf;
-            desc.size           = per_frame_size;
-            desc.usage          = VkBufferUsageFlagBits( buf_info.usage );
-            desc.memFlags       = VkMemoryPropertyFlagBits( prop_flags );
-            desc.canBeDestroyed = true;
+            auto*   buf = _resMngr.GetResource( vb.buffer );
 
-            vb.buffer = _resMngr.CreateBuffer( desc, "vstream" );
-            CHECK_ERR( vb.buffer );
+            VulkanMemoryObjInfo mem_info;
+            CHECK_ERR( _resMngr.GetMemoryInfo( buf->MemoryId(), OUT mem_info ));
 
             vb.size.store( 0_b );
-            vb.capacity     = per_frame_size;
-            vb.memOffset    = offset;
-            vb.bufferHandle = _resMngr.GetResource( vb.buffer )->Handle();
-            vb.mapped       = mapped + offset;
-
-            offset += per_frame_size;
+            vb.capacity     = desc.size;
+            vb.memOffset    = mem_info.offset;
+            vb.bufferHandle = buf->Handle();
+            vb.mapped       = mem_info.mappedPtr;
         }
+
+        CHECK( allocator->GetStatistic().pageCount == 1 );
         return true;
     }
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.h b/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.h
index 13f0c9f6..879159fa 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VStagingBufferManager.h
@@ -1,13 +1,4 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-/*
-    hint:
-        upload      - write (on host)   - from host to device
-        readback    - read  (on host)   - from device to host
-
-    Upload staging buffer must use coherent memory and doesn't require FlushMemoryRanges.
-    Readback staging buffer can use cached non-coherent memory.
-    Vertex buffer use unified memory and doesn't require FlushMemoryRanges.
-*/
 
 #pragma once
 
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.cpp b/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.cpp
index 9e8704b2..1a80191e 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.cpp
+++ b/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.cpp
@@ -173,7 +173,7 @@ namespace AE::Graphics
     ParseShaderTrace
 =================================================
 */
-    bool  VTilePipeline::ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
+    bool  VTilePipeline::ParseShaderTrace (const void* ptr, Bytes maxSize, ShaderDebugger::ELogFormat format, OUT Array<String> &result) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
         return _dbgTrace and _dbgTrace->ParseShaderTrace( ptr, maxSize, ConvertLogFormat(format), OUT result );
diff --git a/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.h b/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.h
index 079e6168..f6a67773 100644
--- a/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.h
+++ b/AE/engine/src/graphics/Vulkan/Resources/VTilePipeline.h
@@ -51,23 +51,27 @@ namespace AE::Graphics
 
     // methods
     public:
-        VTilePipeline ()                                            __NE___ {}
-        ~VTilePipeline ()                                           __NE___;
-
-        ND_ bool  Create (VResourceManager &, const CreateInfo &ci) __NE___;
-            void  Destroy (VResourceManager &)                      __NE___;
-
-        ND_ bool  ParseShaderTrace (const void *ptr, Bytes maxSize, ShaderDebugger::ELogFormat, OUT Array<String> &result) C_NE___;
-
-        ND_ VkPipeline              Handle ()                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
-        ND_ VkPipelineLayout        Layout ()                       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
-        ND_ VkPipelineBindPoint     BindPoint ()                    C_NE___ { return VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI; }
-        ND_ PipelineLayoutID        LayoutID ()                     C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
-        ND_ uint2                   LocalSize ()                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint2{_localSize}; }
-        ND_ EPipelineDynamicState   DynamicState ()                 C_NE___ { return Default; }
-        ND_ uint                    RenderPassSubpassIndex ()       C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _subpassIndex; }
-
-        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
+        VTilePipeline ()                                                __NE___ {}
+        ~VTilePipeline ()                                               __NE___;
+
+        ND_ bool  Create (VResourceManager &, const CreateInfo &ci)     __NE___;
+            void  Destroy (VResourceManager &)                          __NE___;
+
+        ND_ bool  ParseShaderTrace (const void*                 ptr,
+                                    Bytes                       maxSize,
+                                    ShaderDebugger::ELogFormat  logFmt,
+                                    OUT Array<String>           &result) C_NE___;
+
+        ND_ VkPipeline              Handle ()                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _handle; }
+        ND_ VkPipelineLayout        Layout ()                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layout; }
+        ND_ VkPipelineBindPoint     BindPoint ()                        C_NE___ { return VK_PIPELINE_BIND_POINT_SUBPASS_SHADING_HUAWEI; }
+        ND_ PipelineLayoutID        LayoutId ()                         C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _layoutId; }
+        ND_ uint2                   LocalSize ()                        C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint2{_localSize}; }
+        ND_ EPipelineDynamicState   DynamicState ()                     C_NE___ { return Default; }
+        ND_ uint                    RenderPassSubpassIndex ()           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _subpassIndex; }
+        ND_ EPipelineOpt            Options ()                          C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _options; }
+
+        DEBUG_ONLY(  ND_ StringView  GetDebugName ()                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _debugName; })
     };
 
 } // AE::Graphics
diff --git a/AE/engine/src/graphics/Vulkan/VCommon.h b/AE/engine/src/graphics/Vulkan/VCommon.h
index 5fd157b2..49bd13a6 100644
--- a/AE/engine/src/graphics/Vulkan/VCommon.h
+++ b/AE/engine/src/graphics/Vulkan/VCommon.h
@@ -3,7 +3,7 @@
     docs:
         [Vulkan spec](https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html)
 
-    [supported features](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/VulkanFeatures.md)
+    [supported features](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/VulkanFeatures.md)
 */
 
 #pragma once
@@ -38,7 +38,7 @@ namespace AE::Graphics
     class VFramebuffer;
     class VCommandPoolManager;
     class VCommandBatch;
-    class VRenderTaskScheduler;
+    class RenderTaskScheduler;
 
     DEBUG_ONLY(
         using DebugName_t = FixedString<64>;
@@ -58,9 +58,7 @@ namespace AE::Graphics
     //
     struct VConfig final : Noninstanceable
     {
-        static constexpr uint   MaxQueues       = uint(EQueueType::_Count) + 1;
-
-        static constexpr uint   MaxVideoMaxReq  = 8;
+        static constexpr uint   MaxVideoMemReq  = 8;
 
         // for query manager
         static constexpr uint   TimestampQueryPerFrame          = 1000;
diff --git a/AE/engine/src/graphics/Vulkan/VDevice.cpp b/AE/engine/src/graphics/Vulkan/VDevice.cpp
index e4db31ba..35749990 100644
--- a/AE/engine/src/graphics/Vulkan/VDevice.cpp
+++ b/AE/engine/src/graphics/Vulkan/VDevice.cpp
@@ -10,35 +10,35 @@ namespace AE::Graphics
 {
 namespace
 {
-    STATIC_ASSERT( sizeof(DispatchIndirectCommand)      == sizeof(VkDispatchIndirectCommand) );
-    STATIC_ASSERT( sizeof(DrawIndirectCommand)          == sizeof(VkDrawIndirectCommand) );
-    STATIC_ASSERT( sizeof(DrawIndexedIndirectCommand)   == sizeof(VkDrawIndexedIndirectCommand) );
-    STATIC_ASSERT( sizeof(DrawMeshTasksIndirectCommand) == sizeof(VkDrawMeshTasksIndirectCommandEXT) );
-    STATIC_ASSERT( sizeof(TraceRayIndirectCommand)      == sizeof(VkTraceRaysIndirectCommandKHR) );
-    STATIC_ASSERT( sizeof(TraceRayIndirectCommand2)     == sizeof(VkTraceRaysIndirectCommand2KHR) );
-    STATIC_ASSERT( sizeof(ASBuildIndirectCommand)       == sizeof(VkAccelerationStructureBuildRangeInfoKHR) );
-    STATIC_ASSERT( sizeof(DeviceAddress)                == sizeof(VkDeviceAddress) );
-
-    STATIC_ASSERT( offsetof(DrawIndirectCommand, vertexCount)   == offsetof(VkDrawIndirectCommand, vertexCount) );
-    STATIC_ASSERT( offsetof(DrawIndirectCommand, instanceCount) == offsetof(VkDrawIndirectCommand, instanceCount) );
-    STATIC_ASSERT( offsetof(DrawIndirectCommand, firstVertex)   == offsetof(VkDrawIndirectCommand, firstVertex) );
-    STATIC_ASSERT( offsetof(DrawIndirectCommand, firstInstance) == offsetof(VkDrawIndirectCommand, firstInstance) );
-
-    STATIC_ASSERT( offsetof(DrawIndexedIndirectCommand, indexCount)     == offsetof(VkDrawIndexedIndirectCommand, indexCount) );
-    STATIC_ASSERT( offsetof(DrawIndexedIndirectCommand, instanceCount)  == offsetof(VkDrawIndexedIndirectCommand, instanceCount) );
-    STATIC_ASSERT( offsetof(DrawIndexedIndirectCommand, firstIndex)     == offsetof(VkDrawIndexedIndirectCommand, firstIndex) );
-    STATIC_ASSERT( offsetof(DrawIndexedIndirectCommand, vertexOffset)   == offsetof(VkDrawIndexedIndirectCommand, vertexOffset) );
-    STATIC_ASSERT( offsetof(DrawIndexedIndirectCommand, firstInstance)  == offsetof(VkDrawIndexedIndirectCommand, firstInstance) );
-
-    STATIC_ASSERT( FrameUID::MaxFramesLimit() == GraphicsConfig::MaxFrames );
-
-    STATIC_ASSERT( VK_HEADER_VERSION == 261 );
+    StaticAssert( sizeof(DispatchIndirectCommand)       == sizeof(VkDispatchIndirectCommand) );
+    StaticAssert( sizeof(DrawIndirectCommand)           == sizeof(VkDrawIndirectCommand) );
+    StaticAssert( sizeof(DrawIndexedIndirectCommand)    == sizeof(VkDrawIndexedIndirectCommand) );
+    StaticAssert( sizeof(DrawMeshTasksIndirectCommand)  == sizeof(VkDrawMeshTasksIndirectCommandEXT) );
+    StaticAssert( sizeof(TraceRayIndirectCommand)       == sizeof(VkTraceRaysIndirectCommandKHR) );
+    StaticAssert( sizeof(TraceRayIndirectCommand2)      == sizeof(VkTraceRaysIndirectCommand2KHR) );
+    StaticAssert( sizeof(ASBuildIndirectCommand)        == sizeof(VkAccelerationStructureBuildRangeInfoKHR) );
+    StaticAssert( sizeof(DeviceAddress)             == sizeof(VkDeviceAddress) );
+
+    StaticAssert( offsetof(DrawIndirectCommand, vertexCount)    == offsetof(VkDrawIndirectCommand, vertexCount) );
+    StaticAssert( offsetof(DrawIndirectCommand, instanceCount)  == offsetof(VkDrawIndirectCommand, instanceCount) );
+    StaticAssert( offsetof(DrawIndirectCommand, firstVertex)    == offsetof(VkDrawIndirectCommand, firstVertex) );
+    StaticAssert( offsetof(DrawIndirectCommand, firstInstance)  == offsetof(VkDrawIndirectCommand, firstInstance) );
+
+    StaticAssert( offsetof(DrawIndexedIndirectCommand, indexCount)      == offsetof(VkDrawIndexedIndirectCommand, indexCount) );
+    StaticAssert( offsetof(DrawIndexedIndirectCommand, instanceCount)   == offsetof(VkDrawIndexedIndirectCommand, instanceCount) );
+    StaticAssert( offsetof(DrawIndexedIndirectCommand, firstIndex)      == offsetof(VkDrawIndexedIndirectCommand, firstIndex) );
+    StaticAssert( offsetof(DrawIndexedIndirectCommand, vertexOffset)    == offsetof(VkDrawIndexedIndirectCommand, vertexOffset) );
+    StaticAssert( offsetof(DrawIndexedIndirectCommand, firstInstance)   == offsetof(VkDrawIndexedIndirectCommand, firstInstance) );
+
+    StaticAssert( FrameUID::MaxFramesLimit() == GraphicsConfig::MaxFrames );
+
+    StaticAssert( VK_HEADER_VERSION == 261 );
 
     static constexpr usize  c_MaxMemTypes = std::initializer_list<EMemoryType>{
                                                 EMemoryType::DeviceLocal,   EMemoryType::Transient,     EMemoryType::HostCoherent,
                                                 EMemoryType::HostCached,    EMemoryType::Dedicated,     EMemoryType::HostCachedCoherent,
                                                 EMemoryType::Unified,       EMemoryType::UnifiedCached }.size();
-    STATIC_ASSERT( decltype(DeviceResourceFlags::memTypes)::capacity() >= c_MaxMemTypes );
+    StaticAssert( decltype(DeviceResourceFlags::memTypes)::capacity() >= c_MaxMemTypes );
 
 
 #   include "vulkan_loader/vkenum_to_str.h"
@@ -440,7 +440,6 @@ namespace
                 break;
 
             case EMemoryType::Transient :
-            //case EMemoryType::DeviceLocal | EMemoryType::Transient :
                 include_flags       = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT;
                 exclude_flags       = VK_MEMORY_PROPERTY_HOST_CACHED_BIT;
                 opt_exclude_flags   = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
@@ -486,6 +485,43 @@ namespace
         return GetMemoryTypeIndex( memoryTypeBits, include_flags, opt_include_flags, exclude_flags, opt_exclude_flags, OUT memoryTypeIndex );
     }
 
+/*
+=================================================
+    AllocateMemory
+=================================================
+*/
+    VkResult  VDevice::AllocateMemory (const VkMemoryAllocateInfo &allocateInfo, OUT VkDeviceMemory &memory) C_NE___
+    {
+        auto    err = vkAllocateMemory( GetVkDevice(), &allocateInfo, null, OUT &memory );
+
+        #ifdef AE_DEBUG
+        if_unlikely( err == VK_ERROR_OUT_OF_HOST_MEMORY or err == VK_ERROR_OUT_OF_DEVICE_MEMORY )
+        {
+            DRC_SHAREDLOCK( _drCheck );
+            if ( IsInitialized() and GetVExtensions().memoryBudget )
+            {
+                VkPhysicalDeviceMemoryBudgetPropertiesEXT   budget = {};
+                VkPhysicalDeviceMemoryProperties2           props  = {};
+                budget.sType    = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT;
+                props.sType     = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MEMORY_PROPERTIES_2;
+                props.pNext     = &budget;
+
+                vkGetPhysicalDeviceMemoryProperties2KHR( _vkPhysicalDevice, OUT &props );
+
+                const auto&     type    = props.memoryProperties.memoryTypes[ allocateInfo.memoryTypeIndex ];
+                const auto&     heap    = props.memoryProperties.memoryHeaps[ type.heapIndex ];
+
+                AE_LOGI( "Out of memory error, can't allocate memType("s << ToString(allocateInfo.memoryTypeIndex) << ") size(" <<
+                         ToString(Bytes{allocateInfo.allocationSize}) << ") heap(" << ToString(type.heapIndex) << ") heapSize(" <<
+                         ToString(Bytes{heap.size}) << ") heapUsage(" << ToString(Bytes{budget.heapUsage[ type.heapIndex ]}) <<
+                         ") heapAvailable(" << ToString(Bytes{budget.heapBudget[ type.heapIndex ]}) << ")" );
+            }
+        }
+        #endif
+
+        return err;
+    }
+
 /*
 =================================================
     GetMemoryTypeBits
@@ -572,11 +608,13 @@ namespace
 
         Bytes*  usage [] = { &result->deviceUsage, &result->hostUsage, &result->unifiedUsage };
         Bytes*  avail [] = { &result->deviceAvailable, &result->hostAvailable, &result->unifiedAvailable };
+        Bytes*  total [] = { &result->deviceTotal, &result->hostTotal, &result->unifiedTotal };
 
         for (uint i = 0; i < props.memoryProperties.memoryHeapCount; ++i)
         {
             *usage[ _memHeapToType[i] ] += budget.heapUsage[i];
-            *avail[ _memHeapToType[i] ] += budget.heapUsage[i] + budget.heapBudget[i];
+            *avail[ _memHeapToType[i] ] += budget.heapBudget[i];
+            *total[ _memHeapToType[i] ] += props.memoryProperties.memoryHeaps[i].size;
         }
 
         // driver bug: memory_budget extension enabled but not active
@@ -601,6 +639,281 @@ namespace
         }
         return false;
     }
+
+/*
+=================================================
+    PrintPipelineExecutableStatistics
+=================================================
+*/
+    bool  VDevice::PrintPipelineExecutableStatistics (StringView pplnName, const VkPipeline pipeline) C_NE___
+    {
+    #ifdef AE_ENABLE_LOGS
+        if ( not GetVExtensions().pplnExecProps )
+            return false;
+
+        TRY{
+            VkPipelineInfoKHR   ppln_info;
+            ppln_info.sType     = VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR;
+            ppln_info.pNext     = null;
+            ppln_info.pipeline  = pipeline;
+
+            uint    count = 0;
+            VK_CHECK_ERR( vkGetPipelineExecutablePropertiesKHR( GetVkDevice(), &ppln_info, OUT &count, null ));
+
+            Array<VkPipelineExecutablePropertiesKHR>    exec_props;
+            exec_props.resize( count );
+            for (auto& prop : exec_props) prop.sType = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_PROPERTIES_KHR;
+
+            VK_CHECK_ERR( vkGetPipelineExecutablePropertiesKHR( GetVkDevice(), &ppln_info, INOUT &count, OUT exec_props.data() ));
+
+            VkPipelineExecutableInfoKHR exec_info;
+            exec_info.sType     = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR;
+            exec_info.pNext     = null;
+            exec_info.pipeline  = pipeline;
+
+            Array<VkPipelineExecutableStatisticKHR> statistics;
+
+            const StringView    s_stages        {"stages"};
+            const StringView    s_name          {"name"};
+            const StringView    s_subgroupSize  {"subgroupSize"};
+
+            String  str;
+            for (const auto [prop, idx] : WithIndex(exec_props))
+            {
+                exec_info.executableIndex = uint(idx);
+                VK_CHECK_ERR( vkGetPipelineExecutableStatisticsKHR( GetVkDevice(), &exec_info, OUT &count, null ));
+
+                if ( count == 0 ) continue;
+
+                statistics.resize( count );
+                for (auto& stat : statistics) stat.sType = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_STATISTIC_KHR;
+                VK_CHECK_ERR( vkGetPipelineExecutableStatisticsKHR( GetVkDevice(), &exec_info, OUT &count, OUT statistics.data() ));
+
+                if ( exec_props.size() > 1 )
+                    str << "\n[" << ToString(idx) << "]";
+
+                uint    j       = 0;
+                usize   max_len = Max( s_stages.size(), s_name.size(), s_subgroupSize.size() );
+
+                for (auto& stat : statistics)
+                    AssignMax( INOUT max_len, StringView{stat.name}.size() );
+
+                str << "\n  " << s_stages << ": ";
+                AppendToString( INOUT str, s_stages.size(), max_len, !!(j++ & 1), '.', ' ' );
+                str << ' ' << ToString( AEEnumCast( VkShaderStageFlagBits( prop.stages )));
+
+                str << "\n  " << s_name << ": ";
+                AppendToString( INOUT str, s_name.size(), max_len, !!(j++ & 1), '.', ' ' );
+                str << ' ' << prop.name << " (" << prop.description << ')';
+
+                str << "\n  " << s_subgroupSize << ": ";
+                AppendToString( INOUT str, s_subgroupSize.size(), max_len, !!(j++ & 1), '.', ' ' );
+                str << ' ' << ToString( prop.subgroupSize );
+
+                for (const auto [stat, i] : WithIndex(statistics))
+                {
+                    StringView  name {stat.name};
+
+                    str << "\n  " << name << ": ";
+                    AppendToString( INOUT str, name.size(), max_len, !!(j++ & 1), '.', ' ' );
+                    str << ' ';
+
+                    BEGIN_ENUM_CHECKS();
+                    switch ( stat.format )
+                    {
+                        case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_BOOL32_KHR :   str << (stat.value.b32 ? "true" : "false");     break;
+                        case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_INT64_KHR :    str << ToString( stat.value.i64 );              break;
+                        case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR :   str << ToString( stat.value.u64 );              break;
+                        case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_FLOAT64_KHR :  str << ToString( stat.value.f64 );              break;
+                        case VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_MAX_ENUM_KHR : break;
+                    }
+                    END_ENUM_CHECKS();
+                    str << "  (" << stat.description << ')';
+                }
+            }
+
+            if ( str.empty() )
+                return true;
+
+            ("\nPipeline '"s << pplnName << "' ExecutableStatistics {") >> str;
+            str << "\n}\n";
+
+            AE_LOGI( str );
+            return true;
+        }
+        CATCH_ALL(
+            return false;
+        )
+    #endif
+    }
+
+/*
+=================================================
+    PrintPipelineExecutableInternalRepresentations
+=================================================
+*/
+    bool  VDevice::PrintPipelineExecutableInternalRepresentations (StringView pplnName, const VkPipeline pipeline) C_NE___
+    {
+    #ifdef AE_ENABLE_LOGS
+        if ( not GetVExtensions().pplnExecProps )
+            return false;
+
+        TRY{
+            VkPipelineInfoKHR   ppln_info;
+            ppln_info.sType     = VK_STRUCTURE_TYPE_PIPELINE_INFO_KHR;
+            ppln_info.pNext     = null;
+            ppln_info.pipeline  = pipeline;
+
+            uint    count = 0;
+            VK_CHECK_ERR( vkGetPipelineExecutablePropertiesKHR( GetVkDevice(), &ppln_info, OUT &count, null ));
+
+            Array<VkPipelineExecutablePropertiesKHR>    exec_props;
+            exec_props.resize( count );
+            for (auto& prop : exec_props) prop.sType = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_PROPERTIES_KHR;
+
+            VK_CHECK_ERR( vkGetPipelineExecutablePropertiesKHR( GetVkDevice(), &ppln_info, INOUT &count, OUT exec_props.data() ));
+
+            VkPipelineExecutableInfoKHR exec_info;
+            exec_info.sType     = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INFO_KHR;
+            exec_info.pNext     = null;
+            exec_info.pipeline  = pipeline;
+
+            Array<VkPipelineExecutableInternalRepresentationKHR>    exec_irep;
+
+            String  str;
+            for (const auto [prop, idx] : WithIndex(exec_props))
+            {
+                exec_info.executableIndex = uint(idx);
+                VK_CHECK_ERR( vkGetPipelineExecutableInternalRepresentationsKHR( GetVkDevice(), &exec_info, OUT &count, null ));
+
+                if ( count == 0 ) continue;
+
+                exec_irep.resize( count );
+                for (auto& stat : exec_irep) stat.sType = VK_STRUCTURE_TYPE_PIPELINE_EXECUTABLE_INTERNAL_REPRESENTATION_KHR;
+                VK_CHECK_ERR( vkGetPipelineExecutableInternalRepresentationsKHR( GetVkDevice(), &exec_info, OUT &count, OUT exec_irep.data() ));
+
+                str << "\n[" << ToString(idx) << "]"
+                    << "\n  stages:       " << ToString( AEEnumCast( VkShaderStageFlagBits( prop.stages )))
+                    << "\n  name:         " << prop.name << " (" << prop.description << ')'
+                    << "\n  subgroupSize: " << ToString( prop.subgroupSize );
+
+                for (const auto [rep, i] : WithIndex(exec_irep))
+                {
+                    str << "\n  [" << ToString(i) << "]"
+                        << "\n    name:        " << rep.name
+                        << "\n    description: " << rep.description;
+
+                    if ( rep.isText )
+                        str << "\n    text:        " << StringView{ Cast<char>(rep.pData), rep.dataSize };
+                }
+            }
+
+            if ( str.empty() )
+                return true;
+
+            ("\nPipeline '"s << pplnName << "' ExecutableInternalRepresentations {") >> str;
+            str << "\n}\n";
+
+            AE_LOGI( str );
+            return true;
+        }
+        CATCH_ALL(
+            return false;
+        )
+    #endif
+    }
+
+/*
+=================================================
+    PrintPipelineExecutableInfo
+=================================================
+*/
+    bool  VDevice::PrintPipelineExecutableInfo (StringView name, VkPipeline pipeline, EPipelineOpt options) C_NE___
+    {
+        bool    res = GetVExtensions().pplnExecProps;
+
+        if ( AllBits( options, EPipelineOpt::CaptureStatistics ))
+            res &= PrintPipelineExecutableStatistics( name, pipeline );
+
+        if ( AllBits( options, EPipelineOpt::CaptureInternalRepresentation ))
+            res &= PrintPipelineExecutableInternalRepresentations( name, pipeline );
+
+        return res;
+    }
+
+/*
+=================================================
+    GetMemoryRequirements (buffer)
+=================================================
+*/
+    bool  VDevice::GetMemoryRequirements (const VkBufferCreateInfo &ci, OUT VkMemoryRequirements2* memReq) C_NE___
+    {
+        CHECK_ERR( memReq != null );
+
+        if ( _extensions.maintenance4 )
+        {
+            VkDeviceBufferMemoryRequirements    info = {};
+            info.sType          = VK_STRUCTURE_TYPE_DEVICE_BUFFER_MEMORY_REQUIREMENTS;
+            info.pCreateInfo    = &ci;
+
+            vkGetDeviceBufferMemoryRequirementsKHR( _vkLogicalDevice, &info, OUT memReq );
+            return true;
+        }
+
+        VkBuffer    buf = Default;
+        VK_CHECK_ERR( vkCreateBuffer( _vkLogicalDevice, &ci, null, OUT &buf ));
+
+        if ( _extensions.bindMemory2 )
+        {
+            VkBufferMemoryRequirementsInfo2 info = {};
+            info.sType  = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2;
+            info.buffer = buf;
+            vkGetBufferMemoryRequirements2KHR( _vkLogicalDevice, &info, OUT memReq );
+        }else
+            vkGetBufferMemoryRequirements( _vkLogicalDevice, buf, OUT &memReq->memoryRequirements );
+
+        vkDestroyBuffer( _vkLogicalDevice, buf, null );
+        return true;
+    }
+
+/*
+=================================================
+    GetMemoryRequirements (image)
+=================================================
+*/
+    bool  VDevice::GetMemoryRequirements (const VkImageCreateInfo &ci, OUT VkMemoryRequirements2* memReq) C_NE___
+    {
+        CHECK_ERR( memReq != null );
+
+        if ( _extensions.maintenance4 )
+        {
+            VkDeviceImageMemoryRequirements info = {};
+            info.sType          = VK_STRUCTURE_TYPE_DEVICE_IMAGE_MEMORY_REQUIREMENTS;
+            info.pCreateInfo    = &ci;
+
+            // This parameter is ignored unless pCreateInfo::tiling is VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT,
+            // or pCreateInfo::flags has VK_IMAGE_CREATE_DISJOINT_BIT set.
+            //info.planeAspect
+
+            vkGetDeviceImageMemoryRequirementsKHR( _vkLogicalDevice, &info, OUT memReq );
+            return true;
+        }
+
+        VkImage img = Default;
+        VK_CHECK_ERR( vkCreateImage( _vkLogicalDevice, &ci, null, OUT &img ));
+
+        if ( _extensions.bindMemory2 )
+        {
+            VkImageMemoryRequirementsInfo2  info = {};
+            info.sType  = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2;
+            info.image  = img;
+            vkGetImageMemoryRequirements2KHR( _vkLogicalDevice, &info, OUT memReq );
+        }else
+            vkGetImageMemoryRequirements( _vkLogicalDevice, img, OUT &memReq->memoryRequirements );
+
+        vkDestroyImage( _vkLogicalDevice, img, null );
+        return true;
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -616,7 +929,7 @@ namespace
         auto    dbg_report = _dbgReport.WriteNoLock();
         EXLOCK( dbg_report );
 
-        CATCH( dbg_report->tempObjectDbgInfos.reserve( 16 ));
+        NOTHROW( dbg_report->tempObjectDbgInfos.reserve( 16 ));
         dbg_report->tempString.reserve( 1024 );
     }
 
@@ -647,6 +960,21 @@ namespace
         return InstanceVersion{ VK_VERSION_MAJOR(ver), VK_VERSION_MINOR(ver) };
     }
 
+/*
+=================================================
+    LoadNvPerf
+=================================================
+*/
+    bool  VDeviceInitializer::LoadNvPerf () __NE___
+    {
+        //DRC_EXLOCK( _drCheck );
+        //CHECK_ERR( not _nvPerf.IsLoaded() );
+        //CHECK_ERR( GetVkInstance() == Default );
+
+        //return _nvPerf.Load();
+        return false;
+    }
+
 /*
 =================================================
     LoadArmProfiler
@@ -690,7 +1018,7 @@ namespace
         validation.disabledValidationFeatureCount   = uint(ci.disableValidations.size());
         validation.pDisabledValidationFeatures      = ci.disableValidations.data();
 
-        CATCH_ERR(
+        NOTHROW_ERR(
             return _CreateInstance( ci.appName, ci.engineName, ci.instanceLayers, ci.instanceExtensions,
                                     ci.version, ci.appVer, ci.engineVer, &validation );
         )
@@ -698,15 +1026,15 @@ namespace
 
     bool  VDeviceInitializer::_CreateInstance (NtStringView appName, NtStringView engineName, ArrayView<const char*> layers,
                                                ArrayView<const char*> extensions, InstanceVersion version,
-                                               uint appVer, uint engineVer, const VkValidationFeaturesEXT *pValidation) __Th___
+                                               uint appVer, uint engineVer, const VkValidationFeaturesEXT* pValidation) __Th___
     {
         CHECK_ERR( _vkInstance == Default );
+        CHECK_ERR( VulkanLoader::Initialize() );
 
         uint    vk_ver = VK_MAKE_VERSION( version.major, version.minor, 0 );
-        _ValidateInstanceVersion( Default, layers, INOUT vk_ver );
+        _ValidateInstanceVersion( Default, layers, extensions, INOUT vk_ver );
         _vkInstanceVersion = {VK_VERSION_MAJOR(vk_ver), VK_VERSION_MINOR(vk_ver)};
 
-        CHECK_ERR( VulkanLoader::Initialize() );
         _extEmulation.OnInitialize();
 
         Array< const char* >    instance_layers;
@@ -718,8 +1046,8 @@ namespace
         //if ( _nvPerf.IsLoaded() )
         //    _nvPerf.GetInstanceExtensions( *this, INOUT instance_extensions );
 
-        _ValidateInstanceLayers( INOUT instance_layers );                           // throw
-        _ValidateInstanceExtensions( instance_layers, INOUT instance_extensions );  // throw
+        _ValidateInstanceLayers( INOUT instance_layers, Bool{not _enableInfoLog} );                             // throw
+        _ValidateInstanceExtensions( instance_layers, INOUT instance_extensions, Bool{not _enableInfoLog} );    // throw
 
 
         VkApplicationInfo   app_info = {};
@@ -738,6 +1066,9 @@ namespace
         instance_ci.enabledLayerCount       = uint(instance_layers.size());
         instance_ci.ppEnabledLayerNames     = instance_layers.size() ? instance_layers.data() : null;
 
+        if ( ArrayContains( instance_extensions.begin(), instance_extensions.end(), StringView{VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME} ))
+            instance_ci.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
+
         if ( pValidation != null                                                                            and
              (pValidation->enabledValidationFeatureCount | pValidation->disabledValidationFeatureCount) != 0 )
         {
@@ -769,13 +1100,13 @@ namespace
         _vkInstance = newInstance;
         CHECK_ERR( VulkanLoader::LoadInstance( _vkInstance ));
 
-        CATCH_ERR(
+        NOTHROW_ERR(
         for (auto inst : instanceExtensions) {
             _instanceExtensions.insert( inst ); // throw
         })
 
         uint    vk_ver = VK_MAKE_VERSION( version.major, version.minor, 0 );
-        _ValidateInstanceVersion( _vkInstance, Default, INOUT vk_ver );
+        _ValidateInstanceVersion( _vkInstance, instanceLayers, instanceExtensions, INOUT vk_ver );
         _vkInstanceVersion = {VK_VERSION_MAJOR(vk_ver), VK_VERSION_MINOR(vk_ver)};
 
         _OnCreateInstance( instanceExtensions, instanceLayers );    // throw
@@ -913,7 +1244,7 @@ namespace {
 */
     bool  VDeviceInitializer::ChooseHighPerformanceDevice () __NE___
     {
-        CATCH_ERR(
+        NOTHROW_ERR(
             return _ChooseHighPerformanceDevice();
         )
     }
@@ -1127,30 +1458,9 @@ namespace {
 
         // memory type
         {
-            const auto& mem_props = props.memoryProperties;
-
-            for (uint i = 0; i < mem_props.memoryTypeCount; ++i)
-            {
-                auto&       mt  = mem_props.memoryTypes[i];
-                EMemoryType dst = AEEnumCast( VkMemoryPropertyFlagBits(mt.propertyFlags), false );
-
-                if ( dst == Default )
-                    continue;
-
-                outResFlags.memTypes.insert( dst );
-
-                if ( _extensions.dedicatedAllocation and AllBits( dst, EMemoryType::DeviceLocal ))
-                    outResFlags.memTypes.insert( EMemoryType::DeviceLocal | EMemoryType::Dedicated );
-
-                if ( AllBits( dst, EMemoryType::DeviceLocal ))
-                    outResFlags.memTypes.insert( EMemoryType::DeviceLocal );
-
-                if ( AllBits( dst, EMemoryType::HostCached ))
-                    outResFlags.memTypes.insert( EMemoryType::HostCached );
-
-                if ( AllBits( dst, EMemoryType::HostCoherent ))
-                    outResFlags.memTypes.insert( EMemoryType::HostCoherent );
-            }
+            ASSERT( not _memTypeToBits.empty() );
+            for (auto t : _memTypeToBits.GetKeyArray())
+                outResFlags.memTypes.insert( t );
         }
 
         // descriptor types
@@ -1170,7 +1480,7 @@ namespace {
             if ( props.accelerationStructureFeats.accelerationStructure )
                 outResFlags.descrTypes.insert( EDescriptorType::RayTracingScene );
 
-            STATIC_ASSERT( uint(EDescriptorType::_Count) == 12 );
+            StaticAssert( uint(EDescriptorType::_Count) == 12 );
         }
 
         // image & buffer flags
@@ -1235,11 +1545,15 @@ namespace {
     {
         const auto& mem_props = GetVProperties().memoryProperties;
 
-        // for discrete GPU
+        // Is all memory types are device local or has separated device and host memory.
+        bool    all_device_local = true;
+        for (uint i = 0; i < mem_props.memoryTypeCount; ++i) {
+            all_device_local &= AnyBits( mem_props.memoryTypes[i].propertyFlags, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT );
+        }
+
         for (uint i = 0; i < mem_props.memoryTypeCount; ++i)
         {
             const auto&     mt      = mem_props.memoryTypes[i];
-            //const auto&   heap    = mem_props.memoryHeaps[ mt.heapIndex ];
             EMemoryType     dst     = AEEnumCast( VkMemoryPropertyFlagBits(mt.propertyFlags), false );
             const uint      bit     = 1u << i;
 
@@ -1248,36 +1562,34 @@ namespace {
 
             if ( AllBits( dst, EMemoryType::Transient ))  { result( EMemoryType::Transient ) |= bit; continue; }
 
-            if ( AllBits( dst, EMemoryType::Unified ))
+            if ( all_device_local )
             {
-                result( EMemoryType::Unified ) |= bit;
-                if ( AllBits( dst, EMemoryType::UnifiedCached ))  result( EMemoryType::UnifiedCached ) |= bit;
-                continue;
+                // integrated GPU
+                if ( AllBits( dst, EMemoryType::Unified ))              result( EMemoryType::Unified )              |= bit;
+                if ( AllBits( dst, EMemoryType::UnifiedCached ))        result( EMemoryType::UnifiedCached )        |= bit;
+                if ( AllBits( dst, EMemoryType::HostCoherent ))         result( EMemoryType::HostCoherent )         |= bit;
+                if ( AllBits( dst, EMemoryType::HostCached ))           result( EMemoryType::HostCached )           |= bit;
+                if ( AllBits( dst, EMemoryType::HostCachedCoherent ))   result( EMemoryType::HostCachedCoherent )   |= bit;
+                if ( not AllBits( dst, EMemoryType::HostCached ))       result( EMemoryType::DeviceLocal )          |= bit;
             }
+            else
+            {
+                // discrete GPU
+                if ( AllBits( dst, EMemoryType::Unified ))
+                {
+                    result( EMemoryType::Unified ) |= bit;
+                    if ( AllBits( dst, EMemoryType::UnifiedCached ))  result( EMemoryType::UnifiedCached ) |= bit;
+                    continue;
+                }
 
-            if ( AllBits( dst, EMemoryType::DeviceLocal ))          { result( EMemoryType::DeviceLocal ) |= bit; continue; }
-
-            if ( AllBits( dst, EMemoryType::HostCoherent ))         result( EMemoryType::HostCoherent )         |= bit;
-            if ( AllBits( dst, EMemoryType::HostCached ))           result( EMemoryType::HostCached )           |= bit;
-            if ( AllBits( dst, EMemoryType::HostCachedCoherent ))   result( EMemoryType::HostCachedCoherent )   |= bit;
-        }
-
-        // for integrated GPUs add alias 'HostCoherent' for 'Unified'
-        if ( auto it = result.find( EMemoryType::Unified );  (it != result.end()) and (not result.contains( EMemoryType::HostCoherent )) )
-            result.emplace( EMemoryType::HostCoherent, it->second );
+                if ( AllBits( dst, EMemoryType::DeviceLocal ))          { result( EMemoryType::DeviceLocal ) |= bit; continue; }
 
-        // for integrated GPUs add alias 'HostCached' for 'UnifiedCached'
-        if ( auto it = result.find( EMemoryType::UnifiedCached );  (it != result.end()) and (not result.contains( EMemoryType::HostCached )) )
-        {
-            uint    tmp = it->second;
-            result.emplace( EMemoryType::HostCached, tmp );
-            result.emplace( EMemoryType::HostCachedCoherent, tmp );
+                if ( AllBits( dst, EMemoryType::HostCoherent ))         result( EMemoryType::HostCoherent )         |= bit;
+                if ( AllBits( dst, EMemoryType::HostCached ))           result( EMemoryType::HostCached )           |= bit;
+                if ( AllBits( dst, EMemoryType::HostCachedCoherent ))   result( EMemoryType::HostCachedCoherent )   |= bit;
+            }
         }
 
-        // for integrated GPUs add alias 'DeviceLocal' for 'Unified'
-        if ( auto it = result.find( EMemoryType::Unified );  (it != result.end()) and (not result.contains( EMemoryType::DeviceLocal )) )
-            result.emplace( EMemoryType::DeviceLocal, it->second );
-
         // validate
         ASSERT( result.contains( EMemoryType::DeviceLocal ));
         ASSERT( result.contains( EMemoryType::HostCoherent ));
@@ -1312,7 +1624,7 @@ namespace {
                 result[ heap_idx ]  =  memType;
             }
 
-            ASSERT( not AnyBits( heap_bits, new_heap_bits ));   // must not intersects
+            //ASSERT( not AnyBits( heap_bits, new_heap_bits )); // must not intersects
             heap_bits |= new_heap_bits;
         }};
 
@@ -1346,24 +1658,6 @@ namespace {
         ASSERT( heap_bits == ToBitMask<uint>( mem_props.memoryHeapCount ));
     }
 
-/*
-=================================================
-    _LogResourceFlags
-=================================================
-*/
-    void  VDeviceInitializer::_LogResourceFlags () C_Th___
-    {
-        String  str;
-
-        str << "memory types:";
-
-        for (EMemoryType mem : _resFlags.memTypes) {
-            str << "\n  " << ToString( mem );
-        }
-
-        AE_LOG_DBG( str );
-    }
-
 /*
 =================================================
     _LogExternalTools
@@ -1371,6 +1665,10 @@ namespace {
 */
     void  VDeviceInitializer::_LogExternalTools () C_Th___
     {
+    #ifdef AE_ENABLE_LOGS
+        if ( not _extensions.toolingInfo )
+            return;
+
         uint    count = 0;
         VK_CHECK( vkGetPhysicalDeviceToolPropertiesEXT( _vkPhysicalDevice, OUT &count, null ));
 
@@ -1418,6 +1716,7 @@ namespace {
         }
 
         AE_LOGI( str );
+    #endif
     }
 
 /*
@@ -1457,7 +1756,7 @@ namespace {
 */
     bool  VDeviceInitializer::CreateDefaultQueues (EQueueMask required, EQueueMask optional) __NE___
     {
-        CHECK_ERR( _queues.empty() );
+        CHECK_ERR( _queueCount == 0 );
 
         uint    count = 0;
         vkGetPhysicalDeviceQueueFamilyProperties( _vkPhysicalDevice, OUT &count, null );
@@ -1518,7 +1817,7 @@ namespace {
 
                 if ( qcount[i] < q.queueCount and AllBits( q.queueFlags, include_flags ))
                 {
-                    auto&   vq = _queues.emplace_back();
+                    auto&   vq = _queues[ _queueCount++ ];
                     vq.familyIndex      = VQueueFamily(i);
                     vq.priority         = 0.0f;
                     vq.globalPriority   = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_EXT;
@@ -1540,6 +1839,9 @@ namespace {
         }
 
         _InitQueues( queue_family_props, INOUT _queues, INOUT _queueTypes );
+
+        CHECK_ERR(  _queueCount != 0            and
+                    _queueCount <= _queues.size() );
         return true;
     }
 
@@ -1550,7 +1852,7 @@ namespace {
 */
     bool  VDeviceInitializer::CreateQueues (ArrayView<QueueCreateInfo> queues) __NE___
     {
-        CHECK_ERR( _queues.empty() );
+        CHECK_ERR( _queueCount == 0 );
 
         uint    count = 0;
         vkGetPhysicalDeviceQueueFamilyProperties( _vkPhysicalDevice, OUT &count, null );
@@ -1575,7 +1877,7 @@ namespace {
 
                 if ( qcount[i] < prop.queueCount and AllBits( prop.queueFlags, q.includeFlags ))
                 {
-                    auto&   vq = _queues.emplace_back();
+                    auto&   vq = _queues[ _queueCount++ ];
                     vq.familyIndex      = VQueueFamily(i);
                     vq.priority         = q.priority;
                     vq.debugName        = q.debugName;
@@ -1588,7 +1890,8 @@ namespace {
 
         _InitQueues( queue_family_props, INOUT _queues, INOUT _queueTypes );
 
-        CHECK_ERR( _queues.size() );
+        CHECK_ERR(  _queueCount != 0            and
+                    _queueCount <= _queues.size() );
         return true;
     }
 
@@ -1599,7 +1902,7 @@ namespace {
 */
     bool  VDeviceInitializer::CreateLogicalDevice (ArrayView<const char*> extensions, const FeatureSet* fsToDeviceFeatures) __NE___
     {
-        CATCH_ERR(
+        NOTHROW_ERR(
             return _CreateLogicalDevice( extensions, fsToDeviceFeatures );
         )
     }
@@ -1609,7 +1912,7 @@ namespace {
         DRC_EXLOCK( _drCheck );
         CHECK_ERR( _vkPhysicalDevice != Default );
         CHECK_ERR( _vkLogicalDevice == Default );
-        CHECK_ERR( not _queues.empty() );
+        CHECK_ERR( _queueCount != 0 );
 
         // setup device create info
         VkDeviceCreateInfo  device_info = {};
@@ -1625,7 +1928,7 @@ namespace {
 
         _ValidateDeviceExtensions( _vkPhysicalDevice, INOUT device_extensions );    // throw
 
-        CATCH_ERR(
+        NOTHROW_ERR(
         for (auto* ext : device_extensions) {
             _deviceExtensions.insert( ext );
         })
@@ -1639,9 +1942,10 @@ namespace {
 
 
         // setup queues
-        StaticArray< VkDeviceQueueCreateInfo, VConfig::MaxQueues >                  queue_infos;
-        StaticArray< StaticArray<float, VConfig::MaxQueues>, VConfig::MaxQueues >   priorities      = {};
-        StaticArray< VkDeviceQueueGlobalPriorityCreateInfoKHR, VConfig::MaxQueues > global_priority = {};
+        constexpr uint                                                      max_queues      = uint(EQueueType::_Count);
+        StaticArray< VkDeviceQueueCreateInfo, max_queues >                  queue_infos;
+        StaticArray< StaticArray<float, max_queues>, max_queues >           priorities      = {};
+        StaticArray< VkDeviceQueueGlobalPriorityCreateInfoKHR, max_queues > global_priority = {};
         {
             device_info.queueCreateInfoCount    = 0;
             device_info.pQueueCreateInfos       = queue_infos.data();
@@ -1668,8 +1972,9 @@ namespace {
                 }
             }
 
-            for (auto& q : _queues)
+            for (usize i = 0, cnt = _queueCount; i < cnt; ++i)
             {
+                auto&   q = _queues[i];
                 CHECK_ERR( uint(q.familyIndex) < queue_infos.size() );
 
                 auto&   qinfo   = queue_infos[ uint(q.familyIndex) ];
@@ -1742,22 +2047,24 @@ namespace {
         VulkanLoader::SetupDeviceBackwardCompatibility( _vkDeviceVersion.Cast<0>(), INOUT _deviceFnTable );
 
         _queueMask = Default;
-        for (auto& q : _queues)
+        for (usize i = 0, cnt = _queueCount; i < cnt; ++i)
         {
+            auto&   q = _queues[i];
             _queueMask |= q.type;
             vkGetDeviceQueue( _vkLogicalDevice, uint(q.familyIndex), q.queueIndex, OUT &q.handle );
         }
+        ASSERT( _queueCount == BitCount( _queueMask ));
 
         _ValidateQueueStages( _queues );
-        _SetResourceFlags( OUT _resFlags );
         _ValidateSpirvVersion( OUT _spirvVersion );
         _InitMemoryTypeToTypeBits( OUT _memTypeToBits );
         _InitMemHeapToMemType( OUT _memHeapToType );
+        _SetResourceFlags( OUT _resFlags );
         _devProps.InitVulkan( _extensions, _properties );
 
         if ( _enableInfoLog )
         {
-            _LogResourceFlags();    // throw
+            _resFlags.Print();
             _LogLogicalDevice();    // throw
             _devProps.Print();
             _LogExternalTools();    // throw
@@ -1778,9 +2085,8 @@ namespace {
     {
         CHECK_ERR( _vkPhysicalDevice );
         CHECK_ERR( _vkLogicalDevice == Default );
-        CHECK_ERR( not _queues.empty() );
+        CHECK_ERR( _queueCount != 0 );
         CHECK_ERR( newDevice != Default );
-        CHECK_ERR( _queues.empty() );
 
         _vkLogicalDevice = newDevice;
 
@@ -1816,13 +2122,13 @@ namespace {
 
         _vkLogicalDevice    = Default;
         _queueMask          = Default;
+        _queueCount         = 0;
 
-        _queues.clear();
         _queueTypes.fill( Default );
         _deviceExtensions.clear();
 
         if ( _enableInfoLog )
-            AE_LOG_DBG( "Destroyed Vulkan logical device" );
+            AE_LOGI( "Destroyed Vulkan logical device" );
 
         return true;
     }
@@ -1834,6 +2140,7 @@ namespace {
 */
     void  VDeviceInitializer::_LogLogicalDevice () C_Th___
     {
+    #ifdef AE_ENABLE_LOGS
         String  str = "\nCreated Vulkan device:";
 
         str << "\n  requiredApiVersion: . . . . " << ToString( _vkDeviceVersion.major ) << '.' << ToString( _vkDeviceVersion.minor )
@@ -1888,10 +2195,10 @@ namespace {
         }
         str << _GetVulkanExtensionsString();
         str << "\n----";
-        AE_LOG_DBG( str );
+        AE_LOGI( str );
 
         str = "Vulkan device queues:";
-        for (usize i = 0; i < _queues.size(); ++i)
+        for (usize i = 0, cnt = _queueCount; i < cnt; ++i)
         {
             auto&   q = _queues[i];
             str << "\n  [" << ToString(i) << "] "
@@ -1900,7 +2207,8 @@ namespace {
                 << ", familyFlags: " << VkQueueFlagsToString( q.familyFlags );
         }
         str << "\n----";
-        AE_LOG_DBG( str );
+        AE_LOGI( str );
+    #endif
     }
 
 /*
@@ -1912,8 +2220,9 @@ namespace {
     {
         qtypes = {};
 
-        for (auto& vq : queues)
+        for (usize i = 0, cnt = _queueCount; i < cnt; ++i)
         {
+            auto&       vq          = queues[i];
             auto&       q           = props[ uint(vq.familyIndex) ];
             const bool  is_video    = AnyBits( q.queueFlags, VK_QUEUE_VIDEO_DECODE_BIT_KHR | VK_QUEUE_VIDEO_ENCODE_BIT_KHR );
 
@@ -1924,7 +2233,7 @@ namespace {
                                                 q.minImageTransferGranularity.height,
                                                 q.minImageTransferGranularity.depth };
 
-            STATIC_ASSERT( uint(EQueueMask::All) == 0x1F );
+            StaticAssert( uint(EQueueMask::All) == 0x1F );
 
             if ( AllBits( q.queueFlags, VK_QUEUE_GRAPHICS_BIT ) and
                  not is_video                                   and
@@ -2062,8 +2371,10 @@ namespace {
             remove_access |= VK_ACCESS_2_SHADER_BINDING_TABLE_READ_BIT_KHR;
         }
 
-        for (auto& q : queues)
+        for (usize i = 0, cnt = _queueCount; i < cnt; ++i)
         {
+            auto&   q = queues[i];
+
             q.supportedStages   &= ~remove_stages;
             q.supportedAccess   &= ~remove_access;
 
@@ -2077,14 +2388,13 @@ namespace {
     _ValidateInstanceVersion
 =================================================
 */
-    void  VDeviceInitializer::_ValidateInstanceVersion (VkInstance instance, ArrayView<const char*> layers, INOUT uint &version) C_Th___
+    void  VDeviceInitializer::_ValidateInstanceVersion (VkInstance instance, ArrayView<const char*> layers, ArrayView<const char*> extensions, INOUT uint &version) C_Th___
     {
         const uint  min_ver     = VK_API_VERSION_1_0;
         const uint  old_ver     = version;
         uint        current_ver = 0;
 
-        if ( VulkanLoader::Initialize() )
-            VK_CHECK( vkEnumerateInstanceVersion( OUT &current_ver ));
+        VK_CHECK( vkEnumerateInstanceVersion( OUT &current_ver ));
 
         version = Min( Max( version, min_ver ), Max( current_ver, min_ver ));
 
@@ -2097,9 +2407,13 @@ namespace {
             if ( instance == Default )
             {
                 Array< const char* >    instance_layers;
-                instance_layers.assign( layers.begin(), layers.end() ); // throw
+                Array< const char* >    instance_extensions = _GetInstanceExtensions( InstanceVersion{VK_VERSION_MAJOR(min_ver), VK_VERSION_MINOR(min_ver)} );
+
+                instance_layers.assign( layers.begin(), layers.end() );                                         // throw
+                instance_extensions.insert( instance_extensions.end(), extensions.begin(), extensions.end() );  // throw
 
-                _ValidateInstanceLayers( INOUT instance_layers );       // throw
+                _ValidateInstanceLayers( INOUT instance_layers, True{"silent"} );                               // throw
+                _ValidateInstanceExtensions( instance_layers, INOUT instance_extensions, True{"silent"} );      // throw
 
                 VkApplicationInfo       app_info = {};
                 app_info.sType              = VK_STRUCTURE_TYPE_APPLICATION_INFO;
@@ -2108,12 +2422,17 @@ namespace {
                 app_info.pEngineName        = "temp";
 
                 VkInstanceCreateInfo    instance_ci = {};
-                instance_ci.sType               = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
-                instance_ci.pApplicationInfo    = &app_info;
-                instance_ci.enabledLayerCount   = uint(instance_layers.size());
-                instance_ci.ppEnabledLayerNames = instance_layers.size() ? instance_layers.data() : null;
+                instance_ci.sType                   = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
+                instance_ci.pApplicationInfo        = &app_info;
+                instance_ci.enabledLayerCount       = uint(instance_layers.size());
+                instance_ci.ppEnabledLayerNames     = instance_layers.size() ? instance_layers.data() : null;
+                instance_ci.enabledExtensionCount   = uint(instance_extensions.size());
+                instance_ci.ppEnabledExtensionNames = instance_extensions.size() ? instance_extensions.data() : null;
+
+                if ( ArrayContains( instance_extensions.begin(), instance_extensions.end(), StringView{VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME} ))
+                    instance_ci.flags |= VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR;
 
-                VK_CHECK( vkCreateInstance( &instance_ci, null, OUT &tmp_inst ));
+                VK_CHECK_ERRV( vkCreateInstance( &instance_ci, null, OUT &tmp_inst ));
 
                 instance = tmp_inst;
                 CHECK( VulkanLoader::LoadInstance( instance ));
@@ -2149,7 +2468,7 @@ namespace {
             if ( tmp_inst != Default )
             {
                 vkDestroyInstance( tmp_inst, null );
-                VulkanLoader::Unload();
+                VulkanLoader::ResetInstance();
             }
         }
 
@@ -2162,7 +2481,7 @@ namespace {
     _ValidateInstanceLayers
 =================================================
 */
-    void  VDeviceInitializer::_ValidateInstanceLayers (INOUT Array<const char*> &layers) C_Th___
+    void  VDeviceInitializer::_ValidateInstanceLayers (INOUT Array<const char*> &layers, Bool silent) C_Th___
     {
         // load supported layers
         uint    count = 0;
@@ -2198,7 +2517,7 @@ namespace {
 
             if ( not found )
             {
-                if_unlikely( _enableInfoLog )
+                if_unlikely( not silent )
                     AE_LOG_DBG( "Removed layer '"s << (*iter) << "'" );
 
                 iter = layers.erase( iter );
@@ -2206,14 +2525,14 @@ namespace {
             else
             {
                 #ifdef AE_DEBUG
-                if ( spec_ver < VK_HEADER_VERSION_COMPLETE )
+                if ( spec_ver < VK_HEADER_VERSION_COMPLETE and not silent )
                 {
                     // this may cause a crash or false-positive in validation layer, you should update vulkan SDK.
                     AE_LOG_SE( "Instance layer '"s << *iter << "' version (" << ToString(VK_API_VERSION_MAJOR(spec_ver))
-                                    << '.' << ToString(VK_API_VERSION_MINOR(spec_ver)) << '.' << ToString(VK_API_VERSION_PATCH(spec_ver))
-                                    << ") is less than header version (" << ToString(VK_API_VERSION_MAJOR(VK_HEADER_VERSION_COMPLETE))
-                                    << '.' << ToString(VK_API_VERSION_MINOR(VK_HEADER_VERSION_COMPLETE)) << '.' << ToString(VK_API_VERSION_PATCH(VK_HEADER_VERSION_COMPLETE))
-                                    << ")" );
+                                << '.' << ToString(VK_API_VERSION_MINOR(spec_ver)) << '.' << ToString(VK_API_VERSION_PATCH(spec_ver))
+                                << ") is less than header version (" << ToString(VK_API_VERSION_MAJOR(VK_HEADER_VERSION_COMPLETE))
+                                << '.' << ToString(VK_API_VERSION_MINOR(VK_HEADER_VERSION_COMPLETE)) << '.' << ToString(VK_API_VERSION_PATCH(VK_HEADER_VERSION_COMPLETE))
+                                << ")" );
                 }
                 #endif
 
@@ -2227,7 +2546,7 @@ namespace {
     _ValidateInstanceExtensions
 =================================================
 */
-    void  VDeviceInitializer::_ValidateInstanceExtensions (Array<const char*> layers, INOUT Array<const char*> &extensions) C_Th___
+    void  VDeviceInitializer::_ValidateInstanceExtensions (Array<const char*> layers, INOUT Array<const char*> &extensions, Bool silent) C_Th___
     {
         FlatHashSet<StringView> instance_extensions;
 
@@ -2262,7 +2581,7 @@ namespace {
         {
             if ( instance_extensions.find( StringView{*iter} ) == instance_extensions.end() )
             {
-                if_unlikely( _enableInfoLog )
+                if_unlikely( not silent )
                     AE_LOG_DBG( "Removed instance extension '"s << (*iter) << "'" );
 
                 iter = extensions.erase( iter );
@@ -2329,6 +2648,7 @@ namespace {
 */
     void  VDeviceInitializer::_LogInstance (ArrayView<const char*> instanceLayers) C_Th___
     {
+    #ifdef AE_ENABLE_LOGS
         String  str;
         str << "Created Vulkan instance " << ToString(_vkInstanceVersion.major) << '.' << ToString(_vkInstanceVersion.minor) << '\n';
 
@@ -2340,7 +2660,8 @@ namespace {
         for (auto& ext :  _instanceExtensions)
             str << "  " << ext.c_str() << '\n';
 
-        AE_LOG_DBG( str );
+        AE_LOGI( str );
+    #endif
     }
 
 /*
@@ -2526,7 +2847,7 @@ namespace {
         auto    dbg_report  = self->_dbgReport.WriteNoLock();
         EXLOCK( dbg_report );
 
-        try{
+        TRY{
             dbg_report->tempObjectDbgInfos.resize( 1 ); // throw
 
             dbg_report->tempObjectDbgInfos[0] = { VkObjectTypeToString(DebugReportObjectTypeToObjectType( objectType )), "", object };
@@ -2536,8 +2857,8 @@ namespace {
                                 dbg_report->callback,
                                 { dbg_report->tempObjectDbgInfos, pMessage, AllBits( flags, VK_DEBUG_REPORT_ERROR_BIT_EXT ) }); // throw
         }
-        catch(...)
-        {}
+        CATCH_ALL()
+
         return VK_FALSE;
     }
 
@@ -2551,6 +2872,7 @@ namespace {
         if ( callback )
             return callback( msg );
 
+      #ifdef AE_ENABLE_LOGS
         str << msg.message << '\n';
 
         for (auto& obj : msg.objects)
@@ -2559,10 +2881,12 @@ namespace {
         }
         str << "----------------------------\n";
 
-        if ( breakOnError and msg.isError )
-            AE_LOGE( str )
-        else
+        if ( breakOnError and msg.isError ){
+            AE_LOGE( str );
+        }else{
             AE_LOG_SE( str );
+        }
+      #endif
     }
 
 /*
@@ -2608,15 +2932,25 @@ namespace {
         _vkDeviceVersion    = otherDev._vkDeviceVersion;
 
         // copy queues
-        _queues = otherDev._queues;
+        _queueMask  = otherDev._queueMask;
+        _queueCount = otherDev._queueCount;
+
+        ASSERT( _queueCount == BitCount( _queueMask ));
+
+        for (usize i = 0, cnt = _queueCount; i < cnt; ++i)
+        {
+            auto&   q = _queues[i];
+
+            // copy fields except mutex
+            constexpr Bytes offset {offsetof( VQueue, handle )};
+            MemCopy( &q + offset, &otherDev._queues[i] + offset, Sizeof(q) - offset );
 
-        for (auto& q : _queues) {
             _queueTypes[ uint(q.type) ] = &q;
         }
 
-        _extensions         = otherDev._extensions;
+        _extensions = otherDev._extensions;
 
-        CATCH(
+        NOTHROW(
             _instanceExtensions = otherDev._instanceExtensions;
             _deviceExtensions   = otherDev._deviceExtensions;
         )
@@ -2660,8 +2994,8 @@ namespace {
         }
         #endif
 
-        //if ( AnyBits( dev_flags, EDeviceFlags::_NvApiMask ))
-        //    LoadNvPerf();
+        if ( AnyBits( dev_flags, EDeviceFlags::_NvApiMask ))
+            LoadNvPerf();
 
         if ( AnyBits( dev_flags, EDeviceFlags::_ArmProfMask ))
             LoadArmProfiler();
diff --git a/AE/engine/src/graphics/Vulkan/VDevice.h b/AE/engine/src/graphics/Vulkan/VDevice.h
index 5729dc92..3d7e327d 100644
--- a/AE/engine/src/graphics/Vulkan/VDevice.h
+++ b/AE/engine/src/graphics/Vulkan/VDevice.h
@@ -3,11 +3,9 @@
 #pragma once
 
 #ifdef AE_ENABLE_VULKAN
-# include "graphics/Public/DeviceProperties.h"
-# include "graphics/Public/ResourceEnums.h"
-# include "graphics/Public/FeatureSet.h"
-# include "graphics/Public/DescriptorSet.h"
+# include "graphics/Public/IDevice.h"
 # include "graphics/Vulkan/VQueue.h"
+//# include "graphics/Vulkan/Utils/VNvPerf.h"
 # include "graphics/Vulkan/Utils/RenderDocApi.h"
 # include "VulkanExtEmulation.h"
 
@@ -18,7 +16,7 @@ namespace AE::Graphics
     // Vulkan Device
     //
 
-    class VDevice : public VulkanDeviceFn, public Noncopyable
+    class VDevice : public VulkanDeviceFn, public IDevice
     {
     // types
     public:
@@ -30,12 +28,9 @@ namespace AE::Graphics
         #include "vulkan_loader/vk_features.h"
         #undef  VKFEATS_STRUCT
 
-        using ResourceFlags     = DeviceResourceFlags;
-        using DevMemoryInfoOpt  = Optional< DeviceMemoryInfo >;
-
 
     protected:
-        using Queues_t          = FixedArray< VQueue, VConfig::MaxQueues >;
+        using Queues_t          = StaticArray< VQueue, uint(EQueueType::_Count) >;
         using QueueTypes_t      = StaticArray< VQueuePtr, uint(EQueueType::_Count) >;
 
         using ExtensionName_t   = FixedString<VK_MAX_EXTENSION_NAME_SIZE>;
@@ -60,6 +55,7 @@ namespace AE::Graphics
         MemHeapToMemType_t      _memHeapToType;
 
         EQueueMask              _queueMask              = Default;
+        ubyte                   _queueCount             = 0;
         QueueTypes_t            _queueTypes             = {};
         Queues_t                _queues;
 
@@ -68,8 +64,10 @@ namespace AE::Graphics
         InstanceVersion         _vkInstanceVersion;
         DeviceVersion           _vkDeviceVersion;
         SpirvVersion            _spirvVersion;
+        VExtensions             _extensions;
 
         // tools
+        //VNvPerf               _nvPerf;
         RenderDocApi            _rdc;
 
         NO_UNIQUE_ADDRESS
@@ -78,12 +76,10 @@ namespace AE::Graphics
         DRC_ONLY(
             RWDataRaceCheck     _drCheck;)
 
-        VExtensions             _extensions;            // large
-        VulkanDeviceFnTable     _deviceFnTable;         // large
-
         ExtensionSet_t          _instanceExtensions;
         ExtensionSet_t          _deviceExtensions;
 
+        VulkanDeviceFnTable     _deviceFnTable;         // large
         VProperties             _properties;            // very large
 
 
@@ -94,8 +90,8 @@ namespace AE::Graphics
 
         ND_ VExtensions const&      GetVExtensions ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _extensions; }
         ND_ VProperties const&      GetVProperties ()                               C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _properties; }
-        ND_ ResourceFlags const&    GetResourceFlags ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _resFlags; }
-        ND_ DeviceProperties const& GetDeviceProperties ()                          C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _devProps; }
+        ND_ ResourceFlags const&    GetResourceFlags ()                             C_NE_OF { DRC_SHAREDLOCK( _drCheck );  return _resFlags; }
+        ND_ DeviceProperties const& GetDeviceProperties ()                          C_NE_OF { DRC_SHAREDLOCK( _drCheck );  return _devProps; }
 
         ND_ VkDevice                GetVkDevice ()                                  C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _vkLogicalDevice; }
         ND_ VkPhysicalDevice        GetVkPhysicalDevice ()                          C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _vkPhysicalDevice; }
@@ -104,19 +100,22 @@ namespace AE::Graphics
         ND_ DeviceVersion           GetDeviceVersion ()                             C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _vkDeviceVersion; }
         ND_ SpirvVersion            GetSpirvVersion ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _spirvVersion; }
         ND_ Version2                GetVkVersion ()                                 C_NE___ { return GetDeviceVersion().Cast<0>(); }
-        ND_ ArrayView<VQueue>       GetQueues ()                                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _queues; }
+        ND_ ArrayView<VQueue>       GetQueues ()                                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return ArrayView<VQueue>{ _queues.data(), _queueCount }; }
         ND_ VQueuePtr               GetQueue (EQueueType type)                      C_NE___ { DRC_SHAREDLOCK( _drCheck );  return uint(type) < _queueTypes.size() ? _queueTypes[uint(type)] : null; }
-        ND_ EQueueMask              GetAvailableQueues ()                           C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _queueMask; }
-        ND_ StringView              GetDeviceName ()                                C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _properties.properties.deviceName; }
+        ND_ EQueueMask              GetAvailableQueues ()                           C_NE_OF { DRC_SHAREDLOCK( _drCheck );  return _queueMask; }
+        ND_ StringView              GetDeviceName ()                                C_NE_OF { DRC_SHAREDLOCK( _drCheck );  return _properties.properties.deviceName; }
+
+        ND_ bool                    IsInitialized ()                                C_NE_OF { return GetVkDevice() != Default; }
 
-        ND_ bool                    IsInitialized ()                                C_NE___ { return GetVkDevice() != Default; }
+        //ND_ VNvPerf const&        GetNvPerf ()                                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _nvPerf; }
+        //ND_ bool                  HasNvPerf ()                                    C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _nvPerf.IsInitialized(); }
 
         ND_ RenderDocApi const&     GetRenderDocApi ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _rdc; }
         ND_ bool                    HasRenderDocApi ()                              C_NE___ { DRC_SHAREDLOCK( _drCheck );  return _rdc.IsInitialized(); }
 
-        ND_ DevMemoryInfoOpt        GetMemoryUsage ()                               C_NE___;
+        ND_ DevMemoryInfoOpt        GetMemoryUsage ()                               C_NE_OF;
 
-        ND_ bool                    IsUnderDebugger ()                              C_NE___;
+        ND_ bool                    IsUnderDebugger ()                              C_NE_OF;
 
 
         // check extensions
@@ -138,12 +137,26 @@ namespace AE::Graphics
         ND_ bool  GetMemoryTypeIndex (uint memoryTypeBits, EMemoryType memType,
                                       OUT uint &memoryTypeIndex)                    C_NE___;
 
+        ND_ VkResult  AllocateMemory (const VkMemoryAllocateInfo    &allocateInfo,
+                                      OUT VkDeviceMemory            &memory)        C_NE___;
+
         ND_ uint  GetMemoryTypeBits (EMemoryType)                                   C_NE___;
 
-        ND_ bool  CheckConstantLimits ()                                            C_NE___;
-        ND_ bool  CheckExtensions ()                                                C_NE___;
+        ND_ bool  CheckConstantLimits ()                                            C_NE_OF;
+        ND_ bool  CheckExtensions ()                                                C_NE_OF;
 
             void  InitFeatureSet (OUT FeatureSet &)                                 C_NE___;
+
+        // requires 'EPipelineOpt::CaptureStatistics'
+            bool  PrintPipelineExecutableStatistics (StringView name, VkPipeline)                   C_NE___;
+
+        // requires 'EPipelineOpt::CaptureInternalRepresentation'
+            bool  PrintPipelineExecutableInternalRepresentations (StringView name, VkPipeline)      C_NE___;
+
+            bool  PrintPipelineExecutableInfo (StringView name, VkPipeline, EPipelineOpt options)   C_NE___;
+
+        ND_ bool  GetMemoryRequirements (const VkBufferCreateInfo &, OUT VkMemoryRequirements2*)    C_NE___;
+        ND_ bool  GetMemoryRequirements (const VkImageCreateInfo &, OUT VkMemoryRequirements2*)     C_NE___;
     };
 
 
@@ -234,17 +247,22 @@ namespace AE::Graphics
         explicit VDeviceInitializer (Bool enableInfoLog = False{})                                  __NE___;
         ~VDeviceInitializer ()                                                                      __NE___;
 
+
+      // LowLevel //
         ND_ InstanceVersion  GetMaxInstanceVersion ()                                               C_NE___;
 
             bool  LoadNvPerf ()                                                                     __NE___;
             bool  LoadArmProfiler ()                                                                __NE___;
-            bool  LoadRenderDoc ()                                                                  __NE___;
 
         ND_ bool  CreateInstance (const InstanceCreateInfo &ci)                                     __NE___;
+        //  bool  SetInstance (VkInstance value, const InstanceCreateInfo &ci)                      __NE___;
+            bool  DestroyInstance ()                                                                __NE___;
 
-        //ND_ bool  SetInstance (VkInstance value, const InstanceCreateInfo &ci)                    __NE___;
+            bool  LoadRenderDoc ()                                                                  __NE___;
 
-            bool  DestroyInstance ()                                                                __NE___;
+            bool  CreateDebugCallback (VkDebugUtilsMessageSeverityFlagsEXT  severity,
+                                       DebugReport_t &&                     callback = Default)     __NE___;
+            void  DestroyDebugCallback ()                                                           __NE___;
 
         ND_ bool  ChooseDevice (StringView deviceName)                                              __NE___;
         ND_ bool  ChooseHighPerformanceDevice ()                                                    __NE___;
@@ -256,17 +274,16 @@ namespace AE::Graphics
 
         ND_ bool  CreateLogicalDevice (ArrayView<const char*>   extensions          = {},
                                        const FeatureSet*        fsToDeviceFeatures  = null)         __NE___;
-            //bool  SetLogicalDevice (VkDevice value, ArrayView<const char*> extensions = {})       __NE___;
+        //  bool  SetLogicalDevice (VkDevice value, ArrayView<const char*> extensions = {})         __NE___;
             bool  DestroyLogicalDevice ()                                                           __NE___;
 
-            bool  CreateDebugCallback (VkDebugUtilsMessageSeverityFlagsEXT  severity,
-                                       DebugReport_t &&                     callback = Default)     __NE___;
-            void  DestroyDebugCallback ()                                                           __NE___;
+        ND_ static ArrayView<const char*>   GetRecommendedInstanceLayers ()                         __NE___;
+
 
+      // HighLevel //
         ND_ bool  Init (const VDeviceInitializer &otherDev)                                         __NE___;
         ND_ bool  Init (const GraphicsCreateInfo &ci, ArrayView<const char*> instanceExtensions)    __NE___;
 
-        ND_ static ArrayView<const char*>   GetRecommendedInstanceLayers ()                         __NE___;
 
         ND_ VulkanDeviceFnTable &           EditDeviceFnTable ()                                    __NE___ { DRC_EXLOCK( _drCheck ); return _deviceFnTable; }
 
@@ -278,11 +295,12 @@ namespace AE::Graphics
 
         ND_ bool  _CreateInstance (NtStringView appName, NtStringView engineName, ArrayView<const char*> instanceLayers,
                                    ArrayView<const char*> instanceExtensions, InstanceVersion version,
-                                   uint appVer, uint engineVer, const VkValidationFeaturesEXT *pValidation)             __Th___;
+                                   uint appVer, uint engineVer, const VkValidationFeaturesEXT* pValidation)             __Th___;
 
-        void  _ValidateInstanceVersion (VkInstance instance, ArrayView<const char*> layers, INOUT uint &version)        C_Th___;
-        void  _ValidateInstanceLayers (INOUT Array<const char*> &layers)                                                C_Th___;
-        void  _ValidateInstanceExtensions (Array<const char*> layers, INOUT Array<const char*> &ext)                    C_Th___;
+        void  _ValidateInstanceVersion (VkInstance instance, ArrayView<const char*> layers,
+                                        ArrayView<const char*> extensions, INOUT uint &version)                         C_Th___;
+        void  _ValidateInstanceLayers (INOUT Array<const char*> &layers, Bool silent)                                   C_Th___;
+        void  _ValidateInstanceExtensions (Array<const char*> layers, INOUT Array<const char*> &ext, Bool silent)       C_Th___;
         bool  _ChooseHighPerformanceDevice ()                                                                           __Th___;
         bool  _CreateLogicalDevice (ArrayView<const char*> extensions, const FeatureSet* fsToDeviceFeatures)            __Th___;
         void  _ValidateDeviceExtensions (VkPhysicalDevice physDev, INOUT Array<const char*> &ext)                       C_Th___;
@@ -296,7 +314,6 @@ namespace AE::Graphics
         void  _LogInstance (ArrayView<const char*> instanceLayers)                                                      C_Th___;
         void  _LogPhysicalDevices ()                                                                                    C_NE___;
         void  _LogLogicalDevice ()                                                                                      C_Th___;
-        void  _LogResourceFlags ()                                                                                      C_Th___;
         void  _LogExternalTools ()                                                                                      C_Th___;
 
         void  _InitQueues (ArrayView<VkQueueFamilyProperties> props, INOUT Queues_t &queues, INOUT QueueTypes_t &qtypes)C_NE___;
@@ -338,7 +355,7 @@ namespace AE::Graphics
     template <typename T>
     bool  VDevice::SetObjectName (T id, NtStringView name, VkObjectType type) C_NE___
     {
-        STATIC_ASSERT( sizeof(T) <= sizeof(ulong) );
+        StaticAssert( sizeof(T) <= sizeof(ulong) );
         return SetObjectName( ulong(id), name, type );
     }
 
diff --git a/AE/engine/src/graphics/Vulkan/VDeviceFS.cpp b/AE/engine/src/graphics/Vulkan/VDeviceFS.cpp
index a58f51fe..e6456d3f 100644
--- a/AE/engine/src/graphics/Vulkan/VDeviceFS.cpp
+++ b/AE/engine/src/graphics/Vulkan/VDeviceFS.cpp
@@ -6,6 +6,11 @@
 
 namespace AE::Graphics
 {
+namespace
+{
+    // https://vulkan.gpuinfo.org/displayextensionproperty.php?extensionname=VK_KHR_maintenance3&extensionproperty=maxPerSetDescriptors&platform=all
+    static constexpr uint   c_MaxPerSetDescriptors = 512;
+}
 
 /*
 =================================================
@@ -14,7 +19,7 @@ namespace AE::Graphics
 */
     void  VDevice::InitFeatureSet (OUT FeatureSet &outFeatureSet) C_NE___
     {
-        STATIC_ASSERT( sizeof(FeatureSet) == 680 );
+        StaticAssert( sizeof(FeatureSet) == 688 );
 
         const EFeature  True    = EFeature::RequireTrue;
         const EFeature  False   = EFeature::RequireFalse;
@@ -193,7 +198,12 @@ namespace AE::Graphics
         }
 
         if ( _extensions.cooperativeMatrix )
-            outFeatureSet.cooperativeMatrix = _properties.cooperativeMatrixFeats.cooperativeMatrix ? True : False;
+        {
+            outFeatureSet.cooperativeMatrix         = _properties.cooperativeMatrixFeats.cooperativeMatrix ? True : False;
+            outFeatureSet.cooperativeMatrixStages   = AEEnumCast( VkShaderStageFlagBits( _properties.cooperativeMatrixProps.cooperativeMatrixSupportedStages )) & all_stages;
+
+            // use vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR to get supported props
+        }
 
         if ( _extensions.bufferDeviceAddress )
             SET_FEAT2( bufferDeviceAddress, _properties.bufferDeviceAddressFeats );
@@ -306,6 +316,7 @@ namespace AE::Graphics
                 EShadingRate    samples = EShadingRate_FromSampleBits( shading_rates[i].sampleCounts );
                 uint2           size2   = EShadingRate_Size( size | samples );
 
+                Unused( size2 );
                 ASSERT( size2.x == shading_rates[i].fragmentSize.width );
                 ASSERT( size2.y == shading_rates[i].fragmentSize.height );
 
@@ -362,7 +373,7 @@ namespace AE::Graphics
         outFeatureSet.perDescrSet.maxStorageBuffers     = limits.maxDescriptorSetStorageBuffers;
         outFeatureSet.perDescrSet.maxStorageImages      = limits.maxDescriptorSetStorageImages;
         outFeatureSet.perDescrSet.maxUniformBuffers     = limits.maxDescriptorSetUniformBuffers;
-        outFeatureSet.perDescrSet.maxTotalResources     = _extensions.maintenance3 ? _properties.maintenance3Props.maxPerSetDescriptors : 1024u;
+        outFeatureSet.perDescrSet.maxTotalResources     = _extensions.maintenance3 ? _properties.maintenance3Props.maxPerSetDescriptors : c_MaxPerSetDescriptors;
 
         outFeatureSet.perStage.maxInputAttachments      = limits.maxPerStageDescriptorInputAttachments;
         outFeatureSet.perStage.maxSampledImages         = limits.maxPerStageDescriptorSampledImages;
@@ -584,7 +595,7 @@ namespace AE::Graphics
                 vkGetPhysicalDeviceQueueFamilyProperties( _vkPhysicalDevice, OUT &count, OUT queue_family_props.data() );
                 queue_family_props.resize( Min( count, queue_family_props.size() ));
 
-                STATIC_ASSERT( uint(EQueueMask::All) == 0x1F );
+                StaticAssert( uint(EQueueMask::All) == 0x1F );
                 for (auto& props : queue_family_props)
                 {
                     if ( AllBits( props.queueFlags, VK_QUEUE_GRAPHICS_BIT ) and
@@ -631,7 +642,7 @@ namespace AE::Graphics
         #define SET_FEAT( _name_ )          feats10._name_ = (inFS._name_ == True ? VK_TRUE : VK_FALSE)
         #define SET_FEAT2( _name_, _feat_ ) _feat_._name_  = (inFS._name_ == True ? VK_TRUE : VK_FALSE)
 
-        STATIC_ASSERT( sizeof(FeatureSet) == 680 );
+        StaticAssert( sizeof(FeatureSet) == 688 );
 
         auto&           feats10     = _properties.features;
         auto&           f16i8_feats = _properties.shaderFloat16Int8Feats;
@@ -791,7 +802,12 @@ namespace AE::Graphics
         SET_FEAT2( shaderSubgroupClock, _properties.shaderClockFeats );
         SET_FEAT2( shaderDeviceClock,   _properties.shaderClockFeats );
 
-        _extensions.cooperativeMatrix = (inFS.cooperativeMatrix == True);
+        if ( inFS.cooperativeMatrix == True )
+        {
+            _extensions.cooperativeMatrix                                       = true;
+            _properties.cooperativeMatrixFeats.cooperativeMatrix                = VK_TRUE;
+            _properties.cooperativeMatrixProps.cooperativeMatrixSupportedStages = VEnumCast( inFS.cooperativeMatrixStages );
+        }
 
         _extensions.bufferDeviceAddress = (inFS.bufferDeviceAddress == True);
         SET_FEAT2( bufferDeviceAddress, _properties.bufferDeviceAddressFeats );
@@ -864,7 +880,7 @@ namespace AE::Graphics
 
         _extensions.accelerationStructure = _extensions.rayTracingPipeline or _extensions.rayQuery;
 
-        SET_FEAT( drawIndirectFirstInstance ); 
+        SET_FEAT( drawIndirectFirstInstance );
         _extensions.drawIndirectCount = (inFS.drawIndirectCount == True);
 
         _extensions.multiview = (inFS.multiview                     == True)    or
diff --git a/AE/engine/src/graphics/Vulkan/VEnumCast.cpp b/AE/engine/src/graphics/Vulkan/VEnumCast.cpp
index 6a0b2188..d8198bdd 100644
--- a/AE/engine/src/graphics/Vulkan/VEnumCast.cpp
+++ b/AE/engine/src/graphics/Vulkan/VEnumCast.cpp
@@ -73,7 +73,7 @@ namespace AE::Graphics
             StateInfo{ VK_PIPELINE_STAGE_2_ACCELERATION_STRUCTURE_BUILD_BIT_KHR,            VK_ACCESS_2_INDIRECT_COMMAND_READ_BIT,                                                                                                  VK_IMAGE_LAYOUT_MAX_ENUM,                                   _EResState::BuildRTAS_IndirectBuffer        },
             StateInfo{ VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR,                      VK_ACCESS_2_SHADER_BINDING_TABLE_READ_BIT_KHR | VK_ACCESS_2_SHADER_STORAGE_READ_BIT,                                                    VK_IMAGE_LAYOUT_MAX_ENUM,                                   _EResState::RTShaderBindingTable            }
         };
-        STATIC_ASSERT( CountOf(info_arr) == _EResState::_AccessCount );
+        StaticAssert( CountOf(info_arr) == _EResState::_AccessCount );
 
         constexpr auto VertexProcessingShaders =
             VK_PIPELINE_STAGE_2_VERTEX_SHADER_BIT |
diff --git a/AE/engine/src/graphics/Vulkan/VEnumCast.h b/AE/engine/src/graphics/Vulkan/VEnumCast.h
index adb1e360..5e365007 100644
--- a/AE/engine/src/graphics/Vulkan/VEnumCast.h
+++ b/AE/engine/src/graphics/Vulkan/VEnumCast.h
@@ -896,7 +896,7 @@ namespace AE::Graphics
         outVideoUsage   = Default;
         outMemType      = Default;
 
-        STATIC_ASSERT( uint(EImageUsage::All) == 0xFF );
+        StaticAssert( uint(EImageUsage::All) == 0xFF );
         for (auto t : BitfieldIterate( usage ))
         {
             BEGIN_ENUM_CHECKS();
@@ -964,7 +964,7 @@ namespace AE::Graphics
     {
         EImageOpt   result = Zero;
 
-        STATIC_ASSERT( uint(EImageOpt::All) == 0x1FFFF );
+        StaticAssert( uint(EImageOpt::All) == 0x1FFFF );
         for (auto t : BitfieldIterate( values ))
         {
             BEGIN_ENUM_CHECKS();
@@ -1009,7 +1009,7 @@ namespace AE::Graphics
     {
         EBufferUsage    result = Default;
 
-        STATIC_ASSERT( uint(EBufferUsage::All) == 0x1FFF );
+        StaticAssert( uint(EBufferUsage::All) == 0x1FFF );
         for (auto t : BitfieldIterate( values ))
         {
             BEGIN_ENUM_CHECKS();
@@ -1099,10 +1099,10 @@ namespace AE::Graphics
             switch ( t )
             {
                 case VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT :      result |= EMemoryType::DeviceLocal;     break;
-                case VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT :
                 case VK_MEMORY_PROPERTY_HOST_COHERENT_BIT :     result |= EMemoryType::HostCoherent;    break;
                 case VK_MEMORY_PROPERTY_HOST_CACHED_BIT :       result |= EMemoryType::HostCached;      break;
                 case VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT :  result |= EMemoryType::Transient;       break;
+                case VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT :
                 case VK_MEMORY_PROPERTY_PROTECTED_BIT :
                 case VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD :
                 case VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD :
@@ -1184,6 +1184,9 @@ namespace AE::Graphics
                 case EPipelineOpt::RT_NoNullIntersectionShaders :   result |= VK_PIPELINE_CREATE_RAY_TRACING_NO_NULL_INTERSECTION_SHADERS_BIT_KHR;  break;
                 case EPipelineOpt::RT_SkipTriangles :               result |= VK_PIPELINE_CREATE_RAY_TRACING_SKIP_TRIANGLES_BIT_KHR;                break;
                 case EPipelineOpt::RT_SkipAABBs :                   result |= VK_PIPELINE_CREATE_RAY_TRACING_SKIP_AABBS_BIT_KHR;                    break;
+                case EPipelineOpt::DontCompile :                    result |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT;             break;
+                case EPipelineOpt::CaptureStatistics :              result |= VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR;                        break;
+                case EPipelineOpt::CaptureInternalRepresentation :  result |= VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR;          break;
 
                 case EPipelineOpt::_Last :
                 case EPipelineOpt::All :
@@ -1757,8 +1760,14 @@ namespace AE::Graphics
         switch ( value )
         {
             case ESamplerUsage::Default :                           return Zero;
-            case ESamplerUsage::Subsampled :                        return VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT;
-            case ESamplerUsage::SubsampledCoarseReconstruction :    return VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT | VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT;
+
+            // VK_EXT_fragment_density_map
+            //case ESamplerUsage::Subsampled :                      return VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT;
+            //case ESamplerUsage::SubsampledCoarseReconstruction :  return VK_SAMPLER_CREATE_SUBSAMPLED_BIT_EXT | VK_SAMPLER_CREATE_SUBSAMPLED_COARSE_RECONSTRUCTION_BIT_EXT;
+
+            // VK_EXT_non_seamless_cube_map
+            case ESamplerUsage::NonSeamlessCubeMap :                return VK_SAMPLER_CREATE_NON_SEAMLESS_CUBE_MAP_BIT_EXT;
+
             case ESamplerUsage::_Count :                            break;
         }
         END_ENUM_CHECKS();
diff --git a/AE/engine/src/graphics/Vulkan/VQueue.h b/AE/engine/src/graphics/Vulkan/VQueue.h
index 3e14a470..fa569e4f 100644
--- a/AE/engine/src/graphics/Vulkan/VQueue.h
+++ b/AE/engine/src/graphics/Vulkan/VQueue.h
@@ -10,7 +10,7 @@ namespace AE::Graphics
 {
     enum class VQueueFamily : uint
     {
-        _Count      = VConfig::MaxQueues,
+        _Count      = uint(EQueueType::_Count),
         External    = VK_QUEUE_FAMILY_EXTERNAL,
         Foreign     = VK_QUEUE_FAMILY_FOREIGN_EXT,
         Ignored     = VK_QUEUE_FAMILY_IGNORED,
@@ -49,23 +49,6 @@ namespace AE::Graphics
     // methods
         VQueue () __NE___ {}
 
-        // move-ctor used only during device initialization, mutex is not moved
-        VQueue (VQueue &&other) __NE___ :
-            handle{other.handle}, type{other.type}, familyIndex{other.familyIndex}, familyFlags{other.familyFlags},
-            queueIndex{other.queueIndex}, priority{other.priority}, globalPriority{other.globalPriority},
-            supportedStages{other.supportedStages}, supportedAccess{other.supportedAccess},
-            minImageTransferGranularity{other.minImageTransferGranularity}, timestampValidBits{other.timestampValidBits},
-            debugName{other.debugName}
-        {}
-
-        VQueue (const VQueue &other) __NE___ :
-            handle{other.handle}, type{other.type}, familyIndex{other.familyIndex}, familyFlags{other.familyFlags},
-            queueIndex{other.queueIndex}, priority{other.priority}, globalPriority{other.globalPriority},
-            supportedStages{other.supportedStages}, supportedAccess{other.supportedAccess},
-            minImageTransferGranularity{other.minImageTransferGranularity}, timestampValidBits{other.timestampValidBits},
-            debugName{other.debugName}
-        {}
-
         ND_ bool  HasUnsupportedStages (VkPipelineStageFlagBits2 stages)    C_NE___ { return AnyBits( stages, ~supportedStages ); }
         ND_ bool  HasUnsupportedAccess (VkAccessFlagBits2 access)           C_NE___ { return AnyBits( access, ~supportedAccess ); }
     };
@@ -114,7 +97,7 @@ namespace AE::Graphics
             VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT |
             VK_PIPELINE_STAGE_2_RAY_TRACING_SHADER_BIT_KHR;                 // VK_KHR_ray_tracing_pipeline
 
-        static constexpr auto   _GraphicsStageMask = 
+        static constexpr auto   _GraphicsStageMask =
             //VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT |
             VK_PIPELINE_STAGE_2_DRAW_INDIRECT_BIT |
             VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT |
@@ -249,8 +232,8 @@ namespace AE::Graphics
             _AllAccessMask                              // All
         };
 
-        STATIC_ASSERT( CountOf(_StageScopes)  == uint(EPipelineScope::_Count) );
-        STATIC_ASSERT( CountOf(_AccessScopes) == uint(EPipelineScope::_Count) );
+        StaticAssert( CountOf(_StageScopes)  == uint(EPipelineScope::_Count) );
+        StaticAssert( CountOf(_AccessScopes) == uint(EPipelineScope::_Count) );
 
     public:
         static constexpr auto   ReadOnlyAccessMask =
@@ -268,7 +251,7 @@ namespace AE::Graphics
             VK_ACCESS_2_INPUT_ATTACHMENT_READ_BIT |
             VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT |
             VK_ACCESS_2_DEPTH_STENCIL_ATTACHMENT_READ_BIT |
-            VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR |     // VK_KHR_fragment_shading_rate 
+            VK_ACCESS_2_FRAGMENT_SHADING_RATE_ATTACHMENT_READ_BIT_KHR |     // VK_KHR_fragment_shading_rate
             VK_ACCESS_2_FRAGMENT_DENSITY_MAP_READ_BIT_EXT |                 // VK_EXT_fragment_density_map
             VK_ACCESS_2_SHADER_BINDING_TABLE_READ_BIT_KHR |                 // VK_KHR_ray_tracing_maintenance1
             VK_ACCESS_2_MICROMAP_READ_BIT_EXT |                             // VK_EXT_opacity_micromap
diff --git a/AE/engine/src/graphics/Vulkan/VRenderTaskScheduler.cpp b/AE/engine/src/graphics/Vulkan/VRenderTaskScheduler.cpp
index 25e2ea45..c976863a 100644
--- a/AE/engine/src/graphics/Vulkan/VRenderTaskScheduler.cpp
+++ b/AE/engine/src/graphics/Vulkan/VRenderTaskScheduler.cpp
@@ -15,10 +15,10 @@ namespace AE::Graphics
 =================================================
 */
 #if not AE_VK_TIMELINE_SEMAPHORE
-    void  VRenderTaskScheduler::VirtualFenceApi::Recycle (uint indexInPool) __NE___
+    void  RenderTaskScheduler::VirtualFenceApi::Recycle (VirtualFence* ptr) __NE___
     {
-        auto&   rts = RenderTaskScheduler();
-        rts._virtFencePool.Unassign( indexInPool );
+        auto&   rts = GraphicsScheduler();
+        rts._virtFencePool.Unassign( ptr );
     }
 #endif
 //-----------------------------------------------------------------------------
@@ -30,7 +30,7 @@ namespace AE::Graphics
     GraphicsContextApi
 =================================================
 */
-    RC<VDrawCommandBatch>  VRenderTaskScheduler::GraphicsContextApi::CreateFirstPassBatch (VRenderTaskScheduler &rts,
+    RC<VDrawCommandBatch>  RenderTaskScheduler::GraphicsContextApi::CreateFirstPassBatch (RenderTaskScheduler &rts,
                                                                                            const VPrimaryCmdBufState &primaryState, const RenderPassDesc &desc,
                                                                                            DebugLabel dbg) __NE___
     {
@@ -43,7 +43,7 @@ namespace AE::Graphics
         return rts._CreateDrawBatch( primaryState, viewports, scissors, dbg );
     }
 
-    RC<VDrawCommandBatch>  VRenderTaskScheduler::GraphicsContextApi::CreateNextPassBatch (VRenderTaskScheduler &rts,
+    RC<VDrawCommandBatch>  RenderTaskScheduler::GraphicsContextApi::CreateNextPassBatch (RenderTaskScheduler &rts,
                                                                                           const VDrawCommandBatch &prevBatch, DebugLabel dbg) __NE___
     {
         VPrimaryCmdBufState draw_state = prevBatch.GetPrimaryCtxState();
@@ -63,13 +63,13 @@ namespace AE::Graphics
 =================================================
 */
 #if not AE_VK_TIMELINE_SEMAPHORE
-    RC<VRenderTaskScheduler::VirtualFence>  VRenderTaskScheduler::_CreateFence ()
+    RC<RenderTaskScheduler::VirtualFence>  RenderTaskScheduler::_CreateFence ()
     {
         uint    idx;
         CHECK_ERR( _virtFencePool.Assign( OUT idx ));
 
         auto&   virt = _virtFencePool[ idx ];
-        CHECK_ERR( virt.Create( GetDevice(), idx ));
+        CHECK_ERR( virt.Create( GetDevice() ));
 
         return RC<VirtualFence>{ &virt };
     }
@@ -81,7 +81,7 @@ namespace AE::Graphics
 =================================================
 */
 #if not AE_VK_TIMELINE_SEMAPHORE
-    bool  VRenderTaskScheduler::_FlushQueue_Fence (EQueueType queueType, TempBatches_t &pending)
+    bool  RenderTaskScheduler::_FlushQueue_Fence (EQueueType queueType, TempBatches_t &pending)
     {
         VTempStackAllocator allocator;
 
@@ -146,7 +146,7 @@ namespace AE::Graphics
 =================================================
 */
 #if AE_VK_TIMELINE_SEMAPHORE
-    bool  VRenderTaskScheduler::_FlushQueue_Timeline (EQueueType queueType, TempBatches_t &pending)
+    bool  RenderTaskScheduler::_FlushQueue_Timeline (EQueueType queueType, TempBatches_t &pending)
     {
         VTempStackAllocator allocator;
 
@@ -209,7 +209,7 @@ namespace AE::Graphics
 =================================================
 */
 #if not AE_VK_TIMELINE_SEMAPHORE
-    bool  VRenderTaskScheduler::_IsFrameComplete_Fence (FrameUID frameId)
+    bool  RenderTaskScheduler::_IsFrameComplete_Fence (FrameUID frameId)
     {
         auto&   dev             = GetDevice();
         auto&   frame           = _perFrame[ frameId.Index() ];
@@ -248,7 +248,7 @@ namespace AE::Graphics
 =================================================
 */
 #if AE_VK_TIMELINE_SEMAPHORE
-    bool  VRenderTaskScheduler::_IsFrameComplete_Timeline (FrameUID frameId)
+    bool  RenderTaskScheduler::_IsFrameComplete_Timeline (FrameUID frameId)
     {
         auto&   dev             = GetDevice();
         auto&   frame           = _perFrame[ frameId.Index() ];
@@ -289,7 +289,7 @@ namespace AE::Graphics
     _IsFrameCompleted
 =================================================
 */
-    bool  VRenderTaskScheduler::_IsFrameCompleted (FrameUID frameId)
+    bool  RenderTaskScheduler::_IsFrameCompleted (FrameUID frameId)
     {
         #if AE_VK_TIMELINE_SEMAPHORE
             bool res = _IsFrameComplete_Timeline( frameId );
@@ -308,14 +308,14 @@ namespace AE::Graphics
     _CreateDrawBatch
 =================================================
 */
-    RC<VDrawCommandBatch>  VRenderTaskScheduler::_CreateDrawBatch (const VPrimaryCmdBufState &primaryState, ArrayView<VkViewport> viewports,
+    RC<VDrawCommandBatch>  RenderTaskScheduler::_CreateDrawBatch (const VPrimaryCmdBufState &primaryState, ArrayView<VkViewport> viewports,
                                                                    ArrayView<VkRect2D> scissors, DebugLabel dbg) __NE___
     {
         ASSERT( primaryState.IsValid() );
         CHECK_ERR( AnyEqual( _GetState(), EState::Idle, EState::BeginFrame, EState::RecordFrame ));
 
         uint    index;
-        CHECK_ERR( _drawBatchPool.Assign( OUT index, [](auto* ptr, uint idx) { new (ptr) VDrawCommandBatch{ idx }; }));
+        CHECK_ERR( _drawBatchPool.Assign( OUT index ));
 
         auto&   batch = _drawBatchPool[ index ];
 
diff --git a/AE/engine/src/graphics/Vulkan/VResourceManager.cpp b/AE/engine/src/graphics/Vulkan/VResourceManager.cpp
index 8cd35bd7..c19bb370 100644
--- a/AE/engine/src/graphics/Vulkan/VResourceManager.cpp
+++ b/AE/engine/src/graphics/Vulkan/VResourceManager.cpp
@@ -134,7 +134,7 @@ namespace AE::Graphics
     CreateSampler
 =================================================
 */
-    Strong<SamplerID>  VResourceManager::CreateSampler (const VkSamplerCreateInfo &info, const VkSamplerYcbcrConversionCreateInfo *ycbcrInfo, StringView dbgName) __NE___
+    Strong<SamplerID>  VResourceManager::CreateSampler (const VkSamplerCreateInfo &info, const VkSamplerYcbcrConversionCreateInfo* ycbcrInfo, StringView dbgName) __NE___
     {
         return _CreateResource<SamplerID>( "failed when creating sampler", *this, info, ycbcrInfo, dbgName );
     }
@@ -237,7 +237,7 @@ namespace AE::Graphics
             RETURN_ERR( "failed when creating framebuffer from render pass '"s << HashToName( desc.renderPassName ) << "'" );
         }
 
-        data.AddRef();  // 'raw_id' rc == 1 
+        data.AddRef();  // 'raw_id' rc == 1
 
 
         // add to cache
@@ -405,7 +405,7 @@ namespace AE::Graphics
 */
     void  VResourceManager::VReleaseExpiredResourcesTask::Run ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         auto&   list     = res_mngr._expiredResources.Get( _frameId );
         EXLOCK( list.guard );
 
diff --git a/AE/engine/src/graphics/Vulkan/VSwapchain.cpp b/AE/engine/src/graphics/Vulkan/VSwapchain.cpp
index e52fe027..252dc510 100644
--- a/AE/engine/src/graphics/Vulkan/VSwapchain.cpp
+++ b/AE/engine/src/graphics/Vulkan/VSwapchain.cpp
@@ -4,7 +4,7 @@
 # include "graphics/Vulkan/VulkanLoader.h"
 
 # ifdef AE_PLATFORM_WINDOWS
-#   include "base/Platforms/WindowsHeader.h"
+#   include "base/Platforms/WindowsHeader.cpp.h"
 #   include <vulkan/vulkan_win32.h>
 # endif
 
@@ -17,7 +17,15 @@
 #   include <vulkan/vulkan_android.h>
 # endif
 
-# include "base/Algorithms/StringUtils.h"
+# ifdef AE_PLATFORM_APPLE
+#   include <vulkan/vulkan_metal.h>
+# endif
+# ifdef AE_PLATFORM_MACOS
+#   include <vulkan/vulkan_macos.h>
+# endif
+# ifdef AE_PLATFORM_IOS
+#   include <vulkan/vulkan_ios.h>
+# endif
 
 # include "graphics/Vulkan/VSwapchain.h"
 # include "graphics/Vulkan/VResourceManager.h"
@@ -87,7 +95,7 @@ namespace AE::Graphics
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceFormatsKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, null ));
         CHECK_ERR( count > 0 );
 
-        CATCH_ERR( surf_formats.resize( count ));
+        NOTHROW_ERR( surf_formats.resize( count ));
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceFormatsKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, OUT surf_formats.data() ));
 
         for (auto& fmt : surf_formats)
@@ -118,7 +126,7 @@ namespace AE::Graphics
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceFormatsKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, null ));
         CHECK_ERR( count > 0 );
 
-        CATCH_ERR( surf_formats.resize( count ));
+        NOTHROW_ERR( surf_formats.resize( count ));
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceFormatsKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, OUT surf_formats.data() ));
 
         for (usize i = 0, cnt = Min( maxCount, surf_formats.size() ); i < cnt; ++i)
@@ -147,7 +155,7 @@ namespace AE::Graphics
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfacePresentModesKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, null ));
         CHECK_ERR( count > 0 );
 
-        CATCH_ERR( present_modes.resize( count ));
+        NOTHROW_ERR( present_modes.resize( count ));
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfacePresentModesKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, OUT present_modes.data() ));
 
         for (usize i = 0, cnt = Min( maxCount, present_modes.size() ); i < cnt; ++i)
@@ -204,7 +212,7 @@ namespace AE::Graphics
 ----
     Fence is not used because on all tested platforms it doesn't change anything.
 ----
-    Intel: when used vsync vkAcquireNextImage() stalls on 1/refresh_rate.
+    Intel in windowed mode: when used vsync vkAcquireNextImage() stalls on 1/refresh_rate.
 =================================================
 */
     VkResult  VSwapchain::AcquireNextImage () __NE___
@@ -234,7 +242,7 @@ namespace AE::Graphics
 =================================================
     Present
 ----
-    NV: when used vsync vkAcquireNextImage() stalls on 1/refresh_rate.
+    Nvidia in windowed mode: when used vsync vkAcquireNextImage() stalls on 1/refresh_rate.
 =================================================
 */
     VkResult  VSwapchain::Present (VQueuePtr queue, ArrayView<VkSemaphore> renderFinished) __NE___
@@ -248,7 +256,7 @@ namespace AE::Graphics
 
         const VkSwapchainKHR    swap_chains[]   = { _vkSwapchain };
         const uint              image_indices[] = { cur_idx.imageIdx };
-        STATIC_ASSERT( CountOf(swap_chains) == CountOf(image_indices) );
+        StaticAssert( CountOf(swap_chains) == CountOf(image_indices) );
 
         if ( renderFinished.empty() )
             renderFinished = ArrayView<VkSemaphore>{ &_renderFinishedSem[cur_idx.semaphoreId], 1 };
@@ -279,6 +287,36 @@ namespace AE::Graphics
         EXLOCK( queue->guard );
         return _device->vkQueuePresentKHR( queue->handle, &present_info );
     }
+
+/*
+=================================================
+    GetInstanceExtensions
+=================================================
+*/
+    ArrayView<const char*>  VSwapchain::GetInstanceExtensions () __NE___
+    {
+        static const char*  extensions[] = {
+            #ifdef AE_PLATFORM_WINDOWS
+                VK_KHR_WIN32_SURFACE_EXTENSION_NAME,
+            #endif
+            #ifdef AE_PLATFORM_ANDROID
+                VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
+            #endif
+            #ifdef AE_PLATFORM_LINUX
+                VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
+            #endif
+            #ifdef AE_PLATFORM_MACOS
+                VK_MVK_MACOS_SURFACE_EXTENSION_NAME,
+            #endif
+            #ifdef AE_PLATFORM_IOS
+                VK_MVK_IOS_SURFACE_EXTENSION_NAME,
+            #endif
+            #ifdef AE_PLATFORM_APPLE
+                VK_EXT_METAL_SURFACE_EXTENSION_NAME,
+            #endif
+        };
+        return extensions;
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -300,15 +338,14 @@ namespace AE::Graphics
     {
         EXLOCK( _guard );
 
-        _device = &RenderTaskScheduler().GetDevice();
+        _device = &GraphicsScheduler().GetDevice();
         CHECK_ERR( _device->GetVkInstance() != Default );
         CHECK_ERR( _device->GetVExtensions().surface );
         CHECK_ERR( _vkSurface == Default );
+        CHECK_ERR( window );
 
         #if defined(AE_PLATFORM_WINDOWS)
         {
-            CHECK_ERR( window.hInstance != null and window.hWnd != null );
-
             VkWin32SurfaceCreateInfoKHR     surface_info = {};
 
             surface_info.sType      = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
@@ -319,15 +356,10 @@ namespace AE::Graphics
             CHECK_ERR( fpCreateWin32SurfaceKHR );
 
             VK_CHECK_ERR( fpCreateWin32SurfaceKHR( _device->GetVkInstance(), &surface_info, null, OUT &_vkSurface ));
-
-            _device->SetObjectName( _vkSurface, dbgName, VK_OBJECT_TYPE_SURFACE_KHR );
-
             AE_LOG_DBG( "Created WinAPI Vulkan surface" );
         }
         #elif defined(AE_PLATFORM_ANDROID)
         {
-            CHECK_ERR( window.nativeWindow != null );
-
             VkAndroidSurfaceCreateInfoKHR   surface_info = {};
 
             surface_info.sType  = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
@@ -338,15 +370,10 @@ namespace AE::Graphics
             CHECK_ERR( fpCreateAndroidSurfaceKHR );
 
             VK_CHECK_ERR( fpCreateAndroidSurfaceKHR( _device->GetVkInstance(), &surface_info, null, OUT &_vkSurface ));
-
-            _device->SetObjectName( _vkSurface, dbgName, VK_OBJECT_TYPE_SURFACE_KHR );
-
             AE_LOG_DBG( "Created Android Vulkan surface" );
         }
         #elif defined(AE_PLATFORM_LINUX)
         {
-            CHECK_ERR( window.x11Window != null and window.x11Display != null );
-
             VkXlibSurfaceCreateInfoKHR  surface_info = {};
             surface_info.sType  = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
             surface_info.dpy    = BitCast< ::Display *>( window.x11Display );
@@ -356,16 +383,62 @@ namespace AE::Graphics
             CHECK_ERR( fpCreateXlibSurfaceKHR );
 
             VK_CHECK_ERR( fpCreateXlibSurfaceKHR( _device->GetVkInstance(), &surface_info, null, OUT &_vkSurface ));
+            AE_LOG_DBG( "Created X11 Vulkan surface" );
+        }
+        #elif defined(AE_PLATFORM_APPLE)
+        {
+            // VK_EXT_metal_surface
+            if ( _device->HasInstanceExtension( VK_EXT_METAL_SURFACE_EXTENSION_NAME ))
+            {
+                VkMetalSurfaceCreateInfoEXT surface_info = {};
+                surface_info.sType  = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT;
+                surface_info.pLayer = window.metalLayer.Ptr();
+
+                auto  fpCreateMetalSurfaceEXT = BitCast<PFN_vkCreateMetalSurfaceEXT>( vkGetInstanceProcAddr( _device->GetVkInstance(), "vkCreateMetalSurfaceEXT" ));
+                if ( fpCreateMetalSurfaceEXT != null )
+                {
+                    auto err = fpCreateMetalSurfaceEXT( _device->GetVkInstance(), &surface_info, null, OUT &_vkSurface );
+                    if ( err == VK_SUCCESS ) {
+                        AE_LOG_DBG( "Created Metal surface" );
+                    }else
+                        VK_CHECK( err );
+                }
+            }
+            #if defined(AE_PLATFORM_MACOS)
+            if ( _vkSurface == Default )
+            {
+                VkMacOSSurfaceCreateInfoMVK surface_info = {};
+                surface_info.sType  = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
+                surface_info.pView  = window.nsView.Ptr();
 
-            _device->SetObjectName( _vkSurface, dbgName, VK_OBJECT_TYPE_SURFACE_KHR );
+                auto  fpCreateMacOSSurfaceMVK = BitCast<PFN_vkCreateMacOSSurfaceMVK>( vkGetInstanceProcAddr( _device->GetVkInstance(), "vkCreateMacOSSurfaceMVK" ));
+                CHECK_ERR( fpCreateMacOSSurfaceMVK );
 
-            AE_LOG_DBG( "Created X11 Vulkan surface" );
+                VK_CHECK_ERR( fpCreateMacOSSurfaceMVK( _device->GetVkInstance(), &surface_info, null, OUT &_vkSurface ));
+                AE_LOG_DBG( "Created MacOS MoltenVK surface" );
+            }
+            #elif defined(AE_PLATFORM_IOS)
+            if ( _vkSurface == Default )
+            {
+                VkIOSSurfaceCreateInfoMVK   surface_info = {};
+                surface_info.sType  = VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK;
+                surface_info.pView  = window.metalLayer.Ptr();
+
+                auto  fpCreateIOSSurfaceMVK = BitCast<PFN_vkCreateIOSSurfaceMVK>( vkGetInstanceProcAddr( _device->GetVkInstance(), "vkCreateIOSSurfaceMVK" ));
+                CHECK_ERR( fpCreateIOSSurfaceMVK );
+
+                VK_CHECK_ERR( fpCreateIOSSurfaceMVK( _device->GetVkInstance(), &surface_info, null, OUT &_vkSurface ));
+                AE_LOG_DBG( "Created iOS MoltenVK surface" );
+            }
+            #endif
         }
         #else
             #error unsupported platform!
             return false;
         #endif
 
+        _device->SetObjectName( _vkSurface, dbgName, VK_OBJECT_TYPE_SURFACE_KHR );
+
         // check that surface supported with current device
         bool    present_supported = false;
 
@@ -386,33 +459,6 @@ namespace AE::Graphics
         return true;
     }
 
-/*
-=================================================
-    GetInstanceExtensions
-=================================================
-*/
-    ArrayView<const char*>  VSwapchainInitializer::GetInstanceExtensions () __NE___
-    {
-        static const char*  extensions[] = {
-            #ifdef AE_PLATFORM_WINDOWS
-                VK_KHR_WIN32_SURFACE_EXTENSION_NAME,
-            #endif
-            #ifdef AE_PLATFORM_ANDROID
-                VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
-            #endif
-            #ifdef AE_PLATFORM_LINUX
-                VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
-            #endif
-            #ifdef AE_PLATFORM_MACOS
-                VK_MVK_MACOS_SURFACE_EXTENSION_NAME,
-            #endif
-            #ifdef AE_PLATFORM_IOS
-                VK_MVK_IOS_SURFACE_EXTENSION_NAME,
-            #endif
-        };
-        return extensions;
-    }
-
 /*
 =================================================
     DestroySurface
@@ -423,17 +469,20 @@ namespace AE::Graphics
         EXLOCK( _guard );
         CHECK( _vkSwapchain == Default );
 
-        if ( _vkSurface != Default )
+        if ( _device != null )
         {
-            vkDestroySurfaceKHR( _device->GetVkInstance(), _vkSurface, null );
-            _vkSurface = Default;
+            if ( _vkSurface != Default )
+            {
+                vkDestroySurfaceKHR( _device->GetVkInstance(), _vkSurface, null );
+                _vkSurface = Default;
 
-            AE_LOG_DBG( "Destroyed Vulkan surface" );
-        }
+                AE_LOG_DBG( "Destroyed Vulkan surface" );
+            }
 
-        if ( _device->GetVkDevice() != Default )
-        {
-            _DestroySemaphores();
+            if ( _device->GetVkDevice() != Default )
+            {
+                _DestroySemaphores();
+            }
         }
     }
 
@@ -450,80 +499,75 @@ namespace AE::Graphics
 
     bool  VSwapchainInitializer::_ChooseColorFormat (INOUT VkFormat &colorFormat, INOUT VkColorSpaceKHR &colorSpace) C_NE___
     {
-        CHECK_ERR( _device->GetVkPhysicalDevice() and _vkSurface != Default );
+        CHECK_ERR( _device != null                and
+                   _device->GetVkPhysicalDevice() and
+                   _vkSurface != Default );
 
         uint                        count               = 0;
         Array< VkSurfaceFormatKHR > surf_formats;
-        const VkFormat              def_format          = VK_FORMAT_B8G8R8A8_UNORM;
-        const VkColorSpaceKHR       def_space           = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
-        const VkFormat              required_format     = colorFormat;
         const VkColorSpaceKHR       required_colorspace = colorSpace;
+        const VkFormat              required_format1    = colorFormat;
+        const VkFormat              required_format2    = colorFormat == VK_FORMAT_B8G8R8A8_UNORM ? VK_FORMAT_R8G8B8A8_UNORM :
+                                                          (colorFormat == VK_FORMAT_R8G8B8A8_UNORM ? VK_FORMAT_B8G8R8A8_UNORM : colorFormat);
 
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceFormatsKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, null ));
         CHECK_ERR( count > 0 );
 
-        CATCH_ERR( surf_formats.resize( count ));
+        NOTHROW_ERR( surf_formats.resize( count ));
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceFormatsKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, OUT surf_formats.data() ));
 
         if ( count == 1                                     and
              surf_formats[0].format == VK_FORMAT_UNDEFINED )
         {
-            colorFormat = required_format;
+            colorFormat = required_format1;
             colorSpace  = surf_formats[0].colorSpace;
+            return true;
         }
-        else
+
+        usize   both_match_idx      = UMax;
+        usize   format_match_idx    = UMax;
+        usize   space_match_idx     = UMax;
+        usize   def_format_idx      = UMax;
+        usize   def_space_idx       = UMax;
+
+        for (usize i = 0; i < surf_formats.size(); ++i)
         {
-            usize   both_match_idx      = UMax;
-            usize   format_match_idx    = UMax;
-            usize   space_match_idx     = UMax;
-            usize   def_format_idx      = 0;
-            usize   def_space_idx       = 0;
+            const auto& surf_fmt = surf_formats[i];
 
-            for (usize i = 0; i < surf_formats.size(); ++i)
+            if ( AnyEqual( surf_fmt.format, required_format1, required_format2 )    and
+                 surf_fmt.colorSpace == required_colorspace )
             {
-                const auto& surf_fmt = surf_formats[i];
-
-                if ( surf_fmt.format     == required_format     and
-                     surf_fmt.colorSpace == required_colorspace )
-                {
-                    both_match_idx = i;
-                }
-                else
-                // separate check
-                if ( surf_fmt.format     == required_format )
-                    format_match_idx = i;
-                else
-                if ( surf_fmt.colorSpace == required_colorspace )
-                    space_match_idx = i;
-
-                // check with default
-                if ( surf_fmt.format     == def_format )
-                    def_format_idx = i;
-
-                if ( surf_fmt.colorSpace == def_space )
-                    def_space_idx = i;
+                both_match_idx = i;
+                break;
             }
-
-            usize   idx = UMax;
-
-            if ( both_match_idx != UMax )
-                idx = both_match_idx;
             else
-            if ( format_match_idx != UMax )
-                idx = format_match_idx;
+            // separate check
+            if ( AnyEqual( surf_fmt.format, required_format1, required_format2 ))
+                format_match_idx = i;
             else
-            if ( def_format_idx != UMax )
-                idx = def_format_idx;
-
-            // TODO: space_match_idx and def_space_idx are unused yet
+            if ( surf_fmt.colorSpace == required_colorspace )
+                space_match_idx = i;
 
-            if ( idx >= surf_formats.size() )
-                idx = 0;
+            // check with default
+            if ( AnyEqual( surf_fmt.format, VK_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM ))
+                def_format_idx = i;
 
-            colorFormat = surf_formats[ idx ].format;
-            colorSpace  = surf_formats[ idx ].colorSpace;
+            if ( surf_fmt.colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR )
+                def_space_idx = i;
         }
 
+        usize   idx = UMax;
+        if ( both_match_idx     != UMax )   idx = both_match_idx;   else
+        if ( format_match_idx   != UMax )   idx = format_match_idx; else
+        if ( space_match_idx    != UMax )   idx = space_match_idx;  else
+        if ( def_format_idx     != UMax )   idx = def_format_idx;   else
+        if ( def_space_idx      != UMax )   idx = def_space_idx;
+
+        if ( idx >= surf_formats.size() )
+            idx = 0;
+
+        colorFormat = surf_formats[ idx ].format;
+        colorSpace  = surf_formats[ idx ].colorSpace;
         return true;
     }
 
@@ -535,7 +579,9 @@ namespace AE::Graphics
     bool  VSwapchainInitializer::IsSupported (const VkPresentModeKHR presentMode, const VkFormat colorFormat, const VkImageUsageFlagBits colorImageUsage) C_NE___
     {
         SHAREDLOCK( _guard );
-        CHECK_ERR( _device->GetVkPhysicalDevice() and _vkSurface != Default );
+        CHECK_ERR( _device != null                and
+                   _device->GetVkPhysicalDevice() and
+                   _vkSurface != Default );
 
         VkSurfaceCapabilitiesKHR    surf_caps;
         VK_CHECK_ERR( vkGetPhysicalDeviceSurfaceCapabilitiesKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &surf_caps ));
@@ -631,7 +677,7 @@ namespace AE::Graphics
         }
 
         // destroy obsolete resources
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         {
             for (auto& id : _imageViewIDs)
             {
@@ -693,9 +739,12 @@ namespace AE::Graphics
     {
         EXLOCK( _guard );
 
-        CHECK( not IsImageAcquired() );
+        CHECK( not IsImageAcquired() );     // TODO: use vkReleaseSwapchainImagesEXT (VK_EXT_swapchain_maintenance1)
+
+        if ( _vkSwapchain == Default )
+            return;
 
-        if ( _device->GetVkDevice() != Default )
+        if ( _device != null and _device->GetVkDevice() != Default )
         {
             if ( _vkSwapchain != Default )
             {
@@ -705,7 +754,7 @@ namespace AE::Graphics
             }
         }
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         for (auto& id : _imageViewIDs)
         {
@@ -832,7 +881,7 @@ namespace AE::Graphics
         VK_CHECK( vkGetPhysicalDeviceSurfacePresentModesKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, null ));
         CHECK_ERRV( count > 0 );
 
-        CATCH_ERRV( present_modes.resize( count ));
+        NOTHROW_ERRV( present_modes.resize( count ));
         VK_CHECK( vkGetPhysicalDeviceSurfacePresentModesKHR( _device->GetVkPhysicalDevice(), _vkSurface, OUT &count, OUT present_modes.data() ));
 
         bool    required_mode_supported     = false;
diff --git a/AE/engine/src/graphics/Vulkan/VSwapchain.h b/AE/engine/src/graphics/Vulkan/VSwapchain.h
index f6853bda..88a06ce1 100644
--- a/AE/engine/src/graphics/Vulkan/VSwapchain.h
+++ b/AE/engine/src/graphics/Vulkan/VSwapchain.h
@@ -115,6 +115,8 @@ namespace AE::Graphics
 
         ND_ ImageAndViewID      GetCurrentImageAndViewID ()                     C_NE___ { return GetImageAndViewID( GetCurrentImageIndex() ); }
         ND_ ImageAndViewID      GetImageAndViewID (uint i)                      C_NE___;
+
+        ND_ static ArrayView<const char*>  GetInstanceExtensions ()             __NE___;
     };
 
 
@@ -146,8 +148,6 @@ namespace AE::Graphics
 
             void  Destroy ()                                                                                                __NE___;
 
-        ND_ static ArrayView<const char*>  GetInstanceExtensions ()                                                         __NE___;
-
     private:
         ND_ bool  _Create (const VSwapchainDesc& desc, StringView dbgName)                                                  __NE___;
         ND_ bool  _CreateColorAttachment (VResourceManager &resMngr, const VkSwapchainCreateInfoKHR &, EImageOpt options)   __NE___;
diff --git a/AE/engine/src/graphics/Vulkan/Video/VVideoImage.cpp b/AE/engine/src/graphics/Vulkan/Video/VVideoImage.cpp
index 22dddbd1..78e19d80 100644
--- a/AE/engine/src/graphics/Vulkan/Video/VVideoImage.cpp
+++ b/AE/engine/src/graphics/Vulkan/Video/VVideoImage.cpp
@@ -460,7 +460,7 @@ namespace
     bool  VVideoImage::Validate (const VDevice &dev, INOUT VideoImageDesc &desc, OUT VkImageCreateInfo &imageCI,
                                  OUT VkImageViewCreateInfo &viewCI, OUT ushort2 &pictureAccessGranularity) __NE___
     {
-        return WithVideoProfile( dev, desc.profile, 
+        return WithVideoProfile( dev, desc.profile,
                 [&] (const VkVideoProfileInfoKHR &profileInfo, const VkVideoCapabilitiesKHR &capabilities) -> bool
                 {
                     if ( All( desc.dimension == uint2{0} )) {
@@ -486,7 +486,7 @@ namespace
                     prof_list.profileCount  = 1;
                     prof_list.pProfiles     = &profileInfo;
 
-                    STATIC_ASSERT( uint(EVideoCodecMode::_Count) == 2 );
+                    StaticAssert( uint(EVideoCodecMode::_Count) == 2 );
 
                     if ( desc.profile.mode == EVideoCodecMode::Decode )
                     {
diff --git a/AE/engine/src/graphics/Vulkan/Video/VVideoSession.cpp b/AE/engine/src/graphics/Vulkan/Video/VVideoSession.cpp
index 63e53ab9..0b69d0cf 100644
--- a/AE/engine/src/graphics/Vulkan/Video/VVideoSession.cpp
+++ b/AE/engine/src/graphics/Vulkan/Video/VVideoSession.cpp
@@ -18,7 +18,7 @@
 
 namespace AE::Graphics
 {
-    STATIC_ASSERT( IGfxMemAllocator::VideoStorageArr_t::capacity() == VConfig::MaxVideoMaxReq );
+    StaticAssert( IGfxMemAllocator::VideoStorageArr_t::capacity() == VConfig::MaxVideoMemReq );
 
 /*
 =================================================
@@ -327,7 +327,7 @@ namespace
 */
     bool  VVideoSession::Validate (const VDevice &dev, INOUT VideoSessionDesc &desc) __NE___
     {
-        return WithVideoProfile( dev, desc.profile, 
+        return WithVideoProfile( dev, desc.profile,
                 [&dev, &desc] (const VkVideoProfileInfoKHR &profileInfo, const VkVideoCapabilitiesKHR &capabilities) -> bool
                 {
                     desc.maxDpbSlots                = Min( desc.maxDpbSlots, capabilities.maxDpbSlots );
@@ -346,7 +346,7 @@ namespace
 
                     // TODO: minBitstreamBufferOffsetAlignment, minBitstreamBufferSizeAlignment
 
-                    STATIC_ASSERT( uint(EVideoCodecMode::_Count) == 2 );
+                    StaticAssert( uint(EVideoCodecMode::_Count) == 2 );
 
                     if ( desc.profile.mode == EVideoCodecMode::Decode )
                     {
diff --git a/AE/engine/src/graphics/Vulkan/VulkanCheckError.cpp b/AE/engine/src/graphics/Vulkan/VulkanCheckError.cpp
index 5ad92a09..8124b547 100644
--- a/AE/engine/src/graphics/Vulkan/VulkanCheckError.cpp
+++ b/AE/engine/src/graphics/Vulkan/VulkanCheckError.cpp
@@ -12,12 +12,13 @@ namespace AE::Graphics
     __vk_CheckErrors
 =================================================
 */
-    bool __vk_CheckErrors (VkResult errCode, const char *vkcall, const char *func, const SourceLoc &loc) __NE___
+    bool __vk_CheckErrors (VkResult errCode, const char* vkcall, const char* func, const SourceLoc &loc) __NE___
     {
-        if ( errCode == VK_SUCCESS )
+        if_likely( errCode == VK_SUCCESS )
             return true;
 
-        try {
+      #ifdef AE_ENABLE_LOGS
+        TRY{
             #define VK1_CASE_ERR( _code_ )\
                 case _code_ :   msg += AE_TOSTRING( _code_ ); break;
 
@@ -84,8 +85,11 @@ namespace AE::Graphics
 
             AE_LOGE( msg, loc.file, loc.line );
         }
-        catch(...)
-        {}
+        CATCH_ALL()
+      #else
+        Unused( vkcall, func, loc );
+      #endif
+
         return false;
     }
 
diff --git a/AE/engine/src/graphics/Vulkan/VulkanCheckError.h b/AE/engine/src/graphics/Vulkan/VulkanCheckError.h
index 91ccac36..2d486bae 100644
--- a/AE/engine/src/graphics/Vulkan/VulkanCheckError.h
+++ b/AE/engine/src/graphics/Vulkan/VulkanCheckError.h
@@ -30,7 +30,7 @@
         AE_PRIVATE_VK_CHECK2_R( AE_PRIVATE_GETARG_0( __VA_ARGS__ ), AE_PRIVATE_GETARG_1( __VA_ARGS__, AE::Base::Default ))
 
 # define VK_CHECK_ERRV( _expr_ )                                                                                                            \
-        AE_PRIVATE_VK_CHECK2_R( (_expr_), )
+        AE_PRIVATE_VK_CHECK2_R( (_expr_), void() )
 
 # define VK_ERR( _err_, /* msg, return_on_error */... )                                                                                     \
         AE_PRIVATE_VK_CHECK_R( (_err_), AE_PRIVATE_GETARG_0( __VA_ARGS__ ), AE_PRIVATE_GETARG_1( __VA_ARGS__, AE::Base::Default ))
@@ -52,7 +52,7 @@ namespace AE::Graphics
 {
     using namespace AE::Base;
 
-    ND_ bool __vk_CheckErrors (VkResult errCode, const char *vkcall, const char *func, const SourceLoc &loc) __NE___;
+    ND_ bool __vk_CheckErrors (VkResult errCode, const char* vkcall, const char* func, const SourceLoc &loc) __NE___;
 
     enum class VkException {};
 
diff --git a/AE/engine/src/graphics/Vulkan/VulkanLoader.cpp b/AE/engine/src/graphics/Vulkan/VulkanLoader.cpp
index fec43a64..dea42069 100644
--- a/AE/engine/src/graphics/Vulkan/VulkanLoader.cpp
+++ b/AE/engine/src/graphics/Vulkan/VulkanLoader.cpp
@@ -56,7 +56,7 @@ namespace {
     must be externally synchronized!
 =================================================
 */
-    bool VulkanLoader::Initialize (NtStringView libName) __NE___
+    bool  VulkanLoader::Initialize (NtStringView libName) __NE___
     {
         VulkanLib&  lib = VulkanLib::Instance();
 
@@ -69,7 +69,8 @@ namespace {
         if ( not libName.empty() )
             Unused( lib.module.Load( libName ));
 
-    #ifdef AE_PLATFORM_WINDOWS
+
+    #if defined(AE_PLATFORM_WINDOWS)
         if ( not lib.module )
             Unused( lib.module.Load( NtStringView{ "vulkan-1.dll" }));
 
@@ -79,7 +80,14 @@ namespace {
         // software emulation
         if ( not lib.module )
             Unused( lib.module.Load( NtStringView{ "vkswiftshader.dll" }));
-    #else
+
+
+    #elif defined(AE_PLATFORM_APPLE)
+        if ( not lib.module )
+            Unused( lib.module.Load( NtStringView{ "/usr/local/lib/libvulkan.1.dylib" }));
+
+
+    #elif defined(AE_PLATFORM_UNIX_BASED)
         if ( not lib.module )
             Unused( lib.module.Load( NtStringView{ "libvulkan.so" }));
 
@@ -89,6 +97,9 @@ namespace {
         // software emulation
         if ( not lib.module )
             Unused( lib.module.Load( NtStringView{ "libvkswiftshader.so" }));
+
+    #else
+    #   error not implemented
     #endif
 
         if ( not lib.module  )
@@ -108,7 +119,7 @@ namespace {
         ++lib.refCounter;
 
         // it is allowed to use null instance handle in 'vkGetInstanceProcAddr'.
-        const auto  Load =  [&lib] (OUT auto& outResult, const char *procName, auto dummy)
+        const auto  Load =  [&lib] (OUT auto& outResult, const char* procName, auto dummy)
                             {{
                                 using FN = decltype(dummy);
                                 FN  result = BitCast<FN>( lib.getInstanceProcAddr( null, procName ));
@@ -131,7 +142,7 @@ namespace {
     warning: multiple instances are not supported!
 =================================================
 */
-    bool VulkanLoader::LoadInstance (VkInstance instance) __NE___
+    bool  VulkanLoader::LoadInstance (VkInstance instance) __NE___
     {
         VulkanLib&  lib = VulkanLib::Instance();
 
@@ -146,7 +157,7 @@ namespace {
 
         lib.instance = instance;
 
-        const auto  Load =  [&lib] (OUT auto& outResult, const char *procName, auto dummy)
+        const auto  Load =  [&lib] (OUT auto& outResult, const char* procName, auto dummy)
                             {{
                                 using FN = decltype(dummy);
                                 FN  result = BitCast<FN>( vkGetInstanceProcAddr( lib.instance, procName ));
@@ -160,6 +171,30 @@ namespace {
         return true;
     }
 
+/*
+=================================================
+    ResetInstance
+----
+    must be externally synchronized!
+=================================================
+*/
+    void  VulkanLoader::ResetInstance () __NE___
+    {
+        VulkanLib&  lib = VulkanLib::Instance();
+        ASSERT( lib.instance != Default );
+
+        lib.instance = Default;
+
+        const auto  Load =  [] (OUT auto& outResult, const char *, auto dummy) {
+                                outResult = dummy;
+                            };
+
+        #define VKLOADER_STAGE_GETADDRESS
+        #include "vulkan_loader/fn_vulkan_inst.h"
+        #undef  VKLOADER_STAGE_GETADDRESS
+    }
+
+
 /*
 =================================================
     LoadDevice
@@ -167,11 +202,11 @@ namespace {
     access to the 'vkGetDeviceProcAddr' must be externally synchronized!
 =================================================
 */
-    bool VulkanLoader::LoadDevice (VkDevice device, OUT VulkanDeviceFnTable &table) __NE___
+    bool  VulkanLoader::LoadDevice (VkDevice device, OUT VulkanDeviceFnTable &table) __NE___
     {
         CHECK_ERR( _var_vkGetDeviceProcAddr != &Dummy_vkGetDeviceProcAddr );
 
-        const auto  Load =  [device] (OUT auto& outResult, const char *procName, auto dummy)
+        const auto  Load =  [device] (OUT auto& outResult, const char* procName, auto dummy)
                             {{
                                 using FN = decltype(dummy);
                                 FN  result = BitCast<FN>( vkGetDeviceProcAddr( device, procName ));
@@ -190,7 +225,7 @@ namespace {
     ResetDevice
 =================================================
 */
-    void VulkanLoader::ResetDevice (OUT VulkanDeviceFnTable &table) __NE___
+    void  VulkanLoader::ResetDevice (OUT VulkanDeviceFnTable &table) __NE___
     {
         const auto  Load =  [] (OUT auto& outResult, const char *, auto dummy) {
                                 outResult = dummy;
@@ -208,7 +243,7 @@ namespace {
     must be externally synchronized!
 =================================================
 */
-    void VulkanLoader::Unload () __NE___
+    void  VulkanLoader::Unload () __NE___
     {
         VulkanLib&  lib = VulkanLib::Instance();
 
@@ -237,12 +272,12 @@ namespace {
     VulkanDeviceFn_Init
 =================================================
 */
-    void VulkanDeviceFn::VulkanDeviceFn_Init (const VulkanDeviceFn &other) __NE___
+    void  VulkanDeviceFn::VulkanDeviceFn_Init (const VulkanDeviceFn &other) __NE___
     {
         _table = other._table;
     }
 
-    void VulkanDeviceFn::VulkanDeviceFn_Init (const VulkanDeviceFnTable *table) __NE___
+    void  VulkanDeviceFn::VulkanDeviceFn_Init (const VulkanDeviceFnTable* table) __NE___
     {
         _table = table;
     }
@@ -252,7 +287,7 @@ namespace {
     SetupInstanceBackwardCompatibility
 =================================================
 */
-    void VulkanLoader::SetupInstanceBackwardCompatibility (Version2 version) __NE___
+    void  VulkanLoader::SetupInstanceBackwardCompatibility (Version2 version) __NE___
     {
     #define VK_COMPAT( _dst_, _src_ )   \
         ASSERT( _var_##_src_ != null ); \
@@ -291,7 +326,7 @@ namespace {
     SetupDeviceBackwardCompatibility
 =================================================
 */
-    void VulkanLoader::SetupDeviceBackwardCompatibility (Version2 version, INOUT VulkanDeviceFnTable &table) __NE___
+    void  VulkanLoader::SetupDeviceBackwardCompatibility (Version2 version, INOUT VulkanDeviceFnTable &table) __NE___
     {
     #define VK_COMPAT( _dst_, _src_ )           \
         ASSERT( table._var_##_src_ != null );   \
diff --git a/AE/engine/src/graphics/Vulkan/VulkanLoader.h b/AE/engine/src/graphics/Vulkan/VulkanLoader.h
index 3c8d3bc3..e786ff8d 100644
--- a/AE/engine/src/graphics/Vulkan/VulkanLoader.h
+++ b/AE/engine/src/graphics/Vulkan/VulkanLoader.h
@@ -77,12 +77,12 @@ namespace AE::Graphics
     // methods
     protected:
         void  VulkanDeviceFn_Init (const VulkanDeviceFn &other)         __NE___;
-        void  VulkanDeviceFn_Init (const VulkanDeviceFnTable *table)    __NE___;
+        void  VulkanDeviceFn_Init (const VulkanDeviceFnTable* table)    __NE___;
 
     public:
         VulkanDeviceFn ()                                               __NE___ : _table{null} {}
         VulkanDeviceFn (const VulkanDeviceFn &)                         __NE___ = default;
-        explicit VulkanDeviceFn (VulkanDeviceFnTable *table)            __NE___ : _table{table} {}
+        explicit VulkanDeviceFn (VulkanDeviceFnTable* table)            __NE___ : _table{table} {}
 
         ND_ VulkanDeviceFnTable const* _GetVkTable ()                   C_NE___ { return _table; }
 
@@ -99,9 +99,11 @@ namespace AE::Graphics
     struct VulkanLoader final : Noninstanceable
     {
         ND_ static bool  Initialize (NtStringView libName = {})                                                         __NE___;
-        ND_ static bool  LoadInstance (VkInstance instance)                                                             __NE___;
             static void  Unload ()                                                                                      __NE___;
 
+        ND_ static bool  LoadInstance (VkInstance instance)                                                             __NE___;
+            static void  ResetInstance ()                                                                               __NE___;
+
         ND_ static bool  LoadDevice (VkDevice device, OUT VulkanDeviceFnTable &table)                                   __NE___;
             static void  ResetDevice (OUT VulkanDeviceFnTable &table)                                                   __NE___;
 
diff --git a/AE/engine/src/graphics_hl/CMakeLists.txt b/AE/engine/src/graphics_hl/CMakeLists.txt
index 5a40eace..fb32275e 100644
--- a/AE/engine/src/graphics_hl/CMakeLists.txt
+++ b/AE/engine/src/graphics_hl/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 if (TARGET "Graphics")
 
-    file( GLOB_RECURSE HPP_SOURCES "*.h" )
+    file( GLOB_RECURSE HPP_SOURCES "*.h" "*.as" )
     if (NOT (DEFINED ENGINE_LIBS_PATH))
         file( GLOB_RECURSE CPP_SOURCES "*.cpp" )
     endif()
diff --git a/AE/engine/src/graphics_hl/Canvas/Canvas.cpp b/AE/engine/src/graphics_hl/Canvas/Canvas.cpp
index 25925367..6c6a2ff5 100644
--- a/AE/engine/src/graphics_hl/Canvas/Canvas.cpp
+++ b/AE/engine/src/graphics_hl/Canvas/Canvas.cpp
@@ -25,7 +25,7 @@ namespace AE::Graphics
         range.attribsCapacity   = _AttribsVBufSize;
         range.indexCapacity     = _IndexBufSize;
 
-        auto&           res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&           res_mngr = GraphicsScheduler().GetResourceManager();
         VertexStream    vstream;
 
         CHECK_ERR( res_mngr.GetStagingManager().AllocVStream( _frameId, range.BufferSize(), OUT vstream ));
@@ -43,10 +43,10 @@ namespace AE::Graphics
     _AllocDrawCall
 =================================================
 */
-    bool  Canvas::_AllocDrawCall (uint instanceCount, uint vertCount, Bytes32u posSize, Bytes32u attrSize, Bytes32u idxDataSize)
+    bool  Canvas::_AllocDrawCall (uint instanceCount, uint vertCount, Byte32u posSize, Byte32u attrSize, Byte32u idxDataSize)
     {
-        const Bytes32u  pos_data_size   = posSize * vertCount;
-        const Bytes32u  attr_data_size  = attrSize * vertCount;
+        const Byte32u   pos_data_size   = posSize * vertCount;
+        const Byte32u   attr_data_size  = attrSize * vertCount;
 
         // allocate buffer
         if_unlikely( _buffers.empty() or not _buffers.back().HasSpace( pos_data_size, attr_data_size, idxDataSize ))
diff --git a/AE/engine/src/graphics_hl/Canvas/Canvas.h b/AE/engine/src/graphics_hl/Canvas/Canvas.h
index b3981ccb..40823394 100644
--- a/AE/engine/src/graphics_hl/Canvas/Canvas.h
+++ b/AE/engine/src/graphics_hl/Canvas/Canvas.h
@@ -59,22 +59,22 @@ namespace AE::Graphics
         // variables
             void *          ptr;
 
-            Bytes32u        posSize;
-            Bytes32u        attribsSize;
-            Bytes32u        indexSize;
+            Byte32u         posSize;
+            Byte32u         attribsSize;
+            Byte32u         indexSize;
 
-            Bytes32u        posCapacity;
-            Bytes32u        attribsCapacity;
-            Bytes32u        indexCapacity;
+            Byte32u         posCapacity;
+            Byte32u         attribsCapacity;
+            Byte32u         indexCapacity;
 
             Bytes           offset;
             NativeBuffer_t  handle;
 
 
         // methods
-            ND_ Bytes32u    _PositionOffset ()                      C_NE___ { return 0_b; }
-            ND_ Bytes32u    _AttribsOffset ()                       C_NE___ { return posCapacity; }
-            ND_ Bytes32u    _IndicesOffset ()                       C_NE___ { return posCapacity + attribsCapacity; }
+            ND_ Byte32u     _PositionOffset ()                      C_NE___ { return 0_b; }
+            ND_ Byte32u     _AttribsOffset ()                       C_NE___ { return posCapacity; }
+            ND_ Byte32u     _IndicesOffset ()                       C_NE___ { return posCapacity + attribsCapacity; }
 
             ND_ Bytes       PositionOffset ()                       C_NE___ { return offset + _PositionOffset(); }
             ND_ Bytes       AttribsOffset ()                        C_NE___ { return offset + _AttribsOffset(); }
@@ -103,9 +103,9 @@ namespace AE::Graphics
         using Allocator_t       = LinearAllocator< UntypedAllocator, 8, false >;
 
         static constexpr uint       _MaxVertsPerBatch   = 1u << 12;
-        static constexpr Bytes32u   _PositionVBufSize   {8_b * _MaxVertsPerBatch};
-        static constexpr Bytes32u   _AttribsVBufSize    {16_b * _MaxVertsPerBatch};
-        static constexpr Bytes32u   _IndexBufSize       {SizeOf<BatchIndex_t> * _MaxVertsPerBatch * 3};
+        static constexpr Byte32u    _PositionVBufSize   {8_b * _MaxVertsPerBatch};
+        static constexpr Byte32u    _AttribsVBufSize    {16_b * _MaxVertsPerBatch};
+        static constexpr Byte32u    _IndexBufSize       {SizeOf<BatchIndex_t> * _MaxVertsPerBatch * 3};
 
         using FontPosition_t    = VB_Position_f2;
         using FontAttribs_t     = VB_UVs2_SCs1_Col8;
@@ -163,7 +163,7 @@ namespace AE::Graphics
         template <typename PrimitiveType>   void  _BreakStrip    (const PrimitiveType &primitive, uint indexCount, uint vertexCount);
         template <typename PrimitiveType>   void  _ContinueStrip (const PrimitiveType &primitive, uint indexCount, uint vertexCount);
 
-        ND_ bool  _AllocDrawCall (uint instanceCount, uint vertCount, Bytes32u posSize, Bytes32u attrSize, Bytes32u idxDataSize);
+        ND_ bool  _AllocDrawCall (uint instanceCount, uint vertCount, Byte32u posSize, Byte32u attrSize, Byte32u idxDataSize);
         ND_ bool  _Alloc ();
     };
 
@@ -243,9 +243,9 @@ namespace AE::Graphics
 
         const uint      idx_count   = primitive.IndexCount();
         const uint      vert_count  = primitive.VertexCount();
-        const Bytes32u  pos_size    = SizeOf< typename PrimitiveType::Position_t >;
-        const Bytes32u  attr_size   = SizeOf< typename PrimitiveType::Attribs_t  >;
-        const Bytes32u  idx_size    = SizeOf< BatchIndex_t > * idx_count;
+        const Byte32u   pos_size    = SizeOf< typename PrimitiveType::Position_t >;
+        const Byte32u   attr_size   = SizeOf< typename PrimitiveType::Attribs_t  >;
+        const Byte32u   idx_size    = SizeOf< BatchIndex_t > * idx_count;
 
         // add primitive to draw call
         if constexpr( PrimitiveType::Topology() == EPrimitive::LineStrip    or
diff --git a/AE/engine/src/graphics_hl/Canvas/Primitives.h b/AE/engine/src/graphics_hl/Canvas/Primitives.h
index c3ebb86c..69192405 100644
--- a/AE/engine/src/graphics_hl/Canvas/Primitives.h
+++ b/AE/engine/src/graphics_hl/Canvas/Primitives.h
@@ -35,8 +35,8 @@ namespace AE::Graphics
         ND_ constexpr uint              IndexCount ()                       C_NE___ { return Strip ? 4 : 6; }
         ND_ constexpr uint              VertexCount ()                      C_NE___ { return 4; }
 
-        constexpr void  Get (OUT BatchIndex_t *idx, BatchIndex_t firstIdx,
-                             OUT void *positionPtr, OUT void *attributePtr) C_NE___
+        constexpr void  Get (OUT BatchIndex_t* idx, BatchIndex_t firstIdx,
+                             OUT void* positionPtr, OUT void* attributePtr) C_NE___
         {
             // front face CCW
             if constexpr( Strip ){
@@ -105,8 +105,8 @@ namespace AE::Graphics
         ND_ constexpr uint              IndexCount ()                       C_NE___ { return 54; }
         ND_ constexpr uint              VertexCount ()                      C_NE___ { return 16; }
 
-        constexpr void  Get (OUT BatchIndex_t *idx, BatchIndex_t firstIdx,
-                             OUT void *positionPtr, OUT void *attributePtr) C_NE___
+        constexpr void  Get (OUT BatchIndex_t* idx, BatchIndex_t firstIdx,
+                             OUT void* positionPtr, OUT void* attributePtr) C_NE___
         {
             // indices (front face CCW)
             {
@@ -239,8 +239,8 @@ namespace AE::Graphics
         ND_ constexpr uint              IndexCount ()               C_NE___ { return segments * 2; }
         ND_ constexpr uint              VertexCount ()              C_NE___ { return segments; }
 
-        void  Get (OUT BatchIndex_t *idx, BatchIndex_t firstIdx,
-                   OUT void *positionPtr, OUT void *attributePtr)   C_NE___
+        void  Get (OUT BatchIndex_t* idx, BatchIndex_t firstIdx,
+                   OUT void* positionPtr, OUT void* attributePtr)   C_NE___
         {
             // indices (front face CCW)
             {
@@ -306,8 +306,8 @@ namespace AE::Graphics
         ND_ constexpr uint              IndexCount ()               C_NE___ { return segments * 3; }
         ND_ constexpr uint              VertexCount ()              C_NE___ { return segments + 1; }
 
-        void  Get (OUT BatchIndex_t *idx, BatchIndex_t firstIdx,
-                   OUT void *positionPtr, OUT void *attributePtr)   C_NE___
+        void  Get (OUT BatchIndex_t* idx, BatchIndex_t firstIdx,
+                   OUT void* positionPtr, OUT void* attributePtr)   C_NE___
         {
             // indices (front face CCW)
             {
diff --git a/AE/engine/src/graphics_hl/Canvas/VertexTypes.as b/AE/engine/src/graphics_hl/Canvas/VertexTypes.as
index 58fd4fbf..0c6da1a2 100644
--- a/AE/engine/src/graphics_hl/Canvas/VertexTypes.as
+++ b/AE/engine/src/graphics_hl/Canvas/VertexTypes.as
@@ -4,41 +4,49 @@ void ASmain ()
     // Position
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_Position_f2" );
-        st.Set( "packed_float2  Position;" );
+        st.Set( EStructLayout::InternalIO,
+                "packed_float2      Position;" );
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_Position_s2" );
-        st.Set( "packed_short_norm2     Position;" );
+        st.Set( EStructLayout::InternalIO,
+                "packed_short_norm2 Position;" );
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_Position_f3" );
-        st.Set( "packed_float3  Position;" );
+        st.Set( EStructLayout::InternalIO,
+                "packed_float3      Position;" );
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_Position_f4" );
-        st.Set( "packed_float4  Position;" );
+        st.Set( EStructLayout::InternalIO,
+                "packed_float4      Position;" );
     }
 
 
     // Attributes
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_UVf2_Col8" );
-        st.Set( "packed_float2      UV;" +
-                "packed_ubyte_norm4 Color;" );
+        st.Set( EStructLayout::InternalIO,
+                "packed_float2          UV;" +
+                "packed_ubyte_norm4     Color;" );
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_UVs2_Col8" );
-        st.Set( "packed_ushort_norm2    UV;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_ushort_norm2    UV;" +
                 "packed_ubyte_norm4     Color;" );
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_UVs2_SCs1_Col8" );
-        st.Set( "packed_ushort_norm4    UV_Scale;"  +
+        st.Set( EStructLayout::InternalIO,
+                "packed_ushort_norm4    UV_Scale;"  +
                 "packed_ubyte_norm4     Color;"     );
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "VB_Color8" );
-        st.Set( "packed_ubyte_norm4 Color;" );
+        st.Set( EStructLayout::InternalIO,
+                "packed_ubyte_norm4     Color;" );
     }
 
 
diff --git a/AE/engine/src/graphics_hl/Canvas/VertexTypes.h b/AE/engine/src/graphics_hl/Canvas/VertexTypes.h
index 71c7d5d1..9f23af1c 100644
--- a/AE/engine/src/graphics_hl/Canvas/VertexTypes.h
+++ b/AE/engine/src/graphics_hl/Canvas/VertexTypes.h
@@ -11,7 +11,7 @@ struct VB_Position_f2
 {
     packed_float2   Position;
 };
-STATIC_ASSERT( sizeof(VB_Position_f2) == 8 );
+StaticAssert( sizeof(VB_Position_f2) == 8 );
 
 
 // size: 4, align: 2
@@ -19,7 +19,7 @@ struct VB_Position_s2
 {
     packed_short2   Position;
 };
-STATIC_ASSERT( sizeof(VB_Position_s2) == 4 );
+StaticAssert( sizeof(VB_Position_s2) == 4 );
 
 
 // size: 12, align: 4
@@ -27,7 +27,7 @@ struct VB_Position_f3
 {
     packed_float3   Position;
 };
-STATIC_ASSERT( sizeof(VB_Position_f3) == 12 );
+StaticAssert( sizeof(VB_Position_f3) == 12 );
 
 
 // size: 16, align: 4
@@ -35,7 +35,7 @@ struct VB_Position_f4
 {
     packed_float4   Position;
 };
-STATIC_ASSERT( sizeof(VB_Position_f4) == 16 );
+StaticAssert( sizeof(VB_Position_f4) == 16 );
 
 
 
@@ -55,7 +55,7 @@ struct VB_UVf2_Col8
     VB_UVf2_Col8 (const packed_float2 &uv, const ubyte4 &col) : UV{uv}, Color{col} {}
     VB_UVf2_Col8 (const packed_float2 &uv, const RGBA8u &col) : UV{uv}, Color{col} {}
 };
-STATIC_ASSERT( sizeof(VB_UVf2_Col8) == 12 );
+StaticAssert( sizeof(VB_UVf2_Col8) == 12 );
 
 
 // size: 8, align: 2
@@ -68,7 +68,7 @@ struct VB_UVs2_Col8
     VB_UVs2_Col8 (const packed_ushort2 &uv, const ubyte4 &col) : UV{uv}, Color{col} {}
     VB_UVs2_Col8 (const packed_ushort2 &uv, const RGBA8u &col) : UV{uv}, Color{col} {}
 };
-STATIC_ASSERT( sizeof(VB_UVs2_Col8) == 8 );
+StaticAssert( sizeof(VB_UVs2_Col8) == 8 );
 
 
 // size: 4, align: 1
@@ -80,7 +80,7 @@ struct VB_Color8
     VB_Color8 (const ubyte4 &col) : Color{col} {}
     VB_Color8 (const RGBA8u &col) : Color{col} {}
 };
-STATIC_ASSERT( sizeof(VB_Color8) == 4 );
+StaticAssert( sizeof(VB_Color8) == 4 );
 
 
 // size: 12, align: 2
@@ -93,5 +93,5 @@ struct VB_UVs2_SCs1_Col8
     VB_UVs2_SCs1_Col8 (const packed_ushort2 &uv, ushort scale, const ubyte4 &col) : UV_Scale{uv, scale, 0}, Color{col} {}
     VB_UVs2_SCs1_Col8 (const packed_ushort2 &uv, ushort scale, const RGBA8u &col) : UV_Scale{uv, scale, 0}, Color{col} {}
 };
-STATIC_ASSERT( sizeof(VB_UVs2_SCs1_Col8) == 12 );
+StaticAssert( sizeof(VB_UVs2_SCs1_Col8) == 12 );
 
diff --git a/AE/engine/src/graphics_hl/Resources/FormattedText.cpp b/AE/engine/src/graphics_hl/Resources/FormattedText.cpp
index 6bfdc781..0598b1a3 100644
--- a/AE/engine/src/graphics_hl/Resources/FormattedText.cpp
+++ b/AE/engine/src/graphics_hl/Resources/FormattedText.cpp
@@ -88,7 +88,7 @@ namespace {
 
         const auto  ParseOpeningTag = [&states, str] (INOUT usize &pos) -> bool
         {
-            const uint  u = *(str.data() + pos) | ((str.data() + pos)[1] << 8);
+            const uint  u = uint((str.data() + pos)[0]) | (uint((str.data() + pos)[1]) << 8);
             switch ( u )
             {
                 case tag_bold : {
@@ -263,7 +263,7 @@ namespace {
 
             MemCopy( OUT chunk->string, tag, Bytes{length} );
             chunk->string[length] = '\0';
-            chunk->length       = length;
+            chunk->length       = uint(length);
             chunk->color        = state.color;
             chunk->height       = state.height;
             chunk->bold         = state.bold;
@@ -337,11 +337,12 @@ namespace {
 */
     U8String  FormattedText::ToString () C_NE___
     {
-        try{
+        TRY{
             return _ToString();
-        }catch(...){
-            return Default;
         }
+        CATCH_ALL(
+            return Default;
+        )
     }
 
     U8String  FormattedText::_ToString () C_Th___
diff --git a/AE/engine/src/graphics_hl/Resources/LoadableImage.cpp b/AE/engine/src/graphics_hl/Resources/LoadableImage.cpp
index 907e3a84..4d2b2161 100644
--- a/AE/engine/src/graphics_hl/Resources/LoadableImage.cpp
+++ b/AE/engine/src/graphics_hl/Resources/LoadableImage.cpp
@@ -15,7 +15,7 @@ namespace AE::Graphics
     LoadableImage::~LoadableImage () __NE___
     {
         if ( _imageId )
-            RenderTaskScheduler().GetResourceManager().ReleaseResource( _imageId );
+            GraphicsScheduler().GetResourceManager().ReleaseResource( _imageId );
     }
 
 /*
@@ -25,7 +25,7 @@ namespace AE::Graphics
 */
     auto  LoadableImage::ReleaseImageAndView () __NE___ -> StrongImageAndViewID
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         auto    view_id = res_mngr.CreateImageView( ImageViewDesc{ _viewType }, _imageId, Default );
 
@@ -48,7 +48,7 @@ namespace AE::Graphics
         CHECK_ERR( stream and stream->IsOpen() );
 
         auto    image       = MakeRC<LoadableImage>();
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
 
         ImagePacker unpacker;
         CHECK_ERR( unpacker.ReadHeader( *stream ));
diff --git a/AE/engine/src/graphics_hl/Resources/RasterFont.cpp b/AE/engine/src/graphics_hl/Resources/RasterFont.cpp
index 4845b041..013d2f32 100644
--- a/AE/engine/src/graphics_hl/Resources/RasterFont.cpp
+++ b/AE/engine/src/graphics_hl/Resources/RasterFont.cpp
@@ -16,7 +16,7 @@ namespace AE::Graphics
     RasterFont::~RasterFont () __NE___
     {
         if ( _imageId )
-            RenderTaskScheduler().GetResourceManager().DelayedReleaseResources( _imageId, _viewId );
+            GraphicsScheduler().GetResourceManager().DelayedReleaseResources( _imageId, _viewId );
     }
 
 /*
@@ -169,7 +169,7 @@ namespace AE::Graphics
         }
 
         auto    font        = MakeRC<RasterFont>();
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
 
         font->_imageId = res_mngr.CreateImage( unpacker.Header().ToDesc().SetUsage( EImageUsage::Sampled | EImageUsage::Transfer ), Default, alloc );
         CHECK_ERR( font->_imageId );
diff --git a/AE/engine/src/graphics_hl/Resources/StaticImageAtlas.cpp b/AE/engine/src/graphics_hl/Resources/StaticImageAtlas.cpp
index 5759a101..3bc939eb 100644
--- a/AE/engine/src/graphics_hl/Resources/StaticImageAtlas.cpp
+++ b/AE/engine/src/graphics_hl/Resources/StaticImageAtlas.cpp
@@ -17,7 +17,7 @@ namespace AE::Graphics
     StaticImageAtlas::~StaticImageAtlas () __NE___
     {
         if ( _imageId )
-            RenderTaskScheduler().GetResourceManager().DelayedReleaseResources( _imageId, _viewId );
+            GraphicsScheduler().GetResourceManager().DelayedReleaseResources( _imageId, _viewId );
     }
 
 /*
@@ -63,7 +63,7 @@ namespace AE::Graphics
         }
 
         auto    atlas       = MakeRC<StaticImageAtlas>();
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
 
         atlas->_imageId = res_mngr.CreateImage( unpacker.Header().ToDesc().SetUsage( EImageUsage::Sampled | EImageUsage::Transfer ), Default, alloc );
         CHECK_ERR( atlas->_imageId );
diff --git a/AE/engine/src/networking/Common.h b/AE/engine/src/networking/Common.h
new file mode 100644
index 00000000..f7a655a6
--- /dev/null
+++ b/AE/engine/src/networking/Common.h
@@ -0,0 +1,37 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/Networking.pch.h"
+
+namespace AE::Networking
+{
+    using namespace AE::Base;
+
+
+    //
+    // Config
+    //
+
+    struct NetConfig : Noninstanceable
+    {
+    // low level //
+        static constexpr Bytes      UDP_SendBufferSize      {1_Mb};
+        static constexpr Bytes      UDP_ReceiveBufferSize   {1_Mb};
+
+        static constexpr Bytes      TCP_SendBufferSize      {1_Mb};
+        static constexpr Bytes      TCP_ReceiveBufferSize   {1_Mb};
+
+    // high level //
+        static constexpr Bytes      ChannelStorageSize      {1_Mb};
+
+        static constexpr Bytes      TCP_MaxMsgSize          {1400};
+        static constexpr Bytes      UDP_MaxMsgSize          {444};  // 512 - 68 bytes
+
+        static constexpr uint       MsgPerChunk             {62};   // 2 pointers are used by chunk header, 512 bytes per chunk
+        static constexpr uint       MaxMsgGroupsPerFrame    {8};
+    };
+
+
+} // AE::Networking
+
diff --git a/AE/engine/src/networking/HighLevel/AsyncCSMessageProducer.h b/AE/engine/src/networking/HighLevel/AsyncCSMessageProducer.h
new file mode 100644
index 00000000..44fbb5e5
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/AsyncCSMessageProducer.h
@@ -0,0 +1,311 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe:  yes
+        - used split lock: CreateMsg() - lock_shared, AddMessage() - unlock_shared.
+        - Produce() use exclusive lock.
+*/
+
+#pragma once
+
+#include "networking/HighLevel/MessageFactory.h"
+
+namespace AE::Networking
+{
+
+    //
+    // Async Client/Server Message Producer
+    //
+
+    template <typename AllocatorType>
+    class alignas(AE_CACHE_LINE) AsyncCSMessageProducer : public ICSMessageProducer
+    {
+        StaticAssert( IsThreadSafeAllocator< AllocatorType >);
+
+    // types
+    private:
+        using _SpinLock_t       = Threading::TRWSpinLock< false, true >;
+        using Allocator_t       = AllocatorType;
+        using DoubleBufAlloc_t  = StaticArray< RC<Allocator_t>, 2 >;
+        using LfMessageList_t   = Threading::LfChunkList< CSMessagePtr, NetConfig::MsgPerChunk >;
+
+    public:
+        // Message and chunk with message must use the same allocator,
+        // so we need to use shared_lock to allow allocations from multiple thread,
+        // but only one thread can reset allocator (see 'Produce()' method).
+
+        template <typename T>
+        struct MsgAndSync : MovableOnly
+        {
+            friend class AsyncCSMessageProducer;
+
+        // variables
+        private:
+            T *             _msg    = null;
+            _SpinLock_t *   _guard  = null;
+            DEBUG_ONLY(
+                Bytes       _extraSize;
+            )
+
+        // methods
+        public:
+            MsgAndSync ()                                               __NE___ {}
+            MsgAndSync (T* msg, _SpinLock_t &guard, Bytes extraSize)    __NE___ : _msg{msg}, _guard{&guard} DEBUG_ONLY(, _extraSize{extraSize}) {}
+            MsgAndSync (MsgAndSync &&other)                             __NE___ : _msg{other._msg}, _guard{other._guard} { other._guard = null; }
+            ~MsgAndSync ()                                              __NE___ { if_unlikely( _guard != null ) _guard->unlock_shared(); }
+
+            MsgAndSync&  operator = (MsgAndSync &&rhs)                  __NE___;
+
+            ND_ T*  operator -> ()                                      __NE___ { ASSERT( _msg != null );  return _msg; }
+
+            ND_ explicit operator bool ()                               C_NE___ { return _msg != null; }
+            ND_ explicit operator CSMessagePtr ()                       C_NE___ { return CSMessagePtr{ _msg }; }
+
+
+            template <typename E>
+            ND_ E*  Extra ()                                            __NE___;
+
+            template <typename E>
+            E*      PutExtra (const E* data, usize count)               __NE___;
+            void*   PutExtra (const void* data, Bytes dataSize)         __NE___;
+
+            template <typename E>
+            E*      PutExtra (BasicStringView<E> str)                   __NE___ { return PutExtra( str.data(), str.size() ); }
+
+            template <typename E>
+            E*      PutExtra (ArrayView<E> arr)                         __NE___ { return PutExtra( arr.data(), arr.size() ); }
+
+
+            template <typename E>
+            void    PutInPlace (E T::*, const void* src, Bytes size)    __NE___;
+
+        //  template <typename E>
+        //  void    PutInPlace (E (T::*m)[], BasicStringView<E> str)    __NE___ { PutInPlace( m, str.data(), StringSizeOf(str) ); }
+
+        //  template <typename E>
+        //  void    PutInPlace (E (T::*m)[], ArrayView<E> arr)          __NE___ { PutInPlace( m, arr.data(), ArraySizeOf(arr) ); }
+        };
+
+
+    // variables
+    private:
+        _SpinLock_t         _guard;
+        Atomic<uint>        _index      {0};
+        LfMessageList_t     _outputMsg;
+        DoubleBufAlloc_t    _dbAlloc;
+
+
+    // methods
+    public:
+        AsyncCSMessageProducer ()                                       __NE___;
+        ~AsyncCSMessageProducer ()                                      __NE___ { Unused( _outputMsg.Release() ); }
+
+        template <typename T>
+        ND_ MsgAndSync<T>   CreateMsg (Bytes extraSize = 0_b)           __NE___;
+
+        template <typename T>
+        ND_ MsgAndSync<T>   CreateMsgOpt (Bytes extraSize = 0_b)        __NE___;
+
+        template <typename T>
+        ND_ bool            AddMessage (MsgAndSync<T> &)                __NE___;
+
+        // safe to use between 'CreateMsg()' and 'AddMessage()'
+        ND_ Allocator_t&    GetAllocator ()                             __NE___ { return *_dbAlloc[ _index.load() & 1 ]; }
+
+    private:
+        // ICSMessageProducer //
+        ChunkList<CSMessagePtr>  Produce (FrameUID frameId)             __NE_OF;
+    };
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    operator =
+=================================================
+*/
+    template <typename A>
+    template <typename T>
+    typename AsyncCSMessageProducer<A>::template MsgAndSync<T>&
+        AsyncCSMessageProducer<A>::MsgAndSync<T>::operator = (MsgAndSync &&rhs) __NE___
+    {
+        ASSERT( _guard == null );
+
+        _msg    = rhs._msg;
+        _guard  = rhs._guard;
+
+        DEBUG_ONLY( _extraSize = rhs._extraSize;)
+
+        rhs._guard  = null;
+        return *this;
+    }
+
+/*
+=================================================
+    Extra
+=================================================
+*/
+    template <typename A>
+    template <typename T>
+    template <typename E>
+    E*  AsyncCSMessageProducer<A>::MsgAndSync<T>::Extra () __NE___
+    {
+        ASSERT( _msg != null );
+
+        if constexpr( alignof(E) <= alignof(T) )
+            return Cast<E>( _msg + SizeOf<T> );
+        else
+            return Cast<E>( AlignUp( _msg, AlignOf<E> ) + SizeOf<T> );
+    }
+
+/*
+=================================================
+    PutExtra
+=================================================
+*/
+    template <typename A>
+    template <typename T>
+    template <typename E>
+    E*  AsyncCSMessageProducer<A>::MsgAndSync<T>::PutExtra (const E* data, const usize count) __NE___
+    {
+        ASSERT( _msg != null );
+
+        const Bytes  data_size = SizeOf<E> * count;
+        ASSERT( data_size <= _extraSize );
+
+        E*  dst = Extra<E>();
+        ASSERT_MSG( dst + data_size <= (Cast<void>(_msg) + SizeOf<T> + _extraSize),
+                    "'extraSize' must include alignment to dst type" );
+
+        MemCopy( OUT dst, data, data_size );
+        return dst;
+    }
+
+    template <typename A>
+    template <typename T>
+    void*  AsyncCSMessageProducer<A>::MsgAndSync<T>::PutExtra (const void* data, const Bytes dataSize) __NE___
+    {
+        ASSERT( _msg != null );
+        ASSERT( dataSize <= _extraSize );
+
+        void*   dst = Extra<char>();
+        MemCopy( OUT dst, data, dataSize );
+
+        return dst;
+    }
+
+/*
+=================================================
+    PutInPlace
+=================================================
+*/
+    template <typename A>
+    template <typename T>
+    template <typename E>
+    void  AsyncCSMessageProducer<A>::MsgAndSync<T>::PutInPlace (E T::*member, const void* srcData, const Bytes srcDataSize) __NE___
+    {
+        ASSERT( _msg != null );
+
+        void*   dst = &(_msg->*member);
+        ASSERT( dst + srcDataSize <= (Cast<void>(_msg) + SizeOf<T> + _extraSize) );
+
+        MemCopy( OUT dst, srcData, srcDataSize );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    template <typename A>
+    AsyncCSMessageProducer<A>::AsyncCSMessageProducer () __NE___ :
+        _dbAlloc{ MakeRC<Allocator_t>(), MakeRC<Allocator_t>() }
+    {
+        CHECK( _outputMsg.Init( GetAllocator() ));
+    }
+
+/*
+=================================================
+    CreateMsg
+=================================================
+*/
+    template <typename A>
+    template <typename T>
+    typename AsyncCSMessageProducer<A>::template MsgAndSync<T>  AsyncCSMessageProducer<A>::CreateMsg (Bytes extraSize) __NE___
+    {
+        _guard.lock_shared();
+
+        CSMessagePtr    msg;
+        Unused( CSMessageCtor<T>::CreateForEncode( OUT msg, GetAllocator(), extraSize ));
+        return MsgAndSync<T>{ Cast<T>(msg.get()), _guard, extraSize };
+    }
+
+    template <typename A>
+    template <typename T>
+    typename AsyncCSMessageProducer<A>::template MsgAndSync<T>  AsyncCSMessageProducer<A>::CreateMsgOpt (Bytes extraSize) __NE___
+    {
+        if_unlikely( not _guard.try_lock_shared( 200 ))
+            return Default;
+
+        CSMessagePtr    msg;
+        Unused( CSMessageCtor<T>::CreateForEncode( OUT msg, GetAllocator(), extraSize ));
+        return MsgAndSync<T>{ Cast<T>(msg.get()), _guard, extraSize };
+    }
+
+/*
+=================================================
+    AddMessage
+=================================================
+*/
+    template <typename A>
+    template <typename T>
+    bool  AsyncCSMessageProducer<A>::AddMessage (MsgAndSync<T> &msg) __NE___
+    {
+        ASSERT( msg );
+        bool    res = _outputMsg.Emplace( GetAllocator(), CSMessagePtr{msg} );
+
+        _guard.unlock_shared();
+
+        msg._msg    = null;
+        msg._guard  = null;
+
+        return res;
+    }
+
+/*
+=================================================
+    Produce
+=================================================
+*/
+    template <typename A>
+    ChunkList<CSMessagePtr>  AsyncCSMessageProducer<A>::Produce (const FrameUID frameId) __NE___
+    {
+        const uint                  new_fid = frameId.Remap2();
+        ChunkList<CSMessagePtr>     result;
+        {
+            EXLOCK( _guard );
+
+            const uint  bits        = _index.load();
+            const uint  prev_id     = bits & 1;
+            const uint  prev_fid    = (bits >> 2) & 1;
+
+            if ( new_fid != prev_fid )
+            {
+                // New frameId indicates that all previous messages are sent and memory can be reused.
+                const uint  id = (new_fid == prev_fid ? prev_id : ((prev_id+1) & 1));
+
+                _index.store( id | (new_fid << 2) );
+                _dbAlloc[id]->Discard();
+            }
+
+            result = _outputMsg.Release();
+            CHECK( _outputMsg.Init( GetAllocator() ));
+        }
+        return result;
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/Client.cpp b/AE/engine/src/networking/HighLevel/Client.cpp
new file mode 100644
index 00000000..9245f559
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/Client.cpp
@@ -0,0 +1,91 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/HighLevel/Client.h"
+#include "networking/HighLevel/TcpChannel.h"
+#include "networking/HighLevel/UdpUnreliable.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    _Initialize
+=================================================
+*/
+    bool  BaseClient::_Initialize (RC<MessageFactory>   mf,
+                                   RC<IServerProvider>  serverProvider,
+                                   RC<IAllocator>       alloc,
+                                   FrameUID             firstFrameId) __NE___
+    {
+        CHECK_ERR( serverProvider );
+
+        _serverProvider = RVRef(serverProvider);
+
+        return _Initialize2( RVRef(mf), RVRef(alloc), firstFrameId );
+    }
+
+/*
+=================================================
+    _Deinitialize
+=================================================
+*/
+    void  BaseClient::_Deinitialize () __NE___
+    {
+        _Deinitialize2();
+        _serverProvider = null;
+    }
+
+/*
+=================================================
+    _AddChannelTCP
+=================================================
+*/
+    bool  BaseClient::_AddChannelTCP () __NE___
+    {
+        auto&   dst = _channels[ uint(EChannel::Reliable) ];
+        CHECK_ERR( not dst );
+
+        auto    channel = TcpClientChannel::ClientAPI::Create( _msgFactory, _allocator, _serverProvider );
+        CHECK_ERR( channel );
+
+        dst = RVRef(channel);
+        return true;
+    }
+
+/*
+=================================================
+    _AddChannelUnreliableUDP
+=================================================
+*/
+    bool  BaseClient::_AddChannelUnreliableUDP (ushort port) __NE___
+    {
+        auto&   dst = _channels[ uint(EChannel::Unreliable) ];
+        CHECK_ERR( not dst );
+
+        auto    channel = UdpUnreliableClientChannel::ClientAPI::Create( _msgFactory, _allocator, _serverProvider, port );
+        CHECK_ERR( channel );
+
+        dst = RVRef(channel);
+        return true;
+    }
+
+/*
+=================================================
+    _IsConnected
+=================================================
+*/
+    bool  BaseClient::_IsConnected () C_NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        bool    result = false;
+        for (auto& ch : _channels)
+        {
+            if ( ch )
+                result |= ch->IsConnected();
+        }
+        return result;
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/Client.h b/AE/engine/src/networking/HighLevel/Client.h
new file mode 100644
index 00000000..39b93136
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/Client.h
@@ -0,0 +1,60 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe:  see ClientServerBase
+*/
+
+#pragma once
+
+#include "networking/HighLevel/ClientServerBase.h"
+
+namespace AE::Networking
+{
+
+    //
+    // Client
+    //
+
+    class BaseClient : public ClientServerBase
+    {
+    // variables
+    private:
+        RC<IServerProvider>     _serverProvider;
+
+
+    // methods
+    protected:
+        ND_ bool  _Initialize (RC<MessageFactory>   mf,
+                               RC<IServerProvider>  serverProvider,
+                               RC<IAllocator>       alloc,
+                               FrameUID             firstFrameId)   __NE___;
+            void  _Deinitialize ()                                  __NE___;
+
+        ND_ bool  _AddChannelTCP ()                                 __NE___;
+        ND_ bool  _AddChannelUnreliableUDP (ushort port)            __NE___;
+
+        ND_ bool  _IsConnected ()                                   C_NE___;
+    };
+
+
+
+    //
+    // Server Provider interface
+    //
+
+    class IServerProvider : public EnableRC<IServerProvider>
+    {
+    // interface
+    public:
+
+        // Returns the server address.
+        //  'alt'   - index of alternative address, if available.
+        //  'isTCP' - TCP or UDP connection.
+        //
+        // Can be used in multiple threads but not in concurrent when used in single client/server.
+        //
+        virtual void  GetAddress (EChannel, uint alt, Bool isTCP, OUT IpAddress &)  __NE___ = 0;
+        virtual void  GetAddress (EChannel, uint alt, Bool isTCP, OUT IpAddress6 &) __NE___ = 0;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/ClientServerBase.cpp b/AE/engine/src/networking/HighLevel/ClientServerBase.cpp
new file mode 100644
index 00000000..d149514f
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/ClientServerBase.cpp
@@ -0,0 +1,243 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/HighLevel/ClientServerBase.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    _Initialize2
+=================================================
+*/
+    bool  ClientServerBase::_Initialize2 (RC<MessageFactory>    mf,
+                                          RC<IAllocator>        alloc,
+                                          FrameUID              firstFrameId) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        CHECK_ERR( mf );
+        CHECK_ERR( not _IsInitialized2() );  // already initialized
+
+        _prevFrameId    = firstFrameId;
+        _msgFactory     = RVRef(mf);
+        _allocator      = RVRef(alloc);
+
+        if ( not _allocator )
+            _allocator = AE::GetDefaultAllocator();
+
+        return true;
+    }
+
+/*
+=================================================
+    _Deinitialize2
+=================================================
+*/
+    void  ClientServerBase::_Deinitialize2 () __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        _prevFrameId    = Default;
+        _msgFactory     = null;
+        _allocator      = null;
+        _channels.fill( null );
+        _producers.fill( Default );
+        _consumers.clear();
+    }
+
+/*
+=================================================
+    Update
+=================================================
+*/
+    void  ClientServerBase::Update (const FrameUID frameId) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        ASSERT( _IsInitialized2() );
+        ASSERT( frameId == _prevFrameId     or
+                frameId == _prevFrameId.Next()  );
+
+        if ( frameId > _prevFrameId )
+        {
+            _msgFactory->NextFrame( frameId );
+            _prevFrameId = frameId;
+        }
+
+        // produce outcoming messages
+        for (uint i = 0; i < uint(EChannel::_Count); ++i)
+        {
+            auto&   channel = _channels[i];
+            if ( not channel )
+                continue;
+
+            for (auto& producer : _producers[i])
+            {
+                auto    msg_list = producer->Produce( frameId );
+                if ( not msg_list.empty() )
+                    channel->Send( msg_list );
+            }
+        }
+
+        // send & receive
+        for (auto& ch : _channels)
+        {
+            if ( ch )
+                ch->ProcessMessages( frameId );
+        }
+
+        // consume incoming messages
+        for (auto& ch : _channels)
+        {
+            if ( not ch )
+                continue;
+
+            auto&   msg_map = ch->Receive();
+            for (auto [id, list] : msg_map)
+            {
+                if_unlikely( list.first.empty() )
+                    continue;   // TODO: empty only if memory is out
+
+                auto    it = _consumers.find( id );
+                if_likely( it != _consumers.end() )
+                {
+                    for (auto& consumer : it->second)
+                        consumer->Consume( list.first );
+                }
+                else
+                {
+                    AE_LOG_DBG( "messages in group ("s << ToString(uint(id)) << ") is not consumed" );
+                }
+            }
+            msg_map.clear();
+        }
+    }
+
+/*
+=================================================
+    Send
+=================================================
+*/
+    void  ClientServerBase::Send (EChannel type, MsgList_t msgList) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        ASSERT( _IsInitialized2() );
+        CHECK_ERRV( uint(type) < _channels.size() );
+        CHECK_ERRV( _channels[ uint(type) ] );
+
+        _channels[ uint(type) ]->Send( msgList );
+    }
+
+/*
+=================================================
+    Add
+=================================================
+*/
+    bool  ClientServerBase::Add (RC<ICSMessageProducer> producer) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        CHECK_ERR( producer );
+
+        for (EChannel type : producer->GetChannels())
+        {
+            CHECK_ERR( uint(type) < _producers.size() );
+            CHECK_ERR( _channels[ uint(type) ] );
+
+            _producers[ uint(type) ].push_back( producer );  // throw
+        }
+        return true;
+    }
+
+/*
+=================================================
+    Remove
+=================================================
+*/
+    void  ClientServerBase::Remove (const ICSMessageProducer* producer) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        CHECK_ERRV( producer != null );
+
+        for (auto& per_channel : _producers)
+        {
+            EraseIfEqual( INOUT per_channel, producer );
+        }
+    }
+
+/*
+=================================================
+    RemoveAllProducers
+=================================================
+*/
+    void  ClientServerBase::RemoveAllProducers () __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        for (auto& p : _producers)
+            p.clear();
+    }
+
+/*
+=================================================
+    Add
+=================================================
+*/
+    bool  ClientServerBase::Add (RC<ICSMessageConsumer> consumer) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        CHECK_ERR( consumer );
+        CHECK_ERR( _consumers.size() < _consumers.capacity() );
+
+        const CSMessageGroupID  group_id = consumer->GetGroupID();
+
+        auto&   arr = _consumers( group_id );
+        arr.push_back( RVRef(consumer) );  // throw
+
+        return true;
+    }
+
+/*
+=================================================
+    Remove
+=================================================
+*/
+    void  ClientServerBase::Remove (const ICSMessageConsumer* consumer) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        CHECK_ERRV( consumer != null );
+
+        const CSMessageGroupID  group_id = consumer->GetGroupID();
+
+        auto    it = _consumers.find( group_id );
+        if ( it != _consumers.end() )
+        {
+            EraseIfEqual( INOUT it->second, consumer );
+        }
+    }
+
+/*
+=================================================
+    RemoveAll
+=================================================
+*/
+    void  ClientServerBase::RemoveAll (CSMessageGroupID groupId) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        _consumers.EraseByKey( groupId );
+    }
+
+/*
+=================================================
+    RemoveAllConsumers
+=================================================
+*/
+    void  ClientServerBase::RemoveAllConsumers () __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        _consumers.clear();
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/ClientServerBase.h b/AE/engine/src/networking/HighLevel/ClientServerBase.h
new file mode 100644
index 00000000..0b796f09
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/ClientServerBase.h
@@ -0,0 +1,85 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe: no
+*/
+
+#pragma once
+
+#include "networking/HighLevel/IChannel.h"
+
+namespace AE::Networking
+{
+
+    //
+    // Client/Server Base
+    //
+
+    class ClientServerBase
+    {
+    // types
+    private:
+        using Channels_t        = StaticArray< RC<IChannel>, uint(EChannel::_Count) >;
+        using MsgList_t         = IChannel::MsgList_t;
+        using CMsgList_t        = IChannel::CMsgList_t;
+
+        using MsgProducerMap_t  = StaticArray< Array< RC<ICSMessageProducer> >, uint(EChannel::_Count) >;
+        using MsgConsumerMap_t  = FixedMap< CSMessageGroupID, Array<RC<ICSMessageConsumer>>, NetConfig::MaxMsgGroupsPerFrame >;
+
+
+    // variables
+    protected:
+        FrameUID                _prevFrameId;
+        RC<MessageFactory>      _msgFactory;
+        Channels_t              _channels;
+        MsgProducerMap_t        _producers;
+        MsgConsumerMap_t        _consumers;
+        RC<IAllocator>          _allocator;
+
+        DRC_ONLY( Threading::DataRaceCheck  _drCheck;)
+
+
+    // methods
+    public:
+
+        // Add/Remove message producer
+        //
+        bool  Add (RC<ICSMessageProducer>)                          __NE___;
+        void  Remove (const ICSMessageProducer*)                    __NE___;
+        void  RemoveAllProducers ()                                 __NE___;
+
+
+        // Add/Remove message consumer
+        //
+        bool  Add (RC<ICSMessageConsumer>)                          __NE___;
+        void  Remove (const ICSMessageConsumer*)                    __NE___;
+        void  RemoveAll (CSMessageGroupID)                          __NE___;
+        void  RemoveAllConsumers ()                                 __NE___;
+
+
+        // Receive and send messages.
+        // 'frameId' must be same or +1 to the previous call.
+        //
+        void  Update (FrameUID frameId)                             __NE___;
+
+
+        // Send messages to the specified channel.
+        //
+        void  Send (EChannel id, MsgList_t)                         __NE___;
+
+
+    protected:
+        ClientServerBase ()                                         __NE___ {}
+        virtual ~ClientServerBase ()                                __NE___ {}
+
+        ND_ bool  _Initialize2 (RC<MessageFactory>  mf,
+                                RC<IAllocator>      alloc,
+                                FrameUID            firstFrameId)   __NE___;
+            void  _Deinitialize2 ()                                 __NE___;
+
+        ND_ bool  _IsInitialized2 ()                                C_NE___ { return bool{_msgFactory}; }
+
+        ND_ MessageFactory&  _GetMessageFactory ()                  __NE___ { return *_msgFactory; }
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/DataDecoder.h b/AE/engine/src/networking/HighLevel/DataDecoder.h
new file mode 100644
index 00000000..a675c223
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/DataDecoder.h
@@ -0,0 +1,41 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe: no
+*/
+
+#pragma once
+
+#include "networking/Common.h"
+#include "pch/Serializing.h"
+
+namespace AE::Networking
+{
+    using namespace AE::Base;
+
+
+    //
+    // Network Data Decoder (Deserializer)
+    //
+
+    class DataDecoder final
+    {
+    // variables
+    private:
+        Serializing::Deserializer   _des;
+
+
+    // methods
+    public:
+        DataDecoder (const void* ptr, Bytes size, IAllocator &alloc)    __NE___ : _des{ FastRStream{ ptr, ptr+size }, &alloc } {}
+
+        ND_ bool    IsComplete ()                                       C_NE___ { return _des.stream.Empty(); }
+        ND_ Bytes   RemainingSize ()                                    C_NE___ { return _des.stream.RemainingSize(); }
+
+        template <typename ...Args>
+        ND_ bool    operator () (INOUT Args& ...args)                   __NE___ { return _des( args... ); }
+
+        ND_ bool    Read (OUT void* buffer, Bytes size)                 __NE___ { return _des.stream.Read( OUT buffer, size ); }
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/DataEncoder.h b/AE/engine/src/networking/HighLevel/DataEncoder.h
new file mode 100644
index 00000000..05d4bcd5
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/DataEncoder.h
@@ -0,0 +1,42 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe: no
+*/
+
+#pragma once
+
+#include "networking/Common.h"
+#include "pch/Serializing.h"
+
+namespace AE::Networking
+{
+    using namespace AE::Base;
+
+
+    //
+    // Network Data Encoder (Serializer)
+    //
+
+    class DataEncoder final
+    {
+    // variables
+    private:
+        Serializing::Serializer     _ser;
+
+
+    // methods
+    public:
+        DataEncoder (void* ptr, Bytes size)                 __NE___ : _ser{FastWStream{ ptr, ptr+size }} {}
+        DataEncoder (void* ptr, const void* end)            __NE___ : _ser{FastWStream{ ptr, end }} {}
+
+        ND_ Bytes   RemainingSize ()                        C_NE___ { return _ser.stream.RemainingSize(); }
+        ND_ bool    IsFull ()                               C_NE___ { return _ser.stream.Empty(); }
+
+        template <typename ...Args>
+        ND_ bool    operator () (const Args& ...args)       __NE___ { return _ser( args... ); }
+
+        ND_ bool    Write (const void* buffer, Bytes size)  __NE___ { return _ser.stream.Write( buffer, size ); }
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/IChannel.h b/AE/engine/src/networking/HighLevel/IChannel.h
new file mode 100644
index 00000000..023dc307
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/IChannel.h
@@ -0,0 +1,55 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe: no
+*/
+
+#pragma once
+
+#include "networking/LowLevel/IpAddress.h"
+#include "networking/LowLevel/IpAddress6.h"
+#include "networking/HighLevel/MessageFactory.h"
+
+namespace AE::Networking
+{
+    class IServerProvider;
+    class IClientListener;
+
+
+
+    //
+    // Channel interface
+    //
+
+    class IChannel : public EnableRC<IChannel>
+    {
+    // types
+    public:
+        using MsgList_t     = ChunkList< CSMessagePtr >;
+        using CMsgList_t    = ChunkList< const CSMessagePtr >;
+
+    protected:
+        struct MsgQueueByGroup
+        {
+            MsgList_t   first;
+            MsgList_t   last;
+        };
+        using MsgQueueMap_t = FixedMap< CSMessageGroupID, MsgQueueByGroup, NetConfig::MaxMsgGroupsPerFrame >;
+
+
+    // interface
+    public:
+      // user api //
+            virtual void            Send (MsgList_t)            __NE___ = 0;
+        ND_ virtual MsgQueueMap_t&  Receive ()                  __NE___ = 0;
+
+
+      // client / server api //
+            virtual void  ProcessMessages (FrameUID frameId)    __NE___ = 0;
+
+        ND_ virtual bool  DisconnectClient (EClientLocalID)     __NE___ = 0;
+
+        ND_ virtual bool  IsConnected ()                        C_NE___ = 0;    // TODO: status
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/MessageFactory.cpp b/AE/engine/src/networking/HighLevel/MessageFactory.cpp
new file mode 100644
index 00000000..ab4dd98c
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/MessageFactory.cpp
@@ -0,0 +1,124 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/HighLevel/MessageFactory.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    MessageFactory::MessageFactory () __NE___
+    {
+        for (auto& alloc : _dbAlloc) {
+            alloc = MakeRC< Allocator_t >();
+        }
+    }
+
+/*
+=================================================
+    Register
+=================================================
+*/
+    bool  MessageFactory::Register (const CSMessageUID uid, CreateForEncode_t ctor1, CreateAndDecode_t ctor2) __NE___
+    {
+        auto [group_id, msg_id] = CSMessage::_UnpackUID( uid );
+
+        auto&   group = _msgTypes[group_id];
+
+        EXLOCK( group.guard );
+        CHECK_ERR( not group.immutable );
+
+        return group.map.emplace( msg_id, Tuple{ ctor1, ctor2 }).second;
+    }
+
+    bool  MessageFactory::Register (const CSMessageGroupID groupId, ArrayView<MsgAndCtor_t> arr, Bool lockGroup) __NE___
+    {
+        auto&   group = _msgTypes[ uint(groupId) ];
+
+        EXLOCK( group.guard );
+        CHECK_ERR( not group.immutable );
+
+        for (auto& [uid, ctor1, ctor2] : arr)
+        {
+            auto [group_id, msg_id] = CSMessage::_UnpackUID( uid );
+            CHECK_ERR( uint(groupId) == group_id );
+            CHECK_ERR( group.map.emplace( msg_id, Tuple{ ctor1, ctor2 }).second );
+        }
+
+        if ( lockGroup )
+            group.immutable = true;
+
+        return true;
+    }
+
+/*
+=================================================
+    CreateMsg
+=================================================
+*/
+    bool  MessageFactory::CreateMsg (const FrameUID frameId, const CSMessageUID uid, Bytes extraSize, OUT MsgPtr_t &msg) __NE___
+    {
+        auto [group_id, msg_id] = CSMessage::_UnpackUID( uid );
+
+        CreateForEncode_t   fn = null;
+        {
+            auto&   group = _msgTypes[group_id];
+
+            SHAREDLOCK( group.guard );
+            ASSERT( group.immutable );
+
+            auto    it = group.map.find( msg_id );
+            CHECK_ERR( it != group.map.end() );
+
+            fn = it->second.Get<0>();
+        }
+
+        return fn( OUT msg, GetAllocator( frameId ), extraSize );
+    }
+
+/*
+=================================================
+    DeserializeMsg
+=================================================
+*/
+    bool  MessageFactory::DeserializeMsg (const FrameUID frameId, const CSMessageUID uid, EClientLocalID cid, OUT MsgPtr_t &msg, DataDecoder &des) __NE___
+    {
+        auto [group_id, msg_id] = CSMessage::_UnpackUID( uid );
+
+        CreateAndDecode_t   fn = null;
+        {
+            auto&   group = _msgTypes[group_id];
+
+            SHAREDLOCK( group.guard );
+            ASSERT( group.immutable );
+
+            auto    it = group.map.find( msg_id );
+            CHECK_ERR( it != group.map.end() );
+
+            fn = it->second.Get<1>();
+        }
+
+        return fn( OUT msg, GetAllocator( frameId ), cid, des );
+    }
+
+/*
+=================================================
+    NextFrame
+=================================================
+*/
+    void  MessageFactory::NextFrame (const FrameUID frameId) __NE___
+    {
+        const uint  id = frameId.Remap2();
+
+        _dbAlloc[id]->Discard();
+
+        DEBUG_ONLY(
+            _dbFrameId[id].store( frameId );
+        )
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/MessageFactory.h b/AE/engine/src/networking/HighLevel/MessageFactory.h
new file mode 100644
index 00000000..f1112b08
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/MessageFactory.h
@@ -0,0 +1,476 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    ICSMessageProducer
+        thread-safe: no
+
+    ICSMessageConsumer
+        thread-safe: no
+
+    MessageFactory
+        thread-safe: ???
+*/
+
+#pragma once
+
+#include "networking/HighLevel/DataDecoder.h"
+#include "networking/HighLevel/DataEncoder.h"
+
+namespace AE::Networking
+{
+    using AE::Threading::RWSpinLock;
+
+    enum class CSMessageUID : ushort {};
+    enum class CSMessageGroupID : ushort {};
+
+    enum class EChannel : uint
+    {
+        Reliable    = 0,    // reliable & ordered channel
+        Unreliable  = 1,    // unreliable (unordered?) channel
+        _Count
+    };
+
+    enum class EClientLocalID : ushort
+    {
+        Unknown     = 0xFFFF
+    };
+
+    using CSMessagePtr = Ptr< struct CSMessage >;
+
+
+
+    //
+    // Client/Server Message interface
+    //
+    struct CSMessage
+    {
+        friend class MessageFactory;
+
+    // types
+    public:
+        enum class EncodeError : ubyte
+        {
+            OK,
+            NoMemory,
+            Failed,
+        };
+
+        using EncodeFn_t = EncodeError (*) (const void* self, DataEncoder &)    __NE___;
+
+    protected:
+        static constexpr uint   _MaxGroupID         = (1u << 9) - 1;
+        static constexpr uint   _GroupMaskOffset    = CT_SizeOfInBits<CSMessageUID> - IntLog2( _MaxGroupID+1 );
+        static constexpr uint   _GroupMask          = _MaxGroupID << _GroupMaskOffset;
+        static constexpr uint   _MaxMessageID       = (1u << _GroupMaskOffset) - 1;
+
+        template <uint GroupID, uint MsgID>
+        ND_ static constexpr CSMessageUID  _PackUID ()                          __NE___
+        {
+            StaticAssert( GroupID <= _MaxGroupID );
+            StaticAssert( MsgID   <= _MaxMessageID );
+            return _PackUID( GroupID, MsgID );
+        }
+
+        ND_ static constexpr CSMessageUID  _PackUID (uint group, uint id)       __NE___
+        {
+            ASSERT( group <= _MaxGroupID );
+            ASSERT( id <= _MaxMessageID );
+            return CSMessageUID((group << _GroupMaskOffset) | id);
+        }
+
+        ND_ static constexpr Tuple<uint, uint>  _UnpackUID (CSMessageUID uid)   __NE___
+        {
+            return Tuple{ (uint(uid) >> _GroupMaskOffset) & _MaxGroupID, uint(uid) & ~_GroupMask };
+        }
+
+
+    // variables
+    private:
+        const CSMessageUID      _uid;
+        const EClientLocalID    _clientId;
+
+
+    // methods
+    protected:
+        CSMessage (CSMessageUID uid, EClientLocalID cid)            __NE___ : _uid{uid}, _clientId{cid} {}
+
+    public:
+        ND_ EncodeError         Serialize (DataEncoder &enc)        C_NE___;
+
+        // utils //
+        ND_ static constexpr uint  GroupCount ()                    __NE___ { return _MaxGroupID+1; }
+        ND_ static constexpr auto  UnpackGroupID (CSMessageUID uid) __NE___ { return CSMessageGroupID( (uint(uid) >> _GroupMaskOffset) & _MaxGroupID ); }
+
+
+        template <typename T>
+        ND_ T const*            As ()                               C_NE___ { ASSERT( _uid == T::UID );  return Cast<T>( this ); }
+
+        ND_ CSMessageGroupID    GroupId ()                          C_NE___ { return UnpackGroupID( _uid ); }
+    //  ND_ uint                LocalId ()                          C_NE___ { return uint(_uid) & _MaxMessageID; }
+        ND_ CSMessageUID        UniqueId ()                         C_NE___ { return _uid; }
+
+        ND_ EClientLocalID      ClientId ()                         C_NE___ { return _clientId; }
+    };
+
+
+
+    //
+    // Message Constructor
+    //
+    template <typename T>
+    struct CSMessageCtor
+    {
+        static bool  CreateForEncode (OUT CSMessagePtr &, IAllocator &, Bytes extraSize)                __NE___;
+        static bool  CreateAndDecode (OUT CSMessagePtr &, IAllocator &, EClientLocalID, DataDecoder &)  __NE___;
+    };
+
+
+
+    //
+    // Message Producer interface
+    //
+    class ICSMessageProducer : public EnableRC<ICSMessageProducer>
+    {
+    // interface
+    public:
+        ND_ virtual EnumBitSet<EChannel>    GetChannels ()              C_NE___ = 0;
+
+        ND_ virtual ChunkList<CSMessagePtr>  Produce (FrameUID frameId) __NE___ = 0;
+    };
+
+
+
+    //
+    // Message Consumer interface
+    //
+    class ICSMessageConsumer : public EnableRC<ICSMessageConsumer>
+    {
+    // interface
+    public:
+        ND_ virtual CSMessageGroupID  GetGroupID ()                     C_NE___ = 0;
+
+            virtual void  Consume (ChunkList<const CSMessagePtr>)       __NE___ = 0;
+    };
+
+
+
+    //
+    // Message Factory
+    //
+    class MessageFactory : public EnableRC<MessageFactory>
+    {
+    // types
+    public:
+        using MsgPtr_t              = CSMessagePtr; // allocated by '_dbAlloc' and memory will be auto-released in 'NextFrame()'
+        using CreateForEncode_t     = bool (*) (OUT MsgPtr_t &, IAllocator &, Bytes);
+        using CreateAndDecode_t     = bool (*) (OUT MsgPtr_t &, IAllocator &, EClientLocalID, DataDecoder &);
+
+    private:
+        using MsgTypeMap_t          = FlatHashMap< uint, Tuple< CreateForEncode_t, CreateAndDecode_t >>;
+        using Allocator_t           = Threading::LfLinearAllocator< usize{4_Mb}, usize{16_b}, 16 >;
+
+        using DoubleBufAlloc_t      = StaticArray< RC<Allocator_t>, 2 >;
+        using DoubleBufFrameId_t    = StaticArray< AtomicFrameUID, 2 >;
+
+        struct MsgGroup
+        {
+            RWSpinLock      guard;
+            bool            immutable   = false;
+            MsgTypeMap_t    map;
+        };
+        using MsgTypes_t    = StaticArray< MsgGroup, CSMessage::_MaxGroupID+1 >;
+
+        using MsgAndCtor_t  = Tuple< CSMessageUID, CreateForEncode_t, CreateAndDecode_t >;
+
+
+    // variables
+    private:
+        DoubleBufAlloc_t        _dbAlloc;
+
+        MsgTypes_t              _msgTypes;
+
+        DEBUG_ONLY(
+            DoubleBufFrameId_t  _dbFrameId;
+        )
+
+
+    // methods
+    public:
+        MessageFactory ()                                                               __NE___;
+        ~MessageFactory ()                                                              __NE___ {}
+
+        // register messages //
+        template <typename T>
+            bool    Register ()                                                         __NE___;
+
+        template <typename T0, typename ...Types>
+            bool    Register (Bool lockGroup)                                           __NE___;
+
+            bool    Register (CSMessageUID uid, CreateForEncode_t, CreateAndDecode_t)   __NE___;
+            bool    Register (CSMessageGroupID groupId, ArrayView<MsgAndCtor_t>,
+                              Bool lockGroup = False{})                                 __NE___;
+
+        // message constructors //
+        template <typename T>
+        ND_ Ptr<T>  CreateMsg (FrameUID, Bytes extraSize = 0_b)                         __NE___;
+        ND_ bool    CreateMsg (FrameUID, CSMessageUID, Bytes extraSize, OUT MsgPtr_t &) __NE___;
+
+        ND_ bool    DeserializeMsg (FrameUID, CSMessageUID, EClientLocalID,
+                                    OUT MsgPtr_t &, DataDecoder &)                      __NE___;
+
+
+        // client/server api //
+            void    NextFrame (FrameUID frameId)                                        __NE___;
+
+        // utils //
+        ND_ IAllocator&  GetAllocator (FrameUID frameId)                                __NE___;
+    };
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    DECL_CSMSG
+----
+    Helper for client/server message declaration.
+=================================================
+*/
+    #define DECL_CSMSG( _name_, _group_, /*fields*/... )                                                                        \
+        struct CSMsg_ ## _name_ final : CSMessage                                                                               \
+        {                                                                                                                       \
+            friend struct CSMessageCtor< CSMsg_ ## _name_ >;                                                                    \
+                                                                                                                                \
+            static constexpr auto   UID = _PackUID< uint(CSMessageGroup::_group_),                                              \
+                                                    uint(CSMessageGroup:: _group_ ## _MsgCounter.next< CSMsg_ ## _name_ >())    \
+                                                  >();                                                                          \
+            __VA_ARGS__                                                                                                         \
+                                                                                                                                \
+        private:                                                                                                                \
+            CSMsg_ ## _name_ ()                                     __NE___ : CSMessage{ UID, Default } {}                      \
+            explicit CSMsg_ ## _name_ (EClientLocalID cid)          __NE___ : CSMessage{ UID, cid } {}                          \
+                                                                                                                                \
+            inline EncodeError  _Serialize (DataEncoder &)          C_NE___;                                                    \
+            inline bool         _Deserialize (DataDecoder &)        __NE___;                                                    \
+                                                                                                                                \
+            static EncodeError  _EncodeFn (const void* self, DataEncoder &enc) __NE___ {                                        \
+                return Cast< CSMsg_ ## _name_ >(self)->_Serialize( enc );                                                       \
+            }                                                                                                                   \
+        };                                                                                                                      \
+        //StaticAssert( IsTriviallyDestructible< CSMsg_ ## _name_ >);
+
+/*
+=================================================
+    CSMSG_ENC_DEC
+----
+    Helper for client/server message encoding/decoding.
+=================================================
+*/
+    #define CSMSG_ENC_DEC( _name_, /*fields*/... )                                              \
+        inline CSMessage::EncodeError  CSMsg_ ## _name_::_Serialize (DataEncoder &enc) C_NE___  \
+        {                                                                                       \
+            return  enc( __VA_ARGS__ ) ? EncodeError::OK : EncodeError::NoMemory;               \
+        }                                                                                       \
+                                                                                                \
+        inline bool  CSMsg_ ## _name_::_Deserialize (DataDecoder &dec) __NE___                  \
+        {                                                                                       \
+            return  dec( OUT __VA_ARGS__ );                                                     \
+        }
+
+/*
+=================================================
+    CSMSG_ENC_DEC_INPLACEARR
+----
+    Helper for client/server message encoding/decoding,
+    when message contains in place array.
+=================================================
+*/
+    #define CSMSG_ENC_DEC_INPLACEARR( _name_, _inPlaceArrSize_, _inPlaceArr_, _fields_ )                            \
+        inline CSMessage::EncodeError  CSMsg_ ## _name_::_Serialize (DataEncoder &enc) C_NE___                      \
+        {                                                                                                           \
+            StaticAssert( sizeof(_inPlaceArrSize_) <= sizeof(ushort) );                                             \
+            StaticAssert( IsUnsignedInteger< decltype(_inPlaceArrSize_) > or                                        \
+                          IsBytes< decltype(_inPlaceArrSize_) >);                                                   \
+                                                                                                                    \
+            bool    ok = enc( _fields_ );                                                                           \
+                    ok = ok and enc.Write( _inPlaceArr_, _inPlaceArrSize_ );                                        \
+            return  ok ? EncodeError::OK : EncodeError::NoMemory;                                                   \
+        }                                                                                                           \
+                                                                                                                    \
+        inline bool  CSMsg_ ## _name_::_Deserialize (DataDecoder &dec) __NE___                                      \
+        {                                                                                                           \
+            return  dec( OUT _fields_ );                                                                            \
+        }                                                                                                           \
+                                                                                                                    \
+        template <>                                                                                                 \
+        inline bool  CSMessageCtor< CSMsg_ ## _name_ >::CreateAndDecode (OUT CSMessagePtr &msg, IAllocator &alloc,  \
+                                                                         EClientLocalID, DataDecoder &dec) __NE___  \
+        {                                                                                                           \
+            using T = CSMsg_ ## _name_;                                                                             \
+                                                                                                                    \
+            constexpr Bytes  msg_size {offsetof( CSMsg_ ## _name_, _inPlaceArr_ )};                                 \
+                                                                                                                    \
+            T   temp;                                                                                               \
+            if_likely( temp._Deserialize( dec ))                                                                    \
+            {                                                                                                       \
+                auto*   t_msg = Cast<T>( alloc.Allocate( SizeAndAlign{                                              \
+                                            msg_size + temp._inPlaceArrSize_, AlignOf<T> }));                       \
+                                                                                                                    \
+                if_likely( t_msg != null )                                                                          \
+                {                                                                                                   \
+                    msg = t_msg;                                                                                    \
+                    new(t_msg) T{ RVRef(temp) };                                                                    \
+                                                                                                                    \
+                    return dec.Read( t_msg->_inPlaceArr_, t_msg->_inPlaceArrSize_ );                                \
+                }                                                                                                   \
+            }                                                                                                       \
+            return false;                                                                                           \
+        }
+
+/*
+=================================================
+    CSMSG_EMPTY_ENC_DEC
+----
+    Helper for client/server message encoding/decoding for empty message.
+=================================================
+*/
+    #define CSMSG_EMPTY_ENC_DEC( _name_ )                                                       \
+        inline CSMessage::EncodeError  CSMsg_ ## _name_::_Serialize (DataEncoder &) C_NE___     \
+        {                                                                                       \
+            return  EncodeError::OK;                                                            \
+        }                                                                                       \
+                                                                                                \
+        inline bool  CSMsg_ ## _name_::_Deserialize (DataDecoder &) __NE___                     \
+        {                                                                                       \
+            return  true;                                                                       \
+        }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    Serialize
+=================================================
+*/
+    inline CSMessage::EncodeError  CSMessage::Serialize (DataEncoder &enc) C_NE___
+    {
+        struct MsgAndFn {
+            DEBUG_ONLY( usize   magic;)
+            EncodeFn_t          fn;
+            CSMessage           msg;
+        };
+        auto*   msg_fn = BitCast<MsgAndFn *>( usize(this) - offsetof( MsgAndFn, msg ));
+        ASSERT( msg_fn->magic == usize(this) );
+        ASSERT( &msg_fn->msg == this );
+        ASSERT( msg_fn->fn != null );
+        return msg_fn->fn( this, enc );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    CreateForEncode
+=================================================
+*/
+    template <typename T>
+    bool  CSMessageCtor<T>::CreateForEncode (OUT CSMessagePtr &msg, IAllocator &alloc, Bytes extraSize) __NE___
+    {
+        struct MsgAndFn {
+            DEBUG_ONLY( usize       magic;)
+            typename T::EncodeFn_t  fn;
+            T                       msg;
+        };
+
+        auto*   msg_fn = Cast<MsgAndFn>( alloc.Allocate( SizeAndAlign{ SizeOf<MsgAndFn> + extraSize, AlignOf<MsgAndFn> }));
+        if_likely( msg_fn != null )
+        {
+            DEBUG_ONLY( msg_fn->magic = usize(&msg_fn->msg) );
+
+            msg_fn->fn = &T::_EncodeFn;
+            new(&msg_fn->msg) T{};
+
+            msg = &msg_fn->msg;
+            return true;
+        }
+        return false;
+    }
+
+/*
+=================================================
+    CreateAndDecode
+=================================================
+*/
+    template <typename T>
+    bool  CSMessageCtor<T>::CreateAndDecode (OUT CSMessagePtr &msg, IAllocator &alloc, EClientLocalID clientId, DataDecoder &dec) __NE___
+    {
+        auto*   t_msg = alloc.Allocate<T>();
+        ASSERT( t_msg != null );
+
+        if_likely( t_msg != null )
+        {
+            msg = t_msg;
+            new(t_msg) T{ clientId };
+            return t_msg->_Deserialize( dec );
+        }
+        return false;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    Register
+=================================================
+*/
+    template <typename T>
+    bool  MessageFactory::Register () __NE___
+    {
+        StaticAssert( IsTriviallyDestructible<T> );
+
+        return Register( T::UID, &CSMessageCtor<T>::CreateForEncode, &CSMessageCtor<T>::CreateAndDecode );
+    }
+
+    template <typename T0, typename ...Types>
+    bool  MessageFactory::Register (Bool lockGroup) __NE___
+    {
+        // Destructor may not be used because message allocated in linear allocator and memory will be discarded.
+        StaticAssert( IsTriviallyDestructible<T0> );
+        StaticAssert( TypeList<Types...>::template ForEach_And< TTriviallyDestructible >() );
+
+        return Register( CSMessageGroupID(CSMessage::_UnpackUID( T0::UID ).template Get<0>()),
+                         ArrayView< MsgAndCtor_t >{
+                            MsgAndCtor_t{ T0::UID,      &CSMessageCtor<T0>::CreateForEncode,    &CSMessageCtor<T0>::CreateAndDecode },
+                            MsgAndCtor_t{ Types::UID,   &CSMessageCtor<Types>::CreateForEncode, &CSMessageCtor<Types>::CreateAndDecode }... },
+                         lockGroup );
+    }
+
+/*
+=================================================
+    CreateMsg
+=================================================
+*/
+    template <typename T>
+    Ptr<T>  MessageFactory::CreateMsg (FrameUID frameId, Bytes extraSize) __NE___
+    {
+        MsgPtr_t    tmp;
+        if_likely( CreateMsg( frameId, T::UID, extraSize, OUT tmp ))
+            return Cast<T>( tmp );
+        return Default;
+    }
+
+/*
+=================================================
+    GetAllocator
+=================================================
+*/
+    inline IAllocator&  MessageFactory::GetAllocator (const FrameUID frameId) __NE___
+    {
+        const uint  id = frameId.Remap2();
+        return *_dbAlloc[id];
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/Messages.h b/AE/engine/src/networking/HighLevel/Messages.h
new file mode 100644
index 00000000..ee39afe0
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/Messages.h
@@ -0,0 +1,59 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Client / Server messages
+*/
+
+#pragma once
+
+#include "networking/HighLevel/MessageFactory.h"
+
+// Client/Server Message Group
+namespace AE::CSMessageGroup
+{
+    using AE::Networking::CSMessageGroupID;
+
+    template <CSMessageGroupID GroupId>
+    struct _MsgCounterCtx {};
+
+    static constexpr auto                                       Global          = CSMessageGroupID(0);
+    static constexpr Base::CT_Counter< _MsgCounterCtx<Global> > Global_MsgCounter;
+
+    static constexpr auto                                       Debug           = CSMessageGroupID(1);
+    static constexpr Base::CT_Counter< _MsgCounterCtx<Debug> >  Debug_MsgCounter;
+}
+
+namespace AE::Networking
+{
+    DECL_CSMSG( Log,  Debug,
+        StringView      msg;
+        SourceLoc       loc;
+        ELogLevel       level   = ELogLevel::Debug;
+        ELogScope       scope   = ELogScope::Unknown;
+
+        void  Execute ()    C_NE___;
+    );
+
+    DECL_CSMSG( NextFrame,  Global );
+
+    DECL_CSMSG( Sync,  Global,
+        ulong           timeNs;
+        ulong           frameId;
+    );
+//-----------------------------------------------------------------------------
+
+
+
+    CSMSG_ENC_DEC( Log,  msg, loc.file, loc.line, level, scope );
+
+    inline void  CSMsg_Log::Execute () C_NE___
+    {
+        AE_PRIVATE_LOGX( level, scope, msg, loc.file, loc.line );
+    }
+
+
+    CSMSG_EMPTY_ENC_DEC( NextFrame );
+
+    CSMSG_ENC_DEC( Sync,  timeNs, frameId );
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/Server.cpp b/AE/engine/src/networking/HighLevel/Server.cpp
new file mode 100644
index 00000000..5acc39e5
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/Server.cpp
@@ -0,0 +1,91 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/HighLevel/Server.h"
+#include "networking/HighLevel/TcpChannel.h"
+#include "networking/HighLevel/UdpUnreliable.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    _Initialize
+=================================================
+*/
+    bool  BaseServer::_Initialize (RC<MessageFactory>   mf,
+                                   RC<IClientListener>  clientListener,
+                                   RC<IAllocator>       alloc,
+                                   FrameUID             firstFrameId) __NE___
+    {
+        CHECK_ERR( clientListener );
+
+        _clientListener = RVRef(clientListener);
+
+        return _Initialize2( RVRef(mf), RVRef(alloc), firstFrameId );
+    }
+
+/*
+=================================================
+    _Deinitialize
+=================================================
+*/
+    void  BaseServer::_Deinitialize () __NE___
+    {
+        _Deinitialize2();
+        _clientListener = null;
+    }
+
+/*
+=================================================
+    _AddChannelTCP
+=================================================
+*/
+    bool  BaseServer::_AddChannelTCP (ushort port) __NE___
+    {
+        auto&   dst = _channels[ uint(EChannel::Reliable) ];
+        CHECK_ERR( not dst );
+
+        auto    channel = TcpServerChannel::ServerAPI::Create( _msgFactory, _allocator, _clientListener, port, UMax );
+        CHECK_ERR( channel );
+
+        dst = RVRef(channel);
+        return true;
+    }
+
+/*
+=================================================
+    _AddChannelUnreliableUDP
+=================================================
+*/
+    bool  BaseServer::_AddChannelUnreliableUDP (ushort port) __NE___
+    {
+        auto&   dst = _channels[ uint(EChannel::Unreliable) ];
+        CHECK_ERR( not dst );
+
+        auto    channel = UdpUnreliableServerChannel::ServerAPI::Create( _msgFactory, _allocator, _clientListener, port );
+        CHECK_ERR( channel );
+
+        dst = RVRef(channel);
+        return true;
+    }
+
+/*
+=================================================
+    _DisconnectClient
+=================================================
+*/
+    bool  BaseServer::_DisconnectClient (EClientLocalID id) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        bool    result = false;
+        for (auto& ch : _channels)
+        {
+            if ( ch )
+                result |= ch->DisconnectClient( id );
+        }
+        return result;
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/Server.h b/AE/engine/src/networking/HighLevel/Server.h
new file mode 100644
index 00000000..44d0cff7
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/Server.h
@@ -0,0 +1,62 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe:  see ClientServerBase
+*/
+
+#pragma once
+
+#include "networking/HighLevel/ClientServerBase.h"
+
+namespace AE::Networking
+{
+
+    //
+    // Server
+    //
+
+    class BaseServer : public ClientServerBase
+    {
+    // variables
+    private:
+        RC<IClientListener>     _clientListener;
+
+
+    // methods
+    protected:
+        ND_ bool  _Initialize (RC<MessageFactory>   mf,
+                               RC<IClientListener>  clientListener,
+                               RC<IAllocator>       alloc,
+                               FrameUID             firstFrameId)   __NE___;
+            void  _Deinitialize ()                                  __NE___;
+
+        ND_ bool  _AddChannelTCP (ushort port)                      __NE___;
+        ND_ bool  _AddChannelUnreliableUDP (ushort port)            __NE___;
+
+        ND_ bool  _DisconnectClient (EClientLocalID)                __NE___;
+    };
+
+
+
+    //
+    // Client Event Listener interface
+    //
+
+    class IClientListener : public EnableRC<IClientListener>
+    {
+    // interface
+    public:
+
+        // Called when new client connected.
+        // Returns valid ID if client is allowed to connect, otherwise it will be disconnected.
+        //
+        // Thread-safe:
+        //  Can be used in multiple threads but not in concurrent when used in single client/server.
+        //
+        ND_ virtual EClientLocalID  OnClientConnected (EChannel, const IpAddress &)     __NE___ = 0;
+        ND_ virtual EClientLocalID  OnClientConnected (EChannel, const IpAddress6 &)    __NE___ = 0;
+
+            virtual void  OnClientDisconnected (EChannel, EClientLocalID)               __NE___ = 0;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/TcpChannel.cpp b/AE/engine/src/networking/HighLevel/TcpChannel.cpp
new file mode 100644
index 00000000..2c490110
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/TcpChannel.cpp
@@ -0,0 +1,783 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/HighLevel/TcpChannel.h"
+#include "networking/HighLevel/Client.h"
+#include "networking/HighLevel/Server.h"
+
+namespace AE::Networking
+{
+namespace {
+    static constexpr auto   c_ChannelType = EChannel::Reliable;
+}
+
+/*
+=================================================
+    _MsgHeader
+=================================================
+*/
+    struct TcpChannel::_MsgHeader
+    {
+        // TODO
+    //  uint            _magic  : 8;
+    //  uint            _size   : 11;
+    //  uint            _msgId  : 12;
+
+        ushort          magic;
+        Byte16u         size;
+        CSMessageUID    msgId;
+
+        _MsgHeader () __NE___ = default;
+
+        _MsgHeader (Byte16u size, CSMessageUID msgId) __NE___ :
+            magic{ _magicByte },
+            size{ size },
+            msgId{ msgId }
+        {}
+    };
+
+/*
+=================================================
+    SendQueue::ResetQueue
+=================================================
+*/
+    inline void  TcpChannel::SendQueue::ResetQueue () __NE___
+    {
+        queue       = Default;
+        queueLast   = Default;
+    }
+
+/*
+=================================================
+    ReceiveQueue::ResetQueue
+=================================================
+*/
+    inline void  TcpChannel::ReceiveQueue::ResetQueue () __NE___
+    {
+        queue.clear();
+    }
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    TcpChannel::TcpChannel (RC<MessageFactory> mf, RC<IAllocator> alloc) __NE___ :
+        _msgFactory{ RVRef(mf) },
+        _allocator{ RVRef(alloc) }
+    {
+        StaticAssert( sizeof(_MsgHeader) == 6 );
+
+        _toSend  .storage.Alloc( NetConfig::ChannelStorageSize, DefaultAllocatorAlign, _allocator.get() );
+        _received.storage.Alloc( NetConfig::ChannelStorageSize, DefaultAllocatorAlign, _allocator.get() );
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    TcpChannel::~TcpChannel () __NE___
+    {
+        _toSend  .storage.Dealloc( _allocator.get() );
+        _received.storage.Dealloc( _allocator.get() );
+    }
+
+/*
+=================================================
+    _IsValid
+=================================================
+*/
+    bool  TcpChannel::_IsValid () C_NE___
+    {
+        return  _msgFactory         and
+                _allocator          and
+                _toSend.storage     and
+                _received.storage;
+    }
+
+/*
+=================================================
+    _SendMessages
+=================================================
+*/
+    void  TcpChannel::_SendMessages (TcpSocket &socket, INOUT bool &isDisconnected) __NE___
+    {
+        if_unlikely( _toSend.queue.empty() )
+            return;
+
+        auto&       storage         = _toSend.storage;
+        Bytes       encoded         = _toSend.encoded;      // offset in 'storage' to the end of encoded messages
+        Bytes       pending;                                // offset in 'storage' to begin of data which can be sent
+        auto        last_failed_it  = _toSend.queue.end();
+
+        const auto  SendData        = [&socket, &storage, &encoded, &pending, &isDisconnected] (bool sendAll = false)
+        {{
+            //DEBUG_ONLY( _ValidateMsgStream( storage.Ptr(pending), encoded ));
+
+            bool    retry = true;
+            for (uint i = 0; retry & (encoded > pending) & (i < _maxAttemptsToSend); ++i)
+            {
+                        retry       = sendAll;
+                auto    [err, sent] = socket.Send( storage.Ptr( pending ), encoded - pending );
+
+                BEGIN_ENUM_CHECKS();
+                switch ( err )
+                {
+                    case_likely SocketSendError::Sent :
+                    {
+                        ASSERT( sent > 0 );
+                        pending += sent;
+                        break;
+                    }
+
+                    case SocketSendError::NotSent :
+                    case SocketSendError::ResourceTemporarilyUnavailable :
+                        ThreadUtils::Sleep_500us();     // TODO: optimize
+                        break; // skip
+
+                    case SocketSendError::_Error :
+                    case SocketSendError::UDP_MessageTooLong :
+                        // unused
+
+                    case SocketSendError::NoSocket :
+                    case SocketSendError::NotConnected :
+                    case SocketSendError::ConnectionResetByPeer :
+                    case SocketSendError::UnknownError :
+                    case SocketSendError::PermissionDenied :
+                    default :
+                        isDisconnected = true;
+                        return;
+                }
+                END_ENUM_CHECKS();
+            }
+
+            if ( pending != encoded )
+            {
+                MemMove( OUT storage.Ptr(), storage.Ptr( pending ), encoded - pending );    // TODO: optimize
+                //DEBUG_ONLY( _ValidateMsgStream( storage.Ptr(), encoded - pending ));
+            }
+
+            encoded -= pending;
+            pending  = 0_b;
+        }};
+
+
+        for (auto it = _toSend.queue.begin(); (it != _toSend.queue.end()) & (not isDisconnected);)
+        {
+            if_unlikely( encoded + sizeof(_MsgHeader) >= storage.Size() )
+                SendData();
+
+            auto*           hdr_ptr     = storage.Ptr( encoded );
+            const Bytes     msg_off     = encoded + sizeof(_MsgHeader);
+            DataEncoder     enc         { storage.Ptr( msg_off ), storage.End() };
+            auto            err         = (*it)->Serialize( enc );
+
+            BEGIN_ENUM_CHECKS();
+            switch ( err )
+            {
+                case_likely CSMessage::EncodeError::OK :
+                {
+                    encoded = storage.Size() - enc.RemainingSize();
+
+                    _MsgHeader  header { encoded - msg_off, (*it)->UniqueId() };
+
+                    ASSERT( Bytes{header.size} <= _maxMsgSize );
+                    MemCopy( OUT hdr_ptr, &header, Sizeof(header) );
+
+                    ++it;
+                    break;
+                }
+
+                // skip message
+                case CSMessage::EncodeError::Failed :
+                    _OnEncodingError( *it );
+                    ++it;
+                    break;
+
+                // send and try again
+                case CSMessage::EncodeError::NoMemory :
+                {
+                    // skip on second try
+                    if ( last_failed_it == it )
+                    {
+                        _OnEncodingError( *it );
+                        ++it;
+                        break;
+                    }
+
+                    SendData();
+                    last_failed_it = it;
+                    break;
+                }
+            }
+            END_ENUM_CHECKS();
+        }
+
+        SendData( true );
+        ASSERT( isDisconnected or pending == 0 );
+
+        isDisconnected |= (pending > 0);
+
+        _toSend.encoded = encoded;
+    }
+
+/*
+=================================================
+    _ReceiveMessages
+=================================================
+*/
+    void  TcpChannel::_ReceiveMessages (TcpSocket &socket, const FrameUID frameId, const EClientLocalID clientId, INOUT bool &isDisconnected) __NE___
+    {
+        auto&   storage     = _received.storage;
+        Bytes   received    = _received.received;   // offset in 'storage' to the end of received data
+        Bytes   decoded;                            // offset in 'storage' to the begin of data which can be decoded, if enough size
+        auto&   allocator   = _msgFactory->GetAllocator( frameId );
+        bool    retry       = true;
+
+        for (uint i = 0; retry & (i < _maxAttemptsToReceive); ++i)
+        {
+                    retry       = false;
+            auto    [err, recv] = socket.Receive( OUT storage.Ptr( received ), storage.Size() - received );
+
+            BEGIN_ENUM_CHECKS();
+            switch ( err )
+            {
+                case_likely SocketReceiveError::Received :
+                {
+                    ASSERT( recv > 0 );
+                    received += recv;
+
+                    DEBUG_ONLY( _ValidateMsgStream( storage.Ptr(decoded), received ));
+
+                    for (; sizeof(_MsgHeader) <= (received - decoded);)
+                    {
+                        ASSERT( received >= decoded );
+
+                        _MsgHeader  header; MemCopy( OUT &header, storage.Ptr( decoded ), Sizeof(header) );
+
+                        if_unlikely( (Bytes{header.size} + sizeof(header)) > (received - decoded) )
+                        {
+                            ASSERT( (received - decoded) < Sizeof(header)   or
+                                    Bytes{header.size} <= _maxMsgSize       or
+                                    header.magic == _magicByte );
+
+                            retry = true;
+                            break;  // not enough data
+                        }
+
+                        DataDecoder     des{ storage.Ptr( decoded + sizeof(header) ), header.size, allocator };
+
+                        ASSERT( Bytes{header.size} <= _maxMsgSize );
+                        ASSERT( header.magic == _magicByte );
+
+                        decoded += sizeof(header) + header.size;
+
+                        if_unlikely( header.magic != _magicByte )
+                            continue;  // invalid header - skip
+
+                        // cache optimization:
+                        // allocate chunk before allocating the message.
+                        auto&   dst = _received.queue( CSMessage::UnpackGroupID( header.msgId ));
+
+                        if_unlikely( dst.last.empty() )
+                        {
+                            dst.last = dst.first.AddChunk( allocator, NetConfig::MsgPerChunk );
+                            if_unlikely( dst.last.empty() )
+                                break;  // out of memory
+                        }
+
+                        if_unlikely( dst.last->IsFull() )
+                        {
+                            dst.last = dst.last.AddChunk( allocator, NetConfig::MsgPerChunk );
+                            if_unlikely( dst.last.empty() )
+                                break;  // out of memory
+                        }
+
+                        // create & decode message
+                        CSMessagePtr    msg;
+                        if_likely( _msgFactory->DeserializeMsg( frameId, header.msgId, clientId, OUT msg, des ))
+                        {
+                            ASSERT( des.IsComplete() );
+                            dst.last->emplace_back( msg );
+                        }
+                        else
+                        {
+                            // TODO:
+                            //  out of memory - try again in next frame
+                            //  data corruption - skip
+
+                            //_OnDecodingError( header.msgId );
+                            break;
+                        }
+                    }
+
+                    // free space for large data
+                    if ( decoded > 0 )
+                    {
+                        ASSERT( received >= decoded );
+                        if ( received != decoded )
+                        {
+                            MemMove( OUT storage.Ptr(), storage.Ptr( decoded ), received - decoded );   // TODO: optimize
+                            DEBUG_ONLY( _ValidateMsgStream( storage.Ptr(), received - decoded ));
+                        }
+                        received    -= decoded;
+                        decoded     = 0_b;
+                        retry       = true;
+                    }
+                    break;
+                }
+
+                case SocketReceiveError::NotReceived :
+                case SocketReceiveError::ResourceTemporarilyUnavailable :
+                    break; // skip
+
+                case SocketReceiveError::_Error :
+                    // unused
+
+                case SocketReceiveError::ConnectionResetByPeer :
+                case SocketReceiveError::ConnectionRefused :
+                case SocketReceiveError::NotConnected :
+                case SocketReceiveError::NoSocket :
+                case SocketReceiveError::UnknownError :
+                default :
+                    isDisconnected = true;
+                    break;
+            }
+            END_ENUM_CHECKS();
+        }
+
+        CHECK_MSG( decoded == 0, "Received data is not complete" );
+        _received.received = received;
+    }
+
+/*
+=================================================
+    _OnEncodingError / _OnDecodingError
+=================================================
+*/
+    inline void  TcpChannel::_OnEncodingError (CSMessagePtr) C_NE___
+    {
+        AE_LOG_DBG( "OnEncodingError" );
+    }
+
+    inline void  TcpChannel::_OnDecodingError (CSMessageUID) C_NE___
+    {
+        AE_LOG_DBG( "OnDecodingError" );
+    }
+
+/*
+=================================================
+    Send
+=================================================
+*/
+    void  TcpChannel::Send (MsgList_t msgList) __NE___
+    {
+        if_unlikely( _toSend.queue.empty() )
+            _toSend.queue = msgList;
+
+        _toSend.queueLast.Append( msgList );
+        _toSend.queueLast.MoveToLast();
+    }
+
+/*
+=================================================
+    _ValidateMsgStream
+=================================================
+*/
+    void  TcpChannel::_ValidateMsgStream (const void *ptr, Bytes size) __NE___
+    {
+        Bytes   offset;
+
+        for (;;)
+        {
+            _MsgHeader  header;
+
+            if ( offset + Sizeof(header) > size )
+                break;
+
+            MemCopy( OUT &header, ptr + offset, Sizeof(header) );
+
+            ASSERT( header.magic == _magicByte );
+            ASSERT( header.size <= _maxMsgSize );
+
+            if ( offset + Sizeof(header) + header.size > size )
+                break;
+
+            offset += Sizeof(header) + header.size;
+        }
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    ProcessMessages
+=================================================
+*/
+    void  TcpClientChannel::ProcessMessages (FrameUID frameId) __NE___
+    {
+        BEGIN_ENUM_CHECKS();
+        switch ( _status )
+        {
+            case_likely EStatus::Connected :
+                _ProcessMessages( frameId );
+                break;
+
+            // TODO: custom timeout
+            case EStatus::Connecting :
+            {
+                switch ( _socket.ConnectionStatus() )
+                {
+                    case TcpSocket::EStatus::Connected :
+                        AE_LOGI( "Connected client to TCP server: "s << _serverAddress.ToString() );
+                        _status = EStatus::Connected;
+                        break;
+
+                    case TcpSocket::EStatus::Connecting :
+                        break;
+
+                    case TcpSocket::EStatus::Failed :
+                    case TcpSocket::EStatus::NoSocket :
+                    default :
+                        _status = EStatus::Failed;
+                        break;
+                }
+                break;
+            }
+
+            case EStatus::Failed :
+                ++_serverIndex;
+
+            case EStatus::Disconnected :
+            default :
+                AE_LOGI( "Client disconnected, try to reconnect or try another server..." );
+                _Reconnect();
+                break;
+        }
+        END_ENUM_CHECKS();
+    }
+
+    void  TcpClientChannel::_ProcessMessages (FrameUID frameId) __NE___
+    {
+        _received.ResetQueue();
+
+        bool    disconnected = false;
+
+        _ReceiveMessages( _socket, frameId, Default, INOUT disconnected );
+        _SendMessages( _socket, INOUT disconnected );
+
+        _toSend.ResetQueue();
+
+        if ( disconnected )
+        {
+            AE_LOGI( "Client disconnected, try to reconnect or try another server..." );
+            _Reconnect();
+        }
+    }
+
+/*
+=================================================
+    _Reconnect
+=================================================
+*/
+    void  TcpClientChannel::_Reconnect () __NE___
+    {
+        _socket.Close();
+
+        _status             = EStatus::Disconnected;
+        _toSend.encoded     = 0_b;
+        _received.received  = 0_b;
+
+        _serverProvider->GetAddress( c_ChannelType, _serverIndex, True{"TCP"}, OUT _serverAddress );
+
+        if ( _socket.AsyncConnect( _serverAddress ))
+        {
+            AE_LOGI( "Try connecting client to TCP server: "s << _serverAddress.ToString() );
+            _status = EStatus::Connecting;
+        }
+        else
+        {
+            AE_LOGI( "Invalid server address: "s << _serverAddress.ToString() );
+            ++_serverIndex;
+        }
+    }
+
+/*
+=================================================
+    ClientAPI::Create
+=================================================
+*/
+    RC<IChannel>  TcpClientChannel::ClientAPI::Create (RC<MessageFactory> mf, RC<IAllocator> alloc, RC<IServerProvider> serverProvider) __NE___
+    {
+        CHECK_ERR( mf );
+        CHECK_ERR( alloc );
+        CHECK_ERR( serverProvider );
+
+        RC<TcpClientChannel>    result{new TcpClientChannel{ RVRef(mf), RVRef(serverProvider), RVRef(alloc) }};
+
+        CHECK_ERR( result->_IsValid() );
+
+        DEBUG_ONLY( result->_socket.SetDebugName( "TCP client" );)
+
+        result->_Reconnect();
+
+        return result;
+    }
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    TcpClientChannel::TcpClientChannel (RC<MessageFactory>  mf,
+                                        RC<IServerProvider> serverProvider,
+                                        RC<IAllocator>      alloc) __NE___ :
+        TcpChannel{ RVRef(mf), RVRef(alloc) },
+        _serverProvider{ RVRef(serverProvider) }
+    {}
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    TcpClientChannel::~TcpClientChannel () __NE___
+    {}
+
+/*
+=================================================
+    _IsValid
+=================================================
+*/
+    bool  TcpClientChannel::_IsValid () C_NE___
+    {
+        return  TcpChannel::_IsValid()  and
+                _serverProvider;
+    }
+
+/*
+=================================================
+    IsConnected
+=================================================
+*/
+    bool  TcpClientChannel::IsConnected () C_NE___
+    {
+        return _socket.IsOpen();
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    ProcessMessages
+=================================================
+*/
+    void  TcpServerChannel::ProcessMessages (const FrameUID frameId) __NE___
+    {
+        if_unlikely( not _socket.IsOpen() )
+            return;
+
+        _received.ResetQueue();
+
+        for (uint i = 0; i < _maxClients; ++i)
+        {
+            IpAddress   addr;
+            TcpSocket   client;
+
+            if_likely( not client.Accept( _socket, OUT addr ))
+                break;
+
+            if ( auto client_id = _listener->OnClientConnected( c_ChannelType, addr );  client_id != Default )
+            {
+                const int   idx = BitScanForward( ~_poolBits.to_ullong() );
+
+                if_unlikely( idx < 0 or idx >= int(_maxClients) )
+                {
+                    _listener->OnClientDisconnected( c_ChannelType, client_id );
+                    break;
+                }
+
+                // save client
+                _poolBits.set( idx );
+
+                auto&   dst = _clientPool[idx];
+                dst.id      = client_id;
+                Reconstruct( OUT dst.socket, RVRef(client) );
+
+                dst.socket.KeepAlive();
+
+                CHECK( _clientAddrMap.insert_or_assign( addr, ClientIdx_t(idx) ).first );
+
+                ASSERT( _uniqueClientId.insert( client_id ).second );
+                ASSERT( _uniqueClientId.size() == _clientAddrMap.size() );
+            }
+        }
+
+        for (uint idx : BitIndexIterate( _poolBits ))
+        {
+            auto&   client          = _clientPool[idx];
+            void*   storage         = _tempStorage.Ptr( idx * _maxMsgSize );
+            bool    disconnected    = false;
+
+            // receive message from client
+            {
+                // restore data which is not yet decoded
+                if ( client.received > 0 )
+                {
+                    MemCopy( OUT _received.storage.Ptr(), storage, client.received );
+                    _received.received  = client.received;
+                    client.received     = 0_b;
+                }
+
+                _ReceiveMessages( client.socket, frameId, client.id, INOUT disconnected );
+
+                // Too much data, disconnect client to avoid message stream corruption.
+                if_unlikely( _received.received > _maxMsgSize )
+                {
+                    AE_LOG_DBG( "input message stream overflow, client will be disconnected" );
+                    disconnected = true;
+                }else
+
+                // Save data which can not be decoded, must be less than single message size.
+                if_unlikely( _received.received > 0 )
+                {
+                    MemCopy( OUT storage, _received.storage.Ptr(), _received.received );
+
+                    client.received     = _received.received;
+                    _received.received  = 0_b;
+                }
+            }
+
+            // send messages to client
+            if_likely( not disconnected )
+            {
+                _toSend.encoded = 0_b;
+
+                _SendMessages( client.socket, INOUT disconnected );
+
+                if_unlikely( _toSend.encoded > 0 )
+                {
+                    AE_LOG_DBG( "output message stream overflow, client will be disconnected" );
+                    disconnected = true;
+                }
+            }
+
+            if_unlikely( disconnected )
+                _Disconnect( idx );
+        }
+
+        _toSend.ResetQueue();
+    }
+
+/*
+=================================================
+    ServerAPI::Create
+=================================================
+*/
+    RC<IChannel>  TcpServerChannel::ServerAPI::Create (RC<MessageFactory> mf, RC<IAllocator> alloc,
+                                                       RC<IClientListener> listener,
+                                                       ushort port, uint maxConnections) __NE___
+    {
+        CHECK_ERR( mf );
+        CHECK_ERR( alloc );
+        CHECK_ERR( listener );
+
+        RC<TcpServerChannel>    result  {new TcpServerChannel{ RVRef(mf), RVRef(listener), RVRef(alloc) }};
+        TcpSocket::Config       cfg;    cfg.maxConnections = maxConnections;
+
+        CHECK_ERR( result->_IsValid() );
+
+        DEBUG_ONLY( result->_socket.SetDebugName( "TCP server" );)
+        CHECK_ERR( result->_socket.Listen( IpAddress::FromLocalPortTCP(port), cfg ));
+
+        AE_LOGI( "Started TCP server on port: "s << ToString(port) );
+        return result;
+    }
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    TcpServerChannel::TcpServerChannel (RC<MessageFactory>  mf,
+                                        RC<IClientListener> listener,
+                                        RC<IAllocator>      alloc) __NE___ :
+        TcpChannel{ RVRef(mf), RVRef(alloc) },
+        _listener{ RVRef(listener) }
+    {
+        _tempStorage.Alloc( _maxMsgSize * _maxClients, DefaultAllocatorAlign, _allocator.get() );
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    TcpServerChannel::~TcpServerChannel () __NE___
+    {
+        _tempStorage.Dealloc( _allocator.get() );
+    }
+
+/*
+=================================================
+    _IsValid
+=================================================
+*/
+    bool  TcpServerChannel::_IsValid () C_NE___
+    {
+        return  TcpChannel::_IsValid()  and
+                _tempStorage            and
+                _listener;
+    }
+
+/*
+=================================================
+    DisconnectClient
+=================================================
+*/
+    bool  TcpServerChannel::DisconnectClient (EClientLocalID id) __NE___
+    {
+        for (uint idx : BitIndexIterate( _poolBits ))
+        {
+            if_unlikely( _clientPool[idx].id == id )
+            {
+                _Disconnect( idx );
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void  TcpServerChannel::_Disconnect (const uint idx) __NE___
+    {
+        auto&       client  = _clientPool[idx];
+        const auto  id      = client.id;
+
+        client.id       = Default;
+        client.received = 0_b;
+        client.socket.Close();
+
+        _poolBits.reset( idx );
+
+        for (ubyte i : _clientAddrMap.GetValueArray())
+        {
+            if ( i == idx )
+            {
+                auto    it = _clientAddrMap.begin() + i;
+                ASSERT( it->second == idx );
+
+                _clientAddrMap.EraseByIter( it );
+                break;
+            }
+        }
+
+        ASSERT( _uniqueClientId.erase( id ));
+        _listener->OnClientDisconnected( c_ChannelType, id );
+
+        AE_LOG_DBG( "client ("s << ToString<16>(uint(id)) << ") disconnected" );
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/TcpChannel.h b/AE/engine/src/networking/HighLevel/TcpChannel.h
new file mode 100644
index 00000000..1175cc42
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/TcpChannel.h
@@ -0,0 +1,215 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe: no
+
+    Input:
+        - Receive data and accumulate it in data stream ('_input.storage').
+        - Try to extract message from data stream and add it to message queue ('_input.queue').
+        - User can access the message queue by calling 'Receive()'.
+
+    Output:
+        - Add messages to queue ('_output.queue').
+        - Send messages to server/client.
+        - Recycle memory which is allocated for messages and start new frame.
+*/
+
+#pragma once
+
+#include "networking/HighLevel/IChannel.h"
+#include "networking/LowLevel/TcpSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // TCP Reliable Ordered Channel
+    //
+
+    class TcpChannel : public IChannel
+    {
+    // types
+    protected:
+        static constexpr Bytes      _maxMsgSize             = NetConfig::TCP_MaxMsgSize;
+    private:
+        static constexpr ushort     _magicByte              = 0xAE23;
+        static constexpr uint       _maxAttemptsToReceive   = 4;
+        static constexpr uint       _maxAttemptsToSend      = 8;
+
+        struct _MsgHeader;
+
+        struct SendQueue
+        {
+            MsgList_t               queue;
+            MsgList_t               queueLast;
+            DynUntypedStorage       storage;
+            Bytes                   encoded;
+
+            void  ResetQueue () __NE___;
+        };
+
+        struct ReceiveQueue
+        {
+            MsgQueueMap_t           queue;
+            DynUntypedStorage       storage;
+            Bytes                   received;
+
+            void  ResetQueue () __NE___;
+        };
+
+
+    // variables
+    protected:
+        TcpSocket               _socket;
+        RC<MessageFactory>      _msgFactory;
+
+        SendQueue               _toSend;
+        ReceiveQueue            _received;
+
+        RC<IAllocator>          _allocator;
+
+
+    // methods
+    public:
+        ~TcpChannel ()                                                          __NE_OV;
+
+      // IChannel //
+        void            Send (MsgList_t)                                        __NE_OV;
+        MsgQueueMap_t&  Receive ()                                              __NE_OV { return _received.queue; }
+
+
+    protected:
+        TcpChannel (RC<MessageFactory>  mf,
+                    RC<IAllocator>      alloc)                                  __NE___;
+
+        void  _SendMessages (TcpSocket &, bool &)                               __NE___;
+        void  _ReceiveMessages (TcpSocket &, FrameUID, EClientLocalID, bool &)  __NE___;
+
+        void  _OnEncodingError (CSMessagePtr)                                   C_NE___;
+        void  _OnDecodingError (CSMessageUID)                                   C_NE___;
+
+        ND_ bool  _IsValid ()                                                   C_NE___;
+
+        static void  _ValidateMsgStream (const void *ptr, Bytes size)           __NE___;
+    };
+
+
+
+    //
+    // TCP Client Channel
+    //
+
+    class TcpClientChannel final : public TcpChannel
+    {
+    // types
+    public:
+        class ClientAPI
+        {
+            friend class BaseClient;
+            ND_ static RC<IChannel>  Create (RC<MessageFactory> mf, RC<IAllocator>, RC<IServerProvider>) __NE___;
+        };
+
+    private:
+        enum class EStatus : uint
+        {
+            Disconnected,
+            Connecting,
+            Connected,
+            Failed,
+        };
+
+
+    // variables
+    private:
+        EStatus                 _status             = EStatus::Disconnected;
+        uint                    _serverIndex        = 0;
+        IpAddress               _serverAddress;
+        RC<IServerProvider>     _serverProvider;
+
+
+    // methods
+    public:
+        ~TcpClientChannel ()                                    __NE_OV;
+
+      // IChannel //
+        void  ProcessMessages (FrameUID)                        __NE_OV;
+        bool  DisconnectClient (EClientLocalID)                 __NE_OV { return false; }
+        bool  IsConnected ()                                    C_NE_OV;
+
+    private:
+        TcpClientChannel (RC<MessageFactory>    mf,
+                          RC<IServerProvider>   serverProvider,
+                          RC<IAllocator>        alloc)          __NE___;
+        void  _Reconnect ()                                     __NE___;
+        void  _ProcessMessages (FrameUID)                       __NE___;
+
+        ND_ bool  _IsValid ()                                   C_NE___;
+    };
+
+
+
+    //
+    // TCP Server Channel
+    //
+
+    class TcpServerChannel final : public TcpChannel
+    {
+    // types
+    public:
+        class ServerAPI
+        {
+            friend class BaseServer;
+            ND_ static RC<IChannel>  Create (RC<MessageFactory> mf, RC<IAllocator>, RC<IClientListener>,
+                                             ushort port, uint maxConnections) __NE___;
+        };
+
+    private:
+        static constexpr uint   _maxClients = 16;
+
+        struct Client
+        {
+            EClientLocalID      id;
+            Byte16u             received;
+            TcpSocket           socket;
+        };
+
+        using ClientIdx_t       = ubyte;
+        using ClientPool_t      = StaticArray< Client, _maxClients >;
+        using ClientPoolBits_t  = BitSet< _maxClients >;
+        using ClientAddrMap_t   = FixedMap< IpAddress, ClientIdx_t, _maxClients >;
+        using UniqueClientId_t  = FixedSet< EClientLocalID, _maxClients >;
+
+
+    // variables
+    private:
+        ClientPool_t            _clientPool;
+        ClientPoolBits_t        _poolBits;
+
+        ClientAddrMap_t         _clientAddrMap;
+        DynUntypedStorage       _tempStorage;       // size: '_maxMsgSize * _maxClients'
+
+        RC<IClientListener>     _listener;
+
+        DEBUG_ONLY(
+            UniqueClientId_t    _uniqueClientId;)
+
+
+    // methods
+    public:
+        ~TcpServerChannel ()                                    __NE_OV;
+
+      // IChannel //
+        void  ProcessMessages (FrameUID)                        __NE_OV;
+        bool  DisconnectClient (EClientLocalID)                 __NE_OV;
+        bool  IsConnected ()                                    C_NE_OV { return true; }
+
+    private:
+        TcpServerChannel (RC<MessageFactory>    mf,
+                          RC<IClientListener>   listener,
+                          RC<IAllocator>        alloc)          __NE___;
+
+        ND_ bool  _IsValid ()                                   C_NE___;
+            void  _Disconnect (uint idx)                        __NE___;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/UdpReliable.h b/AE/engine/src/networking/HighLevel/UdpReliable.h
new file mode 100644
index 00000000..250d08c8
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/UdpReliable.h
@@ -0,0 +1,20 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/HighLevel/IChannel.h"
+#include "networking/LowLevel/UdpSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // UDP Reliable Channel
+    //
+
+    class UdpReliable final : public IChannel
+    {
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/UdpUnreliable.cpp b/AE/engine/src/networking/HighLevel/UdpUnreliable.cpp
new file mode 100644
index 00000000..3f5afe52
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/UdpUnreliable.cpp
@@ -0,0 +1,357 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/HighLevel/UdpUnreliable.h"
+#include "networking/HighLevel/Client.h"
+#include "networking/HighLevel/Server.h"
+
+namespace AE::Networking
+{
+namespace {
+    static constexpr auto   c_ChannelType = EChannel::Unreliable;
+}
+
+/*
+=================================================
+    _PacketHeader
+=================================================
+*/
+    struct UdpUnreliable::_PacketHeader
+    {
+        ushort          magic       = 0;
+        ushort          packetId    = 0;
+    };
+
+/*
+=================================================
+    _MsgHeader
+=================================================
+*/
+    struct UdpUnreliable::_MsgHeader
+    {
+        ushort          magic   = 0;
+        Byte16u         size;
+        CSMessageUID    msgId   = CSMessageUID(0);
+    };
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    UdpUnreliable::UdpUnreliable (RC<MessageFactory> mf, RC<IAllocator> alloc) __NE___ :
+        _msgFactory{ RVRef(mf) },
+        _allocator{ RVRef(alloc) }
+    {
+        //_input .storage.Alloc( NetConfig::ChannelStorageSize, DefaultAllocatorAlign, _allocator.get() );
+        //_output.storage.Alloc( NetConfig::ChannelStorageSize, DefaultAllocatorAlign, _allocator.get() );
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    UdpUnreliable::~UdpUnreliable () __NE___
+    {
+        //_input .storage.Dealloc( _allocator.get() );
+        //_output.storage.Dealloc( _allocator.get() );
+    }
+
+/*
+=================================================
+    _SendMessages
+=================================================
+*/
+    template <typename Address>
+    void  UdpUnreliable::_SendMessages (const Address &addr, QueueAndStorage &qs, INOUT bool &isDisconnected) C_NE___
+    {
+        if_unlikely( qs.queue.empty() )
+            return;
+
+        Bytes       encoded;        // offset in 'qs.storage' to the end of encoded messages
+        Bytes       pending;        // offset in 'qs.storage' to begin of data which can be sent
+        auto        last_failed_it  = qs.queue.end();
+
+        const auto  SendData        = [this, &addr, &qs, &encoded, &pending, &isDisconnected] ()
+        {{
+            for (bool retry = true; retry & (encoded - pending > 0);)
+            {
+                ASSERT( encoded > pending );
+
+                        retry       = false;
+                auto    [err, sent] = _socket.Send( addr, qs.storage.Ptr( pending ), encoded - pending );
+
+                switch ( err )
+                {
+                    case_likely SocketSendError::Sent :
+                    {
+                        AE_LOGI( "Sent "s << ToString(sent) );
+                        ASSERT( sent > 0 );
+                        pending += sent;
+                        //retry = pending < encoded;    // TODO ?
+                        break;
+                    }
+
+                    case SocketSendError::NotSent :
+                    case SocketSendError::ResourceTemporarilyUnavailable :
+                        break; // skip
+
+                    case SocketSendError::NoSocket :
+                    case SocketSendError::NotConnected :
+                    case SocketSendError::ConnectionResetByPeer :
+                    case SocketSendError::UnknownError :
+                        isDisconnected = true;
+                        break;
+                }
+            }
+            encoded -= pending;
+            pending  = 0_b;
+        }};
+
+        for (auto it = qs.queue.begin(); (it != qs.queue.end()) & (not isDisconnected);)
+        {
+            if_unlikely( encoded + sizeof(_MsgHeader) >= qs.storage.Size() )
+                SendData();
+
+            auto*           hdr_ptr     = qs.storage.Ptr( encoded );
+            const Bytes     msg_off     = encoded + sizeof(_MsgHeader);
+            DataEncoder     enc         { qs.storage.Ptr( msg_off ), qs.storage.Size() - msg_off };
+            auto            err         = (*it)->Serialize( enc );
+
+            BEGIN_ENUM_CHECKS();
+            switch ( err )
+            {
+                case_likely CSMessage::EncodeError::OK :
+                {
+                    encoded = qs.storage.Size() - enc.RemainingSize();
+
+                    _MsgHeader  header;
+                    header.magic = _magic;
+                    header.msgId = (*it)->UniqueId();
+                    header.size  = encoded - msg_off;
+
+                    MemCopy( OUT hdr_ptr, &header, Sizeof(header) );
+                    ++it;
+                    break;
+                }
+
+                // skip message
+                case CSMessage::EncodeError::Failed :
+                    _OnEncodingError( *it );
+                    ++it;
+                    break;
+
+                // send and try again
+                case CSMessage::EncodeError::NoMemory :
+                {
+                    // skip on second try
+                    if ( last_failed_it == it )
+                    {
+                        _OnEncodingError( *it );
+                        ++it;
+                        break;
+                    }
+
+                    SendData();
+                    Reconstruct( INOUT enc, qs.storage.Ptr(), qs.storage.Size() );
+
+                    last_failed_it = it;
+                    break;
+                }
+            }
+            END_ENUM_CHECKS();
+        }
+
+        SendData();
+        ASSERT( isDisconnected or encoded == pending );
+    }
+
+/*
+=================================================
+    _ReceiveMessages
+=================================================
+*
+    template <typename Address>
+    void  UdpUnreliable::_ReceiveMessages (const Address &addr, QueueAndStorage &qs, const FrameUID frameId, INOUT bool &isDisconnected) C_NE___
+    {
+    }
+
+/*
+=================================================
+    _OnEncodingError / _OnDecodingError
+=================================================
+*/
+    inline void  UdpUnreliable::_OnEncodingError (CSMessagePtr) C_NE___
+    {
+        // TODO ?
+    }
+
+    inline void  UdpUnreliable::_OnDecodingError (CSMessageUID) C_NE___
+    {
+        // TODO ?
+    }
+
+/*
+=================================================
+    Send
+=================================================
+*/
+    void  UdpUnreliable::Send (MsgList_t msgList) __NE___
+    {
+        //_output.queue.insert( _output.queue.end(), msgs.begin(), msgs.end() );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    ProcessMessages
+=================================================
+*/
+    void  UdpUnreliableClientChannel::ProcessMessages (const FrameUID frameId) __NE___
+    {
+        if_unlikely( not _socket.IsOpen() )
+            return;
+
+    //  _input.queue.clear();
+
+        bool    disconnected = false;
+    //  _ReceiveMessages( _serverAddress, _input, frameId, INOUT disconnected );
+        _SendMessages( _serverAddress, _output, INOUT disconnected );
+
+        _output.queue.clear();
+
+        if ( disconnected )
+            _Reconnect();
+    }
+
+/*
+=================================================
+    _Reconnect
+=================================================
+*/
+    void  UdpUnreliableClientChannel::_Reconnect () __NE___
+    {
+        _serverProvider->GetAddress( c_ChannelType, _serverIndex, False{"UDP"}, OUT _serverAddress );
+
+        ++_serverIndex;
+    }
+
+/*
+=================================================
+    ClientAPI::Create
+=================================================
+*/
+    RC<IChannel>  UdpUnreliableClientChannel::ClientAPI::Create (RC<MessageFactory> mf, RC<IAllocator> alloc,
+                                                                 RC<IServerProvider> serverProvider, ushort port) __NE___
+    {
+        CHECK_ERR( mf );
+        CHECK_ERR( alloc );
+        CHECK_ERR( serverProvider );
+
+        RC<UdpUnreliableClientChannel>  result {new UdpUnreliableClientChannel{ RVRef(mf), RVRef(serverProvider), RVRef(alloc) }};
+
+        DEBUG_ONLY( result->_socket.SetDebugName( "UDP client" );)
+        CHECK_ERR( result->_socket.Open( IpAddress::FromLocalPortUDP(port) ));
+
+        AE_LOGI( "Started UDP client on port: "s << ToString(port) );
+        return result;
+    }
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    UdpUnreliableClientChannel::UdpUnreliableClientChannel (RC<MessageFactory>  mf,
+                                                            RC<IServerProvider> serverProvider,
+                                                            RC<IAllocator>      alloc) __NE___ :
+        UdpUnreliable{ RVRef(mf), RVRef(alloc) },
+        _serverProvider{ RVRef(serverProvider) }
+    {}
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    UdpUnreliableClientChannel::~UdpUnreliableClientChannel ()__NE___
+    {}
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    ProcessMessages
+=================================================
+*/
+    void  UdpUnreliableServerChannel::ProcessMessages (const FrameUID frameId) __NE___
+    {
+        if_unlikely( not _socket.IsOpen() )
+            return;
+
+    //  _input.queue.clear();
+
+    //  _ReceiveMessages( _input, frameId, INOUT disconnected );
+
+    //  for (auto it = _clients.begin(); it != _clients.end();)
+    //  {
+    //      bool    disconnected = false;
+    //      _SendMessages( it->first, _output, INOUT disconnected );
+    //
+    //      if_likely( not disconnected ){
+    //          ++it;
+    //      }else{
+    //          _listener->OnClientDisconnected( _channelId, it->first );
+    //          it = _clients.EraseByIter( it );
+    //      }
+    //  }
+
+        _output.queue.clear();
+    }
+
+/*
+=================================================
+    ServerAPI::Create
+=================================================
+*/
+    RC<IChannel>  UdpUnreliableServerChannel::ServerAPI::Create (RC<MessageFactory> mf, RC<IAllocator> alloc,
+                                                                 RC<IClientListener> listener, ushort port) __NE___
+    {
+        CHECK_ERR( mf );
+        CHECK_ERR( alloc );
+        CHECK_ERR( listener );
+
+        RC<UdpUnreliableServerChannel>  result{ new UdpUnreliableServerChannel{ RVRef(mf), RVRef(listener), RVRef(alloc) }};
+
+        DEBUG_ONLY( result->_socket.SetDebugName( "UDP server" );)
+        CHECK_ERR( result->_socket.Open( IpAddress::FromLocalPortUDP(port) ));
+
+        AE_LOGI( "Started UDP server on port: "s << ToString(port) );
+        return result;
+    }
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    UdpUnreliableServerChannel::UdpUnreliableServerChannel (RC<MessageFactory>  mf,
+                                                            RC<IClientListener> listener,
+                                                            RC<IAllocator>      alloc) __NE___ :
+        UdpUnreliable{ RVRef(mf), RVRef(alloc) },
+        _listener{ RVRef(listener) }
+    {}
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    UdpUnreliableServerChannel::~UdpUnreliableServerChannel () __NE___
+    {}
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/HighLevel/UdpUnreliable.h b/AE/engine/src/networking/HighLevel/UdpUnreliable.h
new file mode 100644
index 00000000..8426a286
--- /dev/null
+++ b/AE/engine/src/networking/HighLevel/UdpUnreliable.h
@@ -0,0 +1,163 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    thread-safe: no
+*/
+
+#pragma once
+
+#include "networking/HighLevel/IChannel.h"
+#include "networking/LowLevel/UdpDbgSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // UDP Unreliable Unordered Channel
+    //
+
+    class UdpUnreliable : public IChannel
+    {
+    // types
+    protected:
+        #if 0 //def AE_DEBUG
+        using Socket_t  = UdpDbgSocket;
+        #else
+        using Socket_t  = UdpSocket;
+        #endif
+
+        static constexpr ushort     _magic          = 0;    // TODO
+        static constexpr Bytes      _maxPacketSize  {508};
+
+        struct _PacketHeader;
+        struct _MsgHeader;
+
+        struct QueueAndStorage
+        {
+            Array< CSMessagePtr >   queue;
+            DynUntypedStorage       storage;
+        };
+
+
+    // variables
+    protected:
+        Socket_t                _socket;
+        RC<MessageFactory>      _msgFactory;
+
+        QueueAndStorage         _output;
+        Array< CSMessagePtr >   _inputQueue;
+
+        RC<IAllocator>          _allocator;
+
+
+    // methods
+    public:
+        ~UdpUnreliable ()                                               __NE_OV;
+
+      // IChannel //
+        void            Send (MsgList_t)                                __NE_OV;
+        MsgQueueMap_t&  Receive ()                                      __NE_OV { return *Cast<MsgQueueMap_t>(null); }
+
+        bool  DisconnectClient (EClientLocalID)                         __NE_OV { return false; }
+        bool  IsConnected ()                                            C_NE_OV { return false; }
+
+
+    protected:
+        UdpUnreliable (RC<MessageFactory>   mf,
+                       RC<IAllocator>       alloc)                      __NE___;
+
+        template <typename Address>
+        void  _SendMessages (const Address &, QueueAndStorage &, bool &)C_NE___;
+
+    //  void  _ReceiveMessages (QueueAndStorage &, FrameUID, bool &)    C_NE___;
+
+        void  _OnEncodingError (CSMessagePtr)                           C_NE___;
+        void  _OnDecodingError (CSMessageUID)                           C_NE___;
+    };
+
+
+
+    //
+    // UDP Client Channel
+    //
+
+    class UdpUnreliableClientChannel final : public UdpUnreliable
+    {
+    // types
+    public:
+        class ClientAPI
+        {
+            friend class BaseClient;
+            ND_ static RC<IChannel>  Create (RC<MessageFactory> mf, RC<IAllocator>,
+                                             RC<IServerProvider>, ushort port) __NE___;
+        };
+
+
+    // variables
+    private:
+        IpAddress               _serverAddress;
+        uint                    _serverIndex        = 0;
+        RC<IServerProvider>     _serverProvider;
+
+
+    // methods
+    public:
+        ~UdpUnreliableClientChannel ()                                  __NE_OV;
+
+      // IChannel //
+        void  ProcessMessages (FrameUID)                                __NE_OV;
+
+    private:
+        UdpUnreliableClientChannel (RC<MessageFactory>  mf,
+                                    RC<IServerProvider> serverProvider,
+                                    RC<IAllocator>      alloc)          __NE___;
+        void  _Reconnect ()                                             __NE___;
+    };
+
+
+
+    //
+    // UDP Server Channel
+    //
+
+    class UdpUnreliableServerChannel final : public UdpUnreliable
+    {
+    // types
+    public:
+        class ServerAPI
+        {
+            friend class BaseServer;
+            ND_ static RC<IChannel>  Create (RC<MessageFactory> mf, RC<IAllocator>,
+                                             RC<IClientListener>, ushort port) __NE___;
+        };
+
+    private:
+        static constexpr uint   _maxClients = 64;
+
+        struct Client
+        {
+            DynUntypedStorage       storage;
+        };
+        using Clients_t = FixedMap< IpAddress, Client, _maxClients >;
+
+
+    // variables
+    private:
+    //  Clients_t               _clients;
+        RC<IClientListener>     _listener;
+
+
+    // methods
+    public:
+        ~UdpUnreliableServerChannel ()                                  __NE_OV;
+
+      // IChannel //
+        void  ProcessMessages (FrameUID)                                __NE_OV;
+
+    private:
+        UdpUnreliableServerChannel (RC<MessageFactory>  mf,
+                                    RC<IClientListener> listener,
+                                    RC<IAllocator>      alloc)          __NE___;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/BaseSocket.cpp b/AE/engine/src/networking/LowLevel/BaseSocket.cpp
similarity index 65%
rename from AE/engine/src/networking/Raw/BaseSocket.cpp
rename to AE/engine/src/networking/LowLevel/BaseSocket.cpp
index 9625f1c0..e3da6aaa 100644
--- a/AE/engine/src/networking/Raw/BaseSocket.cpp
+++ b/AE/engine/src/networking/LowLevel/BaseSocket.cpp
@@ -1,39 +1,33 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "networking/Raw/BaseSocket.h"
-#include "networking/Raw/PlatformSpecific.cpp.h"
+#include "networking/LowLevel/BaseSocket.h"
+#include "networking/LowLevel/PlatformSpecific.cpp.h"
 
 namespace AE::Networking
 {
 
-/*
-=================================================
-    constructor
-=================================================
-*/
-    BaseSocket::BaseSocket () __NE___
-    {
-    #if defined(AE_WINDOWS_SOCKET)
-        STATIC_ASSERT( sizeof(SOCKET) == sizeof(Socket_t) );
-        STATIC_ASSERT( Socket_t(INVALID_SOCKET) == Socket_t::Unknown );
+#if defined(AE_WINDOWS_SOCKET)
+    StaticAssert( sizeof(SOCKET) == sizeof(BaseSocket::Socket_t) );
+    StaticAssert( BaseSocket::Socket_t(INVALID_SOCKET) == BaseSocket::Socket_t::Unknown );
 
-    #elif defined(AE_UNIX_SOCKET)
-        STATIC_ASSERT( sizeof(int) == sizeof(Socket_t) );
-        STATIC_ASSERT( Socket_t(-1) == Socket_t::Unknown );
+#elif defined(AE_UNIX_SOCKET)
+    StaticAssert( sizeof(int) == sizeof(BaseSocket::Socket_t) );
+    StaticAssert( BaseSocket::Socket_t(-1) == BaseSocket::Socket_t::Unknown );
 
-    #else
-        #error Unsupported platform!
-    #endif
-    }
+#else
+#   error Unsupported platform!
+#endif
 
 /*
 =================================================
-    destructor
+    constructor
 =================================================
 */
-    BaseSocket::~BaseSocket () __NE___
+    BaseSocket::BaseSocket (BaseSocket &&other) __NE___ :
+        _handle{ other._handle }
+        DEBUG_ONLY(, _dbgName{ RVRef(_dbgName) })
     {
-        Close();
+        other._handle = Default;
     }
 
 /*
@@ -46,12 +40,14 @@ namespace AE::Networking
         if ( _handle != Default )
         {
             #if defined(AE_WINDOWS_SOCKET)
+                ::shutdown( BitCast<NativeSocket_t>(_handle), SD_BOTH );    // for TCP
                 ::closesocket( BitCast<NativeSocket_t>(_handle) );
 
             #elif defined(AE_PLATFORM_EMSCRIPTEN)
                 ::shutdown( BitCast<NativeSocket_t>(_handle), SHUT_RDWR );
 
             #elif defined(AE_UNIX_SOCKET)
+                ::shutdown( BitCast<NativeSocket_t>(_handle), SHUT_RDWR );  // for TCP
                 ::close( BitCast<NativeSocket_t>(_handle) );
 
             #else
@@ -74,7 +70,7 @@ namespace AE::Networking
         DWORD   non_blocking = 1;
         if_unlikely( ::ioctlsocket( BitCast<NativeSocket_t>(_handle), FIONBIO, &non_blocking ) != 0 )
         {
-            CATCH( PlatformUtils::CheckNetworkError( "Failed to set socket non-blocking mode: ", SourceLoc_Current(), ELogLevel::Info ));
+            NET_CHECK2( "Failed to set socket non-blocking mode: " );
             return false;
         }
 
@@ -82,7 +78,7 @@ namespace AE::Networking
         int     non_blocking = 1;
         if_unlikely( ::fcntl( BitCast<NativeSocket_t>(_handle), F_SETFL, O_NONBLOCK, non_blocking ) < 0 )
         {
-            CATCH( PlatformUtils::CheckNetworkError( "Failed to set socket non-blocking mode: ", SourceLoc_Current(), ELogLevel::Info ));
+            NET_CHECK2( "Failed to set socket non-blocking mode: " );
             return false;
         }
 
@@ -106,7 +102,7 @@ namespace AE::Networking
         // The total per-socket buffer space reserved for sends.
         if_unlikely( ::setsockopt( BitCast<NativeSocket_t>(_handle), SOL_SOCKET, SO_SNDBUF, Cast<NativeSocketOpPtr_t>(&size), sizeof(size) ) != 0 )
         {
-            CATCH( PlatformUtils::CheckNetworkError( "Failed to set socket send buffer size: ", SourceLoc_Current(), ELogLevel::Info ));
+            NET_CHECK2( "Failed to set socket send buffer size: " );
             return false;
         }
         return true;
@@ -126,7 +122,7 @@ namespace AE::Networking
         // Specifies the total per-socket buffer space reserved for receives.
         if_unlikely( ::setsockopt( BitCast<NativeSocket_t>(_handle), SOL_SOCKET, SO_RCVBUF, Cast<NativeSocketOpPtr_t>(&size), sizeof(size) ) != 0 )
         {
-            CATCH( PlatformUtils::CheckNetworkError( "Failed to set socket receive buffer size: ", SourceLoc_Current(), ELogLevel::Info ));
+            NET_CHECK2( "Failed to set socket receive buffer size: " );
             return false;
         }
         return true;
@@ -137,23 +133,36 @@ namespace AE::Networking
     GetAddress
 =================================================
 */
-    bool  BaseSocket::GetAddress (OUT IpAddress &outAddr) C_NE___
+    template <typename NativeAddress, typename AddressType>
+    bool  BaseSocket::_GetAddress (OUT AddressType &outAddr) C_NE___
     {
         CHECK_ERR( IsOpen() );
 
-        sockaddr_in addr;
-        socklen_t   addr_len = sizeof(addr);
+        NativeAddress   addr;
+        socklen_t       addr_len = sizeof(addr);
 
         if_unlikely( ::getsockname( BitCast<NativeSocket_t>(_handle), OUT Cast<sockaddr>(&addr), OUT &addr_len ) != 0 )
         {
-            CATCH( PlatformUtils::CheckNetworkError( "Failed to get socket address: ", SourceLoc_Current(), ELogLevel::Info ));
+            NET_CHECK2( "Failed to get socket address: " );
             return false;
         }
 
-        outAddr = IpAddress{ NetworkToHost(addr.sin_addr.s_addr), NetworkToHost(addr.sin_port) };
+        outAddr = AddressType::FromNative( AnyTypeCRef{ addr });
+        ASSERT( outAddr.IsValid() );
+
         return true;
     }
 
+    bool  BaseSocket::GetAddress (OUT IpAddress &outAddr) C_NE___
+    {
+        return _GetAddress< sockaddr_in >( outAddr );
+    }
+
+    bool  BaseSocket::GetAddress (OUT IpAddress6 &outAddr) C_NE___
+    {
+        return _GetAddress< sockaddr_in6 >( outAddr );
+    }
+
 
 } // AE::Networking
 
diff --git a/AE/engine/src/networking/LowLevel/BaseSocket.h b/AE/engine/src/networking/LowLevel/BaseSocket.h
new file mode 100644
index 00000000..47993c6a
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/BaseSocket.h
@@ -0,0 +1,79 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/LowLevel/IpAddress.h"
+#include "networking/LowLevel/IpAddress6.h"
+#include "networking/LowLevel/SocketError.h"
+
+namespace AE::Networking
+{
+
+    //
+    // Base Socket
+    //
+
+    class BaseSocket
+    {
+    // types
+    public:
+        #ifdef AE_PLATFORM_WINDOWS
+            enum class Socket_t : usize { Unknown = ~usize(0) };
+
+        #elif defined(AE_PLATFORM_UNIX_BASED)
+            enum class Socket_t : int { Unknown = -1 };
+
+        #else
+            #error Unsupported platform!
+        #endif
+
+    protected:
+        struct _Config
+        {
+            Bytes   sendBufferSize;
+            Bytes   receiveBufferSize;
+        };
+
+
+    // variables
+    protected:
+        Socket_t            _handle = Default;
+
+        DEBUG_ONLY( String  _dbgName;)
+
+
+    // methods
+    public:
+        BaseSocket ()                                   __NE___ {}
+        BaseSocket (BaseSocket &&)                      __NE___;
+        ~BaseSocket ()                                  __NE___ { Close(); }
+
+        BaseSocket (const BaseSocket &)                 = delete;
+        BaseSocket&  operator = (const BaseSocket &)    = delete;
+        BaseSocket&  operator = (BaseSocket &&)         = delete;
+
+            void  Close ()                              __NE___;
+
+        ND_ bool  IsOpen ()                             C_NE___ { return _handle != Default; }
+
+            bool  GetAddress (OUT IpAddress  &outAddr)  C_NE___;
+            bool  GetAddress (OUT IpAddress6 &outAddr)  C_NE___;
+
+        ND_ auto  NativeHandle ()                       C_NE___ { return _handle; }
+
+      #ifdef AE_DEBUG
+            void        SetDebugName (String name)      __NE___ { _dbgName = RVRef(name); }
+        ND_ StringView  GetDebugName ()                 C_NE___ { return _dbgName; }
+      #endif
+
+
+    protected:
+        ND_ bool  _SetNonBlocking ()                    __NE___;
+        ND_ bool  _SetSendBufferSize (Bytes size)       __NE___;
+        ND_ bool  _SetReceiveBufferSize (Bytes size)    __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _GetAddress (OUT A &outAddr)          C_NE___;
+    };
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/IpAddress.cpp b/AE/engine/src/networking/LowLevel/IpAddress.cpp
similarity index 53%
rename from AE/engine/src/networking/Raw/IpAddress.cpp
rename to AE/engine/src/networking/LowLevel/IpAddress.cpp
index 6c35100b..1339afdd 100644
--- a/AE/engine/src/networking/Raw/IpAddress.cpp
+++ b/AE/engine/src/networking/LowLevel/IpAddress.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "networking/Raw/IpAddress.h"
-#include "networking/Raw/PlatformSpecific.cpp.h"
+#include "networking/LowLevel/IpAddress.h"
+#include "networking/LowLevel/PlatformSpecific.cpp.h"
 
 namespace AE::Networking
 {
@@ -20,40 +20,61 @@ namespace
 
         addrinfo*   out_info = null;
         {
-            addrinfo    info    = {};
-            info.ai_family      = AF_INET;
-            info.ai_socktype    = isUDP ? SOCK_DGRAM : SOCK_STREAM;
-            info.ai_protocol    = isUDP ? IPPROTO_UDP : IPPROTO_TCP;
+            addrinfo    hints   = {};
+        //  hints.ai_flags      = AI_PASSIVE;
+            hints.ai_family     = AF_INET;
+            hints.ai_socktype   = isUDP ? SOCK_DGRAM : SOCK_STREAM;
+            hints.ai_protocol   = isUDP ? IPPROTO_UDP : IPPROTO_TCP;
 
-            if_unlikely( ::getaddrinfo( hostName, serviceName, &info, OUT &out_info ) != 0 )
+            if_unlikely( ::getaddrinfo( hostName, serviceName, &hints, OUT &out_info ) != 0 )
             {
                 if ( hostName == null )     hostName    = "";
                 if ( serviceName == null )  serviceName = "";
 
-                CATCH( PlatformUtils::CheckNetworkError(
-                            "Failed to get address info for host '"s << hostName << "' and service '" << serviceName << "': ",
-                            SourceLoc_Current(), ELogLevel::Info ));
+                NET_CHECK2( "Failed to get address info for host '"s << hostName << "' and service '" << serviceName << "': " );
                 return false;
             }
         }
 
-        IpAddress   result;
+        bool    result = false;
 
-        if ( out_info != null and out_info->ai_family == AF_INET )
+        for (addrinfo* info = out_info; info != null; info = info->ai_next)
         {
-            const auto* ptr         = Cast<ubyte>( out_info->ai_addr->sa_data );
-            ushort      port        = (ushort(ptr[0]) << 0) | (ushort(ptr[1]) << 16);
-            uint        addr        = (uint(ptr[2]) << 0) | (uint(ptr[3]) << 8) | (uint(ptr[4]) << 16) | (uint(ptr[5]) << 24);
-                        outIpv4Addr = NetworkToHost( addr );
-                        outPort     = NetworkToHost( port );
+            if ( info->ai_family == AF_INET and info->ai_addrlen == sizeof(sockaddr_in) )
+            {
+                auto*   addr_v4 = Cast<sockaddr_in>( info->ai_addr );
+
+                outIpv4Addr = NetworkToHost( addr_v4->sin_addr.s_addr );
+                outPort     = NetworkToHost( addr_v4->sin_port );
+
+                result = true;
+                break;
+            }
         }
 
         if ( out_info != null )
             ::freeaddrinfo( out_info );
 
-        return true;
+        return result;
+    }
+
+} // namespace
+
+
+/*
+=================================================
+    ToNative
+=================================================
+*/
+    void  IpAddress::ToNative (OUT AnyTypeRef outAddr) C_NE___
+    {
+        auto&   addr = outAddr.As< sockaddr_in >();
+
+        addr.sin_family         = AF_INET;
+        addr.sin_port           = HostToNetwork( _port );
+        addr.sin_addr.s_addr    = HostToNetwork( _address );
+        ZeroMem( addr.sin_zero );
     }
-}
 
 /*
 =================================================
@@ -67,6 +88,27 @@ namespace
                 Base::ToString( _port );
     }
 
+/*
+=================================================
+    ToHostName
+=================================================
+*/
+    String  IpAddress::ToHostName (Bool optIsTCP) C_Th___
+    {
+        sockaddr_in addr;
+        ToNative( OUT addr );
+
+        char    host    [NI_MAXHOST];
+        char    service [NI_MAXSERV];
+
+        if_unlikely( ::getnameinfo( Cast<sockaddr>(&addr), sizeof(addr), OUT host, NI_MAXHOST, OUT service, NI_MAXSERV, (optIsTCP ? 0 : NI_DGRAM) ) != 0 )
+            return Default;
+
+        String  str;
+        str << host << ':' << service;
+        return str;
+    }
+
 /*
 =================================================
     FromServiceUDP
@@ -88,10 +130,21 @@ namespace
     {
         IpAddress   result;
         CHECK( GetAddressFromHostAndService( hostName.c_str(), null, True{"UDP"}, OUT result._address, OUT result._port ));
+        ASSERT( result._port == 0 );
         result._port = port;
         return result;
     }
 
+/*
+=================================================
+    FromLocalPortUDP
+=================================================
+*/
+    IpAddress  IpAddress::FromLocalPortUDP (ushort port) __NE___
+    {
+        return FromHostPortUDP( "0.0.0.0", port );
+    }
+
 /*
 =================================================
     FromLocalhostUDP
@@ -99,7 +152,7 @@ namespace
 */
     IpAddress  IpAddress::FromLocalhostUDP (ushort port) __NE___
     {
-        return IpAddress{ 0x7F'00'00'01, port };
+        return FromHostPortUDP( "localhost", port );
     }
 
 /*
@@ -123,10 +176,21 @@ namespace
     {
         IpAddress   result;
         CHECK( GetAddressFromHostAndService( hostName.c_str(), null, False{"TCP"}, OUT result._address, OUT result._port ));
+        ASSERT( result._port == 0 );
         result._port = port;
         return result;
     }
 
+/*
+=================================================
+    FromLocalPortTCP
+=================================================
+*/
+    IpAddress  IpAddress::FromLocalPortTCP (ushort port) __NE___
+    {
+        return FromHostPortTCP( "0.0.0.0", port );
+    }
+
 /*
 =================================================
     FromLocalhostTCP
@@ -137,5 +201,18 @@ namespace
         return FromHostPortTCP( "localhost", port );
     }
 
+/*
+=================================================
+    FromNative
+=================================================
+*/
+    IpAddress  IpAddress::FromNative (AnyTypeCRef inAddr) __NE___
+    {
+        const auto&     addr = inAddr.As< sockaddr_in >();
+        ASSERT( addr.sin_family == AF_INET );
+
+        return IpAddress{ NetworkToHost(addr.sin_addr.s_addr), NetworkToHost(addr.sin_port) };
+    }
+
 
 } // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/IpAddress.h b/AE/engine/src/networking/LowLevel/IpAddress.h
new file mode 100644
index 00000000..a0785551
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/IpAddress.h
@@ -0,0 +1,82 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Address and port in host order.
+    Use HostToNetwork() to convert to network order.
+    Use NetworkToHost() to convert from network order before creating IpAddress object.
+*/
+
+#pragma once
+
+#include "networking/Common.h"
+
+namespace AE::Networking
+{
+    using namespace AE::Base;
+
+
+    //
+    // IPv4 Address
+    //
+
+    class IpAddress
+    {
+    // types
+    private:
+        struct IPv4Bits
+        {
+            uint    p3 : 8;     // ...xxx
+            uint    p2 : 8;     // ..xxx.
+            uint    p1 : 8;     // .xxx..
+            uint    p0 : 8;     // xxx...
+        };
+        StaticAssert( sizeof(IPv4Bits) == 4, "IPv4Bits must have 32 bits" );
+
+
+    // variables
+    private:
+        union {
+            IPv4Bits    _addressBits;
+            uint        _address    = 0;
+        };
+        ushort          _port       = 0;
+
+
+    // methods
+    public:
+        IpAddress ()                                    __NE___ {}
+        IpAddress (uint addr, ushort port)              __NE___ : _address{addr}, _port{port} {}
+
+        ND_ bool    IsValid ()                          C_NE___ { return (_address != 0) | (_port != 0); }
+        ND_ uint    Address ()                          C_NE___ { return _address; }
+        ND_ ushort  Port ()                             C_NE___ { return _port; }
+
+            void    SetPort (ushort value)              __NE___ { _port = value; }
+
+        ND_ bool    operator == (const IpAddress &rhs)  C_NE___ { return (_address == rhs._address) & (_port == rhs._port); }
+        ND_ bool    operator <  (const IpAddress &rhs)  C_NE___ { return _address == rhs._address ? _port < rhs._port : _address < rhs._address; }
+
+        ND_ String  ToString ()                         C_Th___;
+        ND_ String  ToHostName (Bool optIsTCP = True{}) C_Th___;
+
+            void    ToNative (OUT AnyTypeRef addr)      C_NE___;
+
+
+        ND_ static IpAddress  FromServiceUDP (NtStringView hostName, NtStringView serviceName)  __NE___;
+        ND_ static IpAddress  FromServiceTCP (NtStringView hostName, NtStringView serviceName)  __NE___;
+
+        ND_ static IpAddress  FromHostPortUDP (NtStringView hostName, ushort port)              __NE___;
+        ND_ static IpAddress  FromHostPortTCP (NtStringView hostName, ushort port)              __NE___;
+
+        // allow external connection
+        ND_ static IpAddress  FromLocalPortUDP (ushort port)                                    __NE___;
+        ND_ static IpAddress  FromLocalPortTCP (ushort port)                                    __NE___;
+
+        // only local connection
+        ND_ static IpAddress  FromLocalhostUDP (ushort port)                                    __NE___;
+        ND_ static IpAddress  FromLocalhostTCP (ushort port)                                    __NE___;
+
+        ND_ static IpAddress  FromNative (AnyTypeCRef addr)                                     __NE___;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/IpAddress6.cpp b/AE/engine/src/networking/LowLevel/IpAddress6.cpp
new file mode 100644
index 00000000..a1d234ca
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/IpAddress6.cpp
@@ -0,0 +1,331 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/LowLevel/IpAddress6.h"
+#include "networking/LowLevel/PlatformSpecific.cpp.h"
+
+namespace AE::Networking
+{
+namespace
+{
+/*
+=================================================
+    GetAddressFromHostAndService
+=================================================
+*/
+    template <typename IPv6Addr>
+    ND_ static bool  GetAddressFromHostAndService (const char* hostName, const char* serviceName, Bool isUDP,
+                                                   OUT IPv6Addr &outIpv6Addr, OUT ushort &outPort, OUT ushort &outScopeId) __NE___
+    {
+        ZeroMem( OUT outIpv6Addr );
+        outPort = 0;
+
+        addrinfo*   out_info = null;
+        {
+            addrinfo    info    = {};
+            info.ai_family      = AF_INET6;
+            info.ai_socktype    = isUDP ? SOCK_DGRAM : SOCK_STREAM;
+            info.ai_protocol    = isUDP ? IPPROTO_UDP : IPPROTO_TCP;
+
+            if_unlikely( ::getaddrinfo( hostName, serviceName, &info, OUT &out_info ) != 0 )
+            {
+                if ( hostName == null )     hostName    = "";
+                if ( serviceName == null )  serviceName = "";
+
+                NET_CHECK2( "Failed to get address info for host '"s << hostName << "' and service '" << serviceName << "': " );
+                return false;
+            }
+        }
+
+        bool    result = false;
+
+        for (addrinfo* info = out_info; info != null; info = info->ai_next)
+        {
+            if ( info->ai_family == AF_INET6 and info->ai_addrlen == sizeof(sockaddr_in6) )
+            {
+                auto*   addr_v6 = Cast<sockaddr_in6>( info->ai_addr );
+
+                std::memcpy( OUT &outIpv6Addr, &addr_v6->sin6_addr, sizeof(outIpv6Addr) );
+                outPort     = NetworkToHost( addr_v6->sin6_port );
+                outScopeId  = ushort(addr_v6->sin6_scope_id);
+
+                result = true;
+                break;
+            }
+        }
+
+        if ( out_info != null )
+            ::freeaddrinfo( out_info );
+
+        return result;
+    }
+
+} // namespace
+
+
+/*
+=================================================
+    IsValid
+=================================================
+*/
+    bool  IpAddress6::IsValid () C_NE___
+    {
+        return  ((_address.p0 | _address.p1 | _address.p2 | _address.p3 | _address.p4 | _address.p5 | _address.p6 | _address.p7) != 0) &
+                (_port != 0);
+    }
+
+/*
+=================================================
+    ToNative
+=================================================
+*/
+    void  IpAddress6::ToNative (OUT AnyTypeRef outAddr) C_NE___
+    {
+        auto&   addr = outAddr.As< sockaddr_in6 >();
+
+        addr.sin6_family    = AF_INET6;
+        addr.sin6_port      = HostToNetwork( _port );
+        addr.sin6_flowinfo  = 0;
+        addr.sin6_scope_id  = _scopeId;
+
+        std::memcpy( OUT &addr.sin6_addr, &_address, sizeof(_address) );
+        StaticAssert( sizeof(addr.sin6_addr) == sizeof(_address) );
+    }
+
+/*
+=================================================
+    ToString
+=================================================
+*/
+    String  IpAddress6::ToString () C_Th___
+    {
+        String  str;
+        if ( _address.p0 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p0 ));   str << ':';
+        if ( _address.p1 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p1 ));   str << ':';
+        if ( _address.p2 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p2 ));   str << ':';
+        if ( _address.p3 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p3 ));   str << ':';
+        if ( _address.p4 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p4 ));   str << ':';
+        if ( _address.p5 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p5 ));   str << ':';
+        if ( _address.p6 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p6 ));   str << ':';
+        if ( _address.p7 != 0 ) str << Base::ToString<16>( NetworkToHost( _address.p7 ));
+        if ( _scopeId != 0 )    str << '%' << Base::ToString( _scopeId );
+        str << " port:" << Base::ToString<10>( _port );
+        return str;
+    }
+
+/*
+=================================================
+    FromServiceUDP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromServiceUDP (NtStringView hostName, NtStringView serviceName) __NE___
+    {
+        IpAddress6  result;
+        CHECK( GetAddressFromHostAndService( hostName.c_str(), serviceName.c_str(), True{"UDP"}, OUT result._address, OUT result._port, OUT result._scopeId ));
+        return result;
+    }
+
+/*
+=================================================
+    FromHostPortUDP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromHostPortUDP (NtStringView hostName, ushort port) __NE___
+    {
+        IpAddress6  result;
+        CHECK( GetAddressFromHostAndService( hostName.c_str(), null, True{"UDP"}, OUT result._address, OUT result._port, OUT result._scopeId ));
+        ASSERT( result._port == 0 );
+        result._port = port;
+        return result;
+    }
+
+/*
+=================================================
+    FromLocalPortUDP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromLocalPortUDP (ushort port) __NE___
+    {
+        return FromHostPortUDP( "::", port );
+    }
+
+/*
+=================================================
+    FromLocalhostUDP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromLocalhostUDP (ushort port) __NE___
+    {
+        return FromHostPortUDP( "::1", port );
+    }
+
+/*
+=================================================
+    FromServiceTCP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromServiceTCP (NtStringView hostName, NtStringView serviceName) __NE___
+    {
+        IpAddress6  result;
+        CHECK( GetAddressFromHostAndService( hostName.c_str(), serviceName.c_str(), False{"TCP"}, OUT result._address, OUT result._port, OUT result._scopeId ));
+        return result;
+    }
+
+/*
+=================================================
+    FromHostPortTCP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromHostPortTCP (NtStringView hostName, ushort port) __NE___
+    {
+        IpAddress6  result;
+        CHECK( GetAddressFromHostAndService( hostName.c_str(), null, False{"TCP"}, OUT result._address, OUT result._port, OUT result._scopeId ));
+        ASSERT( result._port == 0 );
+        result._port = port;
+        return result;
+    }
+
+/*
+=================================================
+    FromLocalPortTCP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromLocalPortTCP (ushort port) __NE___
+    {
+        return FromHostPortTCP( "::", port );
+    }
+
+/*
+=================================================
+    FromLocalhostTCP
+=================================================
+*/
+    IpAddress6  IpAddress6::FromLocalhostTCP (ushort port) __NE___
+    {
+        return FromHostPortTCP( "::1", port );
+    }
+
+/*
+=================================================
+    FromNative
+=================================================
+*/
+    IpAddress6  IpAddress6::FromNative (AnyTypeCRef inAddr) __NE___
+    {
+        const auto&     addr = inAddr.As< sockaddr_in6 >();
+        IpAddress6      result;
+
+        ASSERT( addr.sin6_family == AF_INET6 );
+
+        std::memcpy( OUT &result._address, &addr.sin6_addr, sizeof(result._address) );
+        StaticAssert( sizeof(addr.sin6_addr) == sizeof(_address) );
+
+        result._port    = NetworkToHost( addr.sin6_port );
+        result._scopeId = ushort(addr.sin6_scope_id);
+
+        return result;
+    }
+
+/*
+=================================================
+    FromString
+----
+    Supported formats:
+        xxxx:xxxx:::
+        xxxx:xxxx:::%scope
+        ::1
+        [xxxx:xxxx:::]:port
+=================================================
+*/
+    IpAddress6  IpAddress6::FromString (StringView addr) __NE___
+    {
+        const auto  ParseUShortHex = [] (INOUT usize &pos, StringView addr) -> ushort
+        {{
+            uint    x = 0;
+            for (uint j = 0; (j < 4) & (pos < addr.size()); ++j, ++pos)
+            {
+                const char  c = addr[pos];
+
+                if ( (c >= '0') & (c <= '9') )  (x <<= 4) |= uint(c - '0');         else
+                if ( (c >= 'a') & (c <= 'f') )  (x <<= 4) |= uint(c - 'a' + 0xA);   else
+                if ( (c >= 'A') & (c <= 'F') )  (x <<= 4) |= uint(c - 'A' + 0xA);   else
+                                                break;
+            }
+            return ushort(x);
+        }};
+
+        const auto  ParseUShort = [] (INOUT usize &pos, StringView addr) -> ushort
+        {{
+            uint    x = 0;
+            for (uint j = 0; (j < 4) & (pos < addr.size()); ++j, ++pos)
+            {
+                const char  c = addr[pos];
+                if ( (c >= '0') & (c <= '9') )  (x *= 10) += uint(c - '0'); else
+                                                break;
+            }
+            return ushort(x);
+        }};
+
+        IpAddress6  result;
+        usize       pos     = 0;
+        uint        i       = 0;
+
+        if ( pos < addr.size() and addr[pos] == '[' )
+            ++pos;
+
+        for (ushort* part = &result._address.p0; i < 8; ++i, ++part)
+        {
+            *part = NetworkToHost( ParseUShortHex( INOUT pos, addr ));
+
+            if ( (pos < addr.size()) & (i < 7) )
+            {
+                const char  c = addr[pos];
+                ASSERT( c == ':' );
+
+                if_unlikely( c != ':' )
+                    break;
+
+                ++pos;
+            }
+        }
+
+        // read scope
+        if ( pos < addr.size() and addr[pos] == '%' )
+        {
+            ++pos;
+            result._scopeId = ParseUShort( INOUT pos, addr );
+        }
+
+        // read port
+        if ( pos+1 < addr.size() and addr[pos] == ']' and addr[pos+1] == ':' )
+        {
+            pos += 2;
+            result._port = ParseUShort( INOUT pos, addr );
+        }
+
+        ASSERT( pos == addr.size() );
+        return result;
+    }
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    IpAddress6::IpAddress6 (ushort p0, ushort p1, ushort p2, ushort p3,
+                            ushort p4, ushort p5, ushort p6, ushort p7,
+                            ushort port, ushort scopeId) __NE___
+    {
+        _address.p0 = NetworkToHost( p0 );
+        _address.p1 = NetworkToHost( p1 );
+        _address.p2 = NetworkToHost( p2 );
+        _address.p3 = NetworkToHost( p3 );
+        _address.p4 = NetworkToHost( p4 );
+        _address.p5 = NetworkToHost( p5 );
+        _address.p6 = NetworkToHost( p6 );
+        _address.p7 = NetworkToHost( p7 );
+        _port       = port;
+        _scopeId    = scopeId;
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/IpAddress6.h b/AE/engine/src/networking/LowLevel/IpAddress6.h
new file mode 100644
index 00000000..a71e6761
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/IpAddress6.h
@@ -0,0 +1,85 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Address and port in host order.
+    Use HostToNetwork() to convert to network order.
+    Use NetworkToHost() to convert from network order before creating IpAddress object.
+*/
+
+#pragma once
+
+#include "networking/Common.h"
+
+namespace AE::Networking
+{
+    using namespace AE::Base;
+
+
+    //
+    // IPv6 Address
+    //
+
+    class IpAddress6
+    {
+    // types
+    private:
+        struct IPv6Bits
+        {
+            ushort  p0;     // xxxx:::::::
+            ushort  p1;     // :xxxx::::::
+            ushort  p2;     // ::xxxx:::::
+            ushort  p3;     // :::xxxx::::
+            ushort  p4;     // ::::xxxx:::
+            ushort  p5;     // :::::xxxx::
+            ushort  p6;     // ::::::xxxx:
+            ushort  p7;     // :::::::xxxx
+        };
+        StaticAssert( sizeof(IPv6Bits) == 16, "IPv6Bits must have 128 bits" );
+
+
+    // variables
+    private:
+        IPv6Bits    _address    = {};   // in network order
+        ushort      _port       = 0;
+        ushort      _scopeId    = 0;
+
+
+    // methods
+    public:
+        IpAddress6 ()                                           __NE___ {}
+        IpAddress6 (ushort p0, ushort p1, ushort p2, ushort p3,
+                    ushort p4, ushort p5, ushort p6, ushort p7,
+                    ushort port, ushort scopeId)                __NE___;
+
+        ND_ bool    IsValid ()                                  C_NE___;
+        ND_ ushort  Port ()                                     C_NE___ { return _port; }
+
+            void    SetPort (ushort value)                      __NE___ { _port = value; }
+
+        ND_ bool    operator == (const IpAddress6 &rhs)         C_NE___ { return MemEqual( *this, rhs ); }
+        ND_ bool    operator <  (const IpAddress6 &rhs)         C_NE___ { return MemLess( *this, rhs ); }
+
+        ND_ String  ToString ()                                 C_Th___;
+
+            void    ToNative (OUT AnyTypeRef addr)              C_NE___;
+
+
+        ND_ static IpAddress6  FromServiceUDP (NtStringView hostName, NtStringView serviceName) __NE___;
+        ND_ static IpAddress6  FromServiceTCP (NtStringView hostName, NtStringView serviceName) __NE___;
+
+        ND_ static IpAddress6  FromHostPortUDP (NtStringView hostName, ushort port)             __NE___;
+        ND_ static IpAddress6  FromHostPortTCP (NtStringView hostName, ushort port)             __NE___;
+
+        // allow external connection
+        ND_ static IpAddress6  FromLocalPortUDP (ushort port)                                   __NE___;
+        ND_ static IpAddress6  FromLocalPortTCP (ushort port)                                   __NE___;
+
+        // only local connection
+        ND_ static IpAddress6  FromLocalhostUDP (ushort port)                                   __NE___;
+        ND_ static IpAddress6  FromLocalhostTCP (ushort port)                                   __NE___;
+
+        ND_ static IpAddress6  FromNative (AnyTypeCRef addr)                                    __NE___;
+        ND_ static IpAddress6  FromString (StringView addr)                                     __NE___;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/PlatformSpecific.cpp.h b/AE/engine/src/networking/LowLevel/PlatformSpecific.cpp.h
new file mode 100644
index 00000000..59ef210c
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/PlatformSpecific.cpp.h
@@ -0,0 +1,144 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/LowLevel/SocketError.h"
+
+#ifdef AE_PLATFORM_WINDOWS
+    // Berkeley sockets supported in Windows Vista and Windows Server 2003.
+#   if AE_PLATFORM_TARGET_VERSION_MAJOR < 6
+#     error Required at least Windows Vista.
+#   endif
+#   define AE_WINDOWS_SOCKET
+#   include "base/Platforms/WindowsHeader.cpp.h"
+
+#elif defined(AE_EMS_NATIVE_SOCKETS)
+    // https://emscripten.org/docs/porting/networking.html
+#   include "emscripten/websocket.h"
+
+#elif defined(AE_PLATFORM_UNIX_BASED)
+#   define AE_UNIX_SOCKET
+#   include <sys/types.h>
+#   include <sys/socket.h>
+#   include <netdb.h>
+#   include <netinet/in.h>
+#   include <netinet/ip.h>
+#   include <netinet/tcp.h>
+
+#   ifdef AE_PLATFORM_LINUX
+#    include <fcntl.h>
+#   endif
+
+#   ifdef AE_PLATFORM_APPLE
+#    include <fcntl.h>
+#    include <arpa/inet.h>
+#   endif
+
+#else
+#   error Unsupported platform!
+#endif
+
+namespace AE::Networking
+{
+
+#if defined(AE_WINDOWS_SOCKET)
+    using NativeSocket_t        = SOCKET;
+    using NativeSocketOpPtr_t   = char;
+    using NativeSoketSendBuf_t  = char;
+    using Byte_t                = int;
+
+    ND_ inline bool     ShouldPrintError (uint err)     __NE___ { return not AnyEqual( long(err), WSAEWOULDBLOCK, WSAECONNRESET ); }
+    ND_ inline bool     IsNotConnected (uint err)       __NE___ { return err == WSAENOTCONN; }
+    ND_ inline bool     IsInProgress (uint err)         __NE___ { return AnyEqual( long(err), 0, WSAEINPROGRESS, WSAEWOULDBLOCK ); }
+
+
+#elif defined(AE_UNIX_SOCKET)
+    using NativeSocket_t        = int;
+    using NativeSocketOpPtr_t   = void;
+    using NativeSoketSendBuf_t  = void;
+    using Byte_t                = ssize;
+
+    ND_ inline bool     ShouldPrintError (int err)      __NE___ { return not AnyEqual( err, EAGAIN, EWOULDBLOCK, ECONNRESET ); }
+    ND_ inline bool     IsNotConnected (int err)        __NE___ { return err == ENOTCONN; }
+    ND_ inline bool     IsInProgress (int err)          __NE___ { return AnyEqual( err, 0, EAGAIN, EWOULDBLOCK, EINPROGRESS ); }
+
+
+#else
+#   error Unsupported platform!
+#endif
+
+
+    ND_ inline ushort   HostToNetwork (ushort value)    __NE___ { return htons( value ); }
+    ND_ inline uint     HostToNetwork (uint   value)    __NE___ { return htonl( value ); }
+    ND_ inline ushort   NetworkToHost (ushort value)    __NE___ { return ntohs( value ); }
+    ND_ inline uint     NetworkToHost (uint   value)    __NE___ { return ntohl( value ); }
+
+#ifdef AE_PLATFORM_WINDOWS
+    ND_ inline ULONG    HostToNetwork (ULONG  value)    __NE___ { return htonl( value ); }
+    ND_ inline ULONG    NetworkToHost (ULONG  value)    __NE___ { return ntohl( value ); }
+#endif
+
+
+
+/*
+=================================================
+    TranslateSocketSendError
+=================================================
+*/
+    ND_ inline SocketSendError  TranslateSocketSendError (uint err)
+    {
+        #if defined(AE_WINDOWS_SOCKET)
+        #   define CASE( _wsa_, _unix_, _ae_ )  case _wsa_  : return SocketSendError::_ae_;
+        #elif defined(AE_UNIX_SOCKET)
+        #   define CASE( _wsa_, _unix_, _ae_ )  case _unix_ : return SocketSendError::_ae_;
+        #else
+            #error Unsupported platform!
+        #endif
+        switch ( err )
+        {
+            CASE( WSAEWOULDBLOCK,   EWOULDBLOCK,    ResourceTemporarilyUnavailable );
+            CASE( WSAEACCES,        EACCES,         PermissionDenied );
+            CASE( WSAECONNRESET,    ECONNRESET,     ConnectionResetByPeer );
+            CASE( WSAENOTCONN,      ENOTCONN,       NotConnected );
+            CASE( WSAEMSGSIZE,      EMSGSIZE,       UDP_MessageTooLong );
+        }
+        #undef CASE
+        StaticAssert( uint(SocketSendError::UnknownError) == 9 );
+        return SocketSendError::UnknownError;
+    }
+
+/*
+=================================================
+    TranslateSocketReceiveError
+=================================================
+*/
+    ND_ inline SocketReceiveError  TranslateSocketReceiveError (uint err)
+    {
+        #if defined(AE_WINDOWS_SOCKET)
+        #   define CASE( _wsa_, _unix_, _ae_ )  case _wsa_  : return SocketReceiveError::_ae_;
+        #elif defined(AE_UNIX_SOCKET)
+        #   define CASE( _wsa_, _unix_, _ae_ )  case _unix_ : return SocketReceiveError::_ae_;
+        #else
+            #error Unsupported platform!
+        #endif
+        switch ( err )
+        {
+            CASE( WSAEWOULDBLOCK,   EWOULDBLOCK,    ResourceTemporarilyUnavailable );
+            CASE( WSAECONNRESET,    ECONNRESET,     ConnectionResetByPeer );
+            CASE( WSAECONNREFUSED,  ECONNREFUSED,   ConnectionRefused );
+            CASE( WSAENOTCONN,      ENOTCONN,       NotConnected );
+        }
+        #undef CASE
+        StaticAssert( uint(SocketReceiveError::UnknownError) == 8 );
+        return SocketReceiveError::UnknownError;
+    }
+
+
+} // AE::Networking
+
+#ifdef AE_DEBUG
+#   define NET_CHECK( _error_, _msg_ )  {PlatformUtils::CheckNetworkError( (_error_), (_msg_), SourceLoc_Current(), ELogLevel::Info );}
+#   define NET_CHECK2( _msg_ )          NET_CHECK( PlatformUtils::GetNetworkErrorCode(), (_msg_) )
+#else
+#   define NET_CHECK( _error_, _msg_ )  {}
+#   define NET_CHECK2( _msg_ )          {}
+#endif
+
diff --git a/AE/engine/src/networking/LowLevel/SocketError.h b/AE/engine/src/networking/LowLevel/SocketError.h
new file mode 100644
index 00000000..9733291e
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/SocketError.h
@@ -0,0 +1,41 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/Common.h"
+
+namespace AE::Networking
+{
+
+    enum class SocketSendError : ubyte
+    {
+        Sent,
+        NotSent,
+        ResourceTemporarilyUnavailable,         // WSAEWOULDBLOCK   | EWOULDBLOCK
+
+        _Error,
+        PermissionDenied,                       // WSAEACCES        | EACCES
+        ConnectionResetByPeer,                  // WSAECONNRESET    | ECONNRESET
+        NotConnected,                           // WSAENOTCONN      | ENOTCONN
+        UDP_MessageTooLong,                     // WSAEMSGSIZE      | EMSGSIZE
+        NoSocket,
+        UnknownError,
+    };
+
+
+    enum class SocketReceiveError : ubyte
+    {
+        Received,
+        NotReceived,
+        ResourceTemporarilyUnavailable,         // WSAEWOULDBLOCK   | EWOULDBLOCK
+
+        _Error,
+        ConnectionResetByPeer,                  // WSAECONNRESET    | ECONNRESET
+        ConnectionRefused,                      // WSAECONNREFUSED  | ECONNREFUSED
+        NotConnected,                           // WSAENOTCONN      | ENOTCONN
+        NoSocket,
+        UnknownError,
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/SocketService.cpp b/AE/engine/src/networking/LowLevel/SocketService.cpp
new file mode 100644
index 00000000..36fb53c5
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/SocketService.cpp
@@ -0,0 +1,153 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/LowLevel/SocketService.h"
+#include "networking/LowLevel/PlatformSpecific.cpp.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    SocketService::SocketService () __NE___
+    {
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    SocketService::~SocketService () __NE___
+    {
+        Deinitialize();
+    }
+
+/*
+=================================================
+    Instance
+=================================================
+*/
+    bool  SocketService::Initialize () __NE___
+    {
+        if ( _initialized )
+            return true;
+
+    #if defined(AE_WINDOWS_SOCKET)
+        WSADATA     wsa_data;
+        const WORD  req_ver = MAKEWORD(2, 2);
+        const int   error   = ::WSAStartup( req_ver, OUT &wsa_data );
+
+        if_unlikely( error != NO_ERROR )
+        {
+            NET_CHECK2( "WSAStartup failed: " );
+            return false;
+        }
+        _initialized = true;
+
+    #elif defined(AE_UNIX_SOCKET)
+        _initialized = true;
+
+    #else
+    #   error Unsupported platform!
+    #endif
+
+        return true;
+    }
+
+/*
+=================================================
+    Deinitialize
+=================================================
+*/
+    bool  SocketService::Deinitialize () __NE___
+    {
+        if ( not _initialized )
+            return true;
+
+        _initialized = false;
+
+    #if defined(AE_WINDOWS_SOCKET)
+        ::WSACleanup();
+
+    #elif defined(AE_UNIX_SOCKET)
+    #else
+    #   error Unsupported platform!
+    #endif
+        return true;
+    }
+
+/*
+=================================================
+    Instance
+=================================================
+*/
+    SocketService&  SocketService::Instance () __NE___
+    {
+        static SocketService    network;
+        return network;
+    }
+
+/*
+=================================================
+    GetSelfIPAddress
+----
+    How to use:
+    set router or any internet DNS address to 'host' and get your local address.
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    bool  SocketService::_GetSelfIPAddress (const AddressType &hostAddr, OUT AddressType &selfAddr) C_NE___
+    {
+        constexpr bool  is_ipv6 = IsSameTypes< AddressType, IpAddress6 >;
+
+        NativeSocket_t  socket = ::socket( (is_ipv6 ? AF_INET6 : AF_INET), SOCK_DGRAM, 0 );
+
+        if ( BitCast<BaseSocket::Socket_t>(socket) == Default )
+            return false;
+
+        bool            result  = false;
+        NativeAddress   host_addr;
+        hostAddr.ToNative( OUT AnyTypeRef{ host_addr });
+
+        if ( ::connect( socket, Cast<sockaddr>(&host_addr), sizeof(host_addr) ) == 0 )
+        {
+            NativeAddress   self_addr;
+            socklen_t       self_addr_len = sizeof(self_addr);
+
+            if ( ::getsockname( socket, OUT Cast<sockaddr>(&self_addr), OUT &self_addr_len ) == 0 )
+            {
+                result      = true;
+                selfAddr    = AddressType::FromNative( self_addr );
+            }
+            else
+                NET_CHECK2( "getsockname() failed: " );
+        }
+        else
+            NET_CHECK2( "connect() failed: " );
+
+      #if defined(AE_WINDOWS_SOCKET)
+        ::closesocket( socket );
+      #elif defined(AE_UNIX_SOCKET)
+        ::close( socket );
+      #else
+        #error Unsupported platform!
+      #endif
+
+        return result;
+    }
+
+    bool  SocketService::GetSelfIPAddress (const IpAddress &host, OUT IpAddress &self) C_NE___
+    {
+        return _GetSelfIPAddress< sockaddr_in >( host, OUT self );
+    }
+
+    bool  SocketService::GetSelfIPAddress (const IpAddress6 &host, OUT IpAddress6 &self) C_NE___
+    {
+        return _GetSelfIPAddress< sockaddr_in6 >( host, OUT self );
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/SocketService.h b/AE/engine/src/networking/LowLevel/SocketService.h
new file mode 100644
index 00000000..db19ee2d
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/SocketService.h
@@ -0,0 +1,41 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/LowLevel/UdpSocket.h"
+#include "networking/LowLevel/TcpSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // Socket Service
+    //
+
+    class SocketService final : public Noncopyable
+    {
+    // variables
+    private:
+        bool        _initialized    = false;
+
+
+    // methods
+    public:
+        ND_ static SocketService&  Instance ()                                      __NE___;
+
+        ND_ bool  Initialize ()                                                     __NE___;
+            bool  Deinitialize ()                                                   __NE___;
+
+        ND_ bool  GetSelfIPAddress (const IpAddress &host, OUT IpAddress &self)     C_NE___;
+        ND_ bool  GetSelfIPAddress (const IpAddress6 &host, OUT IpAddress6 &self)   C_NE___;
+
+    private:
+        SocketService ()                                                            __NE___;
+        ~SocketService ()                                                           __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _GetSelfIPAddress (const A &host, OUT A &self)                    C_NE___;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/TcpSocket.cpp b/AE/engine/src/networking/LowLevel/TcpSocket.cpp
new file mode 100644
index 00000000..4f7e0cfa
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/TcpSocket.cpp
@@ -0,0 +1,436 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/LowLevel/TcpSocket.h"
+#include "networking/LowLevel/PlatformSpecific.cpp.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    Accept
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    inline bool  TcpSocket::_Accept (const TcpSocket &other, OUT AddressType &clientAddr) __NE___
+    {
+        CHECK_ERR( not IsOpen() );
+
+        if_unlikely( not other.IsOpen() )
+            return false;
+
+        NativeAddress   src_addr;
+        socklen_t       addr_len = sizeof(src_addr);
+
+        _handle = BitCast<Socket_t>(::accept( BitCast<NativeSocket_t>(other._handle), OUT Cast<sockaddr>(&src_addr), OUT &addr_len ));
+
+        if_likely( _handle == Default )
+            return false;   // no clients   // TODO: check errors
+
+        clientAddr = AddressType::FromNative( AnyTypeCRef{ src_addr });
+        ASSERT( clientAddr.IsValid() );
+
+        DEBUG_ONLY(
+            if constexpr( IsSameTypes< AddressType, IpAddress6 >){
+                _dbgAddr6   = clientAddr;
+                _isIPv6     = true;
+            }else{
+                _dbgAddr4   = clientAddr;
+                _isIPv6     = false;
+            })
+        return true;
+    }
+
+    bool  TcpSocket::Accept (const TcpSocket &other, OUT IpAddress &clientAddr) __NE___
+    {
+        return _Accept< sockaddr_in >( other, OUT clientAddr );
+    }
+
+    bool  TcpSocket::Accept (const TcpSocket &other, OUT IpAddress6 &clientAddr) __NE___
+    {
+        return _Accept< sockaddr_in6 >( other, OUT clientAddr );
+    }
+
+/*
+=================================================
+    Listen
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    bool  TcpSocket::_Listen (const AddressType &addr, const Config &cfg) __NE___
+    {
+        constexpr bool  is_ipv6 = IsSameTypes< AddressType, IpAddress6 >;
+
+        ASSERT( addr.IsValid() );
+        CHECK_ERR( _Create( cfg, Bool{is_ipv6} ));
+
+        // binding
+        {
+            const int       opt         = 1;
+            NativeAddress   sock_addr;
+            addr.ToNative( OUT AnyTypeRef{ sock_addr });
+
+            if_unlikely( ::setsockopt( BitCast<NativeSocket_t>(_handle), SOL_SOCKET, SO_REUSEADDR, Cast<NativeSocketOpPtr_t>(&opt), sizeof(opt) ))
+            {
+                NET_CHECK2( "TCP("s << GetDebugName() << ") failed to set 'reuse_address' flag" );
+            }
+
+            if_unlikely( ::bind( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&sock_addr), sizeof(sock_addr) ) != 0 )
+            {
+                NET_CHECK2( "TCP("s << GetDebugName() << ") failed to bind socket to port ("s << ToString(addr.Port()) << "): " );
+                Close();
+                return false;
+            }
+
+            if_unlikely( ::listen( BitCast<NativeSocket_t>(_handle), (cfg.maxConnections == UMax ? SOMAXCONN : cfg.maxConnections) ) != 0 )
+            {
+                NET_CHECK2( "TCP("s << GetDebugName() << ") failed to listen on port ("s << ToString(addr.Port()) << "): " );
+                Close();
+                return false;
+            }
+        }
+
+        CHECK_ERR( _SetNonBlocking() );
+        CHECK_ERR( _SetNoDelay() );
+
+        DEBUG_ONLY(
+            if constexpr( is_ipv6 ){
+                _dbgAddr6   = addr;
+                _isIPv6     = true;
+            }else{
+                _dbgAddr4   = addr;
+                _isIPv6     = false;
+            })
+        return true;
+    }
+
+    bool  TcpSocket::Listen (const IpAddress &addr, const Config &cfg) __NE___
+    {
+        return _Listen< sockaddr_in >( addr, cfg );
+    }
+
+    bool  TcpSocket::Listen (const IpAddress6 &addr, const Config &cfg) __NE___
+    {
+        return _Listen< sockaddr_in6 >( addr, cfg );
+    }
+
+/*
+=================================================
+    Connect
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    inline bool  TcpSocket::_Connect (const AddressType &addr, const Config &cfg) __NE___
+    {
+        constexpr bool  is_ipv6 = IsSameTypes< AddressType, IpAddress6 >;
+
+        ASSERT( addr.IsValid() );
+        CHECK_ERR( _Create( cfg, Bool{is_ipv6} ));
+
+        // connect
+        {
+            NativeAddress   peer_addr;
+            addr.ToNative( OUT AnyTypeRef{ peer_addr });
+
+            if_unlikely( ::connect( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&peer_addr), sizeof(peer_addr) ) != 0 )
+            {
+                NET_CHECK2( "TCP("s << GetDebugName() << ") failed to connect socket to address ("s << addr.ToString() << "): " );
+                Close();
+                return false;
+            }
+        }
+
+        // set non-blocking after 'connect()' otherwise 'connect()' will return EAGAIN or EINPROGRESS until 3-way handshake is in progress.
+        CHECK_ERR( _SetNonBlocking() );
+        CHECK_ERR( _SetNoDelay() );
+
+        DEBUG_ONLY(
+            if constexpr( is_ipv6 ){
+                _dbgAddr6   = addr;
+                _isIPv6     = true;
+            }else{
+                _dbgAddr4   = addr;
+                _isIPv6     = false;
+            })
+        return true;
+    }
+
+    bool  TcpSocket::Connect (const IpAddress &addr, const Config &cfg) __NE___
+    {
+        ASSERT( addr.Address() != 0 );
+        return _Connect< sockaddr_in >( addr, cfg );
+    }
+
+    bool  TcpSocket::Connect (const IpAddress6 &addr, const Config &cfg) __NE___
+    {
+        return _Connect< sockaddr_in6 >( addr, cfg );
+    }
+
+/*
+=================================================
+    AsyncConnect
+----
+    use 'ConnectionStatus()' to check is it connected or failed.
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    inline bool  TcpSocket::_AsyncConnect (const AddressType &addr, const Config &cfg) __NE___
+    {
+        constexpr bool  is_ipv6 = IsSameTypes< AddressType, IpAddress6 >;
+
+        ASSERT( addr.IsValid() );
+        CHECK_ERR( _Create( cfg, Bool{is_ipv6} ));
+
+        CHECK_ERR( _SetNonBlocking() );
+        CHECK_ERR( _SetNoDelay() );
+
+        // connect
+        {
+            NativeAddress   peer_addr;
+            addr.ToNative( OUT AnyTypeRef{ peer_addr });
+
+            const int   res = ::connect( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&peer_addr), sizeof(peer_addr) );
+            const auto  err = PlatformUtils::GetNetworkErrorCode();
+
+            if_unlikely( res != 0 and not IsInProgress( err ))
+            {
+                NET_CHECK( err, "TCP("s << GetDebugName() << ") failed to connect socket to address ("s << addr.ToString() << "): " );
+                Close();
+                return false;
+            }
+        }
+
+        DEBUG_ONLY(
+            if constexpr( is_ipv6 ){
+                _dbgAddr6   = addr;
+                _isIPv6     = true;
+            }else{
+                _dbgAddr4   = addr;
+                _isIPv6     = false;
+            })
+        return true;
+    }
+
+    bool  TcpSocket::AsyncConnect (const IpAddress &addr, const Config &cfg) __NE___
+    {
+        ASSERT( addr.Address() != 0 );
+        return _AsyncConnect< sockaddr_in >( addr, cfg );
+    }
+
+    bool  TcpSocket::AsyncConnect (const IpAddress6 &addr, const Config &cfg) __NE___
+    {
+        return _AsyncConnect< sockaddr_in6 >( addr, cfg );
+    }
+
+/*
+=================================================
+    _Create
+=================================================
+*/
+    bool  TcpSocket::_Create (const Config &cfg, Bool useIPv6) __NE___
+    {
+        CHECK_ERR( not IsOpen() );
+
+        _handle = BitCast<Socket_t>(::socket( (useIPv6 ? AF_INET6 : AF_INET), SOCK_STREAM, IPPROTO_TCP ));
+
+        if_unlikely( _handle == Default )
+        {
+            NET_CHECK2( "TCP("s << GetDebugName() << ") socket() failed with error: " );
+            return false;
+        }
+
+        DEBUG_ONLY( _isIPv6 = useIPv6; )
+
+        CHECK_ERR( _SetSendBufferSize( cfg.sendBufferSize ));
+        CHECK_ERR( _SetReceiveBufferSize( cfg.receiveBufferSize ));
+        return true;
+    }
+
+/*
+=================================================
+    _SetNoDelay
+=================================================
+*/
+    bool  TcpSocket::_SetNoDelay () __NE___
+    {
+        ASSERT( IsOpen() );
+
+        int     option = 1;
+
+        if_unlikely( ::setsockopt( BitCast<NativeSocket_t>(_handle), IPPROTO_TCP, TCP_NODELAY, Cast<NativeSocketOpPtr_t>(&option), sizeof(option) ) != 0 )
+        {
+            NET_CHECK2( "TCP("s << GetDebugName() << ") failed to set socket no-delay mode: " );
+            return false;
+        }
+        return true;
+    }
+
+/*
+=================================================
+    Send
+=================================================
+*/
+    auto  TcpSocket::Send (const void* data, const Bytes dataSize) C_NE___ -> Tuple< SocketSendError, Bytes >
+    {
+        ASSERT( data != null );
+        ASSERT( dataSize > 0 );
+
+        if_unlikely( not IsOpen() )
+            return Tuple{ SocketSendError::NoSocket, 0_b };
+
+        const Byte_t    sent = ::send( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0 );
+
+        if_unlikely( sent < 0 )
+        {
+            const auto  err = PlatformUtils::GetNetworkErrorCode();
+            DEBUG_ONLY( if ( ShouldPrintError( err )) NET_CHECK( err, "TCP("s << GetDebugName() << ") failed to write to socket ("s << _GetLastAddress() << "): " );)
+            return Tuple{ TranslateSocketSendError( err ), 0_b };
+        }
+        return Tuple{ (sent ? SocketSendError::Sent : SocketSendError::NotSent), Bytes{ulong(sent)} };
+    }
+
+/*
+=================================================
+    Receive
+=================================================
+*/
+    auto  TcpSocket::Receive (OUT void* data, const Bytes dataSize) C_NE___ -> Tuple< SocketReceiveError, Bytes >
+    {
+        ASSERT( data != null );
+        ASSERT( dataSize > 0 );
+
+        if_unlikely( not IsOpen() )
+            return Tuple{ SocketReceiveError::NoSocket, 0_b };
+
+        const Byte_t    received = ::recv( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0 );
+
+        if_unlikely( received < 0 )
+        {
+            const auto  err = PlatformUtils::GetNetworkErrorCode();
+            DEBUG_ONLY( if ( ShouldPrintError( err )) NET_CHECK( err, "TCP("s << GetDebugName() << ") failed to read from socket ("s << _GetLastAddress() << "): " );)
+            return Tuple{ TranslateSocketReceiveError( err ), 0_b };
+        }
+        return Tuple{ (received ? SocketReceiveError::Received : SocketReceiveError::NotReceived), Bytes{ulong(received)} };
+    }
+
+/*
+=================================================
+    KeepAlive
+=================================================
+*/
+    bool  TcpSocket::KeepAlive (bool enable) __NE___
+    {
+        ASSERT( IsOpen() );
+
+        const int   i_enable = int(enable);
+
+        if_unlikely( ::setsockopt( BitCast<NativeSocket_t>(_handle), SOL_SOCKET, SO_KEEPALIVE, Cast<NativeSocketOpPtr_t>(&i_enable), sizeof(i_enable) ) != 0 )
+        {
+            NET_CHECK2( "TCP("s << GetDebugName() << ") failed to set socket keep alive: " );
+            return false;
+        }
+
+        return true;
+    }
+
+/*
+=================================================
+    GetPeerName
+----
+    Returns peer address which was previously used in 'Connect()' call.
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    bool  TcpSocket::_GetPeerName (OUT AddressType &outAddr) C_NE___
+    {
+        constexpr bool  is_ipv6 = IsSameTypes< AddressType, IpAddress6 >;
+        ASSERT( _isIPv6 == is_ipv6 );
+        Unused( is_ipv6 );
+
+        NativeAddress   addr;
+        socklen_t       addr_len = sizeof(addr);
+
+        if_unlikely( ::getpeername( BitCast<NativeSocket_t>(_handle), OUT Cast<sockaddr>(&addr), OUT &addr_len ) != 0 )
+        {
+            DEBUG_ONLY(
+                const auto  err = PlatformUtils::GetNetworkErrorCode();
+                if ( not IsNotConnected( err ))
+                    NET_CHECK( err, "Failed to get peer address: " );
+            )
+            return false;
+        }
+
+        outAddr = AddressType::FromNative( AnyTypeCRef{ addr });
+        ASSERT( outAddr.IsValid() );
+
+        return true;
+    }
+
+    bool  TcpSocket::GetPeerName (OUT IpAddress &outAddr) C_NE___
+    {
+        return _GetPeerName< sockaddr_in >( outAddr );
+    }
+
+    bool  TcpSocket::GetPeerName (OUT IpAddress6 &outAddr) C_NE___
+    {
+        return _GetPeerName< sockaddr_in6 >( outAddr );
+    }
+
+/*
+=================================================
+    ConnectionStatus
+----
+    If not connected 'getpeername()' returns error.
+    Non-blocking socket in 'Connect()' will start 3-way handshake, so we need to check if connection is established.
+=================================================
+*/
+    TcpSocket::EStatus  TcpSocket::ConnectionStatus () C_NE___
+    {
+        if ( not IsOpen() )
+            return EStatus::NoSocket;
+
+        const auto  CheckError = [this] (EStatus onSuccess)
+        {{
+            int         err = 0;
+            socklen_t   len = sizeof(err);
+
+            if ( ::getsockopt( BitCast<NativeSocket_t>(_handle), SOL_SOCKET, SO_ERROR, OUT Cast<NativeSocketOpPtr_t>(&err), &len ) == 0 )
+            {
+                return  err == 0 ? onSuccess :
+                        IsInProgress( err ) ? EStatus::Connecting :
+                        EStatus::Failed;
+            }
+            return EStatus::Failed;
+        }};
+
+        struct timeval wait_time;
+        wait_time.tv_sec    = 0;
+        wait_time.tv_usec   = 0;
+
+        fd_set  socket_set = {};
+
+      #ifdef AE_WINDOWS_SOCKET
+        socket_set.fd_count     = 1;
+        socket_set.fd_array[0]  = BitCast<NativeSocket_t>(_handle);
+      #else
+        FD_ZERO( &socket_set );
+        FD_SET( BitCast<NativeSocket_t>(_handle), &socket_set );
+      #endif
+
+        int count = ::select( int(BitCast<NativeSocket_t>(_handle) + 1), &socket_set, &socket_set, null, &wait_time );
+        if ( count == 0 )
+            return CheckError( EStatus::Connecting );   // select() timeout
+
+        if ( count > 0 )
+            return CheckError( EStatus::Connected );
+
+        const auto  err = PlatformUtils::GetNetworkErrorCode();
+
+        if ( IsInProgress( err ))
+            return EStatus::Connecting;
+
+        return EStatus::Failed;
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/TcpSocket.h b/AE/engine/src/networking/LowLevel/TcpSocket.h
new file mode 100644
index 00000000..d3fb8530
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/TcpSocket.h
@@ -0,0 +1,97 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/LowLevel/BaseSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // TCP Socket
+    //
+
+    class TcpSocket final : public BaseSocket
+    {
+    // types
+    public:
+        struct Config : BaseSocket::_Config
+        {
+            uint    maxConnections = UMax;      // only for 'Listen()'
+
+            Config () __NE___ :
+                _Config{ NetConfig::TCP_SendBufferSize, NetConfig::TCP_ReceiveBufferSize }
+            {}
+        };
+
+        enum class EStatus
+        {
+            Connecting,
+            Connected,
+            Failed,
+            NoSocket,
+        };
+
+
+    // variables
+    private:
+        DEBUG_ONLY(
+            union{
+                IpAddress   _dbgAddr4;
+                IpAddress6  _dbgAddr6;
+            };
+            bool        _isIPv6     = false;
+        )
+
+
+    // methods
+    public:
+        TcpSocket ()                                                            __NE___ {}
+        TcpSocket (TcpSocket &&)                                                __NE___ = default;
+
+        ND_ bool  Accept (const TcpSocket &other, OUT IpAddress &clientAddr)    __NE___;
+        ND_ bool  Accept (const TcpSocket &other, OUT IpAddress6 &clientAddr)   __NE___;
+
+        ND_ bool  Listen (const IpAddress &addr, const Config &cfg = Default)   __NE___;
+        ND_ bool  Listen (const IpAddress6 &addr, const Config &cfg = Default)  __NE___;
+
+        ND_ bool  Connect (const IpAddress &addr, const Config &cfg = Default)  __NE___;
+        ND_ bool  Connect (const IpAddress6 &addr, const Config &cfg = Default) __NE___;
+
+        ND_ bool  AsyncConnect (const IpAddress &, const Config &cfg = Default) __NE___;
+        ND_ bool  AsyncConnect (const IpAddress6 &, const Config &cfg = Default)__NE___;
+
+        ND_ EStatus  ConnectionStatus ()                                        C_NE___;
+
+            bool  GetPeerName (OUT IpAddress &addr)                             C_NE___;
+            bool  GetPeerName (OUT IpAddress6 &addr)                            C_NE___;
+
+        ND_ auto  Send (const void* data, Bytes dataSize)                       C_NE___ -> Tuple< SocketSendError, Bytes >;
+        ND_ auto  Receive (OUT void* data, Bytes dataSize)                      C_NE___ -> Tuple< SocketReceiveError, Bytes >;
+
+            bool  KeepAlive (bool enable = true)                                __NE___;
+
+    private:
+        ND_ bool  _Create (const Config &cfg, Bool useIPv6)                     __NE___;
+        ND_ bool  _SetNoDelay ()                                                __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _Accept (const TcpSocket &other, OUT A &clientAddr)           __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _Listen (const A &addr, const Config &cfg)                    __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _Connect (const A &addr, const Config &cfg)                   __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _AsyncConnect (const A &addr, const Config &cfg)              __NE___;
+
+        template <typename N, typename A>
+        ND_ bool  _GetPeerName (OUT A &addr)                                    C_NE___;
+
+        DEBUG_ONLY( ND_ String  _GetLastAddress ()                              C_Th___ { return _isIPv6 ? _dbgAddr6.ToString() : _dbgAddr4.ToString(); })
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/UdpDbgSocket.cpp b/AE/engine/src/networking/LowLevel/UdpDbgSocket.cpp
new file mode 100644
index 00000000..62320e10
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/UdpDbgSocket.cpp
@@ -0,0 +1,163 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/LowLevel/UdpDbgSocket.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    Open
+=================================================
+*/
+    bool  UdpDbgSocket::Open (const IpAddress &addr, const Config &cfg) __NE___
+    {
+        _stat   = Default;
+        _config = cfg;
+        return _socket.Open( addr, cfg );
+    }
+
+    bool  UdpDbgSocket::Open (const IpAddress6 &addr, const Config &cfg) __NE___
+    {
+        _stat   = Default;
+        _config = cfg;
+        return _socket.Open( addr, cfg );
+    }
+
+/*
+=================================================
+    Close
+=================================================
+*/
+    void  UdpDbgSocket::Close () __NE___
+    {
+        // TODO: print stat?
+        _socket.Close();
+    }
+
+/*
+=================================================
+    Send
+=================================================
+*/
+    auto  UdpDbgSocket::Send (const IpAddress &addr, const void* data, Bytes dataSize) C_NE___ -> Tuple< SocketSendError, Bytes >
+    {
+        Array<char>     temp;
+        if ( _DropOrCorrupt( temp, INOUT data, INOUT dataSize ))
+            return Tuple{ SocketSendError::Sent, dataSize };
+
+        auto    result = _socket.Send( addr, data, dataSize );
+
+        _stat.sentData      += result.Get<1>();
+        _stat.sentPackets   ++;
+
+        return result;
+    }
+
+    auto  UdpDbgSocket::Send (const IpAddress6 &addr, const void* data, Bytes dataSize) C_NE___ -> Tuple< SocketSendError, Bytes >
+    {
+        Array<char>     temp;
+        if ( _DropOrCorrupt( temp, INOUT data, INOUT dataSize ))
+            return Tuple{ SocketSendError::Sent, dataSize };
+
+        auto    result = _socket.Send( addr, data, dataSize );
+
+        _stat.sentData      += result.Get<1>();
+        _stat.sentPackets   ++;
+
+        return result;
+    }
+
+/*
+=================================================
+    Receive
+=================================================
+*/
+    auto  UdpDbgSocket::Receive (OUT IpAddress &addr, OUT void* data, Bytes dataSize) C_NE___ -> Tuple< SocketReceiveError, Bytes >
+    {
+        auto    result = _socket.Receive( addr, OUT data, dataSize );
+        _DropOrCorrupt( INOUT data, INOUT result );
+        return result;
+    }
+
+    auto  UdpDbgSocket::Receive (OUT IpAddress6 &addr, OUT void* data, Bytes dataSize) C_NE___ -> Tuple< SocketReceiveError, Bytes >
+    {
+        auto    result = _socket.Receive( addr, OUT data, dataSize );
+        _DropOrCorrupt( INOUT data, INOUT result );
+        return result;
+    }
+
+/*
+=================================================
+    _DropOrCorrupt
+=================================================
+*/
+    void  UdpDbgSocket::_DropOrCorrupt (INOUT void* data, INOUT Tuple< SocketReceiveError, Bytes > &res) C_NE___
+    {
+        if ( res.Get<0>() != SocketReceiveError::Received )
+            return;
+
+        if ( _rnd.Uniform( 0.f, 1.f ) < _config.packetLost.GetFraction() )
+        {
+            _stat.lostRecvPackets ++;
+
+            res.Get<0>() = SocketReceiveError::NotReceived;
+            res.Get<1>() = 0_b;
+            return;
+        }
+
+        if ( _rnd.Uniform( 0.f, 1.f ) < _config.packetCorruption.GetFraction() )
+        {
+            _CorruptData( INOUT data, INOUT res.Get<1>() );
+            _stat.corruptRecvPackets ++;
+        }
+    }
+
+    bool  UdpDbgSocket::_DropOrCorrupt (Array<char> &buffer, INOUT const void* &data, INOUT Bytes &dataSize) C_NE___
+    {
+        if ( _rnd.Uniform( 0.f, 1.f ) < _config.packetLost.GetFraction() )
+        {
+            _stat.lostSentPackets ++;
+            return true;  // drop
+        }
+
+        if ( _rnd.Uniform( 0.f, 1.f ) < _config.packetCorruption.GetFraction() )
+        {
+            NOTHROW_ERR( buffer.assign( Cast<char>(data), Cast<char>(data + dataSize) ));
+
+            _CorruptData( INOUT buffer.data(), INOUT dataSize );
+            data = buffer.data();
+
+            _stat.corruptSentPackets ++;
+        }
+
+        return false;  // send
+    }
+
+    void  UdpDbgSocket::_CorruptData (INOUT void* data, INOUT Bytes &dataSize) C_NE___
+    {
+        //const auto    bits = usize( (_rnd.Uniform( 0.1f, 1.f ) * _config.packetCorruptionBits.GetFraction()) * float(usize{dataSize}) + 0.5f );
+        // TODO
+    }
+
+/*
+=================================================
+    PrintStat
+=================================================
+*/
+    void  UdpDbgSocket::PrintStat () C_NE___
+    {
+        #ifdef AE_ENABLE_LOGS
+        NOTHROW(
+            String  str;
+            str << "sent/lost/corrupt: " << ToString(_stat.sentPackets) << ", " << ToString(_stat.lostSentPackets) << ", " << ToString(_stat.corruptSentPackets) << '\n'
+                << "recv/lost/corrupt: " << ToString(_stat.recvPackets) << ", " << ToString(_stat.lostRecvPackets) << ", " << ToString(_stat.corruptRecvPackets) << '\n'
+                << "sent data:         " << ToString( _stat.sentData ) << '\n'
+                << "received data:     " << ToString( _stat.recvData ) << '\n';
+            AE_LOGI( str );
+        )
+        #endif
+    }
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/UdpDbgSocket.h b/AE/engine/src/networking/LowLevel/UdpDbgSocket.h
new file mode 100644
index 00000000..82f862ee
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/UdpDbgSocket.h
@@ -0,0 +1,99 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/LowLevel/UdpSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // UDP Debug Socket
+    //
+
+    class UdpDbgSocket
+    {
+    // types
+    public:
+        struct Config : UdpSocket::Config
+        {
+            Percent     packetLost;
+            Percent     packetDuplicates;
+            Percent     packetCorruption;
+            Percent     packetCorruptionBits;
+
+            Config () __NE___ :
+                packetLost{ 5_pct },
+                packetDuplicates{ 5_pct },
+                packetCorruption{ 0_pct },
+                packetCorruptionBits{ 0_pct }
+            {}
+        };
+
+        struct Statistic
+        {
+            Bytes       sentData;
+            Bytes       recvData;
+
+            ulong       sentPackets             = 0;
+            ulong       recvPackets             = 0;
+
+            ulong       lostSentPackets         = 0;
+            ulong       lostRecvPackets         = 0;
+
+            ulong       corruptSentPackets      = 0;
+            ulong       corruptRecvPackets      = 0;
+        };
+
+
+    // variables
+    private:
+        UdpSocket           _socket;
+
+        Config              _config;
+        mutable Statistic   _stat;
+        mutable Random      _rnd;
+
+
+    // methods
+    public:
+        UdpDbgSocket ()                                                             __NE___ {}
+        UdpDbgSocket (UdpDbgSocket &&)                                              __NE___ = default;
+        ~UdpDbgSocket ()                                                            __NE___ { Close(); }
+
+        UdpDbgSocket (const UdpDbgSocket &)                                                 = delete;
+        UdpDbgSocket&  operator = (const UdpDbgSocket &)                                    = delete;
+        UdpDbgSocket&  operator = (UdpDbgSocket &&)                                         = delete;
+
+        ND_ bool  Open (const IpAddress &addr, const Config &cfg = Default)         __NE___;
+        ND_ bool  Open (const IpAddress6 &addr, const Config &cfg = Default)        __NE___;
+
+            void  Close ()                                                          __NE___;
+        ND_ bool  IsOpen ()                                                         C_NE___ { return _socket.IsOpen(); }
+
+            bool  GetAddress (OUT IpAddress &addr)                                  C_NE___ { return _socket.GetAddress( OUT addr ); }
+        ND_ auto  NativeHandle ()                                                   C_NE___ { return _socket.NativeHandle(); }
+
+            auto  Send (const IpAddress &addr, const void* data, Bytes dataSize)    C_NE___ -> Tuple< SocketSendError, Bytes >;
+            auto  Send (const IpAddress6 &addr, const void* data, Bytes dataSize)   C_NE___ -> Tuple< SocketSendError, Bytes >;
+
+            auto  Receive (OUT IpAddress &addr, OUT void* data, Bytes dataSize)     C_NE___ -> Tuple< SocketReceiveError, Bytes >;
+            auto  Receive (OUT IpAddress6 &addr, OUT void* data, Bytes dataSize)    C_NE___ -> Tuple< SocketReceiveError, Bytes >;
+
+        ND_ Statistic const&    Stats ()                                            C_NE___ { return _stat; }
+            void                PrintStat ()                                        C_NE___;
+
+      #ifdef AE_DEBUG
+            void        SetDebugName (String name)                                  __NE___ { _socket.SetDebugName( RVRef(name) ); }
+        ND_ StringView  GetDebugName ()                                             C_NE___ { return _socket.GetDebugName(); }
+      #endif
+
+
+    private:
+        ND_ bool  _DropOrCorrupt (Array<char> &, INOUT const void* &data, INOUT Bytes &dataSize)    C_NE___;
+            void  _DropOrCorrupt (INOUT void* data, INOUT Tuple< SocketReceiveError, Bytes > &)     C_NE___;
+            void  _CorruptData (INOUT void* data, INOUT Bytes &dataSize)                            C_NE___;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/UdpSocket.cpp b/AE/engine/src/networking/LowLevel/UdpSocket.cpp
new file mode 100644
index 00000000..bd1c8579
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/UdpSocket.cpp
@@ -0,0 +1,144 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "networking/LowLevel/UdpSocket.h"
+#include "networking/LowLevel/PlatformSpecific.cpp.h"
+
+namespace AE::Networking
+{
+
+/*
+=================================================
+    Open
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    bool  UdpSocket::_Open (const AddressType &addr, const Config &cfg) __NE___
+    {
+        ASSERT( addr.IsValid() );
+        CHECK_ERR( not IsOpen() );
+
+        constexpr bool  is_ipv6 = IsSameTypes< AddressType, IpAddress6 >;
+
+        _handle = BitCast<Socket_t>(::socket( (is_ipv6 ? AF_INET6 : AF_INET), SOCK_DGRAM, IPPROTO_UDP ));
+
+        if_unlikely( _handle == Default )
+        {
+            NET_CHECK2( "UDP("s << GetDebugName() << ") socket() failed with error: " );
+            return false;
+        }
+
+        // bind to port
+        {
+            NativeAddress   sock_addr = {};
+            addr.ToNative( OUT AnyTypeRef{ sock_addr });
+
+            if_unlikely( ::bind( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&sock_addr), sizeof(sock_addr) ) != 0 )
+            {
+                NET_CHECK2( "UDP("s << GetDebugName() << ") failed to bind socket to port ("s << ToString(addr.Port()) << "): " );
+                Close();
+                return false;
+            }
+        }
+
+        CHECK_ERR( _SetSendBufferSize( cfg.sendBufferSize ));
+        CHECK_ERR( _SetReceiveBufferSize( cfg.receiveBufferSize ));
+        CHECK_ERR( _SetNonBlocking() );
+
+        return true;
+    }
+
+    bool  UdpSocket::Open (const IpAddress &addr, const Config &cfg) __NE___
+    {
+        return _Open< sockaddr_in >( addr, cfg );
+    }
+
+    bool  UdpSocket::Open (const IpAddress6 &addr, const Config &cfg) __NE___
+    {
+        return _Open< sockaddr_in6 >( addr, cfg );
+    }
+
+/*
+=================================================
+    Send
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    auto  UdpSocket::_Send (const AddressType &addr, const void* data, Bytes dataSize) C_NE___ -> Tuple< SocketSendError, Bytes >
+    {
+        ASSERT( data != null );
+        ASSERT( dataSize > 0 );
+        ASSERT( addr.IsValid() );
+
+        if_unlikely( not IsOpen() )
+            return Tuple{ SocketSendError::NoSocket, 0_b };
+
+        NativeAddress   dst_Addr = {};
+        addr.ToNative( OUT AnyTypeRef{ dst_Addr });
+
+        const Byte_t    sent = ::sendto( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0, Cast<sockaddr>(&dst_Addr), sizeof(dst_Addr) );
+
+        if_unlikely( sent < 0 )
+        {
+            const auto  err = PlatformUtils::GetNetworkErrorCode();
+            DEBUG_ONLY( if ( ShouldPrintError( err )) NET_CHECK( err, "UDP("s << GetDebugName() << ") failed to write to socket ("s << addr.ToString() << "): " );)
+            return Tuple{ TranslateSocketSendError( err ), 0_b };
+        }
+
+        return Tuple{ (sent ? SocketSendError::Sent : SocketSendError::NotSent), Bytes{ulong(sent)} };
+    }
+
+    auto  UdpSocket::Send (const IpAddress &addr, const void* data, const Bytes dataSize) C_NE___ -> Tuple< SocketSendError, Bytes >
+    {
+        ASSERT( addr.Address() != 0 );
+        return _Send< sockaddr_in >( addr, data, dataSize );
+    }
+
+    auto  UdpSocket::Send (const IpAddress6 &addr, const void* data, const Bytes dataSize) C_NE___ -> Tuple< SocketSendError, Bytes >
+    {
+        return _Send< sockaddr_in6 >( addr, data, dataSize );
+    }
+
+/*
+=================================================
+    Receive
+=================================================
+*/
+    template <typename NativeAddress, typename AddressType>
+    auto  UdpSocket::_Receive (OUT AddressType &addr, OUT void* data, Bytes dataSize) C_NE___ -> Tuple< SocketReceiveError, Bytes >
+    {
+        ASSERT( data != null );
+        ASSERT( dataSize > 0 );
+
+        addr = Default;
+
+        if_unlikely( not IsOpen() )
+            return Tuple{ SocketReceiveError::NoSocket, 0_b };
+
+        NativeAddress   src_addr;
+        socklen_t       addr_len = sizeof(src_addr);
+        const Byte_t    received = ::recvfrom( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0, OUT Cast<sockaddr>(&src_addr), OUT &addr_len );
+
+        if_unlikely( received < 0 )
+        {
+            const auto  err = PlatformUtils::GetNetworkErrorCode();
+            DEBUG_ONLY( if ( ShouldPrintError( err )) NET_CHECK( err, "UDP("s << GetDebugName() << ") failed to read from socket: " );)
+            return Tuple{ TranslateSocketReceiveError( err ), 0_b };
+        }
+
+        addr = AddressType::FromNative( AnyTypeCRef{ src_addr });
+        ASSERT( addr.IsValid() );
+
+        return Tuple{ (received ? SocketReceiveError::Received : SocketReceiveError::NotReceived), Bytes{ulong(received)} };
+    }
+
+    auto  UdpSocket::Receive (OUT IpAddress &addr, OUT void* data, const Bytes dataSize) C_NE___ -> Tuple< SocketReceiveError, Bytes >
+    {
+        return _Receive< sockaddr_in >( OUT addr, OUT data, dataSize );
+    }
+
+    auto  UdpSocket::Receive (OUT IpAddress6 &addr, OUT void* data, const Bytes dataSize) C_NE___ -> Tuple< SocketReceiveError, Bytes >
+    {
+        return _Receive< sockaddr_in6 >( OUT addr, OUT data, dataSize );
+    }
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/LowLevel/UdpSocket.h b/AE/engine/src/networking/LowLevel/UdpSocket.h
new file mode 100644
index 00000000..53653d84
--- /dev/null
+++ b/AE/engine/src/networking/LowLevel/UdpSocket.h
@@ -0,0 +1,51 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "networking/LowLevel/BaseSocket.h"
+
+namespace AE::Networking
+{
+
+    //
+    // UDP Socket
+    //
+
+    class UdpSocket final : public BaseSocket
+    {
+    // types
+    public:
+        struct Config : BaseSocket::_Config
+        {
+            Config () __NE___ : _Config{ NetConfig::UDP_SendBufferSize, NetConfig::UDP_ReceiveBufferSize } {}
+        };
+
+
+    // methods
+    public:
+        UdpSocket ()                                                                __NE___ {}
+        UdpSocket (UdpSocket &&)                                                    __NE___ = default;
+
+        ND_ bool  Open (const IpAddress &addr, const Config &cfg = Default)         __NE___;
+        ND_ bool  Open (const IpAddress6 &addr, const Config &cfg = Default)        __NE___;
+
+        ND_ auto  Send (const IpAddress &addr, const void* data, Bytes dataSize)    C_NE___ -> Tuple< SocketSendError, Bytes >;
+        ND_ auto  Send (const IpAddress6 &addr, const void* data, Bytes dataSize)   C_NE___ -> Tuple< SocketSendError, Bytes >;
+
+        ND_ auto  Receive (OUT IpAddress &addr, OUT void* data, Bytes dataSize)     C_NE___ -> Tuple< SocketReceiveError, Bytes >;
+        ND_ auto  Receive (OUT IpAddress6 &addr, OUT void* data, Bytes dataSize)    C_NE___ -> Tuple< SocketReceiveError, Bytes >;
+
+
+    private:
+        template <typename N, typename A>
+        ND_ bool  _Open (const A &addr, const Config &cfg)                          __NE___;
+
+        template <typename N, typename A>
+        ND_ auto  _Send (const A &addr, const void* data, Bytes dataSize)           C_NE___ -> Tuple< SocketSendError, Bytes >;
+
+        template <typename N, typename A>
+        ND_ auto  _Receive (OUT A &addr, OUT void* data, Bytes dataSize)            C_NE___ -> Tuple< SocketReceiveError, Bytes >;
+    };
+
+
+} // AE::Networking
diff --git a/AE/engine/src/networking/Networking.pch.h b/AE/engine/src/networking/Networking.pch.h
index 38268828..f2c57bcd 100644
--- a/AE/engine/src/networking/Networking.pch.h
+++ b/AE/engine/src/networking/Networking.pch.h
@@ -3,4 +3,3 @@
 #pragma once
 
 #include "pch/Threading.h"
-#include "pch/Serializing.h"
diff --git a/AE/engine/src/networking/Raw/BaseSocket.h b/AE/engine/src/networking/Raw/BaseSocket.h
deleted file mode 100644
index 6e4ccbac..00000000
--- a/AE/engine/src/networking/Raw/BaseSocket.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#include "networking/Raw/IpAddress.h"
-
-namespace AE::Networking
-{
-
-    //
-    // Base Socket
-    //
-
-    class BaseSocket
-    {
-    // types
-    protected:
-        #ifdef AE_PLATFORM_WINDOWS
-            enum class Socket_t : usize { Unknown = ~usize(0) };
-            using Bytes_t       = int;
-
-        #elif defined(AE_PLATFORM_UNIX_BASED)
-            enum class Socket_t : int { Unknown = -1 };
-            using Bytes_t       = ssize;
-
-        #else
-            #error Unsupported platform!
-        #endif
-
-        struct _Config
-        {
-            Bytes   sendBufferSize      = 1_Mb;
-            Bytes   receiveBufferSize   = 1_Mb;
-        };
-
-
-    // variables
-    protected:
-        Socket_t    _handle = Default;
-
-
-    // methods
-    public:
-        BaseSocket ()                                   __NE___;
-        ~BaseSocket ()                                  __NE___;
-
-            void  Close ()                              __NE___;
-
-        ND_ bool  IsOpen ()                             C_NE___ { return _handle != Default; }
-
-            bool  GetAddress (OUT IpAddress &outAddr)   C_NE___;
-
-    protected:
-        ND_ bool  _SetNonBlocking ()                    __NE___;
-        ND_ bool  _SetSendBufferSize (Bytes size)       __NE___;
-        ND_ bool  _SetReceiveBufferSize (Bytes size)    __NE___;
-    };
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/IpAddress.h b/AE/engine/src/networking/Raw/IpAddress.h
deleted file mode 100644
index fde54bd4..00000000
--- a/AE/engine/src/networking/Raw/IpAddress.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-/*
-    Address and port in host order.
-    Use HostToNetwork() to convert to network order.
-    Use NetworkToHost() to convert from network order before creating IpAddress object.
-*/
-
-#pragma once
-
-#include "networking/Networking.pch.h"
-
-namespace AE::Networking
-{
-    using namespace AE::Base;
-
-
-    //
-    // IPv4 Address
-    //
-
-    class IpAddress
-    {
-    // types
-    private:
-        struct IPv4Bits
-        {
-            uint    p3 : 8;     // ...xxx
-            uint    p2 : 8;     // ..xxx.
-            uint    p1 : 8;     // .xxx.
-            uint    p0 : 8;     // xxx.
-        };
-
-
-    // variables
-    private:
-        union {
-            IPv4Bits    _addressBits;
-            uint        _address    = 0;
-        };
-        ushort          _port       = 0;
-
-
-    // methods
-    public:
-        IpAddress ()                        __NE___ {}
-        IpAddress (uint addr, ushort port)  __NE___ : _address{addr}, _port{port} {}
-        ~IpAddress ()                       __NE___ {}
-
-        ND_ bool    IsValid ()              C_NE___ { return (_address != 0) & (_port != 0); }
-        ND_ uint    Address ()              C_NE___ { return _address; }
-        ND_ ushort  Port ()                 C_NE___ { return _port; }
-
-        ND_ String  ToString ()             C_Th___;
-
-        ND_ static IpAddress  FromServiceUDP (NtStringView hostName, NtStringView serviceName)  __NE___;
-        ND_ static IpAddress  FromServiceTCP (NtStringView hostName, NtStringView serviceName)  __NE___;
-
-        ND_ static IpAddress  FromHostPortUDP (NtStringView hostName, ushort port)              __NE___;
-        ND_ static IpAddress  FromHostPortTCP (NtStringView hostName, ushort port)              __NE___;
-
-        ND_ static IpAddress  FromLocalhostUDP (ushort port)                                    __NE___;
-        ND_ static IpAddress  FromLocalhostTCP (ushort port)                                    __NE___;
-    };
-
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/PlatformSpecific.cpp.h b/AE/engine/src/networking/Raw/PlatformSpecific.cpp.h
deleted file mode 100644
index a5f6521e..00000000
--- a/AE/engine/src/networking/Raw/PlatformSpecific.cpp.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "networking/Networking.pch.h"
-
-#ifdef AE_PLATFORM_WINDOWS
-#   define AE_WINDOWS_SOCKET
-#   include "base/Platforms/WindowsHeader.h"
-
-#elif defined(AE_EMS_NATIVE_SOCKETS)
-    // https://emscripten.org/docs/porting/networking.html
-#   include "emscripten/websocket.h"
-
-#elif defined(AE_PLATFORM_UNIX_BASED)
-#   define AE_UNIX_SOCKET
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <netdb.h>
-#   include <netinet/in.h>
-#   include <netinet/ip.h>
-#   include <netinet/tcp.h>
-
-#   ifdef AE_PLATFORM_LINUX
-#    include <fcntl.h>
-#   endif
-
-#   ifdef AE_PLATFORM_APPLE
-#    include <fcntl.h>
-#    include <arpa/inet.h>
-#   endif
-
-#else
-#   error Unsupported platform!
-#endif
-
-namespace AE::Networking
-{
-
-#if defined(AE_WINDOWS_SOCKET)
-    using NativeSocket_t        = SOCKET;
-    using NativeSocketOpPtr_t   = char;
-    using NativeSoketSendBuf_t  = char;
-
-    ND_ inline bool     IsWouldBlock (uint err)         __NE___ { return err == WSAEWOULDBLOCK; }
-    ND_ inline bool     IsForcedlyClosed (uint err)     __NE___ { return err == WSAECONNRESET; }
-
-
-#elif defined(AE_UNIX_SOCKET)
-    using NativeSocket_t        = int;
-    using NativeSocketOpPtr_t   = void;
-    using NativeSoketSendBuf_t  = void;
-
-    ND_ inline bool     IsWouldBlock (int err)          __NE___ { return err == EWOULDBLOCK; }
-    ND_ inline bool     IsForcedlyClosed (int err)      __NE___ { return false; }
-
-#else
-#   error Unsupported platform!
-#endif
-
-    ND_ inline ushort   HostToNetwork (ushort value)    __NE___ { return htons( value ); }
-    ND_ inline uint     HostToNetwork (uint   value)    __NE___ { return htonl( value ); }
-    ND_ inline ushort   NetworkToHost (ushort value)    __NE___ { return ntohs( value ); }
-    ND_ inline uint     NetworkToHost (uint   value)    __NE___ { return ntohl( value ); }
-
-#ifdef AE_PLATFORM_WINDOWS
-    ND_ inline ULONG    HostToNetwork (ULONG  value)    __NE___ { return htonl( value ); }
-    ND_ inline ULONG    NetworkToHost (ULONG  value)    __NE___ { return ntohl( value ); }
-#endif
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/SocketService.cpp b/AE/engine/src/networking/Raw/SocketService.cpp
deleted file mode 100644
index c545c8c4..00000000
--- a/AE/engine/src/networking/Raw/SocketService.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "networking/Raw/SocketService.h"
-#include "networking/Raw/PlatformSpecific.cpp.h"
-
-namespace AE::Networking
-{
-
-/*
-=================================================
-    constructor
-=================================================
-*/
-    SocketService::SocketService () __NE___
-    {
-    }
-
-/*
-=================================================
-    destructor
-=================================================
-*/
-    SocketService::~SocketService () __NE___
-    {
-        Deinitialize();
-    }
-
-/*
-=================================================
-    Instance
-=================================================
-*/
-    bool  SocketService::Initialize () __NE___
-    {
-        if ( _initialized )
-            return true;
-
-    #if defined(AE_WINDOWS_SOCKET)
-        WSADATA     wsa_data;
-        const WORD  req_ver = MAKEWORD(2, 2);
-        const int   error   = ::WSAStartup( req_ver, OUT &wsa_data );
-
-        if_unlikely( error != NO_ERROR )
-        {
-            CATCH( PlatformUtils::CheckNetworkError( "WSAStartup failed: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-        _initialized = true;
-
-    #elif defined(AE_UNIX_SOCKET)
-        _initialized = true;
-
-    #else
-    #   error Unsupported platform!
-    #endif
-
-        return true;
-    }
-
-/*
-=================================================
-    Deinitialize
-=================================================
-*/
-    bool  SocketService::Deinitialize () __NE___
-    {
-        if ( not _initialized )
-            return true;
-
-        _initialized = false;
-
-    #if defined(AE_WINDOWS_SOCKET)
-        ::WSACleanup();
-
-    #elif defined(AE_UNIX_SOCKET)
-    #else
-    #   error Unsupported platform!
-    #endif
-        return true;
-    }
-
-/*
-=================================================
-    Instance
-=================================================
-*/
-    SocketService&  SocketService::Instance () __NE___
-    {
-        static SocketService    network;
-        return network;
-    }
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/SocketService.h b/AE/engine/src/networking/Raw/SocketService.h
deleted file mode 100644
index a2e182c6..00000000
--- a/AE/engine/src/networking/Raw/SocketService.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#include "networking/Raw/UdpSocket.h"
-#include "networking/Raw/TcpSocket.h"
-
-namespace AE::Networking
-{
-
-    //
-    // Socket Service
-    //
-
-    class SocketService final : public Noncopyable
-    {
-    // variables
-    private:
-        bool        _initialized    = false;
-
-
-    // methods
-    public:
-        ND_ static SocketService&  Instance ()  __NE___;
-
-        ND_ bool  Initialize ()                 __NE___;
-            bool  Deinitialize ()               __NE___;
-
-    private:
-        SocketService ()                        __NE___;
-        ~SocketService ()                       __NE___;
-    };
-
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/TcpSocket.cpp b/AE/engine/src/networking/Raw/TcpSocket.cpp
deleted file mode 100644
index 9f4ffc1c..00000000
--- a/AE/engine/src/networking/Raw/TcpSocket.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "networking/Raw/TcpSocket.h"
-#include "networking/Raw/PlatformSpecific.cpp.h"
-
-namespace AE::Networking
-{
-
-/*
-=================================================
-    Accept
-=================================================
-*/
-    bool  TcpSocket::Accept (const TcpSocket &other, OUT IpAddress &clientAddr) __NE___
-    {
-        CHECK_ERR( not IsOpen() );
-
-        if_unlikely( not other.IsOpen() )
-            return false;
-
-        sockaddr_in src_addr;
-        socklen_t   addr_len = sizeof(src_addr);
-
-        _handle = BitCast<Socket_t>(::accept( BitCast<NativeSocket_t>(other._handle), OUT Cast<sockaddr>(&src_addr), OUT &addr_len ));
-
-        if_likely( _handle == Default )
-            return false;   // no clients
-
-        clientAddr = IpAddress{ NetworkToHost(src_addr.sin_addr.s_addr), NetworkToHost(src_addr.sin_port) };
-        return true;
-    }
-
-/*
-=================================================
-    Listen
-=================================================
-*/
-    bool  TcpSocket::Listen (ushort port, const Config &cfg) __NE___
-    {
-        CHECK_ERR( _Create( cfg ));
-
-        // binding
-        {
-            sockaddr_in     sock_addr   = {};
-            sock_addr.sin_family        = AF_INET;
-            sock_addr.sin_addr.s_addr   = INADDR_ANY;
-            sock_addr.sin_port          = HostToNetwork( port );
-
-            if_unlikely( ::bind( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&sock_addr), sizeof(sock_addr) ) != 0 )
-            {
-                CATCH( PlatformUtils::CheckNetworkError( "Failed to bind TCP socket to port ("s << ToString(port) << "): ", SourceLoc_Current(), ELogLevel::Info ));
-                return false;
-            }
-
-            if_unlikely( ::listen( BitCast<NativeSocket_t>(_handle), (cfg.maxConnections == UMax ? SOMAXCONN : cfg.maxConnections) ) != 0 )
-            {
-                CATCH( PlatformUtils::CheckNetworkError( "Failed to listen on TCP socket: ", SourceLoc_Current(), ELogLevel::Info ));
-                return false;
-            }
-        }
-
-        CHECK_ERR( _SetNonBlocking() );
-        CHECK_ERR( _SetNoDelay() );
-        return true;
-    }
-
-/*
-=================================================
-    Connect
-=================================================
-*/
-    bool  TcpSocket::Connect (const IpAddress &addr, const Config &cfg) __NE___
-    {
-        CHECK_ERR( _Create( cfg ));
-
-        // connect
-        {
-            sockaddr_in     dst_Addr    = {};
-            dst_Addr.sin_family         = AF_INET;
-            dst_Addr.sin_addr.s_addr    = HostToNetwork( addr.Address() );
-            dst_Addr.sin_port           = HostToNetwork( addr.Port() );
-
-            if_unlikely( ::connect( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&dst_Addr), sizeof(dst_Addr) ) != 0 )
-            {
-                CATCH( PlatformUtils::CheckNetworkError( "Failed to connect TCP socket to address ("s << addr.ToString() << "): ",
-                                                         SourceLoc_Current(), ELogLevel::Info ));
-                return false;
-            }
-        }
-
-        CHECK_ERR( _SetNonBlocking() );
-        CHECK_ERR( _SetNoDelay() );
-        return true;
-    }
-
-/*
-=================================================
-    _Create
-=================================================
-*/
-    bool  TcpSocket::_Create (const Config &cfg) __NE___
-    {
-        CHECK_ERR( not IsOpen() );
-
-        _handle = BitCast<Socket_t>(::socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ));
-
-        if_unlikely( _handle == Default )
-        {
-            CATCH( PlatformUtils::CheckNetworkError( "socket() failed with error: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-
-        CHECK_ERR( _SetSendBufferSize( cfg.sendBufferSize ));
-        CHECK_ERR( _SetReceiveBufferSize( cfg.receiveBufferSize ));
-        return true;
-    }
-
-/*
-=================================================
-    _SetNoDelay
-=================================================
-*/
-    bool  TcpSocket::_SetNoDelay () __NE___
-    {
-        ASSERT( IsOpen() );
-
-        int     option = 1;
-
-        if_unlikely( ::setsockopt( BitCast<NativeSocket_t>(_handle), IPPROTO_TCP, TCP_NODELAY, Cast<NativeSocketOpPtr_t>(&option), sizeof(option) ) != 0 )
-        {
-            CATCH( PlatformUtils::CheckNetworkError( "Failed to set socket no-delay mode: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-        return true;
-    }
-
-/*
-=================================================
-    Send
-=================================================
-*/
-    bool  TcpSocket::Send (const void* data, Bytes dataSize, OUT Bytes &outSent) C_NE___
-    {
-        ASSERT( data != null );
-        ASSERT( dataSize > 0 );
-
-        outSent = 0_b;
-
-        if_unlikely( not IsOpen() )
-            return false;
-
-        const Bytes_t   sent = ::send( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0 );
-
-        if_unlikely( sent < 0 )
-        {
-            const auto  err = PlatformUtils::GetNetworkErrorCode();
-
-            if_likely( IsWouldBlock( err ))
-                return true;
-
-            CATCH( PlatformUtils::CheckNetworkError( err, "Failed to write to socket: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-
-        outSent = Bytes{ulong(sent)};
-        return true;
-    }
-
-/*
-=================================================
-    Receive
-=================================================
-*/
-    bool  TcpSocket::Receive (OUT void* data, Bytes dataSize, OUT Bytes &outReceived) C_NE___
-    {
-        ASSERT( data != null );
-        ASSERT( dataSize > 0 );
-
-        outReceived = 0_b;
-
-        if_unlikely( not IsOpen() )
-            return false;
-
-        const Bytes_t   received = ::recv( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0 );
-
-        if_unlikely( received < 0 )
-        {
-            const auto  err = PlatformUtils::GetNetworkErrorCode();
-
-            if_likely( IsWouldBlock( err ))
-                return true;
-
-            if ( IsForcedlyClosed( err ))
-                return false;
-
-            CATCH( PlatformUtils::CheckNetworkError( err, "Failed to read from socket: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-
-        outReceived = Bytes{ulong(received)};
-        return true;
-    }
-
-
-} // AE::Networking
-
diff --git a/AE/engine/src/networking/Raw/TcpSocket.h b/AE/engine/src/networking/Raw/TcpSocket.h
deleted file mode 100644
index 0a5b1bec..00000000
--- a/AE/engine/src/networking/Raw/TcpSocket.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#include "networking/Raw/BaseSocket.h"
-
-namespace AE::Networking
-{
-
-    //
-    // TCP Socket
-    //
-
-    class TcpSocket final : public BaseSocket
-    {
-    // types
-    public:
-        struct Config : BaseSocket::_Config
-        {
-            uint    maxConnections = UMax;      // only for 'Listen()'
-
-            Config ()   __NE___ {}
-        };
-
-
-    // methods
-    public:
-        TcpSocket ()                                                            __NE___ {}
-
-        ND_ bool  Accept (const TcpSocket &other, OUT IpAddress &clientAddr)    __NE___;
-
-        ND_ bool  Listen (ushort port, const Config &cfg = Default)             __NE___;
-        ND_ bool  Connect (const IpAddress &addr, const Config &cfg = Default)  __NE___;
-
-            bool  Send (const void* data, Bytes dataSize, OUT Bytes &sent)      C_NE___;
-            bool  Receive (OUT void* data, Bytes dataSize, OUT Bytes &received) C_NE___;
-
-    private:
-        ND_ bool  _Create (const Config &cfg)                                   __NE___;
-        ND_ bool  _SetNoDelay ()                                                __NE___;
-    };
-
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/UdpSocket.cpp b/AE/engine/src/networking/Raw/UdpSocket.cpp
deleted file mode 100644
index 22c3ee54..00000000
--- a/AE/engine/src/networking/Raw/UdpSocket.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "networking/Raw/UdpSocket.h"
-#include "networking/Raw/PlatformSpecific.cpp.h"
-
-namespace AE::Networking
-{
-
-/*
-=================================================
-    Open
-=================================================
-*/
-    bool  UdpSocket::Open (ushort port, const Config &cfg) __NE___
-    {
-        CHECK_ERR( not IsOpen() );
-
-        _stat   = Default;
-        _handle = BitCast<Socket_t>(::socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ));
-
-        if_unlikely( _handle == Default )
-        {
-            CATCH( PlatformUtils::CheckNetworkError( "socket() failed with error: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-
-        // bind to port
-        {
-            sockaddr_in     sock_addr   = {};
-            sock_addr.sin_family        = AF_INET;
-            sock_addr.sin_addr.s_addr   = INADDR_ANY;
-            sock_addr.sin_port          = HostToNetwork( port );
-
-            if_unlikely( ::bind( BitCast<NativeSocket_t>(_handle), Cast<sockaddr>(&sock_addr), sizeof(sock_addr) ) != 0 )
-            {
-                CATCH( PlatformUtils::CheckNetworkError( "Failed to bind UDP socket to port ("s << ToString(port) << "): ", SourceLoc_Current(), ELogLevel::Info ));
-                return false;
-            }
-        }
-
-        CHECK_ERR( _SetSendBufferSize( cfg.sendBufferSize ));
-        CHECK_ERR( _SetReceiveBufferSize( cfg.receiveBufferSize ));
-        CHECK_ERR( _SetNonBlocking() );
-
-        return true;
-    }
-
-/*
-=================================================
-    Send
-=================================================
-*/
-    bool  UdpSocket::Send (const IpAddress &addr, const void* data, const Bytes dataSize, OUT Bytes &outSent) C_NE___
-    {
-        ASSERT( data != null );
-        ASSERT( dataSize > 0 );
-        ASSERT( addr.IsValid() );
-
-        outSent = 0_b;
-
-        if_unlikely( not IsOpen() )
-            return false;
-
-        sockaddr_in     dst_Addr = {};
-        dst_Addr.sin_family         = AF_INET;
-        dst_Addr.sin_addr.s_addr    = HostToNetwork( addr.Address() );
-        dst_Addr.sin_port           = HostToNetwork( addr.Port() );
-
-        const Bytes_t   sent = ::sendto( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0, Cast<sockaddr>(&dst_Addr), sizeof(dst_Addr) );
-
-        if_unlikely( sent < 0 )
-        {
-            const auto  err = PlatformUtils::GetNetworkErrorCode();
-
-            if_likely( IsWouldBlock( err ))
-                return true;
-
-            CATCH( PlatformUtils::CheckNetworkError( err, "Failed to write to socket: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-
-        _stat.sentData      += sent;
-        _stat.sentPackets   ++;
-
-        outSent = Bytes{ulong(sent)};
-        return true;
-    }
-
-/*
-=================================================
-    Receive
-=================================================
-*/
-    bool  UdpSocket::Receive (OUT IpAddress &addr, OUT void* data, const Bytes dataSize, OUT Bytes &outReceived) C_NE___
-    {
-        ASSERT( data != null );
-        ASSERT( dataSize > 0 );
-
-        addr        = Default;
-        outReceived = 0_b;
-
-        if_unlikely( not IsOpen() )
-            return false;
-
-        sockaddr_in     src_addr;
-        socklen_t       addr_len = sizeof(src_addr);
-        const Bytes_t   received = ::recvfrom( BitCast<NativeSocket_t>(_handle), Cast<NativeSoketSendBuf_t>(data), int(dataSize), 0, OUT Cast<sockaddr>(&src_addr), OUT &addr_len );
-
-        if_unlikely( received < 0 )
-        {
-            const auto  err = PlatformUtils::GetNetworkErrorCode();
-
-            if_likely( IsWouldBlock( err ))
-                return true;
-
-            if ( IsForcedlyClosed( err ))
-                return false;
-
-            CATCH( PlatformUtils::CheckNetworkError( err, "Failed to read from socket: ", SourceLoc_Current(), ELogLevel::Info ));
-            return false;
-        }
-
-        _stat.recvData      += received;
-        _stat.recvPackets   ++;
-
-        addr = IpAddress{ NetworkToHost(src_addr.sin_addr.s_addr), NetworkToHost(src_addr.sin_port) };
-
-        outReceived = Bytes{ulong(received)};
-        return true;
-    }
-
-
-} // AE::Networking
diff --git a/AE/engine/src/networking/Raw/UdpSocket.h b/AE/engine/src/networking/Raw/UdpSocket.h
deleted file mode 100644
index b22dd44d..00000000
--- a/AE/engine/src/networking/Raw/UdpSocket.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-/*
-    MTU : 1460 bytes
-*/
-
-#pragma once
-
-#include "networking/Raw/BaseSocket.h"
-
-namespace AE::Networking
-{
-
-    //
-    // UDP Socket
-    //
-
-    class UdpSocket final : public BaseSocket
-    {
-    // types
-    public:
-        struct Statistic
-        {
-            Bytes   sentData;
-            Bytes   recvData;
-            uint    sentPackets = 0;
-            uint    recvPackets = 0;
-        };
-
-        using Config = BaseSocket::_Config;
-
-
-    // variables
-    private:
-        mutable Statistic   _stat;
-
-
-    // methods
-    public:
-        UdpSocket ()                                                                                    __NE___ {}
-
-        ND_ bool  Open (ushort port, const Config &cfg = Default)                                       __NE___;
-
-            bool  Send (const IpAddress &addr, const void* data, Bytes dataSize, OUT Bytes &sent)       C_NE___;
-            bool  Receive (OUT IpAddress &addr, OUT void* data, Bytes dataSize, OUT Bytes &received)    C_NE___;
-
-        ND_ Statistic const&  Stats ()                                                                  C_NE___ { return _stat; }
-    };
-
-
-} // AE::Networking
diff --git a/AE/engine/src/platform/Android/AndroidCommon.h b/AE/engine/src/platform/Android/AndroidCommon.h
index 9ea8adf6..f119b636 100644
--- a/AE/engine/src/platform/Android/AndroidCommon.h
+++ b/AE/engine/src/platform/Android/AndroidCommon.h
@@ -8,6 +8,8 @@
 # include <android/asset_manager_jni.h>
 # include <android/native_window.h>
 
+# include "platform/Android/Java.h"
+
 namespace AE::App
 {
     class ApplicationAndroid;
diff --git a/AE/engine/src/platform/Android/ApplicationAndroid.cpp b/AE/engine/src/platform/Android/ApplicationAndroid.cpp
index c868c96d..336953ba 100644
--- a/AE/engine/src/platform/Android/ApplicationAndroid.cpp
+++ b/AE/engine/src/platform/Android/ApplicationAndroid.cpp
@@ -72,10 +72,9 @@ namespace {
 */
     WindowPtr  ApplicationAndroid::CreateWindow (WndListenerPtr listener, const WindowDesc &, IInputActions* dstActions) __NE___
     {
-        DRC_EXLOCK( _stCheck );
-
         CHECK_ERR( listener );
 
+        DRC_EXLOCK( _stCheck );
         EXLOCK( _windowsGuard );
 
         if ( _windows.size() == 1 and not _windows.front().second->_listener )
@@ -90,17 +89,29 @@ namespace {
 
 /*
 =================================================
-    OpenBuiltinStorage
+    OpenStorage
 =================================================
 */
-    RC<IVirtualFileStorage>  ApplicationAndroid::OpenBuiltinStorage () __NE___
+    RC<IVirtualFileStorage>  ApplicationAndroid::OpenStorage (EAppStorage type) __NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
-
-        auto    fs = MakeRC<FileSystemAndroid>();           // throw
-        CHECK_ERR( fs->Create( _java.jniAssetMngr, "" ));
+        BEGIN_ENUM_CHECKS();
+        switch ( type )
+        {
+            case EAppStorage::Builtin :
+            {
+                auto    fs = MakeRC<FileSystemAndroid>();
+                CHECK_ERR( fs->Create( _paths->jniAssetMngr, "" ));
+                return fs;
+            }
 
-        return fs;
+            case EAppStorage::Cache :
+            {
+                Path    dir = _paths->externalCache;
+                CHECK_ERR( not dir.empty() );
+                return VFS::VirtualFileStorageFactory::CreateDynamicFolder( dir );
+            }
+        }
+        END_ENUM_CHECKS();
     }
 
 /*
@@ -124,10 +135,7 @@ namespace {
 */
     ArrayView<const char*>  ApplicationAndroid::GetVulkanInstanceExtensions () __NE___
     {
-        static const char*  extensions[] = {
-            "VK_KHR_android_surface"
-        };
-        return extensions;
+        return Graphics::VSwapchain::GetInstanceExtensions();
     }
 
 /*
@@ -200,9 +208,9 @@ namespace {
 
         _java.application       = Default;
         _java.assetManager      = Default;
-        _java.jniAssetMngr      = null;
+        _paths->jniAssetMngr    = null;
 
-        _methods.createWindow   = Default;
+        //_methods.createWindow = Default;
 
         EXLOCK( _windowsGuard );
 
@@ -222,11 +230,13 @@ namespace {
 */
     ApplicationAndroid::WinID  ApplicationAndroid::_AddWindow (SharedPtr<WindowAndroid> wnd) __NE___
     {
-        EXLOCK( _windowsGuard );
-
-        const WinID id = ++_windowCounter;
+        WinID   id;
+        {
+            EXLOCK( _windowsGuard );
 
-        _windows.emplace_back( id, wnd );
+            id = ++_windowCounter;
+            _windows.emplace_back( id, wnd );
+        }
 
         if ( not _started and _listener )
         {
@@ -266,26 +276,20 @@ namespace {
     native_OnCreate
 =================================================
 */
-    void JNICALL ApplicationAndroid::native_OnCreate (JNIEnv *env, jclass, jobject appCtx, jobject assetMngr) __NE___
+    void JNICALL ApplicationAndroid::native_OnCreate (JNIEnv* env, jclass, jobject appCtx, jobject assetMngr) __NE___
     {
         auto&   app = GetApp();
         DRC_EXLOCK( app._drCheck );
 
         JavaEnv je{ env };
 
-        app._java.application   = JavaObj{ appCtx, je };
-        app._java.assetManager  = JavaObj{ assetMngr, je };
-        app._java.jniAssetMngr  = AAssetManager_fromJava( env, app._java.assetManager.Get() );
+        app._java.application       = JavaObj{ appCtx, je };
+        app._java.assetManager      = JavaObj{ assetMngr, je };
+        app._paths->jniAssetMngr    = AAssetManager_fromJava( env, app._java.assetManager.Get() );
 
         app._java.application.Method( "ShowToast", OUT app._methods.showToast );
         app._java.application.Method( "IsNetworkConnected", OUT app._methods.isNetworkConnected );
         //app._java.application.Method( "CreateWindow", OUT app._methods.createWindow );
-
-        if ( not app._started and app._listener )
-        {
-            app._started = true;
-            app._listener->OnStart( app );
-        }
     }
 
 /*
@@ -295,9 +299,15 @@ namespace {
 */
     void JNICALL ApplicationAndroid::native_SetDirectories (JNIEnv*, jclass,
                                                             jstring internalAppData, jstring internalCache,
-                                                            jstring externalAppData, jstring externalCache, jstring externalStorage) __NE___
+                                                            jstring externalAppData, jstring externalCache) __NE___
     {
-        // TODO
+        auto&   app = GetApp();
+        DRC_EXLOCK( app._drCheck );
+
+        app._paths->internalAppData = Path{JavaString{ internalAppData }};
+        app._paths->internalCache   = Path{JavaString{ internalCache }};
+        app._paths->externalAppData = Path{JavaString{ externalAppData }};
+        app._paths->externalCache   = Path{JavaString{ externalCache }};
     }
 
 /*
diff --git a/AE/engine/src/platform/Android/ApplicationAndroid.h b/AE/engine/src/platform/Android/ApplicationAndroid.h
index 330eee3f..942502d4 100644
--- a/AE/engine/src/platform/Android/ApplicationAndroid.h
+++ b/AE/engine/src/platform/Android/ApplicationAndroid.h
@@ -25,6 +25,15 @@ namespace AE::App
         using WinID         = WindowAndroid::WinID;
         using AWindows_t    = FixedArray<Pair< WinID, Window >, PlatformConfig::MaxWindows >;
 
+        struct StoragePath {
+            AAssetManager *     jniAssetMngr    = null;
+            Path                internalAppData;
+            Path                internalCache;
+            Path                externalAppData;
+            Path                externalCache;
+        };
+        using StoragePathSync_t = Threading::Synchronized< Threading::RWSpinLock, StoragePath >;
+
 
     // variables
     private:
@@ -36,16 +45,16 @@ namespace AE::App
         bool                    _started        = false;
 
         Locales_t               _locales;
+        StoragePathSync_t       _paths;
 
         struct {
             JavaObj                 application;
             JavaObj                 assetManager;
-            AAssetManager *         jniAssetMngr    = null;
         }                       _java;
         struct {
             JavaMethod< jboolean () >               isNetworkConnected;
             JavaMethod< void (jstring, jboolean) >  showToast;
-            JavaMethod< void () >                   createWindow;
+            //JavaMethod< void () >                 createWindow;
         }                       _methods;
 
         DRC_ONLY(
@@ -79,7 +88,7 @@ namespace AE::App
 
         Monitors_t      GetMonitors (bool update = false)                               __NE_OV;
 
-        RC<IVirtualFileStorage> OpenBuiltinStorage ()                                   __NE_OV;
+        RC<IVirtualFileStorage> OpenStorage (EAppStorage type)                          __NE_OV;
 
         ArrayView<const char*>  GetVulkanInstanceExtensions ()                          __NE_OV;
 
@@ -92,14 +101,14 @@ namespace AE::App
 
     // called from java
     private:
-        static void JNICALL  native_OnCreate (JNIEnv*, jclass, jobject app, jobject assetMngr)                      __NE___;
-        static void JNICALL  native_SetDirectories (JNIEnv*, jclass, jstring, jstring, jstring, jstring, jstring)   __NE___;
+        static void JNICALL  native_OnCreate (JNIEnv*, jclass, jobject app, jobject assetMngr)              __NE___;
+        static void JNICALL  native_SetDirectories (JNIEnv*, jclass, jstring, jstring, jstring, jstring)    __NE___;
         static void JNICALL  native_SetDisplayInfo (JNIEnv*, jclass, jint width, jint height,
-                                                    float xdpi, float ydpi, jint orientation)                       __NE___;
-        static void JNICALL  native_SetSystemInfo (JNIEnv*, jclass, jstring, jstring)                               __NE___;
+                                                    float xdpi, float ydpi, jint orientation)               __NE___;
+        static void JNICALL  native_SetSystemInfo (JNIEnv*, jclass, jstring, jstring)                       __NE___;
     public:
-        static jint  OnJniLoad (JavaVM* vm)                                                                         __NE___;
-        static void  OnJniUnload (JavaVM* vm)                                                                       __NE___;
+        static jint  OnJniLoad (JavaVM* vm)                                                                 __NE___;
+        static void  OnJniUnload (JavaVM* vm)                                                               __NE___;
     };
 
 
diff --git a/AE/engine/src/platform/Android/FileSystemAndroid.cpp b/AE/engine/src/platform/Android/FileSystemAndroid.cpp
index b41e6e39..4c8cc752 100644
--- a/AE/engine/src/platform/Android/FileSystemAndroid.cpp
+++ b/AE/engine/src/platform/Android/FileSystemAndroid.cpp
@@ -116,7 +116,7 @@ namespace
     ReadSeq
 =================================================
 */
-    Bytes  AndroidRStream::ReadSeq (OUT void *buffer, Bytes size) __NE___
+    Bytes  AndroidRStream::ReadSeq (OUT void* buffer, Bytes size) __NE___
     {
         ASSERT( IsOpen() );
         return Bytes{ CheckCast<ulong>( AAsset_read( _asset, OUT buffer, usize(size) ))};
@@ -163,14 +163,14 @@ namespace
     ReadBlock
 =================================================
 */
-    Bytes  AndroidRDataSource::ReadBlock (Bytes offset, OUT void *buffer, Bytes size) __NE___
+    Bytes  AndroidRDataSource::ReadBlock (const Bytes pos, OUT void* buffer, const Bytes size) __NE___
     {
         ASSERT( IsOpen() );
 
-        if ( _pos != offset )
+        if ( _pos != pos )
         {
-            CHECK_ERR( AAsset_seek( _asset, usize(offset), SEEK_SET ) != 0 );
-            _pos = offset;
+            CHECK_ERR( AAsset_seek( _asset, usize(pos), SEEK_SET ) != 0 );
+            _pos = pos;
         }
         return Bytes{ CheckCast<ulong>( AAsset_read( _asset, OUT buffer, usize(size) ))};
     }
@@ -258,17 +258,17 @@ namespace
     Open
 =================================================
 */
-    bool  FileSystemAndroid::Open (OUT RC<RStream> &outStream, const FileName &name) C_NE___
+    bool  FileSystemAndroid::Open (OUT RC<RStream> &outStream, FileNameRef name) C_NE___
     {
         return _Open<AndroidRStream>( OUT outStream, name );
     }
 
-    bool  FileSystemAndroid::Open (OUT RC<RDataSource> &outDS, const FileName &name) C_NE___
+    bool  FileSystemAndroid::Open (OUT RC<RDataSource> &outDS, FileNameRef name) C_NE___
     {
         return _Open<AndroidRDataSource>( OUT outDS, name );
     }
 
-    bool  FileSystemAndroid::Open (OUT RC<AsyncRDataSource> &outDS, const FileName &name) C_NE___
+    bool  FileSystemAndroid::Open (OUT RC<AsyncRDataSource> &outDS, FileNameRef name) C_NE___
     {
         Unused( outDS, name );
         return false;
@@ -280,7 +280,7 @@ namespace
 =================================================
 */
     template <typename ImplType, typename ResultType>
-    bool  FileSystemAndroid::_Open (OUT ResultType &result, const FileName &name) C_NE___
+    bool  FileSystemAndroid::_Open (OUT ResultType &result, FileNameRef name) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
 
@@ -290,7 +290,7 @@ namespace
             AAsset* asset = AAssetManager_open( _assetMngr, iter->second, AASSET_MODE_RANDOM );
             CHECK_ERR( asset != null );
 
-            result = MakeRC<ImplType>( asset, iter->second );   // throw
+            result = MakeRC<ImplType>( asset, iter->second );
             return true;
         }
         return false;
@@ -301,7 +301,7 @@ namespace
     Exists
 =================================================
 */
-    bool  FileSystemAndroid::Exists (const FileName &name) C_NE___
+    bool  FileSystemAndroid::Exists (FileNameRef name) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
 
@@ -309,7 +309,7 @@ namespace
         return iter != _map.end();
     }
 
-    bool  FileSystemAndroid::Exists (const FileGroupName &) C_NE___
+    bool  FileSystemAndroid::Exists (FileGroupNameRef) C_NE___
     {
         // not supported
         return false;
@@ -335,17 +335,17 @@ namespace
     _OpenByIter
 =================================================
 */
-    bool  FileSystemAndroid::_OpenByIter (OUT RC<RStream> &stream, const FileName &name, const void* ref) C_NE___
+    bool  FileSystemAndroid::_OpenByIter (OUT RC<RStream> &stream, FileNameRef name, const void* ref) C_NE___
     {
         return _OpenByIter2<AndroidRStream>( OUT stream, name, ref, AASSET_MODE_STREAMING );
     }
 
-    bool  FileSystemAndroid::_OpenByIter (OUT RC<RDataSource> &ds, const FileName &name, const void* ref) C_NE___
+    bool  FileSystemAndroid::_OpenByIter (OUT RC<RDataSource> &ds, FileNameRef name, const void* ref) C_NE___
     {
         return _OpenByIter2<AndroidRDataSource>( OUT ds, name, ref, AASSET_MODE_RANDOM );
     }
 
-    bool  FileSystemAndroid::_OpenByIter (OUT RC<AsyncRDataSource> &ds, const FileName &name, const void* ref) C_NE___
+    bool  FileSystemAndroid::_OpenByIter (OUT RC<AsyncRDataSource> &ds, FileNameRef name, const void* ref) C_NE___
     {
         Unused( ds, name, ref );
         return false;
@@ -357,7 +357,7 @@ namespace
 =================================================
 */
     template <typename ImplType, typename ResultType>
-    bool  FileSystemAndroid::_OpenByIter2 (OUT ResultType &result, const FileName &name, const void* ref, int mode) C_NE___
+    bool  FileSystemAndroid::_OpenByIter2 (OUT ResultType &result, FileNameRef name, const void* ref, int mode) C_NE___
     {
         DRC_SHAREDLOCK( _drCheck );
 
diff --git a/AE/engine/src/platform/Android/FileSystemAndroid.h b/AE/engine/src/platform/Android/FileSystemAndroid.h
index f9c69882..ed7e0eab 100644
--- a/AE/engine/src/platform/Android/FileSystemAndroid.h
+++ b/AE/engine/src/platform/Android/FileSystemAndroid.h
@@ -41,7 +41,7 @@ namespace AE::App
         bool        SeekSet (Bytes newPos)                  __NE_OV;
         bool        SeekFwd (Bytes offset)                  __NE_OV;
 
-        Bytes       ReadSeq (OUT void *buffer, Bytes size)  __NE_OV;
+        Bytes       ReadSeq (OUT void* buffer, Bytes size)  __NE_OV;
     };
 
 
@@ -113,24 +113,24 @@ namespace AE::App
 
 
       // IVirtualFileStorage //
-        bool  Open (OUT RC<RStream> &stream, const FileName &name)                                  C_NE_OV;
-        bool  Open (OUT RC<RDataSource> &ds, const FileName &name)                                  C_NE_OV;
-        bool  Open (OUT RC<AsyncRDataSource> &ds, const FileName &name)                             C_NE_OV;
+        bool  Open (OUT RC<RStream> &stream, FileNameRef name)                                      C_NE_OV;
+        bool  Open (OUT RC<RDataSource> &ds, FileNameRef name)                                      C_NE_OV;
+        bool  Open (OUT RC<AsyncRDataSource> &ds, FileNameRef name)                                 C_NE_OV;
 
-        bool  Exists (const FileName &name)                                                         C_NE_OV;
-        bool  Exists (const FileGroupName &name)                                                    C_NE_OV;
+        bool  Exists (FileNameRef name)                                                             C_NE_OV;
+        bool  Exists (FileGroupNameRef name)                                                        C_NE_OV;
 
     private:
         void  _Append (INOUT GlobalFileMap_t &)                                                     C_Th_OV;
-        bool  _OpenByIter (OUT RC<RStream> &stream, const FileName &name, const void* ref)          C_NE_OV;
-        bool  _OpenByIter (OUT RC<RDataSource> &ds, const FileName &name, const void* ref)          C_NE_OV;
-        bool  _OpenByIter (OUT RC<AsyncRDataSource> &ds, const FileName &name, const void* ref)     C_NE_OV;
+        bool  _OpenByIter (OUT RC<RStream> &stream, FileNameRef name, const void* ref)              C_NE_OV;
+        bool  _OpenByIter (OUT RC<RDataSource> &ds, FileNameRef name, const void* ref)              C_NE_OV;
+        bool  _OpenByIter (OUT RC<AsyncRDataSource> &ds, FileNameRef name, const void* ref)         C_NE_OV;
 
         template <typename ImplType, typename ResultType>
-        ND_ bool  _Open (OUT ResultType &, const FileName &name)                                    C_NE___;
+        ND_ bool  _Open (OUT ResultType &, FileNameRef name)                                        C_NE___;
 
         template <typename ImplType, typename ResultType>
-        ND_ bool  _OpenByIter2 (OUT ResultType &, const FileName &name, const void* ref, int mode)  C_NE___;
+        ND_ bool  _OpenByIter2 (OUT ResultType &, FileNameRef name, const void* ref, int mode)      C_NE___;
     };
 
 
diff --git a/AE/engine/src/platform/Android/InputActionsAndroid.cpp b/AE/engine/src/platform/Android/InputActionsAndroid.cpp
index 1f70bdaf..09440952 100644
--- a/AE/engine/src/platform/Android/InputActionsAndroid.cpp
+++ b/AE/engine/src/platform/Android/InputActionsAndroid.cpp
@@ -68,7 +68,7 @@ namespace AE::App
             TYPE_GRAVITY                = 9,    // [3]
             TYPE_GYROSCOPE              = 4,    // [3]
             TYPE_LINEAR_ACCELERATION    = 10,   // [3]
-            TYPE_ROTATION_VECTOR        = 11,   // [4]
+            TYPE_ROTATION_VECTOR        = 11,   // [5]
         };
 
         EInputType  type = Default;
@@ -152,7 +152,7 @@ namespace AE::App
     SetQueue
 =================================================
 */
-    void  InputActionsAndroid::SetQueue (DubleBufferedQueue *q) __NE___
+    void  InputActionsAndroid::SetQueue (DubleBufferedQueue* q) __NE___
     {
         CHECK_ERRV( q != null );
 
diff --git a/AE/engine/src/platform/Android/Java.cpp b/AE/engine/src/platform/Android/Java.cpp
index 69c6e0ba..63421f7e 100644
--- a/AE/engine/src/platform/Android/Java.cpp
+++ b/AE/engine/src/platform/Android/Java.cpp
@@ -25,7 +25,7 @@ namespace {
     constructor
 =================================================
 */
-    JavaEnv::JavaEnv (JNIEnv *env) __NE___ :
+    JavaEnv::JavaEnv (JNIEnv* env) __NE___ :
         _env{ env }
     {
         Attach();
@@ -116,7 +116,7 @@ namespace {
     SetVM
 =================================================
 */
-    void JavaEnv::SetVM (JavaVM *ptr) __NE___
+    void JavaEnv::SetVM (JavaVM* ptr) __NE___
     {
         ASSERT( GetJavaVM() == null );
 
diff --git a/AE/engine/src/platform/Android/Java.h b/AE/engine/src/platform/Android/Java.h
index 4e9edb78..71f38ea1 100644
--- a/AE/engine/src/platform/Android/Java.h
+++ b/AE/engine/src/platform/Android/Java.h
@@ -49,7 +49,7 @@ namespace AE::Java
 
     // methods
     public:
-        explicit JavaEnv (JNIEnv *env)                  __NE___;
+        explicit JavaEnv (JNIEnv* env)                  __NE___;
         JavaEnv ()                                      __NE___;
         ~JavaEnv ()                                     __NE___;
 
@@ -58,12 +58,12 @@ namespace AE::Java
 
             void  ThrowException (NtStringView msg)     C_NE___;
             void  ExceptionClear ()                     C_NE___;
-        ND_ bool HasException ()                        C_NE___;
+        ND_ bool  HasException ()                       C_NE___;
 
-        ND_ JNIEnv* Env ()                              C_NE___ { ASSERT( _env );  return _env; }
-        ND_ JNIEnv* operator -> ()                      C_NE___ { ASSERT( _env );  return _env; }
+        ND_ JNIEnv*  Env ()                             C_NE___ { ASSERT( _env );  return _env; }
+        ND_ JNIEnv*  operator -> ()                     C_NE___ { ASSERT( _env );  return _env; }
 
-            static void SetVM (JavaVM *ptr)             __NE___;
+            static void  SetVM (JavaVM* ptr)            __NE___;
     };
 
 
@@ -167,7 +167,7 @@ namespace AE::Java
             ND_ jarray_t        Get ()          C_NE___ { return _jarray; }                             \
                                                                                                         \
         private:                                                                                        \
-            void _Release ()                                                                            \
+            void  _Release ()                                                                           \
             {                                                                                           \
                 if ( _fromNative )                                                                      \
                 {                                                                                       \
@@ -231,6 +231,8 @@ namespace AE::Java
         ND_ usize           size ()                                     C_NE___ { return _length; }
 
         ND_ operator StringView ()                                      C_NE___ { return StringView{ c_str(), length() }; }
+        ND_ explicit operator String ()                                 C_Th___ { return String{ c_str(), length() }; }
+        ND_ explicit operator Path ()                                   C_Th___ { return Path{StringView{ c_str(), length() }}; }
 
     private:
         void  _Release ();
@@ -649,7 +651,7 @@ namespace AE::Java
         struct JniTypeName< T* >
         {
             using type = T*;
-            static void Append (INOUT String &s) __Th___ { s += '['; JniTypeName<T>::Append( INOUT s ); }
+            static void  Append (INOUT String &s) __Th___ { s += '['; JniTypeName<T>::Append( INOUT s ); }
         };
 
 
@@ -673,7 +675,7 @@ namespace AE::Java
         public:
             JavaMethodSignature () __NE___
             {
-                try {
+                TRY{
                     _sig += '(';
 
                     if constexpr( CountOf< Args... >() > 0 )
@@ -682,9 +684,9 @@ namespace AE::Java
                     _sig += ')';
                     JniTypeName<Ret>::Append( INOUT _sig );
                 }
-                catch (...) {
+                CATCH_ALL(
                     _sig.clear();
-                }
+                )
             }
 
             ND_ String const&  signature ()     C_NE___ { return _sig; }
diff --git a/AE/engine/src/platform/Android/SerializableInputActionsAndroid.cpp b/AE/engine/src/platform/Android/SerializableInputActionsAndroid.cpp
index 37ca5bd6..827dd4a3 100644
--- a/AE/engine/src/platform/Android/SerializableInputActionsAndroid.cpp
+++ b/AE/engine/src/platform/Android/SerializableInputActionsAndroid.cpp
@@ -15,7 +15,7 @@ namespace AE::App
 # ifdef AE_PLATFORM_ANDROID
 
     #define AE_ANDROID_KEY_CODES_VISITOR( _key_, _code_, _name_, _and_code_ ) \
-        STATIC_ASSERT( uint(SerializableInputActionsAndroid::EInputType::_key_) == uint(_and_code_) );
+        StaticAssert( uint(SerializableInputActionsAndroid::EInputType::_key_) == uint(_and_code_) );
 
     AE_ANDROID_KEY_CODES( AE_ANDROID_KEY_CODES_VISITOR )
     #undef AE_ANDROID_KEY_CODES_VISITOR
@@ -182,15 +182,15 @@ namespace {
 
             binder.AddValue( "MultiTouch",          EInputType::MultiTouch );
 
-            STATIC_ASSERT( uint(EInputType::Cursor2DBegin) == 523 );
-            STATIC_ASSERT( uint(EInputType::Cursor2DEnd)   == 526 );
+            StaticAssert( uint(EInputType::Cursor2DBegin) == 523 );
+            StaticAssert( uint(EInputType::Cursor2DEnd)   == 526 );
             binder.AddValue( "TouchPos",            EInputType::TouchPos );
             binder.AddValue( "TouchPos_mm",         EInputType::TouchPos_mm );
             binder.AddValue( "TouchDelta",          EInputType::TouchDelta );
             binder.AddValue( "TouchDelta_norm",     EInputType::TouchDelta_norm );
 
-            STATIC_ASSERT( uint(EInputType::Sensors1fBegin) == 527 );
-            STATIC_ASSERT( uint(EInputType::Sensors1fEnd)   == 533 );
+            StaticAssert( uint(EInputType::Sensors1fBegin) == 527 );
+            StaticAssert( uint(EInputType::Sensors1fEnd)   == 533 );
             binder.AddValue( "AirTemperature",      EInputType::AirTemperature );
             binder.AddValue( "AmbientLight",        EInputType::AmbientLight );
             binder.AddValue( "AirPressure",         EInputType::AirPressure );
@@ -199,12 +199,12 @@ namespace {
             binder.AddValue( "StepCount",           EInputType::StepCount );
             binder.AddValue( "BatteryState",        EInputType::BatteryState );
 
-            STATIC_ASSERT( uint(EInputType::Sensors2dBegin) == 534 );
-            STATIC_ASSERT( uint(EInputType::Sensors2dEnd)   == 534 );
+            StaticAssert( uint(EInputType::Sensors2dBegin) == 534 );
+            StaticAssert( uint(EInputType::Sensors2dEnd)   == 534 );
             binder.AddValue( "GeoLocation",         EInputType::GeoLocation );
 
-            STATIC_ASSERT( uint(EInputType::Sensors3fBegin) == 535 );
-            STATIC_ASSERT( uint(EInputType::Sensors3fEnd)   == 540 );
+            StaticAssert( uint(EInputType::Sensors3fBegin) == 535 );
+            StaticAssert( uint(EInputType::Sensors3fEnd)   == 540 );
             binder.AddValue( "Accelerometer",       EInputType::Accelerometer );
             binder.AddValue( "Gravity",             EInputType::Gravity );
             binder.AddValue( "Gyroscope",           EInputType::Gyroscope );
@@ -212,8 +212,8 @@ namespace {
             binder.AddValue( "MagneticField",       EInputType::MagneticField );
             binder.AddValue( "RotationVector",      EInputType::RotationVector );
 
-            STATIC_ASSERT( uint(EInputType::Sensors4x4fBegin) == 541 );
-            STATIC_ASSERT( uint(EInputType::Sensors4x4fEnd)   == 541 );
+            StaticAssert( uint(EInputType::Sensors4x4fBegin) == 541 );
+            StaticAssert( uint(EInputType::Sensors4x4fEnd)   == 541 );
             binder.AddValue( "Pose6DOF",            EInputType::Pose6DOF );
         }
 
diff --git a/AE/engine/src/platform/Android/SerializableInputActionsAndroid.h b/AE/engine/src/platform/Android/SerializableInputActionsAndroid.h
index 8e6f5342..a4c796b5 100644
--- a/AE/engine/src/platform/Android/SerializableInputActionsAndroid.h
+++ b/AE/engine/src/platform/Android/SerializableInputActionsAndroid.h
@@ -80,7 +80,7 @@ namespace AE::App
             _visitor_( Key_Delete,          67,     "Delete",           AKEYCODE_DEL                )\
             _visitor_( Key_Grave,           68,     "Grave",            AKEYCODE_GRAVE              )   /* '`' */\
             _visitor_( Key_Minus,           69,     "Minus",            AKEYCODE_MINUS              )   /* '-' */\
-            _visitor_( Key_Equals,          70,     "Equals",           AKEYCODE_EQUALS             )   /* '=' */\
+            _visitor_( Key_Equals,          70,     "Equal",            AKEYCODE_EQUALS             )   /* '=' */\
             _visitor_( Key_LeftBracket,     71,     "LeftBracket",      AKEYCODE_LEFT_BRACKET       )   /* '[' */\
             _visitor_( Key_RightBracket,    72,     "RightBracket",     AKEYCODE_RIGHT_BRACKET      )   /* ']' */\
             _visitor_( Key_BackSlash,       73,     "BackSlash",        AKEYCODE_BACKSLASH          )   /* '\' */\
diff --git a/AE/engine/src/platform/Android/WindowAndroid.cpp b/AE/engine/src/platform/Android/WindowAndroid.cpp
index 52e69fae..678e44cc 100644
--- a/AE/engine/src/platform/Android/WindowAndroid.cpp
+++ b/AE/engine/src/platform/Android/WindowAndroid.cpp
@@ -225,7 +225,7 @@ namespace {
     native_OnCreate
 =================================================
 */
-    WindowAndroid::WinID JNICALL  WindowAndroid::native_OnCreate (JNIEnv *env, jclass, jobject jwnd) __NE___
+    WindowAndroid::WinID JNICALL  WindowAndroid::native_OnCreate (JNIEnv* env, jclass, jobject jwnd) __NE___
     {
         auto [window, id] = ApplicationAndroid::_GetNewWindow();
 
@@ -346,7 +346,7 @@ namespace {
     native_SurfaceChanged
 =================================================
 */
-    void JNICALL  WindowAndroid::native_SurfaceChanged (JNIEnv *env, jclass, WinID wndId, jobject surface) __NE___
+    void JNICALL  WindowAndroid::native_SurfaceChanged (JNIEnv* env, jclass, WinID wndId, jobject surface) __NE___
     {
         if_likely( auto window = GetAppWindow( wndId ))
         {
diff --git a/AE/engine/src/platform/Android/WindowAndroid.h b/AE/engine/src/platform/Android/WindowAndroid.h
index f27674b2..23cb4bb5 100644
--- a/AE/engine/src/platform/Android/WindowAndroid.h
+++ b/AE/engine/src/platform/Android/WindowAndroid.h
@@ -7,7 +7,6 @@
 #ifdef AE_PLATFORM_ANDROID
 # include "platform/Public/Common.h"
 # include "platform/Private/WindowBase.h"
-# include "platform/Android/Java.h"
 # include "platform/Android/InputActionsAndroid.h"
 # include "platform/Private/WindowSurface.h"
 
diff --git a/AE/engine/src/platform/DefaultV1/AppConfig.h b/AE/engine/src/platform/BaseAppV1/AppConfig.h
similarity index 91%
rename from AE/engine/src/platform/DefaultV1/AppConfig.h
rename to AE/engine/src/platform/BaseAppV1/AppConfig.h
index a3b77d69..8e6f192f 100644
--- a/AE/engine/src/platform/DefaultV1/AppConfig.h
+++ b/AE/engine/src/platform/BaseAppV1/AppConfig.h
@@ -36,8 +36,9 @@ namespace AE::AppV1
         GraphicsCreateInfo  graphics;
         ThreadConfig        threading;
         WindowDesc          window;
+        bool                enableNetwork   = false;
 
-        bool                enableVR    = false;
+        bool                enableVR        = false;
         VRDeviceTypes       vrDevices;
         VRImageDesc         vr;
     };
diff --git a/AE/engine/src/platform/BaseAppV1/DefaultAppV1.cpp b/AE/engine/src/platform/BaseAppV1/DefaultAppV1.cpp
new file mode 100644
index 00000000..15151aa1
--- /dev/null
+++ b/AE/engine/src/platform/BaseAppV1/DefaultAppV1.cpp
@@ -0,0 +1,372 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "platform/BaseAppV1/DefaultAppV1.h"
+
+#include "platform/Android/AndroidCommon.h"
+#include "platform/GLFW/GLFWCommon.h"
+#include "platform/WinAPI/WinAPICommon.h"
+#include "platform/OpenVR/OpenVRCommon.h"
+
+// Enable it if you have very rare bug with synchs.
+// When Vulkan validation reports error put breakpoint in 'log.clear();' and check 'log' content.
+#define ENABLE_SYNC_LOG     0
+#if ENABLE_SYNC_LOG
+#   include "VulkanSyncLog.h"
+#endif
+
+namespace AE::AppV1
+{
+    using namespace AE::Threading;
+    using namespace AE::Graphics;
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    AppCoreV1::AppCoreV1 (const AppConfig &cfg, RC<IBaseApp> impl) __NE___ :
+        _device{ True{"enable info log"} },
+        _impl{ RVRef(impl) },
+        _config{ cfg }
+    {
+        CHECK( _config.graphics.maxFrames <= _config.graphics.swapchain.minImageCount );
+
+        TaskScheduler::InstanceCtor::Create();
+        VFS::VirtualFileSystem::InstanceCtor::Create();
+
+        CHECK_FATAL( ThreadMngr::SetupThreads( _config.threading,
+                                               _config.threading.mask,
+                                               _config.threading.maxThreads,
+                                               True{"bind threads to physical cores"},
+                                               OUT _allowProcessInMain ));
+
+        if ( _config.enableNetwork )
+            CHECK_FATAL( Networking::SocketService::Instance().Initialize() );
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    AppCoreV1::~AppCoreV1 () __NE___
+    {
+        _windows.clear();
+
+        Scheduler().Release();
+
+        if ( _config.enableNetwork )
+            Networking::SocketService::Instance().Deinitialize();
+
+        VFS::VirtualFileSystem::InstanceCtor::Destroy();
+        TaskScheduler::InstanceCtor::Destroy();
+    }
+
+/*
+=================================================
+    BeforeWndUpdate
+=================================================
+*/
+    void  AppCoreV1::BeforeWndUpdate (IApplication &) __NE___
+    {
+        PROFILE_ONLY({
+            auto    profiler = Scheduler().GetProfiler();
+            if ( profiler )
+                profiler->EndNonTaskWork( this, "NativeApp" );
+        })
+
+
+        Ptr<IWindow>    active_wnd;
+        Ptr<IVRDevice>  active_vr;
+
+        for (auto& wnd : _windows) {
+            if ( wnd->GetState() == IWindow::EState::Focused )
+                active_wnd = wnd.get();
+        }
+
+        if ( _vrDevice and _vrDevice->GetState() == IWindow::EState::Focused )
+            active_vr = _vrDevice.get();
+
+        _impl->WaitFrame( GetMainThreadMask(), active_wnd, active_vr );
+    }
+
+/*
+=================================================
+    AfterWndUpdate
+=================================================
+*/
+    void  AppCoreV1::AfterWndUpdate (IApplication &app) __NE___
+    {
+        _impl->RenderFrame();
+
+        #if ENABLE_SYNC_LOG
+        {
+            String  log;
+            VulkanSyncLog::GetLog( OUT log );
+            log.clear();
+        }
+        #endif
+
+        PROFILE_ONLY({
+            auto    profiler = Scheduler().GetProfiler();
+            if ( profiler )
+                profiler->BeginNonTaskWork( this, "NativeApp" );
+        })
+
+        // terminate application if main window has been closed
+        if_unlikely( _windows.empty() or _windows[0]->GetState() == IWindow::EState::Destroyed )
+        {
+            if ( _vrDevice )
+                _vrDevice.reset();
+
+            app.Terminate();
+        }
+    }
+
+/*
+=================================================
+    OnStart
+=================================================
+*/
+    void  AppCoreV1::OnStart (IApplication &app) __NE___
+    {
+        CHECK_FATAL( _InitGraphics( app ));
+    }
+
+/*
+=================================================
+    _OnStartImpl
+=================================================
+*/
+    bool  AppCoreV1::_OnStartImpl (IApplication &app) __NE___
+    {
+        // create window
+        {
+            auto    wnd = app.CreateWindow( MakeUnique<AppCoreV1::WindowEventListener>( _impl, *this ), _config.window );
+            CHECK_ERR( wnd );
+            _windows.emplace_back( RVRef(wnd) );
+        }
+
+        // create second window
+        #if 0
+        {
+            WindowDesc  desc = _config.window;
+            desc.title << "-2";
+
+            auto    wnd = app.CreateWindow( MakeUnique<AppCoreV1::WindowEventListener>( _impl, *this ), desc, &_windows[0]->InputActions() );
+            CHECK_ERR( wnd );
+            _windows.emplace_back( RVRef(wnd) );
+        }
+        #endif
+
+        // create VR device
+        if ( _config.enableVR and _windows.size() >= 1 )
+        {
+            const auto  CreateVR = [this, &app] (IVRDevice::EDeviceType type) -> bool
+            {{
+                _vrDevice = app.CreateVRDevice( MakeUnique<AppCoreV1::VRDeviceEventListener>( _impl, *this ), &_windows[0]->InputActions(), type );
+                return _vrDevice and _vrDevice->CreateRenderSurface( _config.vr );
+            }};
+
+            ASSERT( not _config.vrDevices.empty() );
+
+            for (auto type : _config.vrDevices) {
+                if ( CreateVR( type )) break;
+            }
+
+            if ( _vrDevice )
+            {
+                IVRDevice::Settings     settings;
+                settings.cameraClipPlanes   = { 0.1f, 100.f };
+
+                Unused( _vrDevice->Setup( settings ));
+            }
+        }
+
+        return true;
+    }
+
+/*
+=================================================
+    OnStop
+=================================================
+*/
+    void  AppCoreV1::OnStop (IApplication &) __NE___
+    {
+        if ( _impl )
+        {
+            _impl->WaitFrame( GetMainThreadMask(), null, null );
+            _impl = null;
+        }
+        _windows.clear();
+
+        _DestroyGraphics();
+    }
+
+/*
+=================================================
+    _InitGraphics
+=================================================
+*/
+    bool  AppCoreV1::_InitGraphics (IApplication &app)
+    {
+        if_unlikely( _device.IsInitialized() )
+            return true;
+
+        RenderTaskScheduler::InstanceCtor::Create( _device );
+
+      #ifdef AE_ENABLE_VULKAN
+        CHECK_ERR( _device.Init( _config.graphics, app.GetVulkanInstanceExtensions() ));
+
+        #if ENABLE_SYNC_LOG
+        {
+            FlatHashMap<VkQueue, String>    qnames;
+
+            for (auto& q : _device.GetQueues()) {
+                qnames.emplace( q.handle, q.debugName );
+            }
+            VulkanSyncLog::Initialize( INOUT _device.EditDeviceFnTable(), RVRef(qnames) );
+            VulkanSyncLog::Enable();
+        }
+        #endif
+
+      #elif defined(AE_ENABLE_METAL) and defined(AE_ENABLE_REMOTE_GRAPHICS)
+        CHECK_ERR( _device.Init( _config.graphics ));
+
+      #else
+      # error not implemented
+      #endif
+
+        CHECK_ERR( _device.CheckConstantLimits() );
+        CHECK_ERR( _device.CheckExtensions() );
+
+        CHECK_ERR( GraphicsScheduler().Initialize( _config.graphics ));
+        return true;
+    }
+
+/*
+=================================================
+    _DestroyGraphics
+=================================================
+*/
+    void  AppCoreV1::_DestroyGraphics ()
+    {
+        if_unlikely( not _device.IsInitialized() )
+            return;
+
+        #if ENABLE_SYNC_LOG
+            VulkanSyncLog::Deinitialize( INOUT _device.EditDeviceFnTable() );
+        #endif
+
+        Unused( GraphicsScheduler().WaitAll( AE::DefaultTimeout )); // TODO ???
+
+        RenderTaskScheduler::InstanceCtor::Destroy();
+
+        CHECK_ERRV( _device.DestroyLogicalDevice() );
+        CHECK_ERRV( _device.DestroyInstance() );
+    }
+
+/*
+=================================================
+    OnStateChanged
+=================================================
+*/
+    void  AppCoreV1::WindowEventListener::OnStateChanged (IWindow &wnd, EState state) __NE___
+    {
+        BEGIN_ENUM_CHECKS();
+        switch ( state )
+        {
+            case EState::InForeground :
+            case EState::Focused :
+                _impl->StartRendering( &wnd.InputActions(), &wnd.GetSurface(), state );
+                break;
+
+            case EState::InBackground :
+            case EState::Stopped :
+            case EState::Destroyed :
+                _impl->StopRendering( &wnd.GetSurface() );
+                _impl->WaitFrame( _app.GetMainThreadMask(), null, null );
+                break;
+
+            case EState::Created :
+            case EState::Unknown :
+            case EState::Started :
+                break;
+
+            default :
+                DBG_WARNING( "unsupported window state" );
+                break;
+        }
+        END_ENUM_CHECKS();
+    }
+
+/*
+=================================================
+    OnSurfaceCreated
+=================================================
+*/
+    void  AppCoreV1::WindowEventListener::OnSurfaceCreated (IWindow &wnd) __NE___
+    {
+        // create render surface
+        CHECK_FATAL( wnd.CreateRenderSurface( _app.GetConfig().graphics.swapchain ));
+
+        _impl->StartRendering( &wnd.InputActions(), &wnd.GetSurface(), EState::InForeground );
+
+        CHECK_FATAL( _impl->OnSurfaceCreated( wnd ));
+    }
+
+/*
+=================================================
+    OnSurfaceDestroyed
+=================================================
+*/
+    void  AppCoreV1::WindowEventListener::OnSurfaceDestroyed (IWindow &) __NE___
+    {
+        _impl->StopRendering( null );
+        _impl->WaitFrame( _app.GetMainThreadMask(), null, null );
+
+        // 'WaitFrame' may not process any task, so we need to process them here too.
+        Unused( Scheduler().ProcessTasks( _app.GetMainThreadMask(), Scheduler().GetDefaultSeed() ));
+
+        Unused( GraphicsScheduler().WaitAll( AE::DefaultTimeout ));
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    OnStateChanged
+=================================================
+*/
+    void  AppCoreV1::VRDeviceEventListener::OnStateChanged (IVRDevice &vr, EState state) __NE___
+    {
+        BEGIN_ENUM_CHECKS();
+        switch ( state )
+        {
+            case EState::InForeground :
+            case EState::Focused :
+                _impl->StartRendering( &vr.InputActions(), &vr.GetSurface(), state );
+                break;
+
+            case EState::InBackground :
+            case EState::Stopped :
+            case EState::Destroyed :
+                _impl->StopRendering( &vr.GetSurface() );
+                _impl->WaitFrame( _app.GetMainThreadMask(), null, null );
+                break;
+
+            case EState::Created :
+            case EState::Unknown :
+            case EState::Started :
+                break;
+
+            default :
+                DBG_WARNING( "unsupported VR state" );
+                break;
+        }
+        END_ENUM_CHECKS();
+    }
+
+
+} // AE::AppV1
diff --git a/AE/engine/src/platform/DefaultV1/DefaultAppV1.h b/AE/engine/src/platform/BaseAppV1/DefaultAppV1.h
similarity index 62%
rename from AE/engine/src/platform/DefaultV1/DefaultAppV1.h
rename to AE/engine/src/platform/BaseAppV1/DefaultAppV1.h
index e7f67ba3..eaf446fb 100644
--- a/AE/engine/src/platform/DefaultV1/DefaultAppV1.h
+++ b/AE/engine/src/platform/BaseAppV1/DefaultAppV1.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include "platform/Public/IApplication.h"
-#include "platform/DefaultV1/AppConfig.h"
-#include "platform/DefaultV1/IBaseApp.h"
+#include "platform/BaseAppV1/AppConfig.h"
+#include "platform/BaseAppV1/IBaseApp.h"
 
 #if defined(AE_ENABLE_VULKAN)
 #   include "graphics/Vulkan/VDevice.h"
@@ -27,18 +27,24 @@ namespace AE::AppV1
     // Application Event Listener
     //
 
-    class DefaultAppListener : public IApplication::IAppListener
+    class AppCoreV1 : public IApplication::IAppListener
     {
+    // types
+    private:
+        class WindowEventListener;
+        class VRDeviceEventListener;
+
+
     // variables
     private:
       #if defined(AE_ENABLE_VULKAN)
-        Graphics::VDeviceInitializer    _vulkan;
+        Graphics::VDeviceInitializer    _device;
 
       #elif defined(AE_ENABLE_METAL)
-        Graphics::MDeviceInitializer    _metal;
+        Graphics::MDeviceInitializer    _device;
 
       #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        Graphics::RDeviceInitializer    _remote;
+        Graphics::RDeviceInitializer    _device;
 
       #else
       # error not implemented
@@ -54,13 +60,15 @@ namespace AE::AppV1
 
     // methods
     protected:
-        explicit DefaultAppListener (const AppConfig &, RC<IBaseApp>)   __NE___;
+        explicit AppCoreV1 (const AppConfig &, RC<IBaseApp>)    __NE___;
     public:
-        ~DefaultAppListener ()                          __NE_OV;
+        ~AppCoreV1 ()                           __NE_OV;
 
         ND_ AppConfig const&    GetConfig ()            C_NE___ { return _config; }
         ND_ IBaseApp &          GetBaseApp ()           __NE___ { return *_impl; }
 
+        ND_ auto const&         GetMainThreadMask ()    C_NE___ { return _allowProcessInMain; }
+
 
     // IAppListener //
         void  OnStart (IApplication &)                  __NE_OV;
@@ -74,21 +82,8 @@ namespace AE::AppV1
         ND_ bool  _OnStartImpl (IApplication &app)      __NE___;
 
     private:
-      #if defined(AE_ENABLE_VULKAN)
-        bool  _CreateVulkan (IApplication &app);
-        bool  _DestroyVulkan ();
-
-      #elif defined(AE_ENABLE_METAL)
-        bool  _CreateMetal (IApplication &app);
-        bool  _DestroyMetal ();
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        bool  _CreateRemoteGraphics (IApplication &app);
-        bool  _DestroyRemoteGraphics ();
-
-      #else
-      # error not implemented
-      #endif
+        ND_ bool  _InitGraphics (IApplication &);
+            void  _DestroyGraphics ();
     };
 
 
@@ -97,17 +92,17 @@ namespace AE::AppV1
     // Window Event Listener
     //
 
-    class DefaultIWndListener final : public IWindow::IWndListener
+    class AppCoreV1::WindowEventListener final : public IWindow::IWndListener
     {
     // variables
     private:
         RC<IBaseApp>            _impl;
-        DefaultAppListener &    _app;
+        AppCoreV1 & _app;
 
 
     // methods
     public:
-        DefaultIWndListener (RC<IBaseApp> impl, DefaultAppListener &app) __NE___ :
+        WindowEventListener (RC<IBaseApp> impl, AppCoreV1 &app) __NE___ :
             _impl{RVRef(impl)}, _app{app}
         {}
 
@@ -124,17 +119,18 @@ namespace AE::AppV1
     // VR Device Listener
     //
 
-    class DefaultVRDeviceListener final : public IVRDevice::IVRDeviceEventListener
+    class AppCoreV1::VRDeviceEventListener final : public IVRDevice::IVRDeviceEventListener
     {
     // variables
     private:
-        RC<IBaseApp>    _impl;
+        RC<IBaseApp>            _impl;
+        AppCoreV1 & _app;
 
 
     // methods
     public:
-        DefaultVRDeviceListener (RC<IBaseApp> impl, DefaultAppListener &) __NE___ :
-            _impl{RVRef(impl)}
+        VRDeviceEventListener (RC<IBaseApp> impl, AppCoreV1 &app) __NE___ :
+            _impl{RVRef(impl)}, _app{app}
         {}
 
 
diff --git a/AE/engine/src/platform/DefaultV1/IBaseApp.h b/AE/engine/src/platform/BaseAppV1/IBaseApp.h
similarity index 98%
rename from AE/engine/src/platform/DefaultV1/IBaseApp.h
rename to AE/engine/src/platform/BaseAppV1/IBaseApp.h
index 2db7243c..f72c7101 100644
--- a/AE/engine/src/platform/DefaultV1/IBaseApp.h
+++ b/AE/engine/src/platform/BaseAppV1/IBaseApp.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include "platform/DefaultV1/AppConfig.h"
+#include "platform/BaseAppV1/AppConfig.h"
 
 namespace AE::AppV1
 {
diff --git a/AE/engine/src/platform/DefaultV2/DefaultAppV2.cpp b/AE/engine/src/platform/BaseAppV2/DefaultAppV2.cpp
similarity index 60%
rename from AE/engine/src/platform/DefaultV2/DefaultAppV2.cpp
rename to AE/engine/src/platform/BaseAppV2/DefaultAppV2.cpp
index 96575b14..8333a2d7 100644
--- a/AE/engine/src/platform/DefaultV2/DefaultAppV2.cpp
+++ b/AE/engine/src/platform/BaseAppV2/DefaultAppV2.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "platform/DefaultV2/DefaultAppV2.h"
+#include "platform/BaseAppV2/DefaultAppV2.h"
+#include "graphics/RenderGraph/RenderGraphImpl.h"
 
 #include "platform/Android/AndroidCommon.h"
 #include "platform/GLFW/GLFWCommon.h"
@@ -85,11 +86,11 @@ namespace AE::AppV2
     bool  AppCore::_InitVFS (IApplication &app) __NE___
     {
       #ifdef AE_PLATFORM_ANDROID
-        auto    assets = app.OpenBuiltinStorage();
+        auto    assets = app.OpenStorage( EAppStorage::Builtin );
         CHECK_ERR( assets );
 
         RC<RDataSource> ds;
-        CHECK_ERR( assets->Open( OUT ds, VFS::FileName{"resources.bin"} )); 
+        CHECK_ERR( assets->Open( OUT ds, VFS::FileName{"resources.bin"} ));
 
         auto    storage = VFS::VirtualFileStorageFactory::CreateStaticArchive( RVRef(ds) );
       #else
@@ -99,6 +100,8 @@ namespace AE::AppV2
 
         CHECK_ERR( storage );
         CHECK_ERR( GetVFS().AddStorage( storage ));
+
+        GetVFS().MakeImmutable();
         return true;
     }
 
@@ -215,20 +218,9 @@ namespace AE::AppV2
     WaitFrame
 =================================================
 */
-    void  AppCore::WaitFrame (const EThreadArray &threads) __NE___
+    void  AppCore::WaitFrame (const Threading::EThreadArray &threads) __NE___
     {
-        AsyncTask   task;
-        std::swap( task, _mainLoop->endFrame );
-
-        for (;;)
-        {
-            if ( task == null or task->IsFinished() )
-                break;
-
-            Scheduler().ProcessTasks( threads, 0 );
-
-            Scheduler().DbgDetectDeadlock();
-        }
+        CHECK( GraphicsScheduler().WaitNextFrame( threads, AE::DefaultTimeout ));
     }
 
 /*
@@ -238,12 +230,11 @@ namespace AE::AppV2
 */
     void  AppCore::RenderFrame () __NE___
     {
-        _mainLoop->endFrame = null;
-
         Ptr<IInputActions>      input;
         Ptr<IOutputSurface>     output;
         RC<IViewMode>           mode;
-        auto&                   rts     = RenderTaskScheduler();
+        auto&                   rts     = GraphicsScheduler();
+        auto                    rg      = rts.GetRenderGraphPtr();
 
         {
             auto    main_loop = _mainLoop.ReadNoLock();
@@ -260,23 +251,24 @@ namespace AE::AppV2
                      mode == null )
             return;
 
-        const auto  frame_id    = rts.GetFrameId();
+        const auto  frame_id = rts.GetFrameId();
+        CHECK_ERRV( rts.BeginFrame() );
+
+        if ( rg )
+            rg->OnBeginFrame( frame_id );
 
         AsyncTask   proc_input  = mode->Update( input->ReadInput( frame_id ), Default );
         // 'proc_input' can be null
 
-        AsyncTask   begin_frame = rts.BeginFrame();
-        if_unlikely( begin_frame->IsInterrupted() )
-            return;
-
-        AsyncTask   draw_task   = mode->Draw( output, { begin_frame, proc_input });
+        AsyncTask   draw_task   = mode->Draw( output, { proc_input });
         CHECK( draw_task );
 
         AsyncTask   end_frame   = rts.EndFrame( Tuple{ draw_task });
 
-        input->NextFrame( frame_id.Next() );
+        if ( rg )
+            rg->OnEndFrame();
 
-        _mainLoop->endFrame = end_frame;
+        input->NextFrame( frame_id.Next() );
     }
 //-----------------------------------------------------------------------------
 
@@ -287,49 +279,30 @@ namespace AE::AppV2
     constructor
 =================================================
 */
-    DefaultAppListener::DefaultAppListener (const AppConfig &cfg, AppCoreCtor_t ctor) __NE___ :
-        #if defined(AE_ENABLE_VULKAN)
-            _vulkan{ True{"enable info log"} },
-        #elif defined(AE_ENABLE_METAL)
-            _metal{ True{"enable info log"} },
-        #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-            _remote{ True{"enable info log"} },
-        #else
-        #   error not implemented
-        #endif
+    AppCoreV2::AppCoreV2 (const AppConfig &cfg, AppCoreCtor_t ctor) __NE___ :
+        _device{ True{"enable info log"} },
         _config{ cfg }
     {
         CHECK( _config.graphics.maxFrames <= _config.graphics.swapchain.minImageCount );
 
-        TaskScheduler::CreateInstance();
-        VFS::VirtualFileSystem::CreateInstance();
-
-        // create render task scheduler
-      #if defined(AE_ENABLE_VULKAN)
-        VRenderTaskScheduler::CreateInstance( _vulkan );
-
-      #elif defined(AE_ENABLE_METAL)
-        MRenderTaskScheduler::CreateInstance( _metal );
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        RRenderTaskScheduler::CreateInstance( _remote );
-
-      #else
-      # error not implemented
-      #endif
+        TaskScheduler::InstanceCtor::Create();
+        VFS::VirtualFileSystem::InstanceCtor::Create();
 
         _core = ctor();
         CHECK_FATAL( _core );
 
         CHECK_FATAL( ThreadMngr::SetupThreads( _config.threading,
                                                _config.threading.mask,
-                                               null,
                                                _config.threading.maxThreads,
+                                               True{"bind threads to physical cores"},
                                                OUT _allowProcessInMain ));
+
+        if ( _config.enableNetwork )
+            CHECK_FATAL( Networking::SocketService::Instance().Initialize() );
     }
 
-    DefaultAppListener::DefaultAppListener (const AppConfig &cfg, RC<AppCore> core) __NE___ :
-        DefaultAppListener{ cfg, [core](){ return core; }}
+    AppCoreV2::AppCoreV2 (const AppConfig &cfg, RC<AppCore> core) __NE___ :
+        AppCoreV2{ cfg, [core](){ return core; }}
     {}
 
 /*
@@ -337,15 +310,19 @@ namespace AE::AppV2
     destructor
 =================================================
 */
-    DefaultAppListener::~DefaultAppListener () __NE___
+    AppCoreV2::~AppCoreV2 () __NE___
     {
         _core = null;
         _windows.clear();
         _vrDevice = null;
 
         Scheduler().Release();
-        VFS::VirtualFileSystem::DestroyInstance();
-        TaskScheduler::DestroyInstance();
+
+        if ( _config.enableNetwork )
+            Networking::SocketService::Instance().Deinitialize();
+
+        VFS::VirtualFileSystem::InstanceCtor::Destroy();
+        TaskScheduler::InstanceCtor::Destroy();
     }
 
 /*
@@ -353,7 +330,7 @@ namespace AE::AppV2
     BeforeWndUpdate
 =================================================
 */
-    void  DefaultAppListener::BeforeWndUpdate (IApplication &) __NE___
+    void  AppCoreV2::BeforeWndUpdate (IApplication &) __NE___
     {
         PROFILE_ONLY({
             auto    profiler = Scheduler().GetProfiler();
@@ -361,7 +338,7 @@ namespace AE::AppV2
                 profiler->EndNonTaskWork( this, "NativeApp" );
         })
 
-        _core->WaitFrame( _allowProcessInMain );
+        _core->WaitFrame( GetMainThreadMask() );
     }
 
 /*
@@ -369,7 +346,7 @@ namespace AE::AppV2
     AfterWndUpdate
 =================================================
 */
-    void  DefaultAppListener::AfterWndUpdate (IApplication &app) __NE___
+    void  AppCoreV2::AfterWndUpdate (IApplication &app) __NE___
     {
         _core->RenderFrame();
 
@@ -401,7 +378,7 @@ namespace AE::AppV2
     OnStart
 =================================================
 */
-    void  DefaultAppListener::OnStart (IApplication &app) __NE___
+    void  AppCoreV2::OnStart (IApplication &app) __NE___
     {
         CHECK_FATAL( _core->OnStart( app ));
 
@@ -409,37 +386,16 @@ namespace AE::AppV2
         CHECK_FATAL( _CreateWindow( app ));
     }
 
-/*
-=================================================
-    _InitGraphics
-=================================================
-*/
-    bool  DefaultAppListener::_InitGraphics (IApplication &app)
-    {
-      #if defined(AE_ENABLE_VULKAN)
-        return _CreateVulkan( app );
-
-      #elif defined(AE_ENABLE_METAL)
-        return _CreateMetal( app );
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        return _CreateRemoteGraphics( app );
-
-      #else
-      # error not implemented
-      #endif
-    }
-
 /*
 =================================================
     _CreateWindow
 =================================================
 */
-    bool  DefaultAppListener::_CreateWindow (IApplication &app)
+    bool  AppCoreV2::_CreateWindow (IApplication &app)
     {
         // create window
         {
-            auto    wnd = app.CreateWindow( MakeUnique<DefaultIWndListener>( _core, *this ), _config.window );
+            auto    wnd = app.CreateWindow( MakeUnique<AppCoreV2::WindowEventListener>( _core, *this ), _config.window );
             CHECK_ERR( wnd );
             _windows.emplace_back( RVRef(wnd) );
         }
@@ -449,7 +405,7 @@ namespace AE::AppV2
         {
             const auto  CreateVR = [this, &app] (IVRDevice::EDeviceType type) -> bool
             {{
-                _vrDevice = app.CreateVRDevice( MakeUnique<DefaultVRDeviceListener>( _core, *this ), &_windows[0]->InputActions(), type );
+                _vrDevice = app.CreateVRDevice( MakeUnique<AppCoreV2::VRDeviceEventListener>( _core, *this ), &_windows[0]->InputActions(), type );
                 return _vrDevice and _vrDevice->CreateRenderSurface( _config.vr );
             }};
 
@@ -466,196 +422,112 @@ namespace AE::AppV2
     OnStop
 =================================================
 */
-    void  DefaultAppListener::OnStop (IApplication &) __NE___
+    void  AppCoreV2::OnStop (IApplication &) __NE___
     {
         if ( _core )
         {
-            _core->WaitFrame( _allowProcessInMain );
+            _core->WaitFrame( GetMainThreadMask() );
             _core = null;
         }
         _windows.clear();
         _vrDevice = null;
 
-      #if defined(AE_ENABLE_VULKAN)
-        Unused( _DestroyVulkan() );
-
-      #elif defined(AE_ENABLE_METAL)
-        Unused( _DestroyMetal() );
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        Unused( _DestroyRemoteGraphics() );
-
-      #else
-      # error not implemented
-      #endif
+        _DestroyGraphics();
     }
-//-----------------------------------------------------------------------------
-
 
-
-#ifdef AE_ENABLE_VULKAN
 /*
 =================================================
-    _CreateVulkan
+    _InitGraphics
 =================================================
 */
-    bool  DefaultAppListener::_CreateVulkan (IApplication &app)
+    bool  AppCoreV2::_InitGraphics (IApplication &app)
     {
-        if_unlikely( _vulkan.IsInitialized() )
+        if_unlikely( _device.IsInitialized() )
             return true;
 
-        CHECK_ERR( _vulkan.Init( _config.graphics, app.GetVulkanInstanceExtensions() ));
-        CHECK_ERR( _vulkan.CheckConstantLimits() );
-        CHECK_ERR( _vulkan.CheckExtensions() );
+        RenderTaskScheduler::InstanceCtor::Create( _device );
+
+      #ifdef AE_ENABLE_VULKAN
+        CHECK_ERR( _device.Init( _config.graphics, app.GetVulkanInstanceExtensions() ));
 
         #if ENABLE_SYNC_LOG
         {
             FlatHashMap<VkQueue, String>    qnames;
 
-            for (auto& q : _vulkan.GetQueues()) {
+            for (auto& q : _device.GetQueues()) {
                 qnames.emplace( q.handle, q.debugName );
             }
-            VulkanSyncLog::Initialize( INOUT _vulkan.EditDeviceFnTable(), RVRef(qnames) );
+            VulkanSyncLog::Initialize( INOUT _device.EditDeviceFnTable(), RVRef(qnames) );
             VulkanSyncLog::Enable();
         }
         #endif
 
-        CHECK_ERR( RenderTaskScheduler().Initialize( _config.graphics ));
-        return true;
-    }
-
-/*
-=================================================
-    _DestroyVulkan
-=================================================
-*/
-    bool  DefaultAppListener::_DestroyVulkan ()
-    {
-        if_unlikely( not _vulkan.IsInitialized() )
-            return true;
-
-        #if ENABLE_SYNC_LOG
-            VulkanSyncLog::Deinitialize( INOUT _vulkan.EditDeviceFnTable() );
-        #endif
+      #elif defined(AE_ENABLE_METAL) and defined(AE_ENABLE_REMOTE_GRAPHICS)
+        CHECK_ERR( _device.Init( _config.graphics ));
 
-        Unused( RenderTaskScheduler().WaitAll() );  // TODO ???
-
-        VRenderTaskScheduler::DestroyInstance();
-
-        CHECK_ERR( _vulkan.DestroyLogicalDevice() );
-        CHECK_ERR( _vulkan.DestroyInstance() );
-        return true;
-    }
-//-----------------------------------------------------------------------------
-
-
-
-#elif defined(AE_ENABLE_METAL)
-/*
-=================================================
-    _CreateMetal
-=================================================
-*/
-    bool  DefaultAppListener::_CreateMetal (IApplication &)
-    {
-        if_unlikely( _metal.IsInitialized() )
-            return true;
-
-        CHECK_ERR( _metal.Init( _config.graphics ));
-        CHECK_ERR( _metal.CheckConstantLimits() );
-        CHECK_ERR( _metal.CheckExtensions() );
-
-        CHECK_ERR( RenderTaskScheduler().Initialize( _config.graphics ));
-        return true;
-    }
-
-/*
-=================================================
-    _DestroyMetal
-=================================================
-*/
-    bool  DefaultAppListener::_DestroyMetal ()
-    {
-        if_unlikely( not _metal.IsInitialized() )
-            return true;
-
-        Unused( RenderTaskScheduler().WaitAll() );  // TODO ???
+      #else
+      # error not implemented
+      #endif
 
-        MRenderTaskScheduler::DestroyInstance();
+        CHECK_ERR( _device.CheckConstantLimits() );
+        CHECK_ERR( _device.CheckExtensions() );
 
-        CHECK_ERR( _metal.DestroyLogicalDevice() );
+        CHECK_ERR( GraphicsScheduler().Initialize( _config.graphics ));
         return true;
     }
-//-----------------------------------------------------------------------------
 
-
-
-#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
 /*
 =================================================
-    _CreateRemoteGraphics
+    _DestroyGraphics
 =================================================
 */
-    bool  DefaultAppListener::_CreateRemoteGraphics (IApplication &)
+    void  AppCoreV2::_DestroyGraphics ()
     {
-        if_unlikely( _remote.IsInitialized() )
-            return true;
-
-        //CHECK_ERR( _remote.Init( _config.graphics ));
-        CHECK_ERR( _remote.CheckConstantLimits() );
-        CHECK_ERR( _remote.CheckExtensions() );
-
-        CHECK_ERR( RenderTaskScheduler().Initialize( _config.graphics ));
-        return true;
-    }
+        if_unlikely( not _device.IsInitialized() )
+            return;
 
-/*
-=================================================
-    _DestroyRemoteGraphics
-=================================================
-*/
-    bool  DefaultAppListener::_DestroyRemoteGraphics ()
-    {
-        if_unlikely( not _remote.IsInitialized() )
-            return true;
+        #if ENABLE_SYNC_LOG
+            VulkanSyncLog::Deinitialize( INOUT _device.EditDeviceFnTable() );
+        #endif
 
-        Unused( RenderTaskScheduler().WaitAll() );  // TODO ???
+        Unused( GraphicsScheduler().WaitAll( AE::DefaultTimeout )); // TODO ???
 
-        RRenderTaskScheduler::DestroyInstance();
+        RenderTaskScheduler::InstanceCtor::Destroy();
 
-        //CHECK_ERR( _remote.DestroyLogicalDevice() );
-        return true;
+        CHECK_ERRV( _device.DestroyLogicalDevice() );
+        CHECK_ERRV( _device.DestroyInstance() );
     }
-//-----------------------------------------------------------------------------
-
-#else
-#   error not implemented
-#endif
-
-
 
 /*
 =================================================
     OnStateChanged
 =================================================
 */
-    void  DefaultIWndListener::OnStateChanged (IWindow &wnd, EState state) __NE___
+    void  AppCoreV2::WindowEventListener::OnStateChanged (IWindow &wnd, EState state) __NE___
     {
         BEGIN_ENUM_CHECKS();
         switch ( state )
         {
             case EState::InForeground :
-            case EState::Focused :          _core->StartRendering( &wnd.InputActions(), &wnd.GetSurface(), state ); break;
+            case EState::Focused :
+                _core->StartRendering( &wnd.InputActions(), &wnd.GetSurface(), state );
+                break;
 
             case EState::InBackground :
             case EState::Stopped :
-            case EState::Destroyed :        _core->StopRendering( &wnd.GetSurface() );                              break;
+            case EState::Destroyed :
+                _core->StopRendering( &wnd.GetSurface() );
+                _core->WaitFrame( _app.GetMainThreadMask() );
+                break;
 
             case EState::Created :
             case EState::Unknown :
-            case EState::Started :                                                                                  break;
+            case EState::Started :
+                break;
 
-            default :                       DBG_WARNING( "unsupported window state" );                              break;
+            default :
+                DBG_WARNING( "unsupported window state" );
+                break;
         }
         END_ENUM_CHECKS();
     }
@@ -665,7 +537,7 @@ namespace AE::AppV2
     OnSurfaceCreated
 =================================================
 */
-    void  DefaultIWndListener::OnSurfaceCreated (IWindow &wnd) __NE___
+    void  AppCoreV2::WindowEventListener::OnSurfaceCreated (IWindow &wnd) __NE___
     {
         // create render surface
         CHECK_FATAL( wnd.CreateRenderSurface( _app.Config().graphics.swapchain ));
@@ -680,9 +552,10 @@ namespace AE::AppV2
     OnSurfaceDestroyed
 =================================================
 */
-    void  DefaultIWndListener::OnSurfaceDestroyed (IWindow &) __NE___
+    void  AppCoreV2::WindowEventListener::OnSurfaceDestroyed (IWindow &) __NE___
     {
         _core->StopRendering( null );
+        _core->WaitFrame( _app.GetMainThreadMask() );
     }
 //-----------------------------------------------------------------------------
 
@@ -693,23 +566,31 @@ namespace AE::AppV2
     OnStateChanged
 =================================================
 */
-    void  DefaultVRDeviceListener::OnStateChanged (IVRDevice &vr, EState state) __NE___
+    void  AppCoreV2::VRDeviceEventListener::OnStateChanged (IVRDevice &vr, EState state) __NE___
     {
         BEGIN_ENUM_CHECKS();
         switch ( state )
         {
             case EState::InForeground :
-            case EState::Focused :          _core->StartRendering( &vr.InputActions(), &vr.GetSurface(), state );   break;
+            case EState::Focused :
+                _core->StartRendering( &vr.InputActions(), &vr.GetSurface(), state );
+                break;
 
             case EState::InBackground :
             case EState::Stopped :
-            case EState::Destroyed :        _core->StopRendering( &vr.GetSurface() );                               break;
+            case EState::Destroyed :
+                _core->StopRendering( &vr.GetSurface() );
+                _core->WaitFrame( _app.GetMainThreadMask() );
+                break;
 
             case EState::Created :
             case EState::Unknown :
-            case EState::Started :                                                                                  break;
+            case EState::Started :
+                break;
 
-            default :                       DBG_WARNING( "unsupported VR state" );                                  break;
+            default :
+                DBG_WARNING( "unsupported VR state" );
+                break;
         }
         END_ENUM_CHECKS();
     }
diff --git a/AE/engine/src/platform/DefaultV2/DefaultAppV2.h b/AE/engine/src/platform/BaseAppV2/DefaultAppV2.h
similarity index 77%
rename from AE/engine/src/platform/DefaultV2/DefaultAppV2.h
rename to AE/engine/src/platform/BaseAppV2/DefaultAppV2.h
index bdaba732..dcbecdee 100644
--- a/AE/engine/src/platform/DefaultV2/DefaultAppV2.h
+++ b/AE/engine/src/platform/BaseAppV2/DefaultAppV2.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include "platform/Public/IApplication.h"
-#include "platform/DefaultV1/AppConfig.h"
-#include "platform/DefaultV2/IViewMode.h"
+#include "platform/BaseAppV1/AppConfig.h"
+#include "platform/BaseAppV2/IViewMode.h"
 
 #if defined(AE_ENABLE_VULKAN)
 #   include "graphics/Vulkan/VDevice.h"
@@ -40,7 +40,6 @@ namespace AE::AppV2
             Ptr<IInputActions>      input;      // lifetime is same as Window/VRDevice lifetime
             Ptr<IOutputSurface>     output;     // lifetime is same as Window/VRDevice lifetime
             RC<IViewMode>           mode;
-            AsyncTask               endFrame;
         };
         using MainLoopDataSync  = Threading::DRCSynchronized< MainLoopData >;
 
@@ -72,7 +71,7 @@ namespace AE::AppV2
         ND_ Ptr<IOutputSurface> GetOutputSurface ()                                                 C_NE___ { return _mainLoop->output; }
 
 
-    // for DefaultAppListener
+    // for AppCoreV2
         ND_ virtual bool  OnStart (IApplication &)                                                  __NE___;
 
 
@@ -102,23 +101,27 @@ namespace AE::AppV2
     //
     // Application Event Listener
     //
-    class DefaultAppListener final : public IApplication::IAppListener
+    class AppCoreV2 final : public IApplication::IAppListener
     {
     // types
     private:
+        class WindowEventListener;
+        class VRDeviceEventListener;
+
+    public:
         using AppCoreCtor_t = Function< RC<AppCore> () >;
 
 
     // variables
     private:
       #if defined(AE_ENABLE_VULKAN)
-        Graphics::VDeviceInitializer    _vulkan;
+        Graphics::VDeviceInitializer    _device;
 
       #elif defined(AE_ENABLE_METAL)
-        Graphics::MDeviceInitializer    _metal;
+        Graphics::MDeviceInitializer    _device;
 
       #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        Graphics::RDeviceInitializer    _remote;
+        Graphics::RDeviceInitializer    _device;
 
       #else
       # error not implemented
@@ -134,12 +137,13 @@ namespace AE::AppV2
 
     // methods
     public:
-        DefaultAppListener (const AppConfig &, RC<AppCore>)     __NE___;
-        DefaultAppListener (const AppConfig &, AppCoreCtor_t)   __NE___;
-        ~DefaultAppListener ()                                  __NE_OV;
+        AppCoreV2 (const AppConfig &, RC<AppCore>)      __NE___;
+        AppCoreV2 (const AppConfig &, AppCoreCtor_t)    __NE___;
+        ~AppCoreV2 ()                                   __NE_OV;
 
         ND_ AppConfig const&    Config ()                       C_NE___ { return _config; }
         //ND_ AppCore &         GetBaseApp ()                   __NE___ { return *_core; }
+        ND_ auto const&         GetMainThreadMask ()            C_NE___ { return _allowProcessInMain; }
 
 
     // IAppListener //
@@ -153,22 +157,7 @@ namespace AE::AppV2
     private:
         ND_ bool  _CreateWindow (IApplication &);
         ND_ bool  _InitGraphics (IApplication &);
-
-      #if defined(AE_ENABLE_VULKAN)
-        ND_ bool  _CreateVulkan (IApplication &app);
-        ND_ bool  _DestroyVulkan ();
-
-      #elif defined(AE_ENABLE_METAL)
-        ND_ bool  _CreateMetal (IApplication &app);
-        ND_ bool  _DestroyMetal ();
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        ND_ bool  _CreateRemoteGraphics (IApplication &app);
-        ND_ bool  _DestroyRemoteGraphics ();
-
-      #else
-      # error not implemented
-      #endif
+            void  _DestroyGraphics ();
     };
 
 
@@ -176,17 +165,17 @@ namespace AE::AppV2
     //
     // Window Event Listener
     //
-    class DefaultIWndListener final : public IWindow::IWndListener
+    class AppCoreV2::WindowEventListener final : public IWindow::IWndListener
     {
     // variables
     private:
-        RC<AppCore>             _core;
-        DefaultAppListener &    _app;
+        RC<AppCore>     _core;
+        AppCoreV2 &     _app;
 
 
     // methods
     public:
-        DefaultIWndListener (RC<AppCore> core, DefaultAppListener &app) __NE___ :
+        WindowEventListener (RC<AppCore> core, AppCoreV2 &app) __NE___ :
             _core{RVRef(core)}, _app{app}
         {}
 
@@ -203,17 +192,18 @@ namespace AE::AppV2
     //
     // VR Device Listener
     //
-    class DefaultVRDeviceListener final : public IVRDevice::IVRDeviceEventListener
+    class AppCoreV2::VRDeviceEventListener final : public IVRDevice::IVRDeviceEventListener
     {
     // variables
     private:
         RC<AppCore>     _core;
+        AppCoreV2 &     _app;
 
 
     // methods
     public:
-        DefaultVRDeviceListener (RC<AppCore> core, DefaultAppListener &) __NE___ :
-            _core{RVRef(core)}
+        VRDeviceEventListener (RC<AppCore> core, AppCoreV2 &app) __NE___ :
+            _core{RVRef(core)}, _app{app}
         {}
 
 
diff --git a/AE/engine/src/platform/DefaultV2/IViewMode.h b/AE/engine/src/platform/BaseAppV2/IViewMode.h
similarity index 89%
rename from AE/engine/src/platform/DefaultV2/IViewMode.h
rename to AE/engine/src/platform/BaseAppV2/IViewMode.h
index e98a0f8c..22b0417a 100644
--- a/AE/engine/src/platform/DefaultV2/IViewMode.h
+++ b/AE/engine/src/platform/BaseAppV2/IViewMode.h
@@ -1,4 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Thread-safe:  yes
+*/
 
 #pragma once
 
@@ -25,8 +28,17 @@ namespace AE::AppV2
 
     // interface
     public:
+
+        // TODO
+        //
         ND_ virtual AsyncTask       Update (const ActionQueueReader &, ArrayView<AsyncTask> deps)   __NE___ = 0;
+
+        // TODO
+        //
         ND_ virtual AsyncTask       Draw (Ptr<IOutputSurface>, ArrayView<AsyncTask> deps)           __NE___ = 0;
+
+        // TODO
+        //
         ND_ virtual InputModeName   GetInputMode ()                                                 C_NE___ = 0;
     };
 
diff --git a/AE/engine/src/platform/CMakeLists.txt b/AE/engine/src/platform/CMakeLists.txt
index 793b995c..28866a19 100644
--- a/AE/engine/src/platform/CMakeLists.txt
+++ b/AE/engine/src/platform/CMakeLists.txt
@@ -9,22 +9,27 @@ if (MSVC OR APPLE)
 endif()
 set( SOURCES ${HPP_SOURCES} ${CPP_SOURCES} ${OBJC_SOURCES} )
 
-add_library( "Platform" STATIC ${SOURCES} ${PREBUILD_CPP_FILE} )
+set( ANDROID_SRC_PATH "${MAIN_SOURCE_DIR}/android/engine/src/main" )
+if (NOT EXISTS "${ANDROID_SRC_PATH}")
+    message( FATAL_ERROR "Android source is not exists in ${ANDROID_SRC_PATH}" )
+endif()
+file( GLOB_RECURSE JAVA_SOURCES "${ANDROID_SRC_PATH}/*.*" )
+
+add_library( "Platform" STATIC ${SOURCES} ${PREBUILD_CPP_FILE} ${JAVA_SOURCES} )
 source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
+source_group( "Android/Apk" FILES ${JAVA_SOURCES} )
 
 set_property( TARGET "Platform" PROPERTY FOLDER "Engine" )
-target_link_libraries( "Platform" PUBLIC "Threading" "VFS" )
+target_link_libraries( "Platform" PUBLIC "Threading" "VFS" "Networking" )
 
 if (TARGET "Graphics")
     target_link_libraries( "Platform" PUBLIC "Graphics" )
 endif()
-if (TARGET "RenderDoc-lib")
-    target_link_libraries( "Platform" PRIVATE "RenderDoc-lib" )
-endif()
 
 if (MSVC)
     set_source_files_properties( ${OBJC_SOURCES} PROPERTIES HEADER_FILE_ONLY TRUE )
 endif()
+set_source_files_properties( ${JAVA_SOURCES} PROPERTIES HEADER_FILE_ONLY TRUE )
 
 # choose window library
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
@@ -52,14 +57,12 @@ else()
     message( FATAL_ERROR "At least one window library must be supported" )
 endif()
 
-if (${AE_ENABLE_OPENVR})
+if (TARGET "OpenVR-lib")
     target_link_libraries( "Platform" PUBLIC "OpenVR-lib" )
 endif()
-
-if (${AE_ENABLE_OPENXR})
+if (TARGET "OpenXR-lib")
     target_link_libraries( "Platform" PUBLIC "OpenXR-lib" )
 endif()
-
 if (${AE_ENABLE_VULKAN})
     target_link_libraries( "Platform" PUBLIC "VulkanSyncLog" )
 endif()
diff --git a/AE/engine/src/platform/DefaultV1/DefaultAppV1.cpp b/AE/engine/src/platform/DefaultV1/DefaultAppV1.cpp
deleted file mode 100644
index 516b3faa..00000000
--- a/AE/engine/src/platform/DefaultV1/DefaultAppV1.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "platform/DefaultV1/DefaultAppV1.h"
-
-#include "platform/Android/AndroidCommon.h"
-#include "platform/GLFW/GLFWCommon.h"
-#include "platform/WinAPI/WinAPICommon.h"
-#include "platform/OpenVR/OpenVRCommon.h"
-
-// Enable it if you have very rare bug with synchs.
-// When Vulkan validation reports error put breakpoint in 'log.clear();' and check 'log' content.
-#define ENABLE_SYNC_LOG     0
-#if ENABLE_SYNC_LOG
-#   include "VulkanSyncLog.h"
-#endif
-
-namespace AE::AppV1
-{
-    using namespace AE::Threading;
-    using namespace AE::Graphics;
-
-/*
-=================================================
-    constructor
-=================================================
-*/
-    DefaultAppListener::DefaultAppListener (const AppConfig &cfg, RC<IBaseApp> impl) __NE___ :
-        #if defined(AE_ENABLE_VULKAN)
-            _vulkan{ True{"enable info log"} },
-        #elif defined(AE_ENABLE_METAL)
-            _metal{ True{"enable info log"} },
-        #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-            _remote{ True{"enable info log"} },
-        #else
-        #   error not implemented
-        #endif
-        _impl{ RVRef(impl) },
-        _config{ cfg }
-    {
-        CHECK( _config.graphics.maxFrames <= _config.graphics.swapchain.minImageCount );
-
-        TaskScheduler::CreateInstance();
-        VFS::VirtualFileSystem::CreateInstance();
-
-        // create render task scheduler
-      #if defined(AE_ENABLE_VULKAN)
-        VRenderTaskScheduler::CreateInstance( _vulkan );
-
-      #elif defined(AE_ENABLE_METAL)
-        MRenderTaskScheduler::CreateInstance( _metal );
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        RRenderTaskScheduler::CreateInstance( _remote );
-
-      #else
-      # error not implemented
-      #endif
-
-        CHECK_FATAL( ThreadMngr::SetupThreads( _config.threading,
-                                               _config.threading.mask,
-                                               null,
-                                               _config.threading.maxThreads,
-                                               OUT _allowProcessInMain ));
-    }
-
-/*
-=================================================
-    destructor
-=================================================
-*/
-    DefaultAppListener::~DefaultAppListener () __NE___
-    {
-        _windows.clear();
-
-        Scheduler().Release();
-        VFS::VirtualFileSystem::DestroyInstance();
-        TaskScheduler::DestroyInstance();
-    }
-
-/*
-=================================================
-    BeforeWndUpdate
-=================================================
-*/
-    void  DefaultAppListener::BeforeWndUpdate (IApplication &) __NE___
-    {
-        PROFILE_ONLY({
-            auto    profiler = Scheduler().GetProfiler();
-            if ( profiler )
-                profiler->EndNonTaskWork( this, "NativeApp" );
-        })
-
-
-        Ptr<IWindow>    active_wnd;
-        Ptr<IVRDevice>  active_vr;
-
-        for (auto& wnd : _windows) {
-            if ( wnd->GetState() == IWindow::EState::Focused )
-                active_wnd = wnd.get();
-        }
-
-        if ( _vrDevice and _vrDevice->GetState() == IWindow::EState::Focused )
-            active_vr = _vrDevice.get();
-
-        _impl->WaitFrame( _allowProcessInMain, active_wnd, active_vr );
-    }
-
-/*
-=================================================
-    AfterWndUpdate
-=================================================
-*/
-    void  DefaultAppListener::AfterWndUpdate (IApplication &app) __NE___
-    {
-        _impl->RenderFrame();
-
-        #if ENABLE_SYNC_LOG
-        {
-            String  log;
-            VulkanSyncLog::GetLog( OUT log );
-            log.clear();
-        }
-        #endif
-
-        PROFILE_ONLY({
-            auto    profiler = Scheduler().GetProfiler();
-            if ( profiler )
-                profiler->BeginNonTaskWork( this, "NativeApp" );
-        })
-
-        // terminate application if main window has been closed
-        if_unlikely( _windows.empty() or _windows[0]->GetState() == IWindow::EState::Destroyed )
-        {
-            if ( _vrDevice )
-                _vrDevice.reset();
-
-            app.Terminate();
-        }
-    }
-
-/*
-=================================================
-    OnStart
-=================================================
-*/
-    void  DefaultAppListener::OnStart (IApplication &app) __NE___
-    {
-      #if defined(AE_ENABLE_VULKAN)
-        CHECK_FATAL( _CreateVulkan( app ));
-
-      #elif defined(AE_ENABLE_METAL)
-        CHECK_FATAL( _CreateMetal( app ));
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        CHECK_FATAL( _CreateRemoteGraphics( app ));
-
-      #else
-      # error not implemented
-      #endif
-    }
-
-/*
-=================================================
-    _OnStartImpl
-=================================================
-*/
-    bool  DefaultAppListener::_OnStartImpl (IApplication &app) __NE___
-    {
-        // create window
-        {
-            auto    wnd = app.CreateWindow( MakeUnique<DefaultIWndListener>( _impl, *this ), _config.window );
-            CHECK_ERR( wnd );
-            _windows.emplace_back( RVRef(wnd) );
-        }
-
-        // create second window
-        #if 0
-        {
-            WindowDesc  desc = _config.window;
-            desc.title << "-2";
-
-            auto    wnd = app.CreateWindow( MakeUnique<DefaultIWndListener>( _impl, *this ), desc, &_windows[0]->InputActions() );
-            CHECK_ERR( wnd );
-            _windows.emplace_back( RVRef(wnd) );
-        }
-        #endif
-
-        // create VR device
-        if ( _config.enableVR and _windows.size() >= 1 )
-        {
-            const auto  CreateVR = [this, &app] (IVRDevice::EDeviceType type) -> bool
-            {{
-                _vrDevice = app.CreateVRDevice( MakeUnique<DefaultVRDeviceListener>( _impl, *this ), &_windows[0]->InputActions(), type );
-                return _vrDevice and _vrDevice->CreateRenderSurface( _config.vr );
-            }};
-
-            ASSERT( not _config.vrDevices.empty() );
-
-            for (auto type : _config.vrDevices) {
-                if ( CreateVR( type )) break;
-            }
-
-            if ( _vrDevice )
-            {
-                IVRDevice::Settings     settings;
-                settings.cameraClipPlanes   = { 0.1f, 100.f };
-
-                Unused( _vrDevice->Setup( settings ));
-            }
-        }
-
-        return true;
-    }
-
-/*
-=================================================
-    OnStop
-=================================================
-*/
-    void  DefaultAppListener::OnStop (IApplication &) __NE___
-    {
-        if ( _impl )
-        {
-            _impl->WaitFrame( _allowProcessInMain, null, null );
-            _impl = null;
-        }
-        _windows.clear();
-
-      #if defined(AE_ENABLE_VULKAN)
-        _DestroyVulkan();
-
-      #elif defined(AE_ENABLE_METAL)
-        _DestroyMetal();
-
-      #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        _DestroyRemoteGraphics();
-
-      #else
-      # error not implemented
-      #endif
-    }
-//-----------------------------------------------------------------------------
-
-
-
-#ifdef AE_ENABLE_VULKAN
-/*
-=================================================
-    _CreateVulkan
-=================================================
-*/
-    bool  DefaultAppListener::_CreateVulkan (IApplication &app)
-    {
-        if_unlikely( _vulkan.IsInitialized() )
-            return true;
-
-        CHECK_ERR( _vulkan.Init( _config.graphics, app.GetVulkanInstanceExtensions() ));
-        CHECK_ERR( _vulkan.CheckConstantLimits() );
-        CHECK_ERR( _vulkan.CheckExtensions() );
-
-        #if ENABLE_SYNC_LOG
-        {
-            FlatHashMap<VkQueue, String>    qnames;
-
-            for (auto& q : _vulkan.GetQueues()) {
-                qnames.emplace( q.handle, q.debugName );
-            }
-            VulkanSyncLog::Initialize( INOUT _vulkan.EditDeviceFnTable(), RVRef(qnames) );
-            VulkanSyncLog::Enable();
-        }
-        #endif
-
-        CHECK_ERR( RenderTaskScheduler().Initialize( _config.graphics ));
-        return true;
-    }
-
-/*
-=================================================
-    _DestroyVulkan
-=================================================
-*/
-    bool  DefaultAppListener::_DestroyVulkan ()
-    {
-        if_unlikely( not _vulkan.IsInitialized() )
-            return true;
-
-        #if ENABLE_SYNC_LOG
-            VulkanSyncLog::Deinitialize( INOUT _vulkan.EditDeviceFnTable() );
-        #endif
-
-        Unused( RenderTaskScheduler().WaitAll() );  // TODO ???
-
-        VRenderTaskScheduler::DestroyInstance();
-
-        CHECK_ERR( _vulkan.DestroyLogicalDevice() );
-        CHECK_ERR( _vulkan.DestroyInstance() );
-        return true;
-    }
-//-----------------------------------------------------------------------------
-
-
-
-#elif defined(AE_ENABLE_METAL)
-/*
-=================================================
-    _CreateMetal
-=================================================
-*/
-    bool  DefaultAppListener::_CreateMetal (IApplication &)
-    {
-        if_unlikely( _metal.IsInitialized() )
-            return true;
-
-        CHECK_ERR( _metal.Init( _config.graphics ));
-        CHECK_ERR( _metal.CheckConstantLimits() );
-        CHECK_ERR( _metal.CheckExtensions() );
-
-        CHECK_ERR( RenderTaskScheduler().Initialize( _config.graphics ));
-        return true;
-    }
-
-/*
-=================================================
-    _DestroyMetal
-=================================================
-*/
-    bool  DefaultAppListener::_DestroyMetal ()
-    {
-        if_unlikely( not _metal.IsInitialized() )
-            return true;
-
-        Unused( RenderTaskScheduler().WaitAll() );  // TODO ???
-
-        MRenderTaskScheduler::DestroyInstance();
-
-        CHECK_ERR( _metal.DestroyLogicalDevice() );
-        return true;
-    }
-//-----------------------------------------------------------------------------
-
-
-
-#elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-/*
-=================================================
-    _CreateRemoteGraphics
-=================================================
-*/
-    bool  DefaultAppListener::_CreateRemoteGraphics (IApplication &)
-    {
-        if_unlikely( _remote.IsInitialized() )
-            return true;
-
-        //CHECK_ERR( _remote.Init( _config.graphics ));
-        CHECK_ERR( _remote.CheckConstantLimits() );
-        CHECK_ERR( _remote.CheckExtensions() );
-
-        CHECK_ERR( RenderTaskScheduler().Initialize( _config.graphics ));
-        return true;
-    }
-
-/*
-=================================================
-    _DestroyRemoteGraphics
-=================================================
-*/
-    bool  DefaultAppListener::_DestroyRemoteGraphics ()
-    {
-        if_unlikely( not _remote.IsInitialized() )
-            return true;
-
-        Unused( RenderTaskScheduler().WaitAll() );  // TODO ???
-
-        RRenderTaskScheduler::DestroyInstance();
-
-        //CHECK_ERR( _remote.DestroyLogicalDevice() );
-        return true;
-    }
-//-----------------------------------------------------------------------------
-
-#else
-#   error not implemented
-#endif
-
-
-
-/*
-=================================================
-    OnStateChanged
-=================================================
-*/
-    void  DefaultIWndListener::OnStateChanged (IWindow &wnd, EState state) __NE___
-    {
-        BEGIN_ENUM_CHECKS();
-        switch ( state )
-        {
-            case EState::InForeground :
-            case EState::Focused :          _impl->StartRendering( &wnd.InputActions(), &wnd.GetSurface(), state ); break;
-
-            case EState::InBackground :
-            case EState::Stopped :
-            case EState::Destroyed :        _impl->StopRendering( &wnd.GetSurface() );                              break;
-
-            case EState::Created :
-            case EState::Unknown :
-            case EState::Started :                                                                                  break;
-
-            default :                       DBG_WARNING( "unsupported window state" );                              break;
-        }
-        END_ENUM_CHECKS();
-    }
-
-/*
-=================================================
-    OnSurfaceCreated
-=================================================
-*/
-    void  DefaultIWndListener::OnSurfaceCreated (IWindow &wnd) __NE___
-    {
-        // create render surface
-        CHECK_FATAL( wnd.CreateRenderSurface( _app.GetConfig().graphics.swapchain ));
-
-        _impl->StartRendering( &wnd.InputActions(), &wnd.GetSurface(), EState::InForeground );
-
-        CHECK_FATAL( _impl->OnSurfaceCreated( wnd ));
-    }
-
-/*
-=================================================
-    OnSurfaceDestroyed
-=================================================
-*/
-    void  DefaultIWndListener::OnSurfaceDestroyed (IWindow &) __NE___
-    {
-        _impl->StopRendering( null );
-    }
-//-----------------------------------------------------------------------------
-
-
-
-/*
-=================================================
-    OnStateChanged
-=================================================
-*/
-    void  DefaultVRDeviceListener::OnStateChanged (IVRDevice &vr, EState state) __NE___
-    {
-        BEGIN_ENUM_CHECKS();
-        switch ( state )
-        {
-            case EState::InForeground :
-            case EState::Focused :          _impl->StartRendering( &vr.InputActions(), &vr.GetSurface(), state );   break;
-
-            case EState::InBackground :
-            case EState::Stopped :
-            case EState::Destroyed :        _impl->StopRendering( &vr.GetSurface() );                               break;
-
-            case EState::Created :
-            case EState::Unknown :
-            case EState::Started :                                                                                  break;
-
-            default :                       DBG_WARNING( "unsupported VR state" );                                  break;
-        }
-        END_ENUM_CHECKS();
-    }
-
-
-} // AE::AppV1
diff --git a/AE/engine/src/platform/GLFW/ApplicationGLFW.cpp b/AE/engine/src/platform/GLFW/ApplicationGLFW.cpp
index e21249a6..01ca4c27 100644
--- a/AE/engine/src/platform/GLFW/ApplicationGLFW.cpp
+++ b/AE/engine/src/platform/GLFW/ApplicationGLFW.cpp
@@ -1,8 +1,11 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_ENABLE_GLFW
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "platform/GLFW/ApplicationGLFW.h"
+# include "platform/WinAPI/UtilsWinAPI.h"
+
+# include "graphics/Vulkan/VSwapchain.h"
 
 # include "GLFW/glfw3.h"
 # include "GLFW/glfw3native.h"
@@ -36,7 +39,7 @@ namespace {
         Unused( &GLFW_ErrorCallback );
       #endif
 
-        _UpdateMinitors( OUT _cachedMonitors );
+        _UpdateMonitors( OUT _cachedMonitors );
         _GetLocales( OUT _locales );
 
         DEBUG_ONLY(
@@ -97,17 +100,17 @@ namespace {
 
         if_unlikely( _cachedMonitors.empty() or update )
         {
-            _UpdateMinitors( OUT _cachedMonitors );
+            _UpdateMonitors( OUT _cachedMonitors );
         }
         return _cachedMonitors;
     }
 
 /*
 =================================================
-    _UpdateMinitors
+    _UpdateMonitors
 =================================================
 */
-    void  ApplicationGLFW::_UpdateMinitors (OUT Monitors_t &outMonitors) C_NE___
+    void  ApplicationGLFW::_UpdateMonitors (OUT Monitors_t &outMonitors) C_NE___
     {
         outMonitors.clear();
 
@@ -125,6 +128,10 @@ namespace {
 
             outMonitors[i].id = Monitor::ID(i);
         }
+
+      #ifdef AE_PLATFORM_WINDOWS
+        UtilsWinAPI::SetMonitorNames( INOUT outMonitors );
+      #endif
     }
 
 /*
@@ -136,7 +143,7 @@ namespace {
     {
         outLocales.clear();
 
-    #ifdef AE_PLATFORM_WINDOWS
+      #ifdef AE_PLATFORM_WINDOWS
 
         Array<String>   locales_str;
         if ( WindowsUtils::GetLocales( OUT locales_str ))
@@ -146,7 +153,7 @@ namespace {
                 outLocales.push_back( LocaleName{locales_str[i]} );
             }
         }
-    #endif
+      #endif
     }
 
 /*
@@ -168,6 +175,9 @@ namespace {
         int2    size_mm;
         glfwGetMonitorPhysicalSize( ptr, OUT &size_mm.x, OUT &size_mm.y );
 
+        //float2    dpi_scale;  // DPI / DefaultDPI - not correct in Windows
+        //glfwGetMonitorContentScale( ptr, OUT &dpi_scale.x, OUT &dpi_scale.y );
+
         result.workArea     = PixelsRectI{ RectI{ pos, pos + size }};
         result.physicalSize = Meters2f{ float2(size_mm) * 1.0e-3f };
 
@@ -181,10 +191,10 @@ namespace {
             result.region   = result.workArea;
         }
 
-        // calc PPI
-        result.ppi = result.RegionSize() / result.physicalSize.meters * Monitor::_MetersInInch();
+        result.ppi = result._CalculatePPI();
 
-        result.name = glfwGetMonitorName( ptr );    // TODO: returns 'Generic PnP Monitor'
+        // WinAPI returns 'Generic PnP Monitor', correct name will be set later in 'UtilsWinAPI::SetMonitorNames()'
+        result.name = glfwGetMonitorName( ptr );
 
         // set native handle
         #if defined(AE_PLATFORM_WINDOWS)
@@ -195,7 +205,7 @@ namespace {
             result.native = BitCast<Monitor::NativeMonitor_t>( ::glfwGetX11Monitor( ptr ));
 
         #elif defined(AE_PLATFORM_MACOS)
-            result.native = BitCast<Monitor::NativeMonitor_t>( ::glfwGetCocoaMonitor( ptr ));
+            result.native = BitCast<Monitor::NativeMonitor_t>( usize(::glfwGetCocoaMonitor( ptr )));
 
         #else
         #   error no implementation for current platform!
@@ -211,10 +221,18 @@ namespace {
 */
     ArrayView<const char*>  ApplicationGLFW::GetVulkanInstanceExtensions () __NE___
     {
+    #if 0
         uint            required_extension_count = 0;
         const char **   required_extensions      = glfwGetRequiredInstanceExtensions( OUT &required_extension_count );
 
         return ArrayView<const char*>{ required_extensions, required_extension_count };
+
+    #elif defined(AE_ENABLE_VULKAN)
+        return Graphics::VSwapchain::GetInstanceExtensions();
+
+    #else
+        return Default;
+    #endif
     }
 
 /*
@@ -255,7 +273,7 @@ namespace {
 
             if_unlikely( wnd_is_empty )
             {
-                ThreadUtils::Sleep( milliseconds{1} );
+                ThreadUtils::Sleep_15ms();
             }
         }
 
@@ -272,7 +290,6 @@ namespace {
         int res = 0;
         {
             CHECK_ERR( glfwInit() == GLFW_TRUE, -1 );
-            CHECK_ERR( glfwVulkanSupported() == GLFW_TRUE, -1 );
 
             AE::App::ApplicationGLFW    app{ RVRef(listener) };
             app._MainLoop();
diff --git a/AE/engine/src/platform/GLFW/ApplicationGLFW.h b/AE/engine/src/platform/GLFW/ApplicationGLFW.h
index 9be18eda..8e8fe0b9 100644
--- a/AE/engine/src/platform/GLFW/ApplicationGLFW.h
+++ b/AE/engine/src/platform/GLFW/ApplicationGLFW.h
@@ -49,7 +49,7 @@ namespace AE::App
 
         Locales_t   GetLocales ()                                                       C_NE_OV { return _locales; }
 
-        RC<IVirtualFileStorage> OpenBuiltinStorage ()                                   __NE_OV { return null; }
+        RC<IVirtualFileStorage> OpenStorage (EAppStorage)                               __NE_OV { return null; }
 
         ArrayView<const char*>  GetVulkanInstanceExtensions ()                          __NE_OV;
 
@@ -60,7 +60,7 @@ namespace AE::App
 
         void  _MainLoop ()                                                              __NE___;
 
-        void  _UpdateMinitors (OUT Monitors_t &)                                        C_NE___;
+        void  _UpdateMonitors (OUT Monitors_t &)                                        C_NE___;
         void  _GetLocales (OUT Locales_t &)                                             C_NE___;
     };
 
diff --git a/AE/engine/src/platform/GLFW/GLFWtoNativeWindow.mm b/AE/engine/src/platform/GLFW/GLFWtoNativeWindow.mm
index 887c3c83..f2764387 100644
--- a/AE/engine/src/platform/GLFW/GLFWtoNativeWindow.mm
+++ b/AE/engine/src/platform/GLFW/GLFWtoNativeWindow.mm
@@ -10,9 +10,10 @@
 # include <GLFW/glfw3native.h>
 # define null nullptr
 
+using AE::Graphics::MetalNSViewRC;
 using AE::Graphics::MetalCALayerRC;
 
-extern MetalCALayerRC  GetNSWindowView (GLFWwindow* wnd)
+extern bool  GetNSWindowView (GLFWwindow* wnd, OUT MetalNSViewRC &outNSView, OUT MetalCALayerRC &outMetalLayer)
 {
     id  ms_window = glfwGetCocoaWindow( wnd );  // NSWindow
     CHECK_ERR( ms_window != nil );
@@ -35,9 +36,9 @@ extern MetalCALayerRC  GetNSWindowView (GLFWwindow* wnd)
         [ns_layer setContentsScale : MIN(view_scale.width, view_scale.height)];
     }
 
-    MetalCALayerRC  result;
-    result.Retain( (__bridge void *)ns_layer );
-    return result;
+    outNSView.Retain( (__bridge void *)ns_view );
+    outMetalLayer.Retain( (__bridge void *)ns_layer );
+    return true;
 }
 
 #endif // AE_ENABLE_GLFW and AE_PLATFORM_MACOS
diff --git a/AE/engine/src/platform/GLFW/InputActionsGLFW.cpp b/AE/engine/src/platform/GLFW/InputActionsGLFW.cpp
index 92d83450..6bec7f5d 100644
--- a/AE/engine/src/platform/GLFW/InputActionsGLFW.cpp
+++ b/AE/engine/src/platform/GLFW/InputActionsGLFW.cpp
@@ -13,7 +13,7 @@ namespace AE::App
     constructor
 =================================================
 */
-    InputActionsGLFW::InputActionsGLFW (DubleBufferedQueue *q) __NE___ :
+    InputActionsGLFW::InputActionsGLFW (DubleBufferedQueue* q) __NE___ :
         InputActionsBase{ q != null ? *q : _dbQueue },
         _touchActive{ false },  _touchBegin{ false }, _touchEnd{ false },
         _gestureRecognizer{ ushort(EInputType::TouchPos),   ushort(EInputType::TouchPos_mm),
diff --git a/AE/engine/src/platform/GLFW/InputActionsGLFW.h b/AE/engine/src/platform/GLFW/InputActionsGLFW.h
index 74d3c17e..16d5acb6 100644
--- a/AE/engine/src/platform/GLFW/InputActionsGLFW.h
+++ b/AE/engine/src/platform/GLFW/InputActionsGLFW.h
@@ -41,7 +41,7 @@ namespace AE::App
 
     // methods
     public:
-        explicit InputActionsGLFW (DubleBufferedQueue *q)                           __NE___;
+        explicit InputActionsGLFW (DubleBufferedQueue* q)                           __NE___;
 
         // api for window
         void  SetKey (int key, EGestureState state, Duration_t timestamp)           __NE___;
diff --git a/AE/engine/src/platform/GLFW/SerializableInputActionsGLFW.cpp b/AE/engine/src/platform/GLFW/SerializableInputActionsGLFW.cpp
index a9ef09b7..271f53b6 100644
--- a/AE/engine/src/platform/GLFW/SerializableInputActionsGLFW.cpp
+++ b/AE/engine/src/platform/GLFW/SerializableInputActionsGLFW.cpp
@@ -14,7 +14,7 @@ namespace AE::App
 # ifdef AE_ENABLE_GLFW
 
     #define AE_GLFW_KEY_CODES_VISITOR( _key_, _code_, _name_, _glfw_code_ ) \
-        STATIC_ASSERT( uint(SerializableInputActionsGLFW::EInputType::_key_) == uint(_glfw_code_) );
+        StaticAssert( uint(SerializableInputActionsGLFW::EInputType::_key_) == uint(_glfw_code_) );
 
     AE_GLFW_KEY_CODES( AE_GLFW_KEY_CODES_VISITOR )
     #undef AE_GLFW_KEY_CODES_VISITOR
@@ -180,8 +180,8 @@ namespace {
             binder.AddValue( "TouchDelta",          EInputType::TouchDelta );
             binder.AddValue( "TouchDelta_norm",     EInputType::TouchDelta_norm );
 
-            STATIC_ASSERT( uint(EInputType::Cursor2DBegin) == 359 );
-            STATIC_ASSERT( uint(EInputType::Cursor2DEnd) == 367 );
+            StaticAssert( uint(EInputType::Cursor2DBegin) == 359 );
+            StaticAssert( uint(EInputType::Cursor2DEnd) == 367 );
         }
 
         // BindingsMode
diff --git a/AE/engine/src/platform/GLFW/WindowGLFW.cpp b/AE/engine/src/platform/GLFW/WindowGLFW.cpp
index 438dc19f..f9def0db 100644
--- a/AE/engine/src/platform/GLFW/WindowGLFW.cpp
+++ b/AE/engine/src/platform/GLFW/WindowGLFW.cpp
@@ -4,7 +4,7 @@
 
 # ifdef AE_PLATFORM_WINDOWS
 #   define GLFW_EXPOSE_NATIVE_WIN32 1
-#   include "base/Platforms/WindowsHeader.h"
+#   include "base/Platforms/WindowsHeader.cpp.h"
 # endif
 
 # include "GLFW/glfw3.h"
@@ -14,7 +14,7 @@
 # include "platform/GLFW/ApplicationGLFW.h"
 
 # ifdef AE_PLATFORM_MACOS
-    extern AE::Graphics::MetalCALayerRC  GetNSWindowView (GLFWwindow* wnd);
+    extern bool  GetNSWindowView (GLFWwindow* wnd, OUT AE::Graphics::MetalNSViewRC &outNSView, OUT AE::Graphics::MetalCALayerRC &outMetalLayer);
 # endif
 
 namespace AE::App
@@ -124,7 +124,8 @@ namespace AE::App
 */
     NativeWindow  WindowGLFW::GetNative () C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        DRC_EXLOCK( _drCheck );
+        DRC_EXLOCK( _app.GetSingleThreadCheck() );
 
         NativeWindow    result;
 
@@ -139,7 +140,7 @@ namespace AE::App
             result.x11Display   = glfwGetX11Display();
 
         #elif defined(AE_PLATFORM_MACOS)
-            result.metalLayer   = GetNSWindowView( _window );
+            CHECK( GetNSWindowView( _window, OUT result.nsView, OUT result.metalLayer ));
 
         #else
         #   error unsupported platform!
@@ -285,6 +286,19 @@ namespace AE::App
         // set windowed mode
         if ( not fullscreen and was_fullscreen )
         {
+            if ( Any(IsZero( _lastWindowSize.Size() )))
+            {
+                if ( monitor == null )
+                    monitor = glfwGetPrimaryMonitor();
+
+                int2    work_area_pos, work_area_size;
+                glfwGetMonitorWorkarea( monitor, OUT &work_area_pos.x, OUT &work_area_pos.y, OUT &work_area_size.x, OUT &work_area_size.y );
+
+                int2    wnd_size = Max( work_area_size/3, Min( work_area_size, int2(800, 600) ));
+                _lastWindowSize = RectI{ wnd_size };
+                _lastWindowSize += work_area_pos + (work_area_size - wnd_size)/2;
+            }
+
             glfwSetWindowMonitor( _window, null,
                                   _lastWindowSize.left, _lastWindowSize.top, _lastWindowSize.Width(), _lastWindowSize.Height(),
                                   GLFW_DONT_CARE );
diff --git a/AE/engine/src/platform/OpenVR/InputActionsOpenVR.h b/AE/engine/src/platform/OpenVR/InputActionsOpenVR.h
index c106f8b5..86a43194 100644
--- a/AE/engine/src/platform/OpenVR/InputActionsOpenVR.h
+++ b/AE/engine/src/platform/OpenVR/InputActionsOpenVR.h
@@ -31,7 +31,7 @@ namespace AE::App
 
     // methods
     public:
-        explicit InputActionsOpenVR (DubleBufferedQueue *q) __NE___ : InputActionsBase{q ? *q : _dbQueue} {}
+        explicit InputActionsOpenVR (DubleBufferedQueue* q) __NE___ : InputActionsBase{q ? *q : _dbQueue} {}
 
         void  SetPose (ControllerID id, const float3x3 &rot, const float3 &pos, const float3 &vel, const float3 &avel)  __NE___;
         void  OnAxisStateChanged (ControllerID id, uint key, const float2 &value, const float2 &delta, float dt)        __NE___;
diff --git a/AE/engine/src/platform/OpenVR/OpenVRDevice.cpp b/AE/engine/src/platform/OpenVR/OpenVRDevice.cpp
index dfdc7f9d..fe694f8c 100644
--- a/AE/engine/src/platform/OpenVR/OpenVRDevice.cpp
+++ b/AE/engine/src/platform/OpenVR/OpenVRDevice.cpp
@@ -24,8 +24,8 @@ namespace
     {
         return float4x4{
                 float4{ mat.m[0][0], mat.m[1][0], mat.m[2][0], mat.m[3][0] },
-                float4{ mat.m[0][1], mat.m[1][1], mat.m[2][1], mat.m[3][1] }, 
-                float4{ mat.m[0][2], mat.m[1][2], mat.m[2][2], mat.m[3][2] }, 
+                float4{ mat.m[0][1], mat.m[1][1], mat.m[2][1], mat.m[3][1] },
+                float4{ mat.m[0][2], mat.m[1][2], mat.m[2][2], mat.m[3][2] },
                 float4{ mat.m[0][3], mat.m[1][3], mat.m[2][3], mat.m[3][3] }};
     }
 
@@ -95,7 +95,7 @@ namespace
         {
             EXLOCK( _surface._guard );
 
-            auto&           rts         = RenderTaskScheduler();
+            auto&           rts         = GraphicsScheduler();
             const auto&     res_mngr    = rts.GetResourceManager();
             const auto&     dev         = rts.GetDevice();
             const auto&     vr_dev      = _surface._vrDev;
@@ -162,7 +162,7 @@ namespace
                                                              Tuple{ CmdBatchOnSubmit{cmdBatch}, deps });
 
         // next frame will wait for present task
-        //RenderTaskScheduler().AddNextFrameDeps( task );
+        //GraphicsScheduler().AddNextFrameDeps( task );
 
         return task;*/
         return null;
@@ -197,14 +197,14 @@ namespace
     _GetTrackedDeviceString
 =================================================
 */
-    String  OpenVRDevice::_GetTrackedDeviceString (TrackedDeviceIndex_t device, TrackedDeviceProperty prop, OUT TrackedPropertyError *peError) C_NE___
+    String  OpenVRDevice::_GetTrackedDeviceString (TrackedDeviceIndex_t device, TrackedDeviceProperty prop, OUT TrackedPropertyError* peError) C_NE___
     {
         uint    req_len = _vrSystem->GetStringTrackedDeviceProperty( device, prop, null, 0, OUT peError );
         if_unlikely( req_len == 0 )
             return "";
 
         String  result;
-        CATCH_ERR( result.resize( req_len );)
+        NOTHROW_ERR( result.resize( req_len );)
 
         req_len = _vrSystem->GetStringTrackedDeviceProperty( device, prop, OUT result.data(), uint(result.size()), OUT peError );
         ASSERT( req_len == result.size() );
diff --git a/AE/engine/src/platform/OpenVR/OpenVRDevice.h b/AE/engine/src/platform/OpenVR/OpenVRDevice.h
index 1a8653f2..e0c5cefd 100644
--- a/AE/engine/src/platform/OpenVR/OpenVRDevice.h
+++ b/AE/engine/src/platform/OpenVR/OpenVRDevice.h
@@ -37,10 +37,10 @@ namespace AE::App
         struct OpenVRLoader
         {
         // types
-            using VR_InitInternal_t                         = intptr_t (*) (EVRInitError *peError, EVRApplicationType eType);
+            using VR_InitInternal_t                         = intptr_t (*) (EVRInitError* peError, EVRApplicationType eType);
             using VR_ShutdownInternal_t                     = void (*) ();
             using VR_IsHmdPresent_t                         = int (*) ();
-            using VR_GetGenericInterface_t                  = intptr_t (*) (const char *pchInterfaceVersion, EVRInitError *peError);
+            using VR_GetGenericInterface_t                  = intptr_t (*) (const char* pchInterfaceVersion, EVRInitError* peError);
             using VR_IsRuntimeInstalled_t                   = int (*) ();
             using VR_GetVRInitErrorAsSymbol_t               = const char* (*) (EVRInitError error);
             using VR_GetVRInitErrorAsEnglishDescription_t   = const char* (*) (EVRInitError error);
@@ -161,7 +161,7 @@ namespace AE::App
 
         ND_ ControllerID  _GetControllerID (uint tdi) const;
 
-        ND_ String  _GetTrackedDeviceString (TrackedDeviceIndex_t unDevice, TrackedDeviceProperty prop, TrackedPropertyError *peError = null) C_NE___;
+        ND_ String  _GetTrackedDeviceString (TrackedDeviceIndex_t unDevice, TrackedDeviceProperty prop, TrackedPropertyError* peError = null) C_NE___;
     };
 
 
diff --git a/AE/engine/src/platform/OpenVR/SerializableInputActionsOpenVR.cpp b/AE/engine/src/platform/OpenVR/SerializableInputActionsOpenVR.cpp
index 60475f54..b08a41ec 100644
--- a/AE/engine/src/platform/OpenVR/SerializableInputActionsOpenVR.cpp
+++ b/AE/engine/src/platform/OpenVR/SerializableInputActionsOpenVR.cpp
@@ -14,7 +14,7 @@ namespace AE::App
 # ifdef AE_ENABLE_OPENVR
 
     #define AE_OPENVR_KEY_CODES_VISITOR( _key_, _code_, _name_, _ovr_code_ )
-    //  STATIC_ASSERT( uint(SerializableInputActionsOpenVR::EInputType::_key_) == uint(_ovr_code_) );
+    //  StaticAssert( uint(SerializableInputActionsOpenVR::EInputType::_key_) == uint(_ovr_code_) );
 
     AE_OPENVR_KEY_CODES( AE_OPENVR_KEY_CODES_VISITOR )
     #undef AE_OPENVR_KEY_CODES_VISITOR
diff --git a/AE/engine/src/platform/Private/InputActionsBase.cpp b/AE/engine/src/platform/Private/InputActionsBase.cpp
index 92652c8e..4069e7de 100644
--- a/AE/engine/src/platform/Private/InputActionsBase.cpp
+++ b/AE/engine/src/platform/Private/InputActionsBase.cpp
@@ -193,9 +193,9 @@ namespace AE::App
 
         auto    key_it = _pressedKeys.begin();
 
-        STATIC_ASSERT( uint(EGestureType::Click)+1       == uint(EGestureType::DoubleClick) );
-        STATIC_ASSERT( uint(EGestureType::DoubleClick)+1 == uint(EGestureType::Hold) );
-        STATIC_ASSERT( uint(EGestureType::Hold)+1        == uint(EGestureType::LongPress) );
+        StaticAssert( uint(EGestureType::Click)+1        == uint(EGestureType::DoubleClick) );
+        StaticAssert( uint(EGestureType::DoubleClick)+1 == uint(EGestureType::Hold) );
+        StaticAssert( uint(EGestureType::Hold)+1         == uint(EGestureType::LongPress) );
 
         _Skip< EGestureType::Click >( INOUT key_it );
 
@@ -288,10 +288,11 @@ namespace AE::App
 */
     InputActionsBase::DubleBufferedQueue*  InputActionsBase::GetQueue (IInputActions* act) __NE___
     {
-        if ( auto* base = DynCast<InputActionsBase>( act ))
-        {
-            return base->_dbQueueRef.Get();
-        }
+        ASSERT( CastAllowed<InputActionsBase>( act ));
+
+        if ( act != null )
+            return Cast<InputActionsBase>( act )->_dbQueueRef.Get();
+
         return null;
     }
 
@@ -330,7 +331,7 @@ namespace AE::App
                           GestureType == EGestureType::LongPress )
             {
                 if ( state == EGestureState::Begin ){
-                    _pressedKeys.emplace( key, timestamp );
+                    _pressedKeys.emplace( key, PressedKey{ timestamp, id });
                 }else{
                     _pressedKeys.EraseByKey( key );
                 }
@@ -338,7 +339,7 @@ namespace AE::App
             else
             if constexpr( GestureType == EGestureType::Down )
             {
-                if ( state == EGestureState::Begin and _pressedKeys.emplace( key, timestamp ).second ){
+                if ( state == EGestureState::Begin and _pressedKeys.emplace( key, PressedKey{ timestamp, id }).second ){
                     _dbQueueRef.Insert( info.name, id, EGestureState::End, &v[0], v_size );
                 }
                 if ( state == EGestureState::End ){
@@ -349,7 +350,7 @@ namespace AE::App
             if constexpr( GestureType == EGestureType::Click )
             {
                 if ( state == EGestureState::Begin ){
-                    _pressedKeys.emplace( key, timestamp );
+                    _pressedKeys.emplace( key, PressedKey{ timestamp, id });
                 }else
                 if ( PressedKey pressed;
                      _pressedKeys.Extract( key, OUT pressed ) and (timestamp - pressed.timestamp) <= _ClickMaxDuration )
@@ -361,7 +362,7 @@ namespace AE::App
             if constexpr( GestureType == EGestureType::DoubleClick )
             {
                 if ( state == EGestureState::Begin ){
-                    _pressedKeys.emplace( key, timestamp );
+                    _pressedKeys.emplace( key, PressedKey{ timestamp, id });
                 }else
                 if ( auto key_it = _pressedKeys.find( key );  key_it != _pressedKeys.end() )
                 {
diff --git a/AE/engine/src/platform/Private/InputActionsBase.h b/AE/engine/src/platform/Private/InputActionsBase.h
index a022bdb3..788affeb 100644
--- a/AE/engine/src/platform/Private/InputActionsBase.h
+++ b/AE/engine/src/platform/Private/InputActionsBase.h
@@ -40,6 +40,9 @@ namespace AE::App
             Duration_t      timestamp       {0};
             ControllerID    controllerId    = ControllerID::Default;
             ushort          data            = 0;
+
+            PressedKey ()                                           __NE___ {}
+            explicit PressedKey (Duration_t ts, ControllerID id)    __NE___ : timestamp{ts}, controllerId{id} {}
         };
         using PressedKeys_t = FixedMap< InputKey, PressedKey, 32 >;
 
diff --git a/AE/engine/src/platform/Private/Monitor.cpp b/AE/engine/src/platform/Private/Monitor.cpp
index ee9a8cec..73a8cfe1 100644
--- a/AE/engine/src/platform/Private/Monitor.cpp
+++ b/AE/engine/src/platform/Private/Monitor.cpp
@@ -19,9 +19,9 @@ namespace AE::App
             "workArea:     " << ToString( workArea.pixels ) << " pix\n"
             "region:       " << ToString( region.pixels ) << " pix\n"
             "physicalSize: " << ToString( physicalSize.meters ) << " meters\n"
-            "ppi:          " << ToString( ppi ) << " pixels/inch\n"
+            "ppi:          " << ToString( ppi ) << " pix/inch\n"
             "frequency:    " << ToString( freq ) << " Hz\n"
-            //"orientation:  " << 
+            //"orientation:  " <<
             "external:     " << ToString( isExternal ) << "\n"
         );
     }
diff --git a/AE/engine/src/platform/Private/SerializableInputActions.cpp b/AE/engine/src/platform/Private/SerializableInputActions.cpp
index dd4d1697..00899c77 100644
--- a/AE/engine/src/platform/Private/SerializableInputActions.cpp
+++ b/AE/engine/src/platform/Private/SerializableInputActions.cpp
@@ -106,7 +106,7 @@ namespace AE::App
 */
     bool  SerializableInputActions::Merge (const SerializableInputActions &other)
     {
-        for (auto [name, mode] : other._modeMap) 
+        for (auto [name, mode] : other._modeMap)
         {
             CHECK_ERR( not _modeMap.contains( name ));
             CHECK_ERR( _modeMap.emplace( name, mode ).first != Default );
@@ -238,7 +238,7 @@ namespace AE::App
             binder.AddValue( "Click",           EGestureType::Click             );
             binder.AddValue( "LongPress",       EGestureType::LongPress         );
             binder.AddValue( "DoubleClick",     EGestureType::DoubleClick       );
-            STATIC_ASSERT( uint(EGestureType::_Count) == 8 );
+            StaticAssert( uint(EGestureType::_Count) == 8 );
         }
 
         // EValueType
@@ -255,7 +255,7 @@ namespace AE::App
             binder.AddValue( "Quat",        EValueType::Quat        );
             binder.AddValue( "Float4x4",    EValueType::Float4x4    );
             binder.AddValue( "String",      EValueType::String      );
-            STATIC_ASSERT( uint(EValueType::_Count) == 9 );
+            StaticAssert( uint(EValueType::_Count) == 9 );
         }
 
         // ScriptActionInfo
@@ -297,38 +297,38 @@ namespace AE::App
                     PackedScale4_t  packed{ scale };
                     packed_float4   temp{ packed };
 
-                    CHECK_THROW_MSG( Equals( temp.x, scale.x, PackedScaleEpsilon ));
-                    CHECK_THROW_MSG( Equals( temp.y, scale.y, PackedScaleEpsilon ));
-                    CHECK_THROW_MSG( Equals( temp.z, scale.z, PackedScaleEpsilon ));
-                    CHECK_THROW_MSG( Equals( temp.w, scale.w, PackedScaleEpsilon ));
+                    CHECK_THROW_MSG( Equal( temp.x, scale.x, PackedScaleEpsilon ));
+                    CHECK_THROW_MSG( Equal( temp.y, scale.y, PackedScaleEpsilon ));
+                    CHECK_THROW_MSG( Equal( temp.z, scale.z, PackedScaleEpsilon ));
+                    CHECK_THROW_MSG( Equal( temp.w, scale.w, PackedScaleEpsilon ));
 
                     return packed;
                 }
 
 
                 static void  Ctor1 (OUT void* mem, const String &action) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, EValueType::Unknown, EGestureType::Unknown, VecSwizzle{}, DefaultScale() ); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, EValueType::Unknown, EGestureType::Unknown, VecSwizzle{}, DefaultScale() );
                 }
                 static void  Ctor2 (OUT void* mem, const String &action, EValueType type) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, EGestureType::Unknown, VelueTypeToSwizzle(type), DefaultScale() ); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, EGestureType::Unknown, VelueTypeToSwizzle(type), DefaultScale() );
                 }
                 static void  Ctor2_1 (OUT void* mem, const String &action, EValueType type, const packed_float4 &scale) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, EGestureType::Unknown, VelueTypeToSwizzle(type), ConvertScale( scale )); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, EGestureType::Unknown, VelueTypeToSwizzle(type), ConvertScale( scale ));
                 }
                 static void  Ctor3 (OUT void* mem, const String &action, EGestureType gesture) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, EValueType::Unknown, gesture, VecSwizzle{}, DefaultScale() ); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, EValueType::Unknown, gesture, VecSwizzle{}, DefaultScale() );
                 }
                 static void  Ctor4 (OUT void* mem, const String &action, EValueType type, EGestureType gesture) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, VelueTypeToSwizzle(type), DefaultScale() ); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, VelueTypeToSwizzle(type), DefaultScale() );
                 }
                 static void  Ctor4_1 (OUT void* mem, const String &action, EValueType type, EGestureType gesture, const packed_float4 &scale) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, VelueTypeToSwizzle(type), ConvertScale( scale )); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, VelueTypeToSwizzle(type), ConvertScale( scale ));
                 }
                 static void  Ctor5 (OUT void* mem, const String &action, EValueType type, EGestureType gesture, const VecSwizzle &swizzle) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, swizzle, DefaultScale() ); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, swizzle, DefaultScale() );
                 }
                 static void  Ctor5_1 (OUT void* mem, const String &action, EValueType type, EGestureType gesture, const VecSwizzle &swizzle, const packed_float4 &scale) {
-                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, swizzle, ConvertScale( scale )); // throw
+                    PlacementNew<ScriptActionInfo>( OUT mem, action, type, gesture, swizzle, ConvertScale( scale ));
                 }
             };
 
@@ -368,10 +368,10 @@ namespace AE::App
         info.swizzle    = value.swizzle;
         info.scale      = value.scale;
 
-        CHECK_THROW_MSG( Equals( info.scale.x.GetFast(), info.scale.x.Get(), PackedScaleEpsilon ));
-        CHECK_THROW_MSG( Equals( info.scale.y.GetFast(), info.scale.y.Get(), PackedScaleEpsilon ));
-        CHECK_THROW_MSG( Equals( info.scale.z.GetFast(), info.scale.z.Get(), PackedScaleEpsilon ));
-        CHECK_THROW_MSG( Equals( info.scale.w.GetFast(), info.scale.w.Get(), PackedScaleEpsilon ));
+        CHECK_THROW_MSG( Equal( info.scale.x.GetFast(), info.scale.x.Get(), PackedScaleEpsilon ));
+        CHECK_THROW_MSG( Equal( info.scale.y.GetFast(), info.scale.y.Get(), PackedScaleEpsilon ));
+        CHECK_THROW_MSG( Equal( info.scale.z.GetFast(), info.scale.z.Get(), PackedScaleEpsilon ));
+        CHECK_THROW_MSG( Equal( info.scale.w.GetFast(), info.scale.w.Get(), PackedScaleEpsilon ));
 
         _refl->Add( info.name, value.action );
         _self->_hashCollisionCheck.Add( info.name, value.action );
diff --git a/AE/engine/src/platform/Private/SerializableInputActions.h b/AE/engine/src/platform/Private/SerializableInputActions.h
index 68ee2479..dbb350d3 100644
--- a/AE/engine/src/platform/Private/SerializableInputActions.h
+++ b/AE/engine/src/platform/Private/SerializableInputActions.h
@@ -33,8 +33,8 @@ namespace AE::App
             VecSwizzle          swizzle     = VecSwizzle::VecDefault(4);
             PackedScale4_t      scale       {float4{1.0f}};
 
-            ScriptActionInfo () {}
-            ScriptActionInfo (StringView a, EValueType t, EGestureType g, VecSwizzle sw, const PackedScale4_t &sc) :
+            ScriptActionInfo () __NE___ {}
+            ScriptActionInfo (StringView a, EValueType t, EGestureType g, VecSwizzle sw, const PackedScale4_t &sc) __NE___ :
                 action{a}, type{t}, gesture{g}, swizzle{sw}, scale{sc} {}
         };
 
@@ -86,6 +86,10 @@ namespace AE::App
         {
             ActionMap_t     actions;
             bool            lockAndHideCursor   = false;    // lock into window (for shooter game)
+
+            InputMode ()                    __NE___ = default;
+            InputMode (const InputMode &)   __NE___ = default;
+            InputMode (InputMode &&)        __NE___ = default;
         };
 
         using ModeMap_t = FixedMap< InputModeName, InputMode, _MaxModes >;
diff --git a/AE/engine/src/platform/Private/VRDeviceEmulator.cpp b/AE/engine/src/platform/Private/VRDeviceEmulator.cpp
index ca3c8933..816dec13 100644
--- a/AE/engine/src/platform/Private/VRDeviceEmulator.cpp
+++ b/AE/engine/src/platform/Private/VRDeviceEmulator.cpp
@@ -16,8 +16,8 @@ namespace AE::App
         VRRenderSurface &   t;
 
     public:
-        BlitImageTask (VRRenderSurface* t, CommandBatchPtr batch, DebugLabel) __Th___ :
-            RenderTask{ batch, {"VRDeviceEmulator::BlitImage"} },   // throw
+        BlitImageTask (VRRenderSurface* t, CommandBatchPtr batch, DebugLabel) __NE___ :
+            RenderTask{ batch, {"VRDeviceEmulator::BlitImage"} },
             t{ *t }
         {}
 
@@ -41,8 +41,8 @@ namespace AE::App
         auto&   src_rt1 = src_targets[1];
         auto&   dst_rt  = dst_targets[0];
 
-        //ASSERT( src_rt0.colorSpace == dst_rt.colorSpace );  // TODO
-        //ASSERT( src_rt1.colorSpace == dst_rt.colorSpace );
+        ASSERT( src_rt0.colorSpace == dst_rt.colorSpace );
+        ASSERT( src_rt1.colorSpace == dst_rt.colorSpace );
 
         DirectCtx::Transfer     ctx{ *this };
 
@@ -95,7 +95,7 @@ namespace AE::App
         if_unlikely( not surf.IsInitialized() )
             return null;
 
-        _presentBatch = RenderTaskScheduler().BeginCmdBatch( EQueueType::Graphics, 2, {"VR emulator present"} );
+        _presentBatch = GraphicsScheduler().BeginCmdBatch( EQueueType::Graphics, 2, {"VR emulator present"} );
         CHECK_ERR( _presentBatch );
 
         CHECK_ERR( _presentBatch->AddInputDependency( endCmdBatch ));
@@ -279,8 +279,8 @@ namespace AE::App
     {
         if_likely( _vrDev._window )
         {
-            if ( auto* base_acts = DynCast<InputActionsBase>( &_vrDev._window->InputActions() ))
-                base_acts->EnableVREmulation();
+            ASSERT( CastAllowed<InputActionsBase>( &_vrDev._window->InputActions() ));
+            Cast<InputActionsBase>( &_vrDev._window->InputActions() )->EnableVREmulation();
 
             return _vrDev._window->InputActions().LoadSerialized( stream );
         }
@@ -564,7 +564,7 @@ namespace AE::App
         }
 
         RadianVec<float,2>  angle;
-        const usize         idx = RenderTaskScheduler().GetFrameId().Remap2( 1 ) * 2;
+        const usize         idx = GraphicsScheduler().GetFrameId().Remap2( 1 ) * 2;
         {
             EXLOCK( _hmdRotationGuard );
             angle.x = Rad{_hmdRotation.x};
diff --git a/AE/engine/src/platform/Private/VRDeviceEmulator.h b/AE/engine/src/platform/Private/VRDeviceEmulator.h
index 3dddfe1d..1f61195d 100644
--- a/AE/engine/src/platform/Private/VRDeviceEmulator.h
+++ b/AE/engine/src/platform/Private/VRDeviceEmulator.h
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
     Input actions redirections:
-        VR window input -> VR emulator InputActions -> (optional) Window InputActions 
+        VR window input -> VR emulator InputActions -> (optional) Window InputActions
 */
 
 #pragma once
@@ -76,7 +76,7 @@ namespace AE::App
 
         // methods
         public:
-            InputActions (VRDeviceEmulator &vr, DubleBufferedQueue *q)                                                              __NE___ :
+            InputActions (VRDeviceEmulator &vr, DubleBufferedQueue* q)                                                              __NE___ :
                 InputActionsBase{q ? *q : _dbQueue}, _vrDev{vr}
             {}
 
diff --git a/AE/engine/src/platform/Private/VRSurface.cpp b/AE/engine/src/platform/Private/VRSurface.cpp
index c769312d..2c897858 100644
--- a/AE/engine/src/platform/Private/VRSurface.cpp
+++ b/AE/engine/src/platform/Private/VRSurface.cpp
@@ -36,7 +36,7 @@ namespace AE::App
 
         Destroy();
 
-        auto&           res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&           res_mngr = GraphicsScheduler().GetResourceManager();
         ImageDesc       img_desc;
         ImageViewDesc   view_desc;
 
@@ -73,9 +73,9 @@ namespace AE::App
     {
         EXLOCK( _guard );
 
-        CHECK( RenderTaskScheduler().WaitAll() );
+        CHECK( GraphicsScheduler().WaitAll( AE::DefaultTimeout ));
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         for (usize i = 0; i < _images.size(); ++i)
         {
@@ -147,14 +147,14 @@ namespace AE::App
 
 /*
 =================================================
-    GetTargetSizes
+    GetTargetInfo
 =================================================
 */
-    IOutputSurface::TargetSizes_t  VRSurface::GetTargetSizes () C_NE___
+    IOutputSurface::TargetInfos_t  VRSurface::GetTargetInfo () C_NE___
     {
-        TargetSizes_t   result;
+        TargetInfos_t   result;
         for (usize i = 0; i < _images.size(); ++i) {
-            result.push_back( _desc.dimension );
+            result.emplace_back( _desc.dimension, 0.f );
         }
         return result;
     }
diff --git a/AE/engine/src/platform/Private/VRSurface.h b/AE/engine/src/platform/Private/VRSurface.h
index a0987520..ac478a22 100644
--- a/AE/engine/src/platform/Private/VRSurface.h
+++ b/AE/engine/src/platform/Private/VRSurface.h
@@ -49,7 +49,7 @@ namespace AE::App
 
         bool            GetTargets (OUT RenderTargets_t &)      C_NE_OV;
 
-        TargetSizes_t   GetTargetSizes ()                       C_NE_OV;
+        TargetInfos_t   GetTargetInfo ()                        C_NE_OV;
     };
 
 
diff --git a/AE/engine/src/platform/Private/WindowBase.cpp b/AE/engine/src/platform/Private/WindowBase.cpp
index 3310dbde..57ed41cc 100644
--- a/AE/engine/src/platform/Private/WindowBase.cpp
+++ b/AE/engine/src/platform/Private/WindowBase.cpp
@@ -46,6 +46,7 @@ namespace
     {
         DRC_EXLOCK( _drCheck );
         CHECK( _wndState == EState::Destroyed );
+        ASSERT( not _surface.IsInitialized() );
     }
 
 /*
diff --git a/AE/engine/src/platform/Private/WindowSurface.cpp b/AE/engine/src/platform/Private/WindowSurface.cpp
index 810d0ff6..c886b80c 100644
--- a/AE/engine/src/platform/Private/WindowSurface.cpp
+++ b/AE/engine/src/platform/Private/WindowSurface.cpp
@@ -69,7 +69,7 @@ namespace {
 */
     bool  WindowSurface::_CreateSwapchain (SurfaceDataSync_t::WriteNoLock_t &data) __NE___
     {
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
         auto&   dev         = res_mngr.GetDevice();
 
         CHECK_ERR( dev.IsInitialized() );
@@ -100,7 +100,7 @@ namespace {
         if_unlikely( not _initialized.exchange( false ))
             return;
 
-        CHECK( RenderTaskScheduler().WaitAll() );
+        CHECK( GraphicsScheduler().WaitAll( AE::DefaultTimeout ));
 
         _swapchain.Destroy();
         _swapchain.DestroySurface();
@@ -130,7 +130,7 @@ namespace {
         {
             _initialized.store( false );
 
-            CHECK( RenderTaskScheduler().WaitAll() );
+            CHECK( GraphicsScheduler().WaitAll( AE::DefaultTimeout ));
 
             data->window = &wnd;
 
@@ -243,13 +243,13 @@ namespace {
 
 /*
 =================================================
-    GetTargetSizes
+    GetTargetInfo
 =================================================
 */
-    IOutputSurface::TargetSizes_t  WindowSurface::GetTargetSizes () C_NE___
+    IOutputSurface::TargetInfos_t  WindowSurface::GetTargetInfo () C_NE___
     {
-        TargetSizes_t   result;
-        result.push_back( _swapchain.GetSurfaceSize() );
+        TargetInfos_t   result;
+        result.emplace_back( _swapchain.GetSurfaceSize(), _pixToMm.load() );
         return result;
     }
 
@@ -260,9 +260,6 @@ namespace {
 */
     IOutputSurface::SurfaceInfo  WindowSurface::GetSurfaceInfo () C_NE___
     {
-        // result may be changed immediately if method used outside of 'Begin() / End()' scope.
-        //ASSERT( _swapchain.IsImageAcquired() );
-
         SwapchainDesc   desc    = _swapchain.GetDescription();
         SurfaceInfo     result;
 
@@ -304,7 +301,7 @@ namespace {
         WindowSurface &     _surface;
 
     public:
-        RecreateSwapchainTask (WindowSurface* surf) :
+        RecreateSwapchainTask (WindowSurface* surf) __NE___ :
             IAsyncTask{ RecreateSwapchainQueue },
             _surface{ *surf }
         {}
@@ -347,7 +344,7 @@ namespace {
         CommandBatchPtr     _endCmdBatch;
 
     public:
-        AcquireNextImageTask (WindowSurface* surf, CommandBatchPtr beginCmdBatch, CommandBatchPtr endCmdBatch) :
+        AcquireNextImageTask (WindowSurface* surf, CommandBatchPtr beginCmdBatch, CommandBatchPtr endCmdBatch) __NE___ :
             IAsyncTask{ AcquireAndPresentQueue },
             _surface{ *surf },
             _beginCmdBatch{ RVRef(beginCmdBatch) },
@@ -410,7 +407,7 @@ namespace {
         const EQueueType    _presentQueue;
 
     public:
-        PresentImageTask (WindowSurface* surf, EQueueType presentQueue) :
+        PresentImageTask (WindowSurface* surf, EQueueType presentQueue) __NE___ :
             IAsyncTask{ AcquireAndPresentQueue },
             _surface{ *surf },
             _presentQueue{ presentQueue }
@@ -418,7 +415,7 @@ namespace {
 
         void  Run () __Th_OV
         {
-            auto&       rts = RenderTaskScheduler();
+            auto&       rts = GraphicsScheduler();
             auto        q   = rts.GetDevice().GetQueue( _presentQueue );
             VkResult    err = _surface._swapchain.Present( q );
 
@@ -510,7 +507,7 @@ namespace {
 
         void  Run () __Th_OV
         {
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
             auto    q   = rts.GetDevice().GetQueue( _presentQueue );
 
             CHECK_TE( _surface._swapchain.Present( q ));
@@ -535,7 +532,7 @@ namespace {
         CommandBatchPtr     _endCmdBatch;
 
     public:
-        AcquireNextImageTask (WindowSurface* surf, CommandBatchPtr beginCmdBatch, CommandBatchPtr endCmdBatch) :
+        AcquireNextImageTask (WindowSurface* surf, CommandBatchPtr beginCmdBatch, CommandBatchPtr endCmdBatch) __NE___ :
             IAsyncTask{ AcquireAndPresentQueue },
             _surface{ *surf },
             _beginCmdBatch{ RVRef(beginCmdBatch) },
@@ -572,7 +569,7 @@ namespace {
         const EQueueType    _presentQueue;
 
     public:
-        PresentImageTask (WindowSurface* surf, EQueueType presentQueue) :
+        PresentImageTask (WindowSurface* surf, EQueueType presentQueue) __NE___ :
             IAsyncTask{ AcquireAndPresentQueue },
             _surface{ *surf },
             _presentQueue{ presentQueue }
@@ -580,7 +577,7 @@ namespace {
 
         void  Run () __Th_OV
         {
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
             auto    q   = rts.GetDevice().GetQueue( _presentQueue );
 
             //CHECK_TE( _surface._swapchain.Present( q ));
@@ -618,7 +615,7 @@ namespace {
         CHECK_ERR( _initialized.load() );
 
         AsyncTask   present = RVRef(data->prevTask);    // can be null
-        ASSERT( present == null or DynCast<PresentImageTask>(present) != null );
+        ASSERT( present == null or CastAllowed<PresentImageTask>( present.get() ));
 
         AsyncTask   task = Scheduler().Run<AcquireNextImageTask>( Tuple{ this, beginCmdBatch, endCmdBatch }, Tuple{ present, deps });
 
@@ -642,7 +639,7 @@ namespace {
         CHECK_ERR( data->endCmdBatch );
 
         AsyncTask   acquire = RVRef(data->prevTask);    // can be null
-        ASSERT( acquire == null or DynCast<AcquireNextImageTask>(acquire) != null );
+        ASSERT( acquire == null or CastAllowed<AcquireNextImageTask>( acquire.get() ));
 
         AsyncTask   task = Scheduler().Run<PresentImageTask>( Tuple{ this, data->endCmdBatch->GetQueueType() },
                                                               Tuple{ acquire, CmdBatchOnSubmit{data->endCmdBatch}, deps });
diff --git a/AE/engine/src/platform/Private/WindowSurface.h b/AE/engine/src/platform/Private/WindowSurface.h
index 9980752e..4e75491b 100644
--- a/AE/engine/src/platform/Private/WindowSurface.h
+++ b/AE/engine/src/platform/Private/WindowSurface.h
@@ -79,7 +79,7 @@ namespace AE::App
         bool                GetTargets (OUT RenderTargets_t &targets)                                               C_NE_OV;
         AsyncTask           End (ArrayView<AsyncTask> deps)                                                         __NE_OV;
 
-        TargetSizes_t       GetTargetSizes ()                                                                       C_NE_OV;
+        TargetInfos_t       GetTargetInfo ()                                                                        C_NE_OV;
         SurfaceFormats_t    GetSurfaceFormats ()                                                                    C_NE_OV;
         PresentModes_t      GetPresentModes ()                                                                      C_NE_OV;
         SurfaceInfo         GetSurfaceInfo ()                                                                       C_NE_OV;
diff --git a/AE/engine/src/platform/Public/AppEnums.h b/AE/engine/src/platform/Public/AppEnums.h
index 41a36396..a2cbbc39 100644
--- a/AE/engine/src/platform/Public/AppEnums.h
+++ b/AE/engine/src/platform/Public/AppEnums.h
@@ -18,7 +18,7 @@ namespace AE::App
 
         // continious
         //   state: Begin -> Update -> End/Cancel
-        Hold,               // params:                          |   
+        Hold,               // params:                          |
         LongPress,          // params: f1(0..1)                 |
         Move,               // params: f1/2/3/4                 |
         LongPress_Move,     // params: f3(pos, 0..1)            |   long press to start gesture, then move - only for mouse or touch
diff --git a/AE/engine/src/platform/Public/Common.h b/AE/engine/src/platform/Public/Common.h
index dd8a8388..b4b652f5 100644
--- a/AE/engine/src/platform/Public/Common.h
+++ b/AE/engine/src/platform/Public/Common.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    [supported platforms and features](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Platforms.md)
+    [supported platforms and features](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Platforms.md)
 */
 
 #pragma once
@@ -20,7 +20,7 @@ namespace AE::App
     using namespace AE::Base;
 
     using Threading::Atomic;
-    using Threading::BytesAtomic;
+    using Threading::AtomicByte;
     using Threading::AsyncTask;
 
 #  if AE_ENABLE_DATA_RACE_CHECK
@@ -72,7 +72,7 @@ namespace AE::App
     struct PlatformConfig
     {
         static constexpr uint   MaxMonitors     = 4;
-        static constexpr uint   MaxWindows      = 8;
+        static constexpr uint   MaxWindows      = 4;
     };
 
 } // AE::App
diff --git a/AE/engine/src/platform/Public/IApplication.h b/AE/engine/src/platform/Public/IApplication.h
index e0f3b985..fcec4a31 100644
--- a/AE/engine/src/platform/Public/IApplication.h
+++ b/AE/engine/src/platform/Public/IApplication.h
@@ -1,10 +1,13 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-        IApplication
+    --- IApplication ---
     Contains array of windows.
-    May create IInputSurface for camera.
+    May create:
+     * IInputSurface for camera.
+     * IVirtualFileStorage for builtin resources.
 
-        IWindow
+
+    --- IWindow ---
     Contains reference to IOutputSurface.
 */
 
@@ -18,6 +21,12 @@
 
 namespace AE::App
 {
+    enum class EAppStorage
+    {
+        Builtin,        // read-only
+        Cache,          // read / write
+    };
+
 
     //
     // Application interface
@@ -27,7 +36,7 @@ namespace AE::App
     {
     // types
     public:
-        class IAppListener
+        class IAppListener : public NothrowAllocatable
         {
         // interface
         public:
@@ -56,64 +65,66 @@ namespace AE::App
         //   Windows, Linux, Mac supports multiple windows.
         //   Thread safe: main thread only
         //
-        ND_ virtual WindowPtr  CreateWindow (WndListenerPtr, const WindowDesc &wndDesc, IInputActions* dst = null)                      __NE___ = 0;
+        ND_ virtual WindowPtr  CreateWindow (WndListenerPtr, const WindowDesc &wndDesc,
+                                             IInputActions* dst = null)                         __NE___ = 0;
 
 
         // Create VR device.
         // Input actions can be used to redirect VR input actions to the same queue.
         //   Thread safe: yes
         //
-        ND_ virtual VRDevicePtr  CreateVRDevice (VRDevListenerPtr, IInputActions* dst = null, IVRDevice::EDeviceType type = Default)    __NE___ = 0;
+        ND_ virtual VRDevicePtr  CreateVRDevice (VRDevListenerPtr, IInputActions* dst = null,
+                                                 IVRDevice::EDeviceType type = Default)         __NE___ = 0;
 
 
-        // Read builtin file system.
-        //   Thread safe: no
+        // Open OS-specific file storage. Returns null if not supported.
+        //   Thread safe: yes
         //
-        ND_ virtual RC<IVirtualFileStorage>  OpenBuiltinStorage ()                                                                      __NE___ = 0;
+        ND_ virtual RC<IVirtualFileStorage>  OpenStorage (EAppStorage type)                     __NE___ = 0;
 
 
         // Returns array of monitors.
         // Monitors must be updated if something has been changed (attached/detached monitor, monitor position changed in OS).
         //   Thread safe: main thread only
         //
-        ND_ virtual Monitors_t  GetMonitors (bool update = false)                                                                       __NE___ = 0;
+        ND_ virtual Monitors_t  GetMonitors (bool update = false)                               __NE___ = 0;
 
 
         // Returns required extension names for Vulkan.
         //   Thread safe: yes
         //
-        ND_ virtual ArrayView<const char*>  GetVulkanInstanceExtensions ()                                                              __NE___ = 0;
+        ND_ virtual ArrayView<const char*>  GetVulkanInstanceExtensions ()                      __NE___ = 0;
 
 
         // Window may be closed from any thread,
         // this method internally lock window to prevent destruction.
         //   Thread safe: yes
         //
-        //  virtual void  EnumWindows (const EnumWindowsFn_t &fn)                                                                       __NE___ = 0;
+        //  virtual void  EnumWindows (const EnumWindowsFn_t &fn)                               __NE___ = 0;
 
 
         // Close all windows and delete app.
         //   Thread safe: yes
         //
-            virtual void  Terminate ()                                                                                                  __NE___ = 0;
+            virtual void  Terminate ()                                                          __NE___ = 0;
 
 
         // Returns API/Framework name.
         //   Thread safe: yes
         //
-        ND_ virtual StringView  GetApiName ()                                                                                           C_NE___ = 0;
+        ND_ virtual StringView  GetApiName ()                                                   C_NE___ = 0;
 
 
         // Returns time since startup.
         //   Thread safe: yes
         //
-        ND_ virtual Duration_t  GetTimeSinceStart ()                                                                                    C_NE___ = 0;
+        ND_ virtual Duration_t  GetTimeSinceStart ()                                            C_NE___ = 0;
 
 
         // Returns array of supported locales.
         //   Thread safe: yes
         //
-        ND_ virtual Locales_t  GetLocales ()                                                                                            C_NE___ = 0;
+        ND_ virtual Locales_t  GetLocales ()                                                    C_NE___ = 0;
 
 
         // TODO:
diff --git a/AE/engine/src/platform/Public/IWindow.h b/AE/engine/src/platform/Public/IWindow.h
index 11fed3e0..05fb2508 100644
--- a/AE/engine/src/platform/Public/IWindow.h
+++ b/AE/engine/src/platform/Public/IWindow.h
@@ -60,7 +60,7 @@ namespace AE::App
     {
     // types
     public:
-        class IWndListener
+        class IWndListener : public NothrowAllocatable
         {
         // types
         public:
diff --git a/AE/engine/src/platform/Public/InputActions.h b/AE/engine/src/platform/Public/InputActions.h
index ffd4329f..be34408d 100644
--- a/AE/engine/src/platform/Public/InputActions.h
+++ b/AE/engine/src/platform/Public/InputActions.h
@@ -67,7 +67,7 @@ namespace AE::App
             struct Header
             {
                 InputActionName name;
-                Bytes32u        offset;         // TODO: use ushort ?
+                Byte32u         offset;         // TODO: use ushort ?
                 ControllerID    controllerId;
                 EGestureState   state;
             };
@@ -82,9 +82,9 @@ namespace AE::App
             Header *        _headers    = null;
             void *          _data       = null;
 
-            Bytes32u        _dataPos;
+            Byte32u         _dataPos;
             const uint      _maxHeaders = 0;
-            const Bytes32u  _dataSize;
+            const Byte32u   _dataSize;
 
 
         // methods
@@ -283,7 +283,7 @@ namespace AE::App
     template <typename T>
     T const&  IInputActions::ActionQueueReader::Data (Bytes offset) C_NE___
     {
-        STATIC_ASSERT( AlignOf<T> <= IInputActions::ActionQueue::_DataAlign );
+        StaticAssert( AlignOf<T> <= IInputActions::ActionQueue::_DataAlign );
         return *Cast<T>( _queue->GetData() + offset );
     }
 
diff --git a/AE/engine/src/platform/Public/Monitor.h b/AE/engine/src/platform/Public/Monitor.h
index 34a75860..f6af4234 100644
--- a/AE/engine/src/platform/Public/Monitor.h
+++ b/AE/engine/src/platform/Public/Monitor.h
@@ -10,14 +10,13 @@ namespace AE::App
     //
     // Monitor
     //
-    struct Monitor
+    struct Monitor final
     {
     // types
     public:
         enum class ID : uint
         {
-            Default = ~0u,
-            Unknown = Default,
+            Unknown = ~0u,
         };
 
         enum class EOrientation : short
@@ -43,24 +42,28 @@ namespace AE::App
 
     // variables
     public:
-        ID                  id          = Default;
-        PixelsRectI         workArea;               // area available for window
-        PixelsRectI         region;                 // area available for fullscreen window only
+        ID                  id                  = Default;
+        PixelsRectI         workArea;                       // area available for window
+        PixelsRectI         region;                         // area available for fullscreen window only
 
-        Meters2f            physicalSize;           // in meters
-        float2              ppi;                    // pixels per inch
-        uint                freq        = 0;        // update frequency in Hz
-        EOrientation        orient      = Default;
-        bool                isExternal  = false;
+        Meters2f            physicalSize;                   // in meters
+        float2              ppi;                            // pixels per inch
+        Meters2f            curvatureRadius;                // radius of curvature on X and Y axis, only for curved monitors
+        uint                freq                = 0;        // update frequency in Hz
+        EOrientation        orient              = Default;
+        bool                isExternal          = false;
 
         Name_t              name;
-        NativeMonitor_t     native      = null;
+        NativeMonitor_t     native              = null;
 
 
     // methods
     public:
         Monitor ()                                              __NE___ {}
 
+        ND_ bool        IsDefined ()                            C_NE___ { return id != Default; }
+        ND_ bool        IsCurvedScreen ()                       C_NE___ { return Any( curvatureRadius.meters > 0.f ); }
+
         ND_ float       AspectRatio ()                          C_NE___ { return region.pixels.Width() / float(region.pixels.Height()); }
         ND_ bool        IsHorizontal ()                         C_NE___ { return region.pixels.Width() > region.pixels.Height(); }
         ND_ bool        IsVertical ()                           C_NE___ { return not IsHorizontal(); }
@@ -68,7 +71,7 @@ namespace AE::App
         ND_ float2      DipsPerPixel ()                         C_NE___ { return ppi / _DipToPixel(); }
 
     #if 0
-        ND_ float2      MillimetersPerPixel ()                  C_NE___ { return physicalSize.meters / RegionSize(); }
+        ND_ float2      MillimetersPerPixel ()                  C_NE___ { return (physicalSize.meters * 1.0e+3f) / RegionSize(); }
         ND_ float2      PixelPerMillimeters ()                  C_NE___ { return RegionSize() / (physicalSize.meters * 1.0e+3f); }
     #else
         ND_ float2      MillimetersPerPixel ()                  C_NE___ { return 1.f / (ppi * _InchsInMillimeter()); }
@@ -121,6 +124,11 @@ namespace AE::App
 
 
             void  Print ()                                      C_NE___;
+
+
+        // utils
+        ND_ float2      _CalculatePPI ()                        C_NE___ { return RegionSize() / physicalSize.meters * _MetersInInch(); }
+        ND_ Meters2f    _CalculatePhysicalSize ()               C_NE___ { return Meters2f{ RegionSize() / ppi * _MetersInInch() }; }
     };
 
 
diff --git a/AE/engine/src/platform/Public/OutputSurface.h b/AE/engine/src/platform/Public/OutputSurface.h
index b9e85715..2161fcd5 100644
--- a/AE/engine/src/platform/Public/OutputSurface.h
+++ b/AE/engine/src/platform/Public/OutputSurface.h
@@ -57,6 +57,16 @@ namespace AE::App
         static constexpr uint   MaxOutputTargets    = 8;
 
 
+        struct RenderTargetInfo
+        {
+            uint2                   dimension;
+            float                   pixToMm;        // pixels to millimeters, used for touch screen, should not be used for VR
+
+            RenderTargetInfo ()                         __NE___ {}
+            RenderTargetInfo (uint2 dim, float pixToMm) __NE___ : dimension{dim}, pixToMm{pixToMm} {}
+        };
+
+
         //
         // Render Target
         //
@@ -111,7 +121,7 @@ namespace AE::App
 
         using SurfaceFormats_t  = FixedArray< SurfaceFormat, 16 >;
         using PresentModes_t    = FixedArray< EPresentMode, 8 >;
-        using TargetSizes_t     = FixedArray< uint2, MaxOutputTargets >;
+        using TargetInfos_t     = FixedArray< RenderTargetInfo, MaxOutputTargets >;
 
 
         //
@@ -168,9 +178,9 @@ namespace AE::App
 
         // Returns current surface sizes.
         // Size can be changed at any moment, so result may be outdated.
-        // If not changed then result is equal to 'RenderTarget::RegionSize()' which returns by 'GetTargets()'.
+        // If not changed then result is equal to 'RenderTarget::RegionSize()' and 'RenderTarget::pixToMm' which returns by 'GetTargets()'.
         //
-        ND_ virtual TargetSizes_t  GetTargetSizes ()                                                                            C_NE___ = 0;
+        ND_ virtual TargetInfos_t  GetTargetInfo ()                                                                             C_NE___ = 0;
 
 
         // Returns all supported color formats and color spaces.
diff --git a/AE/engine/src/platform/Public/Projection.h b/AE/engine/src/platform/Public/Projection.h
index 9927d1d7..95ca5ede 100644
--- a/AE/engine/src/platform/Public/Projection.h
+++ b/AE/engine/src/platform/Public/Projection.h
@@ -64,7 +64,7 @@ namespace AE::App
 
         // Generate low resolution ray grid to support specific screen types.
         // Should be used for VR, curved screens and other.
-        // 
+        //
         // 'grid' - must contains preallocated memory for rays and non-zero dimension.
             virtual void  GenerateRays (RaysGrid &grid)                 C_NE___ = 0;
     };
diff --git a/AE/engine/src/platform/Public/VRDevice.h b/AE/engine/src/platform/Public/VRDevice.h
index 60d0a509..5760fbe7 100644
--- a/AE/engine/src/platform/Public/VRDevice.h
+++ b/AE/engine/src/platform/Public/VRDevice.h
@@ -25,7 +25,7 @@ namespace AE::App
 
         using EState = IWindow::EState;
 
-        class IVRDeviceEventListener
+        class IVRDeviceEventListener : public NothrowAllocatable
         {
         // types
         public:
diff --git a/AE/engine/src/platform/WinAPI/ApplicationWinAPI.cpp b/AE/engine/src/platform/WinAPI/ApplicationWinAPI.cpp
index 3a465d57..00c74bfe 100644
--- a/AE/engine/src/platform/WinAPI/ApplicationWinAPI.cpp
+++ b/AE/engine/src/platform/WinAPI/ApplicationWinAPI.cpp
@@ -1,8 +1,9 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_WINAPI_WINDOW
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "platform/WinAPI/ApplicationWinAPI.h"
-# include "base/Platforms/WindowsHeader.h"
+# include "platform/WinAPI/UtilsWinAPI.h"
 
 namespace AE::App
 {
@@ -22,7 +23,7 @@ namespace AE::App
         }
       #endif
 
-        _UpdateMinitors( OUT _cachedMonitors );
+        _UpdateMonitors( OUT _cachedMonitors );
         _GetLocales( OUT _locales );
 
         DEBUG_ONLY(
@@ -133,62 +134,17 @@ namespace AE::App
 
         if_unlikely( _cachedMonitors.empty() or update )
         {
-            _UpdateMinitors( OUT _cachedMonitors );
+            _UpdateMonitors( OUT _cachedMonitors );
         }
         return _cachedMonitors;
     }
 
 /*
 =================================================
-    _SetMinitorNames
+    _UpdateMonitors
 =================================================
 */
-    void  ApplicationWinAPI::_SetMinitorNames (INOUT Monitors_t &monitors) C_NE___
-    {
-        Array<DISPLAYCONFIG_PATH_INFO>  paths;
-        Array<DISPLAYCONFIG_MODE_INFO>  modes;
-        const UINT32                    flags   = QDC_ONLY_ACTIVE_PATHS;
-        UINT32                          path_count, mode_count;
-
-        CHECK_ERRV( ::GetDisplayConfigBufferSizes( flags, OUT &path_count, &mode_count ) == ERROR_SUCCESS );    // winvista
-        CHECK_ERRV( monitors.size() == path_count );
-
-        paths.resize( path_count );
-        modes.resize( mode_count );
-
-        CHECK_ERRV( ::QueryDisplayConfig( flags, INOUT &path_count, OUT paths.data(), INOUT &mode_count, OUT modes.data(), null ) == ERROR_SUCCESS );   // win7
-
-        paths.resize( path_count );
-        modes.resize( mode_count );
-
-        for (usize i = 0 ; i < paths.size(); ++i)
-        {
-            const auto& src = paths[i].targetInfo;
-
-            DISPLAYCONFIG_TARGET_DEVICE_NAME    target_name = {};
-            target_name.header.adapterId    = src.adapterId;
-            target_name.header.id           = src.id;
-            target_name.header.type         = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;
-            target_name.header.size         = sizeof(target_name);
-
-            CHECK_ERRV( ::DisplayConfigGetDeviceInfo( INOUT &target_name.header ) == ERROR_SUCCESS );   // winvista
-
-            auto&   dst = monitors[i];
-
-            dst.freq        = (src.refreshRate.Numerator + src.refreshRate.Denominator/2) / src.refreshRate.Denominator;
-            dst.isExternal  = AnyBits( target_name.outputTechnology, DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL );
-
-            if ( target_name.flags.friendlyNameFromEdid )
-                dst.name = Monitor::Name_t{ToString( WStringView{target_name.monitorFriendlyDeviceName} )};
-        }
-    }
-
-/*
-=================================================
-    _UpdateMinitors
-=================================================
-*/
-    void  ApplicationWinAPI::_UpdateMinitors (OUT Monitors_t &outMonitors) C_NE___
+    void  ApplicationWinAPI::_UpdateMonitors (OUT Monitors_t &outMonitors) C_NE___
     {
         outMonitors.clear();
 
@@ -256,21 +212,13 @@ namespace AE::App
                 uint2   dpi;
                 if ( fn( hMonitor, MDT_RAW_DPI, OUT &dpi.x, OUT &dpi.y ) == S_OK )  // win8.1
                 {
-                    disp.ppi = float2(dpi);
+                    disp.ppi = float2{dpi};
                     has_dpi  = true;
                 }
             }
           #endif
 
-            if ( not has_dpi and is_primary )
-            {
-                // TODO
-                //disp.SetPhysicalSize( self->_ScreenPhysicalSize() );
-                //disp.SetPixelsPerInch( disp.CalcPixelsPerInch() );
-                //has_dpi = true;
-            }
-
-            disp.physicalSize   = Meters2f{ disp.RegionSize() / disp.ppi * Monitor::_MetersInInch() };
+            disp.physicalSize   = disp._CalculatePhysicalSize();
             disp.name           = info.szDevice;
 
             monitors.push_back( disp );
@@ -279,7 +227,7 @@ namespace AE::App
 
         CHECK( ::EnumDisplayMonitors( null, null, EnumMonitor, BitCast<LPARAM>(&params) ) != FALSE );   // win2000
 
-        _SetMinitorNames( outMonitors );
+        UtilsWinAPI::SetMonitorNames( INOUT outMonitors );
     }
 
 /*
@@ -308,8 +256,11 @@ namespace AE::App
 */
     ArrayView<const char*>  ApplicationWinAPI::GetVulkanInstanceExtensions () __NE___
     {
-        static const char*  exts[] = { "VK_KHR_win32_surface" };
-        return exts;
+    #if defined(AE_ENABLE_VULKAN)
+        return Graphics::VSwapchain::GetInstanceExtensions();
+    #else
+        return Default;
+    #endif
     }
 
 /*
@@ -358,7 +309,7 @@ namespace AE::App
 
             if_unlikely( wnd_is_empty )
             {
-                ThreadUtils::Sleep( milliseconds{1} );
+                ThreadUtils::Sleep_15ms();
             }
         }
 
diff --git a/AE/engine/src/platform/WinAPI/ApplicationWinAPI.h b/AE/engine/src/platform/WinAPI/ApplicationWinAPI.h
index 680bb6aa..2ba6cf28 100644
--- a/AE/engine/src/platform/WinAPI/ApplicationWinAPI.h
+++ b/AE/engine/src/platform/WinAPI/ApplicationWinAPI.h
@@ -55,7 +55,7 @@ namespace AE::App
 
         Locales_t   GetLocales ()                                                       C_NE_OV { return _locales; }
 
-        RC<IVirtualFileStorage> OpenBuiltinStorage ()                                   __NE_OV { return null; }
+        RC<IVirtualFileStorage> OpenStorage (EAppStorage)                               __NE_OV { return null; }
 
         ArrayView<const char*>  GetVulkanInstanceExtensions ()                          __NE_OV;
 
@@ -67,8 +67,7 @@ namespace AE::App
         ND_ bool  _RegisterClass ()                                                     __NE___;
             void  _MainLoop ()                                                          __NE___;
 
-            void  _UpdateMinitors (OUT Monitors_t &)                                    C_NE___;
-            void  _SetMinitorNames (INOUT Monitors_t &)                                 C_NE___;
+            void  _UpdateMonitors (OUT Monitors_t &)                                    C_NE___;
             void  _GetLocales (OUT Locales_t &)                                         C_NE___;
     };
 
diff --git a/AE/engine/src/platform/WinAPI/InputActionsWinAPI.cpp b/AE/engine/src/platform/WinAPI/InputActionsWinAPI.cpp
index 7406a674..4c09a979 100644
--- a/AE/engine/src/platform/WinAPI/InputActionsWinAPI.cpp
+++ b/AE/engine/src/platform/WinAPI/InputActionsWinAPI.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_WINAPI_WINDOW
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 
 # include "platform/WinAPI/InputActionsWinAPI.h"
 # include "platform/WinAPI/WindowWinAPI.h"
@@ -59,7 +59,7 @@ namespace
     constructor
 =================================================
 */
-    InputActionsWinAPI::InputActionsWinAPI (DubleBufferedQueue *q) __NE___ :
+    InputActionsWinAPI::InputActionsWinAPI (DubleBufferedQueue* q) __NE___ :
         InputActionsBase{ q != null ? *q : _dbQueue },
         _touchActive{ false },  _touchBegin{ false }, _touchEnd{ false },
         _gestureRecognizer{ ushort(EInputType::TouchPos),   ushort(EInputType::TouchPos_mm),
diff --git a/AE/engine/src/platform/WinAPI/InputActionsWinAPI.h b/AE/engine/src/platform/WinAPI/InputActionsWinAPI.h
index 1a3fb420..eea83d18 100644
--- a/AE/engine/src/platform/WinAPI/InputActionsWinAPI.h
+++ b/AE/engine/src/platform/WinAPI/InputActionsWinAPI.h
@@ -35,7 +35,7 @@ namespace AE::App
 
         bool                _touchActive        : 1;    // \ 
         bool                _touchBegin         : 1;    // |-- touch emulation by mouse & left button
-        bool                _touchEnd           : 1;    // / 
+        bool                _touchEnd           : 1;    // /
 
         float2              _surfaceSize;
 
@@ -44,7 +44,7 @@ namespace AE::App
 
     // methods
     public:
-        explicit InputActionsWinAPI (DubleBufferedQueue *q)                 __NE___;
+        explicit InputActionsWinAPI (DubleBufferedQueue* q)                 __NE___;
 
         ND_ bool  ProcessMessage (uint uMsg, usize wParam, ssize lParam,
                                   Duration_t timestamp, bool hasFocus)      __NE___;
diff --git a/AE/engine/src/platform/WinAPI/SerializableInputActionsWinAPI.cpp b/AE/engine/src/platform/WinAPI/SerializableInputActionsWinAPI.cpp
index 803b165e..40de8301 100644
--- a/AE/engine/src/platform/WinAPI/SerializableInputActionsWinAPI.cpp
+++ b/AE/engine/src/platform/WinAPI/SerializableInputActionsWinAPI.cpp
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "base/Platforms/WindowsHeader.h"
+#include "base/Platforms/WindowsHeader.cpp.h"
 #include "pch/Scripting.h"
 
 #include "platform/Private/EnumToString.h"
@@ -11,7 +11,7 @@ namespace AE::App
 # ifdef AE_PLATFORM_WINDOWS
 
     #define AE_WINAPI_KEY_CODES_VISITOR( _key_, _code_, _name_, _winapi_code_ ) \
-        STATIC_ASSERT( uint(SerializableInputActionsWinAPI::EInputType::_key_) == uint(_winapi_code_) );
+        StaticAssert( uint(SerializableInputActionsWinAPI::EInputType::_key_) == uint(_winapi_code_) );
 
     AE_WINAPI_KEY_CODES( AE_WINAPI_KEY_CODES_VISITOR )
     #undef AE_WINAPI_KEY_CODES_VISITOR
@@ -182,8 +182,8 @@ namespace {
             binder.AddValue( "TouchPos_mm",         EInputType::TouchPos_mm );
             binder.AddValue( "TouchDelta",          EInputType::TouchDelta );
             binder.AddValue( "TouchDelta_norm",     EInputType::TouchDelta_norm );
-            STATIC_ASSERT( uint(EInputType::Cursor2DBegin) == 57099 );
-            STATIC_ASSERT( uint(EInputType::Cursor2DEnd)   == 57107 );
+            StaticAssert( uint(EInputType::Cursor2DBegin) == 57099 );
+            StaticAssert( uint(EInputType::Cursor2DEnd)   == 57107 );
         }
 
         // BindingsMode
diff --git a/AE/engine/src/platform/WinAPI/UtilsWinAPI.cpp b/AE/engine/src/platform/WinAPI/UtilsWinAPI.cpp
new file mode 100644
index 00000000..3fe6769c
--- /dev/null
+++ b/AE/engine/src/platform/WinAPI/UtilsWinAPI.cpp
@@ -0,0 +1,58 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#ifdef AE_PLATFORM_WINDOWS
+# include "base/Platforms/WindowsHeader.cpp.h"
+# include "platform/WinAPI/UtilsWinAPI.h"
+
+namespace AE::App
+{
+
+/*
+=================================================
+    SetMonitorNames
+=================================================
+*/
+    void  UtilsWinAPI::SetMonitorNames (INOUT IApplication::Monitors_t &monitors) __NE___
+    {
+        Array<DISPLAYCONFIG_PATH_INFO>  paths;
+        Array<DISPLAYCONFIG_MODE_INFO>  modes;
+        const UINT32                    flags   = QDC_ONLY_ACTIVE_PATHS;
+        UINT32                          path_count, mode_count;
+
+        CHECK_ERRV( ::GetDisplayConfigBufferSizes( flags, OUT &path_count, &mode_count ) == ERROR_SUCCESS );    // winvista
+        CHECK_ERRV( monitors.size() == path_count );
+
+        paths.resize( path_count );
+        modes.resize( mode_count );
+
+        CHECK_ERRV( ::QueryDisplayConfig( flags, INOUT &path_count, OUT paths.data(), INOUT &mode_count, OUT modes.data(), null ) == ERROR_SUCCESS );   // win7
+
+        paths.resize( path_count );
+        modes.resize( mode_count );
+
+        for (usize i = 0 ; i < paths.size(); ++i)
+        {
+            const auto& src = paths[i].targetInfo;
+
+            DISPLAYCONFIG_TARGET_DEVICE_NAME    target_name = {};
+            target_name.header.adapterId    = src.adapterId;
+            target_name.header.id           = src.id;
+            target_name.header.type         = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;
+            target_name.header.size         = sizeof(target_name);
+
+            CHECK_ERRV( ::DisplayConfigGetDeviceInfo( INOUT &target_name.header ) == ERROR_SUCCESS );   // winvista
+
+            auto&   dst = monitors[i];
+
+            dst.freq        = (src.refreshRate.Numerator + src.refreshRate.Denominator/2) / src.refreshRate.Denominator;
+            dst.isExternal  = AnyBits( target_name.outputTechnology, DISPLAYCONFIG_OUTPUT_TECHNOLOGY_DISPLAYPORT_EXTERNAL );
+
+            if ( target_name.flags.friendlyNameFromEdid )
+                dst.name = Monitor::Name_t{ToString( WStringView{target_name.monitorFriendlyDeviceName} )};
+        }
+    }
+
+
+} // AE::App
+
+#endif // AE_PLATFORM_WINDOWS
diff --git a/AE/engine/src/platform/WinAPI/UtilsWinAPI.h b/AE/engine/src/platform/WinAPI/UtilsWinAPI.h
new file mode 100644
index 00000000..a36e6781
--- /dev/null
+++ b/AE/engine/src/platform/WinAPI/UtilsWinAPI.h
@@ -0,0 +1,23 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_PLATFORM_WINDOWS
+# include "platform/Public/IApplication.h"
+
+namespace AE::App
+{
+
+    //
+    // Utils
+    //
+
+    struct UtilsWinAPI
+    {
+        static void  SetMonitorNames (INOUT IApplication::Monitors_t &monitors) __NE___;
+    };
+
+
+} // AE::App
+
+#endif // AE_PLATFORM_WINDOWS
diff --git a/AE/engine/src/platform/WinAPI/WindowWinAPI.cpp b/AE/engine/src/platform/WinAPI/WindowWinAPI.cpp
index 0590e94d..3f81791c 100644
--- a/AE/engine/src/platform/WinAPI/WindowWinAPI.cpp
+++ b/AE/engine/src/platform/WinAPI/WindowWinAPI.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #ifdef AE_WINAPI_WINDOW
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "platform/WinAPI/WindowWinAPI.h"
 # include "platform/WinAPI/ApplicationWinAPI.h"
 
@@ -14,7 +14,8 @@ namespace AE::App
 */
     WindowWinAPI::WindowWinAPI (ApplicationWinAPI &app, Unique<IWndListener> listener, IInputActions* dstActions) __NE___ :
         WindowBase{ app, RVRef(listener) },
-        _input{ InputActionsBase::GetQueue( dstActions )}
+        _input{ InputActionsBase::GetQueue( dstActions )},
+        _lastWindowSize{100, 100, 800, 600}  // default size
     {}
 
 /*
@@ -132,11 +133,22 @@ namespace AE::App
         int2    wnd_pos, wnd_size;
         CHECK_ERR( _WindowModeToStyle( mode, monitorId, OUT wnd_style, OUT wnd_ext_style, INOUT wnd_size, OUT wnd_pos ));
 
-        if ( was_fullscreen ) {
-            wnd_pos     = _lastWindowSize.LeftTop();
-            wnd_size    = _lastWindowSize.Size();
-        }else
-            _lastWindowSize = RectI{old_rect.left, old_rect.top, old_rect.right, old_rect.bottom};
+        if ( was_fullscreen )
+        {
+            if ( Any(IsZero( _lastWindowSize.Size() )))
+            {
+                wnd_pos     = int2{ old_rect.left, old_rect.top };
+                wnd_size    = int2{ old_rect.right - old_rect.left, old_rect.bottom - old_rect.top };
+                wnd_pos     += wnd_size/2;
+                wnd_size    = Max( wnd_size/3, Min( wnd_size, int2{800,600} ));
+                wnd_pos     -= wnd_size/2;
+            }else{
+                wnd_pos     = _lastWindowSize.LeftTop();
+                wnd_size    = _lastWindowSize.Size();
+            }
+        }else{
+            _lastWindowSize = RectI{ old_rect.left, old_rect.top, old_rect.right, old_rect.bottom };
+        }
 
         ::SetWindowLongA( hwnd, GWL_STYLE, wnd_style );         // win2000
         ::SetWindowLongA( hwnd, GWL_EXSTYLE, wnd_ext_style );   // win2000
@@ -359,7 +371,7 @@ namespace AE::App
                 {
                     // In window mode there is a bug with incorrect render area.
                     // Force to update render area by changing window position.
-                    // Borderless and fullscreen window modes doesn't have this bug. 
+                    // Borderless and fullscreen window modes doesn't have this bug.
                     if ( AnyEqual( _wndMode, EWindowMode::NonResizable, EWindowMode::Resizable ))
                     {
                         _windowPos.x += (IsEven( _windowPos.x ) ? +1 : -1);
diff --git a/AE/engine/src/profiler/ImGui/ImColumnHistoryDiagram.cpp b/AE/engine/src/profiler/ImGui/ImColumnHistoryDiagram.cpp
index c7076a19..34984898 100644
--- a/AE/engine/src/profiler/ImGui/ImColumnHistoryDiagram.cpp
+++ b/AE/engine/src/profiler/ImGui/ImColumnHistoryDiagram.cpp
@@ -5,6 +5,11 @@
 # include "base/Algorithms/StringUtils.h"
 # include "profiler/ImGui/ImColumnHistoryDiagram.h"
 
+namespace AE::Base
+{
+    template <typename ...Args> struct TNothrowCtor< ImVec2, Args... > { static constexpr bool  value = true; };
+}
+
 namespace AE::Profiler
 {
 
diff --git a/AE/engine/src/profiler/ImGui/ImTaskRangeHorDiagram.cpp b/AE/engine/src/profiler/ImGui/ImTaskRangeHorDiagram.cpp
index 2545decf..c081cea7 100644
--- a/AE/engine/src/profiler/ImGui/ImTaskRangeHorDiagram.cpp
+++ b/AE/engine/src/profiler/ImGui/ImTaskRangeHorDiagram.cpp
@@ -98,11 +98,12 @@ namespace AE::Profiler
             }
         }
 
+        ImGui::SetCursorScreenPos( ImVec2{ diag_region.left, diag_region.bottom + padding * 2.f });
+        ImGui::Text( "time range: %s", ToString(nanosecondsd{ f.max - f.min }).c_str() );
+
         // draw tree
         if ( _enableTreeView )
         {
-            ImGui::SetCursorScreenPos( ImVec2{ diag_region.left, diag_region.bottom + padding * 2.f });
-
             String  str;
 
             for (usize i = 0, cnt = f.threads.size(); i < cnt; ++i)
@@ -112,8 +113,10 @@ namespace AE::Profiler
 
                 if ( ImGui::TreeNodeEx( info.name.data(), ImGuiTreeNodeFlags_DefaultOpen ))
                 {
-                    for (auto& task : f.tasks)
+                    for (usize j = 0, k = 0; (j < f.tasks.size() and k < 20); ++j)
                     {
+                        auto&   task = f.tasks[j];
+
                         if ( task.threadIdx != t_idx )
                             continue;
 
@@ -125,6 +128,7 @@ namespace AE::Profiler
 
                         RGBA32f c {task.color};
                         ImGui::TextColored( ImVec4{c.r, c.g, c.b, c.a}, str.c_str(), "" );
+                        ++k;
                     }
                     ImGui::TreePop();
                 }
@@ -210,7 +214,7 @@ namespace AE::Profiler
 
         for (usize i = 0; i < f.sortedThreads.size(); ++i)
         {
-            f.sortedThreads2[ f.sortedThreads[i] ] = InfoIndex(i); 
+            f.sortedThreads2[ f.sortedThreads[i] ] = InfoIndex(i);
         }
 
         _guard.unlock();
diff --git a/AE/engine/src/profiler/Impl/GraphicsProfiler.cpp b/AE/engine/src/profiler/Impl/GraphicsProfiler.cpp
index d946d85b..67e8c0a2 100644
--- a/AE/engine/src/profiler/Impl/GraphicsProfiler.cpp
+++ b/AE/engine/src/profiler/Impl/GraphicsProfiler.cpp
@@ -41,7 +41,7 @@ namespace AE::Profiler
     constructor
 =================================================
 */
-    GraphicsProfiler::GraphicsProfiler (TimePoint_t startTime) :
+    GraphicsProfiler::GraphicsProfiler (TimePoint_t startTime) __NE___ :
         ProfilerUtils{startTime}
     {}
 
@@ -77,9 +77,9 @@ namespace AE::Profiler
             // memory usage
             if ( _memInfo.has_value() )
             {
-                const double    dev_usage_pct   = Max( 100.0 * double(ulong(_memInfo->deviceUsage))  / double(ulong(_memInfo->deviceAvailable)),  0.0 );
-                const double    host_usage_pct  = Max( 100.0 * double(ulong(_memInfo->hostUsage))    / double(ulong(_memInfo->hostAvailable)),    0.0 );
-                const double    uni_usage_pct   = Max( 100.0 * double(ulong{_memInfo->unifiedUsage}) / double(ulong{_memInfo->unifiedAvailable}), 0.0 );
+                const double    dev_usage_pct   = Max( 100.0 * double(ulong(_memInfo->deviceUsage))  / double(ulong(_memInfo->deviceAvailable  + _memInfo->deviceUsage)),  0.0 );
+                const double    host_usage_pct  = Max( 100.0 * double(ulong(_memInfo->hostUsage))    / double(ulong(_memInfo->hostAvailable    + _memInfo->hostUsage)),    0.0 );
+                const double    uni_usage_pct   = Max( 100.0 * double(ulong{_memInfo->unifiedUsage}) / double(ulong{_memInfo->unifiedAvailable + _memInfo->unifiedUsage}), 0.0 );
 
                 str.clear();
                 str << "mem:  dev(" << ToString( _memInfo->deviceUsage ) << ' ' << ToString( dev_usage_pct, 1 ) << "%)";
@@ -93,6 +93,13 @@ namespace AE::Profiler
                 ImGui::TextUnformatted( str.c_str() );
             }
 
+            // memory traffic
+            {
+                str.clear();
+                str << "to_dev: " << ToString( _memTraffic.avgWrite ) << "  to_host: " << ToString( _memTraffic.avgRead );
+                ImGui::TextUnformatted( str.c_str() );
+            }
+
             const ImVec2    wnd_size    = ImGui::GetContentRegionAvail();
             const ImVec2    wnd_pos     = ImGui::GetCursorScreenPos();
             const RectF     max_region  = RectF{float2{ wnd_size.x, Abs(wnd_size.y) }} + float2{wnd_pos.x, wnd_pos.y};
@@ -138,16 +145,27 @@ namespace AE::Profiler
 */
     void  GraphicsProfiler::Update (secondsf dt)
     {
+        auto&       rts         = GraphicsScheduler();
+        const uint  frame_count = _fps.frameCount.exchange( 0 );
+
         // fps
         {
-            uint    count       = _fps.frameCount.exchange( 0 );
             double  accum_time  = _fps.accumframeTime.exchange( 0.0 );
 
-            _fps.result     = float(count) / dt.count();
-            _fps.dt         = float(accum_time / count);
+            _fps.result = float(frame_count) / dt.count();
+            _fps.dt     = float(accum_time / frame_count);
         }
 
-        _memInfo = RenderTaskScheduler().GetDevice().GetMemoryUsage();
+        _memInfo = rts.GetDevice().GetMemoryUsage();
+
+        // mem traffic
+        {
+            Bytes   write   = _memTraffic.accumWrite.exchange( 0_b );
+            Bytes   read    = _memTraffic.accumRead.exchange( 0_b );
+
+            _memTraffic.avgWrite    = Bytes{ulong(double(ulong{write}) / double(frame_count))};
+            _memTraffic.avgRead     = Bytes{ulong(double(ulong{read}) / double(frame_count))};
+        }
     }
 
 /*
@@ -200,33 +218,31 @@ namespace AE::Profiler
         Unused( batch, name );
     }
 
-/*
-=================================================
-    RequestNextFrame
-=================================================
-*/
-    void  GraphicsProfiler::RequestNextFrame (FrameUID frameId) __NE___
-    {
-        Unused( frameId );
-    }
-
 /*
 =================================================
     NextFrame
 =================================================
 */
-    void  GraphicsProfiler::NextFrame (FrameUID) __NE___
+    void  GraphicsProfiler::NextFrame (FrameUID frameId) __NE___
     {
-        auto&   rts = RenderTaskScheduler();
-        auto&   qm  = rts.GetResourceManager().GetQueryManager();
-
-        uint2   idx = qm.ReadAndWriteIndices();
-        _writeIndex = idx[1];
-        _readIndex  = idx[0];
+        auto&   rts = GraphicsScheduler();
 
-        auto    task = MakeRC< Threading::AsyncTaskFn >( [this]() { _ReadResults(); }, "GraphicsProfiler::ReadResults", ETaskQueue::PerFrame );
-        if ( Scheduler().Run( task ))
-            rts.AddNextFrameDeps( task );
+        {
+            auto&   qm  = rts.GetResourceManager().GetQueryManager();
+            uint2   idx = qm.ReadAndWriteIndices();
+
+            _writeIndex = idx[1];
+            _readIndex  = idx[0];
+        }{
+            auto    task = MakeRCTh< Threading::AsyncTaskFn >( [this]() { _ReadResults(); }, "GraphicsProfiler::ReadResults", ETaskQueue::PerFrame );
+            if ( Scheduler().Run( task ))
+                rts.AddNextFrameDeps( task );
+        }{
+            auto    stat = rts.GetResourceManager().GetStagingBufferFrameStat( frameId.Sub(1).value() );
+
+            _memTraffic.accumWrite.fetch_add( stat.dynamicWrite + stat.staticWrite );
+            _memTraffic.accumRead.fetch_add( stat.dynamicRead + stat.staticRead );
+        }
 
         ++_fps.frameCount;
         _perFrame[ _writeIndex ].Clear();
@@ -250,7 +266,7 @@ namespace AE::Profiler
 
         _gpuTime.min = MaxValue<double>();
 
-        auto&   qm  = RenderTaskScheduler().GetResourceManager().GetQueryManager();
+        auto&   qm  = GraphicsScheduler().GetResourceManager().GetQueryManager();
 
         _imHistory.Begin();
 
@@ -382,7 +398,7 @@ namespace AE::Profiler
 
         ASSERT( not taskName.empty() );
 
-        auto&       rts     = RenderTaskScheduler();
+        auto&       rts     = GraphicsScheduler();
         auto&       dev     = rts.GetDevice();
         auto&       qm      = rts.GetResourceManager().GetQueryManager();
         auto*       vbatch  = Cast<VCommandBatch>(batch);
@@ -431,7 +447,7 @@ namespace AE::Profiler
         if ( type == EContextType::Graphics )
             return;
 
-        auto&   rts = RenderTaskScheduler();
+        auto&   rts = GraphicsScheduler();
         auto&   dev = rts.GetDevice();
         Pass    pass;
 
diff --git a/AE/engine/src/profiler/Impl/GraphicsProfiler.h b/AE/engine/src/profiler/Impl/GraphicsProfiler.h
index 294caa6b..5f553ad2 100644
--- a/AE/engine/src/profiler/Impl/GraphicsProfiler.h
+++ b/AE/engine/src/profiler/Impl/GraphicsProfiler.h
@@ -138,6 +138,13 @@ namespace AE::Profiler
             double              max = 0;
         }                   _gpuTime;
 
+        struct {
+            AtomicByte<Bytes>   accumWrite;
+            AtomicByte<Bytes>   accumRead;
+            Bytes               avgWrite;
+            Bytes               avgRead;
+        }                   _memTraffic;
+
         MemoryInfo_t        _memInfo;
 
         PerFrame_t          _perFrame;
@@ -152,8 +159,7 @@ namespace AE::Profiler
 
     // methods
     public:
-        explicit GraphicsProfiler (TimePoint_t startTime);
-        ~GraphicsProfiler () {}
+        explicit GraphicsProfiler (TimePoint_t startTime)                                                                       __NE___;
 
         void  DrawImGUI ();
         void  Draw (Canvas &canvas);
@@ -194,7 +200,6 @@ namespace AE::Profiler
       #endif
 
         // frames
-        void  RequestNextFrame (FrameUID frameId)                                                                               __NE_OV;
         void  NextFrame (FrameUID frameId)                                                                                      __NE_OV;
 
 
diff --git a/AE/engine/src/profiler/Impl/MemoryProfiler.cpp b/AE/engine/src/profiler/Impl/MemoryProfiler.cpp
index a8cbfff6..d2061e24 100644
--- a/AE/engine/src/profiler/Impl/MemoryProfiler.cpp
+++ b/AE/engine/src/profiler/Impl/MemoryProfiler.cpp
@@ -13,7 +13,7 @@ namespace AE::Profiler
     constructor
 =================================================
 */
-    MemoryProfiler::MemoryProfiler (TimePoint_t startTime) :
+    MemoryProfiler::MemoryProfiler (TimePoint_t startTime) __NE___ :
         ProfilerUtils{ startTime }
     {}
 
diff --git a/AE/engine/src/profiler/Impl/MemoryProfiler.h b/AE/engine/src/profiler/Impl/MemoryProfiler.h
index 7b83256b..96d1c597 100644
--- a/AE/engine/src/profiler/Impl/MemoryProfiler.h
+++ b/AE/engine/src/profiler/Impl/MemoryProfiler.h
@@ -16,8 +16,7 @@ namespace AE::Profiler
     {
     // methods
     public:
-        explicit MemoryProfiler (TimePoint_t startTime);
-        ~MemoryProfiler () {}
+        explicit MemoryProfiler (TimePoint_t startTime)     __NE___;
 
         void  DrawImGUI () {}
         void  Draw (Canvas &) {}
diff --git a/AE/engine/src/profiler/Impl/TaskProfiler.cpp b/AE/engine/src/profiler/Impl/TaskProfiler.cpp
index 625d5e6e..7181411b 100644
--- a/AE/engine/src/profiler/Impl/TaskProfiler.cpp
+++ b/AE/engine/src/profiler/Impl/TaskProfiler.cpp
@@ -35,7 +35,7 @@ namespace AE::Profiler
     TaskProfiler::LfTaskCommands::Result<CmdType>
         TaskProfiler::LfTaskCommands::Insert (usize count)
     {
-        STATIC_ASSERT( TaskCmdList_t::HasType<CmdType> );
+        StaticAssert( TaskCmdList_t::HasType<CmdType> );
 
         Bytes   size = SizeOf<CmdType>;
 
@@ -78,7 +78,7 @@ namespace AE::Profiler
         {
             uint    exp = start_pos;
 
-            if ( _availPos.CAS( INOUT exp, endPos ))
+            if_likely( _availPos.CAS( INOUT exp, endPos ))
                 break;
 
             ASSERT( exp <= start_pos );
@@ -109,6 +109,8 @@ namespace AE::Profiler
 
             if_likely( _readPos.CAS( INOUT pos, pos + cmd->_size ))
                 break;
+
+            ThreadUtils::Pause();
         }
         return cmd;
     }
@@ -136,10 +138,10 @@ namespace AE::Profiler
     constructor
 =================================================
 */
-    TaskProfiler::TaskProfiler (TimePoint_t startTime) :
+    TaskProfiler::TaskProfiler (TimePoint_t startTime) __NE___ :
         ProfilerUtils{ startTime }
     {
-        _tmpTaskMap.reserve( 1024 );
+        NOTHROW( _tmpTaskMap.reserve( 1024 );)
     }
 
 /*
@@ -167,7 +169,7 @@ namespace AE::Profiler
     BeginNonTaskWork
 =================================================
 */
-    void  TaskProfiler::BeginNonTaskWork (const void *id, StringView name) __NE___
+    void  TaskProfiler::BeginNonTaskWork (const void* id, StringView name) __NE___
     {
         const uint  idx = _frameIdx.load();
         if_likely( idx < _FirstFrameIdx or idx >= _LastFrameIdx )
@@ -193,7 +195,7 @@ namespace AE::Profiler
     EndNonTaskWork
 =================================================
 */
-    void  TaskProfiler::EndNonTaskWork (const void *id, StringView name) __NE___
+    void  TaskProfiler::EndNonTaskWork (const void* id, StringView name) __NE___
     {
         const uint  idx = _frameIdx.load();
         if_likely( idx < _FirstFrameIdx or idx >= _LastFrameIdx+2 )
@@ -403,7 +405,7 @@ namespace AE::Profiler
             const auto  info = t.thread->GetProfilingInfo();
 
             str.clear();
-            str << info.threadName << " (" << ToString( info.coreId ) << ')';
+            str << info.threadName << " (" << ToString( uint(info.coreId) ) << ')';
 
             t.caption = StringView{str};
         }
diff --git a/AE/engine/src/profiler/Impl/TaskProfiler.h b/AE/engine/src/profiler/Impl/TaskProfiler.h
index 050b20b9..7996564c 100644
--- a/AE/engine/src/profiler/Impl/TaskProfiler.h
+++ b/AE/engine/src/profiler/Impl/TaskProfiler.h
@@ -79,7 +79,7 @@ namespace AE::Profiler
         // variables
         private:
             void*           _data       = null;
-            Bytes32u        _dataSize;
+            Byte32u         _dataSize;
 
             Atomic<uint>    _writePos   {0};
             Atomic<uint>    _availPos   {0};
@@ -150,8 +150,7 @@ namespace AE::Profiler
 
     // methods
     public:
-        explicit TaskProfiler (TimePoint_t startTime);
-        ~TaskProfiler () {}
+        explicit TaskProfiler (TimePoint_t startTime)           __NE___;
 
         void  DrawImGUI ();
         void  Draw (Canvas &) {}
@@ -164,8 +163,8 @@ namespace AE::Profiler
         void  Enqueue (const Threading::IAsyncTask &)           __NE_OV;
         void  AddThread (ThreadPtr)                             __NE_OV;
 
-        void  BeginNonTaskWork (const void *id, StringView name)__NE_OV;
-        void  EndNonTaskWork (const void *id, StringView name)  __NE_OV;
+        void  BeginNonTaskWork (const void* id, StringView name)__NE_OV;
+        void  EndNonTaskWork (const void* id, StringView name)  __NE_OV;
 
     private:
         void  _UpdateThreadFreq ();
diff --git a/AE/engine/src/profiler/ProfilerUI.cpp b/AE/engine/src/profiler/ProfilerUI.cpp
index 07d86565..c544f5e0 100644
--- a/AE/engine/src/profiler/ProfilerUI.cpp
+++ b/AE/engine/src/profiler/ProfilerUI.cpp
@@ -37,7 +37,7 @@ namespace AE::Profiler
 
         Scheduler().SetProfiler( _task );
         MemoryManager().SetProfiler( _memory );
-        RenderTaskScheduler().SetProfiler( _graphics );
+        GraphicsScheduler().SetProfiler( _graphics );
 
         _lastUpdate = TimePoint_t::clock::now();
 
@@ -59,7 +59,7 @@ namespace AE::Profiler
 
         Scheduler().SetProfiler( null );
         MemoryManager().SetProfiler( null );
-        RenderTaskScheduler().SetProfiler( null );
+        GraphicsScheduler().SetProfiler( null );
     }
 
 /*
diff --git a/AE/engine/src/profiler/ProfilerUI.h b/AE/engine/src/profiler/ProfilerUI.h
index f2005ffa..45ab70f5 100644
--- a/AE/engine/src/profiler/ProfilerUI.h
+++ b/AE/engine/src/profiler/ProfilerUI.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Profiling.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Profiling.md)
 */
 
 #pragma once
diff --git a/AE/engine/src/profiler/Utils/ArmProfiler.cpp b/AE/engine/src/profiler/Utils/ArmProfiler.cpp
index 25b30465..5616e9f1 100644
--- a/AE/engine/src/profiler/Utils/ArmProfiler.cpp
+++ b/AE/engine/src/profiler/Utils/ArmProfiler.cpp
@@ -42,7 +42,7 @@ namespace
             CPU_COUNTERS( CPU_COUNTERS_VISITOR )
             #undef CPU_COUNTERS_VISITOR
         }
-        STATIC_ASSERT( uint(hwcpipe::CpuCounter::MaxValue) == 17 );
+        StaticAssert( uint(hwcpipe::CpuCounter::MaxValue) == 17 );
         return hwcpipe::CpuCounter::MaxValue;
     }
 
@@ -112,7 +112,7 @@ namespace
             GPU_COUNTERS( GPU_COUNTERS_VISITOR )
             #undef GPU_COUNTERS_VISITOR
         }
-        STATIC_ASSERT( uint(hwcpipe::GpuCounter::MaxValue) == 37 );
+        StaticAssert( uint(hwcpipe::GpuCounter::MaxValue) == 37 );
         return hwcpipe::GpuCounter::MaxValue;
     }
 
@@ -209,7 +209,7 @@ namespace
     GetCpuCounterValue / GetGpuCounterValue
 =================================================
 */
-    ND_ static double  GetCpuCounterValue (const hwcpipe::CpuMeasurements *cpu, hwcpipe::CpuCounter counter)
+    ND_ static double  GetCpuCounterValue (const hwcpipe::CpuMeasurements* cpu, hwcpipe::CpuCounter counter)
     {
         auto    hwcpipe_ctr = cpu->find( counter );
         if ( hwcpipe_ctr != cpu->end() )
@@ -217,7 +217,7 @@ namespace
         return 0.0;
     }
 
-    ND_ static double  GetGpuCounterValue (const hwcpipe::GpuMeasurements *gpu, hwcpipe::GpuCounter counter)
+    ND_ static double  GetGpuCounterValue (const hwcpipe::GpuMeasurements* gpu, hwcpipe::GpuCounter counter)
     {
         auto    hwcpipe_ctr = gpu->find( counter );
         if ( hwcpipe_ctr != gpu->end() )
@@ -290,10 +290,10 @@ namespace
         CHECK_ERR( not IsInitialized() );
 
         bool    res = false;
-        try {
+        TRY{
             res = _Initialize( counterSet );
         }
-        catch(...) {}
+        CATCH_ALL();
 
         if ( res )
             return true;
diff --git a/AE/engine/src/scripting/Bindings/Array.h b/AE/engine/src/scripting/Bindings/Array.h
index 85aab9be..d2632b1f 100644
--- a/AE/engine/src/scripting/Bindings/Array.h
+++ b/AE/engine/src/scripting/Bindings/Array.h
@@ -15,7 +15,7 @@ namespace AE::Scripting::_hidden_
     {
     // types
     private:
-        STATIC_ASSERT( not (ScriptTypeInfo<T>::is_object or ScriptTypeInfo<T>::is_ref_counted) );
+        StaticAssert( not (ScriptTypeInfo<T>::is_object or ScriptTypeInfo<T>::is_ref_counted) );
 
         using Self              = ScriptPODArray< T >;
         using View_t            = StructView< T >;
@@ -85,7 +85,7 @@ namespace AE::Scripting::_hidden_
     {
     // types
     private:
-        STATIC_ASSERT( ScriptTypeInfo<T>::is_object or ScriptTypeInfo<T>::is_ref_counted );
+        StaticAssert( ScriptTypeInfo<T>::is_object or ScriptTypeInfo<T>::is_ref_counted );
 
         using Self  = ScriptObjArray< T >;
 
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindColor.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindColor.cpp
index e7f2a108..54da5308 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindColor.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindColor.cpp
@@ -7,54 +7,54 @@
 namespace AE::Scripting
 {
 namespace
-{   
+{
 /*
 =================================================
     constructors
 =================================================
 */
     template <typename T>
-    static void  RGBAColor_Ctor1 (void *mem, T val)
+    static void  RGBAColor_Ctor1 (void* mem, T val)
     {
         PlacementNew< RGBAColor<T> >( OUT mem, val );
     }
 
     template <typename T>
-    static void  RGBAColor_Ctor4 (void *mem, T r, T g, T b, T a)
+    static void  RGBAColor_Ctor4 (void* mem, T r, T g, T b, T a)
     {
         PlacementNew< RGBAColor<T> >( OUT mem, r, g, b, a );
     }
 
-    static void  RGBA32f_Ctor_HSV_Alpha (void *mem, const HSVColor &c, float alpha)
+    static void  RGBA32f_Ctor_HSV_Alpha (void* mem, const HSVColor &c, float alpha)
     {
         PlacementNew< RGBA32f >( OUT mem, c, alpha );
     }
 
     template <typename T>
-    static void  RGBA32f_Ctor_RGBA (void *mem, const RGBAColor<T> &c)
+    static void  RGBA32f_Ctor_RGBA (void* mem, const RGBAColor<T> &c)
     {
         PlacementNew< RGBA32f >( OUT mem, c );
     }
 
     template <typename T>
-    static void  RGBA32i_Ctor_RGBA (void *mem, const RGBAColor<T> &c)
+    static void  RGBA32i_Ctor_RGBA (void* mem, const RGBAColor<T> &c)
     {
         PlacementNew< RGBA32i >( OUT mem, c );
     }
 
     template <typename T>
-    static void  RGBA32u_Ctor_RGBA (void *mem, const RGBAColor<T> &c)
+    static void  RGBA32u_Ctor_RGBA (void* mem, const RGBAColor<T> &c)
     {
         PlacementNew< RGBA32u >( OUT mem, c );
     }
 
     template <typename T>
-    static void  RGBA8u_Ctor_RGBA (void *mem, const RGBAColor<T> &c)
+    static void  RGBA8u_Ctor_RGBA (void* mem, const RGBAColor<T> &c)
     {
         PlacementNew< RGBA8u >( OUT mem, c );
     }
 
-    static void  float4_Ctor_RGBA32f (void *mem, const RGBA32f &c)
+    static void  float4_Ctor_RGBA32f (void* mem, const RGBA32f &c)
     {
         PlacementNew< packed_float4 >( OUT mem, c );
     }
@@ -139,7 +139,7 @@ namespace
         binder.AddProperty( &T::a, "a" );
 
         binder.Operators()
-            .Equals( &T::operator== );
+            .Equal( &T::operator== );
 
         if constexpr( IsSameTypes< typename T::value_type, float >)
         {
@@ -210,22 +210,22 @@ namespace
     constructors
 =================================================
 */
-    static void  HSVColor_Ctor1 (void *mem, float h)
+    static void  HSVColor_Ctor1 (void* mem, float h)
     {
         PlacementNew< HSVColor >( OUT mem, h );
     }
 
-    static void  HSVColor_Ctor2 (void *mem, float h, float s)
+    static void  HSVColor_Ctor2 (void* mem, float h, float s)
     {
         PlacementNew< HSVColor >( OUT mem, h, s );
     }
 
-    static void  HSVColor_Ctor3 (void *mem, float h, float s, float v)
+    static void  HSVColor_Ctor3 (void* mem, float h, float s, float v)
     {
         PlacementNew< HSVColor >( OUT mem, h, s, v );
     }
 
-    static void  HSVColor_Ctor_RGBA32f (void *mem, const RGBA32f &c)
+    static void  HSVColor_Ctor_RGBA32f (void* mem, const RGBA32f &c)
     {
         PlacementNew< HSVColor >( OUT mem, c );
     }
@@ -251,7 +251,7 @@ namespace
         binder.AddConstructor( &HSVColor_Ctor_RGBA32f,  {"col"} );
 
         binder.Operators()
-            .Equals( &HSVColor::operator== );
+            .Equal( &HSVColor::operator== );
     }
 
 /*
@@ -259,7 +259,7 @@ namespace
     constructors
 =================================================
 */
-    static void  DepthStencil_Ctor (void *mem, float d, int s)
+    static void  DepthStencil_Ctor (void* mem, float d, int s)
     {
         PlacementNew< DepthStencil >( OUT mem, d, uint(s) );
     }
@@ -281,7 +281,7 @@ namespace
         binder.AddConstructor( &DepthStencil_Ctor,  {"depth", "stencil"} );
 
         binder.Operators()
-            .Equals( &DepthStencil::operator== );
+            .Equal( &DepthStencil::operator== );
     }
 
 } // namespace
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindMatrixMath.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindMatrixMath.cpp
index eaa0fb77..a33efc86 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindMatrixMath.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindMatrixMath.cpp
@@ -23,17 +23,17 @@ namespace
         using Mat_t = PackedMatrix<T,2,Rows>;
         using Col_t = typename Mat_t::Col_t;
 
-        static void  _Ctor1 (void *mem)
+        static void  _Ctor1 (void* mem)
         {
             PlacementNew< Mat_t >( OUT mem, Mat_t::Identity() );
         }
 
-        static void  _Ctor2 (void *mem, const Mat_t &value)
+        static void  _Ctor2 (void* mem, const Mat_t &value)
         {
             PlacementNew< Mat_t >( OUT mem, value );
         }
 
-        static void  _Ctor3 (void *mem, const Col_t &col0, const Col_t &col1)
+        static void  _Ctor3 (void* mem, const Col_t &col0, const Col_t &col1)
         {
             PlacementNew< Mat_t >( OUT mem, col0, col1 );
         }
@@ -68,17 +68,17 @@ namespace
         using Mat_t = PackedMatrix<T,3,Rows>;
         using Col_t = typename Mat_t::Col_t;
 
-        static void  _Ctor1 (void *mem)
+        static void  _Ctor1 (void* mem)
         {
             PlacementNew< Mat_t >( OUT mem, Mat_t::Identity() );
         }
 
-        static void  _Ctor2 (void *mem, const Mat_t &value)
+        static void  _Ctor2 (void* mem, const Mat_t &value)
         {
             PlacementNew< Mat_t >( OUT mem, value );
         }
 
-        static void  _Ctor3 (void *mem, const Col_t &col0, const Col_t &col1, const Col_t &col2)
+        static void  _Ctor3 (void* mem, const Col_t &col0, const Col_t &col1, const Col_t &col2)
         {
             PlacementNew< Mat_t >( OUT mem, col0, col1, col2 );
         }
@@ -114,17 +114,17 @@ namespace
         using Mat_t = PackedMatrix<T,4,Rows>;
         using Col_t = typename Mat_t::Col_t;
 
-        static void  _Ctor1 (void *mem)
+        static void  _Ctor1 (void* mem)
         {
             PlacementNew< Mat_t >( OUT mem, Mat_t::Identity() );
         }
 
-        static void  _Ctor2 (void *mem, const Mat_t &value)
+        static void  _Ctor2 (void* mem, const Mat_t &value)
         {
             PlacementNew< Mat_t >( OUT mem, value );
         }
 
-        static void  _Ctor3 (void *mem, const Col_t &col0, const Col_t &col1, const Col_t &col2, const Col_t &col3)
+        static void  _Ctor3 (void* mem, const Col_t &col0, const Col_t &col1, const Col_t &col2, const Col_t &col3)
         {
             PlacementNew< Mat_t >( OUT mem, col0, col1, col2, col3 );
         }
@@ -325,14 +325,14 @@ namespace
         {
             DefineMat_Func  func{ se };
 
-            MatTypes::Visit( func );
+            MatTypes::VisitTh( func );
         }
 
         // bind
         {
             BindMat_Func    func{ se };
 
-            MatTypes::Visit( func );
+            MatTypes::VisitTh( func );
         }
     }
 
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindRect.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindRect.cpp
index 1503e971..3a31583a 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindRect.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindRect.cpp
@@ -20,27 +20,27 @@ namespace
         using Rect_t    = Rectangle<T>;
         using Vec2_t    = PackedVec<T,2>;
 
-        static void  Rect_Ctor1 (void *mem, const Rect_t &value)
+        static void  Rect_Ctor1 (void* mem, const Rect_t &value)
         {
             PlacementNew< Rect_t >( OUT mem, value );
         }
 
-        static void  Rect_Ctor2 (void *mem, const Vec2_t &value)
+        static void  Rect_Ctor2 (void* mem, const Vec2_t &value)
         {
             PlacementNew< Rect_t >( OUT mem, value );
         }
 
-        static void  Rect_Ctor3 (void *mem, const Vec2_t &leftTop, const Vec2_t &rightBottom)
+        static void  Rect_Ctor3 (void* mem, const Vec2_t &leftTop, const Vec2_t &rightBottom)
         {
             PlacementNew< Rect_t >( OUT mem, leftTop, rightBottom );
         }
 
-        static void  Rect_Ctor4 (void *mem, T sizeX, T sizeY)
+        static void  Rect_Ctor4 (void* mem, T sizeX, T sizeY)
         {
             PlacementNew< Rect_t >( OUT mem, Vec2_t{ sizeX, sizeY });
         }
 
-        static void  Rect_Ctor5 (void *mem, T left, T top, T right, T bottom)
+        static void  Rect_Ctor5 (void* mem, T left, T top, T right, T bottom)
         {
             PlacementNew< Rect_t >( OUT mem, left, top, right, bottom );
         }
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindScalarMath.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindScalarMath.cpp
index d1f6d9d8..048a12f0 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindScalarMath.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindScalarMath.cpp
@@ -61,14 +61,14 @@ namespace
         template <typename T>   static T  BitRotateLeft (T x, uint shift)   { return Math::BitRotateLeft( x, shift ); }
         template <typename T>   static T  BitRotateRight (T x, uint shift)  { return Math::BitRotateRight( x, shift ); }
 
-        template <typename T>   static T  Sin (T value)                     { return Math::Sin( TRadians<T>{value} ); }
-        template <typename T>   static T  SinH (T value)                    { return Math::SinH( TRadians<T>{value} ); }
+        template <typename T>   static T  Sin (T value)                     { return Math::Sin( TRadian<T>{value} ); }
+        template <typename T>   static T  SinH (T value)                    { return Math::SinH( TRadian<T>{value} ); }
         template <typename T>   static T  ASin (T value)                    { return T(Math::ASin( value )); }
-        template <typename T>   static T  Cos (T value)                     { return Math::Cos( TRadians<T>{value} ); }
-        template <typename T>   static T  CosH (T value)                    { return Math::CosH( TRadians<T>{value} ); }
+        template <typename T>   static T  Cos (T value)                     { return Math::Cos( TRadian<T>{value} ); }
+        template <typename T>   static T  CosH (T value)                    { return Math::CosH( TRadian<T>{value} ); }
         template <typename T>   static T  ACos (T value)                    { return T(Math::ACos( value )); }
-        template <typename T>   static T  Tan (T value)                     { return Math::Tan( TRadians<T>{value} ); }
-        template <typename T>   static T  TanH (T value)                    { return Math::TanH( TRadians<T>{value} ); }
+        template <typename T>   static T  Tan (T value)                     { return Math::Tan( TRadian<T>{value} ); }
+        template <typename T>   static T  TanH (T value)                    { return Math::TanH( TRadian<T>{value} ); }
         template <typename T>   static T  ATan (T y, T x)                   { return T(Math::ATan( y, x )); }
 
         template <typename T>   static T  Square (T value)                  { return Math::Square( value ); }
@@ -90,8 +90,8 @@ namespace
         template <typename T>   static T  Wrap (T x, T min, T max)          { return Math::Wrap( x, min, max ); }
         template <typename T>   static T  MirroredWrap (T x, T min, T max)  { return Math::MirroredWrap( x, min, max ); }
 
-        template <typename T>   static T  ToRad (T x)                       { return TRadians<T>::DegToRad() * x; }
-        template <typename T>   static T  ToDeg (T x)                       { return TRadians<T>::RadToDeg() * x; }
+        template <typename T>   static T  ToRad (T x)                       { return TRadian<T>::DegToRad() * x; }
+        template <typename T>   static T  ToDeg (T x)                       { return TRadian<T>::RadToDeg() * x; }
 
         template <typename T>   static T  ToSNorm (T x)                     { return Math::ToSNorm( x ); }
         template <typename T>   static T  ToUNorm (T x)                     { return Math::ToUNorm( x ); }
@@ -101,7 +101,7 @@ namespace
         template <typename T>   static T  Remap (T srcMin, T srcMax, T dstMin, T dstMax, T x)           { return Math::Remap( Range{srcMin, srcMax}, Range{dstMin, dstMax}, x ); }
         template <typename T>   static T  RemapClamped (T srcMin, T srcMax, T dstMin, T dstMax, T x)    { return Math::RemapClamped( Range{srcMin, srcMax}, Range{dstMin, dstMax}, x ); }
 
-        template <typename T>   static T  Pi ()                             { return T{Math::TRadians<T>::Pi()}; }
+        template <typename T>   static T  Pi ()                             { return T{Math::TRadian<T>::Pi()}; }
     };
 
 /*
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindToString.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindToString.cpp
index 067d6baf..32212724 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindToString.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindToString.cpp
@@ -55,15 +55,15 @@ namespace
         }
         if ( vec )
         {
-            VecTypes::Visit( ToStringVisitor{ se });
+            VecTypes::VisitTh( ToStringVisitor{ se });
         }
         if ( rect )
         {
-            RectTypes::Visit( ToStringVisitor{ se });
+            RectTypes::VisitTh( ToStringVisitor{ se });
         }
         if ( color )
         {
-            ColorTypes::Visit( ToStringVisitor{ se });
+            ColorTypes::VisitTh( ToStringVisitor{ se });
         }
     }
 
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath.inl.h b/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath.inl.h
index 33ca1a78..cde4be45 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath.inl.h
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath.inl.h
@@ -20,30 +20,30 @@ namespace
     struct InitVecFields< PackedVec<T,2> >
     {
     private:
-        static void  _Ctor1 (void *mem, const T value)
+        static void  _Ctor1 (void* mem, const T value)
         {
             PlacementNew< PackedVec<T,2> >( OUT mem, value );
         }
 
         template <typename B>
-        static void  _Ctor2 (void *mem, const PackedVec<B,2> &value)
+        static void  _Ctor2 (void* mem, const PackedVec<B,2> &value)
         {
             PlacementNew< PackedVec<T,2> >( OUT mem, PackedVec<T,2>{value} );
         }
 
         template <typename B>
-        static void  _Ctor3 (void *mem, const PackedVec<B,3> &value)
+        static void  _Ctor3 (void* mem, const PackedVec<B,3> &value)
         {
             PlacementNew< PackedVec<T,2> >( OUT mem, PackedVec<T,2>{value} );
         }
 
         template <typename B>
-        static void  _Ctor4 (void *mem, const PackedVec<B,4> &value)
+        static void  _Ctor4 (void* mem, const PackedVec<B,4> &value)
         {
             PlacementNew< PackedVec<T,2> >( OUT mem, PackedVec<T,2>{value} );
         }
 
-        static void  _CtorArg2 (void *mem, T x, T y)
+        static void  _CtorArg2 (void* mem, T x, T y)
         {
             PlacementNew< PackedVec<T,2> >( OUT mem, x, y );
         }
@@ -103,35 +103,35 @@ namespace
     struct InitVecFields< PackedVec<T,3> >
     {
     private:
-        static void  _Ctor1 (void *mem, const T value)
+        static void  _Ctor1 (void* mem, const T value)
         {
             PlacementNew< PackedVec<T,3> >( OUT mem, value );
         }
 
         template <typename B>
-        static void  _Ctor2 (void *mem, const PackedVec<B,2> &value)
+        static void  _Ctor2 (void* mem, const PackedVec<B,2> &value)
         {
             PlacementNew< PackedVec<T,3> >( OUT mem, PackedVec<T,3>{value.x, value.y, B{0}} );
         }
 
         template <typename B>
-        static void  _Ctor3 (void *mem, const PackedVec<B,3> &value)
+        static void  _Ctor3 (void* mem, const PackedVec<B,3> &value)
         {
             PlacementNew< PackedVec<T,3> >( OUT mem, PackedVec<T,3>{value} );
         }
 
         template <typename B>
-        static void  _Ctor4 (void *mem, const PackedVec<B,4> &value)
+        static void  _Ctor4 (void* mem, const PackedVec<B,4> &value)
         {
             PlacementNew< PackedVec<T,3> >( OUT mem, PackedVec<T,3>{value.x, value.y, value.z} );
         }
 
-        static void  _CtorArg2 (void *mem, const PackedVec<T,2> &xy, T z)
+        static void  _CtorArg2 (void* mem, const PackedVec<T,2> &xy, T z)
         {
             PlacementNew< PackedVec<T,3> >( OUT mem, xy, z );
         }
 
-        static void  _CtorArg3 (void *mem, T x, T y, T z)
+        static void  _CtorArg3 (void* mem, T x, T y, T z)
         {
             PlacementNew< PackedVec<T,3> >( OUT mem, x, y, z );
         }
@@ -193,45 +193,45 @@ namespace
     struct InitVecFields< PackedVec<T,4> >
     {
     private:
-        static void  _Ctor1 (void *mem, const T value)
+        static void  _Ctor1 (void* mem, const T value)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, value );
         }
 
         template <typename B>
-        static void  _Ctor2 (void *mem, const PackedVec<B,2> &value)
+        static void  _Ctor2 (void* mem, const PackedVec<B,2> &value)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, PackedVec<T,4>{value.x, value.y, B{0}, B{0}} );
         }
 
         template <typename B>
-        static void  _Ctor3 (void *mem, const PackedVec<B,3> &value)
+        static void  _Ctor3 (void* mem, const PackedVec<B,3> &value)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, PackedVec<T,4>{value.x, value.y, value.z, B{0}} );
         }
 
         template <typename B>
-        static void  _Ctor4 (void *mem, const PackedVec<B,4> &value)
+        static void  _Ctor4 (void* mem, const PackedVec<B,4> &value)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, PackedVec<T,4>{value} );
         }
 
-        static void  _CtorArg2 (void *mem, const PackedVec<T,2> &xy, const PackedVec<T,2> &zw)
+        static void  _CtorArg2 (void* mem, const PackedVec<T,2> &xy, const PackedVec<T,2> &zw)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, xy, zw );
         }
 
-        static void  _CtorArg3 (void *mem, const PackedVec<T,3> &xyz, T w)
+        static void  _CtorArg3 (void* mem, const PackedVec<T,3> &xyz, T w)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, xyz, w );
         }
 
-        static void  _CtorArg4 (void *mem, T x, T y, T z, T w)
+        static void  _CtorArg4 (void* mem, T x, T y, T z, T w)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, x, y, z, w );
         }
 
-        static void  _CtorArg5 (void *mem, T x, const PackedVec<T,3> &yzw)
+        static void  _CtorArg5 (void* mem, T x, const PackedVec<T,3> &yzw)
         {
             PlacementNew< PackedVec<T,4> >( OUT mem, x, yzw );
         }
@@ -438,7 +438,7 @@ namespace
 
         binder.Operators()
             .Unary(     EUnaryOperator::Not,    static_cast<T (*)(const T&) >(&glm::operator !) )
-            .Equals(                            &VecFunc::template Equal< Vec_t >)
+            .Equal(                         &VecFunc::template Equal< Vec_t >)
             .Compare(                           &VecFunc::template Cmp< Vec_t >);
 
         se->AddFunction( &VecFunc::template All< Vec_t >,   "All",  {"x"} );
@@ -553,7 +553,7 @@ namespace
             .Binary(        EBinaryOperator::ShiftRight, &VecFunc::template ShiftR_v_s< Vec_t >)
             .BinaryRH(      EBinaryOperator::ShiftRight, &VecFunc::template ShiftR_s_v< Vec_t >)
 
-            .Equals( &VecFunc::template Equal< Vec_t >)
+            .Equal( &VecFunc::template Equal< Vec_t >)
             .Compare( &VecFunc::template Cmp< Vec_t >);
 
         BindIntFloatVec( binder, se );
@@ -600,7 +600,7 @@ namespace
             .Binary(        EBinaryOperator::Mod, &VecFunc::template Mod_v_s< Vec_t >)
             .BinaryRH(      EBinaryOperator::Mod, &VecFunc::template Mod_s_v< Vec_t >)
 
-            .Equals( &VecFunc::template Equal< Vec_t >)
+            .Equal( &VecFunc::template Equal< Vec_t >)
             .Compare( &VecFunc::template Cmp< Vec_t >);
 
         BindIntFloatVec( binder, se );
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath1.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath1.cpp
index 895af394..3ac659ab 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath1.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath1.cpp
@@ -17,7 +17,7 @@ namespace AE::Scripting
         // declare
         DefineVector_Func   func{ se };
 
-        VecTypes::Visit( func );
+        VecTypes::VisitTh( func );
     }
 
 
diff --git a/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath2.cpp b/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath2.cpp
index 44e67f08..0cb705b0 100644
--- a/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath2.cpp
+++ b/AE/engine/src/scripting/Bindings/CoreBindings_BindVectorMath2.cpp
@@ -17,7 +17,7 @@ namespace AE::Scripting
         // bind
         BindVector_Func func{ se };
 
-        VecTypes::Visit( func );
+        VecTypes::VisitTh( func );
     }
 
 
diff --git a/AE/engine/src/scripting/CMakeLists.txt b/AE/engine/src/scripting/CMakeLists.txt
index 6b2e5501..33633066 100644
--- a/AE/engine/src/scripting/CMakeLists.txt
+++ b/AE/engine/src/scripting/CMakeLists.txt
@@ -4,9 +4,11 @@ if (DEFINED ANDROID)
     set( AE_ENABLE_SCRIPTING OFF CACHE INTERNAL "" FORCE )
 elseif (${AE_ENABLE_ANGELSCRIPT})
     set( AE_ENABLE_SCRIPTING ON CACHE INTERNAL "" FORCE )
+else()
+    set( AE_ENABLE_SCRIPTING OFF CACHE INTERNAL "" FORCE )
 endif()
 
-if (${AE_ENABLE_SCRIPTING})
+if (${AE_ENABLE_SCRIPTING} AND ${AE_ENABLE_EXCEPTIONS})
     file( GLOB_RECURSE HPP_SOURCES "*.h" )
     if (NOT (DEFINED ENGINE_LIBS_PATH))
         file( GLOB_RECURSE CPP_SOURCES "*.cpp" )
diff --git a/AE/engine/src/scripting/Impl/ClassBinder.h b/AE/engine/src/scripting/Impl/ClassBinder.h
index 7e59be02..92a5096b 100644
--- a/AE/engine/src/scripting/Impl/ClassBinder.h
+++ b/AE/engine/src/scripting/Impl/ClassBinder.h
@@ -9,7 +9,7 @@ namespace AE::Scripting
 
     enum class EUnaryOperator
     {
-        Inverse,    
+        Inverse,
         Not,
         PreInc,
         PreDec,
@@ -135,7 +135,7 @@ namespace AE::Scripting
             template <typename OutType> Self &  ImplCast (OutType const* (*) (const T *))   __Th___;
 
             // compare
-            template <typename Fn>      Self &  Equals (Fn func)                            __Th___;    // x == y
+            template <typename Fn>      Self &  Equal (Fn func)                         __Th___;    // x == y
             template <typename Fn>      Self &  Compare (Fn func)                           __Th___;    // x <> y
         };
 
diff --git a/AE/engine/src/scripting/Impl/ClassBinder.inl.h b/AE/engine/src/scripting/Impl/ClassBinder.inl.h
index fe6f27c6..4b7a88e6 100644
--- a/AE/engine/src/scripting/Impl/ClassBinder.inl.h
+++ b/AE/engine/src/scripting/Impl/ClassBinder.inl.h
@@ -112,7 +112,7 @@ namespace _hidden_ {
     {
         using namespace AngelScript;
 
-        STATIC_ASSERT( alignof(T) <= 16 );
+        StaticAssert( alignof(T) <= 16 );
 
         _flags = asOBJ_VALUE | asOBJ_POD | flags;
 
@@ -312,8 +312,8 @@ namespace _hidden_ {
     {
         using namespace AngelScript;
 
-        STATIC_ASSERT(( not IsBaseOf< AngelScriptHelper::SimpleRefCounter, T > ));
-        STATIC_ASSERT(( IsSameTypes< void *, typename GlobalFunction<Fn>::TypeList_t::Front::type > ));
+        StaticAssert(( not IsBaseOf< AngelScriptHelper::SimpleRefCounter, T > ));
+        StaticAssert(( IsSameTypes< void *, typename GlobalFunction<Fn>::TypeList_t::Front::type > ));
 
         String  signature("void f ");
         GlobalFunction<Fn>::GetArgs( INOUT signature, 1 );  // skip (void *)
@@ -339,8 +339,8 @@ namespace _hidden_ {
     {
         using namespace AngelScript;
 
-        STATIC_ASSERT(( IsBaseOf< AngelScriptHelper::SimpleRefCounter, T > ));
-        STATIC_ASSERT(( IsSameTypes< T*, typename GlobalFunction<Fn>::Result_t > ));
+        StaticAssert(( IsBaseOf< AngelScriptHelper::SimpleRefCounter, T > ));
+        StaticAssert(( IsSameTypes< T*, typename GlobalFunction<Fn>::Result_t > ));
 
         String  signature(_name + "@ new_" + _name);
         GlobalFunction<Fn>::GetArgs( INOUT signature );
@@ -491,8 +491,8 @@ namespace _hidden_ {
         using namespace AngelScript;
 
         using C = typename FunctionInfo<Fn>::clazz;
-        STATIC_ASSERT( not IsVoid<C>, "'Fn' must be class method" );
-        STATIC_ASSERT( IsBaseOf< C, T >, "'Fn' must be from this class or from base class");
+        StaticAssert( not IsVoid<C>, "'Fn' must be class method" );
+        StaticAssert( IsBaseOf< C, T >, "'Fn' must be from this class or from base class");
 
         String  signature;
         MemberFunction<Fn>::GetDescriptor( INOUT signature, name );
@@ -543,15 +543,15 @@ namespace _hidden_ {
     void  ClassBinder<T>::AddMethodFromGlobal (Fn funcPtr, StringView name, ArgNames_t argNames) __Th___
     {
         using Args = typename GlobalFunction<Fn>::TypeList_t;
-        STATIC_ASSERT( Args::Count > 0 );
+        StaticAssert( Args::Count > 0 );
 
         constexpr bool  obj_first   = _IsSame< typename Args::Front::type >::value;
         constexpr bool  obj_last    = _IsSame< typename Args::Back::type >::value;
 
         if constexpr( Args::Count == 1 ){
-            STATIC_ASSERT( obj_first and obj_last );
+            StaticAssert( obj_first and obj_last );
         }else{
-            STATIC_ASSERT( obj_first or obj_last );
+            StaticAssert( obj_first or obj_last );
         }
         if constexpr( obj_first )
             return AddMethodFromGlobalObjFirst( funcPtr, name, argNames );
@@ -572,8 +572,8 @@ namespace _hidden_ {
         using FuncInfo  = FunctionInfo<Fn>;
         using FrontArg  = typename FuncInfo::args::Front::type;
 
-        STATIC_ASSERT( IsVoid< FuncInfo::clazz >, "'Fn' must be a function" );
-        STATIC_ASSERT( _IsSame< FrontArg >::value );
+        StaticAssert( IsVoid< FuncInfo::clazz >, "'Fn' must be a function" );
+        StaticAssert( _IsSame< FrontArg >::value );
 
         String  signature;
         GlobalFunction<Fn>::GetDescriptor( INOUT signature, name, 1, 0 );
@@ -605,8 +605,8 @@ namespace _hidden_ {
         using FuncInfo  = FunctionInfo<Fn>;
         using BackArg   = typename FuncInfo::args::template Get< FuncInfo::args::Count-1 >;
 
-        STATIC_ASSERT( IsVoid< FuncInfo::clazz >, "'Fn' must be a function" );
-        STATIC_ASSERT( _IsSame< BackArg >::value );
+        StaticAssert( IsVoid< FuncInfo::clazz >, "'Fn' must be a function" );
+        StaticAssert( _IsSame< BackArg >::value );
 
         String  signature;
         GlobalFunction<Fn>::GetDescriptor( INOUT signature, name, 0, 1 );
@@ -639,12 +639,12 @@ namespace _hidden_ {
 
         if constexpr( Scripting::_hidden_::IsGlobal<Fn>() )
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 1 );
+            StaticAssert( FuncInfo::args::Count == 1 );
             _binder->AddMethodFromGlobalObjFirst( func, _UnaryToStr( op ), {} );
         }
         else
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 0 );
+            StaticAssert( FuncInfo::args::Count == 0 );
             _binder->AddMethod( func, _UnaryToStr( op ), {} );
         }
         return *this;
@@ -664,12 +664,12 @@ namespace _hidden_ {
 
         if constexpr( Scripting::_hidden_::IsGlobal<Fn>() )
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 2 );
+            StaticAssert( FuncInfo::args::Count == 2 );
             _binder->AddMethodFromGlobalObjFirst( func, _BinAssignToStr( op ), {} );
         }
         else
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 1 );
+            StaticAssert( FuncInfo::args::Count == 1 );
             _binder->AddMethod( func, _BinAssignToStr( op ), {} );
         }
         return *this;
@@ -954,12 +954,12 @@ namespace _hidden_ {
 
         if constexpr( Scripting::_hidden_::IsGlobal<Fn>() )
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 2 );
+            StaticAssert( FuncInfo::args::Count == 2 );
             _binder->AddMethodFromGlobalObjFirst( func, _BinToStr( op ), {} );
         }
         else
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 1 );
+            StaticAssert( FuncInfo::args::Count == 1 );
             _binder->AddMethod( func, _BinToStr( op ), {} );
         }
         return *this;
@@ -973,8 +973,8 @@ namespace _hidden_ {
     template <typename T> template <typename Fn>
     typename ClassBinder<T>::OperatorBinder&  ClassBinder<T>::OperatorBinder::BinaryRH (EBinaryOperator op, Fn func) __Th___
     {
-        STATIC_ASSERT( Scripting::_hidden_::IsGlobal<Fn>() );
-        STATIC_ASSERT( FunctionInfo<Fn>::args::Count == 2 );
+        StaticAssert( Scripting::_hidden_::IsGlobal<Fn>() );
+        StaticAssert( FunctionInfo<Fn>::args::Count == 2 );
 
         SCOPED_SET( _binder->_genHeader, false, _binder->_genHeader );
 
@@ -984,29 +984,29 @@ namespace _hidden_ {
 
 /*
 =================================================
-    Equals
+    Equal
 =================================================
 */
     template <typename T> template <typename Fn>
-    typename ClassBinder<T>::OperatorBinder&  ClassBinder<T>::OperatorBinder::Equals (Fn func) __Th___
+    typename ClassBinder<T>::OperatorBinder&  ClassBinder<T>::OperatorBinder::Equal (Fn func) __Th___
     {
         using FuncInfo = FunctionInfo<Fn>;
 
-        STATIC_ASSERT( IsSameTypes< typename FuncInfo::result, bool > );
+        StaticAssert( IsSameTypes< typename FuncInfo::result, bool > );
 
         SCOPED_SET( _binder->_genHeader, false, _binder->_genHeader );
 
         if constexpr( Scripting::_hidden_::IsGlobal<Fn>() )
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 2 );
-            STATIC_ASSERT(( IsSameTypes< typename FuncInfo::args::template Get<0>, T > or IsSameTypes< typename FuncInfo::args::template Get<0>, const T& > ));
-            STATIC_ASSERT(( IsSameTypes< typename FuncInfo::args::template Get<1>, T > or IsSameTypes< typename FuncInfo::args::template Get<1>, const T& > ));
+            StaticAssert( FuncInfo::args::Count == 2 );
+            StaticAssert(( IsSameTypes< typename FuncInfo::args::template Get<0>, T > or IsSameTypes< typename FuncInfo::args::template Get<0>, const T& > ));
+            StaticAssert(( IsSameTypes< typename FuncInfo::args::template Get<1>, T > or IsSameTypes< typename FuncInfo::args::template Get<1>, const T& > ));
 
             _binder->AddMethodFromGlobalObjFirst( func, "opEquals", {} );
         }
         else
         {
-            STATIC_ASSERT( FuncInfo::args::Count == 1 );
+            StaticAssert( FuncInfo::args::Count == 1 );
             _binder->AddMethod( func, "opEquals", {} );
         }
         return *this;
@@ -1022,10 +1022,10 @@ namespace _hidden_ {
     {
         using FuncInfo = FunctionInfo<Fn>;
 
-        STATIC_ASSERT( IsSameTypes< typename FuncInfo::result, int > );
-        STATIC_ASSERT( FuncInfo::args::Count == 2 );
-        STATIC_ASSERT(( IsSameTypes< typename FuncInfo::args::template Get<0>, T > or IsSameTypes< typename FuncInfo::args::template Get<0>, const T& > ));
-        STATIC_ASSERT(( IsSameTypes< typename FuncInfo::args::template Get<1>, T > or IsSameTypes< typename FuncInfo::args::template Get<1>, const T& > ));
+        StaticAssert( IsSameTypes< typename FuncInfo::result, int > );
+        StaticAssert( FuncInfo::args::Count == 2 );
+        StaticAssert(( IsSameTypes< typename FuncInfo::args::template Get<0>, T > or IsSameTypes< typename FuncInfo::args::template Get<0>, const T& > ));
+        StaticAssert(( IsSameTypes< typename FuncInfo::args::template Get<1>, T > or IsSameTypes< typename FuncInfo::args::template Get<1>, const T& > ));
 
         SCOPED_SET( _binder->_genHeader, false, _binder->_genHeader );
 
diff --git a/AE/engine/src/scripting/Impl/EnumBinder.h b/AE/engine/src/scripting/Impl/EnumBinder.h
index 7e6ad039..cb5e0eec 100644
--- a/AE/engine/src/scripting/Impl/EnumBinder.h
+++ b/AE/engine/src/scripting/Impl/EnumBinder.h
@@ -83,7 +83,7 @@ namespace AE::Scripting
         int res = GetASEngine()->RegisterEnum( _name.c_str() );
 
         if ( res == AngelScript::asALREADY_REGISTERED )
-            AE_LOGE( "enum '" + String{Name()} + "' already registerd" );
+            AE_LOGE( "enum '" + String{Name()} + "' already registered" );
 
         AS_CHECK_THROW( res );
 
diff --git a/AE/engine/src/scripting/Impl/InterfaceBinder.h b/AE/engine/src/scripting/Impl/InterfaceBinder.h
index bd07a9af..7c68d214 100644
--- a/AE/engine/src/scripting/Impl/InterfaceBinder.h
+++ b/AE/engine/src/scripting/Impl/InterfaceBinder.h
@@ -91,7 +91,7 @@ namespace AE::Scripting
     void  InterfaceBinder<T>::AddMethod (Func methodPtr, StringView name) __Th___
     {
         using C = typename FunctionInfo<Func>::clazz;
-        STATIC_ASSERT( IsBaseOf< C, T >);
+        StaticAssert( IsBaseOf< C, T >);
 
         String  signature;
         MemberFunction<Func>::GetDescriptor( INOUT signature, name );
diff --git a/AE/engine/src/scripting/Impl/ScriptArgList.h b/AE/engine/src/scripting/Impl/ScriptArgList.h
index a7ced8cc..1c02e549 100644
--- a/AE/engine/src/scripting/Impl/ScriptArgList.h
+++ b/AE/engine/src/scripting/Impl/ScriptArgList.h
@@ -20,12 +20,10 @@ namespace AE::Scripting
             ScriptArgList const&    self;
             bool                    result  = true;
 
-            Visitor (ScriptArgList const& s) : self{s} {}
+            Visitor (ScriptArgList const& s)    __NE___ : self{s} {}
 
             template <typename T, usize I>
-            void  operator () () {
-                result &= self.IsArg<T>( uint(I) );
-            }
+            void  operator () ()                __NE___ { result &= self.IsArg<T>( uint(I) ); }
         };
 
 
@@ -86,7 +84,7 @@ namespace AE::Scripting
         ND_ int             _Return (const T &value)        C_NE___;
     };
 
-    STATIC_ASSERT( sizeof(ScriptArgList) == sizeof(AngelScript::asIScriptGeneric*) );
+    StaticAssert( sizeof(ScriptArgList) == sizeof(AngelScript::asIScriptGeneric*) );
 
 } // AE::Scripting
 
diff --git a/AE/engine/src/scripting/Impl/ScriptArgList.inl.h b/AE/engine/src/scripting/Impl/ScriptArgList.inl.h
index 487bdf70..deea3334 100644
--- a/AE/engine/src/scripting/Impl/ScriptArgList.inl.h
+++ b/AE/engine/src/scripting/Impl/ScriptArgList.inl.h
@@ -63,7 +63,7 @@ namespace AE::Scripting
                 }
                 else
                 {
-                    STATIC_ASSERT( IsClass<T2> );
+                    StaticAssert( IsClass<T2> );
                     T2* arg = *static_cast<T2 **>(_gen->GetArgAddress( idx ));
                     ASSERT( arg == null );
                     return *arg;
@@ -71,7 +71,7 @@ namespace AE::Scripting
             }
             else
             {
-                STATIC_ASSERT( IsClass<T2> );
+                StaticAssert( IsClass<T2> );
                 return *Cast<CT2>(_gen->GetArgAddress( idx ));
             }
         }
@@ -143,7 +143,7 @@ namespace AE::Scripting
             return _gen->SetReturnAddress( const_cast<T*>(&value) );
         else
         {
-            STATIC_ASSERT( ScriptTypeInfo<T>::is_object );
+            StaticAssert( ScriptTypeInfo<T>::is_object );
             return _gen->SetReturnObject( const_cast<T*>(&value) );
         }
     }
@@ -177,7 +177,7 @@ namespace AE::Scripting
 
         constexpr bool  is_obj  = Info::is_object;
         constexpr bool  is_rc   = Info::is_ref_counted or AngelScriptHelper::IsSharedPtrNoQual<T>;
-        STATIC_ASSERT( is_obj or is_rc );
+        StaticAssert( is_obj or is_rc );
 
         const asDWORD   obj_flags   = is_rc ? asOBJ_REF : asOBJ_VALUE;
         asITypeInfo*    info        = _gen->GetEngine()->GetTypeInfoById( _gen->GetObjectTypeId() );
@@ -230,7 +230,7 @@ namespace AE::Scripting
         Visitor     vis {*this};
         FnInfo::args::Visit( vis );
 
-        return  IsReturn< typename FnInfo::result >() and vis.result;
+        return IsReturn< typename FnInfo::result >() and vis.result;
     }
 
 /*
diff --git a/AE/engine/src/scripting/Impl/ScriptEngine.cpp b/AE/engine/src/scripting/Impl/ScriptEngine.cpp
index a9fa521b..15c15a97 100644
--- a/AE/engine/src/scripting/Impl/ScriptEngine.cpp
+++ b/AE/engine/src/scripting/Impl/ScriptEngine.cpp
@@ -123,7 +123,7 @@ namespace AE::Scripting
     Create
 =================================================
 */
-    bool  ScriptEngine::Create (AngelScript::asIScriptEngine *se, Bool genCppHeader) __NE___
+    bool  ScriptEngine::Create (AngelScript::asIScriptEngine* se, Bool genCppHeader) __NE___
     {
         CHECK_ERR( not _engine );
         CHECK_ERR( se != null );
@@ -287,7 +287,9 @@ namespace
             }
         }};
 
+        bool    multiline_strings_assert_once = true;
         usize   pos = 1;
+
         for (; pos < str.size();)
         {
             const char  c = str[pos-1];
@@ -352,26 +354,24 @@ namespace
                 {
                     const char  a = str[pos-1];
                     const char  b = str[pos];
+                    ++pos;
 
-                    // new line
-                    if_unlikely( (a == '\r') & (b == '\n') )
-                    {
-                        ++pos;
-                        continue;
-                    }
-                    if_unlikely( (a == '\n') | (a == '\r') )
-                    {
-                        if ( not include_scope.back() )
-                            dst << '\n';
+                    #ifdef AE_DEBUG
+                    if ( a == '\n' and multiline_strings_assert_once ) {
+                        multiline_strings_assert_once = false;
+                        CHECK_MSG( false, "multiline strings are not supported" );
                     }
+                    #endif
+                    Unused( multiline_strings_assert_once );
+
+                    if_unlikely( a == '"' )
+                        break;
 
-                    if_unlikely( (a == '"') | ((a != '\\') & (b == '"')) )
+                    if_unlikely( (a != '\\') & (b == '"') )
                     {
-                        pos += ((a == '"') ? 1 : 2);
+                        ++pos;
                         break;
                     }
-
-                    ++pos;
                 }
                 continue;
             }
@@ -560,9 +560,10 @@ namespace
             RETURN_ERR( "failed to find included file: '"s << fname << "'" );
         }};
 
-        try {
+        TRY{
             Array<Pair< StringView, usize >>    file_and_pos;
 
+            dst.clear();
             CHECK_ERR( _Preprocessor( str, OUT dst, file_and_pos, defines ));
             CHECK_ERR( file_and_pos.empty() or not includeDirs.empty() );
 
@@ -578,9 +579,9 @@ namespace
             }
             return true;
         }
-        catch (...) {
+        CATCH_ALL(
             return false;
-        }
+        )
     }
 
 /*
@@ -726,7 +727,6 @@ namespace
 
         str << "\n";
 
-        hash = HashVal32{0};
         for (auto& hdr : _cppHeaders)
         {
             str << hdr;
@@ -764,7 +764,6 @@ namespace
     {
     #if AE_SCRIPT_CPP_REFLECTION
         HashVal32   prev_hash;
-        char        hash_str [2+8+1] = {};
 
         if ( FileSystem::IsFile( fname ))
         {
@@ -772,29 +771,13 @@ namespace
 
             if ( file.IsOpen() )
             {
+                char    hash_str [2+8+1] = {};
                 if ( file.Read( OUT hash_str, Sizeof(hash_str) ))
                 {
                     ASSERT( hash_str[0] == '/' );
                     ASSERT( hash_str[1] == '/' );
                     ASSERT( hash_str[10] == '\n' );
-
-                    const auto  FromHChar = [] (char x) -> uint
-                    {{
-                        return  ((x >= '0') & (x <= '9')) ? (x - '0') :
-                                ((x >= 'A') & (x <= 'F')) ? (x - 'A' + 10) :
-                                0;
-                    }};
-
-                    uint    h = 0;
-                    h |= FromHChar( hash_str[2] ) << 0;
-                    h |= FromHChar( hash_str[3] ) << 4;
-                    h |= FromHChar( hash_str[4] ) << 8;
-                    h |= FromHChar( hash_str[5] ) << 12;
-                    h |= FromHChar( hash_str[6] ) << 16;
-                    h |= FromHChar( hash_str[7] ) << 20;
-                    h |= FromHChar( hash_str[8] ) << 24;
-                    h |= FromHChar( hash_str[9] ) << 28;
-                    prev_hash = HashVal32{h};
+                    prev_hash = HashVal32{StringToUInt( StringView{hash_str}.substr( 2 ), 16 )};
                 }
             }
         }
@@ -809,22 +792,7 @@ namespace
         {
             FileWStream file {fname};
             CHECK_ERR( file.IsOpen() );
-
-            const auto  ToHChar = [] (uint x) -> char  {{ x &= 0xF;  return char(x < 10 ? '0' + x : 'A' + x - 10); }};
-
-            hash_str[0] = '/';
-            hash_str[1] = '/';
-            hash_str[2] = ToHChar( uint{hash} >> 0 );
-            hash_str[3] = ToHChar( uint{hash} >> 4 );
-            hash_str[4] = ToHChar( uint{hash} >> 8 );
-            hash_str[5] = ToHChar( uint{hash} >> 12 );
-            hash_str[6] = ToHChar( uint{hash} >> 16 );
-            hash_str[7] = ToHChar( uint{hash} >> 20 );
-            hash_str[8] = ToHChar( uint{hash} >> 24 );
-            hash_str[9] = ToHChar( uint{hash} >> 28 );
-            hash_str[10] = '\n';
-
-            CHECK_ERR( file.Write( hash_str, Sizeof(hash_str) ));
+            CHECK_ERR( file.Write( "//"s << ToString<16>(uint{hash}) << "\n" ));
             CHECK_ERR( file.Write( src ));
         }
         return true;
diff --git a/AE/engine/src/scripting/Impl/ScriptEngine.h b/AE/engine/src/scripting/Impl/ScriptEngine.h
index d3c0ad37..b654e74f 100644
--- a/AE/engine/src/scripting/Impl/ScriptEngine.h
+++ b/AE/engine/src/scripting/Impl/ScriptEngine.h
@@ -155,7 +155,7 @@ namespace AE::Scripting
       #endif
 
         ND_ bool  Create (Bool genCppHeader = False{})                                              __NE___;
-        ND_ bool  Create (AngelScript::asIScriptEngine *se, Bool genCppHeader = False{})            __NE___;
+        ND_ bool  Create (AngelScript::asIScriptEngine* se, Bool genCppHeader = False{})            __NE___;
 
         ND_ ScriptModulePtr  CreateModule (ArrayView<ModuleSource>  src,
                                            ArrayView<StringView>    defines     = Default,
@@ -213,7 +213,7 @@ namespace AE::Scripting
     private:
         ND_ bool  _CreateContext (const String &signature, const ScriptModulePtr &module, OUT AngelScript::asIScriptContext* &ctx);
 
-            static void  _MessageCallback (const AngelScript::asSMessageInfo *msg, void *param);
+            static void  _MessageCallback (const AngelScript::asSMessageInfo* msg, void* param);
 
         ND_ static bool  _Preprocessor (StringView str,
                                         OUT String &,
diff --git a/AE/engine/src/scripting/Impl/ScriptFn.h b/AE/engine/src/scripting/Impl/ScriptFn.h
index eb3cf1ec..69f9dab8 100644
--- a/AE/engine/src/scripting/Impl/ScriptFn.h
+++ b/AE/engine/src/scripting/Impl/ScriptFn.h
@@ -69,7 +69,7 @@ namespace AE::Scripting
         using ExpectedArgs_t    = TypeList< Types... >;
         using InputArgs_t       = TypeList< Args... >;
 
-        STATIC_ASSERT( Scripting::_hidden_::CheckInputArgTypes< ExpectedArgs_t, InputArgs_t >::value );
+        StaticAssert( Scripting::_hidden_::CheckInputArgTypes< ExpectedArgs_t, InputArgs_t >::value );
 
         if_unlikely( not (_module and _ctx != null) )
         {
diff --git a/AE/engine/src/scripting/Impl/ScriptTypes.h b/AE/engine/src/scripting/Impl/ScriptTypes.h
index cdfbaad5..6918ca2d 100644
--- a/AE/engine/src/scripting/Impl/ScriptTypes.h
+++ b/AE/engine/src/scripting/Impl/ScriptTypes.h
@@ -276,7 +276,7 @@ namespace AE::Scripting
         template <typename T>
         struct SharedPtr
         {
-            //STATIC_ASSERT( IsBaseOf< SimpleRefCounter, T > );
+            //StaticAssert( IsBaseOf< SimpleRefCounter, T > );
 
         // types
         public:
@@ -296,7 +296,7 @@ namespace AE::Scripting
         public:
             SharedPtr ()                                        __NE___ {}
             SharedPtr (std::nullptr_t)                          __NE___ {}
-            explicit SharedPtr (T *ptr)                         __NE___ : _ptr{ptr}         { _IncRef(); }
+            explicit SharedPtr (T* ptr)                         __NE___ : _ptr{ptr}         { _IncRef(); }
             SharedPtr (const SharedPtr<T> &other)               __NE___ : _ptr{other._ptr}  { _IncRef(); }
             SharedPtr (SharedPtr<T> &&other)                    __NE___ : _ptr{other._ptr}  { other._ptr = null; }
             ~SharedPtr ()                                       __NE___ { _DecRef(); }
@@ -352,7 +352,7 @@ namespace AE::Scripting
         template <typename T>
         static T *  FactoryCreate ()
         {
-            STATIC_ASSERT( not IsBaseOf< SimpleRefCounter, T > );
+            StaticAssert( not IsBaseOf< SimpleRefCounter, T > );
             return new T{};
         }
 
@@ -364,7 +364,7 @@ namespace AE::Scripting
 
 
         template <typename T>
-        static void  Constructor (AngelScript::asIScriptGeneric *gen)
+        static void  Constructor (AngelScript::asIScriptGeneric* gen)
         {
             // TODO: bug in AngelScript: address is not aligned
             PlacementNew<T>( OUT gen->GetObject() );    // throw
@@ -372,7 +372,7 @@ namespace AE::Scripting
 
 
         template <typename T>
-        static void  CopyConstructor (AngelScript::asIScriptGeneric *gen) __Th___
+        static void  CopyConstructor (AngelScript::asIScriptGeneric* gen) __Th___
         {
             T const*    src = static_cast< const T *>( gen->GetArgObject(0) );
             void *      dst = gen->GetObject();
@@ -381,14 +381,14 @@ namespace AE::Scripting
 
 
         template <typename T>
-        static void  Destructor (AngelScript::asIScriptGeneric *gen)
+        static void  Destructor (AngelScript::asIScriptGeneric* gen)
         {
             static_cast<T *>(gen->GetObject())->~T();
         }
 
 
         template <typename T>
-        static void  CopyAssign (AngelScript::asIScriptGeneric *gen) __Th___
+        static void  CopyAssign (AngelScript::asIScriptGeneric* gen) __Th___
         {
             T const*    src = static_cast< const T *>( gen->GetArgObject(0) );
             T*          dst = static_cast< T *>( gen->GetObject() );
@@ -421,14 +421,14 @@ namespace AE::Scripting
             const uint  first;
             const uint  last;
 
-            ArgsToString_Func (uint first, uint last, INOUT String &str) : 
+            ArgsToString_Func (uint first, uint last, INOUT String &str) __NE___ :
                 result(str), first(first), last(last)
             {
                 ASSERT( first <= last );
             }
 
             template <typename T, usize Index>
-            void  operator () ()
+            void  operator () () __NE___
             {
                 if ( Index < first or Index > last )    return;
                 if ( Index > first )                    result << ", ";
@@ -464,7 +464,7 @@ namespace AE::Scripting
             const uint              last;
             ArrayView<StringView>   argNames;
 
-            CppArgsToString_Func (uint first, uint last, ArrayView<StringView> argNames, INOUT String &str) : 
+            CppArgsToString_Func (uint first, uint last, ArrayView<StringView> argNames, INOUT String &str) __NE___ :
                 result{str}, first{first}, last{last}, argNames{argNames}
             {
                 ASSERT( first <= last );
@@ -472,7 +472,7 @@ namespace AE::Scripting
             }
 
             template <typename T, usize Index>
-            void  operator () ()
+            void  operator () () __NE___
             {
                 if ( Index < first or Index > last )    return;
                 if ( Index > first )                    result << ", ";
@@ -513,7 +513,7 @@ namespace AE::Scripting
             static void  GetDescriptor (INOUT String &str, StringView name, uint offsetFromStart = 0, uint offsetFromEnd = 0)
             {
                 // can not convert between R* to SharedPtr<R>
-                STATIC_ASSERT( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
+                StaticAssert( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
 
                 ScriptTypeInfo< Result_t >::Name( INOUT str );
                 str << ' ' << name;
@@ -528,7 +528,7 @@ namespace AE::Scripting
             static void  GetCppDescriptor (INOUT String &str, StringView name, ArrayView<StringView> argNames, uint offsetFromStart = 0, uint offsetFromEnd = 0)
             {
                 // can not convert between R* to SharedPtr<R>
-                STATIC_ASSERT( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
+                StaticAssert( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
 
                 ScriptTypeInfo< Result_t >::CppArg( INOUT str );
                 str << "  " << name << ' ';
@@ -554,7 +554,7 @@ namespace AE::Scripting
             static void  GetDescriptor (INOUT String &str, StringView name, uint = 0, uint = 0)
             {
                 // can not convert between R* to SharedPtr<R>
-                STATIC_ASSERT( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
+                StaticAssert( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
 
                 ScriptTypeInfo< Result_t >::Name( INOUT str );
                 str << ' ' << name << "()";
@@ -568,7 +568,7 @@ namespace AE::Scripting
             static void  GetCppDescriptor (INOUT String &str, StringView name, ArrayView<StringView>, uint = 0, uint = 0)
             {
                 // can not convert between R* to SharedPtr<R>
-                STATIC_ASSERT( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
+                StaticAssert( not AngelScriptHelper::IsSharedPtrNoQual< Result_t >);
 
                 ScriptTypeInfo< Result_t >::CppArg( INOUT str );
                 str << "  " << name << " ()";
@@ -749,20 +749,20 @@ namespace AE::Scripting
         template <typename T, bool IsObject>
         struct ContextSetterGetter_Var
         {
-            ND_ static T    Get (AngelScript::asIScriptContext *ctx)                    { return *static_cast<T *>(ctx->GetReturnObject()); }
-                static int  Set (AngelScript::asIScriptContext *ctx, int arg, T& value) { return ctx->SetArgObject( arg, static_cast<void *>(&value) ); }
+            ND_ static T    Get (AngelScript::asIScriptContext* ctx)                    { return *static_cast<T *>(ctx->GetReturnObject()); }
+                static int  Set (AngelScript::asIScriptContext* ctx, int arg, T& value) { return ctx->SetArgObject( arg, static_cast<void *>(&value) ); }
         };
 
         template <typename T>
         struct ContextSetterGetter_Var< AngelScriptHelper::SharedPtr<T>, true >
         {
-            STATIC_ASSERT( ScriptTypeInfo<T*>::is_ref_counted );
+            StaticAssert( ScriptTypeInfo<T*>::is_ref_counted );
 
-            ND_ static AngelScriptHelper::SharedPtr<T>  Get (AngelScript::asIScriptContext *ctx) {
+            ND_ static AngelScriptHelper::SharedPtr<T>  Get (AngelScript::asIScriptContext* ctx) {
                 return AngelScriptHelper::SharedPtr<T>{ static_cast<T *>(ctx->GetReturnObject()) };
             }
 
-            static int  Set (AngelScript::asIScriptContext *ctx, int arg, const AngelScriptHelper::SharedPtr<T> &ptr) {
+            static int  Set (AngelScript::asIScriptContext* ctx, int arg, const AngelScriptHelper::SharedPtr<T> &ptr) {
                 return ctx->SetArgObject( arg, reinterpret_cast<void *>(ptr.Get()) );
             }
         };
@@ -771,8 +771,8 @@ namespace AE::Scripting
             template <> \
             struct ContextSetterGetter_Var< _type_, false > \
             { \
-                ND_ static _type_ Get (AngelScript::asIScriptContext *ctx)                                  { return _type_(ctx->_get_()); } \
-                    static int    Set (AngelScript::asIScriptContext *ctx, int arg, const _type_ &value)    { return ctx->_set_( arg, value ); } \
+                ND_ static _type_ Get (AngelScript::asIScriptContext* ctx)                                  { return _type_(ctx->_get_()); } \
+                    static int    Set (AngelScript::asIScriptContext* ctx, int arg, const _type_ &value)    { return ctx->_set_( arg, value ); } \
             }
 
         DECL_CONTEXT_RESULT( sbyte,     GetReturnByte,      SetArgByte );
@@ -790,21 +790,21 @@ namespace AE::Scripting
         template <typename T, bool IsObject>
         struct _ContextSetterGetter_Ptr
         {
-            ND_ static T *  Get (AngelScript::asIScriptContext *ctx)                    { return static_cast<T *>(ctx->GetReturnAddress()); }
-                static int  Set (AngelScript::asIScriptContext *ctx, int arg, T* ptr)   { return ctx->SetArgAddress( arg, (void *)(ptr) ); }
+            ND_ static T *  Get (AngelScript::asIScriptContext* ctx)                    { return static_cast<T *>(ctx->GetReturnAddress()); }
+                static int  Set (AngelScript::asIScriptContext* ctx, int arg, T* ptr)   { return ctx->SetArgAddress( arg, (void *)(ptr) ); }
         };
 
         template <typename T>
         struct _ContextSetterGetter_Ptr < T, true >
         {
-            ND_ static T *  Get (AngelScript::asIScriptContext *ctx)
+            ND_ static T *  Get (AngelScript::asIScriptContext* ctx)
             {
                 T* result = static_cast<T *>(ctx->GetReturnObject());
                 if ( result != null ) result->__AddRef();
                 return result;
             }
 
-            static int  Set (AngelScript::asIScriptContext *ctx, int arg, T* ptr)   { return ctx->SetArgObject( arg, static_cast<void *>(ptr) ); }
+            static int  Set (AngelScript::asIScriptContext* ctx, int arg, T* ptr)   { return ctx->SetArgObject( arg, static_cast<void *>(ptr) ); }
         };
 
         template <typename T>
@@ -848,7 +848,7 @@ namespace AE::Scripting
         template <typename Arg0, typename ...Args>
         struct SetContextArgs< Arg0, Args...>
         {
-            static void  Set (AngelScript::asIScriptContext *ctx, int index, Arg0&& arg0, Args&& ...args)
+            static void  Set (AngelScript::asIScriptContext* ctx, int index, Arg0&& arg0, Args&& ...args)
             {
                 ValidateRC( arg0 );
                 AS_CHECK( ContextSetterGetter<Arg0>::Set( ctx, index, arg0 ));
@@ -859,7 +859,7 @@ namespace AE::Scripting
         template <typename Arg0>
         struct SetContextArgs< Arg0 >
         {
-            static void  Set (AngelScript::asIScriptContext *ctx, int index, Arg0&& arg0)
+            static void  Set (AngelScript::asIScriptContext* ctx, int index, Arg0&& arg0)
             {
                 ValidateRC( arg0 );
                 AS_CHECK( ContextSetterGetter<Arg0>::Set( ctx, index, FwdArg<Arg0>(arg0) ));
@@ -900,7 +900,7 @@ namespace AE::Scripting
             using T1 = RemoveCVRef< typename TL1::template Get< Idx-1 >>;
             using T2 = RemoveCVRef< typename TL2::template Get< Idx-1 >>;
 
-            STATIC_ASSERT( _IsSame< T1, T2 >::value );
+            StaticAssert( _IsSame< T1, T2 >::value );
 
             static constexpr bool   value = _IsSame< T1, T2 >::value and CheckInputArgTypes1< TL1, TL2, Idx-1 >::value;
         };
@@ -914,7 +914,7 @@ namespace AE::Scripting
         template <typename TL1, typename TL2>
         struct CheckInputArgTypes
         {
-            STATIC_ASSERT( TL1::Count == TL2::Count );
+            StaticAssert( TL1::Count == TL2::Count );
 
             static constexpr bool   value = CheckInputArgTypes1< TL1, TL2, TL1::Count >::value;
         };
@@ -993,7 +993,7 @@ namespace AE::Scripting
                                               ScriptTypeInfo<T2*>::is_ref_counted   or
                                               AngelScriptHelper::IsSharedPtrNoQual<T>;
                 constexpr bool  is_value    = not (is_obj or is_rc) and IsClass<T>;
-                STATIC_ASSERT( is_obj or is_rc or is_value );
+                StaticAssert( is_obj or is_rc or is_value );
 
                 const asDWORD   obj_flags   = is_rc ? asOBJ_REF : asOBJ_VALUE;
                 asITypeInfo*    info        = se->GetTypeInfoById( typeId );
diff --git a/AE/engine/src/serializing/Deserializer.h b/AE/engine/src/serializing/Basic/Deserializer.h
similarity index 90%
rename from AE/engine/src/serializing/Deserializer.h
rename to AE/engine/src/serializing/Basic/Deserializer.h
index efd4ce67..1dbd809f 100644
--- a/AE/engine/src/serializing/Deserializer.h
+++ b/AE/engine/src/serializing/Basic/Deserializer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "serializing/Serializer.h"
+#include "serializing/Basic/Serializer.h"
 
 namespace AE::Serializing
 {
@@ -11,7 +11,7 @@ namespace AE::Serializing
     // Deserializer
     //
 
-    struct Deserializer : Noncopyable
+    struct Deserializer final : Noncopyable
     {
     // types
     public:
@@ -22,8 +22,8 @@ namespace AE::Serializing
     // variables
     public:
         FastRStream             stream;
-        Ptr<ObjectFactory>      factory;
-        RC<IAllocator>          allocator;
+        Ptr<ObjectFactory>      factory;        // optional
+        Ptr<IAllocator>         allocator;      // optional
 
     private:
         #if AE_DEBUG_SERIALIZER
@@ -33,8 +33,8 @@ namespace AE::Serializing
 
     // methods
     public:
-        explicit Deserializer (FastRStream rstream, RC<IAllocator> alloc = Default) __NE___ : stream{ RVRef(rstream) }, allocator{ RVRef(alloc) } {}
-        explicit Deserializer (RC<RStream> rstream, RC<IAllocator> alloc = Default) __NE___ : stream{ RVRef(rstream) }, allocator{ RVRef(alloc) } {}
+        explicit Deserializer (FastRStream rstream, Ptr<IAllocator> alloc = Default) __NE___ : stream{ RVRef(rstream) }, allocator{alloc} {}
+        explicit Deserializer (RC<RStream> rstream, Ptr<IAllocator> alloc = Default) __NE___ : stream{ RVRef(rstream) }, allocator{alloc} {}
 
             template <typename ...Args>
         ND_ bool  operator () (INOUT Args& ...args) __NE___;
@@ -48,7 +48,6 @@ namespace AE::Serializing
 
         template <typename T>               ND_ bool  _DeserializeObj (INOUT T &);
         template <typename T>               ND_ bool  _Deserialize (INOUT T &);
-        template <typename T>               ND_ bool  _Deserialize (INOUT TBytes<T> &);
         template <typename F, typename S>   ND_ bool  _Deserialize (INOUT Pair<F,S> &);
         template <usize N>                  ND_ bool  _Deserialize (INOUT BitSet<N> &);
                                             ND_ bool  _Deserialize (INOUT String &);
diff --git a/AE/engine/src/serializing/Deserializer.inl.h b/AE/engine/src/serializing/Basic/Deserializer.inl.h
similarity index 93%
rename from AE/engine/src/serializing/Deserializer.inl.h
rename to AE/engine/src/serializing/Basic/Deserializer.inl.h
index 51c9f051..b9593fde 100644
--- a/AE/engine/src/serializing/Deserializer.inl.h
+++ b/AE/engine/src/serializing/Basic/Deserializer.inl.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "serializing/Deserializer.h"
+#include "serializing/Basic/Deserializer.h"
 
 namespace AE::Serializing
 {
@@ -22,7 +22,7 @@ namespace AE::Serializing
         }
     }
 
-    inline bool  Deserializer::operator () (INOUT void *obj) __NE___
+    inline bool  Deserializer::operator () (INOUT void* obj) __NE___
     {
         #if AE_DEBUG_SERIALIZER
             uint    dbg_idx = 0;
@@ -58,7 +58,7 @@ namespace AE::Serializing
             ++_dbgCounter;
         #endif
 
-        STATIC_ASSERT( not IsConst<Arg0> );
+        StaticAssert( not IsConst<Arg0> );
 
         bool res = _Deserialize( INOUT arg0 );
 
@@ -79,16 +79,6 @@ namespace AE::Serializing
     }
 
 
-    template <typename T>
-    bool  Deserializer::_Deserialize (INOUT TBytes<T> &value)
-    {
-        T       val = {};
-        bool    res = _Deserialize( OUT val );
-        value = TBytes<T>{ val };
-        return res;
-    }
-
-
     template <typename F, typename S>
     bool  Deserializer::_Deserialize (INOUT Pair<F,S> &value)
     {
@@ -99,7 +89,7 @@ namespace AE::Serializing
     template <usize N>
     bool  Deserializer::_Deserialize (INOUT BitSet<N> &value)
     {
-        STATIC_ASSERT( N <= 64 );
+        StaticAssert( N <= 64 );
 
         if constexpr( N <= 32 )
         {
@@ -128,11 +118,7 @@ namespace AE::Serializing
         if_unlikely( (not res) | (count > MaxArrayLength) )
             return false;
 
-        try {
-            arr.resize( count );    // throw
-        } catch(...) {
-            return false;
-        }
+        NOTHROW_ERR( arr.resize( count ));
 
         if constexpr( IsTriviallySerializable<T> )
             return (count == 0) or stream.Read( OUT arr.data(), ArraySizeOf(arr) );
@@ -201,11 +187,7 @@ namespace AE::Serializing
         if_unlikely( (not res) | (len > MaxStringLength) )
             return false;
 
-        try {
-            str.resize( len );  // throw
-        } catch(...) {
-            return false;
-        }
+        NOTHROW_ERR( str.resize( len ));
 
         return (len == 0) or stream.Read( OUT str.data(), StringSizeOf(str) );
     }
@@ -296,7 +278,7 @@ namespace AE::Serializing
         if_unlikely( (not res) | (count > maxCount) )
             return false;
 
-        try {
+        TRY{
             map.reserve( count );   // throw
 
             for (uint i = 0; res & (i < count); ++i)
@@ -309,10 +291,10 @@ namespace AE::Serializing
             ASSERT( map.size() == count );
             return res;
         }
-        catch(...) {
+        CATCH_ALL(
             Reconstruct( INOUT map );
             return false;
-        }
+        )
     }
 
 
@@ -326,7 +308,7 @@ namespace AE::Serializing
         if_unlikely( (not res) | (count > maxCount) )
             return false;
 
-        try {
+        TRY{
             set.reserve( count );   // throw
 
             for (uint i = 0; res & (i < count); ++i)
@@ -338,10 +320,10 @@ namespace AE::Serializing
             ASSERT( set.size() == count );
             return res;
         }
-        catch(...) {
+        CATCH_ALL(
             Reconstruct( INOUT set );
             return false;
-        }
+        )
     }
 
 
@@ -454,7 +436,7 @@ namespace AE::Serializing
         {
             for (uint i = 0; res & (i < count); ++i)
             {
-                PlacementNew<T>( OUT dst + i );         // nothrow
+                PlacementNew<T>( OUT dst + i );
                 res = _Deserialize( INOUT dst[i] );
             }
         }
@@ -465,6 +447,8 @@ namespace AE::Serializing
     template <typename T>
     bool  Deserializer::_Deserialize (INOUT BasicStringView<T> &str)
     {
+        CHECK_ERR( allocator );
+
         uint    len     = 0;
         bool    res     = stream.Read( OUT len );
         ASSERT( len <= MaxStringLength );
@@ -478,7 +462,7 @@ namespace AE::Serializing
             return true;
         }
 
-        T*  dst = Cast<T>( allocator->Allocate( SizeOf<T> * (len+1), AlignOf<T> ));
+        T*  dst = Cast<T>( allocator->Allocate( SizeAndAlign{ SizeOf<T> * (len+1), AlignOf<T> }));
         if_unlikely( dst == null )
             return false;
 
diff --git a/AE/engine/src/serializing/ISerializable.h b/AE/engine/src/serializing/Basic/ISerializable.h
similarity index 100%
rename from AE/engine/src/serializing/ISerializable.h
rename to AE/engine/src/serializing/Basic/ISerializable.h
diff --git a/AE/engine/src/serializing/ObjectFactory.h b/AE/engine/src/serializing/Basic/ObjectFactory.h
similarity index 67%
rename from AE/engine/src/serializing/ObjectFactory.h
rename to AE/engine/src/serializing/Basic/ObjectFactory.h
index 76743ea1..86ffd6b5 100644
--- a/AE/engine/src/serializing/ObjectFactory.h
+++ b/AE/engine/src/serializing/Basic/ObjectFactory.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include "serializing/ISerializable.h"
-#include "serializing/Serializer.h"
-#include "serializing/Deserializer.h"
+#include "serializing/Basic/ISerializable.h"
+#include "serializing/Basic/Serializer.h"
+#include "serializing/Basic/Deserializer.h"
 
 namespace AE::Serializing
 {
@@ -27,7 +27,7 @@ namespace AE::Serializing
         };
 
         using ObjectMap_t   = HashMap< SerializedID, ObjInfo >;     // requires pointer stability
-        using ObjectTypes_t = FlatHashMap< std::type_index, Pair<const SerializedID, ObjInfo>* >;
+        using ObjectTypes_t = FlatHashMap< TypeId, Pair<const SerializedID, ObjInfo>* >;
         using HashToObj_t   = FlatHashMap< uint, Pair<const SerializedID, ObjInfo>* >;
 
 
@@ -48,20 +48,20 @@ namespace AE::Serializing
 
     // methods
     public:
-        ObjectFactory () {}
+        ObjectFactory ()                                                                    __NE___ {}
 
         template <typename T>
-        bool  Register (const SerializedID &id, Serialize_t ser, Deserialize_t deser);
+            bool  Register (const SerializedID &id, Serialize_t ser, Deserialize_t deser)   __NE___;
 
         template <typename T>
-        bool  Register (const SerializedID &id);
+            bool  Register (const SerializedID &id)                                         __NE___;
 
         template <typename T>
-        ND_ bool  Serialize (Serializer &, const T& obj)        C_NE___;
+        ND_ bool  Serialize (Serializer &, const T& obj)                                    C_NE___;
 
         template <typename T>
-        ND_ bool  Deserialize (Deserializer &, INOUT T& obj)    C_NE___;
-        ND_ bool  Deserialize (Deserializer &, INOUT void* obj) C_NE___;
+        ND_ bool  Deserialize (Deserializer &, INOUT T& obj)                                C_NE___;
+        ND_ bool  Deserialize (Deserializer &, INOUT void* obj)                             C_NE___;
     };
 
 
@@ -71,34 +71,41 @@ namespace AE::Serializing
 =================================================
 */
     template <typename T>
-    inline bool  ObjectFactory::Register (const SerializedID &id, Serialize_t ser, Deserialize_t deser)
+    inline bool  ObjectFactory::Register (const SerializedID &id, Serialize_t ser, Deserialize_t deser) __NE___
     {
-        STATIC_ASSERT( not IsTriviallySerializable<T>, "Can not register POD type" );
+        StaticAssert( not IsTriviallySerializable<T>, "Can not register POD type" );
         EXLOCK( _guard );
 
-        auto [iter, inserted] = _objects.emplace( id, ObjInfo{ser, deser} );
-        CHECK_ERR( inserted );
+        TRY{
+            auto [iter, inserted] = _objects.emplace( id, ObjInfo{ser, deser} );        // throw
+            CHECK_ERR( inserted );
 
-        CHECK_ERR( _objectTypes.emplace( typeid(T), iter.operator->() ).second );
+            CHECK_ERR( _objectTypes.emplace( TypeIdOf<T>(), iter.operator->() ).second );   // throw
 
-        #if not AE_OPTIMIZE_IDS
-            _hashToObj.emplace( uint(usize(id.GetHash())), iter.operator->() );
-        #endif
+            #if not AE_OPTIMIZE_IDS
+                _hashToObj.emplace( uint(usize(id.GetHash())), iter.operator->() );
+            #endif
 
-        DEBUG_ONLY( _hashCollisionCheck.Add( id ));
-        return true;
+            DEBUG_ONLY( _hashCollisionCheck.Add( id ));
+            return true;
+        }
+        CATCH_ALL(
+            return false;
+        )
     }
 
     template <typename T>
-    inline bool  ObjectFactory::Register (const SerializedID &id)
+    inline bool  ObjectFactory::Register (const SerializedID &id) __NE___
     {
-        STATIC_ASSERT( IsBaseOf< ISerializable, T > );
+        StaticAssert( IsBaseOf< ISerializable, T >);
+        CheckNothrow( IsNothrowCtor< T >);
+
         return Register<T>( id,
-                            [] (Serializer &ser, const void *ptr) __NE___ {
+                            [] (Serializer &ser, const void* ptr) __NE___ {
                                 return Cast<ISerializable>(ptr)->Serialize( ser );
                             },
-                            [] (Deserializer &des, OUT void *ptr, bool create) __NE___ {
-                                if ( create ) PlacementNew<T>( OUT ptr );       // nothrow
+                            [] (Deserializer &des, OUT void* ptr, bool create) __NE___ {
+                                if ( create ) PlacementNew<T>( OUT ptr );
                                 return Cast<ISerializable>(ptr)->Deserialize( des );
                             }
                           );
@@ -112,10 +119,10 @@ namespace AE::Serializing
     template <typename T>
     inline bool  ObjectFactory::Serialize (Serializer &ser, const T& obj) C_NE___
     {
-        STATIC_ASSERT( not IsTriviallySerializable<T>, "Can not serialize POD type" );
+        StaticAssert( not IsTriviallySerializable<T>, "Can not serialize POD type" );
         SHAREDLOCK( _guard );
 
-        auto    iter = _objectTypes.find( typeid(T) );
+        auto    iter = _objectTypes.find( TypeIdOf<T>() );
         CHECK_ERR( iter != _objectTypes.end() );
 
         CHECK_ERR( ser.stream.Write( uint(usize(iter->second->first.GetHash())) ) and
@@ -131,10 +138,10 @@ namespace AE::Serializing
     template <typename T>
     inline bool  ObjectFactory::Deserialize (Deserializer &deser, INOUT T& obj) C_NE___
     {
-        STATIC_ASSERT( not IsTriviallySerializable<T>, "Can not deserialize POD type" );
+        StaticAssert( not IsTriviallySerializable<T>, "Can not deserialize POD type" );
         SHAREDLOCK( _guard );
 
-        auto    iter = _objectTypes.find( typeid(T) );
+        auto    iter = _objectTypes.find( TypeIdOf<T>() );
         CHECK_ERR( iter != _objectTypes.end() );
 
         uint    id;
@@ -174,5 +181,5 @@ namespace AE::Serializing
 
 } // AE::Serializing
 
-#include "serializing/Serializer.inl.h"
-#include "serializing/Deserializer.inl.h"
+#include "serializing/Basic/Serializer.inl.h"
+#include "serializing/Basic/Deserializer.inl.h"
diff --git a/AE/engine/src/serializing/Serializer.h b/AE/engine/src/serializing/Basic/Serializer.h
similarity index 98%
rename from AE/engine/src/serializing/Serializer.h
rename to AE/engine/src/serializing/Basic/Serializer.h
index 84179fb8..d68ea9bd 100644
--- a/AE/engine/src/serializing/Serializer.h
+++ b/AE/engine/src/serializing/Basic/Serializer.h
@@ -46,7 +46,6 @@ namespace AE::Serializing
 
         template <typename T>               ND_ bool  _SerializeObj (const T &);
         template <typename T>               ND_ bool  _Serialize (const T &);
-        template <typename T>               ND_ bool  _Serialize (const TBytes<T> &);
         template <typename F, typename S>   ND_ bool  _Serialize (const Pair<F,S> &);
         template <usize N>                  ND_ bool  _Serialize (const BitSet<N> &);
         template <typename T>               ND_ bool  _Serialize (ArrayView<T>);
diff --git a/AE/engine/src/serializing/Serializer.inl.h b/AE/engine/src/serializing/Basic/Serializer.inl.h
similarity index 97%
rename from AE/engine/src/serializing/Serializer.inl.h
rename to AE/engine/src/serializing/Basic/Serializer.inl.h
index 73acb660..1a5194de 100644
--- a/AE/engine/src/serializing/Serializer.inl.h
+++ b/AE/engine/src/serializing/Basic/Serializer.inl.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "serializing/Serializer.h"
+#include "serializing/Basic/Serializer.h"
 
 namespace AE::Serializing
 {
@@ -57,13 +57,6 @@ namespace AE::Serializing
     }
 
 
-    template <typename T>
-    bool  Serializer::_Serialize (const TBytes<T> &value)
-    {
-        return _Serialize( T(value) );
-    }
-
-
     template <typename F, typename S>
     bool  Serializer::_Serialize (const Pair<F,S> &value)
     {
@@ -74,7 +67,7 @@ namespace AE::Serializing
     template <usize N>
     bool  Serializer::_Serialize (const BitSet<N> &value)
     {
-        STATIC_ASSERT( N <= 64 );
+        StaticAssert( N <= 64 );
 
         if constexpr( N <= 32 )
             return _Serialize( value.to_ulong() );
diff --git a/AE/engine/src/serializing/Serializing.cpp b/AE/engine/src/serializing/Basic/Serializing.cpp
similarity index 60%
rename from AE/engine/src/serializing/Serializing.cpp
rename to AE/engine/src/serializing/Basic/Serializing.cpp
index 10592bb8..71b4377e 100644
--- a/AE/engine/src/serializing/Serializing.cpp
+++ b/AE/engine/src/serializing/Basic/Serializing.cpp
@@ -1,3 +1,3 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "serializing/ObjectFactory.h"
+#include "serializing/Basic/ObjectFactory.h"
diff --git a/AE/engine/src/serializing/BitPacking/BitDeserializer.h b/AE/engine/src/serializing/BitPacking/BitDeserializer.h
new file mode 100644
index 00000000..e428f587
--- /dev/null
+++ b/AE/engine/src/serializing/BitPacking/BitDeserializer.h
@@ -0,0 +1,41 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "serializing/BitPacking/BitSerializer.h"
+
+namespace AE::Serializing
+{
+
+    //
+    // Bit Deserializer
+    //
+
+    struct BitDeserializer final : Noncopyable
+    {
+    // types
+    public:
+
+    // variables
+    public:
+        FastRStream             stream;
+        Ptr<ObjectFactory>      factory;
+        RC<IAllocator>          allocator;
+
+
+    // methods
+    public:
+        explicit BitDeserializer (FastRStream rstream, RC<IAllocator> alloc = Default) __NE___ : stream{ RVRef(rstream) }, allocator{ RVRef(alloc) } {}
+        explicit BitDeserializer (RC<RStream> rstream, RC<IAllocator> alloc = Default) __NE___ : stream{ RVRef(rstream) }, allocator{ RVRef(alloc) } {}
+
+            template <typename ...Args>
+        ND_ bool  operator () (INOUT Args& ...args) __NE___;
+        ND_ bool  operator () (INOUT void *)        __NE___;
+
+        ND_ bool  IsEnd ()                          C_NE___ { return stream.Empty(); }
+
+    private:
+    };
+
+
+} // AE::Serializing
diff --git a/AE/engine/src/serializing/BitPacking/BitSerializer.h b/AE/engine/src/serializing/BitPacking/BitSerializer.h
new file mode 100644
index 00000000..67ea2dba
--- /dev/null
+++ b/AE/engine/src/serializing/BitPacking/BitSerializer.h
@@ -0,0 +1,43 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "serializing/Common.h"
+#include "serializing/BitPacking/PackedBits.h"
+
+namespace AE::Serializing
+{
+
+    //
+    // Bit Serializer
+    //
+
+    struct BitSerializer : Noncopyable
+    {
+        friend class ObjectFactory;
+
+    // types
+    public:
+        static constexpr uint   MaxStringLength = 0xFFFF;
+        static constexpr uint   MaxArrayLength  = 0xFFFFFF; // TODO: remove or limit mem size
+
+
+    // variables
+    public:
+        FastWStream         stream;
+        Ptr<ObjectFactory>  factory;
+
+
+    // methods
+    public:
+        explicit BitSerializer (FastWStream wstream) __NE___ : stream{ RVRef(wstream) } {}
+        explicit BitSerializer (RC<WStream> wstream) __NE___ : stream{ RVRef(wstream) } {}
+
+        template <typename ...Args>
+        ND_ bool  operator () (const Args& ...args) __NE___;
+
+    private:
+    };
+
+
+} // AE::Serializing
diff --git a/AE/engine/src/serializing/BitPacking/PackedBits.h b/AE/engine/src/serializing/BitPacking/PackedBits.h
new file mode 100644
index 00000000..ad7222d7
--- /dev/null
+++ b/AE/engine/src/serializing/BitPacking/PackedBits.h
@@ -0,0 +1,24 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "base/Common.h"
+
+namespace AE::Base
+{
+
+    //
+    // Packed Bits
+    //
+
+    template <uint Bits, typename T>
+    struct PackedBits
+    {
+        T   value;
+
+        ND_ T*          operator -> ()      __NE___ { return &value; }
+        ND_ T const*    operator -> ()      C_NE___ { return &value; }
+    };
+
+
+} // AE::Base
diff --git a/AE/engine/src/serializing/Common.h b/AE/engine/src/serializing/Common.h
index 44250453..86d2d378 100644
--- a/AE/engine/src/serializing/Common.h
+++ b/AE/engine/src/serializing/Common.h
@@ -14,10 +14,17 @@ namespace AE::Serializing
 
     using SerializedID = NamedID< 32, 0x400, AE_OPTIMIZE_IDS, UMax >;
 
+    // Basic
     struct Serializer;
     struct Deserializer;
     class ObjectFactory;
 
+
+    // BitPacking
+    struct BitSerializer;
+    struct BitDeserializer;
+
+
     // IsTriviallySerializable<> defined in 'base/CompileTime/TypeTraits.h'
 
 } // AE::Serializing
diff --git a/AE/engine/src/threading/Common.h b/AE/engine/src/threading/Common.h
index b0304c7c..98907cf1 100644
--- a/AE/engine/src/threading/Common.h
+++ b/AE/engine/src/threading/Common.h
@@ -6,6 +6,9 @@
         Lf      - lock-free / wait-free
         Ts      - thread-safe (with locks)
         Async   - thread-safe (with task system)
+
+    'Must be externally synchronized' - means that mutex must be used
+        with at least 'Acquire' memory barrier when locked and 'Release' memory barrier when unlocked.
 */
 
 #pragma once
@@ -18,6 +21,9 @@
 #   define AE_ENABLE_DATA_RACE_CHECK    0
 #endif
 
+// TODO: ThreadWakeup is slow
+#define AE_USE_THREAD_WAKEUP    0
+
 
 namespace AE::Threading
 {
diff --git a/AE/engine/src/threading/Containers/LfChunkList.h b/AE/engine/src/threading/Containers/LfChunkList.h
new file mode 100644
index 00000000..e4d38049
--- /dev/null
+++ b/AE/engine/src/threading/Containers/LfChunkList.h
@@ -0,0 +1,303 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifndef AE_LFAS_ENABLED
+# include "threading/Primitives/SpinLock.h"
+# include "threading/Primitives/DataRaceCheck.h"
+#endif
+
+namespace AE::Threading
+{
+
+    template <typename T,
+              usize ChunkCapacity_v
+             >
+    class LfChunkList final : public Noncopyable
+    {
+    // types
+    public:
+        using Self          = LfChunkList< T, ChunkCapacity_v >;
+        using Value_t       = T;
+
+    private:
+        using Count_t       = ByteSizeToUInt< sizeof(void*)/2 >;
+        using BaseList_t    = ChunkList< Conditional< IsAtomic<T>, AtomicInternalType<T>, T >>;
+        using BaseChunk_t   = typename BaseList_t::Chunk;
+        using CopyPolicy_t  = CopyPolicy::AutoDetect<T>;
+
+        static constexpr usize  _Align          = Max( AE_CACHE_LINE, alignof(T) );
+        static constexpr usize  _HeaderSize     = AlignUp( sizeof(void*)*2, alignof(T) );
+        static constexpr usize  _ChunkCapacity  = ChunkCapacity_v;
+        static constexpr usize  _ChunkSize      = _HeaderSize + sizeof(T) * _ChunkCapacity;
+        static constexpr uint   _MaxAttempts    = 4;
+
+
+        struct alignas(_Align) Chunk final : public Noncopyable
+        {
+        // variables
+            Atomic< Chunk *>    next        {null};
+            Atomic< Count_t >   count       {0};                // TODO: can be > capacity
+            const Count_t       capacity    = _ChunkCapacity;   // only for compatibility with 'ChunkList', use '_ChunkCapacity' instead
+            union {
+                T               _data  [1];                     // needed to put elements with correct alignment
+                char            _data2 [1];
+            };
+
+        // methods
+            Chunk ()                            __NE___ {}
+            ~Chunk ()                           __NE___ { CopyPolicy_t::Destroy( _data, Min( count.load(), _ChunkCapacity )); }
+
+            ND_ bool    IsEmpty ()              C_NE___ { return count.load() == 0; }
+            ND_ bool    IsFull ()               C_NE___ { return count.load() >= _ChunkCapacity; }
+
+            ND_ T*      Data ()                 __NE___ { return _data; }
+            ND_ T&      operator [] (usize i)   __NE___ { ASSERT( i < count.load() );  return _data[i]; }
+        };
+
+
+        StaticAssert( sizeof(Chunk) == sizeof(BaseChunk_t) );   // incorrect because of align
+        StaticAssert( alignof(Chunk) == alignof(BaseChunk_t) );
+        StaticAssert( offsetof( Chunk, count ) == offsetof( BaseChunk_t, count ));
+        StaticAssert( offsetof( Chunk, capacity ) == offsetof( BaseChunk_t, capacity ));
+        StaticAssert64( (_ChunkSize % alignof(Chunk)) < sizeof(T) );
+
+
+    // variables
+    private:
+        Atomic< Chunk *>    _last   {null};
+        Chunk *             _first  {null};
+
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
+
+
+    // methods
+    public:
+        LfChunkList ()                                          __NE___ {}
+        ~LfChunkList ()                                         __NE___;
+
+        ND_ BaseList_t  Release ()                              __NE___;
+
+        template <typename Allocator>
+        ND_ bool  Init (Allocator &alloc)                       __NE___;
+
+        template <typename Allocator,
+                  typename ...Args>
+        ND_ bool  Emplace (Allocator &alloc, Args&& ...args)    __NE___;
+
+        template <typename Allocator>
+            void  Destroy (Allocator &alloc)                    __NE___;
+
+        ND_ static constexpr Bytes  ChunkSize ()                __NE___ { return Bytes{_ChunkSize}; }
+
+    private:
+            void  _UpdateLast ()                                __NE___;
+    };
+
+
+
+/*
+=================================================
+    Release
+----
+    Must be externally synchronized.
+=================================================
+*/
+    template <typename T, usize S>
+    typename LfChunkList<T,S>::BaseList_t  LfChunkList<T,S>::Release () __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        BaseList_t  result { Cast<BaseChunk_t>( _first )};
+
+        _first = null;
+        _last.store( null );
+
+        return result;
+    }
+
+/*
+=================================================
+    Init
+----
+    Must be externally synchronized.
+=================================================
+*/
+    template <typename T, usize S>
+    template <typename Allocator>
+    bool  LfChunkList<T,S>::Init (Allocator &alloc) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        ASSERT( _last.load() == null );
+        ASSERT( _first == null );
+
+        Chunk*  new_chunk = Cast<Chunk>( alloc.Allocate( SizeAndAlign{ ChunkSize(), AlignOf<Chunk> }));
+        if_likely( new_chunk != null )
+        {
+            PlacementNew<Chunk>( OUT new_chunk );
+
+            _first  = new_chunk;
+            _last.store( new_chunk );
+
+            return true;
+        }
+        return false;
+    }
+
+/*
+=================================================
+    Emplace
+----
+    Returns 'true' if new element is successfully added to chunk.
+    Returns 'false' if not enough space in last chunk and failed to allocate a new chunk.
+=================================================
+*/
+    template <typename T, usize S>
+    template <typename Allocator, typename ...Args>
+    bool  LfChunkList<T,S>::Emplace (Allocator &alloc, Args&& ...args) __NE___
+    {
+        StaticAssert( IsThreadSafeAllocator< Allocator >);
+
+        DRC_SHAREDLOCK( _drCheck );
+
+        Chunk*  chunk = _last.load();
+
+        for (uint attempt = 0; attempt < _MaxAttempts; ++attempt)
+        {
+            ASSERT( chunk != null );
+
+            if_likely( Count_t idx = chunk->count.fetch_add( 1 );  idx < _ChunkCapacity )   // TODO: CAS ?
+            {
+                if constexpr( IsAtomic<T> )
+                {
+                    // We don't need acquire/release for atomic operations.
+                    // In 'Release()' we need to add memory barrier anyway.
+                    chunk->Data()[idx].store( FwdArg<Args>(args)... );
+                }
+                else
+                {
+                    // load previous content
+                    //MemoryBarrier( EMemoryOrder::Acquire );  // skip because previous content will be discarded
+
+                    PlacementNew<T>( OUT chunk->Data() + idx, FwdArg<Args>(args)... );
+
+                    // make changes visible for all threads
+                    MemoryBarrier( EMemoryOrder::Release );
+                }
+                return true;
+            }
+
+            // another thread may already add the next chunk
+            if_unlikely( Chunk* next = chunk->next.load(); next != null )
+            {
+                chunk = next;
+                _UpdateLast();
+                continue;   // try again
+            }
+
+            // allocate memory for chunk
+            Chunk*  new_chunk = Cast<Chunk>( alloc.Allocate( SizeAndAlign{ ChunkSize(), AlignOf<Chunk> }));
+            if_unlikely( new_chunk == null )
+                continue;   // try again
+
+            // create chunk and flush cache before adding chunk to list
+            PlacementNew<Chunk>( OUT new_chunk );
+            MemoryBarrier( EMemoryOrder::Release );
+
+            // add new chunk to list
+            {
+                Chunk*  next = null;
+                Chunk*  curr = chunk;
+
+                for (uint i = 0; i < ThreadUtils::SpinBeforeLock(); ++i)
+                {
+                    if_likely( curr->next.CAS( INOUT next, new_chunk ))
+                        break;
+
+                    // 'CAS' can return false even if 'next' is null
+                    if_likely( next != null )
+                    {
+                        // we need to attach 'new_chunk' to any subsequent chunk to avoid mem leak
+                        curr = next;
+                        next = null;
+                    }
+
+                    ThreadUtils::Pause();
+                }
+            }
+
+            // 'chunk->next' may not equal to 'new_chunk'
+            chunk = chunk->next.load();
+            _UpdateLast();
+        }
+        return false;
+    }
+
+/*
+=================================================
+    _UpdateLast
+=================================================
+*/
+    template <typename T, usize S>
+    forceinline void  LfChunkList<T,S>::_UpdateLast () __NE___
+    {
+        Chunk*  curr = _last.load();
+        ASSERT( curr != null );
+
+        Chunk*  chunk = curr;
+
+        // move to last with available space
+        for (Chunk* next = chunk->next.load();
+             (next != null) & (chunk->count.load() >= _ChunkCapacity);)
+        {
+            chunk   = next;
+            next    = chunk->next.load();
+        }
+
+        Unused( _last.CAS_Loop( INOUT curr, chunk ));
+    }
+
+/*
+=================================================
+    Destroy
+----
+    Must be externally synchronized.
+=================================================
+*/
+    template <typename T, usize S>
+    template <typename Allocator>
+    void  LfChunkList<T,S>::Destroy (Allocator &alloc) __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+
+        for (Chunk* chunk = _first; chunk != null;)
+        {
+            Chunk*  ptr     = chunk;
+                    chunk   = chunk->next.load();
+
+            ptr->~Chunk();
+            alloc.Deallocate( ptr, SizeAndAlign{ ChunkSize(), AlignOf<Chunk> });
+        }
+
+        _first  = null;
+        _last.store( null );
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    template <typename T, usize S>
+    LfChunkList<T,S>::~LfChunkList () __NE___
+    {
+        // use 'Release()' or 'Destroy()' to avoid mem leak
+
+        DRC_EXLOCK( _drCheck );
+        ASSERT( _last.load() == null );
+        ASSERT( _first == null );
+    }
+
+
+} // AE::Threading
diff --git a/AE/engine/src/threading/Containers/LfIndexedPool.h b/AE/engine/src/threading/Containers/LfIndexedPool.h
new file mode 100644
index 00000000..f580982e
--- /dev/null
+++ b/AE/engine/src/threading/Containers/LfIndexedPool.h
@@ -0,0 +1,151 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    This lock-free container has some limitations:
+     - write access by the same index must be externally synchronized.
+     - read access is safe after flush & invalidation (synchronization).
+     - Release() must be externally synchronized with all other read and write accesses.
+     - Unassign() / UnassignAll() must be externally synchronized with all other read and write accesses to the same 'index'.
+
+    Warning:
+     - This container does not flush/invalidate cache, all atomic operations has relaxed memory order.
+     - This lock-free container designed for large number of elements.
+
+    Pool allocates memory by blocks with 'ChunkSize' elements.
+
+    Elements lifetime:
+     - Elements are created when memory block is allocated.
+     - Assign() doesn't create element, just return index in the pool.
+     - Unassign() doesn't destroy element.
+     - Elements are destroyed only in Release() or in pool destructor.
+     - User can recreate any element using 'Reconstruct()' function.
+
+    Type 'AllocatorType' :
+        UntypedAllocator    - static allocator
+        AllocatorRef        - as adaptor for RC<IAllocatorTS>
+*/
+
+#pragma once
+
+#ifndef AE_LFAS_ENABLED
+# include "threading/Primitives/SpinLock.h"
+# include "threading/Primitives/DataRaceCheck.h"
+#endif
+
+namespace AE::Threading
+{
+
+    //
+    // Lock-Free Indexed Pool v3
+    //
+
+    template <typename ValueType,
+              typename IndexType,
+              usize ChunkSize_v,
+              usize MaxChunks_v,
+              typename AllocatorType = UntypedAllocator
+             >
+    class LfIndexedPool final : public Noncopyable
+    {
+        StaticAssert( ChunkSize_v > 0 );
+        StaticAssert( ChunkSize_v <= 64*64 );
+        StaticAssert( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
+        StaticAssert( IsPowerOfTwo( ChunkSize_v )); // must be power of 2 to increase performance
+        StaticAssert( IsPowerOfTwo( MaxChunks_v )); // must be power of 2 to increase performance
+        StaticAssert( MaxChunks_v > 0 );
+        StaticAssert( MaxValue<IndexType>() >= (ChunkSize_v * MaxChunks_v) );
+
+    // types
+    public:
+        using Self              = LfIndexedPool< ValueType, IndexType, ChunkSize_v, MaxChunks_v, AllocatorType >;
+        using Index_t           = IndexType;
+        using Value_t           = ValueType;
+        using Allocator_t       = AllocatorType;
+
+    private:
+        static constexpr usize  ChunkSize       = ChunkSize_v;
+        static constexpr usize  MaxChunks       = MaxChunks_v;
+        static constexpr usize  LowLvlCount     = ChunkSize <= 32*32 ? 32 : 64;
+        static constexpr usize  HighLvlCount    = ChunkSize / LowLvlCount;
+        StaticAssert( LowLvlCount * HighLvlCount == ChunkSize );
+
+        using LowLvlBits_t  = Conditional< (LowLvlCount  < 64), uint, ulong >;
+        using HighLvlBits_t = Conditional< (HighLvlCount < 64), uint, ulong >;
+
+        struct alignas(AE_CACHE_LINE) LowLevelChunk
+        {
+            Atomic< LowLvlBits_t >                  assigned    {0};    // 1 - assigned, 0 - unassigned
+            StaticArray< Value_t, LowLvlCount >     values      {};
+
+            LowLevelChunk ()    __NE___ {}
+        };
+
+        using LowLvlChunkArray_t    = StaticArray< LowLevelChunk, HighLvlCount >;
+        using LowLvlChunkArrayPtr_t = Atomic< LowLvlChunkArray_t *>;
+
+        static constexpr HighLvlBits_t  MaxHighLevel        = ToBitMask<HighLvlBits_t>( HighLvlCount );
+        static constexpr HighLvlBits_t  InitialHighLevel    = ~MaxHighLevel;
+
+        struct alignas(AE_CACHE_LINE) HighLevelChunk
+        {
+            Atomic< HighLvlBits_t >     available       {InitialHighLevel};     // 1 - chunk is full, 0 - chunk has some empty elements
+            SpinLockRelaxed             availableGuard;                         // only for 'available' modification
+            LowLvlChunkArrayPtr_t       chunksPtr       {null};
+
+            HighLevelChunk ()   __NE___ {}
+        };
+        using HighLvlArray_t    = StaticArray< HighLevelChunk, MaxChunks >;
+
+
+    // variables
+    private:
+        HighLvlArray_t *    _highLvl        = null;
+        Atomic<uint>        _highChunkCount {0};
+
+        Mutex               _allocGuard;
+
+        NO_UNIQUE_ADDRESS
+         Allocator_t        _allocator;
+
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
+
+
+    // methods
+    public:
+        explicit LfIndexedPool (const Allocator_t &alloc = Allocator_t{}) __NE___;
+        ~LfIndexedPool ()                                       __NE___ { Release( True{"check for assigned"} ); }
+
+            void            Release (Bool checkForAssigned)     __NE___;
+
+            template <typename FN>
+            void            UnassignAll (FN &&visitor)          __NE___;
+
+            template <typename FN>
+            void            ForEachAssigned (FN &&fn)           C_NE___;
+
+        ND_ auto            Assign ()                           __NE___ { Index_t idx;  Unused( Assign( OUT idx ));  return idx; }
+        ND_ bool            Assign (OUT Index_t &outIndex)      __NE___;
+            bool            Unassign (Index_t index)            __NE___;
+        ND_ bool            IsAssigned (Index_t index)          __NE___;
+
+        ND_ Index_t         IndexOf (const void* ptr)           C_NE___;
+            bool            Unassign (const void* ptr)          __NE___;
+
+        ND_ Value_t&        operator [] (Index_t index)         __NE___;
+        ND_ Value_t const&  operator [] (Index_t index)         C_NE___ { return const_cast<Self *>(this)->operator[]( index ); }
+
+        ND_ Value_t *       At (Index_t index)                  __NE___;
+        ND_ Value_t const*  At (Index_t index)                  C_NE___ { return const_cast<Self *>(this)->At( index ); }
+
+
+        ND_ static constexpr Bytes  MaxDynamicSize ()           __NE___ { return SizeOf<HighLvlArray_t> * SizeOf<LowLvlChunkArray_t> * MaxChunks; }
+        ND_ static constexpr usize  capacity ()                 __NE___ { return ChunkSize * MaxChunks; }
+
+        ND_ Bytes           DynamicSize ()                      C_NE___;
+
+    private:
+        ND_ static bool  _AssignInChunk (HighLevelChunk& highChunk, OUT Index_t &outIndex) __NE___;
+    };
+
+} // AE::Threading
+
+#include "threading/Containers/LfIndexedPool.inl.h"
diff --git a/AE/engine/src/threading/Containers/LfIndexedPool3.inl.h b/AE/engine/src/threading/Containers/LfIndexedPool.inl.h
similarity index 80%
rename from AE/engine/src/threading/Containers/LfIndexedPool3.inl.h
rename to AE/engine/src/threading/Containers/LfIndexedPool.inl.h
index 41a101d4..73edcc49 100644
--- a/AE/engine/src/threading/Containers/LfIndexedPool3.inl.h
+++ b/AE/engine/src/threading/Containers/LfIndexedPool.inl.h
@@ -8,7 +8,7 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    LfIndexedPool3<V,I,CS,MC,A>::LfIndexedPool3 (const Allocator_t &alloc) __NE___ :
+    LfIndexedPool<V,I,CS,MC,A>::LfIndexedPool (const Allocator_t &alloc) __NE___ :
         _allocator{ alloc }
     {
         EXLOCK( _allocGuard );
@@ -18,7 +18,9 @@ namespace AE::Threading
 
         if ( _highLvl != null )
             PlacementNew< HighLvlArray_t >( OUT _highLvl );
-    }   
+
+        // flush cache when unlock mutex
+    }
 
 /*
 =================================================
@@ -28,8 +30,10 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    void  LfIndexedPool3<V,I,CS,MC,A>::Release (Bool checkForAssigned) __NE___
+    void  LfIndexedPool<V,I,CS,MC,A>::Release (Bool checkForAssigned) __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _highLvl == null )
             return;
 
@@ -73,18 +77,19 @@ namespace AE::Threading
     UnassignAll
 ----
     Must be externally synchronized.
+    User must invalidate cache before accessing the elements.
     Visit each assigned element and then unassign.
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
     template <typename FN>
-    void  LfIndexedPool3<V,I,CS,MC,A>::UnassignAll (FN &&visitor) noexcept(IsNothrowInvocable<FN>)
+    void  LfIndexedPool<V,I,CS,MC,A>::UnassignAll (FN &&visitor) __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _highLvl == null )
             return;
 
-        MemoryBarrier( EMemoryOrder::Acquire );
-
         for (auto& hi_chunk : *_highLvl)
         {
             LowLvlChunkArray_t* low_chunks = hi_chunk.chunksPtr.load();
@@ -101,6 +106,7 @@ namespace AE::Threading
                 {
                     LowLvlBits_t    bit = LowLvlBits_t{1} << idx;
 
+                    CheckNothrow( IsNoExcept( visitor( low_chunk.values[idx] )));
                     visitor( INOUT low_chunk.values[idx] );
 
                     low_bits &= ~bit;                       // 1 -> 0
@@ -116,18 +122,19 @@ namespace AE::Threading
 =================================================
     ForEachAssigned
 ----
-    Must be externally synchronized
+    Must be externally synchronized.
+    User must invalidate cache before accessing the elements.
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
     template <typename FN>
-    void  LfIndexedPool3<V,I,CS,MC,A>::ForEachAssigned (FN &&fn) const noexcept(IsNothrowInvocable<FN>)
+    void  LfIndexedPool<V,I,CS,MC,A>::ForEachAssigned (FN &&fn) C_NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _highLvl == null )
             return;
 
-        MemoryBarrier( EMemoryOrder::Acquire );
-
         for (auto& hi_chunk : *_highLvl)
         {
             LowLvlChunkArray_t* low_chunks = hi_chunk.chunksPtr.load();
@@ -144,6 +151,7 @@ namespace AE::Threading
                 {
                     LowLvlBits_t    bit = LowLvlBits_t{1} << idx;
 
+                    CheckNothrow( IsNoExcept( fn( low_chunk.values[idx] )));
                     fn( low_chunk.values[idx] );
 
                     low_bits &= ~bit;                       // 1 -> 0
@@ -159,8 +167,10 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    bool  LfIndexedPool3<V,I,CS,MC,A>::Assign (OUT Index_t &outIndex) __NE___
+    bool  LfIndexedPool<V,I,CS,MC,A>::Assign (OUT Index_t &outIndex) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         outIndex = UMax;
 
         if_unlikely( _highLvl == null )
@@ -224,12 +234,14 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    bool  LfIndexedPool3<V,I,CS,MC,A>::_AssignInChunk (HighLevelChunk& highChunk, OUT Index_t &outIndex) __NE___
+    bool  LfIndexedPool<V,I,CS,MC,A>::_AssignInChunk (HighLevelChunk& highChunk, OUT Index_t &outIndex) __NE___
     {
         LowLvlChunkArray_t* low_chunks      = highChunk.chunksPtr.load();
         HighLvlBits_t       hi_available    = ~highChunk.available.load();      // 1 - unassigned
         int                 chunk_idx       = BitScanForward( hi_available );   // first 1 bit
 
+        // TODO: offset 'chunk_idx' by thread id
+
         ASSERT( low_chunks != null );
 
         for (; chunk_idx >= 0;)
@@ -278,8 +290,10 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    bool  LfIndexedPool3<V,I,CS,MC,A>::Unassign (Index_t index) __NE___
+    bool  LfIndexedPool<V,I,CS,MC,A>::Unassign (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         if_unlikely( _highLvl == null or index >= capacity() )
             return false;
 
@@ -318,8 +332,10 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    bool  LfIndexedPool3<V,I,CS,MC,A>::IsAssigned (Index_t index) __NE___
+    bool  LfIndexedPool<V,I,CS,MC,A>::IsAssigned (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         if_unlikely( _highLvl == null or index >= capacity() )
             return false;
 
@@ -348,9 +364,11 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    typename LfIndexedPool3<V,I,CS,MC,A>::Value_t&
-        LfIndexedPool3<V,I,CS,MC,A>::operator [] (Index_t index) __NE___
+    typename LfIndexedPool<V,I,CS,MC,A>::Value_t&
+        LfIndexedPool<V,I,CS,MC,A>::operator [] (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( index < capacity() );
         ASSERT( _highLvl != null );
 
@@ -375,9 +393,11 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    typename LfIndexedPool3<V,I,CS,MC,A>::Value_t*
-        LfIndexedPool3<V,I,CS,MC,A>::At (Index_t index) __NE___
+    typename LfIndexedPool<V,I,CS,MC,A>::Value_t*
+        LfIndexedPool<V,I,CS,MC,A>::At (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         if_likely( (index < capacity()) & (_highLvl != null) )
         {
             HighLevelChunk&     high_chunk  = (*_highLvl)[ index / ChunkSize ];
@@ -404,7 +424,7 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize CS, usize MC, typename A>
-    Bytes  LfIndexedPool3<V,I,CS,MC,A>::DynamicSize () C_NE___
+    Bytes  LfIndexedPool<V,I,CS,MC,A>::DynamicSize () C_NE___
     {
         Bytes   result;
         if ( _highLvl != null )
@@ -415,4 +435,53 @@ namespace AE::Threading
         return result;
     }
 
+/*
+=================================================
+    IndexOf
+=================================================
+*/
+    template <typename V, typename I, usize CS, usize MC, typename A>
+    typename LfIndexedPool<V,I,CS,MC,A>::Index_t  LfIndexedPool<V,I,CS,MC,A>::IndexOf (const void* ptr) C_NE___
+    {
+        DRC_SHAREDLOCK( _drCheck );
+
+        if_unlikely( _highLvl == null )
+            return UMax;
+
+        const uint  count = _highChunkCount.load();
+
+        for (uint i = 0; i < count; ++i)
+        {
+            LowLvlChunkArray_t*     chunk_arr = (*_highLvl)[i].chunksPtr.load();
+
+            if_unlikely( chunk_arr != null and
+                         IsIntersects<const void*>( ptr, ptr, chunk_arr, chunk_arr+1 ))
+            {
+                usize   a           = (usize(ptr) - usize(chunk_arr->data())) / sizeof(LowLevelChunk);
+                auto&   ll_chunk    = (*chunk_arr)[a];
+                usize   b           = (usize(ptr) - usize(ll_chunk.values.data())) / sizeof(Value_t);
+
+                return CheckCast<Index_t>( b + (a * LowLvlCount) + (i * ChunkSize) );
+            }
+        }
+
+        // out of bounds
+        return UMax;
+    }
+
+/*
+=================================================
+    Unassign
+=================================================
+*/
+    template <typename V, typename I, usize CS, usize MC, typename A>
+    bool  LfIndexedPool<V,I,CS,MC,A>::Unassign (const void* ptr) __NE___
+    {
+        if_likely( Index_t  idx = IndexOf( ptr );  idx != UMax )
+            return Unassign( idx );
+
+        return false;
+    }
+
+
 } // AE::Threading
diff --git a/AE/engine/src/threading/Containers/LfIndexedPool3.h b/AE/engine/src/threading/Containers/LfIndexedPool3.h
deleted file mode 100644
index 80982560..00000000
--- a/AE/engine/src/threading/Containers/LfIndexedPool3.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#ifndef AE_LFAS_ENABLED
-# include "threading/Primitives/SpinLock.h"
-#endif
-
-namespace AE::Threading
-{
-
-    //
-    // Lock-Free Indexed Pool v3
-    //
-
-    template <typename ValueType,
-              typename IndexType,
-              usize ChunkSize_v = 32*32,
-              usize MaxChunks_v = 8,
-              typename AllocatorType = UntypedAllocator
-             >
-    class LfIndexedPool3 final : public Noncopyable
-    {
-        STATIC_ASSERT( ChunkSize_v > 0 );
-        STATIC_ASSERT( ChunkSize_v <= 64*64 );
-        STATIC_ASSERT( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
-        STATIC_ASSERT( IsPowerOfTwo( ChunkSize_v ));    // must be power of 2 to increase performance
-        STATIC_ASSERT( IsPowerOfTwo( MaxChunks_v ));    // must be power of 2 to increase performance
-        STATIC_ASSERT( MaxChunks_v > 0 );
-        STATIC_ASSERT( MaxValue<IndexType>() >= (ChunkSize_v * MaxChunks_v) );
-        STATIC_ASSERT( AllocatorType::IsThreadSafe );
-
-    // types
-    public:
-        using Self              = LfIndexedPool3< ValueType, IndexType, ChunkSize_v, MaxChunks_v, AllocatorType >;
-        using Index_t           = IndexType;
-        using Value_t           = ValueType;
-        using Allocator_t       = AllocatorType;
-
-    private:
-        static constexpr usize  ChunkSize       = ChunkSize_v;
-        static constexpr usize  MaxChunks       = MaxChunks_v;
-        static constexpr usize  LowLvlCount     = ChunkSize <= 32*32 ? 32 : 64;
-        static constexpr usize  HighLvlCount    = ChunkSize / LowLvlCount;
-        STATIC_ASSERT( LowLvlCount * HighLvlCount == ChunkSize );
-
-        using LowLvlBits_t  = Conditional< LowLvlCount < 64, uint, ulong >;
-        using HighLvlBits_t = Conditional< HighLvlCount < 64, uint, ulong >;
-
-        struct alignas(AE_CACHE_LINE) LowLevelChunk
-        {
-            Atomic< LowLvlBits_t >                  assigned    {0};    // 1 - assigned, 0 - unassigned
-            StaticArray< Value_t, LowLvlCount >     values      {};
-        };
-
-        using LowLvlChunkArray_t    = StaticArray< LowLevelChunk, HighLvlCount >;
-        using LowLvlChunkArrayPtr_t = Atomic< LowLvlChunkArray_t *>;
-
-        static constexpr HighLvlBits_t  MaxHighLevel        = ToBitMask<HighLvlBits_t>( HighLvlCount );
-        static constexpr HighLvlBits_t  InitialHighLevel    = ~MaxHighLevel;
-
-        struct alignas(AE_CACHE_LINE) HighLevelChunk
-        {
-            Atomic< HighLvlBits_t >     available       {InitialHighLevel};     // 1 - chunk is full, 0 - chunk has some empty elements
-            SpinLockRelaxed             availableGuard;                         // only for 'available' modification
-            LowLvlChunkArrayPtr_t       chunksPtr       {null};
-        };
-        using HighLvlArray_t    = StaticArray< HighLevelChunk, MaxChunks >;
-
-
-    // variables
-    private:
-        HighLvlArray_t *    _highLvl        = null;
-        Atomic<uint>        _highChunkCount {0};
-
-        Mutex               _allocGuard;
-
-        NO_UNIQUE_ADDRESS
-         Allocator_t        _allocator;
-
-
-    // methods
-    public:
-        explicit LfIndexedPool3 (const Allocator_t &alloc = Allocator_t{}) __NE___;
-        ~LfIndexedPool3 ()                                  __NE___ { Release( True{"check for assigned"} ); }
-
-
-        void  Release (Bool checkForAssigned)               __NE___;
-
-        template <typename FN>
-        void  UnassignAll (FN &&visitor)                    noexcept(IsNothrowInvocable<FN>);
-
-        template <typename FN>
-        void  ForEachAssigned (FN &&fn)                     const noexcept(IsNothrowInvocable<FN>);
-
-        ND_ auto  Assign ()                                 __NE___ { Index_t idx;  return Assign( OUT idx ) ? idx : UMax; }
-        ND_ bool  Assign (OUT Index_t &outIndex)            __NE___;
-            bool  Unassign (Index_t index)                  __NE___;
-        ND_ bool  IsAssigned (Index_t index)                __NE___;
-
-        ND_ Value_t&        operator [] (Index_t index)     __NE___;
-        ND_ Value_t const&  operator [] (Index_t index)     C_NE___ { return const_cast<Self *>(this)->operator[]( index ); }
-
-        ND_ Value_t *       At (Index_t index)              __NE___;
-        ND_ Value_t const*  At (Index_t index)              C_NE___ { return const_cast<Self *>(this)->At( index ); }
-
-
-        ND_ static constexpr Bytes  MaxDynamicSize ()       __NE___ { return SizeOf<HighLvlArray_t> * SizeOf<LowLvlChunkArray_t> * MaxChunks; }
-        ND_ static constexpr usize  capacity ()             __NE___ { return ChunkSize * MaxChunks; }
-
-        ND_ Bytes  DynamicSize ()                           C_NE___;
-
-    private:
-        ND_ static bool  _AssignInChunk (HighLevelChunk& highChunk, OUT Index_t &outIndex) __NE___;
-    };
-
-} // AE::Threading
-
-#include "threading/Containers/LfIndexedPool3.inl.h"
diff --git a/AE/engine/src/threading/Containers/LfStaticIndexedPool.h b/AE/engine/src/threading/Containers/LfStaticIndexedPool.h
index 4a4a915e..2688858f 100644
--- a/AE/engine/src/threading/Containers/LfStaticIndexedPool.h
+++ b/AE/engine/src/threading/Containers/LfStaticIndexedPool.h
@@ -1,13 +1,15 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    Warning:
-        This container does not flush/invalidate cache, all atomic operations has relaxed memory order.
+    Same as 'LfIndexedPool' but with single memory allocation.
+
+    Optimized for small number of elements with frequent access from multiple threads.
 */
 
 #pragma once
 
 #ifndef AE_LFAS_ENABLED
 # include "threading/Common.h"
+# include "threading/Primitives/DataRaceCheck.h"
 #endif
 
 namespace AE::Threading
@@ -24,9 +26,9 @@ namespace AE::Threading
              >
     class LfStaticIndexedPool final : public Noncopyable
     {
-        STATIC_ASSERT( Count > 0 and IsMultipleOf( Count, 32 ));
-        STATIC_ASSERT( MaxValue<IndexType>() >= Count );
-        STATIC_ASSERT( AllocatorType::IsThreadSafe );
+        StaticAssert( Count > 0 and IsMultipleOf( Count, 32 ));
+        StaticAssert( MaxValue<IndexType>() >= Count );
+        StaticAssert( AllocatorType::IsThreadSafe );
 
     // types
     public:
@@ -39,14 +41,16 @@ namespace AE::Threading
         static constexpr usize  ChunkSize   = Count < 32*12 ? 32 : 64;
         static constexpr usize  ChunksCount = Count / ChunkSize;
 
-        STATIC_ASSERT( IsMultipleOf( Count, ChunkSize ));
+        StaticAssert( IsMultipleOf( Count, ChunkSize ));
 
         using Bitfield_t    = Conditional< (ChunkSize <= 32), uint, ulong >;
 
         struct alignas(AE_CACHE_LINE) Chunk
         {
             Atomic< Bitfield_t >                assigned    {0};    // 1 - assigned, 0 - unassigned
-            StaticArray< Value_t, ChunkSize >   arr         {};
+            StaticArray< Value_t, ChunkSize >   values      {};
+
+            Chunk ()    __NE___ {}
         };
         using ChunkArray_t  = StaticArray< Chunk, ChunksCount >;
 
@@ -58,7 +62,7 @@ namespace AE::Threading
         static constexpr usize  ChunkIdxStep        =   ChunksCount < 4 ?   1 :
                                                         ChunksCount < 10 ?  3 :
                                                                             5;
-        STATIC_ASSERT( ThreadToChunkMask < ChunksCount );
+        StaticAssert( ThreadToChunkMask < ChunksCount );
 
 
     // variables
@@ -68,39 +72,45 @@ namespace AE::Threading
         NO_UNIQUE_ADDRESS
          Allocator_t        _allocator;
 
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
+
 
     // methods
     public:
         explicit LfStaticIndexedPool (const Allocator_t &alloc = Allocator_t{}) __NE___;
-        ~LfStaticIndexedPool ()                         __NE___ { Release( True{"check for assigned"} ); }
+        ~LfStaticIndexedPool ()                             __NE___ { Release( True{"check for assigned"} ); }
 
-            void  Release (Bool checkForAssigned)       __NE___;
+            void  Release (Bool checkForAssigned)           __NE___;
 
             template <typename FN>
-            void  UnassignAll (FN && fn)                noexcept(IsNothrowInvocable<FN>);
+            void  UnassignAll (FN &&fn)                     __NE___;
 
             template <typename FN>
-            void  ForEach (FN && fn)                    noexcept(IsNothrowInvocable<FN>);
+            void  ForEach (FN &&fn)                         __NE___;
 
             template <typename FN>
-            void  ForEachAssigned (FN && fn)            const noexcept(IsNothrowInvocable<FN>);
+            void  ForEachAssigned (FN &&fn)                 C_NE___;
+
+
+        ND_ auto            Assign ()                       __NE___ { Index_t idx;  Unused( Assign( OUT idx ));  return idx; }
+        ND_ bool            Assign (OUT Index_t &outIndex)  __NE___;
+            bool            Unassign (Index_t index)        __NE___;
+        ND_ bool            IsAssigned (Index_t index)      C_NE___;
 
-        ND_ auto  Assign ()                             __NE___ { Index_t idx;  return Assign( OUT idx ) ? idx : UMax; }
-        ND_ bool  Assign (OUT Index_t &outIndex)        __NE___;
-            void  Unassign (Index_t index)              __NE___;
-        ND_ bool  IsAssigned (Index_t index)            C_NE___;
+        ND_ Index_t         IndexOf (const void* ptr)       C_NE___;
+            bool            Unassign (const void* ptr)      __NE___;
 
-        ND_ Value_t&        operator [] (Index_t index) __NE___;
-        ND_ Value_t const&  operator [] (Index_t index) C_NE___ { return const_cast<Self*>(this)->operator[]( index ); }
+        ND_ Value_t&        operator [] (Index_t index)     __NE___;
+        ND_ Value_t const&  operator [] (Index_t index)     C_NE___ { return const_cast<Self*>(this)->operator[]( index ); }
 
-        ND_ Value_t*        At (Index_t index)          __NE___;
-        ND_ Value_t const*  At (Index_t index)          C_NE___ { return const_cast<Self*>(this)->At( index ); }
+        ND_ Value_t*        At (Index_t index)              __NE___;
+        ND_ Value_t const*  At (Index_t index)              C_NE___ { return const_cast<Self*>(this)->At( index ); }
 
-        ND_ usize           size ()                     C_NE___;
-        ND_ bool            empty ()                    C_NE___ { return size() == 0; }
+        ND_ usize           size ()                         C_NE___;
+        ND_ bool            empty ()                        C_NE___ { return size() == 0; }
 
-        ND_ static constexpr usize  capacity ()         __NE___ { return Count; }
-        ND_ static constexpr Bytes  DynamicSize ()      __NE___ { return SizeOf<ChunkArray_t>; }
+        ND_ static constexpr usize  capacity ()             __NE___ { return Count; }
+        ND_ static constexpr Bytes  DynamicSize ()          __NE___ { return SizeOf<ChunkArray_t>; }
     };
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/Containers/LfStaticIndexedPool.inl.h b/AE/engine/src/threading/Containers/LfStaticIndexedPool.inl.h
index 32311209..0114bf6d 100644
--- a/AE/engine/src/threading/Containers/LfStaticIndexedPool.inl.h
+++ b/AE/engine/src/threading/Containers/LfStaticIndexedPool.inl.h
@@ -11,6 +11,8 @@ namespace AE::Threading
     LfStaticIndexedPool<V,I,C,A>::LfStaticIndexedPool (const Allocator_t &alloc) __NE___ :
         _allocator{ alloc }
     {
+        DRC_EXLOCK( _drCheck );
+
         _arr = Cast<ChunkArray_t>( _allocator.Allocate( SizeAndAlignOf<ChunkArray_t> ));
         CHECK( _arr != null );
 
@@ -27,8 +29,10 @@ namespace AE::Threading
 */
     template <typename V, typename I, usize C, typename A>
     template <typename FN>
-    void  LfStaticIndexedPool<V,I,C,A>::ForEach (FN && fn) noexcept(IsNothrowInvocable<FN>)
+    void  LfStaticIndexedPool<V,I,C,A>::ForEach (FN &&fn) __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _arr == null )
             return;
 
@@ -38,7 +42,8 @@ namespace AE::Threading
 
             for (usize j = 0; j < ChunkSize; ++j)
             {
-                fn( INOUT chunk.arr[j], Index_t(i*ChunkSize + j) );
+                CheckNothrow( IsNoExcept( fn( chunk.values[j], Index_t(i*ChunkSize + j) )));
+                fn( INOUT chunk.values[j], Index_t(i*ChunkSize + j) );
             }
         }
     }
@@ -53,6 +58,8 @@ namespace AE::Threading
     template <typename V, typename I, usize C, typename A>
     void  LfStaticIndexedPool<V,I,C,A>::Release (Bool checkForAssigned) __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _arr == null )
             return;
 
@@ -80,8 +87,10 @@ namespace AE::Threading
 */
     template <typename V, typename I, usize C, typename A>
     template <typename FN>
-    void  LfStaticIndexedPool<V,I,C,A>::UnassignAll (FN && fn) noexcept(IsNothrowInvocable<FN>)
+    void  LfStaticIndexedPool<V,I,C,A>::UnassignAll (FN &&fn) __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _arr == null )
             return;
 
@@ -95,7 +104,8 @@ namespace AE::Threading
             {
                 Bitfield_t  mask = Bitfield_t{1} << idx;
 
-                fn( INOUT chunk.arr[idx] );
+                CheckNothrow( IsNoExcept( fn( chunk.values[idx] )));
+                fn( INOUT chunk.values[idx] );
 
                 bits &= ~mask;                  // 1 -> 0
                 idx  = BitScanForward( bits );  // first 1 bit
@@ -112,8 +122,10 @@ namespace AE::Threading
 */
     template <typename V, typename I, usize C, typename A>
     template <typename FN>
-    void  LfStaticIndexedPool<V,I,C,A>::ForEachAssigned (FN && fn) const noexcept(IsNothrowInvocable<FN>)
+    void  LfStaticIndexedPool<V,I,C,A>::ForEachAssigned (FN &&fn) C_NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _arr == null )
             return;
 
@@ -127,7 +139,8 @@ namespace AE::Threading
             {
                 Bitfield_t  mask = Bitfield_t{1} << idx;
 
-                fn( chunk.arr[idx] );
+                CheckNothrow( IsNoExcept( fn( chunk.values[idx] )));
+                fn( chunk.values[idx] );
 
                 bits &= ~mask;                  // 1 -> 0
                 idx  = BitScanForward( bits );  // first 1 bit
@@ -143,6 +156,8 @@ namespace AE::Threading
     template <typename V, typename I, usize C, typename A>
     bool  LfStaticIndexedPool<V,I,C,A>::Assign (OUT Index_t &outIndex) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         CHECK_ERR( _arr != null );
 
         const usize     initial_idx = ThreadUtils::GetIntID() & ThreadToChunkMask;
@@ -183,8 +198,10 @@ namespace AE::Threading
 =================================================
 */
     template <typename V, typename I, usize C, typename A>
-    void  LfStaticIndexedPool<V,I,C,A>::Unassign (Index_t index) __NE___
+    bool  LfStaticIndexedPool<V,I,C,A>::Unassign (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( _arr != null );
         ASSERT( index < capacity() );
 
@@ -194,6 +211,8 @@ namespace AE::Threading
         Bitfield_t  old_bits    = (*_arr)[ chunk_idx ].assigned.fetch_and( ~mask ); // 1 -> 0
         Unused( old_bits );
         ASSERT( old_bits & mask );  // prev bit must be 1
+
+        return !!(old_bits & mask);
     }
 
 /*
@@ -204,6 +223,8 @@ namespace AE::Threading
     template <typename V, typename I, usize C, typename A>
     bool  LfStaticIndexedPool<V,I,C,A>::IsAssigned (Index_t index) C_NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         if_likely( (_arr != null) & (index < capacity()) )
         {
             const uint  chunk_idx   = index / ChunkSize;
@@ -224,6 +245,8 @@ namespace AE::Threading
     typename LfStaticIndexedPool<V,I,C,A>::Value_t&
         LfStaticIndexedPool<V,I,C,A>::operator [] (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( _arr != null );
         ASSERT( index < capacity() );
         ASSERT( IsAssigned( index ));
@@ -232,7 +255,7 @@ namespace AE::Threading
         const uint      bit_idx     = index % ChunkSize;
         auto&           chunk       = (*_arr)[ chunk_idx ];
 
-        return chunk.arr[ bit_idx ];
+        return chunk.values[ bit_idx ];
     }
 
 /*
@@ -244,13 +267,15 @@ namespace AE::Threading
     typename LfStaticIndexedPool<V,I,C,A>::Value_t*
         LfStaticIndexedPool<V,I,C,A>::At (Index_t index) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         if_likely( _arr != null and index < capacity() )
         {
             const uint      chunk_idx   = index / ChunkSize;
             const uint      bit_idx     = index % ChunkSize;
             auto&           chunk       = (*_arr)[ chunk_idx ];
 
-            return &chunk.arr[ bit_idx ];
+            return &chunk.values[ bit_idx ];
         }
         return null;
     }
@@ -263,6 +288,8 @@ namespace AE::Threading
     template <typename V, typename I, usize C, typename A>
     usize  LfStaticIndexedPool<V,I,C,A>::size () C_NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         if_unlikely( _arr == null )
             return 0;
 
@@ -274,4 +301,45 @@ namespace AE::Threading
         return count;
     }
 
+/*
+=================================================
+    IndexOf
+=================================================
+*/
+    template <typename V, typename I, usize C, typename A>
+    typename LfStaticIndexedPool<V,I,C,A>::Index_t  LfStaticIndexedPool<V,I,C,A>::IndexOf (const void* ptr) C_NE___
+    {
+        DRC_SHAREDLOCK( _drCheck );
+
+        if_unlikely( not _arr )
+            return UMax;
+
+        if ( IsIntersects<const void*>( ptr, ptr, _arr->data(), _arr->data() + _arr->size() ))
+        {
+            usize   a           = (usize(ptr) - usize(_arr->data())) / sizeof(Chunk);
+            auto&   ll_chunk    = (*_arr)[a];
+            usize   b           = (usize(ptr) - usize(ll_chunk.values.data())) / sizeof(Value_t);
+
+            return CheckCast<Index_t>( b + (a * ChunkSize) );
+        }
+
+        // out of bounds
+        return UMax;
+    }
+
+/*
+=================================================
+    Unassign
+=================================================
+*/
+    template <typename V, typename I, usize C, typename A>
+    bool  LfStaticIndexedPool<V,I,C,A>::Unassign (const void* ptr) __NE___
+    {
+        if_likely( Index_t  idx = IndexOf( ptr );  idx != UMax )
+            return Unassign( idx );
+
+        return false;
+    }
+
+
 } // AE::Threading
diff --git a/AE/engine/src/threading/Containers/LfStaticPool.h b/AE/engine/src/threading/Containers/LfStaticPool.h
index 25e1b04e..3c1d97cf 100644
--- a/AE/engine/src/threading/Containers/LfStaticPool.h
+++ b/AE/engine/src/threading/Containers/LfStaticPool.h
@@ -9,6 +9,7 @@
 
 #ifndef AE_LFAS_ENABLED
 # include "threading/Common.h"
+# include "threading/Primitives/DataRaceCheck.h"
 #endif
 
 namespace AE::Threading
@@ -24,7 +25,7 @@ namespace AE::Threading
              >
     class LfStaticPool final : public Noncopyable
     {
-        STATIC_ASSERT( Count > 0 and IsMultipleOf( Count, 32 ));
+        StaticAssert( Count > 0 and IsMultipleOf( Count, 32 ));
 
     // types
     public:
@@ -37,7 +38,7 @@ namespace AE::Threading
         static constexpr usize  ChunkSize   = Count < 32*12 ? 32 : 64;
         static constexpr usize  ChunksCount = Count / ChunkSize;
 
-        STATIC_ASSERT( IsMultipleOf( Count, ChunkSize ));
+        StaticAssert( IsMultipleOf( Count, ChunkSize ));
 
         using Bitfield_t    = Conditional< (ChunkSize <= 32), uint, ulong >;
 
@@ -63,16 +64,18 @@ namespace AE::Threading
         static constexpr usize  ChunkIdxStep        =   ChunksCount < 4 ?   1 :
                                                         ChunksCount < 10 ?  3 :
                                                                             5;
-        STATIC_ASSERT( ThreadToChunkMask < ChunksCount );
+        StaticAssert( ThreadToChunkMask < ChunksCount );
 
 
     // variables
     private:
-        ChunkArray_t *      _arr    = null;
+        ChunkArray_t*       _arr        = null;
 
         NO_UNIQUE_ADDRESS
          Allocator_t        _allocator;
 
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
+
 
     // methods
     public:
@@ -82,15 +85,15 @@ namespace AE::Threading
         ND_ static constexpr usize  Capacity ()     __NE___ { return Count; }
         ND_ static constexpr Bytes  DynamicSize ()  __NE___ { return SizeOf<ChunkArray_t>; }
 
-        void  Release ()                            __NE___ { return Release( [](Value_t &value) { value.~Value_t(); }); }
+            void  Release ()                        __NE___ { return Release( [](Value_t &value) __NE___ { value.~Value_t(); }); }
 
-        template <typename FN>
-        void  Release (FN &&fn)                     noexcept(IsNothrowInvocable<FN>);
+            template <typename FN>
+            void  Release (FN &&fn)                 __NE___;
 
         template <typename T>
-        ND_ bool  Put (T && value)                  __NE___;
+        ND_ bool  Put (T &&value)                   __NE___;
 
-        bool  Extract (OUT Value_t &outValue)       __NE___;
+            bool  Extract (OUT Value_t &outValue)   __NE___;
     };
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/Containers/LfStaticPool.inl.h b/AE/engine/src/threading/Containers/LfStaticPool.inl.h
index ed33c0e0..47bef8fd 100644
--- a/AE/engine/src/threading/Containers/LfStaticPool.inl.h
+++ b/AE/engine/src/threading/Containers/LfStaticPool.inl.h
@@ -11,6 +11,8 @@ namespace AE::Threading
     LfStaticPool<V,C,A>::LfStaticPool (const Allocator_t &alloc) __NE___ :
         _allocator{ alloc }
     {
+        DRC_EXLOCK( _drCheck );
+
         _arr = Cast<ChunkArray_t>( _allocator.Allocate( SizeAndAlignOf<ChunkArray_t> ));
         CHECK( _arr != null );
 
@@ -30,8 +32,10 @@ namespace AE::Threading
 */
     template <typename V, usize C, typename A>
     template <typename FN>
-    void  LfStaticPool<V,C,A>::Release (FN &&fn) noexcept(IsNothrowInvocable<FN>)
+    void  LfStaticPool<V,C,A>::Release (FN &&fn) __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         if ( _arr == null )
             return;
 
@@ -53,6 +57,7 @@ namespace AE::Threading
             {
                 Bitfield_t  mask = Bitfield_t{1} << idx;
 
+                CheckNothrow( IsNoExcept( fn( chunk.values[idx] )));
                 fn( INOUT chunk.values[idx] );
 
                 available   &= ~mask;                       // 1 -> 0
@@ -73,8 +78,10 @@ namespace AE::Threading
 */
     template <typename V, usize C, typename A>
     template <typename T>
-    bool  LfStaticPool<V,C,A>::Put (T && value) __NE___
+    bool  LfStaticPool<V,C,A>::Put (T &&value) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         CHECK_ERR( _arr != null );
 
         const usize     initial_idx = ThreadUtils::GetIntID() & ThreadToChunkMask;
@@ -127,6 +134,8 @@ namespace AE::Threading
     template <typename V, usize C, typename A>
     bool  LfStaticPool<V,C,A>::Extract (OUT Value_t &outValue) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         CHECK_ERR( _arr != null );
 
         const usize     initial_idx = ThreadUtils::GetIntID() & ThreadToChunkMask;
diff --git a/AE/engine/src/threading/Containers/LfStaticQueue.h b/AE/engine/src/threading/Containers/LfStaticQueue.h
index f4ebb481..6a39ac55 100644
--- a/AE/engine/src/threading/Containers/LfStaticQueue.h
+++ b/AE/engine/src/threading/Containers/LfStaticQueue.h
@@ -1,9 +1,9 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
     Purpose:
-        * lock-free multiple producers
-        * non-lock-free for extracting multiple elements (single consumer)
-        * lock-free for extracting single element
+     * lock-free multiple producers
+     * non-lock-free for extracting multiple elements (single consumer)
+     * lock-free for extracting single element
 */
 
 #pragma once
@@ -31,7 +31,7 @@ namespace AE::Threading
         using Value_t       = Value;
 
     private:
-        static constexpr bool   _NonTrivialDtor = not (IsZeroMemAvailable<Value> or std::is_trivially_destructible_v<Value>);
+        static constexpr bool   _NonTrivialDtor = not (IsZeroMemAvailable<Value> or IsTriviallyDestructible<Value>);
         static constexpr uint   _MaxSize        = 1 << 12;
         static constexpr uint   _MaxSpin        = 2'000;
 
@@ -57,9 +57,7 @@ namespace AE::Threading
         NO_UNIQUE_ADDRESS
          Allocator_t        _allocator;
 
-        DRC_ONLY(
-            RWDataRaceCheck _drCheck;
-        )
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
 
 
     // methods
diff --git a/AE/engine/src/threading/Containers/LfStaticQueue.inl.h b/AE/engine/src/threading/Containers/LfStaticQueue.inl.h
index 8f7eeef3..b9a89377 100644
--- a/AE/engine/src/threading/Containers/LfStaticQueue.inl.h
+++ b/AE/engine/src/threading/Containers/LfStaticQueue.inl.h
@@ -6,13 +6,14 @@ namespace AE::Threading
 =================================================
     Init
 ----
-    must be externally synchronized
+    Must be externally synchronized
 =================================================
 */
     template <typename V, typename A>
     bool  LfStaticQueue<V,A>::Init (usize size) __NE___
     {
         DRC_EXLOCK( _drCheck );
+
         CHECK_ERR( size > 0 and size < _MaxSize );
         CHECK_ERR( _arr == null );
 
@@ -20,7 +21,6 @@ namespace AE::Threading
         _arr    = _allocator.Allocate( SizeAndAlignOf<Value_t> * _count );
         CHECK_ERR( _arr != null );
 
-        MemoryBarrier( EMemoryOrder::Release );
         return true;
     }
 
@@ -28,7 +28,7 @@ namespace AE::Threading
 =================================================
     Release
 ----
-    must be externally synchronized
+    Must be externally synchronized
 =================================================
 */
     template <typename V, typename A>
@@ -36,8 +36,6 @@ namespace AE::Threading
     {
         DRC_EXLOCK( _drCheck );
 
-        MemoryBarrier( EMemoryOrder::Acquire );
-
         if ( _arr == null )
             return;
 
@@ -59,6 +57,7 @@ namespace AE::Threading
     void  LfStaticQueue<V,A>::Clear () __NE___
     {
         DRC_EXLOCK( _drCheck );
+
         ASSERT( _arr != null );
 
         const Bits  pack = _packed.exchange( Bits{} );
@@ -78,6 +77,7 @@ namespace AE::Threading
     bool  LfStaticQueue<V,A>::Push (const Value_t &value) __NE___
     {
         DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( _arr != null );
 
         Bits    pack = _packed.load();
@@ -112,6 +112,7 @@ namespace AE::Threading
     bool  LfStaticQueue<V,A>::Push (Value_t &&value) __NE___
     {
         DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( _arr != null );
 
         Bits    pack = _packed.load();
@@ -182,6 +183,7 @@ namespace AE::Threading
     bool  LfStaticQueue<V,A>::First (OUT Value_t &value) __NE___
     {
         DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( _arr != null );
 
         Bits    pack = _packed.load();
@@ -203,6 +205,7 @@ namespace AE::Threading
     bool  LfStaticQueue<V,A>::Pop (OUT Value_t &value) __NE___
     {
         DRC_SHAREDLOCK( _drCheck );
+
         ASSERT( _arr != null );
 
         Bits    pack = _packed.load();
diff --git a/AE/engine/src/threading/DataSource/AsyncDataSource.cpp b/AE/engine/src/threading/DataSource/AsyncDataSource.cpp
index 48dd0492..2ad57582 100644
--- a/AE/engine/src/threading/DataSource/AsyncDataSource.cpp
+++ b/AE/engine/src/threading/DataSource/AsyncDataSource.cpp
@@ -4,29 +4,87 @@
 
 namespace AE::Threading
 {
-namespace _hidden_
-{
 
 /*
 =================================================
-    GetResult
+    _AddOnCompleteDependency
 =================================================
-*
-    IAsyncDataSourceRequest::Result  IAsyncDataSourceRequest::GetResult () C_NE___
+*/
+    bool  _hidden_::IAsyncDataSourceRequest::_AddOnCompleteDependency (AsyncTask task, INOUT uint &index, const Bool isStrong) __NE___
     {
+        EXLOCK( _depsGuard );
+
+        // skip dependency if already completed
+        if_unlikely( EStatus stat = Status();  stat > EStatus::_Finished )
+            return stat == EStatus::Completed;
+
+        CHECK_ERR( _deps.size() < _deps.capacity() );   // check for overflow
+
+        TaskDependency  bits;
+        bits.bitIndex   = index++;
+        bits.isStrong   = isStrong;
+
+        _deps.push_back( RVRef(task), bits );
+        return true;
     }
 
 /*
 =================================================
-    AsPromise
+    _SetDependencyCompleteStatus
+----
+    Allow to run tasks which waits when request is completed.
+    'complete' - indicates that request is successfully complete or canceled/failed.
 =================================================
-*
-    IAsyncDataSourceRequest::Promise_t  IAsyncDataSourceRequest::AsPromise () __NE___
+*/
+    void  _hidden_::IAsyncDataSourceRequest::_SetDependencyCompleteStatus (const bool complete) __NE___
     {
+        EXLOCK( _depsGuard );
+        for (auto dep : _deps)
+        {
+            //  weak/strong & complete  -> complete
+            //  strong      & cancelled -> cancelled
+            //  weak        & cancelled -> complete
+            const bool  cancel = dep.Get<1>().isStrong and (not complete);
+
+            ITaskDependencyManager::_SetDependencyCompletionStatus( dep.Get<0>(), dep.Get<1>().bitIndex, cancel );
+        }
+        _deps.clear();
     }
+
+/*
+=================================================
+    Resolve
+=================================================
 */
+    bool  AsyncDSRequestDependencyManager::Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex) __NE___
+    {
+        using EStatus = AsyncDSRequest::Value_t::EStatus;
+
+        if_likely( auto* request_pp = dep.GetIf< AsyncDSRequest >() )
+        {
+            if_unlikely( *request_pp == null )
+                return true;
+
+            auto*   request = (*request_pp).get();  // non-null
 
-} // _hidden_
+            // 'true'   - dependency added or successfully complete.
+            // 'false'  - dependency is cancelled or on an error.
+            return request->_AddOnCompleteDependency( RVRef(task), INOUT bitIndex, True{"strong"} );
+        }
+
+        if_likely( auto* weak_req_pp = dep.GetIf< WeakAsyncDSRequest >() )
+        {
+            if_unlikely( weak_req_pp->_task == null )
+                return true;
+
+            auto*   request = weak_req_pp->_task.get(); // non-null
+
+            Unused( request->_AddOnCompleteDependency( RVRef(task), INOUT bitIndex, False{"weak"} ));
+            return true;    // always return 'true' because it is weak dependency
+        }
+
+        RETURN_ERR( "unsupported dependency type" );
+    }
 
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/DataSource/AsyncDataSource.h b/AE/engine/src/threading/DataSource/AsyncDataSource.h
index 44288095..a5e9861d 100644
--- a/AE/engine/src/threading/DataSource/AsyncDataSource.h
+++ b/AE/engine/src/threading/DataSource/AsyncDataSource.h
@@ -1,4 +1,15 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    AsyncRDataSource / AsyncWDataSource and AsyncRStream / AsyncWStream must be created only as RC<> object,
+    because Request may internally keep reference to it data source object.
+
+    Synchronous DataSource defined in 'base' module:
+      [DataSource](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/base/DataSource/DataSource.h)
+
+    Network DataSource defined in 'VFS' module:
+      [NetworkStorageClient](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/vfs/Network/NetworkStorageClient.h)
+      [NetworkStorageServer](https://github.com/azhirnov/as-en/blob/dev/AE/engine/src/vfs/Network/NetworkStorageServer.h)
+*/
 
 #pragma once
 
@@ -7,6 +18,8 @@
 
 namespace AE::Threading
 {
+    class AsyncDSRequestDependencyManager;
+
 namespace _hidden_
 {
 
@@ -31,7 +44,7 @@ namespace _hidden_
         {
             Bytes           pos;                    // 'pos' argument from 'ReadBlock()' or 'WriteBlock()'
             Bytes           dataSize;               // actually readn / written
-            void const*     data        = null;     // if successfully completed non-null memory for read request.
+            void const*     data        = null;     // non-null pointer if read request is successfully completed
 
             template <typename T>
             ND_ ArrayView<T>    AsArray ()  C_NE___ { return ArrayView<T>{ Cast<T>(data), usize(dataSize)/sizeof(T) }; }
@@ -44,16 +57,23 @@ namespace _hidden_
 
         using Promise_t = Promise< ResultWithRC >;
 
+    protected:
+        using TaskDependency    = IAsyncTask::TaskDependency;
+        using Dependencies_t    = FixedTupleArray< 4, AsyncTask, TaskDependency >;
+
 
     // variables
     protected:
-        Atomic<EStatus>     _status         {EStatus::Destroyed};
-        Atomic<uint>        _actualSize     {0};    // readn / written
+        Atomic<EStatus>         _status         {EStatus::Destroyed};
+        AtomicByte<Byte32u>     _actualSize;    // readn / written
+
+        SpinLock                _depsGuard;
+        Dependencies_t          _deps;
 
 
     // interface
     public:
-        // returns 'true' if cancelled, 'false' if already completed/cancelled or on other error.
+        // Returns 'true' if cancelled, 'false' if already completed/cancelled or on error.
             virtual bool        Cancel ()                                           __NE___ = 0;
 
         ND_ EStatus             Status ()                                           C_NE___ { return _status.load(); }
@@ -67,6 +87,11 @@ namespace _hidden_
         // Use 'promise.Then()' to process result of async IO.
         // Or use 'result = co_await request->AsPromise()'.
         ND_ virtual Promise_t   AsPromise (ETaskQueue q = ETaskQueue::Background)   __NE___ = 0;
+
+    protected:
+        friend class Threading::AsyncDSRequestDependencyManager;
+        ND_ bool  _AddOnCompleteDependency (AsyncTask task, INOUT uint &index, Bool isStrong)   __NE___;
+            void  _SetDependencyCompleteStatus (bool complete)                                  __NE___;
     };
 
 } // _hidden_
@@ -91,30 +116,30 @@ namespace _hidden_
 
     // interface
     public:
-        AsyncRDataSource ()                                                                 __NE___ {}
-
-        ND_ ESourceType  GetSourceType ()                                                   C_NE_OV { return ESourceType::RandomAccess | ESourceType::ReadAccess | ESourceType::Async | ESourceType::ThreadSafe; }
+        ND_ ESourceType  GetSourceType ()       C_NE_OV { return ESourceType::RandomAccess | ESourceType::ReadAccess | ESourceType::Async | ESourceType::ThreadSafe; }
 
 
         // Returns file size.
+        // If 'GetSourceType()' doesn't returns 'FixedSize'
+        // size may be unknown and 'UMax' will be returned.
+        //
         ND_ virtual Bytes   Size ()                                                         C_NE___ = 0;
 
 
         // Read file from 'pos' to 'pos + dataSize'.
-        // 'pos'        - position in the file where data will be readn.
-        // 'data'       - pointer to memory where to put data.
-        // 'dataSize'   - size of the 'data'.
-        // 'mem'        - holds 'data' memory until it in use.
+        //  'pos'       - position in the file where data will be readn.
+        //  'data'      - pointer to memory where to put data.
+        //  'dataSize'  - size of the 'data'.
+        //  'mem'       - holds 'data' memory until it in use.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
-        ND_ virtual ReadRequestPtr  ReadBlock (Bytes pos, void* data,
-                                               Bytes dataSize, RC<> mem)                    __NE___ = 0;
+        ND_ virtual ReadRequestPtr  ReadBlock (Bytes pos, void* data, Bytes dataSize, RC<> mem) __NE___ = 0;
 
 
         // Read file from 'pos' to 'pos + size'.
-        // 'pos'    - position in the file where data will be readn.
-        // 'size'   - size of the data.
-        // 'mem'    - container for memory.
+        //  'pos'   - position in the file where data will be readn.
+        //  'size'  - size of the data.
+        //  'mem'   - container for memory.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
         ND_ ReadRequestPtr  ReadBlock (Bytes pos, Bytes size, RC<SharedMem> mem)            __NE___
@@ -127,8 +152,8 @@ namespace _hidden_
 
         // Read file from 'pos' to 'pos + size'.
         // Memory will be allocated by internal allocator.
-        // 'pos'    - position in the file where data will be readn.
-        // 'size'   - size of the data.
+        //  'pos'   - position in the file where data will be readn.
+        //  'size'  - size of the data.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
         ND_ virtual ReadRequestPtr  ReadBlock (Bytes pos, Bytes size)                       __NE___ = 0;
@@ -164,33 +189,30 @@ namespace _hidden_
 
     // interface
     public:
-        AsyncWDataSource ()                                                                 __NE___ {}
-
-        ND_ ESourceType  GetSourceType ()                                                   C_NE_OV { return ESourceType::RandomAccess | ESourceType::WriteAccess | ESourceType::Async | ESourceType::ThreadSafe; }
+        ND_ ESourceType  GetSourceType ()   C_NE_OV { return ESourceType::RandomAccess | ESourceType::WriteAccess | ESourceType::Async | ESourceType::ThreadSafe; }
 
 
         // Allocate memory block using internal allocator.
         // Returns 'null' on error.
         //
         ND_ virtual RC<SharedMem>   Alloc (SizeAndAlign)                                    __NE___ = 0;
-        ND_ RC<SharedMem>           Alloc (Bytes size)                                      __NE___ { return Alloc( SizeAndAlign{ size, 4_b }); }
+        ND_ RC<SharedMem>           Alloc (Bytes size)                                      __NE___ { return Alloc( SizeAndAlign{ size, DefaultAllocatorAlign }); }
 
 
         // Write data to the file.
-        // 'pos'        - position in the file where data will be written.
-        // 'data'       - pointer to memory with the data.
-        // 'dataSize'   - size of data.
-        // 'mem'        - holds 'data' memory until it in use.
+        //  'pos'       - position in the file where data will be written.
+        //  'data'      - pointer to memory with the data.
+        //  'dataSize'  - size of data.
+        //  'mem'       - holds 'data' memory until it in use.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
-        ND_ virtual WriteRequestPtr  WriteBlock (Bytes pos, const void* data,
-                                                 Bytes dataSize, RC<> mem)                  __NE___ = 0;
+        ND_ virtual WriteRequestPtr  WriteBlock (Bytes pos, const void* data, Bytes dataSize, RC<> mem) __NE___ = 0;
 
 
         // Write data from 'mem' to the file.
-        // 'pos'    - position in the file where data will be written.
-        // 'size'   - size of data.
-        // 'mem'    - container for memory.
+        //  'pos'   - position in the file where data will be written.
+        //  'size'  - size of data.
+        //  'mem'   - container for memory.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
         ND_ WriteRequestPtr  WriteBlock (Bytes pos, Bytes size, RC<SharedMem> mem)          __NE___
@@ -225,10 +247,12 @@ namespace _hidden_
 
     // interface
     public:
-        AsyncRStream ()                                                                     __NE___ {}
-
-        ND_ ESourceType  GetSourceType ()                                                   C_NE_OV { return ESourceType::SequentialAccess | ESourceType::ReadAccess | ESourceType::Async | ESourceType::ThreadSafe; }
+        ND_ ESourceType  GetSourceType ()   C_NE_OV { return ESourceType::SequentialAccess | ESourceType::ReadAccess | ESourceType::Async | ESourceType::ThreadSafe; }
 
+        // Returns:
+        //  - current position in stream, this value must be valid.
+        //  - file size if it is known, 'UMax' otherwise.
+        //
         ND_ virtual PosAndSize  PositionAndSize ()                                          C_NE___ = 0;
 
 
@@ -266,32 +290,34 @@ namespace _hidden_
 
     // interface
     public:
-        AsyncWStream ()                                                                     __NE___ {}
+        ND_ ESourceType  GetSourceType ()   C_NE_OV { return ESourceType::SequentialAccess | ESourceType::WriteAccess | ESourceType::Async | ESourceType::ThreadSafe; }
 
-        ND_ ESourceType  GetSourceType ()                                                   C_NE_OV { return ESourceType::SequentialAccess | ESourceType::WriteAccess | ESourceType::Async | ESourceType::ThreadSafe; }
 
-        ND_ virtual Bytes   Position ()                                                     C_NE___ = 0;    // same as 'Size()'
+        // Returns current position in stream.
+        // This value should be equal to the file size.
+        //
+        ND_ virtual Bytes   Position ()                                                     C_NE___ = 0;
 
 
         // Allocate memory block using internal allocator.
         // Returns 'null' on error.
         //
         ND_ virtual RC<SharedMem>   Alloc (SizeAndAlign)                                    __NE___ = 0;
-        ND_ RC<SharedMem>           Alloc (Bytes size)                                      __NE___ { return Alloc( SizeAndAlign{ size, 4_b }); }
+        ND_ RC<SharedMem>           Alloc (Bytes size)                                      __NE___ { return Alloc( SizeAndAlign{ size, DefaultAllocatorAlign }); }
 
 
         // Write data to the file.
-        // 'data'       - pointer to memory with the data.
-        // 'dataSize'   - size of data.
-        // 'mem'        - holds 'data' memory until it in use.
+        //  'data'      - pointer to memory with the data.
+        //  'dataSize'  - size of data.
+        //  'mem'       - holds 'data' memory until it in use.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
         ND_ virtual WriteRequestPtr  WriteSeq (const void* data, Bytes dataSize, RC<> mem)  __NE___ = 0;
 
 
         // Write data from 'mem' to the file.
-        // 'size'   - size of data.
-        // 'mem'    - container for memory.
+        //  'size'  - size of data.
+        //  'mem'   - container for memory.
         // Returns non-null pointer, request in pending state on success, request in canceled state on error.
         //
         ND_ WriteRequestPtr  WriteSeq (Bytes size, RC<SharedMem> mem)                       __NE___
@@ -311,4 +337,22 @@ namespace _hidden_
     };
 
 
+
+    //
+    // Async Data Source Request Dependency Manager
+    //
+    class AsyncDSRequestDependencyManager final : public ITaskDependencyManager
+    {
+    // methods
+    public:
+
+        // ITaskDependencyManager //
+        bool  Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex)   __NE_OV;
+
+    private:
+        friend class TaskScheduler;
+        AsyncDSRequestDependencyManager ()                                      __NE___ = default;
+    };
+
+
 } // AE::Threading
diff --git a/AE/engine/src/threading/DataSource/AsyncDataSourceAsStream.h b/AE/engine/src/threading/DataSource/AsyncDataSourceAsStream.h
index d1c10c52..086b6368 100644
--- a/AE/engine/src/threading/DataSource/AsyncDataSourceAsStream.h
+++ b/AE/engine/src/threading/DataSource/AsyncDataSourceAsStream.h
@@ -14,13 +14,13 @@ namespace AE::Threading
     {
     // variables
     private:
-        BytesAtomic< Bytes >    _pos;
+        AtomicByte< Bytes >     _pos;
         RC<AsyncRDataSource>    _ds;
 
 
     // methods
     public:
-        AsyncRDataSourceAsStream (RC<AsyncRDataSource> ds, Bytes offset = 0_b)      __NE___ : _pos{ offset }, _ds{ RVRef(ds) } { ASSERT(_ds); }
+        AsyncRDataSourceAsStream (RC<AsyncRDataSource> ds, Bytes offset = 0_b)      __NE___ : _pos{offset}, _ds{RVRef(ds)} { ASSERT(_ds); }
 
         bool            IsOpen ()                                                   C_NE_OV { return _ds and _ds->IsOpen(); }
 
@@ -41,13 +41,13 @@ namespace AE::Threading
     {
     // variables
     private:
-        BytesAtomic< Bytes >    _pos;
+        AtomicByte< Bytes >     _pos;
         RC<AsyncWDataSource>    _ds;
 
 
     // methods
     public:
-        AsyncWDataSourceAsStream (RC<AsyncWDataSource> ds, Bytes offset = 0_b)      __NE___ : _pos{ offset }, _ds{ RVRef(ds) } { ASSERT(_ds); }
+        AsyncWDataSourceAsStream (RC<AsyncWDataSource> ds, Bytes offset = 0_b)      __NE___ : _pos{offset}, _ds{RVRef(ds)} { ASSERT(_ds); }
 
         bool            IsOpen ()                                                   C_NE_OV { return _ds and _ds->IsOpen(); }
 
diff --git a/AE/engine/src/threading/DataSource/SyncDataSource.cpp b/AE/engine/src/threading/DataSource/SyncDataSource.cpp
new file mode 100644
index 00000000..065f0ce2
--- /dev/null
+++ b/AE/engine/src/threading/DataSource/SyncDataSource.cpp
@@ -0,0 +1,177 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "threading/DataSource/SyncDataSource.h"
+
+namespace AE::Threading
+{
+namespace
+{
+
+/*
+=================================================
+    WaitForRequest
+=================================================
+*/
+    template <typename ReqType>
+    inline bool  WaitForRequest (ReqType &req)
+    {
+        #ifdef AE_DEBUG
+        constexpr uint  max_attempt = UMax;
+        #else
+        constexpr uint  max_attempt = 1000; // 1000 * 0.5ms = ~500ms
+        #endif
+
+        constexpr uint  max_tasks   = 6;
+
+        auto&           sched       = Scheduler();
+        const auto      seed        = sched.GetDefaultSeed();
+
+        for (uint a = 0; a < max_attempt; ++a)
+        {
+            if ( req.IsFinished() )
+                return true;
+
+            uint    i = 0;
+            for (; (i < max_tasks) and sched.ProcessTask( ETaskQueue::Background, seed ); ++i) {}
+
+            if ( i < max_tasks )
+                i += uint(sched.ProcessFileIO());
+
+            if_unlikely( i == 0 )
+                ThreadUtils::Sleep_500us();
+        }
+        return false;
+    }
+}
+
+/*
+=================================================
+    ReadBlock
+=================================================
+*/
+    Bytes  SyncRDataSource::ReadBlock (const Bytes pos, OUT void* buffer, Bytes size) __NE___
+    {
+        auto    req = _ds->ReadBlock( pos, size );
+
+        if_likely( WaitForRequest( *req ) and req->IsCompleted() )
+        {
+            auto    res  = req->GetResult();
+                    size = Min( size, res.dataSize );
+            MemCopy( OUT buffer, res.data, size );
+            return size;
+        }
+
+        return 0_b;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    WriteBlock
+=================================================
+*/
+    Bytes  SyncWDataSource::WriteBlock (Bytes pos, const void* buffer, const Bytes size) __NE___
+    {
+        auto    req = _ds->WriteBlock( pos, buffer, size, null );
+
+        if_likely( WaitForRequest( *req ) and req->IsCompleted() )
+        {
+            auto    res = req->GetResult();
+            return Min( size, res.dataSize );
+        }
+
+        return 0_b;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    ReadSeq
+=================================================
+*/
+    Bytes  SyncRStream::ReadSeq (OUT void* buffer, Bytes size) __NE___
+    {
+        auto    req = _stream->ReadSeq( buffer, size, null );
+
+        if_likely( WaitForRequest( *req ) and req->IsCompleted() )
+        {
+            auto    res  = req->GetResult();
+                    size = Min( size, res.dataSize );
+            MemCopy( OUT buffer, res.data, size );
+            return size;
+        }
+
+        return 0_b;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    WriteSeq
+=================================================
+*/
+    Bytes  SyncWStream::WriteSeq (const void* buffer, Bytes size) __NE___
+    {
+        auto    req = _stream->WriteSeq( buffer, size, null );
+
+        if_likely( WaitForRequest( *req ) and req->IsCompleted() )
+        {
+            auto    res = req->GetResult();
+            return Min( size, res.dataSize );
+        }
+
+        return 0_b;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    ReadSeq
+=================================================
+*/
+    Bytes  SyncRStream2::ReadSeq (OUT void* buffer, Bytes size) __NE___
+    {
+        auto    req = _ds->ReadBlock( _pos.fetch_add( size ), buffer, size, null );
+
+        if_likely( WaitForRequest( *req ) and req->IsCompleted() )
+        {
+            auto    res  = req->GetResult();
+                    size = Min( size, res.dataSize );
+            MemCopy( OUT buffer, res.data, size );
+            return size;
+        }
+
+        return 0_b;
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    WriteSeq
+=================================================
+*/
+    Bytes  SyncWStream2::WriteSeq (const void* buffer, const Bytes size) __NE___
+    {
+        auto    req = _ds->WriteBlock( _pos.fetch_add( size ), buffer, size, null );
+
+        if_likely( WaitForRequest( *req ) and req->IsCompleted() )
+        {
+            auto    res = req->GetResult();
+            return Min( size, res.dataSize );
+        }
+
+        return 0_b;
+    }
+
+
+} // AE::Threading
diff --git a/AE/engine/src/threading/DataSource/SyncDataSource.h b/AE/engine/src/threading/DataSource/SyncDataSource.h
new file mode 100644
index 00000000..ca94fd9c
--- /dev/null
+++ b/AE/engine/src/threading/DataSource/SyncDataSource.h
@@ -0,0 +1,197 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "threading/DataSource/AsyncDataSource.h"
+
+namespace AE::Threading
+{
+
+    //
+    // Read-only Data Source (Sync on top of Async)
+    //
+    class SyncRDataSource final : public RDataSource
+    {
+    // variables
+    private:
+        RC<AsyncRDataSource>    _ds;
+
+    // methods
+    public:
+        explicit SyncRDataSource (RC<AsyncRDataSource> ds)                  __NE___ : _ds{RVRef(ds)} {}
+
+        // RDataSource //
+        bool        IsOpen ()                                               C_NE_OV { return _ds and _ds->IsOpen(); }
+        ESourceType GetSourceType ()                                        C_NE_OV { return _ds->GetSourceType() & ~(ESourceType::Async | ESourceType::Buffered); }
+        Bytes       Size ()                                                 C_NE_OV { return _ds->Size(); }
+        Bytes       ReadBlock (Bytes pos, OUT void* buffer, Bytes size)     __NE_OV;
+    };
+
+
+
+    //
+    // Write-only Data Source (Sync on top of Async)
+    //
+    class SyncWDataSource final : public WDataSource
+    {
+    // variables
+    private:
+        RC<AsyncWDataSource>    _ds;
+
+    // methods
+    public:
+        explicit SyncWDataSource (RC<AsyncWDataSource> ds)                  __NE___ : _ds{RVRef(ds)} {}
+
+        // WDataSource //
+        bool        IsOpen ()                                               C_NE_OV { return _ds and _ds->IsOpen(); }
+        ESourceType GetSourceType ()                                        C_NE_OV { return _ds->GetSourceType() & ~(ESourceType::Async | ESourceType::Buffered); }
+        Bytes       WriteBlock (Bytes pos, const void* buffer, Bytes size)  __NE_OV;
+        void        Flush ()                                                __NE_OV {}
+    };
+//-----------------------------------------------------------------------------
+
+
+
+    //
+    // Read-only Stream (Sync on top of Async)
+    //
+    class SyncRStream final : public RStream
+    {
+    // variables
+    private:
+        RC<AsyncRStream>    _stream;
+
+    // methods
+    public:
+        explicit SyncRStream (RC<AsyncRStream> stream)                          __NE___ : _stream{RVRef(stream)} {}
+
+        // RStream //
+        bool        IsOpen ()                                                   C_NE_OV { return _stream and _stream->IsOpen(); }
+        ESourceType GetSourceType ()                                            C_NE_OV { return _stream->GetSourceType() & ~(ESourceType::Async | ESourceType::Buffered); }
+        PosAndSize  PositionAndSize ()                                          C_NE_OV { return _stream->PositionAndSize(); }
+
+        bool        SeekFwd (Bytes)                                             __NE_OV { return false; }
+        Bytes       ReadSeq (OUT void* buffer, Bytes size)                      __NE_OV;
+        bool        SeekSet (Bytes)                                             __NE_OV { return false; }
+    };
+
+
+
+    //
+    // Write-only Stream (Sync on top of Async)
+    //
+    class SyncWStream final : public WStream
+    {
+    // variables
+    private:
+        RC<AsyncWStream>    _stream;
+
+    // methods
+    public:
+        explicit SyncWStream (RC<AsyncWStream> stream)                          __NE___ : _stream{RVRef(stream)} {}
+
+        // WStream //
+        bool        IsOpen ()                                                   C_NE_OV { return _stream and _stream->IsOpen(); }
+        ESourceType GetSourceType ()                                            C_NE_OV { return _stream->GetSourceType() & ~(ESourceType::Async | ESourceType::Buffered); }
+
+        Bytes       Position ()                                                 C_NE_OV { return _stream->Position(); }
+        bool        SeekFwd (Bytes)                                             __NE_OV { return false; }
+        Bytes       WriteSeq (const void* buffer, Bytes size)                   __NE_OV;
+        void        Flush ()                                                    __NE_OV {}
+    };
+//-----------------------------------------------------------------------------
+
+
+
+    //
+    // Read-only Stream (Sync on top of Async)
+    //
+    class SyncRStream2 final : public RStream
+    {
+    // variables
+    private:
+        AtomicByte< Bytes >     _pos;
+        RC<AsyncRDataSource>    _ds;
+
+    // methods
+    public:
+        explicit SyncRStream2 (RC<AsyncRDataSource> ds, Bytes offset = 0_b)     __NE___ : _pos{offset}, _ds{RVRef(ds)} {}
+
+        // RStream //
+        bool        IsOpen ()                                                   C_NE_OV { return _ds and _ds->IsOpen(); }
+        ESourceType GetSourceType ()                                            C_NE_OV { return _ds->GetSourceType() & ~(ESourceType::Async | ESourceType::Buffered); }
+        PosAndSize  PositionAndSize ()                                          C_NE_OV { return PosAndSize{ _pos.load(), _ds->Size() }; }
+
+        bool        SeekFwd (Bytes offset)                                      __NE_OV;
+        Bytes       ReadSeq (OUT void* buffer, Bytes size)                      __NE_OV;
+        bool        SeekSet (Bytes newPos)                                      __NE_OV;
+    };
+
+
+
+    //
+    // Write-only Stream (Sync on top of Async)
+    //
+    class SyncWStream2 final : public WStream
+    {
+    // variables
+    private:
+        AtomicByte< Bytes >     _pos;
+        RC<AsyncWDataSource>    _ds;
+
+    // methods
+    public:
+        explicit SyncWStream2 (RC<AsyncWDataSource> ds, Bytes offset = 0_b)     __NE___ : _pos{offset}, _ds{RVRef(ds)} {}
+
+        // WStream //
+        bool        IsOpen ()                                                   C_NE_OV { return _ds and _ds->IsOpen(); }
+        ESourceType GetSourceType ()                                            C_NE_OV { return _ds->GetSourceType() & ~(ESourceType::Async | ESourceType::Buffered); }
+
+        Bytes       Position ()                                                 C_NE_OV { return _pos.load(); }
+        bool        SeekFwd (Bytes offset)                                      __NE_OV;
+        Bytes       WriteSeq (const void* buffer, Bytes size)                   __NE_OV;
+        void        Flush ()                                                    __NE_OV {}
+    };
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    SeekFwd
+=================================================
+*/
+    inline bool  SyncRStream2::SeekFwd (Bytes offset) __NE___
+    {
+        Bytes   pos = _pos.fetch_add( offset );
+        return pos <= _ds->Size();
+    }
+
+/*
+=================================================
+    SeekSet
+=================================================
+*/
+    inline bool  SyncRStream2::SeekSet (Bytes newPos) __NE___
+    {
+        if ( newPos <= _ds->Size() )
+        {
+            _pos.store( newPos );
+            return true;
+        }
+        return false;
+    }
+
+/*
+=================================================
+    SeekFwd
+=================================================
+*/
+    inline bool  SyncWStream2::SeekFwd (Bytes offset) __NE___
+    {
+        _pos.fetch_add( offset );
+        return true;
+    }
+
+
+} // AE::Threading
diff --git a/AE/engine/src/threading/DataSource/TsDataSource.h b/AE/engine/src/threading/DataSource/TsDataSource.h
index 90b2c1dc..a877bbcf 100644
--- a/AE/engine/src/threading/DataSource/TsDataSource.h
+++ b/AE/engine/src/threading/DataSource/TsDataSource.h
@@ -23,7 +23,7 @@ namespace AE::Threading
     // methods
     public:
         template <typename ...Args>
-        explicit TsRDataSource (Args && ...args)    __NE___ : _dataSource{ FwdArg<Args>(args)...} {}
+        explicit TsRDataSource (Args&& ...args)     __NE___ : _dataSource{ FwdArg<Args>(args)...} {}
         ~TsRDataSource ()                           __NE_OV {}
 
 
@@ -33,10 +33,10 @@ namespace AE::Threading
 
         Bytes       Size ()                         C_NE_OV { EXLOCK( _guard );  return _dataSource->Size(); }
 
-        Bytes  ReadBlock (Bytes offset, OUT void *buffer, Bytes size) __NE_OV
+        Bytes  ReadBlock (Bytes pos, OUT void* buffer, Bytes size) __NE_OV
         {
             EXLOCK( _guard );
-            return _dataSource->ReadBlock( offset, OUT buffer, size );
+            return _dataSource->ReadBlock( pos, OUT buffer, size );
         }
     };
 
@@ -47,7 +47,7 @@ namespace AE::Threading
     //
 
     template <typename T>
-    class TsWDataSource : public WDataSource
+    class TsWDataSource final : public WDataSource
     {
     // variables
     private:
@@ -58,7 +58,7 @@ namespace AE::Threading
     // methods
     public:
         template <typename ...Args>
-        explicit TsWDataSource (Args && ...args)    __NE___ : _dataSource{ FwdArg<Args>(args)...} {}
+        explicit TsWDataSource (Args&& ...args)     __NE___ : _dataSource{ FwdArg<Args>(args)...} {}
         ~TsWDataSource ()                           __NE_OV {}
 
 
@@ -66,13 +66,10 @@ namespace AE::Threading
         bool        IsOpen ()                       C_NE_OV { EXLOCK( _guard );  return _dataSource->IsOpen(); }
         ESourceType GetSourceType ()                C_NE_OV { EXLOCK( _guard );  return _dataSource->GetSourceType() | ESourceType::ThreadSafe; }
 
-        Bytes       Capacity ()                     C_NE_OV { return 0_b; }                         // TODO
-        Bytes       Reserve (Bytes capacity)        __NE_OV { Unused( capacity );  return 0_b; }    // TODO
-
-        Bytes  WriteBlock (Bytes offset, const void *buffer, Bytes size) __NE_OV
+        Bytes  WriteBlock (Bytes pos, const void* buffer, Bytes size) __NE_OV
         {
             EXLOCK( _guard );
-            return _dataSource->WriteBlock( offset, buffer, size );
+            return _dataSource->WriteBlock( pos, buffer, size );
         }
 
         void  Flush ()                              __NE_OV
diff --git a/AE/engine/src/threading/DataSource/WinAsyncDataSource.cpp b/AE/engine/src/threading/DataSource/WinAsyncDataSource.cpp
index 3524fd28..6f6751ac 100644
--- a/AE/engine/src/threading/DataSource/WinAsyncDataSource.cpp
+++ b/AE/engine/src/threading/DataSource/WinAsyncDataSource.cpp
@@ -10,7 +10,7 @@
 */
 
 #ifdef AE_PLATFORM_WINDOWS
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 # include "threading/DataSource/WinAsyncDataSource.h"
 
 namespace AE::Threading
@@ -66,16 +66,41 @@ namespace
 
 
 
+    class WindowsIOService::ReadRequestApi
+    {
+        friend class ReadRequest;
+        static void  Recycle (ReadRequest*) __NE___;
+    };
+
+    class WindowsIOService::AsyncRDataSourceApi
+    {
+        friend class WinAsyncRDataSource;
+        ND_ static bool  CreateResult (OUT AsyncDSRequest &, RC<WinAsyncRDataSource> file, Bytes pos, void* data, Bytes dataSize, RC<> mem) __NE___;
+    };
+
+    class WindowsIOService::WriteRequestApi
+    {
+        friend class WriteRequest;
+        static void  Recycle (WriteRequest*) __NE___;
+    };
+
+    class WindowsIOService::AsyncWDataSourceApi
+    {
+        friend class WinAsyncWDataSource;
+        ND_ static bool  CreateResult (OUT AsyncDSRequest &, RC<WinAsyncWDataSource> file, Bytes pos, const void* data, Bytes dataSize, RC<> mem) __NE___;
+    };
+//-----------------------------------------------------------------------------
+
+
+
 /*
 =================================================
     constructor
 =================================================
 */
-    WindowsIOService::_RequestBase::_RequestBase (Index_t idx) __NE___ :
-        _indexInPool{ idx }
+    WindowsIOService::_RequestBase::_RequestBase () __NE___
     {
-        STATIC_ASSERT( sizeof(_overlapped) == sizeof(OVERLAPPED) );
-        STATIC_ASSERT( OverlappedOffset == offsetof( _RequestBase, _overlapped ));
+        StaticAssert( sizeof(_overlapped) == sizeof(OVERLAPPED) );
     }
 
 /*
@@ -115,8 +140,7 @@ namespace
         SetOverlappedOffset( INOUT ov, pos );
 
         _memRC = RVRef(mem);
-
-        _actualSize.store( 0 );
+        _actualSize.store( 0_b );
 
         CHECK( _status.exchange( EStatus::InProgress ) == EStatus::Destroyed );
 
@@ -132,8 +156,7 @@ namespace
     void  WindowsIOService::_RequestBase::_Cleanup () __NE___
     {
         _memRC = null;
-
-        _actualSize.store( 0 );
+        _actualSize.store( 0_b );
 
         ASSERT( AnyEqual( _status.load(), EStatus::Cancelled, EStatus::Completed ));
         _status.store( EStatus::Destroyed );
@@ -151,7 +174,7 @@ namespace
 */
     void  WindowsIOService::_RequestBase::_Complete (const Bytes size, const long err, const void* ovPtr) __NE___
     {
-        _actualSize.store( uint(size) );
+        _actualSize.store( size );
 
         const auto*     ov = _overlapped.Ptr<OVERLAPPED>();
         ASSERT( ovPtr == ov );  Unused( ovPtr );
@@ -162,20 +185,7 @@ namespace
         ASSERT( complete );
         ASSERT( stat == EStatus::InProgress );  Unused( stat );
 
-        // allow to run tasks which waits when request is completed
-        {
-            EXLOCK( _depsGuard );
-            for (auto dep : _deps)
-            {
-                //  weak/strong & complete  -> complete
-                //  strong      & cancelled -> cancelled
-                //  weak        & cancelled -> complete
-                const bool  cancel = dep.Get<1>().isStrong and (not complete);
-
-                ITaskDependencyManager::_SetDependencyCompletionStatus( dep.Get<0>(), dep.Get<1>().bitIndex, cancel );
-            }
-            _deps.clear();
-        }
+        _SetDependencyCompleteStatus( complete );
 
         // Ref count was increased in '_Init()' to keep request alive until it is complete.
         // Cancelled request may be destroyed here, successfully completed request should not be destroyed here!
@@ -187,29 +197,6 @@ namespace
             DBG_CHECK_MSG( not complete or cnt > 1, "request complete but result is never used" );
         }
     }
-
-/*
-=================================================
-    _AddOnCompleteDependency
-=================================================
-*/
-    bool  WindowsIOService::_RequestBase::_AddOnCompleteDependency (AsyncTask task, INOUT uint &index, Bool isStrong) __NE___
-    {
-        EXLOCK( _depsGuard );
-
-        // skip dependency if already completed
-        if_unlikely( EStatus stat = Status();  stat > EStatus::_Finished )
-            return stat == EStatus::Completed;
-
-        CHECK_ERR( _deps.size() < _deps.capacity() );   // check for overflow
-
-        TaskDependency  bits;
-        bits.bitIndex   = index++;
-        bits.isStrong   = isStrong;
-
-        _deps.push_back( RVRef(task), bits );
-        return true;
-    }
 //-----------------------------------------------------------------------------
 
 
@@ -219,7 +206,7 @@ namespace
     _Create
 =================================================
 */
-    bool  WindowsIOService::ReadRequest::_Create (RC<WinAsyncRDataSource> file, Bytes pos, void* data, Bytes dataSize, RC<SharedMem> mem) __NE___
+    bool  WindowsIOService::ReadRequest::_Create (RC<WinAsyncRDataSource> file, Bytes pos, void* data, Bytes dataSize, RC<> mem) __NE___
     {
         ASSERT_LE( dataSize, MaxValue<DWORD>() );
 
@@ -276,7 +263,7 @@ namespace
 
         Result  res;
         res.pos         = GetOverlappedOffset( _overlapped.Ref<OVERLAPPED>() );
-        res.dataSize    = Bytes{_actualSize.load()};
+        res.dataSize    = _actualSize.load();
         res.data        = IsCompleted() ? _data : null;
         return res;
     }
@@ -292,7 +279,7 @@ namespace
 
         ResultWithRC    res;
         res.pos         = GetOverlappedOffset( _overlapped.Ref<OVERLAPPED>() );
-        res.dataSize    = Bytes{_actualSize.load()};
+        res.dataSize    = _actualSize.load();
         res.data        = IsCompleted() ? _data : null;
         res.rc          = _memRC;
         return res;
@@ -327,7 +314,7 @@ namespace
         }
         MemoryBarrier( EMemoryOrder::Release );
 
-        WindowsIOService::ReadRequestApi::Recycle( _indexInPool );
+        WindowsIOService::ReadRequestApi::Recycle( this );
     }
 //-----------------------------------------------------------------------------
 
@@ -393,7 +380,7 @@ namespace
 
         Result  res;
         res.pos         = GetOverlappedOffset( _overlapped.Ref<OVERLAPPED>() );
-        res.dataSize    = Bytes{_actualSize.load()};
+        res.dataSize    = _actualSize.load();
         res.data        = null;
         return res;
     }
@@ -409,7 +396,7 @@ namespace
 
         ResultWithRC    res;
         res.pos         = GetOverlappedOffset( _overlapped.Ref<OVERLAPPED>() );
-        res.dataSize    = Bytes{_actualSize.load()};
+        res.dataSize    = _actualSize.load();
         return res;
     }
 
@@ -441,7 +428,7 @@ namespace
         }
         MemoryBarrier( EMemoryOrder::Release );
 
-        WindowsIOService::WriteRequestApi::Recycle( _indexInPool );
+        WindowsIOService::WriteRequestApi::Recycle( this );
     }
 //-----------------------------------------------------------------------------
 
@@ -530,7 +517,7 @@ namespace
         AsyncDSRequest  req;
         if_likely( WindowsIOService::AsyncRDataSourceApi::CreateResult( OUT req, GetRC<WinAsyncRDataSource>(), pos, data, dataSize, RVRef(mem) ));
         else
-            req = Cast<WindowsIOService>(Scheduler().GetFileIOService())->GetCancelledRequest();
+            req = AsyncDSRequest{Scheduler().GetCanceledDSRequest()};
         return req;
     }
 
@@ -645,7 +632,7 @@ namespace
         AsyncDSRequest  req;
         if_likely( WindowsIOService::AsyncWDataSourceApi::CreateResult( OUT req, GetRC<WinAsyncWDataSource>(), pos, data, dataSize, RVRef(mem) ));
         else
-            req = Cast<WindowsIOService>(Scheduler().GetFileIOService())->GetCancelledRequest();
+            req = AsyncDSRequest{Scheduler().GetCanceledDSRequest()};
         return req;
     }
 
@@ -656,6 +643,8 @@ namespace
 */
     RC<SharedMem>  WinAsyncWDataSource::Alloc (const SizeAndAlign value) __NE___
     {
+        // TODO: use LfFixedBlockAllocator and MemChunkList
+
         return SharedMem::Create( AE::GetDefaultAllocator(), value );   // TODO: optimize
     }
 
@@ -689,11 +678,11 @@ namespace
     ReadRequestApi::Recycle
 =================================================
 */
-    void  WindowsIOService::ReadRequestApi::Recycle (Index_t indexInPool) __NE___
+    inline void  WindowsIOService::ReadRequestApi::Recycle (ReadRequest* ptr) __NE___
     {
         auto    self = Cast<WindowsIOService>(Scheduler().GetFileIOService());
 
-        CHECK( self->_readResultPool.Unassign( indexInPool ));
+        CHECK( self->_readResultPool.Unassign( ptr ));
     }
 
 /*
@@ -708,7 +697,7 @@ namespace
         auto    self = Cast<WindowsIOService>(Scheduler().GetFileIOService());
         Index_t index;
 
-        CHECK_ERR( self->_readResultPool.Assign( OUT index, [](auto* ptr, Index_t idx) { new(ptr) ReadRequest{ idx }; }));
+        CHECK_ERR( self->_readResultPool.Assign( OUT index ));
 
         // request may complete immediately
         RC<ReadRequest> res { &self->_readResultPool[ index ]};
@@ -719,6 +708,7 @@ namespace
             return true;
         }
 
+        UNTESTED;
         self->_readResultPool.Unassign( index );
         RETURN_ERR( "failed to allocate read result" );
     }
@@ -728,11 +718,11 @@ namespace
     WriteRequestApi::Recycle
 =================================================
 */
-    void  WindowsIOService::WriteRequestApi::Recycle (Index_t indexInPool) __NE___
+    inline void  WindowsIOService::WriteRequestApi::Recycle (WriteRequest* ptr) __NE___
     {
         auto    self = Cast<WindowsIOService>(Scheduler().GetFileIOService());
 
-        CHECK( self->_writeResultPool.Unassign( indexInPool ));
+        CHECK( self->_writeResultPool.Unassign( ptr ));
     }
 
 /*
@@ -747,7 +737,7 @@ namespace
         auto    self = Cast<WindowsIOService>(Scheduler().GetFileIOService());
         Index_t index;
 
-        CHECK_ERR( self->_writeResultPool.Assign( OUT index, [](auto* ptr, Index_t idx) { new(ptr) WriteRequest{ idx }; }));
+        CHECK_ERR( self->_writeResultPool.Assign( OUT index ));
 
         // request may complete immediately
         RC<WriteRequest>    res { &self->_writeResultPool[ index ]};
@@ -758,6 +748,7 @@ namespace
             return true;
         }
 
+        UNTESTED;
         self->_writeResultPool.Unassign( index );
         RETURN_ERR( "failed to allocate write result" );
     }
@@ -773,8 +764,7 @@ namespace
 =================================================
 */
     WindowsIOService::WindowsIOService (uint maxThreads) __NE___ :
-        _ioCompletionPort{ ::CreateIoCompletionPort( INVALID_HANDLE_VALUE, null, 0, maxThreads )},
-        _cancelledRequest{ MakeRC<_DummyRequest>() }
+        _ioCompletionPort{ ::CreateIoCompletionPort( INVALID_HANDLE_VALUE, null, 0, maxThreads )}
     {
         ASSERT( maxThreads > 0 );
 
@@ -831,7 +821,7 @@ namespace
 
             if_likely( AnyEqual( err, ERROR_SUCCESS, ERROR_HANDLE_EOF, ERROR_OPERATION_ABORTED ) & (overlapped != null) )
             {
-                _RequestBase*   res = Cast<_RequestBase>( overlapped - Bytes{OverlappedOffset});
+                _RequestBase*   res = Cast<_RequestBase>( overlapped - Bytes{_OverlappedOffset});
 
                 res->_Complete( Bytes{byte_transferred}, err, overlapped );
 
@@ -849,49 +839,6 @@ namespace
         return num_events;
     }
 
-/*
-=================================================
-    Resolve
-=================================================
-*/
-    bool  WindowsIOService::Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex) __NE___
-    {
-        using EStatus = AsyncDSRequest::Value_t::EStatus;
-
-        CHECK_ERR( IsInitialized() );
-
-        if_likely( auto* request_pp = dep.GetIf< AsyncDSRequest >() )
-        {
-            if_unlikely( *request_pp == null )
-                return true;
-
-            auto*   request = (*request_pp).get();  // non-null
-
-            ASSERT( DynCast<_RequestBase>(request) != null );
-            ASSERT( DynCast<_RequestBase>(request) == Cast<_RequestBase>(request) );
-
-            // 'true'   - dependency added or successfully complete.
-            // 'false'  - dependency is cancelled or on an error.
-            return Cast<_RequestBase>(request)->_AddOnCompleteDependency( RVRef(task), INOUT bitIndex, True{"strong"} );
-        }
-
-        if_likely( auto* weak_req_pp = dep.GetIf< WeakAsyncDSRequest >() )
-        {
-            if_unlikely( weak_req_pp->_task == null )
-                return true;
-
-            auto*   request = weak_req_pp->_task.get(); // non-null
-
-            ASSERT( DynCast<_RequestBase>(request) != null );
-            ASSERT( DynCast<_RequestBase>(request) == Cast<_RequestBase>(request) );
-
-            Unused( Cast<_RequestBase>(request)->_AddOnCompleteDependency( RVRef(task), INOUT bitIndex, False{"weak"} ));
-            return true;    // always return 'true' because it is weak dependency
-        }
-
-        RETURN_ERR( "unsupported dependency type" );
-    }
-
 
 } // AE::Threading
 
diff --git a/AE/engine/src/threading/DataSource/WinAsyncDataSource.h b/AE/engine/src/threading/DataSource/WinAsyncDataSource.h
index 9c6b1403..b8758f37 100644
--- a/AE/engine/src/threading/DataSource/WinAsyncDataSource.h
+++ b/AE/engine/src/threading/DataSource/WinAsyncDataSource.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "threading/DataSource/AsyncDataSource.h"
-#include "threading/Containers/LfIndexedPool3.h"
+#include "threading/Containers/LfIndexedPool.h"
 
 #ifdef AE_PLATFORM_WINDOWS
 
@@ -29,64 +29,31 @@ namespace AE::Threading
         class AsyncWDataSourceApi;
 
     private:
-        static constexpr uint   OverlappedOffset = sizeof(void*)*3;
-
-        using AsyncRequestPtr = RC<Threading::_hidden_::IAsyncDataSourceRequest>;
-
-
-        //
-        // Dummy Request
-        //
-        class _DummyRequest final : public Threading::_hidden_::IAsyncDataSourceRequest
-        {
-        // methods
-        public:
-            _DummyRequest ()                    __NE___ { _status.store( EStatus::Cancelled ); }
-
-            // IAsyncDataSourceRequest //
-            Result      GetResult ()            C_NE_OV { return Default; }
-            bool        Cancel ()               __NE_OV { return false; }
-            Promise_t   AsPromise (ETaskQueue)  __NE_OV { return Default; }
-        };
-
 
         //
         // Request Base
         //
         class _RequestBase : public Threading::_hidden_::IAsyncDataSourceRequest
         {
-        // types
-        protected:
-            using TaskDependency    = IAsyncTask::TaskDependency;
-            using Dependencies_t    = FixedTupleArray< 4, AsyncTask, TaskDependency >;
-
-
         // variables
         protected:
             Overlapped_t        _overlapped;
 
-            SpinLock            _depsGuard;
-            Dependencies_t      _deps;
-
-            const Index_t       _indexInPool;   // can be used in 'ReadRequestApi' or 'WriteRequestApi'
-
             // read-only data: accessed only in '_Init()' and '_Cleanup()' which are externally synchronized
             RC<>                _memRC;         // keep memory alive
 
 
         // methods
         protected:
-            explicit _RequestBase (Index_t idx)                                                     __NE___;
+            _RequestBase ()                                             __NE___;
 
-                void  _Init (Bytes pos, RC<> mem)                                                   __NE___;
-                void  _Cleanup ()                                                                   __NE___;
-            ND_ bool  _Cancel (const File_t &file)                                                  __NE___;
+                void  _Init (Bytes pos, RC<> mem)                       __NE___;
+                void  _Cleanup ()                                       __NE___;
+            ND_ bool  _Cancel (const File_t &file)                      __NE___;
 
         private:
             friend class WindowsIOService;
-                void  _Complete (Bytes size, long err, const void* ov)                              __NE___;
-
-            ND_ bool  _AddOnCompleteDependency (AsyncTask task, INOUT uint &index, Bool isStrong)   __NE___;
+                void  _Complete (Bytes size, long err, const void* ov)  __NE___;
         };
 
 
@@ -105,8 +72,6 @@ namespace AE::Threading
 
         // methods
         public:
-            explicit ReadRequest (Index_t idx)  __NE___ : _RequestBase{idx} {}
-
             // IAsyncDataSourceRequest //
             Result      GetResult ()            C_NE_OV;
             bool        Cancel ()               __NE_OV;
@@ -114,7 +79,7 @@ namespace AE::Threading
 
         private:
             friend class AsyncRDataSourceApi;
-            ND_ bool  _Create (RC<WinAsyncRDataSource> file, Bytes pos, void* data, Bytes dataSize, RC<SharedMem> mem) __NE___;
+            ND_ bool  _Create (RC<WinAsyncRDataSource> file, Bytes pos, void* data, Bytes dataSize, RC<> mem) __NE___;
 
             ND_ ResultWithRC  _GetResult ()     __NE___;
 
@@ -136,8 +101,6 @@ namespace AE::Threading
 
         // methods
         public:
-            explicit WriteRequest (Index_t idx) __NE___ : _RequestBase{idx} {}
-
             // IAsyncDataSourceRequest //
             Result      GetResult ()            C_NE_OV;
             bool        Cancel ()               __NE_OV;
@@ -154,70 +117,42 @@ namespace AE::Threading
 
 
     private:
+        static constexpr uint       _OverlappedOffset = offsetof( _RequestBase, _overlapped );
+
         template <typename T, usize ChunkSize, usize MaxChunks>
-        using PoolTmpl              = LfIndexedPool2< T, Index_t, ChunkSize, MaxChunks, GlobalLinearAllocatorRef >;
+        using PoolTmpl              = LfIndexedPool< T, Index_t, ChunkSize, MaxChunks, GlobalLinearAllocatorRef >;
 
-        static constexpr uint       _ReqPoolSize = 1u << 10;
+        static constexpr uint       _ReqChunkSize = 1u << 10;
 
-        using ReadRequestPool_t     = PoolTmpl< ReadRequest,  _ReqPoolSize, 8 >;
-        using WriteRequestPool_t    = PoolTmpl< WriteRequest, _ReqPoolSize, 8 >;
+        using ReadRequestPool_t     = PoolTmpl< ReadRequest,  _ReqChunkSize, 8 >;
+        using WriteRequestPool_t    = PoolTmpl< WriteRequest, _ReqChunkSize, 8 >;
 
 
     // variables
     private:
         IOPort_t            _ioCompletionPort;
 
-        AsyncDSRequest      _cancelledRequest;
-
         ReadRequestPool_t   _readResultPool;
         WriteRequestPool_t  _writeResultPool;
 
 
     // methods
     public:
-        ~WindowsIOService ()                                                    __NE___;
+        ~WindowsIOService ()                            __NE___;
 
-        ND_ bool            IsInitialized ()                                    C_NE___;
+        ND_ bool            IsInitialized ()            C_NE___;
 
-        ND_ IOPort_t const& GetIOCompletionPort ()                              C_NE___ { return _ioCompletionPort; }
-        ND_ AsyncDSRequest  GetCancelledRequest ()                              C_NE___ { return _cancelledRequest; }
+        ND_ IOPort_t const& GetIOCompletionPort ()      C_NE___ { return _ioCompletionPort; }
 
 
         // IOService //
-        usize           ProcessEvents ()                                        __NE_OV;
-        EIOServiceType  GetIOServiceType ()                                     C_NE_OV { return EIOServiceType::File; }
+        usize               ProcessEvents ()            __NE_OV;
+        EIOServiceType      GetIOServiceType ()         C_NE_OV { return EIOServiceType::File; }
 
 
     private:
         friend class TaskScheduler;
-        explicit WindowsIOService (uint maxThreads)                             __NE___;
-
-        bool  Resolve (AnyTypeCRef dep, AsyncTask task, INOUT uint &bitIndex)   __NE_OV;
-    };
-
-
-    class WindowsIOService::ReadRequestApi
-    {
-        friend class ReadRequest;
-        static void  Recycle (Index_t indexInPool) __NE___;
-    };
-
-    class WindowsIOService::AsyncRDataSourceApi
-    {
-        friend class WinAsyncRDataSource;
-        ND_ static bool  CreateResult (OUT AsyncDSRequest &, RC<WinAsyncRDataSource> file, Bytes pos, void* data, Bytes dataSize, RC<> mem) __NE___;
-    };
-
-    class WindowsIOService::WriteRequestApi
-    {
-        friend class WriteRequest;
-        static void  Recycle (Index_t indexInPool) __NE___;
-    };
-
-    class WindowsIOService::AsyncWDataSourceApi
-    {
-        friend class WinAsyncWDataSource;
-        ND_ static bool  CreateResult (OUT AsyncDSRequest &, RC<WinAsyncWDataSource> file, Bytes pos, const void* data, Bytes dataSize, RC<> mem) __NE___;
+        explicit WindowsIOService (uint maxThreads)     __NE___;
     };
 //-----------------------------------------------------------------------------
 
diff --git a/AE/engine/src/threading/Memory/FrameAllocator.h b/AE/engine/src/threading/Memory/FrameAllocator.h
index 231951c2..1f55d776 100644
--- a/AE/engine/src/threading/Memory/FrameAllocator.h
+++ b/AE/engine/src/threading/Memory/FrameAllocator.h
@@ -11,15 +11,15 @@ namespace AE::Threading
     // GraphicsFrameAllocatorRef
     //
 
-    class GraphicsFrameAllocatorRef final : public AllocatorRef2< MemoryManagerImpl::FrameAllocator_t >
+    class GraphicsFrameAllocatorRef final : public AllocatorRef< MemoryManagerImpl::FrameAllocator_t >
     {
     public:
         GraphicsFrameAllocatorRef () __NE___ :
-            AllocatorRef2{ MemoryManager().GetGraphicsFrameAllocator().Get() }
+            AllocatorRef{ MemoryManager().GetGraphicsFrameAllocator().Get() }
         {}
 
         explicit GraphicsFrameAllocatorRef (FrameUID frameId) __NE___ :
-            AllocatorRef2{ MemoryManager().GetGraphicsFrameAllocator().Get( frameId )}
+            AllocatorRef{ MemoryManager().GetGraphicsFrameAllocator().Get( frameId )}
         {}
     };
 
diff --git a/AE/engine/src/threading/Memory/GlobalLinearAllocator.h b/AE/engine/src/threading/Memory/GlobalLinearAllocator.h
index 4ccc9e80..f41beb84 100644
--- a/AE/engine/src/threading/Memory/GlobalLinearAllocator.h
+++ b/AE/engine/src/threading/Memory/GlobalLinearAllocator.h
@@ -11,11 +11,11 @@ namespace AE::Threading
     // GlobalLinearAllocatorRef
     //
 
-    class GlobalLinearAllocatorRef final : public AllocatorRef2< MemoryManagerImpl::GlobalLinearAllocator_t >
+    class GlobalLinearAllocatorRef final : public AllocatorRef< MemoryManagerImpl::GlobalLinearAllocator_t >
     {
     public:
         GlobalLinearAllocatorRef () __NE___ :
-            AllocatorRef2{ MemoryManager().GetGlobalLinearAllocator() }
+            AllocatorRef{ MemoryManager().GetGlobalLinearAllocator() }
         {}
     };
 
@@ -41,23 +41,29 @@ namespace AE::Threading
     };
 
 
-#   define AE_GLOBALLY_ALLOC \
-    void*  operator new (std::size_t size) __NE___ \
-    { \
-        return AE::MemoryManager().GetGlobalLinearAllocator().Allocate( SizeAndAlign{ Bytes{size}, DefaultAllocatorAlign }); \
-    } \
-    void*  operator new (std::size_t size, std::align_val_t align) __NE___ \
-    { \
-        return AE::MemoryManager().GetGlobalLinearAllocator().Allocate( SizeAndAlign{ Bytes{size}, Bytes{align} }); \
-    } \
-    void operator delete (void *) __NE___ \
-    {} \
-    void operator delete (void *, std::align_val_t) __NE___ \
-    {} \
-    void operator delete (void *, std::size_t) __NE___ \
-    {} \
-    void operator delete (void *, std::size_t, std::align_val_t) __NE___ \
-    {}
+#   define AE_GLOBALLY_ALLOC                                                                                                    \
+        void*  operator new (std::size_t size) __NE___                                                                          \
+        {                                                                                                                       \
+            return AE::MemoryManager().GetGlobalLinearAllocator().Allocate( SizeAndAlign{ Bytes{size}, DefaultAllocatorAlign });\
+        }                                                                                                                       \
+        void*  operator new (std::size_t size, std::align_val_t align) __NE___                                                  \
+        {                                                                                                                       \
+            return AE::MemoryManager().GetGlobalLinearAllocator().Allocate( SizeAndAlign{ size, align });                       \
+        }                                                                                                                       \
+                                                                                                                                \
+        void operator delete (void *)                                   __NE___ {}                                              \
+        void operator delete (void *, std::align_val_t)                 __NE___ {}                                              \
+        void operator delete (void *, std::size_t)                      __NE___ {}                                              \
+        void operator delete (void *, std::size_t, std::align_val_t)    __NE___ {}                                              \
+
+
+    //
+    // GlobalLinearAllocatorBase
+    //
+    struct GlobalLinearAllocatorBase
+    {
+        AE_GLOBALLY_ALLOC
+    };
 
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/Memory/LfFixedBlockAllocator.h b/AE/engine/src/threading/Memory/LfFixedBlockAllocator.h
index 6ebba73c..7e4ca0b5 100644
--- a/AE/engine/src/threading/Memory/LfFixedBlockAllocator.h
+++ b/AE/engine/src/threading/Memory/LfFixedBlockAllocator.h
@@ -5,6 +5,7 @@
 #ifndef AE_LFAS_ENABLED
 # include "threading/Primitives/SpinLock.h"
 # include "threading/Primitives/SyncEvent.h"
+# include "threading/Primitives/DataRaceCheck.h"
 #endif
 
 #ifdef AE_DEBUG
@@ -17,7 +18,7 @@ namespace AE::Threading
 {
 
     //
-    // Lock-free Fixed block Allocator
+    // Lock-free Fixed block Allocator v3
     //
 
     template <usize ChunkSize_v = 64*64,
@@ -25,15 +26,15 @@ namespace AE::Threading
               typename BlockAllocatorType   = UntypedAllocator,
               typename GeneralAllocatorType = UntypedAllocator
              >
-    class LfFixedBlockAllocator final : public Noncopyable
+    class LfFixedBlockAllocator final : public IAllocatorTS
     {
-        STATIC_ASSERT( ChunkSize_v > 0 );
-        STATIC_ASSERT( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
-        STATIC_ASSERT( ChunkSize_v <= 64*64 );
-        STATIC_ASSERT( MaxChunks_v > 0 );
-        STATIC_ASSERT( IsPowerOfTwo( ChunkSize_v ));    // must be power of 2 to increase performance
-        STATIC_ASSERT( BlockAllocatorType::IsThreadSafe );
-        STATIC_ASSERT( GeneralAllocatorType::IsThreadSafe );
+        StaticAssert( ChunkSize_v > 0 );
+        StaticAssert( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
+        StaticAssert( ChunkSize_v <= 64*64 );
+        StaticAssert( MaxChunks_v > 0 );
+        StaticAssert( IsPowerOfTwo( ChunkSize_v )); // must be power of 2 to increase performance
+        StaticAssert( BlockAllocatorType::IsThreadSafe );
+        StaticAssert( GeneralAllocatorType::IsThreadSafe );
 
     // types
     public:
@@ -42,8 +43,6 @@ namespace AE::Threading
         using GenAllocator_t    = GeneralAllocatorType;
         using Ptr_t             = RstPtr<void>;
 
-        static constexpr bool   IsThreadSafe = true;
-
     private:
         static constexpr uint   ChunkSize       = ChunkSize_v;
         static constexpr uint   MaxChunks       = MaxChunks_v;
@@ -54,42 +53,54 @@ namespace AE::Threading
         using LowLevels_t       = StaticArray< Atomic< LowLevelBits_t >, HiLevel_Count >;
         using HiLevelBits_t     = Conditional< (HiLevel_Count <= 32), uint, ulong >;
 
-        STATIC_ASSERT( HiLevel_Count <= 64 );
+        StaticAssert( HiLevel_Count <= 64 );
 
-        struct alignas(AE_CACHE_LINE) ChunkInfo
+        struct alignas(AE_CACHE_LINE) BottomChunk
         {
-            Atomic< HiLevelBits_t > hiLevel;        // 0 - is unassigned bit, 1 - assigned bit
-            SpinLockRelaxed         hiLevelGuard;   // only for 'hiLevel' modification
-
-            LowLevels_t             lowLevel;       // 0 - is unassigned bit, 1 - assigned bit
-            Atomic< void * >        memBlock;
+            SpinLockRelaxed             hiLevelGuard;   // only for 'hiLevel' modification
+            Atomic< HiLevelBits_t >     hiLevel;        // 0 - is unassigned bit, 1 - assigned bit
+            LowLevels_t                 lowLevel;       // 0 - is unassigned bit, 1 - assigned bit
+            Atomic< void * >            memBlock;
 
             #if AE_LFFIXEDBLOCKALLOC_DEBUG
-            Atomic< SourceLoc *>    dbgInfo;
-            SyncEvent               dbgInfoEvent {SyncEvent::EFlags::ManualReset};
+            Atomic< SourceLoc *>        dbgInfo;
+            SyncEvent                   dbgInfoEvent {SyncEvent::EFlags::ManualReset};
             #endif
         };
 
-        using ChunkInfos_t  = StaticArray< ChunkInfo, MaxChunks >;
-
         static constexpr HiLevelBits_t  MaxHighLevel        = ToBitMask<HiLevelBits_t>( HiLevel_Count );
         static constexpr HiLevelBits_t  InitialHighLevel    = ~MaxHighLevel;
         static constexpr uint           HighWaitCount       = 2;
-        static constexpr usize          ThreadToChunkMask   = MaxChunks < 5 ? 0 : 15;
+        static constexpr usize          ThreadToChunkMask   = MaxChunks < 5 ? 0 : 3;
+
+        using TopLevelBits_t    = Conditional< (MaxChunks <= 32), uint, ulong >;
+        static constexpr uint   TopLevel_Count  = (MaxChunks + CT_SizeOfInBits<TopLevelBits_t> - 1) / CT_SizeOfInBits<TopLevelBits_t>;
+
+        struct TopChunk
+        {
+            SpinLockRelaxed             assignedGuard;  // only for 'assigned' modification
+            Atomic< TopLevelBits_t >    assigned;       // 0 - is unassigned bit, 1 - assigned bit
+        };
+
+        using BottomChunks_t    = StaticArray< BottomChunk, MaxChunks >;
+        using TopChunks_t       = StaticArray< TopChunk, TopLevel_Count >;
 
 
     // variables
     private:
-        ChunkInfos_t        _chunkInfo;
+        TopChunks_t         _topChunks;
         const POTBytes      _blockSize;
         const POTBytes      _blockAlign;
+        BlockAllocator_t    _blockAlloc;
 
-        NO_UNIQUE_ADDRESS BlockAllocator_t  _blockAlloc;
         NO_UNIQUE_ADDRESS GenAllocator_t    _genAlloc;
+        NO_UNIQUE_ADDRESS BottomChunks_t    _bottomChunks;
 
         Atomic<ulong>       _dbgCounter     {0};
         Atomic<ulong>       _dbgLockCounter {0};
 
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
+
 
     // methods
     public:
@@ -98,26 +109,35 @@ namespace AE::Threading
                                 const BlockAllocator_t& blockAlloc  = Default,
                                 const GenAllocator_t&   genAlloc    = Default) __NE___;
 
-        ~LfFixedBlockAllocator ()                   __NE___ { Release( true ); }
+        ~LfFixedBlockAllocator ()                           __NE___ { Release( True{"checkMemLeak"} ); }
+
+            void    Release (Bool checkMemLeak)             __NE___;
+
+        ND_ Ptr_t   AllocBlock ()                           __NE___ { return AllocBlock( Default ); }
+        ND_ Ptr_t   AllocBlock (const SourceLoc &loc)       __NE___;
+            bool    DeallocBlock (void *)                   __NE___;
+
+        ND_ Bytes   BlockSize ()                            C_NE___ { return Bytes{ _blockSize }; }
+        ND_ Bytes   BlockAlign ()                           C_NE___ { return Bytes{ _blockAlign }; }
+        ND_ POTBytes BlockSizePOT ()                        C_NE___ { return _blockSize; }
+        ND_ POTBytes BlockAlignPOT ()                       C_NE___ { return _blockAlign; }
 
-        ND_ Ptr_t       Alloc ()                    __NE___ { return Alloc( Default ); }
-        ND_ Ptr_t       Alloc (const SourceLoc &loc)__NE___;
-            bool        Dealloc (void *)            __NE___;
+        ND_ Bytes   LargeBlockSize ()                       C_NE___ { return BlockSize() * ChunkSize; }
+        ND_ Bytes   MaxMemorySize ()                        C_NE___ { return LargeBlockSize() * MaxChunks; }
+        ND_ usize   MaxBlockCount ()                        C_NE___ { return MaxChunks * ChunkSize; }
+        ND_ Bytes   AllocatedSize ()                        C_NE___;
 
-            void        Release (bool checkMemLeak) __NE___;
 
-        ND_ Bytes       BlockSize ()                C_NE___ { return Bytes{ _blockSize }; }
-        ND_ Bytes       BlockAlign ()               C_NE___ { return Bytes{ _blockAlign }; }
-        ND_ POTBytes    BlockSizePOT ()             C_NE___ { return _blockSize; }
-        ND_ POTBytes    BlockAlignPOT ()            C_NE___ { return _blockAlign; }
+        // IAllocator //
+        ND_ void*   Allocate (const SizeAndAlign sa)        __NE_OV;
+            void    Deallocate (void*, const SizeAndAlign)  __NE_OV;
+            void    Deallocate (void* ptr)                  __NE_OV { CHECK( DeallocBlock( ptr )); }
 
-        ND_ Bytes       LargeBlockSize ()           C_NE___ { return BlockSize() * ChunkSize; }
-        ND_ Bytes       MaxMemorySize ()            C_NE___ { return LargeBlockSize() * MaxChunks; }
-        ND_ usize       MaxBlockCount ()            C_NE___ { return MaxChunks * ChunkSize; }
-        ND_ Bytes       AllocatedSize ()            C_NE___;
+            using IAllocator::Allocate;
+            using IAllocator::Deallocate;
 
     private:
-        ND_ Ptr_t       _Alloc (uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___;
+        ND_ Ptr_t  _Alloc (uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___;
 
         ND_ static constexpr Bytes  _DbgInfoSize () __NE___ { return SizeOf<SourceLoc> * ChunkSize; }
         ND_ static constexpr Bytes  _DbgInfoAlign ()__NE___ { return AlignOf<SourceLoc>; }
diff --git a/AE/engine/src/threading/Memory/LfFixedBlockAllocator.inl.h b/AE/engine/src/threading/Memory/LfFixedBlockAllocator.inl.h
index f7758ea0..8a052ee0 100644
--- a/AE/engine/src/threading/Memory/LfFixedBlockAllocator.inl.h
+++ b/AE/engine/src/threading/Memory/LfFixedBlockAllocator.inl.h
@@ -9,36 +9,46 @@ namespace AE::Threading
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    LfFixedBlockAllocator<CS,MC,BA,GA>::LfFixedBlockAllocator  (Bytes blockSize,
-                                                                Bytes blockAlign,
-                                                                const BlockAllocator_t& blockAlloc,
-                                                                const GenAllocator_t&   genAlloc) __NE___ :
+    LfFixedBlockAllocator<CS,MC,BA,GA>::LfFixedBlockAllocator (Bytes blockSize,
+                                                                 Bytes blockAlign,
+                                                                 const BlockAllocator_t&    blockAlloc,
+                                                                 const GenAllocator_t&      genAlloc) __NE___ :
         _blockSize{ blockSize },
         _blockAlign{ blockAlign },
         _blockAlloc{ blockAlloc },
         _genAlloc{ genAlloc }
     {
+        DRC_EXLOCK( _drCheck );
+
         ASSERT( BlockSize() == blockSize );
         ASSERT( BlockAlign() == blockAlign );
 
-        for (usize i = 0; i < MaxChunks; ++i)
+        StaticArray< TopLevelBits_t, TopLevel_Count >   top_bits = {};
+
+        for (usize i = 0; i < _bottomChunks.size(); ++i)
         {
-            auto&   chunk = _chunkInfo[i];
+            auto&   chunk   = _bottomChunks[i];
+            auto&   top     = top_bits[ i / CT_SizeOfInBits<TopLevelBits_t> ];
 
             for (usize j = 0; j < HiLevel_Count; ++j)
             {
                 chunk.lowLevel[j].store( 0 );
             }
 
-            chunk.hiLevel.store( InitialHighLevel );    // set 0 bits for working range, 1 bit for unused bits
+            chunk.hiLevel.store( InitialHighLevel );    // set 0 bit for working range, 1 bit for unused bits
             chunk.memBlock.store( null );
 
+            top |= TopLevelBits_t{1} << (i % CT_SizeOfInBits<TopLevelBits_t>);
+
             #if AE_LFFIXEDBLOCKALLOC_DEBUG
             chunk.dbgInfo.store( null );
             #endif
         }
 
-        MemoryBarrier( EMemoryOrder::Release );
+        for (usize i = 0; i < _topChunks.size(); ++i)
+        {
+            _topChunks[i].assigned.store( ~top_bits[i] );   // set 0 bit for working range, 1 bit for unused bits
+        }
     }
 
 /*
@@ -49,14 +59,15 @@ namespace AE::Threading
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    void  LfFixedBlockAllocator<CS,MC,BA,GA>::Release (bool checkMemLeak) __NE___
+    void  LfFixedBlockAllocator<CS,MC,BA,GA>::Release (Bool checkMemLeak) __NE___
     {
-        MemoryBarrier( EMemoryOrder::Acquire );
+        DRC_EXLOCK( _drCheck );
 
         for (usize i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk   = _chunkInfo[i];
-            void*   ptr     = chunk.memBlock.exchange( null );
+            auto&   chunk       = _bottomChunks[i];
+            void*   ptr         = chunk.memBlock.exchange( null );
+            auto&   top_chunk   = _topChunks[ i / CT_SizeOfInBits<TopLevelBits_t> ];
 
             if ( ptr != null )
                 _blockAlloc.Deallocate( ptr, SizeAndAlign{ LargeBlockSize(), BlockAlign() });
@@ -66,8 +77,14 @@ namespace AE::Threading
             HiLevelBits_t   old_hi_level = chunk.hiLevel.exchange( InitialHighLevel );
 
             if ( checkMemLeak )
+            {
                 CHECK( old_hi_level == InitialHighLevel );  // some blocks is still allocated
 
+                TopLevelBits_t  top_bits    = top_chunk.assigned.load();
+                TopLevelBits_t  top_lvl_bit = TopLevelBits_t{1} << (i % CT_SizeOfInBits<TopLevelBits_t>);
+                CHECK( not (top_bits & top_lvl_bit) );
+            }
+
             #if AE_LFFIXEDBLOCKALLOC_DEBUG
             SourceLoc*  dbg_info = chunk.dbgInfo.exchange( null );
             #endif
@@ -92,9 +109,8 @@ namespace AE::Threading
 
                             AE_LOGI( "Leaked memory block: "s << ToString( BlockSize() ), dbg.file, dbg.line );
 
-                            old_low_level &= (LowLevelBits_t{1} << low_idx);    // 1 -> 0
-
-                            low_idx = BitScanForward( old_low_level );  // first 1 bit
+                            old_low_level   &= (LowLevelBits_t{1} << low_idx);  // 1 -> 0
+                            low_idx         = BitScanForward( old_low_level );  // first 1 bit
                         }
                     }
                     #endif
@@ -118,13 +134,15 @@ namespace AE::Threading
 
 /*
 =================================================
-    Alloc
+    AllocBlock
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
     typename LfFixedBlockAllocator<CS,MC,BA,GA>::Ptr_t
-        LfFixedBlockAllocator<CS,MC,BA,GA>::Alloc (const SourceLoc &loc) __NE___
+        LfFixedBlockAllocator<CS,MC,BA,GA>::AllocBlock (const SourceLoc &loc) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         struct Dbg
         {
             ulong   counter = 0;
@@ -141,32 +159,22 @@ namespace AE::Threading
             }
         } dbg{ *this };
 
-        for (uint i = ThreadUtils::GetIntID() & ThreadToChunkMask;
-            i < MaxChunks; i += (ThreadToChunkMask >> 1))
+        for (usize i = 0; i < _topChunks.size(); ++i, ++dbg.counter)
         {
-            auto&   chunk = _chunkInfo[i];
+            auto&           top_chunk   = _topChunks[i];
+            TopLevelBits_t  available   = ~top_chunk.assigned.load();   // 1 - unassigned
+            int             idx         = BitScanForward( available );  // first 1 bit
 
-            if ( chunk.hiLevel.load() == UMax )
-                continue;
-
-            Ptr_t   ptr = _Alloc( i, loc, INOUT dbg.counter, INOUT dbg.locks );
-
-            if_likely( ptr != null )
-                return ptr;
-        }
-
-        // TODO
-        for (uint i = 0; i < MaxChunks; ++i)
-        {
-            auto&   chunk = _chunkInfo[i];
-
-            if ( chunk.hiLevel.load() == UMax )
-                continue;
+            for (; idx >= 0; ++dbg.counter)
+            {
+                Ptr_t   ptr = _Alloc( uint(idx + i * CT_SizeOfInBits<TopLevelBits_t>), loc, INOUT dbg.counter, INOUT dbg.locks );
 
-            Ptr_t   ptr = _Alloc( i, loc, INOUT dbg.counter, INOUT dbg.locks );
+                if_likely( ptr != null )
+                    return ptr;
 
-            if_likely( ptr != null )
-                return ptr;
+                available   &= ~(TopLevelBits_t{1} << idx);     // 1 -> 0
+                idx         = BitScanForward( available );      // first 1 bit
+            }
         }
 
         return null;
@@ -181,15 +189,11 @@ namespace AE::Threading
     typename LfFixedBlockAllocator<CS,MC,BA,GA>::Ptr_t
         LfFixedBlockAllocator<CS,MC,BA,GA>::_Alloc (const uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___
     {
-        Unused( loc );
-
-        ChunkInfo&  chunk   = _chunkInfo[ chunkIndex ];
-        void*       ptr     = chunk.memBlock.load( EMemoryOrder::Acquire );
-        ++dbgCounter;
+        BottomChunk&    chunk   = _bottomChunks[ chunkIndex ];
+        auto*           ptr     = chunk.memBlock.load( EMemoryOrder::Acquire );
 
         #if AE_LFFIXEDBLOCKALLOC_DEBUG
         SourceLoc*  dbg_info = chunk.dbgInfo.load( EMemoryOrder::Acquire );
-        ++dbgCounter;
         #endif
 
         // allocate new block
@@ -237,6 +241,7 @@ namespace AE::Threading
             }
             else
             {
+                // TODO: memleak in linear allocator
                 ASSERT( ptr != null );
                 _blockAlloc.Deallocate( new_block, SizeAndAlign{ LargeBlockSize(), BlockAlign() });
 
@@ -255,7 +260,7 @@ namespace AE::Threading
         // find available index in high level
         for (uint j = 0; j < HighWaitCount; ++j, ++dbgCounter)
         {
-            HiLevelBits_t   hi_available    = ~chunk.hiLevel.load();            // 1 - unassigned bit
+            HiLevelBits_t   hi_available    = ~chunk.hiLevel.load();            // 1 - unassigned
             int             hi_lvl_idx      = BitScanForward( hi_available );   // first 1 bit
 
             for (; hi_lvl_idx >= 0; ++dbgCounter)
@@ -264,28 +269,47 @@ namespace AE::Threading
 
                 // find available index in low level
                 auto&           level           = chunk.lowLevel[ hi_lvl_idx ];
-                LowLevelBits_t  low_available   = level.load();                     // 0 - unassigned bit
+                LowLevelBits_t  low_available   = level.load();                     // 0 - unassigned
                 int             low_lvl_idx     = BitScanForward( ~low_available ); // first 0 bit
 
                 for (; low_lvl_idx >= 0; ++dbgCounter)
                 {
                     const LowLevelBits_t    low_lvl_bit = (LowLevelBits_t{1} << low_lvl_idx);
 
-                    if ( level.CAS( INOUT low_available, low_available | low_lvl_bit ))     // 0 -> 1
+                    if_likely( level.CAS( INOUT low_available, low_available | low_lvl_bit ))   // 0 -> 1
                     {
                         // update high level
                         if_unlikely( low_available == ~low_lvl_bit )
                         {
-                            EXLOCK( chunk.hiLevelGuard );
-                            ++lockCounter;
+                            bool    update_top  = false;
+                            {
+                                EXLOCK( chunk.hiLevelGuard );
+                                ++lockCounter;
 
-                            // low level value may be changed at any time so check it inside spinlock
-                            if ( level.load() == UMax )
+                                // low level value may be changed at any time so check it inside spinlock
+                                if ( level.load() == UMax )
+                                {
+                                    const auto  hi_lvl_bit  = (HiLevelBits_t{1} << hi_lvl_idx);
+
+                                    update_top = (chunk.hiLevel.Or( hi_lvl_bit ) == MaxHighLevel);  // 0 -> 1
+                                    ++dbgCounter;
+                                }
+                            }
+
+                            if_unlikely( update_top )
                             {
-                                const auto  hi_lvl_bit = (HiLevelBits_t{1} << hi_lvl_idx);
+                                auto&   top_chunk = _topChunks[ chunkIndex / CT_SizeOfInBits<TopLevelBits_t> ];
+
+                                EXLOCK( top_chunk.assignedGuard );
+                                ++lockCounter;
+
+                                if ( chunk.hiLevel.load() == MaxHighLevel )
+                                {
+                                    const auto  top_lvl_bit = TopLevelBits_t{1} << (chunkIndex % CT_SizeOfInBits<TopLevelBits_t>);
 
-                                chunk.hiLevel.fetch_or( hi_lvl_bit );   // 0 -> 1
-                                ++dbgCounter;
+                                    top_chunk.assigned.fetch_or( top_lvl_bit ); // 0 -> 1
+                                    ++dbgCounter;
+                                }
                             }
                         }
 
@@ -299,6 +323,7 @@ namespace AE::Threading
                             MemoryBarrier( EMemoryOrder::Release );
                         }
                         #endif
+                        Unused( loc );
 
                         void*   result = ptr + BlockSize() * idx_in_chunk;
 
@@ -323,17 +348,19 @@ namespace AE::Threading
 
 /*
 =================================================
-    Dealloc
+    DeallocBlock
 =================================================
 */
     template <usize CS, usize MC, typename BA, typename GA>
-    bool  LfFixedBlockAllocator<CS,MC,BA,GA>::Dealloc (void* ptr) __NE___
+    bool  LfFixedBlockAllocator<CS,MC,BA,GA>::DeallocBlock (void* ptr) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         const Bytes block_size  = LargeBlockSize();
 
         for (uint i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk   = _chunkInfo[i];
+            auto&   chunk   = _bottomChunks[i];
             void*   mem     = chunk.memBlock.load();
 
             if ( ptr < mem or ptr >= mem + block_size )
@@ -362,14 +389,31 @@ namespace AE::Threading
             // update high level bits
             if_unlikely( old_bits == UMax )
             {
-                EXLOCK( chunk.hiLevelGuard );
+                bool    update_top  = false;
+                {
+                    EXLOCK( chunk.hiLevelGuard );
+
+                    // low level value may be changed at any time so check it inside spinlock
+                    if ( level.load() != UMax )
+                    {
+                        const auto  hi_lvl_bit  = (HiLevelBits_t{1} << hi_lvl_idx);
 
-                // low level value may be changed at any time so check it inside spinlock
-                if ( level.load() != UMax )
+                        update_top = (chunk.hiLevel.fetch_and( ~hi_lvl_bit ) == MaxHighLevel);  // 1 -> 0
+                    }
+                }
+
+                if_unlikely( update_top )
                 {
-                    const auto  hi_bit  = (HiLevelBits_t{1} << hi_lvl_idx);
+                    auto&   top_chunk = _topChunks[ i / CT_SizeOfInBits<TopLevelBits_t> ];
+
+                    EXLOCK( top_chunk.assignedGuard );
 
-                    chunk.hiLevel.fetch_and( ~hi_bit ); // 1 -> 0
+                    if ( chunk.hiLevel.load() != MaxHighLevel )
+                    {
+                        const auto  top_lvl_bit = TopLevelBits_t{1} << (i % CT_SizeOfInBits<TopLevelBits_t>);
+
+                        top_chunk.assigned.fetch_and( ~top_lvl_bit );   // 1 -> 0
+                    }
                 }
             }
             return true;
@@ -387,12 +431,14 @@ namespace AE::Threading
     template <usize CS, usize MC, typename BA, typename GA>
     Bytes  LfFixedBlockAllocator<CS,MC,BA,GA>::AllocatedSize () C_NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         const Bytes block_size  = LargeBlockSize();
         Bytes       result;
 
         for (uint i = 0; i < MaxChunks; ++i)
         {
-            auto&   chunk   = _chunkInfo[i];
+            auto&   chunk   = _bottomChunks[i];
 
             if ( chunk.memBlock.load() != null )
                 result += block_size;
@@ -400,4 +446,32 @@ namespace AE::Threading
         return result;
     }
 
+/*
+=================================================
+    Allocate
+=================================================
+*/
+    template <usize CS, usize MC, typename BA, typename GA>
+    void*  LfFixedBlockAllocator<CS,MC,BA,GA>::Allocate (const SizeAndAlign sizeAndAlign) __NE___
+    {
+        CHECK_ERR(  sizeAndAlign.size  <= BlockSize() and
+                    sizeAndAlign.align <= BlockAlign() );
+        return AllocBlock();
+    }
+
+/*
+=================================================
+    Deallocate
+=================================================
+*/
+    template <usize CS, usize MC, typename BA, typename GA>
+    void  LfFixedBlockAllocator<CS,MC,BA,GA>::Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE___
+    {
+        ASSERT( sizeAndAlign.size  <= BlockSize() and
+                sizeAndAlign.align <= BlockAlign() );
+        Unused( sizeAndAlign );
+        CHECK( DeallocBlock( ptr ));
+    }
+
+
 } // AE::Threading
diff --git a/AE/engine/src/threading/Memory/LfFixedBlockAllocator3.h b/AE/engine/src/threading/Memory/LfFixedBlockAllocator3.h
deleted file mode 100644
index afa0ce5c..00000000
--- a/AE/engine/src/threading/Memory/LfFixedBlockAllocator3.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#pragma once
-
-#ifndef AE_LFAS_ENABLED
-# include "threading/Primitives/SpinLock.h"
-# include "threading/Primitives/SyncEvent.h"
-#endif
-
-#ifdef AE_DEBUG
-#   define AE_LFFIXEDBLOCKALLOC_DEBUG   1
-#else
-#   define AE_LFFIXEDBLOCKALLOC_DEBUG   0
-#endif
-
-namespace AE::Threading
-{
-
-    //
-    // Lock-free Fixed block Allocator
-    //
-
-    template <usize ChunkSize_v = 64*64,
-              usize MaxChunks_v = 1024,
-              typename BlockAllocatorType   = UntypedAllocator,
-              typename GeneralAllocatorType = UntypedAllocator
-             >
-    class LfFixedBlockAllocator3 final : public Noncopyable
-    {
-        STATIC_ASSERT( ChunkSize_v > 0 );
-        STATIC_ASSERT( IsMultipleOf( ChunkSize_v, 32 ) or IsMultipleOf( ChunkSize_v, 64 ));
-        STATIC_ASSERT( ChunkSize_v <= 64*64 );
-        STATIC_ASSERT( MaxChunks_v > 0 );
-        STATIC_ASSERT( IsPowerOfTwo( ChunkSize_v ));    // must be power of 2 to increase performance
-        STATIC_ASSERT( BlockAllocatorType::IsThreadSafe );
-        STATIC_ASSERT( GeneralAllocatorType::IsThreadSafe );
-
-    // types
-    public:
-        using Self              = LfFixedBlockAllocator3< ChunkSize_v, MaxChunks_v, BlockAllocatorType, GeneralAllocatorType >;
-        using BlockAllocator_t  = BlockAllocatorType;
-        using GenAllocator_t    = GeneralAllocatorType;
-        using Ptr_t             = RstPtr<void>;
-
-        static constexpr bool   IsThreadSafe = true;
-
-    private:
-        static constexpr uint   ChunkSize       = ChunkSize_v;
-        static constexpr uint   MaxChunks       = MaxChunks_v;
-        static constexpr uint   LowLevel_Count  = (ChunkSize <= 32 ? 32 : 64);
-        static constexpr uint   HiLevel_Count   = Max( 1u, (ChunkSize + LowLevel_Count - 1) / LowLevel_Count );
-
-        using LowLevelBits_t    = Conditional< (LowLevel_Count <= 32), uint, ulong >;
-        using LowLevels_t       = StaticArray< Atomic< LowLevelBits_t >, HiLevel_Count >;
-        using HiLevelBits_t     = Conditional< (HiLevel_Count <= 32), uint, ulong >;
-
-        STATIC_ASSERT( HiLevel_Count <= 64 );
-
-        struct alignas(AE_CACHE_LINE) BottomChunk
-        {
-            SpinLockRelaxed             hiLevelGuard;   // only for 'hiLevel' modification
-            Atomic< HiLevelBits_t >     hiLevel;        // 0 - is unassigned bit, 1 - assigned bit
-            LowLevels_t                 lowLevel;       // 0 - is unassigned bit, 1 - assigned bit
-            Atomic< void * >            memBlock;
-
-            #if AE_LFFIXEDBLOCKALLOC_DEBUG
-            Atomic< SourceLoc *>        dbgInfo;
-            SyncEvent                   dbgInfoEvent {SyncEvent::EFlags::ManualReset};
-            #endif
-        };
-
-        static constexpr HiLevelBits_t  MaxHighLevel        = ToBitMask<HiLevelBits_t>( HiLevel_Count );
-        static constexpr HiLevelBits_t  InitialHighLevel    = ~MaxHighLevel;
-        static constexpr uint           HighWaitCount       = 2;
-        static constexpr usize          ThreadToChunkMask   = MaxChunks < 5 ? 0 : 3;
-
-        using TopLevelBits_t    = Conditional< (MaxChunks <= 32), uint, ulong >;
-        static constexpr uint   TopLevel_Count  = (MaxChunks + CT_SizeOfInBits<TopLevelBits_t> - 1) / CT_SizeOfInBits<TopLevelBits_t>;
-
-        struct TopChunk
-        {
-            SpinLockRelaxed             assignedGuard;  // only for 'assigned' modification
-            Atomic< TopLevelBits_t >    assigned;       // 0 - is unassigned bit, 1 - assigned bit
-        };
-
-        using BottomChunks_t    = StaticArray< BottomChunk, MaxChunks >;
-        using TopChunks_t       = StaticArray< TopChunk, TopLevel_Count >;
-
-
-    // variables
-    private:
-        TopChunks_t         _topChunks;
-        const POTBytes      _blockSize;
-        const POTBytes      _blockAlign;
-        BlockAllocator_t    _blockAlloc;
-
-        NO_UNIQUE_ADDRESS GenAllocator_t    _genAlloc;
-        NO_UNIQUE_ADDRESS BottomChunks_t    _bottomChunks;
-
-        Atomic<ulong>       _dbgCounter     {0};
-        Atomic<ulong>       _dbgLockCounter {0};
-
-
-    // methods
-    public:
-        LfFixedBlockAllocator3  (Bytes blockSize,
-                                Bytes blockAlign,
-                                const BlockAllocator_t& blockAlloc  = Default,
-                                const GenAllocator_t&   genAlloc    = Default) __NE___;
-
-        ~LfFixedBlockAllocator3 ()                  __NE___ { Release( true ); }
-
-        ND_ Ptr_t   Alloc ()                        __NE___ { return Alloc( Default ); }
-        ND_ Ptr_t   Alloc (const SourceLoc &loc)    __NE___;
-            bool    Dealloc (void *)                __NE___;
-
-        ND_ Bytes   BlockSize ()                    C_NE___ { return Bytes{ _blockSize }; }
-        ND_ Bytes   BlockAlign ()                   C_NE___ { return Bytes{ _blockAlign }; }
-        ND_ Bytes   LargeBlockSize ()               C_NE___ { return BlockSize() * ChunkSize; }
-        ND_ Bytes   MaxMemorySize ()                C_NE___ { return LargeBlockSize() * MaxChunks; }
-        ND_ usize   MaxBlockCount ()                C_NE___ { return MaxChunks * ChunkSize; }
-        ND_ Bytes   AllocatedSize ()                C_NE___;
-
-            void    Release (bool checkMemLeak)     __NE___;
-
-    private:
-        ND_ Ptr_t  _Alloc (uint chunkIndex, const SourceLoc &loc, INOUT ulong& dbgCounter, INOUT ulong& lockCounter) __NE___;
-
-        ND_ static constexpr Bytes  _DbgInfoSize () __NE___ { return SizeOf<SourceLoc> * ChunkSize; }
-        ND_ static constexpr Bytes  _DbgInfoAlign ()__NE___ { return AlignOf<SourceLoc>; }
-    };
-
-
-} // AE::Threading
-
-#include "threading/Memory/LfFixedBlockAllocator3.inl.h"
-#undef AE_LFFIXEDBLOCKALLOC_DEBUG
diff --git a/AE/engine/src/threading/Memory/LfLinearAllocator.h b/AE/engine/src/threading/Memory/LfLinearAllocator.h
index 3d4360dc..c3367bd8 100644
--- a/AE/engine/src/threading/Memory/LfLinearAllocator.h
+++ b/AE/engine/src/threading/Memory/LfLinearAllocator.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #ifndef AE_LFAS_ENABLED
-# include "threading/Primitives/SyncEvent.h"
+# include "threading/Primitives/DataRaceCheck.h"
 #endif
 
 namespace AE::Threading
@@ -15,33 +15,31 @@ namespace AE::Threading
     //
 
     template <usize BlockSize_v     = usize(SmallAllocationSize),   // in bytes
-              usize MemAlign        = 8,
-              usize MaxBlocks       = 16,
+              usize MemAlign        = AE_CACHE_LINE,                // in bytes
+              usize MaxBlocks_v     = 16,
               typename AllocatorType = UntypedAllocator
              >
-    class LfLinearAllocator final : public Noncopyable
+    class LfLinearAllocator final : public IAllocatorTS
     {
-        STATIC_ASSERT( BlockSize_v > 0 );
-        STATIC_ASSERT( MaxBlocks > 0 and MaxBlocks < 64 );
+        StaticAssert( BlockSize_v > 0 );
+        StaticAssert( MaxBlocks_v > 0 and MaxBlocks_v < 64 );
 
     // types
     public:
-        using Self          = LfLinearAllocator< BlockSize_v, MemAlign, MaxBlocks, AllocatorType >;
+        using Self          = LfLinearAllocator< BlockSize_v, MemAlign, MaxBlocks_v, AllocatorType >;
         using Index_t       = uint;
         using Allocator_t   = AllocatorType;
 
-        static constexpr bool   IsThreadSafe = true;
-
     private:
         struct alignas(AE_CACHE_LINE) MemBlock
         {
             Atomic< void *>     mem     {null};
-            Atomic< usize >     size    {0};            // <= _Capacity
+            Atomic< usize >     size    {0};            // <= BlockSize()
         };
-        using MemBlocks_t = StaticArray< MemBlock, MaxBlocks >;
+        using MemBlocks_t = StaticArray< MemBlock, MaxBlocks_v >;
 
         static constexpr Bytes  _Capacity {BlockSize_v};
-        static constexpr Bytes  _MemAlign {MemAlign};
+        static constexpr Bytes  _MemAlign {MemAlign};   // TODO: min align as cache line size?
 
 
     // variables
@@ -53,6 +51,8 @@ namespace AE::Threading
         NO_UNIQUE_ADDRESS
          Allocator_t        _allocator;
 
+        DRC_ONLY( RWDataRaceCheck   _drCheck;)
+
 
     // methods
     public:
@@ -61,24 +61,25 @@ namespace AE::Threading
 
 
         // must be externally synchronized
-            void   Release ()                                               __NE___;
-            void   Discard ()                                               __NE___;
-        ND_ Bytes  CurrentSize ()                                           C_NE___;
+            void    Release ()                                              __NE___;
+            void    Discard ()                                              __NE___;
 
+        ND_ Bytes   CurrentSize ()                                          C_NE___;
 
-        template <typename T>
-        ND_ T*      Allocate (usize count = 1)                              __NE___ { return Cast<T>( Allocate( SizeAndAlignOf<T> * count )); }
-        ND_ void*   Allocate (Bytes size)                                   __NE___ { return Allocate( SizeAndAlign{ size, DefaultAllocatorAlign }); }
-        ND_ void*   Allocate (const SizeAndAlign sizeAndAlign)              __NE___;
+        ND_ static constexpr Bytes  BlockSize ()                            __NE___ { return _Capacity; }
+        ND_ static constexpr Bytes  MaxSize ()                              __NE___ { return MaxBlocks_v * _Capacity; }
+        ND_ static constexpr usize  MaxBlocks ()                            __NE___ { return MaxBlocks_v; }
 
-        // only for debugging
-        void  Deallocate (void *ptr, const SizeAndAlign sizeAndAlign)       __NE___ { Deallocate( ptr, sizeAndAlign.size ); }
-        void  Deallocate (void *ptr, const Bytes size)                      __NE___;
-        void  Deallocate (void *ptr)                                        __NE___ { Deallocate( ptr, 1_b ); }
 
+        // IAllocator //
+        ND_ void*   Allocate (const SizeAndAlign sizeAndAlign)              __NE_OV;
 
-        ND_ static constexpr Bytes  BlockSize ()                            __NE___ { return _Capacity; }
-        ND_ static constexpr Bytes  MaxSize ()                              __NE___ { return MaxBlocks * _Capacity; }
+        // only for debugging
+            void    Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE_OV { Deallocate( ptr, sizeAndAlign.size ); }
+            void    Deallocate (void* ptr, const Bytes size)                __NE_OV;
+            void    Deallocate (void* ptr)                                  __NE_OV { Deallocate( ptr, 1_b ); }
+
+            using IAllocator::Allocate;
     };
 
 
diff --git a/AE/engine/src/threading/Memory/LfLinearAllocator.inl.h b/AE/engine/src/threading/Memory/LfLinearAllocator.inl.h
index cdabf505..dde55827 100644
--- a/AE/engine/src/threading/Memory/LfLinearAllocator.inl.h
+++ b/AE/engine/src/threading/Memory/LfLinearAllocator.inl.h
@@ -11,10 +11,7 @@ namespace AE::Threading
     template <usize BS, usize MA, usize MB, typename A>
     LfLinearAllocator<BS,MA,MB,A>::LfLinearAllocator (const Allocator_t &alloc) __NE___ :
         _allocator{ alloc }
-    {
-        // make visible changes in '_blocks'
-        MemoryBarrier( EMemoryOrder::Release );
-    }
+    {}
 
 /*
 =================================================
@@ -24,6 +21,8 @@ namespace AE::Threading
     template <usize BS, usize MA, usize MB, typename A>
     Bytes  LfLinearAllocator<BS,MA,MB,A>::CurrentSize () C_NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         Bytes   result;
 
         for (auto& block : _blocks)
@@ -37,12 +36,13 @@ namespace AE::Threading
 =================================================
     Release
 ----
-    must be externally synchronized
+    Must be externally synchronized
 =================================================
 */
     template <usize BS, usize MA, usize MB, typename A>
     void  LfLinearAllocator<BS,MA,MB,A>::Release () __NE___
     {
+        DRC_EXLOCK( _drCheck );
         EXLOCK( _allocGuard );
 
         Bytes   allocated;
@@ -67,16 +67,28 @@ namespace AE::Threading
 =================================================
     Discard
 ----
-    must be externally synchronized
+    Must be externally synchronized
 =================================================
 */
     template <usize BS, usize MA, usize MB, typename A>
     void  LfLinearAllocator<BS,MA,MB,A>::Discard () __NE___
     {
+        DRC_EXLOCK( _drCheck );
+
         for (auto& block : _blocks)
         {
             block.size.store( 0 );
         }
+
+    #ifdef AE_DEBUG
+        MemoryBarrier( EMemoryOrder::Acquire );
+        for (auto& block : _blocks)
+        {
+            if ( auto* ptr = block.mem.load() )
+                DbgInitMem( OUT ptr, BlockSize() );
+        }
+        MemoryBarrier( EMemoryOrder::Release );
+    #endif
     }
 
 /*
@@ -87,6 +99,8 @@ namespace AE::Threading
     template <usize BS, usize MA, usize MB, typename A>
     void*  LfLinearAllocator<BS,MA,MB,A>::Allocate (const SizeAndAlign sizeAndAlign) __NE___
     {
+        DRC_SHAREDLOCK( _drCheck );
+
         for (auto block_it = _blocks.begin(); block_it != _blocks.end();)
         {
             void*   ptr = block_it->mem.load();
@@ -136,9 +150,11 @@ namespace AE::Threading
 =================================================
 */
     template <usize BS, usize MA, usize MB, typename A>
-    void  LfLinearAllocator<BS,MA,MB,A>::Deallocate (void *ptr, Bytes size) __NE___
+    void  LfLinearAllocator<BS,MA,MB,A>::Deallocate (void* ptr, Bytes size) __NE___
     {
     #ifdef AE_DEBUG
+        DRC_SHAREDLOCK( _drCheck );
+
         for (auto& block : _blocks)
         {
             if ( void* mem = block.mem.load() )
diff --git a/AE/engine/src/threading/Memory/MemoryManager.cpp b/AE/engine/src/threading/Memory/MemoryManager.cpp
index 8cb56faf..5c310d6d 100644
--- a/AE/engine/src/threading/Memory/MemoryManager.cpp
+++ b/AE/engine/src/threading/Memory/MemoryManager.cpp
@@ -67,20 +67,15 @@ namespace AE::Threading
 
 /*
 =================================================
-    CreateInstance
+    InstanceCtor
 =================================================
 */
-    void  MemoryManagerImpl::TaskSchedulerApi::CreateInstance () __NE___
+    void  MemoryManagerImpl::InstanceCtor::Create () __NE___
     {
         s_MemoryManager.Create();
     }
 
-/*
-=================================================
-    DestroyInstance
-=================================================
-*/
-    void  MemoryManagerImpl::TaskSchedulerApi::DestroyInstance () __NE___
+    void  MemoryManagerImpl::InstanceCtor::Destroy () __NE___
     {
         s_MemoryManager.Destroy();
     }
@@ -93,7 +88,7 @@ namespace AE::Threading
     void  MemoryManagerImpl::SetProfiler (RC<IMemoryProfiler> profiler) __NE___
     {
         PROFILE_ONLY(
-            _profiler = RVRef(profiler);
+            _profiler.store( RVRef(profiler) );
         )
     }
 //-----------------------------------------------------------------------------
@@ -104,7 +99,7 @@ namespace AE::Threading
     TsSharedMem::Create
 =================================================
 */
-    RC<TsSharedMem>  TsSharedMem::Create (Allocator_t alloc, Bytes size, Bytes align) __NE___
+    RC<TsSharedMem>  TsSharedMem::Create (RC<IAllocator> alloc, Bytes size, Bytes align) __NE___
     {
         if_likely( alloc and size > 0 )
         {
@@ -117,9 +112,9 @@ namespace AE::Threading
         return Default;
     }
 
-    RC<TsSharedMem>  TsSharedMem::Create (Allocator_t alloc, const SizeAndAlign sizeAndAlign) __NE___
+    RC<TsSharedMem>  TsSharedMem::Create (RC<IAllocator> alloc, const SizeAndAlign sizeAndAlign) __NE___
     {
-        return TsSharedMem::Create( alloc, sizeAndAlign.size, sizeAndAlign.align );
+        return TsSharedMem::Create( RVRef(alloc), sizeAndAlign.size, sizeAndAlign.align );
     }
 
     RC<TsSharedMem>  TsSharedMem::Create (Bytes size, Bytes align) __NE___
diff --git a/AE/engine/src/threading/Memory/MemoryManager.h b/AE/engine/src/threading/Memory/MemoryManager.h
index 103d7194..404ff347 100644
--- a/AE/engine/src/threading/Memory/MemoryManager.h
+++ b/AE/engine/src/threading/Memory/MemoryManager.h
@@ -18,17 +18,18 @@ namespace AE::Threading
 
     class MemoryManagerImpl final : public Noncopyable
     {
-        friend struct InPlace<MemoryManagerImpl>;
+        friend struct Base::TNothrowCtor<MemoryManagerImpl>;
+        friend struct Base::InPlace<MemoryManagerImpl>;
 
     // types
     public:
-        using GlobalLinearAllocator_t   = LfLinearAllocator< 16u<<20, AE_CACHE_LINE, 32 >;
-        using FrameAllocator_t          = LfLinearAllocator< 4u<<20, AE_CACHE_LINE, 8 >;
+        using GlobalLinearAllocator_t   = LfLinearAllocator< usize{16_Mb}, AE_CACHE_LINE, 32 >;
+        using FrameAllocator_t          = LfLinearAllocator< usize{ 4_Mb}, AE_CACHE_LINE,  8 >;
 
-        class TaskSchedulerApi {
+        class InstanceCtor {
             friend class TaskScheduler;
-            static void  CreateInstance ()  __NE___;
-            static void  DestroyInstance () __NE___;
+            static void  Create ()  __NE___;
+            static void  Destroy () __NE___;
         };
 
 
@@ -48,7 +49,7 @@ namespace AE::Threading
 
             DEBUG_ONLY(
                 AtomicFrameUID  _dbgFrameId;
-            )   
+            )
 
         // methods
         public:
diff --git a/AE/engine/src/threading/Memory/TsIAllocator.h b/AE/engine/src/threading/Memory/TsIAllocator.h
new file mode 100644
index 00000000..a85b35fd
--- /dev/null
+++ b/AE/engine/src/threading/Memory/TsIAllocator.h
@@ -0,0 +1,84 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "threading/Common.h"
+
+namespace AE::Threading
+{
+
+    //
+    // Thread-safe Allocator implementation
+    //
+
+    class TsIAllocator final : public IAllocatorTS
+    {
+    // variables
+    private:
+        Mutex               _guard;
+        RC<IAllocator>      _impl;
+
+
+    // methods
+    public:
+        explicit TsIAllocator (RC<IAllocator> alloc)                    __NE___;
+        ~TsIAllocator ()                                                __NE_OV;
+
+    // IAllocator //
+        void*   Allocate (Bytes size)                                   __NE_OV;
+        void    Deallocate (void* ptr, Bytes size)                      __NE_OV;
+        void    Deallocate (void* ptr)                                  __NE_OV;
+
+        void*   Allocate (const SizeAndAlign sizeAndAlign)              __NE_OV;
+        void    Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE_OV;
+    };
+
+
+
+    inline TsIAllocator::TsIAllocator (RC<IAllocator> alloc) __NE___ :
+        _impl{ RVRef(alloc) }
+    {
+        ASSERT( _impl );
+
+        // don't use 'TsIAllocator' on top of 'IAllocatorTS'
+        ASSERT( CastNotAllowed<IAllocatorTS>(_impl.get()) );
+    }
+
+    inline TsIAllocator::~TsIAllocator () __NE___
+    {
+        EXLOCK( _guard );
+        _impl = null;
+    }
+
+    inline void*  TsIAllocator::Allocate (Bytes size) __NE___
+    {
+        EXLOCK( _guard );
+        return _impl->Allocate( size );
+    }
+
+    inline void  TsIAllocator::Deallocate (void* ptr, Bytes size) __NE___
+    {
+        EXLOCK( _guard );
+        return _impl->Deallocate( ptr, size );
+    }
+
+    inline void  TsIAllocator::Deallocate (void* ptr) __NE___
+    {
+        EXLOCK( _guard );
+        return _impl->Deallocate( ptr );
+    }
+
+    inline void*  TsIAllocator::Allocate (const SizeAndAlign sizeAndAlign) __NE___
+    {
+        EXLOCK( _guard );
+        return _impl->Allocate( sizeAndAlign );
+    }
+
+    inline void  TsIAllocator::Deallocate (void* ptr, const SizeAndAlign sizeAndAlign) __NE___
+    {
+        EXLOCK( _guard );
+        return _impl->Deallocate( ptr, sizeAndAlign );
+    }
+
+
+} // AE::Threading
diff --git a/AE/engine/src/threading/Memory/TsLinearAllocator.h b/AE/engine/src/threading/Memory/TsLinearAllocator.h
index a5c9efc1..94f1abf4 100644
--- a/AE/engine/src/threading/Memory/TsLinearAllocator.h
+++ b/AE/engine/src/threading/Memory/TsLinearAllocator.h
@@ -15,7 +15,7 @@ namespace AE::Base
     //
 
     template <typename AllocatorType, uint MaxBlocks>
-    class LinearAllocator< AllocatorType, MaxBlocks, true > final : public MovableOnly
+    class LinearAllocator< AllocatorType, MaxBlocks, true > final : public IAllocatorTS
     {
     // types
     private:
@@ -24,8 +24,6 @@ namespace AE::Base
         using Allocator_t   = AllocatorType;
         using Self          = LinearAllocator< AllocatorType, MaxBlocks, true >;
 
-        static constexpr bool   IsThreadSafe = true;
-
 
     // variables
     private:
@@ -35,26 +33,25 @@ namespace AE::Base
 
     // methods
     public:
-        LinearAllocator ()                                      __NE___ {}
-        LinearAllocator (Self &&other)                          __NE___;
-        explicit LinearAllocator (const Allocator_t &alloc)     __NE___ : _base{ alloc } {}
-        explicit LinearAllocator (Bytes blockSize)              __NE___ : _base{ blockSize } {}
-        ~LinearAllocator ()                                     __NE___ { Release(); }
+        LinearAllocator ()                                          __NE___ {}
+        LinearAllocator (Self &&other)                              __NE___;
+        explicit LinearAllocator (const Allocator_t &alloc)         __NE___ : _base{ alloc } {}
+        explicit LinearAllocator (Bytes blockSize)                  __NE___ : _base{ blockSize } {}
+        ~LinearAllocator ()                                         __NE___ { Release(); }
 
-        Self& operator = (Self &&rhs)                           __NE___;
+            Self&   operator = (Self &&rhs)                         __NE___;
 
-        ND_ void*  Allocate (const SizeAndAlign sizeAndAlign)   __NE___;
+            void    SetBlockSize (Bytes size)                       __NE___;
+            void    Discard ()                                      __NE___;
+            void    Release ()                                      __NE___;
 
-        template <typename T>
-        ND_ T*  Allocate (usize count = 1)                      __NE___;
 
-        void  Deallocate (void* ptr)                            __NE___ { Deallocate( ptr, 1_b ); }
-        void  Deallocate (void* ptr, Bytes size)                __NE___;
-        void  Deallocate (void* ptr, const SizeAndAlign sa)     __NE___ { Deallocate( ptr, sa.size ); }
+        // IAllocator //
+        ND_ void*   Allocate (const SizeAndAlign sizeAndAlign)      __NE_OV;
 
-        void  SetBlockSize (Bytes size)                         __NE___;
-        void  Discard ()                                        __NE___;
-        void  Release ()                                        __NE___;
+            void    Deallocate (void* ptr)                          __NE_OV { Deallocate( ptr, 1_b ); }
+            void    Deallocate (void* ptr, Bytes size)              __NE_OV;
+            void    Deallocate (void* ptr, const SizeAndAlign sa)   __NE_OV { Deallocate( ptr, sa.size ); }
     };
 
 
@@ -103,14 +100,6 @@ namespace AE::Base
         return _base.Allocate( sizeAndAlign );
     }
 
-    template <typename A, uint MB>
-    template <typename T>
-    T*  LinearAllocator<A,MB,true>::Allocate (usize count) __NE___
-    {
-        EXLOCK( _guard );
-        return _base.template Allocate<T>( count );
-    }
-
 /*
 =================================================
     Deallocate
diff --git a/AE/engine/src/threading/Memory/TsSharedMem.h b/AE/engine/src/threading/Memory/TsSharedMem.h
index 1e62a5e7..c83d5f84 100644
--- a/AE/engine/src/threading/Memory/TsSharedMem.h
+++ b/AE/engine/src/threading/Memory/TsSharedMem.h
@@ -20,8 +20,7 @@ namespace AE::Threading
     {
     // types
     public:
-        using Allocator_t   = RC<IAllocator>;
-        using Self          = TsSharedMem;
+        using Self  = TsSharedMem;
 
     private:
 
@@ -64,40 +63,39 @@ namespace AE::Threading
             ND_ Bytes   Align ()                C_NE___ { return _ref != null ? _ref->Align() : 0_b; }
 
             template <typename T>
-            ND_ ArrayView<T>  ToView ()         C_NE___
-            {
-                ASSERT( IsMultipleOf( Size(), SizeOf<T> ));
-                ASSERT( AlignOf<T> <= Align() );
-                return ArrayView<T>{ Cast<T>(Data()), Size() / SizeOf<T> };
-            }
+            ND_ ArrayView<T>  ToView ()         C_NE___;
         };
 
 
     // variables
     private:
         RWSpinLock      _guard;     // used to protect access to '_Data()'
-        Bytes32u        _size;
+        Byte32u         _size;
         POTBytes        _align;
-        Allocator_t     _allocator;
+        RC<IAllocator>  _allocator;
 
 
     // methods
     public:
-        ND_ Bytes       Size ()         C_NE___ { return _size; }
-        ND_ Bytes       Align ()        C_NE___ { return Bytes{ _align }; }
-        ND_ auto        Allocator ()    C_NE___ { return _allocator; }
+        ND_ Bytes           Size ()                 C_NE___ { return _size; }
+        ND_ Bytes           Align ()                C_NE___ { return Bytes{ _align }; }
+        ND_ IAllocator*     AllocatorPtr ()         C_NE___ { return _allocator.get(); }
+        ND_ RC<IAllocator>  AllocatorRC ()          C_NE___ { return _allocator; }
 
-        ND_ ReadAccess  Read ()         __NE___ { return ReadAccess{  _guard.try_lock_shared()  ? this : null }; }
-        ND_ WriteAccess Write ()        __NE___ { return WriteAccess{ _guard.try_lock()         ? this : null }; }
+        ND_ ReadAccess      Read ()                 __NE___ { return ReadAccess{  _guard.try_lock_shared()  ? this : null }; }
+        ND_ WriteAccess     Write ()                __NE___ { return WriteAccess{ _guard.try_lock()         ? this : null }; }
 
-        ND_ static RC<Self>  Create (Allocator_t alloc, const SizeAndAlign sizeAndAlign)                    __NE___;
-        ND_ static RC<Self>  Create (Allocator_t alloc, Bytes size, Bytes align = DefaultAllocatorAlign)    __NE___;
+        ND_ static RC<Self>  Create (RC<IAllocator> alloc, const SizeAndAlign sizeAndAlign)                 __NE___;
+        ND_ static RC<Self>  Create (RC<IAllocator> alloc, Bytes size, Bytes align = DefaultAllocatorAlign) __NE___;
         ND_ static RC<Self>  Create (Bytes size, Bytes align = DefaultAllocatorAlign)                       __NE___;
 
+        ND_ static void*  operator new (usize, void* where)             __NE___ { return where; }
+        //  static void   operator delete (void*, void*)                __NE___ {}
+
 
     private:
-        TsSharedMem (Bytes size, POTBytes align, Allocator_t alloc)     __NE___ : _size{size}, _align{align}, _allocator{RVRef(alloc)} {}
-        ~TsSharedMem ()                                                 __NE_OV {}
+        TsSharedMem (Bytes size, POTBytes align, RC<IAllocator> alloc)  __NE___ : _size{size}, _align{align}, _allocator{RVRef(alloc)} {}
+        ~TsSharedMem ()                                                 __NE_OV { DBG_WARNING( "never used" ); }
 
         ND_ void const*     _Data ()                                    C_NE___ { return this + AlignUp( SizeOf<Self>, _align ); }
         ND_ void*           _Data ()                                    __NE___ { return this + AlignUp( SizeOf<Self>, _align ); }
@@ -141,5 +139,18 @@ namespace AE::Threading
         // TODO: flush cache ?
     }
 
+/*
+=================================================
+    ReadAccess::ToView
+=================================================
+*/
+    template <typename T>
+    ArrayView<T>  TsSharedMem::ReadAccess::ToView () C_NE___
+    {
+        ASSERT( IsMultipleOf( Size(), SizeOf<T> ));
+        ASSERT( AlignOf<T> <= Align() );
+        return ArrayView<T>{ Cast<T>(Data()), Size() / SizeOf<T> };
+    }
+
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/Memory/TsStackAllocator.h b/AE/engine/src/threading/Memory/TsStackAllocator.h
index c3009284..26a9154e 100644
--- a/AE/engine/src/threading/Memory/TsStackAllocator.h
+++ b/AE/engine/src/threading/Memory/TsStackAllocator.h
@@ -15,7 +15,7 @@ namespace AE::Base
     //
 
     template <typename AllocatorType, uint MaxBlocks>
-    class StackAllocator< AllocatorType, MaxBlocks, true > final : public MovableOnly
+    class StackAllocator< AllocatorType, MaxBlocks, true > final : public IAllocatorTS
     {
     // types
     private:
@@ -25,8 +25,6 @@ namespace AE::Base
         using Allocator_t       = AllocatorType;
         using Bookmark          = typename BaseAllocator_t::Bookmark;
 
-        static constexpr bool   IsThreadSafe = true;
-
 
     // variables
     private:
@@ -36,29 +34,30 @@ namespace AE::Base
 
     // methods
     public:
-        StackAllocator ()                                       __NE___ {}
-        StackAllocator (Self &&other)                           __NE___;
-        explicit StackAllocator (const Allocator_t &alloc)      __NE___ : _base{ alloc } {}
-        ~StackAllocator ()                                      __NE___ { Release(); }
+        StackAllocator ()                                               __NE___ {}
+        StackAllocator (Self &&other)                                   __NE___;
+        explicit StackAllocator (const Allocator_t &alloc)              __NE___ : _base{ alloc } {}
+        ~StackAllocator ()                                              __NE___ { Release(); }
+
+            Self&       operator = (Self &&rhs)                         __NE___;
 
-            Self&  operator = (Self &&rhs)                      __NE___;
+            void        SetBlockSize (Bytes size)                       __NE___;
 
-        ND_ void*  Allocate (const SizeAndAlign sizeAndAlign)   __NE___;
+        ND_ Bookmark    Push ()                                         __NE___;
+            void        Pop (Bookmark bm)                               __NE___;
 
-        template <typename T>
-        ND_ T*  Allocate (usize count = 1)                      __NE___;
+            void        Discard ()                                      __NE___;
+            void        Release ()                                      __NE___;
 
-            void  Deallocate (void* ptr)                        __NE___ { Deallocate( ptr, 1_b ); }
-            void  Deallocate (void* ptr, Bytes size)            __NE___;
-            void  Deallocate (void* ptr, const SizeAndAlign sa) __NE___ { Deallocate( ptr, sa.size ); }
 
-            void  SetBlockSize (Bytes size)                     __NE___;
+        // IAllocator //
+        ND_ void*       Allocate (const SizeAndAlign sizeAndAlign)      __NE_OV;
 
-        ND_ Bookmark  Push ()                                   __NE___;
-            void  Pop (Bookmark bm)                             __NE___;
+            void        Deallocate (void* ptr)                          __NE_OV { Deallocate( ptr, 1_b ); }
+            void        Deallocate (void* ptr, Bytes size)              __NE_OV;
+            void        Deallocate (void* ptr, const SizeAndAlign sa)   __NE_OV { Deallocate( ptr, sa.size ); }
 
-            void  Discard ()                                    __NE___;
-            void  Release ()                                    __NE___;
+            using IAllocator::Allocate;
     };
 
 
@@ -112,14 +111,6 @@ namespace AE::Base
         return _base.Allocate( sizeAndAlign );
     }
 
-    template <typename A, uint MB>
-    template <typename T>
-    T*  StackAllocator<A,MB,true>::Allocate (usize count) __NE___
-    {
-        EXLOCK( _guard );
-        return _base.template Allocate<T>( count );
-    }
-
 /*
 =================================================
     Deallocate
diff --git a/AE/engine/src/threading/Primitives/Barrier.cpp b/AE/engine/src/threading/Primitives/Barrier.cpp
index 8b94789a..cad05a8a 100644
--- a/AE/engine/src/threading/Primitives/Barrier.cpp
+++ b/AE/engine/src/threading/Primitives/Barrier.cpp
@@ -3,8 +3,7 @@
 #include "threading/Primitives/Barrier.h"
 
 #if (AE_BARRIER_MODE == 0)
-
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 
 namespace AE::Threading
 {
@@ -14,11 +13,9 @@ namespace AE::Threading
     constructor
 =================================================
 */
-    Barrier::Barrier (usize numThreads)
+    Barrier::Barrier (usize numThreads) __NE___
     {
-        auto*   barrier_ptr = PlacementNew<SYNCHRONIZATION_BARRIER>( OUT _data );
-
-        CHECK( InitializeSynchronizationBarrier( barrier_ptr, CheckCast<LONG>(numThreads), -1 ));
+        CHECK( ::InitializeSynchronizationBarrier( OUT _data.Ptr<SYNCHRONIZATION_BARRIER>(), CheckCast<LONG>(numThreads), -1 ));
     }
 
 /*
@@ -26,9 +23,9 @@ namespace AE::Threading
     destructor
 =================================================
 */
-    Barrier::~Barrier ()
+    Barrier::~Barrier () __NE___
     {
-        CHECK( DeleteSynchronizationBarrier( BitCast<SYNCHRONIZATION_BARRIER *>( &_data[0] )));
+        CHECK( ::DeleteSynchronizationBarrier( _data.Ptr<SYNCHRONIZATION_BARRIER>() ));
     }
 
 /*
@@ -36,9 +33,9 @@ namespace AE::Threading
     wait
 =================================================
 */
-    void Barrier::wait ()
+    void  Barrier::wait () __NE___
     {
-        EnterSynchronizationBarrier( BitCast<SYNCHRONIZATION_BARRIER *>( &_data[0] ), SYNCHRONIZATION_BARRIER_FLAGS_NO_DELETE );
+        ::EnterSynchronizationBarrier( _data.Ptr<SYNCHRONIZATION_BARRIER>(), SYNCHRONIZATION_BARRIER_FLAGS_NO_DELETE );
     }
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/Primitives/Barrier.h b/AE/engine/src/threading/Primitives/Barrier.h
index 41695ab4..294ff027 100644
--- a/AE/engine/src/threading/Primitives/Barrier.h
+++ b/AE/engine/src/threading/Primitives/Barrier.h
@@ -42,7 +42,7 @@ namespace AE::Threading
     {
     // variables
     private:
-        alignas(ulong) ubyte    _data [32];
+        UntypedStorage< 32, 8 >     _data;
 
 
     // methods
@@ -56,7 +56,7 @@ namespace AE::Threading
         Barrier&  operator = (const Barrier &)  = delete;
         Barrier&  operator = (Barrier &&)       = delete;
 
-        void  wait ();
+        void  wait ()                           __NE___;
 
         ND_ static constexpr usize  max ()      __NE___ { return uint{UMax}; }
     };
@@ -137,26 +137,24 @@ namespace AE::Threading
                 expected.counter_1  = _numThreads;
             }
 
-            for (uint i = 0;
-                 not _counter.CAS( INOUT expected, new_value );
-                 ++i)
+            for (uint p = 0;; ++p)
             {
-                if ( expected.index != old_value.index )
-                    break;
-
-                old_value.index ? (expected.counter_2 = _numThreads) : (expected.counter_1 = _numThreads);
+                for (uint i = 0; i < ThreadUtils::SpinBeforeLock(); ++i)
+                {
+                    if_likely(  _counter.CAS( INOUT expected, new_value ) or
+                                expected.index != old_value.index )
+                    {
+                        // invalidate cache
+                        MemoryBarrier( EMemoryOrder::Acquire );
+                        return;
+                    }
 
-                ThreadUtils::Pause();
+                    old_value.index ? (expected.counter_2 = _numThreads) : (expected.counter_1 = _numThreads);
 
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
+                    ThreadUtils::Pause();
                 }
+                ThreadUtils::ProgressiveSleep( p );
             }
-
-            // invalidate cache
-            MemoryBarrier( EMemoryOrder::Acquire );
         }
 
         ND_ static constexpr usize  max ()      __NE___ { return uint{UMax}; }
diff --git a/AE/engine/src/threading/Primitives/CoroutineHandle.h b/AE/engine/src/threading/Primitives/CoroutineHandle.h
index 2ead9028..cac296d5 100644
--- a/AE/engine/src/threading/Primitives/CoroutineHandle.h
+++ b/AE/engine/src/threading/Primitives/CoroutineHandle.h
@@ -39,7 +39,7 @@ namespace AE::Threading
             _handle{ null }
         {}
 
-        CoroutineHandle (Self && other)         __NE___ :
+        CoroutineHandle (Self &&other)          __NE___ :
             _handle{ other._handle }
         {
             other._handle = null;
@@ -55,7 +55,7 @@ namespace AE::Threading
 
         Self&  operator = (const Self &)        = delete;
 
-        Self&  operator = (Self && rhs)         __NE___
+        Self&  operator = (Self &&rhs)          __NE___
         {
             if ( _handle )
                 _handle.destroy();
diff --git a/AE/engine/src/threading/Primitives/DataRaceCheck.h b/AE/engine/src/threading/Primitives/DataRaceCheck.h
index 1e77972f..296a234c 100644
--- a/AE/engine/src/threading/Primitives/DataRaceCheck.h
+++ b/AE/engine/src/threading/Primitives/DataRaceCheck.h
@@ -184,12 +184,15 @@ namespace AE::Threading
     {
     // variables
     private:
-        mutable Atomic<usize>   _tid  {ThreadUtils::GetIntID()};
+        mutable Atomic<usize>   _tid;
 
 
     // methods
     public:
-        SingleThreadCheck ()    __NE___ {}
+        SingleThreadCheck ()    __NE___
+        {
+            Reset();
+        }
 
         void  Reset ()          __NE___
         {
@@ -377,8 +380,8 @@ struct std::scoped_lock< const AE::Threading::SingleThreadCheck > :
 
 #else // AE_ENABLE_DATA_RACE_CHECK
 
-# define DRC_EXLOCK( ... )
-# define DRC_SHAREDLOCK( ... )
+# define DRC_EXLOCK( ... )          {}
+# define DRC_SHAREDLOCK( ... )      {}
 # define DRC_ONLY( ... )
 
 namespace AE::Threading
diff --git a/AE/engine/src/threading/Primitives/SpinLock.h b/AE/engine/src/threading/Primitives/SpinLock.h
index 00e3e33d..b4904ad7 100644
--- a/AE/engine/src/threading/Primitives/SpinLock.h
+++ b/AE/engine/src/threading/Primitives/SpinLock.h
@@ -31,61 +31,19 @@ namespace AE::Threading
 
     // methods
     public:
-        TSpinLock ()                __NE___ {}
-
-        TSpinLock (const Self &)    = delete;
-        TSpinLock (Self &&)         = delete;
-
-        ~TSpinLock ()               __NE___
-        {
-            ASSERT( _flag.load() == 0 );
-        }
-
-
-        ND_ bool  is_unlocked ()    __NE___ { return _flag.load() == 0; }
-        ND_ bool  is_locked ()      __NE___ { return _flag.load() != 0; }
-
-
-        ND_ bool  try_lock ()       __NE___
-        {
-            uint    exp = 0;
-            return _flag.CAS_Loop( INOUT exp, 1, _AcquireOrder, EMemoryOrder::Relaxed );
-        }
+        TSpinLock ()                            __NE___ {}
+        ~TSpinLock ()                           __NE___ { ASSERT(is_unlocked()); }
 
+        ND_ bool  is_unlocked ()                C_NE___ { return _flag.load() == 0; }
+        ND_ bool  is_locked ()                  C_NE___ { return _flag.load() != 0; }
 
         // for std::lock_guard / std::unique_lock / std::scoped_lock
-        void  lock ()               __NE___
-        {
-            uint    exp = 0;
-            for (uint i = 0;
-                 not _flag.CAS( INOUT exp, 1, _AcquireOrder, EMemoryOrder::Relaxed );
-                 ++i)
-            {
-                ASSERT( exp == 0 or exp == 1 ); // check for mem corruption
-
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                exp = 0;
-                ThreadUtils::Pause();
-            }
-        }
-
-        void  unlock ()             __NE___
-        {
-          #ifdef AE_DEBUG
-            auto    old = _flag.exchange( 0, _ReleaseOrder );
-            CHECK( old == 1 );
-          #else
-            _flag.store( 0, _ReleaseOrder );
-          #endif
-        }
+        ND_ bool  try_lock ()                   __NE___;
+        ND_ bool  try_lock (uint numAttempts)   __NE___;
+            void  lock ()                       __NE___;
+            void  unlock ()                     __NE___;
     };
 
-
     using SpinLock          = TSpinLock< false >;
     using SpinLockRelaxed   = TSpinLock< true >;
 
@@ -95,176 +53,59 @@ namespace AE::Threading
     // Read-Write Spin Lock
     //
 
-    template <bool IsRelaxedOrder>
+    template <bool ExlockRelaxedOrder, bool SharedlockRelaxedOrder>
     struct TRWSpinLock final : public Noncopyable
     {
     // variables
     private:
         Atomic<int>     _flag {0};      // 0 -- unlocked, -1 -- write lock, >0 -- read lock
 
-        static constexpr auto   _AcquireOrder   = IsRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Acquire;
-        static constexpr auto   _ReleaseOrder   = IsRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Release;
-        static constexpr auto   _MaxReadLocks   = 100;
+        static constexpr auto   _Exlock_AcquireOrder    = ExlockRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Acquire;
+        static constexpr auto   _Exlock_ReleaseOrder    = ExlockRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Release;
+        static constexpr auto   _Shlock_AcquireOrder    = SharedlockRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Acquire;
+        static constexpr auto   _Shlock_ReleaseOrder    = SharedlockRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Release;
+        static constexpr auto   _MaxReadLocks           = 100;
 
 
     // methods
     public:
-        TRWSpinLock ()                          __NE___ {}
-        ~TRWSpinLock ()                         __NE___ { ASSERT( _flag.load() == 0 ); }
-
-        ND_ bool  is_unlocked ()                __NE___ { return _flag.load() == 0; }
-        ND_ bool  is_locked ()                  __NE___ { return _flag.load() < 0; }
-        ND_ bool  is_shared_locked ()           __NE___ { return _flag.load() > 0; }
-
-
-    //-------------------------------------------------
-    // exclusive (read-write)
-
-        ND_ bool  try_lock ()                   __NE___
-        {
-            int exp = 0;
-            return _flag.CAS_Loop( INOUT exp, -1, _AcquireOrder, EMemoryOrder::Relaxed );
-        }
+        TRWSpinLock ()                                                      __NE___ {}
+        ~TRWSpinLock ()                                                     __NE___ { ASSERT(is_unlocked()); }
 
+        ND_ bool  is_unlocked ()                                            C_NE___ { return _flag.load() == 0; }
+        ND_ bool  is_locked ()                                              C_NE___ { return _flag.load() < 0; }
+        ND_ bool  is_shared_locked ()                                       C_NE___ { return _flag.load() > 0; }
 
-        // for std::lock_guard / std::unique_lock / std::scoped_lock
-        void  lock ()                           __NE___
-        {
-            int exp = 0;
-            for (uint i = 0; not _flag.CAS( INOUT exp, -1, _AcquireOrder, EMemoryOrder::Relaxed ); ++i)
-            {
-                ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
-
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                exp = 0;
-                ThreadUtils::Pause();
-            }
-        }
+    // exclusive (read-write) //
+        ND_ bool  try_lock ()                                               __NE___;
+        ND_ bool  try_lock (uint numAttempts, int minReaders = 3)           __NE___;
 
         // for std::lock_guard / std::unique_lock / std::scoped_lock
-        void  unlock ()                         __NE___
-        {
-          #ifdef AE_DEBUG
-            auto    old = _flag.exchange( 0, _ReleaseOrder );
-            CHECK( old == -1 );
-          #else
-            _flag.store( 0, _ReleaseOrder );
-          #endif
-        }
-
-
-    //-------------------------------------------------
-    // shared (read-only)
-
-        ND_ bool  try_lock_shared ()            __NE___
-        {
-            int exp = 0;
-            for (uint i = 0;
-                 not _flag.CAS( INOUT exp, exp + 1, _AcquireOrder, EMemoryOrder::Relaxed );
-                 ++i)
-            {
-                if_unlikely( exp < 0 or i > ThreadUtils::SpinBeforeLock() )
-                    return false;  // failed to lock
-
-                ThreadUtils::Pause();
-            }
-            return true;
-        }
+            void  lock ()                                                   __NE___;
+            void  unlock ()                                                 __NE___;
 
 
-        // for std::shared_lock
-        void  lock_shared ()                    __NE___
-        {
-            int exp = 0;
-            for (uint i = 0;
-                 not _flag.CAS( INOUT exp, exp + 1, _AcquireOrder, EMemoryOrder::Relaxed );
-                 ++i)
-            {
-                ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
-
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                exp = (exp < 0 ? 0 : exp);
-                ThreadUtils::Pause();
-            }
-        }
+    // shared (read-only) //
+        ND_ bool  try_lock_shared ()                                        __NE___;
+        ND_ bool  try_lock_shared (uint numAttempts, int minWriters = -1)   __NE___;
 
         // for std::shared_lock
-        void  unlock_shared ()                  __NE___
-        {
-            int old = _flag.fetch_sub( 1, _ReleaseOrder );
-            ASSERT( old >= 0 );  Unused( old );
-        }
+            void  lock_shared ()                                            __NE___;
+            void  unlock_shared ()                                          __NE___;
 
 
-    //-------------------------------------------------
-    // exclusive <-> shared
+    // exclusive <-> shared //
+        ND_ bool  try_shared_to_exclusive ()                                __NE___;
+        ND_ bool  try_shared_to_exclusive (uint numAttempts, int minReaders)__NE___;
+            void  shared_to_exclusive ()                                    __NE___;
 
-        ND_ bool  try_shared_to_exclusive ()    __NE___
-        {
-            int exp = 1;
-            return _flag.CAS_Loop( INOUT exp, -1 );
-        }
-
-        void  shared_to_exclusive ()            __NE___
-        {
-            int exp = 1;
-            for (uint i = 0;
-                 not _flag.CAS( INOUT exp, -1 );
-                 ++i)
-            {
-                ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
-
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                exp = 1;
-                ThreadUtils::Pause();
-            }
-        }
-
-        ND_ bool  try_exclusive_to_shared ()    __NE___
-        {
-            int exp = -1;
-            return _flag.CAS_Loop( INOUT exp, 1 );
-        }
-
-        void  exclusive_to_shared ()            __NE___
-        {
-            int exp = -1;
-            for (uint i = 0;
-                 not _flag.CAS( INOUT exp, 1 );
-                 ++i)
-            {
-                ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
-
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                exp = 1;
-                ThreadUtils::Pause();
-            }
-        }
+        ND_ bool  try_exclusive_to_shared ()                                __NE___;
+        ND_ bool  try_exclusive_to_shared (uint numAttempts, int minReaders)__NE___;
+            void  exclusive_to_shared ()                                    __NE___;
     };
 
-
-    using RWSpinLock        = TRWSpinLock< false >;
-    using RWSpinLockRelaxed = TRWSpinLock< true >;
+    using RWSpinLock        = TRWSpinLock< false, false >;
+    using RWSpinLockRelaxed = TRWSpinLock< true, true >;
 
 
 
@@ -277,18 +118,20 @@ namespace AE::Threading
     {
     // types
     private:
-        STATIC_ASSERT( LockBit < CT_SizeOfInBits<ValueType> );
-        STATIC_ASSERT( not IsPointer<ValueType> or (LockBit == 0 and alignof(ValueType) > 1) );
+        StaticAssert( LockBit < CT_SizeOfInBits<ValueType> );
+        StaticAssert( not IsPointer<ValueType> or (LockBit == 0 and alignof(ValueType) > 1) );
 
         using Self      = TValueWithSpinLockBit< ValueType, LockBit, IsRelaxedOrder >;
         using UInt_t    = ToUnsignedInteger< ValueType >;
+        using Value_t   = ValueType;
+        using CValue_t  = ValueType const;
 
         static constexpr UInt_t _LockMask   = UInt_t{1} << LockBit;
 
 
     // variables
     private:
-        Atomic< ValueType >     _value {};
+        Atomic< Value_t >       _value {};
 
         static constexpr auto   _AcquireOrder = IsRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Acquire;
         static constexpr auto   _ReleaseOrder = IsRelaxedOrder ? EMemoryOrder::Relaxed : EMemoryOrder::Release;
@@ -296,96 +139,439 @@ namespace AE::Threading
 
     // methods
     public:
-        TValueWithSpinLockBit ()                    __NE___ {}
-        explicit TValueWithSpinLockBit (ValueType v)__NE___ : _value{v} { ASSERT( not _HasLockBit( _value.load() )); }
+        TValueWithSpinLockBit ()                                __NE___ {}
+        explicit TValueWithSpinLockBit (Value_t v)              __NE___ : _value{v} { ASSERT( not _HasLockBit( _value.load() )); }
+        ~TValueWithSpinLockBit ()                               __NE___ { ASSERT(is_unlocked()); }
+
+        ND_ bool        try_lock ()                             __NE___;
+        ND_ bool        try_lock (uint numAttempts)             __NE___;
+
+        // for std::lock_guard / std::unique_lock / std::scoped_lock
+            void        lock ()                                 __NE___;
+            void        unlock ()                               __NE___;
+
+        ND_ bool        is_locked ()                            C_NE___ { return _HasLockBit( _value.load() ); }
+        ND_ bool        is_unlocked ()                          C_NE___ { return not is_locked(); }
+
+        ND_ Value_t     get ()                                  __NE___ { return _RemoveLockBit( _value.load() ); }
+        ND_ CValue_t    get ()                                  C_NE___ { return _RemoveLockBit( _value.load() ); }
+
+        // can be changed outside of lock/unlock scope
+            void        set (Value_t val)                       __NE___;
+        ND_ bool        try_set (Value_t val, uint numAttempts) __NE___;
+        ND_ bool        try_set (Value_t val)                   __NE___ { return try_set( val, 2 ); }
+
+
+    private:
+        ND_ static bool     _HasLockBit (Value_t val)           __NE___ { return (BitCast<UInt_t>(val) & _LockMask); }
+        ND_ static Value_t  _SetLockBit (Value_t val)           __NE___ { return BitCast<Value_t>((BitCast<UInt_t>(val) | _LockMask)); }
+        ND_ static Value_t  _RemoveLockBit (Value_t val)        __NE___ { return BitCast<Value_t>((BitCast<UInt_t>(val) & ~_LockMask)); }
+        ND_ static Value_t  _CopyLockBit (Value_t a, Value_t b) __NE___ { return BitCast<Value_t>( (BitCast<UInt_t>(a) & ~_LockMask) | (BitCast<UInt_t>(b) & _LockMask) ); }
+    };
+
+
+    template <typename T> using PtrWithSpinLock         = TValueWithSpinLockBit< T*, 0, false >;
+    template <typename T> using PtrWithSpinLockRelaxed  = TValueWithSpinLockBit< T*, 0, true >;
 
-        TValueWithSpinLockBit (const Self &)        = delete;
-        TValueWithSpinLockBit (Self &&)             = delete;
+//-----------------------------------------------------------------------------
 
-        ~TValueWithSpinLockBit ()                   __NE___ { ASSERT( not _HasLockBit( _value.load() )); }
 
-        ND_ bool  try_lock ()                       __NE___
+
+/*
+=================================================
+    try_lock
+=================================================
+*/
+    template <bool B>
+    bool  TSpinLock<B>::try_lock () __NE___
+    {
+        uint    exp = 0;
+        return _flag.CAS_Loop( INOUT exp, 1, _AcquireOrder, EMemoryOrder::Relaxed );
+    }
+
+    template <bool B>
+    bool  TSpinLock<B>::try_lock (const uint numAttempts) __NE___
+    {
+        ASSERT( numAttempts > 0 );
+
+        for (uint i = 0; i < numAttempts; ++i)
         {
-            ValueType   exp = _RemoveLockBit( _value.load() );
-            return _value.CAS_Loop( INOUT exp, _SetLockBit( exp ), _AcquireOrder, EMemoryOrder::Relaxed );
+            uint    exp = 0;
+            if ( _flag.CAS( INOUT exp, 1, _AcquireOrder, EMemoryOrder::Relaxed ))
+                return true;
+
+            ASSERT( exp == 0 or exp == 1 ); // check for mem corruption
+            ThreadUtils::Pause();
         }
+        return false;
+    }
+
+/*
+=================================================
+    lock
+=================================================
+*/
+    template <bool B>
+    void  TSpinLock<B>::lock () __NE___
+    {
+        for (uint p = 0;; ++p)
+        {
+            if_likely( try_lock( ThreadUtils::SpinBeforeLock() ))
+                return;
 
+            ThreadUtils::ProgressiveSleep( p );
+        }
+    }
+
+/*
+=================================================
+    unlock
+=================================================
+*/
+    template <bool B>
+    void  TSpinLock<B>::unlock () __NE___
+    {
+        #ifdef AE_DEBUG
+        auto    old = _flag.exchange( 0, _ReleaseOrder );
+        CHECK( old == 1 );
+        #else
+        _flag.store( 0, _ReleaseOrder );
+        #endif
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    try_lock
+----
+    flag: 0 -> -1
+    can stop spinning if already locked for multiple readers
+=================================================
+*/
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_lock () __NE___
+    {
+        int exp = 0;
+        return _flag.CAS_Loop( INOUT exp, -1, _Exlock_AcquireOrder, EMemoryOrder::Relaxed );
+    }
+
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_lock (const uint numAttempts, const int minReaders) __NE___
+    {
+        ASSERT( numAttempts > 0 );
 
-        // for std::lock_guard
-        void  lock ()                               __NE___
+        int exp = 0;
+        for (uint i = 0; (i < numAttempts) & (exp < minReaders); ++i)
         {
-            ValueType   exp = _RemoveLockBit( _value.load() );
-            for (uint i = 0;
-                 not _value.CAS( INOUT exp, _SetLockBit( exp ), _AcquireOrder, EMemoryOrder::Relaxed );
-                 ++i)
-            {
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                exp = _RemoveLockBit( exp );
-                ThreadUtils::Pause();
-            }
+            if ( _flag.CAS( INOUT exp, -1, _Exlock_AcquireOrder, EMemoryOrder::Relaxed ))
+                return true;
+
+            ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
+            exp = 0;
+            ThreadUtils::Pause();
         }
+        return false;
+    }
+
+/*
+=================================================
+    lock
+=================================================
+*/
+    template <bool A, bool B>
+    void  TRWSpinLock<A,B>::lock () __NE___
+    {
+        for (uint p = 0;; ++p)
+        {
+            if_likely( try_lock( ThreadUtils::SpinBeforeLock(), _MaxReadLocks ))
+                return;
 
-        void  unlock ()                             __NE___
+            ThreadUtils::ProgressiveSleep( p );
+        }
+    }
+
+/*
+=================================================
+    unlock
+=================================================
+*/
+    template <bool A, bool B>
+    void  TRWSpinLock<A,B>::unlock () __NE___
+    {
+        #ifdef AE_DEBUG
+        auto    old = _flag.exchange( 0, _Exlock_ReleaseOrder );
+        CHECK( old == -1 );
+        #else
+        _flag.store( 0, _Exlock_ReleaseOrder );
+        #endif
+    }
+
+/*
+=================================================
+    try_lock_shared
+----
+    flag: 0 -> +1
+    can stop spinning if already locked for writing
+=================================================
+*/
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_lock_shared () __NE___
+    {
+        return try_lock_shared( 3 );
+    }
+
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_lock_shared (const uint numAttempts, const int minWriters) __NE___
+    {
+        ASSERT( numAttempts > 0 );
+
+        int exp = 0;
+        for (uint i = 0; (i < numAttempts) & (exp > minWriters); ++i)
         {
-            ValueType   exp = _RemoveLockBit( _value.load() );
-            ValueType   prev = _value.exchange( exp, _ReleaseOrder );
-            Unused( prev );
-            ASSERT( prev == _SetLockBit( exp ));
+            if ( _flag.CAS( INOUT exp, exp + 1, _Shlock_AcquireOrder, EMemoryOrder::Relaxed ))
+                return true;
+
+            ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
+            exp = (exp < 0 ? 0 : exp);
+            ThreadUtils::Pause();
         }
+        return false;
+    }
+
+/*
+=================================================
+    lock_shared
+=================================================
+*/
+    template <bool A, bool B>
+    void  TRWSpinLock<A,B>::lock_shared () __NE___
+    {
+        for (uint p = 0;; ++p)
+        {
+            // disable early exit if already locked
+            if_likely( try_lock_shared( ThreadUtils::SpinBeforeLock(), -2 ))
+                return;
 
-        ND_ bool            IsLocked ()             C_NE___ { return _HasLockBit( _value.load() ); }
+            ThreadUtils::ProgressiveSleep( p );
+        }
+    }
+
+/*
+=================================================
+    unlock_shared
+=================================================
+*/
+    template <bool A, bool B>
+    void  TRWSpinLock<A,B>::unlock_shared () __NE___
+    {
+        int old = _flag.fetch_sub( 1, _Shlock_ReleaseOrder );
+        ASSERT( old >= 0 );  Unused( old );
+    }
+
+/*
+=================================================
+    try_shared_to_exclusive
+----
+    flag: +1 -> -1
+=================================================
+*/
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_shared_to_exclusive () __NE___
+    {
+        int exp = 1;
+        return _flag.CAS_Loop( INOUT exp, -1 );
+    }
 
-        ND_ ValueType       get ()                  __NE___ { return _RemoveLockBit( _value.load() ); }
-        ND_ ValueType const get ()                  C_NE___ { return _RemoveLockBit( _value.load() ); }
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_shared_to_exclusive (const uint numAttempts, const int minReaders) __NE___
+    {
+        ASSERT( numAttempts > 0 );
 
+        int exp = 1;
+        for (uint i = 0; (i < numAttempts) & (exp < minReaders); ++i)
+        {
+            if ( _flag.CAS( INOUT exp, -1 ))
+                return true;
 
-        void  set (ValueType val)                   __NE___
+            ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
+            exp = 1;
+            ThreadUtils::Pause();
+        }
+        return false;
+    }
+
+/*
+=================================================
+    shared_to_exclusive
+=================================================
+*/
+    template <bool A, bool B>
+    void  TRWSpinLock<A,B>::shared_to_exclusive () __NE___
+    {
+        for (uint p = 0;; ++p)
         {
-            ASSERT( IsLocked() );
-            ASSERT( not _HasLockBit( val ));
-
-                        val = _SetLockBit( val );
-            ValueType   exp = _value.load();
-
-            for (uint i = 0; not _value.CAS( INOUT exp, val ); ++i)
-            {
-                if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                {
-                    i = 0;
-                    ThreadUtils::YieldOrSleep();
-                }
-
-                ASSERT( _HasLockBit( exp ));
-                ThreadUtils::Pause();
-            }
+            if_likely( try_shared_to_exclusive( ThreadUtils::SpinBeforeLock(), _MaxReadLocks ))
+                return;
+
+            ThreadUtils::ProgressiveSleep( p );
         }
+    }
+
+/*
+=================================================
+    try_exclusive_to_shared
+----
+    flag: -1 -> +1
+=================================================
+*/
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_exclusive_to_shared () __NE___
+    {
+        int exp = -1;
+        return _flag.CAS_Loop( INOUT exp, 1 );
+    }
 
+    template <bool A, bool B>
+    bool  TRWSpinLock<A,B>::try_exclusive_to_shared (const uint numAttempts, const int minReaders) __NE___
+    {
+        ASSERT( numAttempts > 0 );
 
-    private:
-        ND_ static bool  _HasLockBit (ValueType val)        __NE___
+        int exp = -1;
+        for (uint i = 0; (i < numAttempts) & (exp < minReaders); ++i)
         {
-            return (BitCast<UInt_t>(val) & _LockMask);
-        }
+            if ( _flag.CAS( INOUT exp, 1 ))
+                return true;
 
-        ND_ static ValueType  _SetLockBit (ValueType val)   __NE___
+            ASSERT( exp >= -1 and exp < _MaxReadLocks );    // check for mem corruption
+            exp = -1;
+            ThreadUtils::Pause();
+        }
+        return false;
+    }
+
+/*
+=================================================
+    exclusive_to_shared
+=================================================
+*/
+    template <bool A, bool B>
+    void  TRWSpinLock<A,B>::exclusive_to_shared () __NE___
+    {
+        for (uint p = 0;; ++p)
         {
-            return BitCast< ValueType >((BitCast<UInt_t>(val) | _LockMask));
+            if_likely( try_exclusive_to_shared( ThreadUtils::SpinBeforeLock(), _MaxReadLocks ))
+                return;
+
+            ThreadUtils::ProgressiveSleep( p );
         }
+    }
+//-----------------------------------------------------------------------------
+
 
-        ND_ static ValueType  _RemoveLockBit (ValueType val)__NE___
+
+/*
+=================================================
+    try_lock
+=================================================
+*/
+    template <typename V, uint L, bool B>
+    bool  TValueWithSpinLockBit<V,L,B>::try_lock () __NE___
+    {
+        Value_t exp = _RemoveLockBit( _value.load() );
+        return _value.CAS_Loop( INOUT exp, _SetLockBit( exp ), _AcquireOrder, EMemoryOrder::Relaxed );
+    }
+
+    template <typename V, uint L, bool B>
+    bool  TValueWithSpinLockBit<V,L,B>::try_lock (const uint numAttempts) __NE___
+    {
+        ASSERT( numAttempts > 0 );
+
+        Value_t exp = _value.load();
+        for (uint i = 0; i < numAttempts; ++i)
         {
-            return BitCast< ValueType >((BitCast<UInt_t>(val) & ~_LockMask));
+            exp = _RemoveLockBit( exp );
+
+            if ( _value.CAS( INOUT exp, _SetLockBit( exp ), _AcquireOrder, EMemoryOrder::Relaxed ))
+                return true;
+
+            ThreadUtils::Pause();
         }
-    };
+        return false;
+    }
+
+/*
+=================================================
+    lock
+=================================================
+*/
+    template <typename V, uint L, bool B>
+    void  TValueWithSpinLockBit<V,L,B>::lock () __NE___
+    {
+        for (uint p = 0;; ++p)
+        {
+            if_likely( try_lock( ThreadUtils::SpinBeforeLock() ))
+                return;
+
+            ThreadUtils::ProgressiveSleep( p );
+        }
+    }
+
+/*
+=================================================
+    unlock
+=================================================
+*/
+    template <typename V, uint L, bool B>
+    void  TValueWithSpinLockBit<V,L,B>::unlock () __NE___
+    {
+        Value_t exp = _RemoveLockBit( _value.load() );
+        Value_t prev = _value.exchange( exp, _ReleaseOrder );
+        Unused( prev );
+        ASSERT( prev == _SetLockBit( exp ));
+    }
+
+/*
+=================================================
+    try_set
+=================================================
+*/
+    template <typename V, uint L, bool B>
+    bool  TValueWithSpinLockBit<V,L,B>::try_set (Value_t val, const uint numAttempts) __NE___
+    {
+        ASSERT( not _HasLockBit( val ));
 
+        Value_t exp = _value.load();
 
-    template <typename T> using PtrWithSpinLock         = TValueWithSpinLockBit< T*, 0, false >;
-    template <typename T> using PtrWithSpinLockRelaxed  = TValueWithSpinLockBit< T*, 0, true >;
+        for (uint i = 0; i < numAttempts; ++i)
+        {
+            val = _CopyLockBit( val, exp );
+
+            if ( _value.CAS( INOUT exp, val, _ReleaseOrder, EMemoryOrder::Relaxed ))
+                return true;
+
+            ThreadUtils::Pause();
+        }
+        return false;
+    }
+
+/*
+=================================================
+    set
+=================================================
+*/
+    template <typename V, uint L, bool B>
+    void  TValueWithSpinLockBit<V,L,B>::set (Value_t val) __NE___
+    {
+        for (;;)
+        {
+            if_likely( try_set( val, ThreadUtils::SpinBeforeLock() ))
+                return;
+
+            ThreadUtils::Sleep_1us();
+        }
+    }
 
 
 } // AE::Threading
diff --git a/AE/engine/src/threading/Primitives/SyncEvent.cpp b/AE/engine/src/threading/Primitives/SyncEvent.cpp
index c161828d..29d16e70 100644
--- a/AE/engine/src/threading/Primitives/SyncEvent.cpp
+++ b/AE/engine/src/threading/Primitives/SyncEvent.cpp
@@ -3,7 +3,7 @@
 #include "threading/Primitives/SyncEvent.h"
 
 #if (AE_SYNC_EVENT_MODE == 0)
-# include "base/Platforms/WindowsHeader.h"
+# include "base/Platforms/WindowsHeader.cpp.h"
 
 namespace AE::Threading
 {
@@ -15,7 +15,7 @@ namespace AE::Threading
 */
     SyncEvent::SyncEvent (EFlags flags) __NE___
     {
-        STATIC_ASSERT( sizeof(_event) == sizeof(HANDLE) );
+        StaticAssert( sizeof(_event) == sizeof(HANDLE) );
 
         _event = ::CreateEventA( null,
                                  not AllBits( flags, EFlags::AutoReset ),
diff --git a/AE/engine/src/threading/Primitives/Synchronized.h b/AE/engine/src/threading/Primitives/Synchronized.h
index fafe501c..8661c596 100644
--- a/AE/engine/src/threading/Primitives/Synchronized.h
+++ b/AE/engine/src/threading/Primitives/Synchronized.h
@@ -91,8 +91,8 @@ namespace _hidden_
         using Self          = Synchronized< SyncObj, T0, T1, Types... >;
         using Types_t       = TypeList< T0, T1, Types... >;
 
-        STATIC_ASSERT( Types_t::AllNothrowDtor );
-        //STATIC_ASSERT( Types_t::AllNothrowMoveCtor );
+        //StaticAssert(( AllNothrowMoveCtor< T0, T1, Types... >));
+        //StaticAssert(( AllNothrowDefaultCtor< T0, T1, Types... >));
 
     private:
         using TypesNoRC_t   = typename Types_t::template Apply< RemoveRC >;
@@ -105,22 +105,22 @@ namespace _hidden_
         {
             if constexpr( Types_t::template HasType<T> )
             {
-                STATIC_ASSERT( Types_t::template HasSingle<T> );
+                StaticAssert( Types_t::template HasSingle<T> );
                 return Types_t::template Index<T>;
             }else
             if constexpr( TypesNoRC_t::template HasType<T> )
             {
-                STATIC_ASSERT( TypesNoRC_t::template HasSingle<T> );
+                StaticAssert( TypesNoRC_t::template HasSingle<T> );
                 return TypesNoRC_t::template Index<T>;
             }else
             if constexpr( TypesNoPtr_t::template HasType<T> )
             {
-                STATIC_ASSERT( TypesNoPtr_t::template HasSingle<T> );
+                StaticAssert( TypesNoPtr_t::template HasSingle<T> );
                 return TypesNoPtr_t::template Index<T>;
             }else
             if constexpr( TypesNoPtr2_t::template HasType<T> )
             {
-                STATIC_ASSERT( TypesNoPtr2_t::template HasSingle<T> );
+                StaticAssert( TypesNoPtr2_t::template HasSingle<T> );
                 return TypesNoPtr2_t::template Index<T>;
             }
         }
@@ -138,7 +138,7 @@ namespace _hidden_
         public:
             ReadNoLock_t (const Self &ref)                  __NE___ : _ref{ref} {}
             ReadNoLock_t (const ReadNoLock_t &)             = delete;
-            ReadNoLock_t (ReadNoLock_t && other)            __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
+            ReadNoLock_t (ReadNoLock_t &&other)             __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
             ~ReadNoLock_t ()                                __NE___ { if ( _locked ) unlock_shared(); }
 
             ReadNoLock_t&  operator = (const ReadNoLock_t &)= delete;
@@ -182,7 +182,7 @@ namespace _hidden_
         public:
             WriteNoLock_t (Self &ref)                           __NE___ : _ref{ref} {}
             WriteNoLock_t (const WriteNoLock_t &)               = delete;
-            WriteNoLock_t (WriteNoLock_t && other)              __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
+            WriteNoLock_t (WriteNoLock_t &&other)               __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
             ~WriteNoLock_t ()                                   __NE___ { if ( _locked ) unlock(); }
 
             WriteNoLock_t&  operator = (const WriteNoLock_t &)  = delete;
@@ -224,18 +224,18 @@ namespace _hidden_
 
     // methods
     public:
-        Synchronized ()                     noexcept(Types_t::AllNothrowDefaultCtor)
+        Synchronized ()                     __NE___
         {}
 
         Synchronized (Self &&other)         __NE___ :
             _values{ RVRef(other).Extract() }
         {}
 
-        explicit Synchronized (T0 &&arg0, T1 &&arg1, Types&&... args) noexcept(Types_t::AllNothrowDefaultCtor) :
+        explicit Synchronized (T0 &&arg0, T1 &&arg1, Types&&... args) __NE___ :
             _values{ FwdArg<T0>(arg0), FwdArg<T1>(arg1), FwdArg<Types>(args)... }
         {}
 
-        Synchronized (const Self &other)    noexcept(Types_t::AllNothrowCopyCtor) :
+        Synchronized (const Self &other)    NoExcept(AllNothrowCopyCtor<T0,T1,Types...>) :
             _values{ other.ReadAll() }  // throw
         {}
 
@@ -255,11 +255,11 @@ namespace _hidden_
             return *this;
         }
 
-        Self&  operator = (const Self &rhs) noexcept(Types_t::AllNothrowCopyAssignable)
+        Self&  operator = (const Self &rhs) __NE___
         {
             EXLOCK( this->_sync, rhs._sync );   // TODO: sharedlock for 'rhs'
             this->_values.~Tuple_t();
-            PlacementNew<Tuple_t>( OUT &this->_values, rhs._values );   // throw
+            PlacementNew<Tuple_t>( OUT &this->_values, rhs._values );
             return *this;
         }
 
@@ -268,7 +268,7 @@ namespace _hidden_
                   usize     Index           = _IndexOf<T>(),
                   typename  RawT            = typename Types_t::template Get<Index>
                  >
-        ND_ RawT  Read ()                   const noexcept(IsNothrowCopyCtor<RawT>)
+        ND_ RawT  Read ()                   CNoExcept(IsNothrowCopyCtor<RawT>)
         {
             SHAREDLOCK( _sync );
             return _values.template Get<Index>();
@@ -277,13 +277,13 @@ namespace _hidden_
         template <usize     Index,
                   typename  RawT            = typename Types_t::template Get<Index>
                  >
-        ND_ RawT  Read ()                   const noexcept(IsNothrowCopyCtor<RawT>)
+        ND_ RawT  Read ()                   CNoExcept(IsNothrowCopyCtor<RawT>)
         {
             SHAREDLOCK( _sync );
             return _values.template Get<Index>();
         }
 
-        ND_ Tuple_t  ReadAll ()             const noexcept(Types_t::AllNothrowCopyCtor)
+        ND_ Tuple_t  ReadAll ()             CNoExcept(AllNothrowCopyCtor<T0,T1,Types...>)
         {
             SHAREDLOCK( _sync );
             return _values;
@@ -293,9 +293,9 @@ namespace _hidden_
         template <typename T,
                   typename RawT             = RemoveCVRef<T>
                  >
-        void  Write (T &&value)             noexcept(IsNothrowCopyCtor<RawT>)
+        void  Write (T &&value)             __NE___
         {
-            STATIC_ASSERT( Types_t::template HasSingle<RawT> );
+            StaticAssert( Types_t::template HasSingle<RawT> );
             EXLOCK( _sync );
             auto&   dst = _values.template Get<RawT>();
             dst.~RawT();
@@ -303,7 +303,7 @@ namespace _hidden_
         }
 
         template <typename ...Args>
-        void  WriteAll (Args&& ...args)     noexcept(Types_t::AllNothrowCopyCtor)
+        void  WriteAll (Args&& ...args)     NoExcept(AllNothrowCopyCtor<T0,T1,Types...>)
         {
             EXLOCK( _sync );
             _values.Set( FwdArg<Args>(args)... );
@@ -314,23 +314,23 @@ namespace _hidden_
                   usize     Index           = _IndexOf<T>(),
                   typename  RawT            = typename Types_t::template Get<Index>
                  >
-        void  Reset ()                      noexcept(IsNothrowCopyCtor<RawT>)
+        void  Reset ()                      __NE___
         {
             EXLOCK( _sync );
             auto&   dst = _values.template Get<Index>();
             dst.~RawT();
-            PlacementNew<RawT>( OUT &dst, RawT{} );
+            PlacementNew<RawT>( OUT &dst );
         }
 
         template <usize     Index,
                   typename  RawT            = typename Types_t::template Get<Index>
                  >
-        void  Reset ()                      noexcept(IsNothrowCopyCtor<RawT>)
+        void  Reset ()                      __NE___
         {
             EXLOCK( _sync );
             auto&   dst = _values.template Get<Index>();
             dst.~RawT();
-            PlacementNew<RawT>( OUT &dst, RawT{} );
+            PlacementNew<RawT>( OUT &dst );
         }
 
 
@@ -384,8 +384,8 @@ namespace _hidden_
     template <typename SyncObj, typename T>
     class Synchronized< SyncObj, T >
     {
-        STATIC_ASSERT( IsNothrowDtor< T >);
-        //STATIC_ASSERT( IsNothrowMoveCtor< T >);
+        //CheckNothrow( IsNothrowDefaultCtor< T >);
+        //CheckNothrow( IsNothrowMoveCtor< T >);
 
     // types
     public:
@@ -402,7 +402,7 @@ namespace _hidden_
         public:
             ReadNoLock_t (const Self &ref)                      __NE___ : _ref{ref} {}
             ReadNoLock_t (const ReadNoLock_t &)                 = delete;
-            ReadNoLock_t (ReadNoLock_t && other)                __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
+            ReadNoLock_t (ReadNoLock_t &&other)                 __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
             ~ReadNoLock_t ()                                    __NE___ { if ( _locked ) unlock_shared(); }
 
             ReadNoLock_t&  operator = (const ReadNoLock_t &)    = delete;
@@ -428,7 +428,7 @@ namespace _hidden_
         public:
             WriteNoLock_t (Self &ref)                           __NE___ : _ref{ref} {}
             WriteNoLock_t (const WriteNoLock_t &)               = delete;
-            WriteNoLock_t (WriteNoLock_t && other)              __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
+            WriteNoLock_t (WriteNoLock_t &&other)               __NE___ : _ref{other._ref}, _locked{other._locked} { other._locked = false; }
             ~WriteNoLock_t ()                                   __NE___ { if ( _locked ) unlock(); }
 
             WriteNoLock_t&  operator = (const WriteNoLock_t &)  = delete;
@@ -451,7 +451,7 @@ namespace _hidden_
 
     // methods
     public:
-        Synchronized ()                         noexcept(IsNothrowDefaultCtor<T>)
+        Synchronized ()                         __NE___
         {}
 
         Synchronized (Self &&other)             __NE___ :
@@ -462,11 +462,11 @@ namespace _hidden_
             _value{ RVRef(value) }
         {}
 
-        Synchronized (const Self &other)        noexcept(IsNothrowCopyCtor<T>) :
+        Synchronized (const Self &other)        NoExcept(IsNothrowCopyCtor<T>) :
             _value{ other.Read() }  // throw
         {}
 
-        explicit Synchronized (const T &value)  noexcept(IsNothrowCopyCtor<T>) :
+        explicit Synchronized (const T &value)  NoExcept(IsNothrowCopyCtor<T>) :
             _value{ value }  // throw
         {}
 
@@ -483,7 +483,7 @@ namespace _hidden_
         )}
 
 
-        Self&  operator = (Self && rhs)         __NE___
+        Self&  operator = (Self &&rhs)          __NE___
         {
             EXLOCK( this->_sync, rhs._sync );   // TODO: sharedlock for 'rhs'
             this->_value.~T();
@@ -491,27 +491,27 @@ namespace _hidden_
             return *this;
         }
 
-        Self&  operator = (const Self &rhs)     noexcept(IsNothrowCopyCtor<T>)
+        Self&  operator = (const Self &rhs)     __NE___
         {
             EXLOCK( this->_sync, rhs._sync );   // TODO: sharedlock for 'rhs'
             this->_value.~T();
-            PlacementNew<T>( OUT &this->_value, rhs._value );  // throw
+            PlacementNew<T>( OUT &this->_value, rhs._value );
             return *this;
         }
 
 
-        ND_ T  Read ()                          const noexcept(IsNothrowCopyCtor<T>)
+        ND_ T  Read ()                          CNoExcept(IsNothrowCopyCtor<T>)
         {
             SHAREDLOCK( _sync );
             return _value;
         }
 
 
-        void  Write (const T &value)            noexcept(IsNothrowCopyCtor<T>)
+        void  Write (const T &value)            __NE___
         {
             EXLOCK( _sync );
             this->_value.~T();
-            PlacementNew<T>( OUT &this->_value, value );  // throw
+            PlacementNew<T>( OUT &this->_value, value );
         }
 
         void  Write (T &&value)                 __NE___
@@ -522,11 +522,11 @@ namespace _hidden_
         }
 
 
-        void  Reset ()                          noexcept(IsNothrowCopyCtor<T>)
+        void  Reset ()                          __NE___
         {
             EXLOCK( _sync );
             this->_value.~T();
-            PlacementNew<T>( OUT &this->_value, T{} );
+            PlacementNew<T>( OUT &this->_value );
         }
 
         ND_ T  Extract ()                       rvNE___
diff --git a/AE/engine/src/threading/TaskSystem/AsyncMutex.h b/AE/engine/src/threading/TaskSystem/AsyncMutex.h
index e87f3506..fcadd59d 100644
--- a/AE/engine/src/threading/TaskSystem/AsyncMutex.h
+++ b/AE/engine/src/threading/TaskSystem/AsyncMutex.h
@@ -48,7 +48,7 @@ namespace AE::Threading
 
     // variables
     private:
-        AtomicRC< IAsyncTask >      _currentTask    {null};
+        AtomicRC< IAsyncTask >      _currentTask;
 
 
     // methods
@@ -80,12 +80,12 @@ namespace AE::Threading
 #   define AE_PRIVATE_ASYNC_EXCLUSIVE_LOCK( _amutex_, _index_ )                                                 \
         decltype(_amutex_)::ExclusiveLock  AE_PRIVATE_UNITE_RAW( __asyncExLock, _index_ ){ _amutex_, this };    \
                                                                                                                 \
-        STATIC_ASSERT( AE::Base::IsBaseOfNoQual< AE::Threading::IAsyncTask, decltype(*this) >);                 \
+        StaticAssert( AE::Base::IsBaseOfNoQual< AE::Threading::IAsyncTask, decltype(*this) >);                  \
         ASSERT( this->DbgIsRunning() );                                                                         \
         ASSERT( AE::Base::StringView{"Run"} == AE_FUNCTION_NAME );                                              \
                                                                                                                 \
         if ( AE::Threading::AsyncTask  task = AE_PRIVATE_UNITE_RAW( __asyncExLock, _index_ ).Lock() ) {         \
-            return this->Continue( Tuple{task} );                                                               \
+            return this->Continue( Tuple{WeakDep{task}} );                                                      \
         }
 
 #   define ASYNC_EXLOCK( _amutex_ ) \
diff --git a/AE/engine/src/threading/TaskSystem/AsyncTask.h b/AE/engine/src/threading/TaskSystem/AsyncTask.h
index 83009719..36a5ed31 100644
--- a/AE/engine/src/threading/TaskSystem/AsyncTask.h
+++ b/AE/engine/src/threading/TaskSystem/AsyncTask.h
@@ -11,10 +11,10 @@
     <custom>            - use Scheduler().RegisterDependency< custom >(...)
 
     Weak dependency     - if task in weak dependency is canceled then dependent task will be executed.
-                          Call chain:  task depends on weak,  weak.Cancel(),  weak.OnCancel(),  task.Run().
+                          Call chain:  'task' depends on 'weak',  weak.Cancel(),  weak.OnCancel(),  task.Run().
 
     Strong dependency   - if task in strong dependency is canceled then dependent task will be canceled.
-                          Call chain:  task depends on strong,  strong.Cancel(),  strong.OnCancel(),  task.OnCancel().
+                          Call chain:  'task' depends on 'strong',  strong.Cancel(),  strong.OnCancel(),  task.OnCancel().
 
 
         Coroutines
@@ -125,18 +125,17 @@ namespace AE::Threading
         {
         // variables
             OutputChunk *                               next        = null;
-            uint                                        selfIndex   = UMax;
             uint                                        count       = 0;
             StaticArray< AsyncTask, ElemInChunk >       tasks       {};
             StaticArray< TaskDependency, ElemInChunk >  deps        {};
 
         // methods
-            OutputChunk ()          __NE___ {}
+            OutputChunk ()  __NE___ {}
 
-            void  Init (uint idx)   __NE___;
+            void  Init ()   __NE___;
         };
 
-        STATIC_ASSERT_64( sizeof(OutputChunk) == 128 );
+        StaticAssert64( sizeof(OutputChunk) == 128 );
 
         using WaitBits_t = ulong;
 
@@ -179,40 +178,57 @@ namespace AE::Threading
     protected:
         explicit IAsyncTask (ETaskQueue type)           __NE___;
 
-            // can throw exception
+
+        // Execute task.
+        // Can be executed multiple times if used 'Continue()'.
+        // Can throw exception.
+        //
             virtual void  Run ()                        __Th___ = 0;
 
-            virtual void  OnCancel ()                   __NE___ { ASSERT( not _isRunning.load() ); }
 
-            // call this only inside 'Run()' method.
+        // Executed in the same thread as 'Run()' was/could be executed.
+        // Status before: 'Cancellation', status after: 'Canceled'.
+        // You can free some resources here, otherwise they will be released later,
+        // when all reference to this task will be nulled.
+        //
+            virtual void  OnCancel ()                   __NE___ { ASSERT( not _isRunning.load() );  ASSERT( Status() == EStatus::Cancellation ); }
+
+
+        // Call this only inside 'Run()' method.
+        //
         ND_ bool  IsCanceled () const                   __NE___ { ASSERT( _isRunning.load() );  return Status() == EStatus::Cancellation; }
 
-            // call this only inside 'Run()' method
+
+        // Call this only inside 'Run()' method.
+        // 'OnCancel()' method will be used outside of 'Run()'.
+        //
             void  OnFailure ()                          __NE___;
 
-            // call this only inside 'Run()' method.
-            // doesn't restart if have been canceled in another thread.
-            // throw exception if failed to add dependencies.
+        // Call this only inside 'Run()' method.
+        // Doesn't restart if have been canceled in another thread.
+        // Throw exception if failed to add dependencies.
+        //
             template <typename ...Deps>
             void  Continue (const Tuple<Deps...> &)     __NE___;
             void  Continue ()                           __NE___ { return Continue( Tuple{} ); }
 
-            // call this before reusing task
+
+        // Call this before reusing task.
         ND_ bool  _ResetState ()                        __NE___;
 
-            // Only for debugging!
+        // Only for debugging!
             void  _DbgSet (EStatus status)              __NE___;
 
-            // Only during initialization
+        // Only during initialization
             void  _SetQueueType (ETaskQueue type)       __NE___;
 
-            // Only in constructor!
+        // Only in constructor!
             void  _MakeCompleted ()                     __NE___;
 
             bool  _SetCancellationState ()              __NE___;
 
     private:
-        // call this methods only after 'Run()' method
+        // Call this methods only after 'Run()' method.
         void  _OnFinish (OUT bool& rerun)               __NE___;
         void  _Cancel ()                                __NE___;
         void  _FreeOutputChunks (bool isCanceled)       __NE___;
@@ -246,13 +262,14 @@ namespace AE::Threading
     // methods
     public:
         template <typename Fn>
-        explicit AsyncTaskFn (Fn && fn, StringView dbgName = Default, ETaskQueue type = ETaskQueue::PerFrame) :
+        explicit AsyncTaskFn (Fn &&fn, StringView dbgName = Default, ETaskQueue type = ETaskQueue::PerFrame) __NE___ :
             IAsyncTask{ type },
             _fn{ FwdArg<Fn>(fn) }
             #ifdef AE_DEBUG
             , _dbgName{ dbgName }
             #endif
         {
+            //CheckNothrow( IsNoExcept( Func_t{ FwdArg<Fn>(fn) }));
             Unused( dbgName );
         }
 
@@ -406,8 +423,8 @@ namespace AE::Threading
         template <typename P>
         ND_ static bool  AwaitSuspendImpl (std::coroutine_handle<P> curCoro, const AsyncTask &dep) __NE___
         {
-            // compatible with all 'promise_type' which is inhertited from 'IAsyncTask'
-            STATIC_ASSERT( IsBaseOf< IAsyncTask, P >);
+            // compatible with all 'promise_type' which is inherited from 'IAsyncTask'
+            StaticAssert( IsBaseOf< IAsyncTask, P >);
 
             using EStatus = IAsyncTask::EStatus;
 
@@ -435,12 +452,13 @@ namespace AE::Threading
         template <typename P, typename ...Deps>
         ND_ static bool  AwaitSuspendImpl2 (std::coroutine_handle<P> curCoro, const Tuple<Deps...> &deps) __NE___
         {
-            // compatible with all 'promise_type' which is inhertited from 'IAsyncTask'
-            STATIC_ASSERT( IsBaseOf< IAsyncTask, P >);
+            // compatible with all 'promise_type' which is inherited from 'IAsyncTask'
+            StaticAssert( IsBaseOf< IAsyncTask, P >);
 
             using EStatus = IAsyncTask::EStatus;
 
-            const auto  stats_arr   = deps.Apply( [] (auto&& ...args) { return StaticArray< EStatus, CountOf<Deps...>() >{ _GetStatus( args ) ... }; });
+            const auto  stats_arr   = deps.Apply([] (auto&& ...args) __NE___
+                                                 { return StaticArray< EStatus, CountOf<Deps...>() >{ _GetStatus( args ) ... }; });
             const auto  stats       = ArrayView<EStatus>{ stats_arr };
 
             if ( stats.AllEqual( EStatus::Completed ))
@@ -453,7 +471,8 @@ namespace AE::Threading
                 return true;    // suspend & cancel
             }
 
-            curCoro.promise().Continue( deps.Apply( [] (auto&& ...args) { return Tuple{ AsyncTask{args} ... }; }));
+            curCoro.promise().Continue( deps.Apply([] (auto&& ...args) __NE___
+                                                   { return Tuple{ AsyncTask{args} ... }; }));
 
             // task may be cancelled
             if_unlikely( curCoro.promise().IsFinished() )
@@ -528,8 +547,8 @@ namespace AE::Threading
             template <typename P>
             ND_ bool    await_suspend (std::coroutine_handle<P> curCoro)__NE___
             {
-                // compatible with all 'promise_type' which is inhertited from 'IAsyncTask'
-                STATIC_ASSERT( IsBaseOf< IAsyncTask, P >);
+                // compatible with all 'promise_type' which is inherited from 'IAsyncTask'
+                StaticAssert( IsBaseOf< IAsyncTask, P >);
 
                 curCoro.promise().Fail();
                 return false;   // always resume coroutine
@@ -561,10 +580,10 @@ namespace AE::Threading
             template <typename P>
             ND_ bool    await_suspend (std::coroutine_handle<P> curCoro)__NE___
             {
-                // compatible with all 'promise_type' which is inhertited from 'IAsyncTask'
-                STATIC_ASSERT( IsBaseOf< IAsyncTask, P >);
+                // compatible with all 'promise_type' which is inherited from 'IAsyncTask'
+                StaticAssert( IsBaseOf< IAsyncTask, P >);
 
-                _isCanceled = curCoro.promise().IsCanceled();   
+                _isCanceled = curCoro.promise().IsCanceled();
                 return false;   // always resume coroutine
             }
         };
@@ -594,10 +613,10 @@ namespace AE::Threading
             template <typename P>
             ND_ bool    await_suspend (std::coroutine_handle<P> curCoro)__NE___
             {
-                // compatible with all 'promise_type' which is inhertited from 'IAsyncTask'
-                STATIC_ASSERT( IsBaseOf< IAsyncTask, P >);
+                // compatible with all 'promise_type' which is inherited from 'IAsyncTask'
+                StaticAssert( IsBaseOf< IAsyncTask, P >);
 
-                _status = curCoro.promise().Status();   
+                _status = curCoro.promise().Status();
                 return false;   // always resume coroutine
             }
         };
@@ -627,10 +646,10 @@ namespace AE::Threading
             template <typename P>
             ND_ bool    await_suspend (std::coroutine_handle<P> curCoro)__NE___
             {
-                // compatible with all 'promise_type' which is inhertited from 'IAsyncTask'
-                STATIC_ASSERT( IsBaseOf< IAsyncTask, P >);
+                // compatible with all 'promise_type' which is inherited from 'IAsyncTask'
+                StaticAssert( IsBaseOf< IAsyncTask, P >);
 
-                _queue = curCoro.promise().QueueType(); 
+                _queue = curCoro.promise().QueueType();
                 return false;   // always resume coroutine
             }
         };
diff --git a/AE/engine/src/threading/TaskSystem/Coroutine.h b/AE/engine/src/threading/TaskSystem/Coroutine.h
index 0071f87e..ee95b1a2 100644
--- a/AE/engine/src/threading/TaskSystem/Coroutine.h
+++ b/AE/engine/src/threading/TaskSystem/Coroutine.h
@@ -68,6 +68,8 @@ namespace _hidden_
                 StringView          DbgName ()                      C_NE_OV { return "Coroutine<>"; }
             #endif
 
+            ND_ static void*        operator new   (usize size)     __NE___ { return NothrowAllocatable::operator new( size ); }
+
 
         public:
                 void  Cancel ()                                     __NE___ { Unused( IAsyncTask::_SetCancellationState() ); }
@@ -173,7 +175,7 @@ namespace _hidden_
         template <typename P>
         ND_ bool  await_suspend (std::coroutine_handle<P> curCoro)  __NE___
         {
-            STATIC_ASSERT( IsSpecializationOf< typename P::Coroutine_t, CoroutineImpl >);
+            StaticAssert( IsSpecializationOf< typename P::Coroutine_t, CoroutineImpl >);
 
             return AsyncTaskCoro_AwaiterImpl::AwaitSuspendImpl( curCoro, AsyncTask{_dep} );
         }
@@ -196,7 +198,7 @@ namespace _hidden_
         // return promise results
         ND_ Tuple< Types... >  await_resume ()                                  __NE___
         {
-            return  _deps.Apply( [] (auto&& ...args) {
+            return  _deps.Apply( [] (auto&& ...args) __NE___ {
                         return Tuple<Types...>{ args._Result() ... };
                     });
         }
@@ -205,7 +207,7 @@ namespace _hidden_
         template <typename P>
         ND_ bool  await_suspend (std::coroutine_handle<P> curCoro)              __NE___
         {
-            STATIC_ASSERT( IsSpecializationOf< typename P::Coroutine_t, CoroutineImpl >);
+            StaticAssert( IsSpecializationOf< typename P::Coroutine_t, CoroutineImpl >);
 
             return AsyncTaskCoro_AwaiterImpl::AwaitSuspendImpl2( curCoro, _deps );
         }
diff --git a/AE/engine/src/threading/TaskSystem/EThread.h b/AE/engine/src/threading/TaskSystem/EThread.h
index 6832e26b..53da2ead 100644
--- a/AE/engine/src/threading/TaskSystem/EThread.h
+++ b/AE/engine/src/threading/TaskSystem/EThread.h
@@ -18,7 +18,7 @@ namespace AE::Threading
                         // Allowed:
                         //      - RenderTask, RenderTaskCoro
                         // Note:
-                        //      Command pool allocated per thread, so number of threads with active command pool should be small
+                        //      Command pool allocated per thread, so number of threads with active command pools should be small
                         //      to minimize memory usage. Software command buffers can be used in any thread.
 
         Background,     // Worker thread with low priority.
@@ -43,9 +43,9 @@ namespace AE::Threading
                         // Used only to check if OS complete async IO and mark task dependency as complete.
         _Count
     };
-    STATIC_ASSERT( sizeof(EThread) == sizeof(ETaskQueue) );
-    STATIC_ASSERT( uint(ETaskQueue::_Count) == 4 );
-    STATIC_ASSERT( uint(EThread::_Count) == 6 );
+    StaticAssert( sizeof(EThread) == sizeof(ETaskQueue) );
+    StaticAssert( uint(ETaskQueue::_Count) == 4 );
+    StaticAssert( uint(EThread::_Count) == 6 );
 
 
     using ETaskQueueBits    = EnumBitSet< ETaskQueue >;
@@ -110,7 +110,7 @@ namespace AE::Threading
         template <typename Arg0, typename ...Args>
         constexpr void  _Insert (Arg0 arg0, Args ...args)           __NE___
         {
-            STATIC_ASSERT(( IsSameTypes< Arg0, ETaskQueue > or IsSameTypes< Arg0, EThread > ));
+            StaticAssert(( IsSameTypes< Arg0, ETaskQueue > or IsSameTypes< Arg0, EThread > ));
 
             _arr.try_push_back( EThread(arg0) );
 
diff --git a/AE/engine/src/threading/TaskSystem/LfTaskQueue.cpp b/AE/engine/src/threading/TaskSystem/LfTaskQueue.cpp
index fe0f5c11..cc84d037 100644
--- a/AE/engine/src/threading/TaskSystem/LfTaskQueue.cpp
+++ b/AE/engine/src/threading/TaskSystem/LfTaskQueue.cpp
@@ -65,7 +65,7 @@ namespace AE::Threading
     Process
 =================================================
 */
-    bool  LfTaskQueue::Process (usize seed) __NE___
+    bool  LfTaskQueue::Process (const EThreadSeed seed) __NE___
     {
         if_likely( AsyncTask task = Pull( seed ))
         {
@@ -80,12 +80,12 @@ namespace AE::Threading
             )
             //AE_LOG_DBG( "begin: "s << task->DbgName() );
 
-            try {
+            TRY{
                 task->Run();    // throw
             }
-            catch(...) {
+            CATCH_ALL(
                 task->_SetCancellationState();
-            }
+            )
 
             DEBUG_ONLY( task->_isRunning.store( false ));
             PROFILE_ONLY(
@@ -171,7 +171,7 @@ namespace AE::Threading
     Pull
 =================================================
 */
-    AsyncTask  LfTaskQueue::Pull (usize seed) __NE___
+    AsyncTask  LfTaskQueue::Pull (const EThreadSeed seed) __NE___
     {
         DEBUG_ONLY(
             const auto  start_time = TimePoint_t::clock::now();
@@ -179,7 +179,7 @@ namespace AE::Threading
 
         for (usize j = 0; j < MaxChunks; ++j)
         {
-            Chunk*  chunk_ptr = _chunks[ (j + seed) % MaxChunks ];
+            Chunk*  chunk_ptr = _chunks[ (j + usize(seed)) % MaxChunks ];
 
             for (; chunk_ptr != null; chunk_ptr = chunk_ptr->next.load())
             {
@@ -229,7 +229,7 @@ namespace AE::Threading
                 packed.pack.count   = count;
 
                 const bool  array_changed   = (old_packed.pack.count != count);
-                const auto  order           = 
+                const auto  order           =
                     (array_changed and task != null) ?  EMemoryOrder::AcquireRelease :  // both
                     array_changed                    ?  EMemoryOrder::Release :         // flush changes in 'Chunk::array'
                                                         EMemoryOrder::Relaxed;
@@ -262,12 +262,9 @@ namespace AE::Threading
 /*
 =================================================
     Add
-----
-    TODO: insert tasks without dependencies to the front,
-        with dependencies - to the back
 =================================================
 */
-    void  LfTaskQueue::Add (AsyncTask task, usize seed) __NE___
+    void  LfTaskQueue::Add (AsyncTask task, const EThreadSeed seed) __NE___
     {
         ASSERT( task != null );
 
@@ -279,7 +276,7 @@ namespace AE::Threading
         {
             for (usize j = 0; j < MaxChunks; ++j)
             {
-                Chunk*  chunk_ptr = _chunks[ (j + seed) % MaxChunks ];
+                Chunk*  chunk_ptr = _chunks[ (j + usize(seed)) % MaxChunks ];
 
                 for (uint depth = 0; chunk_ptr != null; ++depth)
                 {
@@ -332,7 +329,7 @@ namespace AE::Threading
 
                                 _maxTasks.fetch_max( _taskCount.Add( 1 ));
                             )
-                            return;
+                            return;  // ok
                         }
                     }
 
@@ -342,13 +339,16 @@ namespace AE::Threading
                     if_unlikely( next == null )
                     {
                         if ( depth >= MaxDepth )
+                        {
+                            AE_LOG_DBG( "task queue overflow" );
                             break;
+                        }
 
-                        next = new Chunk{};
+                        next = new Chunk{};  // throw
 
                         for (Chunk* exp_chunk = null;;)
                         {
-                            if ( chunk_ptr->next.CAS( INOUT exp_chunk, next ))
+                            if_likely( chunk_ptr->next.CAS( INOUT exp_chunk, next ))
                                 break;
 
                             // new chunk was added by another thread
@@ -367,13 +367,20 @@ namespace AE::Threading
                 }
             }
 
-            //AE_LOGI( "task queue overflow" );
-            ThreadUtils::YieldOrSleep();
-
-            // TODO: wait for event or sleep
+            ThreadUtils::Sleep_500us();
         }
     }
 
+/*
+=================================================
+    CancelAll
+=================================================
+*/
+    void  LfTaskQueue::CancelAll () __NE___
+    {
+        // TODO
+    }
+
 /*
 =================================================
     WriteProfilerStat
@@ -386,6 +393,7 @@ namespace AE::Threading
             auto    search_time = _searchTime.exchange( 0 );
             auto    insert_time = _insertionTime.exchange( 0 );
             auto    max_tasks   = _maxTasks.exchange( 0 );
+            auto    task_count  = _totalProcessed.exchange( 0 );
 
             if ( (work_time == 0 and search_time == 0) or max_tasks == 0 )
                 return;
@@ -394,11 +402,12 @@ namespace AE::Threading
             double  search      = (work_time ? double(search_time) /  work : 1.0);
             double  insertion   = (work_time ? double(insert_time) /  work : 1.0);
 
-            AE_LOGI( _name
-                << " queue total work: " << ToString( nanoseconds(work_time) )
-                << ", search: " << ToString( search * 100.0, 2 ) << " %"
-                << ", insertion: " << ToString( insertion * 100.0, 2 ) << " %"
-                << ", max tasks: " << ToString( max_tasks ));
+            AE_LOGI( String{_name} << " queue "
+                << "\n  total work: " << ToString( nanoseconds{work_time} )
+                << "\n  search:     " << ToString( search * 100.0, 2 ) << " %"
+                << "\n  insertion:  " << ToString( insertion * 100.0, 2 ) << " %"
+                << "\n  max tasks:  " << ToString( max_tasks )
+                << "\n  avg task t: " << ToString( nanosecondsd{ work / task_count }));
         )
     }
 
@@ -423,22 +432,22 @@ namespace AE::Threading
                     continue;
 
                 // lock spinlock
-                for (uint i = 0;; ++i)
-                {
-                    // expect in unlocked state
-                    packed.pack.locked = 0;
+                [&]() {
+                    for (uint p = 0;; ++p)
+                    {
+                        for (uint i = 0; i < ThreadUtils::SpinBeforeLock(); ++i)
+                        {
+                            // expect in unlocked state
+                            packed.pack.locked = 0;
 
-                    if_likely( chunk_ptr->packed.CAS( INOUT packed, packed.Lock() ))
-                        break;
+                            if_likely( chunk_ptr->packed.CAS( INOUT packed, packed.Lock() ))
+                                return;
 
-                    if_unlikely( i > ThreadUtils::SpinBeforeLock() )
-                    {
-                        i = 0;
-                        ThreadUtils::YieldOrSleep();
+                            ThreadUtils::Pause();
+                        }
+                        ThreadUtils::ProgressiveSleep( p );
                     }
-
-                    ThreadUtils::Pause();
-                }
+                }();
 
                 // load changes in 'Chunk::array'
                 MemoryBarrier( EMemoryOrder::Acquire );
diff --git a/AE/engine/src/threading/TaskSystem/LfTaskQueue.h b/AE/engine/src/threading/TaskSystem/LfTaskQueue.h
index 512e10aa..3b9f3da4 100644
--- a/AE/engine/src/threading/TaskSystem/LfTaskQueue.h
+++ b/AE/engine/src/threading/TaskSystem/LfTaskQueue.h
@@ -17,7 +17,7 @@ namespace AE::Threading
         static constexpr uint   TasksPerChunk       = (1u << 7) - 2;    // 2 pointers are reserved
         static constexpr uint   MaxChunks           = 2;
         static constexpr uint   MaxDepth            = 128*4;
-        static constexpr uint   SpinlockWaitCount   = 3;
+        static constexpr uint   SpinlockWaitCount   = 8;
 
         using TimePoint_t   = std::chrono::high_resolution_clock::time_point;
         using TaskArr_t     = StaticArray< AsyncTask, TasksPerChunk >;
@@ -48,8 +48,8 @@ namespace AE::Threading
             Chunk () __NE___ {}
         };
 
-        STATIC_ASSERT_64( sizeof(Chunk) == 1_Kb );
-        STATIC_ASSERT( TasksPerChunk * MaxChunks * MaxDepth < 1'000'000 );
+        StaticAssert64( sizeof(Chunk) == 1_Kb );
+        StaticAssert( TasksPerChunk * MaxChunks * MaxDepth < 1'000'000 );
 
         using ChunkArray_t  = StaticArray< Chunk *, MaxChunks >;
 
@@ -76,9 +76,9 @@ namespace AE::Threading
         LfTaskQueue (POTValue seedMask, StringView name)                    __Th___;
         ~LfTaskQueue ()                                                     __NE___ { Release(); }
 
-        ND_ AsyncTask   Pull (usize seed)                                   __NE___;
-            bool        Process (usize seed)                                __NE___;
-            void        Add (AsyncTask task, usize seed)                    __NE___;
+        ND_ AsyncTask   Pull (EThreadSeed seed)                             __NE___;
+            bool        Process (EThreadSeed seed)                          __NE___;
+            void        Add (AsyncTask task, EThreadSeed seed)              __NE___;
 
             void        WriteProfilerStat ()                                __NE___;
 
@@ -86,6 +86,7 @@ namespace AE::Threading
         ND_ Bytes       AllocatedSize ()                                    C_NE___;
 
             void        Release ()                                          __NE___;
+            void        CancelAll ()                                        __NE___;
 
 
       // debugging //
diff --git a/AE/engine/src/threading/TaskSystem/Promise.h b/AE/engine/src/threading/TaskSystem/Promise.h
index a9780738..fe8c15fd 100644
--- a/AE/engine/src/threading/TaskSystem/Promise.h
+++ b/AE/engine/src/threading/TaskSystem/Promise.h
@@ -33,7 +33,7 @@ namespace _hidden_
     template <typename T>
     struct PromiseResult
     {
-        STATIC_ASSERT( not IsSameTypes< Threading::_hidden_::PromiseNullResult, T >);
+        StaticAssert( not IsSameTypes< Threading::_hidden_::PromiseNullResult, T >);
 
     // types
     private:
@@ -53,18 +53,18 @@ namespace _hidden_
         PromiseResult ()                                                = delete;
 
         PromiseResult (T &&value)                                       __NE___ : _value{RVRef(value)}, _hasValue{true} {}
-        PromiseResult (const T &value)                                  __Th___ : _value{value}, _hasValue{true} {}
+        PromiseResult (const T &value)                                  __NE___ : _value{value}, _hasValue{true} {}
         PromiseResult (const NullResult_t &)                            __NE___ {}
 
-        PromiseResult (const PromiseResult<T> &other)                   __Th___;
+        PromiseResult (const PromiseResult<T> &other)                   __NE___;
         PromiseResult (PromiseResult<T> &&other)                        __NE___;
 
-        PromiseResult<T>&  operator = (const PromiseResult<T> &rhs)     __Th___;
+        PromiseResult<T>&  operator = (const PromiseResult<T> &rhs)     __NE___;
         PromiseResult<T>&  operator = (PromiseResult<T> &&rhs)          __NE___;
-        PromiseResult<T>&  operator = (const T &rhs)                    __Th___;
+        PromiseResult<T>&  operator = (const T &rhs)                    __NE___;
         PromiseResult<T>&  operator = (T &&rhs)                         __NE___;
 
-        ~PromiseResult ()                                               __NE___ { STATIC_ASSERT( std::is_nothrow_destructible_v<T> );  if ( _hasValue ) _value.~T(); }
+        ~PromiseResult ()                                               __NE___ { StaticAssert( std::is_nothrow_destructible_v<T> );  if ( _hasValue ) _value.~T(); }
 
         ND_ bool        HasValue ()                                     C_NE___ { return _hasValue; }
         ND_ T const&    Value ()                                        C_NE___ { ASSERT( _hasValue );  return _value; }
@@ -107,7 +107,7 @@ namespace _hidden_
     template <typename T>
     class Promise final
     {
-        STATIC_ASSERT( not IsSameTypes< Threading::_hidden_::PromiseNullResult, T >);
+        StaticAssert( not IsSameTypes< Threading::_hidden_::PromiseNullResult, T >);
 
     // types
     public:
@@ -141,20 +141,20 @@ namespace _hidden_
         template <typename Fn>
         auto  Then (Fn &&fn,
                     StringView dbgName      = Default,
-                    ETaskQueue queueType    = ETaskQueue::PerFrame)                 __Th___;
+                    ETaskQueue queueType    = ETaskQueue::PerFrame)                 __NE___;
 
         // used to process errors
         template <typename Fn>
         auto  Except (Fn &&fn,
                       StringView dbgName    = Default,
-                      ETaskQueue queueType  = ETaskQueue::PerFrame)                 __Th___;
+                      ETaskQueue queueType  = ETaskQueue::PerFrame)                 __NE___;
 
         bool  Cancel ()                                                             __NE___;
 
         // Execute 'fn' only if result is ready.
         // Returns 'true' if completed and 'fn' is executed.
         template <typename Fn>
-        bool  WithResult (Fn && fn)                                                 __Th___;
+        bool  WithResult (Fn &&fn)                                                  NoExcept(IsNothrowInvocable< Fn, T >);
 
         explicit operator AsyncTask ()                                              C_NE___ { return _impl; }
         explicit operator bool ()                                                   C_NE___ { return bool{_impl}; }
@@ -163,19 +163,19 @@ namespace _hidden_
 
     private:
         template <typename Fn>
-        auto  _Then (Fn &&fn, StringView, ETaskQueue queueType)                     __Th___;
+        auto  _Then (Fn &&fn, StringView, ETaskQueue queueType)                     __NE___;
 
         template <typename Fn>
-        auto  _Except (Fn &&fn, StringView, ETaskQueue queueType)                   __Th___;
+        auto  _Except (Fn &&fn, StringView, ETaskQueue queueType)                   __NE___;
 
         template <typename A>
-        Promise (A &&val, bool except, StringView, ETaskQueue, ValueArg)            __Th___;
+        Promise (A &&val, bool except, StringView, ETaskQueue, ValueArg)            __NE___;
 
         template <typename A>
-        Promise (A &&val, bool except, StringView, ETaskQueue, CompleteValueArg)    __Th___;
+        Promise (A &&val, bool except, StringView, ETaskQueue, CompleteValueArg)    __NE___;
 
         template <typename Fn>
-        Promise (Fn &&fn, bool except, StringView, ETaskQueue, FunctionArg)         __Th___;
+        Promise (Fn &&fn, bool except, StringView, ETaskQueue, FunctionArg)         __NE___;
 
         ND_ T  _Result ()                                                           C_NE___;
 
@@ -183,25 +183,25 @@ namespace _hidden_
     // friend functions
     private:
         template <typename Fn, typename ...Deps>
-        friend auto  MakePromise (Fn &&, const Tuple<Deps...> &, StringView, ETaskQueue)        __Th___;
+        friend auto  MakePromise (Fn &&, const Tuple<Deps...> &, StringView, ETaskQueue)        __NE___;
 
         template <typename ...Args>
-        friend auto  MakePromiseFrom (Args&& ...)                                               __Th___;
+        friend auto  MakePromiseFrom (Args&& ...)                                               __NE___;
 
         template <typename A>
-        friend auto  MakePromiseFromArray (Array<Promise<A>>, StringView, ETaskQueue)           __Th___;
+        friend auto  MakePromiseFromArray (Array<Promise<A>>, StringView, ETaskQueue)           __NE___;
 
         template <typename A>
-        friend auto  MakePromiseFromArray (Array< Promise< Array<A> >>, StringView, ETaskQueue) __Th___;
+        friend auto  MakePromiseFromArray (Array< Promise< Array<A> >>, StringView, ETaskQueue) __NE___;
 
         template <typename Fn>
-        friend auto  MakeDelayedPromise (Fn &&fn, StringView, ETaskQueue)                       __Th___;
+        friend auto  MakeDelayedPromise (Fn &&fn, StringView, ETaskQueue)                       __NE___;
 
         template <typename B, typename ...Deps>
-        friend auto  MakePromiseFromValue (B &&, const Tuple<Deps...> &, StringView, ETaskQueue) __Th___;
+        friend auto  MakePromiseFromValue (B &&, const Tuple<Deps...> &, StringView, ETaskQueue)__NE___;
 
         template <typename B>
-        friend auto  MakeDelayedPromiseFromValue (B &&, StringView, ETaskQueue)                 __Th___;
+        friend auto  MakeDelayedPromiseFromValue (B &&, StringView, ETaskQueue)                 __NE___;
 
         template <typename B>
         friend class Promise;
@@ -244,10 +244,10 @@ namespace _hidden_
         _InternalImpl (Fn &&fn, bool except, StringView, ETaskQueue, Promise<T>::FunctionArg)           __NE___;
 
         template <typename A>
-        _InternalImpl (A && value, bool except, StringView, ETaskQueue, Promise<T>::ValueArg)           __NE___;
+        _InternalImpl (A &&value, bool except, StringView, ETaskQueue, Promise<T>::ValueArg)            __NE___;
 
         template <typename A>
-        _InternalImpl (A && value, bool except, StringView, ETaskQueue, Promise<T>::CompleteValueArg)   __NE___;
+        _InternalImpl (A &&value, bool except, StringView, ETaskQueue, Promise<T>::CompleteValueArg)    __NE___;
 
         ND_ decltype(auto)  Result ()                                                                   C_NE___
         {
@@ -324,7 +324,7 @@ namespace _hidden_
         // return promise results
         ND_ Tuple< Types... >  await_resume ()                          __NE___
         {
-            return  _deps.Apply( [] (auto&& ...args) {
+            return  _deps.Apply( [] (auto&& ...args) __NE___ {
                         return Tuple<Types...>{ args._Result() ... };
                     });
         }
@@ -366,18 +366,18 @@ namespace _hidden_
 =================================================
 */
     template <typename T>
-    PromiseResult<T>::PromiseResult (const PromiseResult<T> &other) __Th___ :
+    PromiseResult<T>::PromiseResult (const PromiseResult<T> &other) __NE___ :
         _hasValue{ other._hasValue }
     {
         if ( _hasValue )
-            PlacementNew<T>( OUT &_value, other._value );   // throw
+            PlacementNew<T>( OUT &_value, other._value );
     }
 
     template <typename T>
     PromiseResult<T>::PromiseResult (PromiseResult<T> &&other) __NE___ :
         _hasValue{ other._hasValue }
     {
-        STATIC_ASSERT( IsNothrowMoveCtor<T> );
+        CheckNothrow( IsNothrowMoveCtor<T> );
         if ( _hasValue )
             PlacementNew<T>( OUT &_value, RVRef(other._value) );
     }
@@ -388,7 +388,7 @@ namespace _hidden_
 =================================================
 */
     template <typename T>
-    PromiseResult<T>&  PromiseResult<T>::operator = (const PromiseResult<T> &rhs) __Th___
+    PromiseResult<T>&  PromiseResult<T>::operator = (const PromiseResult<T> &rhs) __NE___
     {
         if ( _hasValue )
             _value.~T();
@@ -396,7 +396,7 @@ namespace _hidden_
         _hasValue = rhs._hasValue;
 
         if ( _hasValue )
-            PlacementNew<T>( OUT &_value, rhs._value );     // throw
+            PlacementNew<T>( OUT &_value, rhs._value );
 
         return *this;
     }
@@ -404,7 +404,7 @@ namespace _hidden_
     template <typename T>
     PromiseResult<T>&  PromiseResult<T>::operator = (PromiseResult<T> &&rhs) __NE___
     {
-        STATIC_ASSERT( std::is_nothrow_move_assignable_v<T> );
+        CheckNothrow( IsNothrowMoveAssignable<T> );
 
         if ( _hasValue )
             _value.~T();
@@ -421,13 +421,13 @@ namespace _hidden_
     }
 
     template <typename T>
-    PromiseResult<T>&  PromiseResult<T>::operator = (const T &rhs) __Th___
+    PromiseResult<T>&  PromiseResult<T>::operator = (const T &rhs) __NE___
     {
         if ( _hasValue )
             _value.~T();
 
         _hasValue = true;
-        PlacementNew<T>( OUT &_value, rhs );    // throw
+        PlacementNew<T>( OUT &_value, rhs );
 
         return *this;
     }
@@ -435,7 +435,7 @@ namespace _hidden_
     template <typename T>
     PromiseResult<T>&  PromiseResult<T>::operator = (T &&rhs) __NE___
     {
-        STATIC_ASSERT( std::is_nothrow_move_assignable_v<T> );
+        CheckNothrow( IsNothrowMoveAssignable<T> );
 
         if ( _hasValue )
             _value.~T();
@@ -481,19 +481,19 @@ namespace _hidden_
 */
     template <typename T>
     template <typename Fn>
-    Promise<T>::Promise (Fn &&fn, bool except, StringView dbgName, ETaskQueue queueType, FunctionArg flag) __Th___ :
+    Promise<T>::Promise (Fn &&fn, bool except, StringView dbgName, ETaskQueue queueType, FunctionArg flag) __NE___ :
         _impl{ MakeRC<_InternalImpl>( FwdArg<Fn>(fn), except, dbgName, queueType, flag )}
     {}
 
     template <typename T>
     template <typename A>
-    Promise<T>::Promise (A &&value, bool except, StringView dbgName, ETaskQueue queueType, ValueArg flag) __Th___ :
+    Promise<T>::Promise (A &&value, bool except, StringView dbgName, ETaskQueue queueType, ValueArg flag) __NE___ :
         _impl{ MakeRC<_InternalImpl>( FwdArg<A>(value), except, dbgName, queueType, flag )}
     {}
 
     template <typename T>
     template <typename A>
-    Promise<T>::Promise (A &&value, bool except, StringView dbgName, ETaskQueue queueType, CompleteValueArg flag) __Th___ :
+    Promise<T>::Promise (A &&value, bool except, StringView dbgName, ETaskQueue queueType, CompleteValueArg flag) __NE___ :
         _impl{ MakeRC<_InternalImpl>( FwdArg<A>(value), except, dbgName, queueType, flag )}
     {}
 
@@ -504,14 +504,14 @@ namespace _hidden_
 */
     template <typename T>
     template <typename Fn>
-    auto  Promise<T>::_Then (Fn &&fn, StringView dbgName, ETaskQueue queueType) __Th___
+    auto  Promise<T>::_Then (Fn &&fn, StringView dbgName, ETaskQueue queueType) __NE___
     {
         using FI        = FunctionInfo< Fn >;
         using Result    = typename Threading::_hidden_::ResultToPromise< typename FI::result >::type;
 
         if constexpr( IsVoid<T> and IsVoid< typename FI::result > )
         {
-            STATIC_ASSERT( FI::args::Count == 0 );
+            StaticAssert( FI::args::Count == 0 );
 
             return Result{  [fn = FwdArg<Fn>(fn)] () {
                                 fn();
@@ -525,7 +525,7 @@ namespace _hidden_
         else
         if constexpr( IsVoid<T> )
         {
-            STATIC_ASSERT( FI::args::Count == 0 );
+            StaticAssert( FI::args::Count == 0 );
 
             return Result{  FwdArg<Fn>(fn),
                             false,
@@ -536,8 +536,8 @@ namespace _hidden_
         else
         if constexpr( IsVoid< typename FI::result > )
         {
-            STATIC_ASSERT( FI::args::Count == 1 );
-            STATIC_ASSERT( IsSameTypes< typename FI::args::template Get<0>, const T& >,
+            StaticAssert( FI::args::Count == 1 );
+            StaticAssert( IsSameTypes< typename FI::args::template Get<0>, const T& >,
                            "argument type must be 'const T&'" );
 
             return Result{  [fn = FwdArg<Fn>(fn), in = _impl] () {
@@ -551,8 +551,8 @@ namespace _hidden_
         }
         else
         {
-            STATIC_ASSERT( FI::args::Count == 1 );
-            STATIC_ASSERT( IsSameTypes< typename FI::args::template Get<0>, const T& >);
+            StaticAssert( FI::args::Count == 1 );
+            StaticAssert( IsSameTypes< typename FI::args::template Get<0>, const T& >);
 
             return Result{  [fn = FwdArg<Fn>(fn), in = _impl] () {
                                 return fn( in->Result() );
@@ -571,7 +571,7 @@ namespace _hidden_
 */
     template <typename T>
     template <typename Fn>
-    auto  Promise<T>::Then (Fn &&fn, StringView dbgName, ETaskQueue queueType) __Th___
+    auto  Promise<T>::Then (Fn &&fn, StringView dbgName, ETaskQueue queueType) __NE___
     {
         using FI        = FunctionInfo< Fn >;
         using Result    = typename Threading::_hidden_::ResultToPromise< typename FI::result >::type;
@@ -609,12 +609,12 @@ namespace _hidden_
 */
     template <typename T>
     template <typename Fn>
-    auto  Promise<T>::_Except (Fn &&fn, StringView dbgName, ETaskQueue queueType) __Th___
+    auto  Promise<T>::_Except (Fn &&fn, StringView dbgName, ETaskQueue queueType) __NE___
     {
         using FI        = FunctionInfo< Fn >;
         using Result    = typename Threading::_hidden_::ResultToPromise< typename FI::result >::type;
 
-        STATIC_ASSERT( FI::args::Count == 0 );
+        StaticAssert( FI::args::Count == 0 );
 
         if constexpr( IsVoid< typename FI::result > )
         {
@@ -639,7 +639,7 @@ namespace _hidden_
 
     template <typename T>
     template <typename Fn>
-    auto  Promise<T>::Except (Fn &&fn, StringView dbgName, ETaskQueue queueType) __Th___
+    auto  Promise<T>::Except (Fn &&fn, StringView dbgName, ETaskQueue queueType) __NE___
     {
         if_likely( _impl )
         {
@@ -696,7 +696,7 @@ namespace _hidden_
     template <typename T>
     IAsyncTask::EStatus  Promise<T>::Status () C_NE___
     {
-        return _impl ? _impl->Status() : IAsyncTask::EStatus::Initial; 
+        return _impl ? _impl->Status() : IAsyncTask::EStatus::Initial;
     }
 
 /*
@@ -706,11 +706,12 @@ namespace _hidden_
 */
     template <typename T>
     template <typename Fn>
-    bool  Promise<T>::WithResult (Fn && fn) __Th___
+    bool  Promise<T>::WithResult (Fn &&fn) NoExcept(IsNothrowInvocable< Fn, T >)
     {
+        StaticAssert( IsVoid< ResultOf< Fn, T >>);
         if ( _impl and _impl->IsCompleted() )
         {
-            fn( _impl->Result() );  // may throw
+            fn( _impl->Result() );
             return true;
         }
         return false;
@@ -796,7 +797,7 @@ namespace _hidden_
     {
         if_likely( _isExept & bool(_func) )
         {
-            CATCH(
+            NOTHROW(
                 _result = _func();  // may throw
             )
             _func   = null;
@@ -816,14 +817,14 @@ namespace _hidden_
     template <typename T>
     ND_ auto  MakeDelayedPromiseFromValue (T &&         value,
                                            StringView   dbgName     = Default,
-                                           ETaskQueue   queueType   = ETaskQueue::PerFrame) __Th___
+                                           ETaskQueue   queueType   = ETaskQueue::PerFrame) __NE___
     {
-        STATIC_ASSERT( not std::is_invocable_v<T> );
+        StaticAssert( not std::is_invocable_v<T> );
 
         using Value_t   = RemoveReference< T >;
         using Result    = typename Threading::_hidden_::ResultToPromise< Value_t >::type;
 
-        STATIC_ASSERT( not IsVoid< Value_t >);
+        StaticAssert( not IsVoid< Value_t >);
 
         return Result{  FwdArg<T>(value),
                         false,
@@ -843,14 +844,14 @@ namespace _hidden_
     ND_ auto  MakePromiseFromValue (T &&                    value,
                                     const Tuple<Deps...> &  dependsOn   = Default,
                                     StringView              dbgName     = Default,
-                                    ETaskQueue              queueType   = ETaskQueue::PerFrame) __Th___
+                                    ETaskQueue              queueType   = ETaskQueue::PerFrame) __NE___
     {
-        STATIC_ASSERT( not std::is_invocable_v<T> );
+        StaticAssert( not std::is_invocable_v<T> );
 
         using Value_t   = RemoveReference< T >;
         using Result    = typename Threading::_hidden_::ResultToPromise< Value_t >::type;
 
-        STATIC_ASSERT( not IsVoid< Value_t >);
+        StaticAssert( not IsVoid< Value_t >);
 
         if constexpr( CountOf<Deps...>() == 0 )
         {
@@ -884,9 +885,9 @@ namespace _hidden_
     template <typename Fn>
     ND_ auto  MakeDelayedPromise (Fn &&         fn,
                                   StringView    dbgName     = Default,
-                                  ETaskQueue    queueType   = ETaskQueue::PerFrame) __Th___
+                                  ETaskQueue    queueType   = ETaskQueue::PerFrame) __NE___
     {
-        STATIC_ASSERT( std::is_invocable_v<Fn> );
+        StaticAssert( std::is_invocable_v<Fn> );
 
         using Value_t   = typename FunctionInfo< Fn >::result;
         using Result    = typename Threading::_hidden_::ResultToPromise< Value_t >::type;
@@ -917,7 +918,7 @@ namespace _hidden_
     ND_ auto  MakePromise (Fn &&                    fn,
                            const Tuple<Deps...> &   dependsOn   = Default,
                            StringView               dbgName     = Default,
-                           ETaskQueue               queueType   = ETaskQueue::PerFrame) __Th___
+                           ETaskQueue               queueType   = ETaskQueue::PerFrame) __NE___
     {
         auto    result = MakeDelayedPromise( FwdArg<Fn>(fn), dbgName, queueType );
 
@@ -933,7 +934,7 @@ namespace _hidden_
 =================================================
 */
     template <typename ...Args>
-    ND_ auto  MakePromiseFrom (Args&& ...args) __Th___
+    ND_ auto  MakePromiseFrom (Args&& ...args) __NE___
     {
         return  MakePromise(
                     [args...] () {
@@ -952,7 +953,7 @@ namespace _hidden_
     template <typename T>
     ND_ auto  MakePromiseFromArray (Array<Promise<T>>   args,
                                     StringView          dbgName     = Default,
-                                    ETaskQueue          queueType   = ETaskQueue::PerFrame) __Th___
+                                    ETaskQueue          queueType   = ETaskQueue::PerFrame) __NE___
     {
         Array<AsyncTask>    deps;       // TODO: optimize
         deps.reserve( args.size() );
@@ -980,7 +981,7 @@ namespace _hidden_
     template <typename T>
     ND_ auto  MakePromiseFromArray (Array< Promise< Array<T> >> args,
                                     StringView                  dbgName     = Default,
-                                    ETaskQueue                  queueType   = ETaskQueue::PerFrame) __Th___
+                                    ETaskQueue                  queueType   = ETaskQueue::PerFrame) __NE___
     {
         Array<AsyncTask>    deps;       // TODO: optimize
         deps.reserve( args.size() );
diff --git a/AE/engine/src/threading/TaskSystem/TaskProfiler.h b/AE/engine/src/threading/TaskSystem/TaskProfiler.h
index 77346278..c1ef60a6 100644
--- a/AE/engine/src/threading/TaskSystem/TaskProfiler.h
+++ b/AE/engine/src/threading/TaskSystem/TaskProfiler.h
@@ -31,8 +31,8 @@ namespace AE::Threading
         virtual void  AddThread (RC<IThread>)                           __NE___ = 0;
 
         // Used for work outside of task.
-        virtual void  BeginNonTaskWork (const void *id, StringView name)__NE___ = 0;
-        virtual void  EndNonTaskWork (const void *id, StringView name)  __NE___ = 0;
+        virtual void  BeginNonTaskWork (const void* id, StringView name)__NE___ = 0;
+        virtual void  EndNonTaskWork (const void* id, StringView name)  __NE___ = 0;
     };
 
 
diff --git a/AE/engine/src/threading/TaskSystem/TaskScheduler.cpp b/AE/engine/src/threading/TaskSystem/TaskScheduler.cpp
index c12f0855..44cc71ce 100644
--- a/AE/engine/src/threading/TaskSystem/TaskScheduler.cpp
+++ b/AE/engine/src/threading/TaskSystem/TaskScheduler.cpp
@@ -1,26 +1,63 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "threading/TaskSystem/TaskScheduler.h"
-#include "threading/Containers/LfIndexedPool2.h"
 #include "threading/Memory/GlobalLinearAllocator.h"
 #include "threading/TaskSystem/ThreadManager.h"
 #include "threading/TaskSystem/LfTaskQueue.h"
 
 #include "threading/DataSource/WinAsyncDataSource.h"
+//#include "threading/DataSource/UnixAsyncDataSource.h"
 
 namespace AE::Threading
 {
+/*
+=================================================
+    constants
+=================================================
+*/
+namespace {
+    static constexpr uint   c_AvgTaskTime_us    {128};      // ~0.1ms
+    static constexpr uint   c_WaitTimeStep_us   {2 << 10};  // ~2ms
+
+
+    ND_ static uint  CalcMaxTasksPerTick (nanoseconds timeout) __NE___
+    {
+        uint    max_tasks = (Min( uint((timeout.count() + 512) >> 10), c_WaitTimeStep_us ) + c_AvgTaskTime_us/2) / c_AvgTaskTime_us;
+        return Clamp( max_tasks, 2u, 32u );
+    }
+}
+
+/*
+=================================================
+    SeedFromThreadID
+----
+    return 8 bit seed
+=================================================
+*/
+namespace {
+    ND_ inline EThreadSeed  SeedFromThreadID () __NE___
+    {
+        usize   seed = ThreadUtils::GetIntID();
+    #if AE_PLATFORM_BITS >= 64
+        seed = (seed >> 32) ^ (seed & 0xFFFFFFFF);
+    #endif
+        seed = (seed >> 16) ^ (seed & 0xFFFF);
+        seed = (seed >> 8) ^ (seed & 0xFF);
+        return EThreadSeed(seed);
+    }
+}
+//-----------------------------------------------------------------------------
+
 
 /*
 =================================================
     OutputChunk::Init
 =================================================
 */
-    void  IAsyncTask::OutputChunk::Init (uint idx) __NE___
+    void  IAsyncTask::OutputChunk::Init () __NE___
     {
-        next        = null;
-        selfIndex   = idx;
-        count       = 0;
+        next    = null;
+        count   = 0;
     }
 //-----------------------------------------------------------------------------
 
@@ -198,7 +235,7 @@ DEBUG_ONLY(
 */
     void  IAsyncTask::_FreeOutputChunks (bool isCanceled) __NE___
     {
-        ASSERT( _output.IsLocked() );
+        ASSERT( _output.is_locked() );
 
         auto&   chunk_pool = Scheduler()._GetChunkPool();
 
@@ -231,7 +268,7 @@ DEBUG_ONLY(
 
             chunk           = old_chunk->next;
             old_chunk->next = null;
-            chunk_pool.Unassign( old_chunk->selfIndex );
+            CHECK( chunk_pool.Unassign( old_chunk ));
         }
 
         _output.set( null );
@@ -319,6 +356,117 @@ DEBUG_ONLY(
 
 
 
+/*
+=================================================
+    Wakeup
+----
+    Windows: 5..20us to wakeup thread
+=================================================
+*/
+    void  TaskScheduler::ThreadWakeup::Wakeup (EThreadBits bits) __NE___
+    {
+        {
+            std::unique_lock    lock {_mutex};
+            _activeThreads = bits;
+        }
+        _cv.notify_all();
+    }
+
+    void  TaskScheduler::ThreadWakeup::Wakeup (ETaskQueueBits bits) __NE___
+    {
+        EThreadBits     threads;
+        for (ETaskQueue q : bits) {
+            threads.insert( EThread(q) );
+        }
+        return Wakeup( threads );
+    }
+
+/*
+=================================================
+    WakeupAndDetach
+=================================================
+*/
+    void  TaskScheduler::ThreadWakeup::WakeupAndDetach (LoopingFlag_t &looping) __NE___
+    {
+        {
+            std::unique_lock    lock {_mutex};  // TODO: not needed?
+            looping.store( 0 );
+        }
+        _cv.notify_all();
+    }
+
+/*
+=================================================
+    Suspend
+=================================================
+*/
+    void  TaskScheduler::ThreadWakeup::Suspend (EThreadBits waitThreads, LoopingFlag_t &looping) __NE___
+    {
+        std::unique_lock    lock {_mutex};
+
+        for (;;)
+        {
+            if ( (waitThreads & _activeThreads).Any() )
+            {
+                _activeThreads &= waitThreads;
+                return;
+            }
+
+            // wakeup if thread will be terminated (joined)
+            if ( looping.load() == 0 )
+                return;
+
+            _cv.wait( lock );
+        }
+    }
+
+    void  TaskScheduler::ThreadWakeup::Suspend (ETaskQueueBits waitQueues, LoopingFlag_t &looping) __NE___
+    {
+        EThreadBits     wait_threads;
+        for (ETaskQueue q : waitQueues) {
+            wait_threads.insert( EThread(q) );
+        }
+        return Suspend( wait_threads, looping );
+    }
+
+    void  TaskScheduler::ThreadWakeup::Suspend (const EThreadArray &waitThreads, LoopingFlag_t &looping) __NE___
+    {
+        return Suspend( waitThreads.ToThreadMask(), looping );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+    //
+    // Canceled Task
+    //
+    class TaskScheduler::_CanceledTask final : public IAsyncTask
+    {
+    public:
+        _CanceledTask ()        __NE___ : IAsyncTask{ETaskQueue::PerFrame} { _DbgSet( EStatus::Canceled ); }
+
+        void        Run ()      __Th_OV {}
+        StringView  DbgName ()  C_NE_OV { return "canceled"; }
+    };
+
+
+    //
+    // Dummy Request
+    //
+    class TaskScheduler::_DummyRequest final : public Threading::_hidden_::IAsyncDataSourceRequest
+    {
+    // methods
+    public:
+        _DummyRequest ()                    __NE___ { _status.store( EStatus::Cancelled ); }
+
+        // IAsyncDataSourceRequest //
+        Result      GetResult ()            C_NE_OV { return Default; }
+        bool        Cancel ()               __NE_OV { return false; }
+        Promise_t   AsPromise (ETaskQueue)  __NE_OV { return Default; }
+    };
+//-----------------------------------------------------------------------------
+
+
 /*
 =================================================
     _Instance
@@ -333,23 +481,18 @@ DEBUG_ONLY(
 
 /*
 =================================================
-    CreateInstance
+    InstanceCtor
 =================================================
 */
-    void  TaskScheduler::CreateInstance () __NE___
+    void  TaskScheduler::InstanceCtor::Create () __NE___
     {
-        MemoryManagerImpl::TaskSchedulerApi::CreateInstance();
+        MemoryManagerImpl::InstanceCtor::Create();
 
         s_TaskScheduler.Create();
         MemoryBarrier( EMemoryOrder::Release );
     }
 
-/*
-=================================================
-    DestroyInstance
-=================================================
-*/
-    void  TaskScheduler::DestroyInstance () __NE___
+    void  TaskScheduler::InstanceCtor::Destroy () __NE___
     {
         MemoryBarrier( EMemoryOrder::Acquire );
 
@@ -357,7 +500,7 @@ DEBUG_ONLY(
 
         MemoryBarrier( EMemoryOrder::Release );
 
-        MemoryManagerImpl::TaskSchedulerApi::DestroyInstance();
+        MemoryManagerImpl::InstanceCtor::Destroy();
     }
 
 /*
@@ -366,7 +509,8 @@ DEBUG_ONLY(
 =================================================
 */
     TaskScheduler::TaskScheduler () __NE___ :
-        _canceledTask{ MakeRC<CanceledTask>() } // throw
+        _canceledTask{ MakeRC<_CanceledTask>() },
+        _cancelledRequest{ MakeRC<_DummyRequest>() }
     {
         DEBUG_ONLY(
             _deadlockCheck.lastUpdate.store( TimePoint_t::clock::now() );
@@ -392,16 +536,15 @@ DEBUG_ONLY(
 */
     bool  TaskScheduler::Setup (const Config &cfg) __NE___
     {
+        CHECK_ERR( uint(cfg.mainThreadCoreId) < ThreadUtils::MaxThreadCount() );
+
         // add main thread
         {
-            uint    core_id = (cfg.mainThreadCoreId == UMax ? 0 : cfg.mainThreadCoreId);
-            _coreId.store( core_id+1 );
-
             EXLOCK( _threadGuard );
             CHECK_ERR( _threads.empty() );
 
             _mainThread = ThreadMngr::_CreateMainThread();
-            CHECK_ERR( _mainThread->Attach( 0, core_id ));
+            CHECK_ERR( _mainThread->Attach( 0, cfg.mainThreadCoreId ));
         }
 
         // all queues must be null
@@ -410,16 +553,16 @@ DEBUG_ONLY(
         }
 
         // setup queues
-        try{
+        TRY{
             _queues[uint( ETaskQueue::Main      )].ptr.reset( new LfTaskQueue{ POTValue{ 2 },                       "main"      });
             _queues[uint( ETaskQueue::PerFrame  )].ptr.reset( new LfTaskQueue{ POTValue{ cfg.maxPerFrameQueues },   "perFrame"  });
             _queues[uint( ETaskQueue::Renderer  )].ptr.reset( new LfTaskQueue{ POTValue{ cfg.maxRenderQueues },     "renderer"  });
             _queues[uint( ETaskQueue::Background)].ptr.reset( new LfTaskQueue{ POTValue{ cfg.maxBackgroundQueues }, "background"});
-            STATIC_ASSERT( uint(ETaskQueue::_Count) == 4 );
+            StaticAssert( uint(ETaskQueue::_Count) == 4 );
         }
-        catch (...) {
+        CATCH_ALL(
             RETURN_ERR( "failed to initialize task queues" );
-        }
+        )
 
         // all queues must not be null
         for (auto& q : _queues) {
@@ -439,26 +582,19 @@ DEBUG_ONLY(
 */
     bool  TaskScheduler::_InitIOServices (const Config &cfg) __NE___
     {
+        auto    io_dep_mngr = RC<AsyncDSRequestDependencyManager>{ new AsyncDSRequestDependencyManager{} };
+        CHECK_ERR( RegisterDependency< AsyncDSRequest >( io_dep_mngr ));
+        CHECK_ERR( RegisterDependency< WeakAsyncDSRequest >( io_dep_mngr ));
+        //CHECK_ERR( RegisterDependency< StrongAsyncDSRequest >( io_dep_mngr ));
+
         #ifdef AE_PLATFORM_WINDOWS
         if ( cfg.maxIOThreads > 0 )
-        {
-            auto    io = RC<WindowsIOService>{ new WindowsIOService{ cfg.maxIOThreads }};
-            CHECK_ERR( RegisterDependency< AsyncDSRequest >( io ));
-            CHECK_ERR( RegisterDependency< WeakAsyncDSRequest >( io ));
-            //CHECK_ERR( RegisterDependency< StrongAsyncDSRequest >( io ));
-            _fileIOService = io;
-        }
+            _fileIOService = RC<WindowsIOService>{ new WindowsIOService{ cfg.maxIOThreads }};
         #endif
 
         #if 0 //def AE_PLATFORM_UNIX_BASED
         if ( cfg.maxIOThreads > 0 )
-        {
-            auto    io = RC<UnixIOService>{ new UnixIOService{ cfg.maxIOThreads }};
-            CHECK_ERR( RegisterDependency< AsyncDSRequest >( io ));
-            CHECK_ERR( RegisterDependency< WeakAsyncDSRequest >( io ));
-            //CHECK_ERR( RegisterDependency< StrongAsyncDSRequest >( io ));
-            _fileIOService = io;
-        }
+            _fileIOService = RC<UnixIOService>{ new UnixIOService{ cfg.maxIOThreads }};
         #endif
 
         return true;
@@ -494,7 +630,8 @@ DEBUG_ONLY(
             _taskDepsMngrs.clear();
         }
 
-        _canceledTask = null;
+        _canceledTask       = null;
+        _cancelledRequest   = null;
         ASSERT_Eq( IAsyncTask::_AsyncTaskTotalCount(), 0 );
 
         _chunkPool.Release( True{"check for assigned"} );
@@ -509,12 +646,7 @@ DEBUG_ONLY(
     AddThread
 =================================================
 */
-    bool  TaskScheduler::AddThread (ThreadPtr thread) __NE___
-    {
-        return AddThread( RVRef(thread), _coreId.fetch_add(1) );
-    }
-
-    bool  TaskScheduler::AddThread (ThreadPtr thread, uint coreId) __NE___
+    bool  TaskScheduler::AddThread (RC<IThread> thread, ECpuCoreId coreId) __NE___
     {
         EXLOCK( _threadGuard );
 
@@ -533,6 +665,16 @@ DEBUG_ONLY(
         return true;
     }
 
+/*
+=================================================
+    GetDefaultSeed
+=================================================
+*/
+    EThreadSeed  TaskScheduler::GetDefaultSeed () __NE___
+    {
+        return SeedFromThreadID();
+    }
+
 /*
 =================================================
     ProcessTask
@@ -540,47 +682,92 @@ DEBUG_ONLY(
     Returns 'true' if task is processed.
     Result can be used to choose behavior:
         - on 'true' process next task with same queue type.
-        - on 'false' try to process task with different queue type or change seed.
+        - on 'false' try to process task with different queue type.
+    The 'seed' is used only to distribute access from different threads to different chunks
+    to avoid access to the same atomic value from multiple threads.
 =================================================
 */
-    bool  TaskScheduler::ProcessTask (ETaskQueue type, uint seed) __NE___
+    bool  TaskScheduler::ProcessTask (const ETaskQueue type, const EThreadSeed seed) __NE___
     {
         CHECK_ERR( type < ETaskQueue::_Count );
 
         return _queues[ uint(type) ].ptr->Process( seed );
     }
 
+/*
+=================================================
+    ProcessFileIO
+=================================================
+*/
+    bool  TaskScheduler::ProcessFileIO () __NE___
+    {
+        if_likely( auto io_service = GetFileIOService() )
+            return (io_service->ProcessEvents() > 0);
+
+        return false;
+    }
+
 /*
 =================================================
     ProcessTasks
+----
+    Process all tasks in specified 'threads' with the specified 'seed'.
+    Returns 'true' if at least one task is processed.
+    The 'seed' is used only to distribute access from different threads to different chunks
+    to avoid access to the same atomic value from multiple threads.
 =================================================
 */
-    bool  TaskScheduler::ProcessTasks (const EThreadArray &threads, const uint seed) __NE___
+    bool  TaskScheduler::ProcessTasks (const EThreadArray &threads, const EThreadSeed seed) __NE___
     {
-        uint    processed = 0;
+        ASSERT( not threads.empty() );
+
+        constexpr uint  max_task_per_queue = 16;
 
+        uint    processed = 0;
         for (auto tt : threads)
         {
             if_likely( tt < EThread::_Last )
             {
-                while ( ProcessTask( ETaskQueue(tt), seed )) {
-                    processed = 1;
-                }
+                uint i = 0;
+                for (; (i < max_task_per_queue) and ProcessTask( ETaskQueue(tt), seed ); ++i) {}
+                processed |= i;
             }
             else
-            switch ( tt )
+            if ( tt == EThread::FileIO )
+                processed |= uint(ProcessFileIO());
+            else
+                DBG_WARNING( "unknown thread type" );
+        }
+        return processed != 0;
+    }
+
+/*
+=================================================
+    ProcessTasks
+----
+    Process all tasks in specified 'threads' with the specified 'seed'.
+    Returns 'true' if at least one task is processed.
+    The 'seed' is used only to distribute access from different threads to different chunks
+    to avoid access to the same atomic value from multiple threads.
+=================================================
+*/
+    bool  TaskScheduler::ProcessTasks (const EThreadArray &threads, const EThreadSeed seed, const uint maxTasks) __NE___
+    {
+        ASSERT( not threads.empty() );
+
+        uint    processed = 0;
+        for (auto tt = threads.begin(); (processed < maxTasks) & (tt != threads.end()); ++tt)
+        {
+            if_likely( *tt < EThread::_Last )
             {
-                case_likely EThread::FileIO :
-                {
-                    if_likely( auto io_service = GetFileIOService() )
-                        processed |= (io_service->ProcessEvents() > 0);
-                    break;
-                }
-                default :
-                    DBG_WARNING( "unknown thread type" );
+                for (; (processed < maxTasks) and ProcessTask( ETaskQueue(*tt), seed ); ++processed) {}
             }
+            else
+            if ( *tt == EThread::FileIO )
+                processed |= uint(ProcessFileIO());
+            else
+                DBG_WARNING( "unknown thread type" );
         }
-
         return processed != 0;
     }
 
@@ -588,10 +775,14 @@ DEBUG_ONLY(
 =================================================
     PullTask
 ----
-    cache is already invalidated when non-null task is returned
+    Extract one task from specified queue 'type'.
+    Canceled tasks processed immediately.
+    Cache is already invalidated when non-null task is returned.
+    The 'seed' is used only to distribute access from different threads to different chunks
+    to avoid access to the same atomic value from multiple threads.
 =================================================
 */
-    AsyncTask  TaskScheduler::PullTask (ETaskQueue type, uint seed) __NE___
+    AsyncTask  TaskScheduler::PullTask (const ETaskQueue type, const EThreadSeed seed) __NE___
     {
         CHECK_ERR( type < ETaskQueue::_Count );
 
@@ -606,55 +797,80 @@ DEBUG_ONLY(
     use it only for debugging and testing
 =================================================
 */
-    bool  TaskScheduler::Wait (ArrayView<AsyncTask> tasks, const EThreadArray &threads, nanoseconds timeout) __NE___
+    inline bool  TaskScheduler::_IsAllComplete (ArrayView<AsyncTask> tasks) __NE___
     {
-        const auto  start_time  = TimePoint_t::clock::now();
+        // TODO: optimization: use bitfield to mark null and complete tasks
+        usize   complete_count = 0;
 
+        for (auto& task : tasks)
+        {
+            if_likely( not task )
+                ++complete_count;
+            else
+            if_likely( task->IsFinished() )
+                ++complete_count;
+        }
+        return complete_count >= tasks.size();
+    }
+
+    bool  TaskScheduler::Wait (ArrayView<AsyncTask> tasks, nanoseconds timeout) __NE___
+    {
         if_unlikely( tasks.empty() )
             return true;
 
-        const auto  mask = threads.ToThreadMask();
+        const auto  end_time = TimePoint_t::clock::now() + timeout;
 
         for (;;)
         {
-            usize   complete_count = 0;
-
-            for (auto& task : tasks)
-            {
-                if_unlikely( not task )
-                {
-                    ++complete_count;
-                    continue;
-                }
+            if ( _IsAllComplete( tasks ))
+                return true;
 
-                if ( task->Status() > EStatus::_Finished )
-                {
-                    ++complete_count;
-                    continue;
-                }
+            const auto  tp = TimePoint_t::clock::now();
+            if_unlikely( tp >= end_time )
+                return false;   // time is out
 
-                bool    sleep = true;
-                if ( mask.contains( EThread(task->_queueType) ))
-                {
-                    // try to avoid deadlock if task must be processed in current thread
-                    sleep = not ProcessTask( task->_queueType, 0 );
-                }
+            DbgDetectDeadlock();
+            ThreadUtils::Sleep_500us();
+        }
+    }
 
-                if ( sleep )
-                {
-                    if_likely( auto io_service = GetFileIOService() )
-                        sleep = (io_service->ProcessEvents() == 0);
-                }
+    bool  TaskScheduler::Wait (ArrayView<AsyncTask> tasks, const EThreadArray &threads, const nanoseconds timeout) __NE___
+    {
+        return Wait( tasks, threads, (TimePoint_t::clock::now() + timeout), CalcMaxTasksPerTick( timeout ));
+    }
 
-                if ( sleep )
-                    ThreadUtils::Sleep( _WaitAll_SleepTime );
-            }
+    bool  TaskScheduler::Wait (ArrayView<AsyncTask> tasks, const EThreadArray &threads, const TimePoint_t endTime, const uint maxTasksPerTick) __NE___
+    {
+        ASSERT( not threads.empty() );
+        if_unlikely( tasks.empty() )
+            return true;
 
-            if ( complete_count >= tasks.size() )
+        const auto  seed = SeedFromThreadID();
+        for (;;)
+        {
+            if ( _IsAllComplete( tasks ))
                 return true;
 
-            if_unlikely( (TimePoint_t::clock::now() - start_time) >= timeout )
+            uint    processed = 0;
+            for (auto tt = threads.begin(); (processed < maxTasksPerTick) & (tt != threads.end()); ++tt)
+            {
+                if_likely( *tt < EThread::_Last )
+                    for (; (processed < maxTasksPerTick) and ProcessTask( ETaskQueue(*tt), seed ); ++processed) {}
+                else
+                if ( *tt == EThread::FileIO )
+                    processed |= uint(ProcessFileIO());
+                else
+                    DBG_WARNING( "unknown thread type" );
+            }
+
+            if_unlikely( TimePoint_t::clock::now() >= endTime )
                 return false;   // time is out
+
+            if_unlikely( processed == 0 )
+            {
+                DbgDetectDeadlock();
+                ThreadUtils::Sleep_500us();
+            }
         }
     }
 
@@ -709,7 +925,7 @@ DEBUG_ONLY(
                     CHECK_ERR( _chunkPool.Assign( OUT idx ));
 
                     *chunk_ref = &_chunkPool[ idx ];
-                    (*chunk_ref)->Init( idx );
+                    (*chunk_ref)->Init();
                 }
 
                 if ( (*chunk_ref)->next != null )
@@ -743,26 +959,6 @@ DEBUG_ONLY(
         return true;
     }
 
-/*
-=================================================
-    SeedFromThreadID
-----
-    return 8 bit seed
-=================================================
-*/
-namespace {
-    ND_ static usize  SeedFromThreadID () __NE___
-    {
-        usize   seed = ThreadUtils::GetIntID();
-    #if AE_PLATFORM_BITS >= 64
-        seed = (seed >> 32) ^ (seed & 0xFFFFFFFF);
-    #endif
-        seed = (seed >> 16) ^ (seed & 0xFFFF);
-        seed = (seed >> 8) ^ (seed & 0xFF);
-        return seed;
-    }
-}
-
 /*
 =================================================
     _InsertTask
@@ -817,12 +1013,54 @@ namespace {
                 prof->Enqueue( *task );
             })
 
+      #if AE_USE_THREAD_WAKEUP
+        _wakeup.Wakeup( task->QueueType() );
+      #endif
+
         const uint  tid = uint(task->QueueType());
 
         _queues[tid].ptr->Add( RVRef(task), SeedFromThreadID() );
         return true;
     }
 
+/*
+=================================================
+    SuspendThread
+=================================================
+*/
+    void  TaskScheduler::SuspendThread (const EThreadArray &threads, LoopingFlag_t &looping, uint iteration) __NE___
+    {
+      #if AE_USE_THREAD_WAKEUP
+
+        if_likely( iteration < 4 )
+            ThreadUtils::Sleep_500us();
+        else
+            _wakeup.Suspend( threads, looping );
+
+      #else
+
+        Unused( threads, looping );
+        ThreadUtils::ProgressiveSleep( iteration );
+
+      #endif
+    }
+
+/*
+=================================================
+    SuspendThread
+=================================================
+*/
+    void  TaskScheduler::WakeupAndDetach (LoopingFlag_t &looping) __NE___
+    {
+      #if AE_USE_THREAD_WAKEUP
+        _wakeup.WakeupAndDetach( looping );
+
+      #else
+        Unused( looping );
+
+      #endif
+    }
+
 /*
 =================================================
     SetProfiler
@@ -839,7 +1077,7 @@ namespace {
                 }
                 profiler->AddThread( _mainThread );
             }
-            _profiler = RVRef(profiler);
+            _profiler.store( RVRef(profiler) );
         )
     }
 
diff --git a/AE/engine/src/threading/TaskSystem/TaskScheduler.h b/AE/engine/src/threading/TaskSystem/TaskScheduler.h
index 37ec5d09..5f293e29 100644
--- a/AE/engine/src/threading/TaskSystem/TaskScheduler.h
+++ b/AE/engine/src/threading/TaskSystem/TaskScheduler.h
@@ -48,22 +48,32 @@
         - If null task used as dependency                           -> ignore
         - If null coroutine used as dependency (co_await noop_coro) -> cancel coroutine
 
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/TaskScheduler.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/TaskScheduler-ru.md)
 */
 
 #pragma once
 
 #include "threading/TaskSystem/AsyncTask.h"
 #include "threading/TaskSystem/Coroutine.h"
-#include "threading/Containers/LfIndexedPool2.h"
+#include "threading/Containers/LfIndexedPool.h"
 #include "threading/Memory/GlobalLinearAllocator.h"
 
 namespace AE::Threading { class TaskScheduler; }
-namespace AE { Threading::TaskScheduler&  Scheduler () __NE___; }
+namespace AE
+{
+    Threading::TaskScheduler&  Scheduler () __NE___;
+
+#ifdef AE_DEBUG
+    static constexpr AE::Base::minutes      DefaultTimeout  {60};   // 60 min - for debugging
+#else
+    static constexpr AE::Base::milliseconds DefaultTimeout  {500};  // 0.5 sec
+#endif
+}
 
 namespace AE::Threading
 {
-    using TaskDependencyManagerPtr  = RC< class ITaskDependencyManager >;
+    enum class EThreadSeed : usize {};
+    enum class ECpuCoreId  : ubyte  { Unknown = 0xFF };
 
 
     //
@@ -78,7 +88,7 @@ namespace AE::Threading
             StringView      threadName;
             StringView      coreName;
             usize           threadId    = 0;
-            uint            coreId      = 0;
+            ECpuCoreId      coreId      = ECpuCoreId(0);
             uint            curFreq     = 0;    // MHz
             uint            minFreq     = 0;    // MHz
             uint            maxFreq     = 0;    // MHz
@@ -87,11 +97,11 @@ namespace AE::Threading
 
     // interface
     public:
-            virtual bool  Attach (uint uid, uint coreId)    __NE___ = 0;
-            virtual void  Detach ()                         __NE___ = 0;
+            virtual bool  Attach (uint uid, ECpuCoreId coreId)  __NE___ = 0;
+            virtual void  Detach ()                             __NE___ = 0;
 
-        ND_ virtual usize           DbgID ()                C_NE___ = 0;
-        ND_ virtual ProfilingInfo   GetProfilingInfo ()     C_NE___ = 0;
+        ND_ virtual usize           DbgID ()                    C_NE___ = 0;
+        ND_ virtual ProfilingInfo   GetProfilingInfo ()         C_NE___ = 0;
     };
 //-----------------------------------------------------------------------------
 
@@ -133,7 +143,7 @@ namespace AE::Threading
     //
     // Input/Output Service
     //
-    class IOService : public ITaskDependencyManager
+    class IOService : public EnableRC< IOService >
     {
     // interface
     public:
@@ -159,62 +169,78 @@ namespace AE::Threading
     public:
         struct Config
         {
-            ubyte   maxPerFrameQueues   = 2;
-            ubyte   maxBackgroundQueues = 2;
-            ubyte   maxRenderQueues     = 2;
-            ubyte   maxIOThreads        = 0;
-            ubyte   mainThreadCoreId    = UMax;
+            ubyte       maxPerFrameQueues   = 2;
+            ubyte       maxBackgroundQueues = 2;
+            ubyte       maxRenderQueues     = 2;
+            ubyte       maxIOThreads        = 0;
+            ECpuCoreId  mainThreadCoreId    = Default;
         };
 
-    private:
-        using TimePoint_t       = std::chrono::high_resolution_clock::time_point;
-        using EStatus           = IAsyncTask::EStatus;
-        using OutputChunk_t     = IAsyncTask::OutputChunk;
-        using WaitBits_t        = IAsyncTask::WaitBits_t;
+        class InstanceCtor {
+        public:
+            static void  Create ()  __NE___;
+            static void  Destroy () __NE___;
+        };
 
-        struct PerQueue
-        {
-            Unique<class LfTaskQueue>   ptr;
+        using LoopingFlag_t = Atomic<uint>;
+        using TimePoint_t   = std::chrono::high_resolution_clock::time_point;
 
-            DEBUG_ONLY(
-                ulong                   totalProcessed  = 0;
-            )
-        };
 
-        using TaskQueues_t      = StaticArray< PerQueue, uint(ETaskQueue::_Count) >;
-        using ThreadPtr         = RC< IThread >;
+        struct ThreadWakeup : Noncopyable
+        {
+        // variables
+        private:
+            ConditionVariable   _cv;
+            Mutex               _mutex;
+            EThreadBits         _activeThreads;
 
-        using TaskDepsMngr_t    = FlatHashMap< std::type_index, TaskDependencyManagerPtr >;
+        // methods
+        public:
+            ThreadWakeup ()                                         __NE___ {}
 
-        using OutputChunkPool_t = LfIndexedPool2< IAsyncTask::OutputChunk, uint, 64*64, 64 >;
+            void  Wakeup (ETaskQueueBits)                           __NE___;
+            void  Wakeup (EThreadBits)                              __NE___;
 
-        static constexpr uint           _WaitAll_SpinCount  = 20'000;
-        static constexpr microseconds   _WaitAll_SleepTime  {100};
+            void  Wakeup (ETaskQueue type)                          __NE___ { Wakeup( ETaskQueueBits{ type }); }
+            void  Wakeup (EThread type)                             __NE___ { Wakeup( EThreadBits{ type }); }
 
-        class CanceledTask final : public IAsyncTask
-        {
-        public:
-            CanceledTask () : IAsyncTask{ETaskQueue::PerFrame} { _DbgSet( EStatus::Canceled ); }
+            void  WakeupAndDetach (LoopingFlag_t &)                 __NE___;
 
-            void        Run ()      __Th_OV {}
-            StringView  DbgName ()  C_NE_OV { return "canceled"; }
+            void  Suspend (ETaskQueueBits, LoopingFlag_t &)         __NE___;
+            void  Suspend (EThreadBits, LoopingFlag_t &)            __NE___;
+            void  Suspend (const EThreadArray &, LoopingFlag_t &)   __NE___;
         };
 
-        class WaitAsyncTask final : public IAsyncTask
+    private:
+        using EStatus           = IAsyncTask::EStatus;
+        using OutputChunk_t     = IAsyncTask::OutputChunk;
+        using WaitBits_t        = IAsyncTask::WaitBits_t;
+
+        struct PerQueue
         {
-        public:
-            explicit WaitAsyncTask (ETaskQueue type) : IAsyncTask{type} {}
+            Unique<class LfTaskQueue>   ptr;
 
-            void        Run ()      __Th_OV {}
-            StringView  DbgName ()  C_NE_OV { return "WaitAsync"; }
+            DEBUG_ONLY( ulong           totalProcessed  = 0;)
         };
 
+        using TaskQueues_t      = StaticArray< PerQueue, uint(ETaskQueue::_Count) >;
+        using TaskDepsMngr_t    = FlatHashMap< TypeId, RC<ITaskDependencyManager> >;
+        using OutputChunkPool_t = LfIndexedPool< IAsyncTask::OutputChunk, uint, 64*64, 64, GlobalLinearAllocatorRef >;
+
+        class _CanceledTask;
+        class _WaitAsyncTask;
+        class _DummyRequest;
+
 
     // variables
     private:
+      #if AE_USE_THREAD_WAKEUP
+        ThreadWakeup        _wakeup;
+      #endif
         TaskQueues_t        _queues;
 
-        AsyncTask           _canceledTask;          // readonly
+        AsyncTask           _canceledTask;          //                  readonly
+        RC<>                _cancelledRequest;      // (AsyncDSRequest) readonly
 
         OutputChunkPool_t   _chunkPool;
 
@@ -222,11 +248,10 @@ namespace AE::Threading
         TaskDepsMngr_t      _taskDepsMngrs;
 
         Mutex               _threadGuard;
-        Array<ThreadPtr>    _threads;
-        ThreadPtr           _mainThread;
+        Array<RC<IThread>>  _threads;
+        RC<IThread>         _mainThread;
 
         RC<IOService>       _fileIOService;
-        Atomic<uint>        _coreId             {0};
 
         PROFILE_ONLY(
             AtomicRC<ITaskProfiler> _profiler;
@@ -242,28 +267,37 @@ namespace AE::Threading
 
     // methods
     public:
-            static void  CreateInstance ()                                          __NE___;
-            static void  DestroyInstance ()                                         __NE___;
-
         ND_ bool  Setup (const Config &cfg)                                         __NE___;
             void  SetProfiler (RC<ITaskProfiler> profiler)                          __NE___;
             void  Release ()                                                        __NE___;
 
             template <typename T>
-            bool  RegisterDependency (TaskDependencyManagerPtr mngr)                __NE___;
+            bool  RegisterDependency (RC<ITaskDependencyManager> mngr)              __NE___;
 
             template <typename T>
             bool  UnregisterDependency ()                                           __NE___;
 
 
     // thread api //
-            bool  AddThread (ThreadPtr thread)                                      __NE___;
-            bool  AddThread (ThreadPtr thread, uint coreId)                         __NE___;
+            bool  AddThread (RC<IThread> thread, ECpuCoreId coreId = Default)       __NE___;
+
+            bool  ProcessTask (ETaskQueue type, EThreadSeed seed)                   __NE___;
+            bool  ProcessTasks (const EThreadArray &threads, EThreadSeed seed)      __NE___;
+            bool  ProcessTasks (const EThreadArray &threads, EThreadSeed seed,
+                                uint maxTasks)                                      __NE___;
+            bool  ProcessFileIO ()                                                  __NE___;
 
-            bool  ProcessTask (ETaskQueue type, uint seed)                          __NE___;
-            bool  ProcessTasks (const EThreadArray &threads, uint seed)             __NE___;
+        ND_ AsyncTask  PullTask (ETaskQueue type, EThreadSeed seed)                 __NE___;
 
-        ND_ AsyncTask  PullTask (ETaskQueue type, uint seed)                        __NE___;
+            void  SuspendThread (const EThreadArray &,
+                                 LoopingFlag_t      &,
+                                 uint               iteration)                      __NE___;
+            void  WakeupAndDetach (LoopingFlag_t &)                                 __NE___;
+
+      #if AE_USE_THREAD_WAKEUP
+        ND_ Ptr<ThreadWakeup>   GetThreadWakeup ()                                  __NE___ { return &_wakeup; }
+      #endif
+        ND_ static EThreadSeed  GetDefaultSeed ()                                   __NE___;
 
 
     // task api //
@@ -316,21 +350,26 @@ namespace AE::Threading
         ND_ AsyncTask   WaitAsync (ETaskQueue queue, const Tuple<Deps...> &deps)    __NE___;
 
         ND_ bool        Wait (ArrayView<AsyncTask>  tasks,
-                              const EThreadArray &  threads = Default,
-                              nanoseconds           timeout = GetDefaultTimeout())  __NE___;
+                              const EThreadArray &  threads,
+                              nanoseconds           timeout)                        __NE___;
+        ND_ bool        Wait (ArrayView<AsyncTask>  tasks,
+                              nanoseconds           timeout)                        __NE___;
+        ND_ bool        Wait (ArrayView<AsyncTask>  tasks,
+                              const EThreadArray &  threads,
+                              TimePoint_t           endTime,
+                              uint                  maxTasksPerTick)                __NE___;
 
 
     // other //
         ND_ Ptr<IOService>      GetFileIOService ()                                 C_NE___ { return _fileIOService.get(); }
 
         ND_ AsyncTask           GetCanceledTask ()                                  C_NE___ { return _canceledTask; }
+        ND_ RC<>                GetCanceledDSRequest ()                             C_NE___ { return _cancelledRequest; }
 
         ND_ IThread const*      GetMainThread ()                                    C_NE___ { return _mainThread.get(); }
 
         friend TaskScheduler&   AE::Scheduler ()                                    __NE___;
 
-        ND_ static constexpr nanoseconds  GetDefaultTimeout ()                      __NE___;
-
         PROFILE_ONLY(
             ND_ RC<ITaskProfiler>   GetProfiler ()                                  __NE___ { return _profiler.load(); }
         )
@@ -352,6 +391,8 @@ namespace AE::Threading
 
         ND_ OutputChunkPool_t&  _GetChunkPool ()                                    __NE___ { return _chunkPool; }
 
+        ND_ static bool _IsAllComplete (ArrayView<AsyncTask> tasks)                 __NE___;
+
         template <usize I, typename ...Args>
         ND_ constexpr bool  _AddDependencies (const AsyncTask &task, const Tuple<Args...> &args, INOUT uint &bitIndex)      __NE___;
 
@@ -364,31 +405,17 @@ namespace AE::Threading
 
 
 
-/*
-=================================================
-    GetDefaultTimeout
-=================================================
-*/
-    constexpr nanoseconds  TaskScheduler::GetDefaultTimeout () __NE___
-    {
-        #ifdef AE_DEBUG
-            return minutes{60};     // 60 min - for debugging
-        #else
-            return seconds{30};     // 30 sec
-        #endif
-    }
-
 /*
 =================================================
     RegisterDependency
 =================================================
 */
     template <typename T>
-    bool  TaskScheduler::RegisterDependency (TaskDependencyManagerPtr mngr) __NE___
+    bool  TaskScheduler::RegisterDependency (RC<ITaskDependencyManager> mngr) __NE___
     {
         CHECK_ERR( mngr );
         EXLOCK( _taskDepsMngrsGuard );
-        return _taskDepsMngrs.insert_or_assign( typeid(T), mngr ).second;   // should not throw
+        return _taskDepsMngrs.insert_or_assign( TypeIdOf<T>(), RVRef(mngr) ).second;    // should not throw
     }
 
 /*
@@ -400,7 +427,7 @@ namespace AE::Threading
     bool  TaskScheduler::UnregisterDependency () __NE___
     {
         EXLOCK( _taskDepsMngrsGuard );
-        return _taskDepsMngrs.erase( typeid(T) ) > 0;
+        return _taskDepsMngrs.erase( TypeIdOf<T>() ) > 0;
     }
 
 /*
@@ -411,28 +438,50 @@ namespace AE::Threading
 =================================================
 */
     template <typename TaskType, typename ...Ctor, typename ...Deps>
-    AsyncTask  TaskScheduler::Run (Tuple<Ctor...>&& ctorArgs, const Tuple<Deps...> &deps) __NE___
+    AsyncTask  TaskScheduler::Run (Tuple<Ctor...> &&ctorArgs, const Tuple<Deps...> &deps) __NE___
     {
-        STATIC_ASSERT( IsBaseOf< IAsyncTask, TaskType > );
-
-        AsyncTask   task;
-        uint        bit_index   = 0;
-        try{
-            task = ctorArgs.Apply([] (auto&& ...args) { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)... ); }); // throw
-        }
-        catch(...) {
-            return GetCanceledTask();
-        }
+        StaticAssert( IsBaseOf< IAsyncTask, TaskType > );
 
-        if_unlikely( not _AddDependencies<0>( task, deps, INOUT bit_index ))
+        if constexpr( IsNothrowCtor< TaskType, Ctor&&... >)
         {
-            // add task to queue only to call 'OnCancel()'
-            task->_SetCancellationState();
-            bit_index = 0;  // no dependencies
+            uint        bit_index   = 0;
+            AsyncTask   task        = ctorArgs.Apply([] (auto&& ...args) __NE___
+                                                    { return MakeRC<TaskType>( FwdArg<decltype(args)>(args)... ); });
+            if_unlikely( not task )
+                return GetCanceledTask();
+
+            if_unlikely( not _AddDependencies<0>( task, deps, INOUT bit_index ))
+            {
+                // add task to queue only to call 'OnCancel()'
+                task->_SetCancellationState();
+                bit_index = 0;  // no dependencies
+            }
+
+            CHECK_ERR( _InsertTask( task, bit_index ), GetCanceledTask() );
+            return task;
         }
+        else
+        {
+            uint        bit_index   = 0;
+            AsyncTask   task;
+            TRY{
+                task = ctorArgs.Apply([] (auto&& ...args) __Th___
+                                    { return MakeRCTh<TaskType>( FwdArg<decltype(args)>(args)... ); });
+
+                if_unlikely( not _AddDependencies<0>( task, deps, INOUT bit_index ))
+                {
+                    // add task to queue only to call 'OnCancel()'
+                    task->_SetCancellationState();
+                    bit_index = 0;  // no dependencies
+                }
 
-        CHECK_ERR( _InsertTask( task, bit_index ), GetCanceledTask() );
-        return task;
+                CHECK_ERR( _InsertTask( task, bit_index ), GetCanceledTask() );
+                return task;
+            }
+            CATCH_ALL(
+                return GetCanceledTask();
+            )
+        }
     }
 
 /*
@@ -572,12 +621,12 @@ namespace AE::Threading
     template <typename T>
     bool  TaskScheduler::_AddCustomDependency (const AsyncTask &task, const T &dep, INOUT uint &bitIndex) __NE___
     {
-        STATIC_ASSERT( not IsConst<T> );
+        StaticAssert( not IsConst<T> );
         SHAREDLOCK( _taskDepsMngrsGuard );
 
-        auto    iter = _taskDepsMngrs.find( typeid(T) );
+        auto    iter = _taskDepsMngrs.find( TypeIdOf<T>() );
         CHECK_ERR_MSG( iter != _taskDepsMngrs.end(),
-            "Can't find dependency manager for type: "s << typeid(T).name() );
+            "Can't find dependency manager for type: "s << TypeNameOf<T>() );
 
         return iter->second->Resolve( AnyTypeCRef{dep}, task, INOUT bitIndex );
     }
@@ -587,10 +636,19 @@ namespace AE::Threading
     WaitAsync
 =================================================
 */
+    class TaskScheduler::_WaitAsyncTask final : public IAsyncTask
+    {
+    public:
+        explicit _WaitAsyncTask (ETaskQueue type) __NE___ : IAsyncTask{type} {}
+
+        void        Run ()      __Th_OV {}
+        StringView  DbgName ()  C_NE_OV { return "WaitAsync"; }
+    };
+
     template <typename ...Deps>
     AsyncTask  TaskScheduler::WaitAsync (ETaskQueue queue, const Tuple<Deps...> &deps) __NE___
     {
-        return Run<WaitAsyncTask>( Tuple{queue}, deps );
+        return Run<_WaitAsyncTask>( Tuple{queue}, deps );
     }
 //-----------------------------------------------------------------------------
 
diff --git a/AE/engine/src/threading/TaskSystem/ThreadManager.cpp b/AE/engine/src/threading/TaskSystem/ThreadManager.cpp
index 97da0926..4ade8ee7 100644
--- a/AE/engine/src/threading/TaskSystem/ThreadManager.cpp
+++ b/AE/engine/src/threading/TaskSystem/ThreadManager.cpp
@@ -14,7 +14,7 @@ namespace
     {
     // variables
     private:
-        ThreadWakeup::LoopingFlag_t     _looping        {0};
+        TaskScheduler::LoopingFlag_t    _looping        {0};
         const ThreadMngr::ThreadConfig  _cfg;
         StdThread                       _thread;
 
@@ -24,14 +24,14 @@ namespace
 
     // methods
     public:
-        explicit WorkerThread (const ThreadMngr::ThreadConfig &cfg);
+        explicit WorkerThread (const ThreadMngr::ThreadConfig &cfg) __NE___;
 
         // IThread //
-        bool            Attach (uint uid, uint coreId)  __NE_OV;
-        void            Detach ()                       __NE_OV;
+        bool            Attach (uint uid, ECpuCoreId coreId)        __NE_OV;
+        void            Detach ()                                   __NE_OV;
 
-        usize           DbgID ()                        C_NE_OV { return ThreadUtils::GetIntID( _thread ); }
-        ProfilingInfo   GetProfilingInfo ()             C_NE_OV { SHAREDLOCK( _profInfoGuard );  return _profInfo; }
+        usize           DbgID ()                                    C_NE_OV { return ThreadUtils::GetIntID( _thread ); }
+        ProfilingInfo   GetProfilingInfo ()                         C_NE_OV { SHAREDLOCK( _profInfoGuard );  return _profInfo; }
 
     private:
         void  _UpdateProfilingInfo ();
@@ -42,7 +42,7 @@ namespace
     constructor
 =================================================
 */
-    WorkerThread::WorkerThread (const ThreadMngr::ThreadConfig &cfg) : _cfg{cfg}
+    WorkerThread::WorkerThread (const ThreadMngr::ThreadConfig &cfg) __NE___ : _cfg{cfg}
     {
         ASSERT( not _cfg.threads.empty() );
     }
@@ -52,44 +52,38 @@ namespace
     Attach
 =================================================
 */
-    bool  WorkerThread::Attach (const uint uid, const uint coreId) __NE___
+    bool  WorkerThread::Attach (const uint uid, const ECpuCoreId coreId) __NE___
     {
     #ifndef AE_DISABLE_THREADS
         _looping.store( 1 );
 
         _thread = StdThread{ [this, uid, coreId] ()
         {
-            uint        seed                    = uid;
-            auto&       scheduler               = Scheduler();
-            const uint  cycles_before_suspend   = 3;
+            const auto  seed        = EThreadSeed(uid);
+            auto&       scheduler   = Scheduler();
 
             ThreadUtils::SetName( _cfg.name );
-            CHECK( ThreadUtils::SetAffinity( coreId % ThreadUtils::MaxThreadCount() ));
+            if ( coreId != Default )
+                CHECK( ThreadUtils::SetAffinity( uint(coreId) % ThreadUtils::MaxThreadCount() ));
 
             {
                 EXLOCK( _profInfoGuard );
-                _profInfo.threadId      = ThreadUtils::GetIntID( _thread );
+                _profInfo.threadId      = ThreadUtils::GetIntID();
+                _profInfo.coreId        = ECpuCoreId(ThreadUtils::GetCoreIndex());
                 _profInfo.threadName    = _cfg.name;
             }
 
-            for (; _looping.load();)
+            for (uint p = 0; _looping.load();)
             {
-                bool    processed = true;
+                bool    processed = scheduler.ProcessTasks( _cfg.threads, seed );
 
-                for (uint i = 0; i < cycles_before_suspend; ++i)
-                {
-                    processed = scheduler.ProcessTasks( _cfg.threads, seed );
-
-                    // try to change seed
-                    if ( not processed )
-                        ++seed;
-                }
+                // suspend thread
+                if_likely( processed )
+                    p = 0;
+                else
+                    scheduler.SuspendThread( _cfg.threads, _looping, p++ );
 
                 _UpdateProfilingInfo();
-
-                // suspend thread
-                if_unlikely( _cfg.wakeup and not processed )
-                    _cfg.wakeup->Suspend( _cfg.threads, _looping );
             }
 
             // TODO: objc: print objects in autorelease pool
@@ -115,9 +109,9 @@ namespace
         ProfilingInfo   info;
 
         info.curFreq    = freq_mhz;
-        info.coreId     = core_id;
+        info.coreId     = ECpuCoreId(core_id);
         info.threadName = _cfg.name;
-        info.threadId   = ThreadUtils::GetIntID( _thread );
+        info.threadId   = ThreadUtils::GetIntID();
 
         if_likely( core != null )
         {
@@ -144,8 +138,7 @@ namespace
 
         if ( _looping.exchange( 0 ))
         {
-            if ( _cfg.wakeup )
-                _cfg.wakeup->WakeupAndDetach( _looping );
+            Scheduler().WakeupAndDetach( _looping );
 
             _thread.join();
         }
@@ -164,20 +157,20 @@ namespace
     // variables
     private:
         ThreadHandle    _handle;
-        uint            _coreId;
+        ECpuCoreId      _coreId;
         usize           _threadId;
 
 
     // methods
     public:
-        MainThread () {}
+        MainThread ()                                           __NE___ {}
 
         // IThread //
-        bool            Attach (uint uid, uint coreId)  __NE_OV;
-        void            Detach ()                       __NE_OV {}
+        bool            Attach (uint uid, ECpuCoreId coreId)    __NE_OV;
+        void            Detach ()                               __NE_OV {}
 
-        usize           DbgID ()                        C_NE_OV { return _threadId; }
-        ProfilingInfo   GetProfilingInfo ()             C_NE_OV;
+        usize           DbgID ()                                C_NE_OV { return _threadId; }
+        ProfilingInfo   GetProfilingInfo ()                     C_NE_OV;
     };
 
 
@@ -186,12 +179,14 @@ namespace
     Attach
 =================================================
 */
-    bool  MainThread::Attach (const uint, const uint coreId) __NE___
+    bool  MainThread::Attach (const uint, const ECpuCoreId coreId) __NE___
     {
-        CHECK( ThreadUtils::SetAffinity( coreId % ThreadUtils::MaxThreadCount() ));
+        ThreadUtils::SetName( "main" );
+        if ( coreId != Default )
+            CHECK( ThreadUtils::SetAffinity( uint(coreId) % ThreadUtils::MaxThreadCount() ));
 
-        _handle     = ThreadUtils::GetCurrentThreadHandle();
-        _coreId     = ThreadUtils::GetCoreIndex();
+        _handle     = ThreadUtils::GetHandle();
+        _coreId     = ECpuCoreId(ThreadUtils::GetCoreIndex());
         _threadId   = ThreadUtils::GetIntID();
 
         return true;
@@ -208,9 +203,9 @@ namespace
         info.threadName = "main";
         info.coreId     = _coreId;
 
-    #ifdef AE_DBG_OR_DEV_OR_PROF
-        const auto      freq_mhz    = CpuPerformance::GetFrequency( _coreId );
-        const auto*     core        = CpuArchInfo::Get().GetCore( _coreId );
+      #ifdef AE_DBG_OR_DEV_OR_PROF
+        const auto      freq_mhz    = CpuPerformance::GetFrequency( uint(_coreId) );
+        const auto*     core        = CpuArchInfo::Get().GetCore( uint(_coreId) );
 
         info.curFreq    = freq_mhz;
         info.threadId   = _threadId;
@@ -223,7 +218,7 @@ namespace
             info.minFreq    = core->baseClock;
             info.maxFreq    = core->maxClock;
         }
-    #endif
+      #endif
         return info;
     }
 
@@ -232,87 +227,6 @@ namespace
 
 
 
-/*
-=================================================
-    Wakeup
-----
-    Windows: 10..20us to wakeup thread
-=================================================
-*/
-    void  ThreadWakeup::Wakeup (EThreadBits bits) __NE___
-    {
-        {
-            std::unique_lock    lock {_mutex};
-            _activeThreads = bits;
-        }
-        _cv.notify_all();
-    }
-
-    void  ThreadWakeup::Wakeup (ETaskQueueBits bits) __NE___
-    {
-        EThreadBits     threads;
-        for (ETaskQueue q : bits) {
-            threads.insert( EThread(q) );
-        }
-        return Wakeup( threads );
-    }
-
-/*
-=================================================
-    WakeupAndDetach
-=================================================
-*/
-    void  ThreadWakeup::WakeupAndDetach (LoopingFlag_t &looping) __NE___
-    {
-        {
-            std::unique_lock    lock {_mutex};  // TODO: not needed?
-            looping.store( 0 );
-        }
-        _cv.notify_all();
-    }
-
-/*
-=================================================
-    Suspend
-=================================================
-*/
-    void  ThreadWakeup::Suspend (EThreadBits waitThreads, LoopingFlag_t &looping) __NE___
-    {
-        std::unique_lock    lock {_mutex};
-
-        for (;;)
-        {
-            if ( (waitThreads & _activeThreads).Any() )
-            {
-                _activeThreads &= waitThreads;
-                return;
-            }
-
-            // wakeup if thread will be terminated (joined)
-            if ( looping.load() == 0 )
-                return;
-
-            _cv.wait( lock );
-        }
-    }
-
-    void  ThreadWakeup::Suspend (ETaskQueueBits waitQueues, LoopingFlag_t &looping) __NE___
-    {
-        EThreadBits     wait_threads;
-        for (ETaskQueue q : waitQueues) {
-            wait_threads.insert( EThread(q) );
-        }
-        return Suspend( wait_threads, looping );
-    }
-
-    void  ThreadWakeup::Suspend (const EThreadArray &waitThreads, LoopingFlag_t &looping) __NE___
-    {
-        return Suspend( waitThreads.ToThreadMask(), looping );
-    }
-//-----------------------------------------------------------------------------
-
-
-
 /*
 =================================================
     CreateThread
@@ -340,8 +254,8 @@ namespace
 */
     bool  ThreadMngr::SetupThreads (const TaskScheduler::Config &cfg,
                                     const EnumBitSet<EThread>    mask,
-                                    Ptr<ThreadWakeup>            wakeup,
                                     const uint                   maxThreads,
+                                    Bool                         bindThreadToPhysicalCore,
                                     OUT EThreadArray            &allowProcessInMain) __NE___
     {
         CHECK_ERR( mask.contains( EThread::PerFrame ));
@@ -350,17 +264,13 @@ namespace
         CHECK_ERR( (cfg.maxBackgroundQueues > 0) == mask.contains( EThread::Background ));
         CHECK_ERR( (cfg.maxIOThreads > 0) == mask.contains( EThread::FileIO ));
 
-        auto&   cpu_info    = CpuArchInfo::Get();
-        auto&   scheduler   = Scheduler();
-
+        auto&   cpu_info = CpuArchInfo::Get();
         AE_LOG_DBG( cpu_info.Print() );
 
-        CHECK_ERR( scheduler.Setup( cfg ));
-
         if ( maxThreads <= 1 )
-            return _SetupThreads_v1( scheduler, mask, maxThreads, OUT allowProcessInMain );
+            return _SetupThreads_v1( cfg, cpu_info, mask, maxThreads, OUT allowProcessInMain );
 
-        return _SetupThreads_v2( scheduler, cpu_info, mask, wakeup, maxThreads, OUT allowProcessInMain );
+        return _SetupThreads_v2( cfg, cpu_info, mask, maxThreads, bindThreadToPhysicalCore, OUT allowProcessInMain );
     }
 
 /*
@@ -370,20 +280,18 @@ namespace
     main thread + one additional thread
 =================================================
 */
-    bool  ThreadMngr::_SetupThreads_v1 (TaskScheduler               &scheduler,
+    bool  ThreadMngr::_SetupThreads_v1 (TaskScheduler::Config        cfg,
+                                        const CpuArchInfo           &cpuInfo,
                                         const EnumBitSet<EThread>    mask,
                                         const uint                   maxThreads,
                                         OUT EThreadArray            &allowProcessInMain) __NE___
     {
-        EThreadArray    threads;
-        allowProcessInMain.insert( EThread::Main );
-
         // Main thread can execute all tasks except 'Background' and 'FileIO'.
         // Second thread can execute all tasks except 'Main'.
+        EThreadArray    threads;
         for (auto tmp = mask;;)
         {
             EThread t = tmp.ExtractFirst();
-
             if ( t >= EThread::_Count )
                 break;
 
@@ -392,13 +300,32 @@ namespace
 
             threads.insert( t );
         }
+        allowProcessInMain.insert( EThread::Main );
+
+        // select CPU core
+        ECpuCoreId  second_thread_id = Default;
+        {
+            CpuArchInfo::Core const*    hp_core = cpuInfo.GetCore( ECoreType::HighPerformance );
+            CpuArchInfo::Core const*    p_core  = cpuInfo.GetCore( ECoreType::Performance );
+            CHECK_ERR( p_core != null );
+
+            // bind main thread to the high performance core
+            int id = BitScanForward( (hp_core != null ? hp_core : p_core)->physicalBits.to_ullong() );
+            cfg.mainThreadCoreId = ECpuCoreId(id);
+
+            id = BitScanForward( (p_core->physicalBits & ~CpuArchInfo::CoreBits_t{}.set(id)).to_ullong() );
+            second_thread_id = ECpuCoreId(id);
+        }
+
+        auto&   scheduler = Scheduler();
+        CHECK_ERR( scheduler.Setup( cfg ));
 
         if ( maxThreads > 0 )
         {
             scheduler.AddThread( ThreadMngr::CreateThread( ThreadConfig{
-                    threads,
-                    "worker"
-                }));
+                                    threads,
+                                    "worker"
+                                }), second_thread_id );
         }
         return true;
     }
@@ -408,69 +335,68 @@ namespace
     _SetupThreads_v2
 =================================================
 */
-    bool  ThreadMngr::_SetupThreads_v2 (TaskScheduler               &scheduler,
+    bool  ThreadMngr::_SetupThreads_v2 (TaskScheduler::Config        cfg,
                                         const CpuArchInfo           &cpuInfo,
                                         const EnumBitSet<EThread>    mask,
-                                        Ptr<ThreadWakeup>            wakeup,
                                         const uint                   maxThreads,
+                                        bool                         bindThreadToPhysicalCore,
                                         OUT EThreadArray            &allowProcessInMain) __NE___
     {
-        CpuArchInfo::Core const*    p_core          = cpuInfo.GetCore( ECoreType::Performance );
-        CpuArchInfo::Core const*    ee_core         = cpuInfo.GetCore( ECoreType::EnergyEfficient );
-        CpuArchInfo::CoreBits_t     logical_bits    {0};
+        CpuArchInfo::CoreBits_t     core_bits   {0};
+        CpuArchInfo::CoreBits_t     p_core_bits;    // \__ may intersects if no EE cores
+        CpuArchInfo::CoreBits_t     ee_core_bits;   // /
+        const int                   shuffle     = 64 - ((usize(&allowProcessInMain) >> 9) & 0xF);
+        {
+            //CpuArchInfo::Core const*  hp_core     = cpuInfo.GetCore( ECoreType::HighPerformance );    // TODO
+            CpuArchInfo::Core const*    p_core      = cpuInfo.GetCore( ECoreType::Performance );
+            CpuArchInfo::Core const*    ee_core     = cpuInfo.GetCore( ECoreType::EnergyEfficient );
 
-        logical_bits.set( scheduler.GetMainThread()->GetProfilingInfo().coreId );
+            if ( p_core == null and ee_core != null )   p_core  = ee_core;
+            if ( p_core != null and ee_core == null )   ee_core = p_core;
+            if ( p_core == null and ee_core == null )   p_core  = ee_core = cpuInfo.GetCore( 0 );
+            CHECK_ERR( p_core != null and ee_core != null );
 
-        if ( p_core == null and ee_core != null )   p_core  = ee_core;
-        if ( p_core != null and ee_core == null )   ee_core = p_core;
-        if ( p_core == null and ee_core == null )   p_core  = ee_core = cpuInfo.GetCore( 0 );
-        CHECK_ERR( p_core != null and ee_core != null );
+            bindThreadToPhysicalCore = bindThreadToPhysicalCore and p_core->HasVirtualCores();
 
-        const uint  max_cores                   = uint((p_core->logicalBits | ee_core->logicalBits).count());
-        uint        worker_only_threads         = 0;
-        uint        render_only_threads         = 0;
-        uint        background_only_threads     = 0;
-        uint        worker_render_threads       = (maxThreads+1)/2;
-        uint        worker_background_threads   = maxThreads/2;
+            p_core_bits     = bindThreadToPhysicalCore ? p_core->physicalBits : p_core->logicalBits;
+            ee_core_bits    = ee_core->logicalBits;
+        }
+
+        uint    worker_only_threads         = 0;
+        uint    render_only_threads         = 0;
+        uint    background_only_threads     = 0;
+        uint    worker_render_threads       = Max( 1u, (maxThreads+1)/2 );
+        uint    worker_background_threads   = Max( 1u, maxThreads - worker_render_threads );
 
         if ( maxThreads > 4 ) {
-            worker_only_threads         = worker_render_threads/2;
-            render_only_threads         = worker_render_threads/2;
-            background_only_threads     = worker_background_threads;
+            worker_only_threads         = Max( 1u, worker_render_threads/2 );
+            render_only_threads         = Max( 1u, worker_render_threads - worker_only_threads );
             worker_render_threads       = 0;
+            background_only_threads     = worker_background_threads;
             worker_background_threads   = 0;
         }
 
-        ASSERT( maxThreads <= max_cores );  Unused( max_cores );
-        ASSERT( (worker_only_threads + render_only_threads + background_only_threads + worker_render_threads + worker_background_threads) == maxThreads );
+        ASSERT_LE( (worker_only_threads + render_only_threads + 1), p_core_bits.count() );
+        ASSERT_Eq( (worker_only_threads + render_only_threads + background_only_threads + worker_render_threads + worker_background_threads), maxThreads );
 
-        const auto  GetPCoreId  = [p_core, &logical_bits] () -> uint
-        {{
-            auto    available   = p_core->logicalBits & ~logical_bits;
-            int     id          = BitScanForward( available.to_ullong() );
-            if ( id >= 0 ) {
-                logical_bits.set( id );
-                return id;
-            }
-            return UMax;
-        }};
+        allowProcessInMain.insert( EThread::Main );
+        if ( mask.contains( EThread::PerFrame ))    allowProcessInMain.insert( EThread::PerFrame );
+        if ( mask.contains( EThread::Renderer ))    allowProcessInMain.insert( EThread::Renderer );
 
-        const auto  GetEECoreId = [ee_core, &logical_bits] () -> uint
+        const auto  GetPCoreId  = [&] () -> ECpuCoreId
         {{
-            auto    available   = ee_core->logicalBits & ~logical_bits;
-            int     id          = BitScanForward( available.to_ullong() );
+            auto    available   = p_core_bits & ~core_bits;
+            int     id          = ShuffleBitScan( available.to_ullong(), shuffle );
             if ( id >= 0 ) {
-                logical_bits.set( id );
-                return id;
+                core_bits.set( id );
+                return ECpuCoreId(id);
             }
-            return UMax;
+            return Default;
         }};
+        cfg.mainThreadCoreId = GetPCoreId();
 
-        allowProcessInMain.insert( EThread::Main );
-        if ( maxThreads <= 2 ) {
-            if ( mask.contains( EThread::PerFrame ))    allowProcessInMain.insert( EThread::PerFrame );
-            if ( mask.contains( EThread::Renderer ))    allowProcessInMain.insert( EThread::Renderer );
-        }
+        auto&   scheduler = Scheduler();
+        CHECK_ERR( scheduler.Setup( cfg ));
 
         // performance core
         {
@@ -478,8 +404,7 @@ namespace
             {
                 scheduler.AddThread( ThreadMngr::CreateThread( ThreadConfig{
                         EThreadArray{ EThread::PerFrame },
-                        (i > 0 ? wakeup : null),
-                        "worker|"s + ToString(i)
+                        "pf|"s + ToString(i)
                     }), GetPCoreId() );
             }
 
@@ -487,8 +412,7 @@ namespace
             {
                 scheduler.AddThread( ThreadMngr::CreateThread( ThreadConfig{
                         EThreadArray{ EThread::Renderer },
-                        (i > 0 ? wakeup : null),
-                        "render|"s + ToString(i)
+                        "rt|"s + ToString(i)
                     }), GetPCoreId() );
             }
 
@@ -496,20 +420,32 @@ namespace
             {
                 scheduler.AddThread( ThreadMngr::CreateThread( ThreadConfig{
                         EThreadArray{ EThread::Renderer, EThread::PerFrame },
-                        (i > 0 ? wakeup : null),
-                        "render|worker|"s + ToString(i)
+                        "rt|pf|"s + ToString(i)
                     }), GetPCoreId() );
             }
         }
 
+        if ( bindThreadToPhysicalCore )
+            core_bits |= (core_bits << 1);
+
         // EE core
         {
+            const auto  GetEECoreId = [&] () -> ECpuCoreId
+            {{
+                auto    available   = ee_core_bits & ~core_bits;
+                int     id          = ShuffleBitScan( available.to_ullong(), shuffle );
+                if ( id >= 0 ) {
+                    core_bits.set( id );
+                    return ECpuCoreId(id);
+                }
+                return Default;
+            }};
+
             for (uint i = 0; i < worker_background_threads; ++i)
             {
                 scheduler.AddThread( ThreadMngr::CreateThread( ThreadConfig{
                         EThreadArray{ EThread::PerFrame, EThread::Background, EThread::FileIO },
-                        (i > 0 ? wakeup : null),
-                        "worker|background|io|"s + ToString(i)
+                        "pf|bg|io|"s + ToString(i)
                     }), GetEECoreId() );
             }
 
@@ -517,8 +453,7 @@ namespace
             {
                 scheduler.AddThread( ThreadMngr::CreateThread( ThreadConfig{
                         EThreadArray{ EThread::Background, EThread::FileIO },
-                        (i > 0 ? wakeup : null),
-                        "background|io|"s + ToString(i)
+                        "bg|io|"s + ToString(i)
                     }), GetEECoreId() );
             }
         }
diff --git a/AE/engine/src/threading/TaskSystem/ThreadManager.h b/AE/engine/src/threading/TaskSystem/ThreadManager.h
index 07ac2278..fc45e8e8 100644
--- a/AE/engine/src/threading/TaskSystem/ThreadManager.h
+++ b/AE/engine/src/threading/TaskSystem/ThreadManager.h
@@ -7,42 +7,6 @@
 namespace AE::Threading
 {
 
-    //
-    // Thread Wakeup
-    //
-    struct ThreadWakeup
-    {
-    // types
-    public:
-        using LoopingFlag_t     = Atomic<uint>;
-
-
-    // variables
-    private:
-        ConditionVariable   _cv;
-        Mutex               _mutex;
-        EThreadBits         _activeThreads;
-
-
-    // methods
-    public:
-        ThreadWakeup ()                                             __NE___ {}
-
-        void  Wakeup (ETaskQueueBits)                               __NE___;
-        void  Wakeup (EThreadBits)                                  __NE___;
-
-        void  Wakeup (ETaskQueue type)                              __NE___ { Wakeup( ETaskQueueBits{ type }); }
-        void  Wakeup (EThread type)                                 __NE___ { Wakeup( EThreadBits{ type }); }
-
-        void  WakeupAndDetach (LoopingFlag_t &)                     __NE___;
-
-        void  Suspend (ETaskQueueBits, LoopingFlag_t &)             __NE___;
-        void  Suspend (EThreadBits, LoopingFlag_t &)                __NE___;
-        void  Suspend (const EThreadArray &, LoopingFlag_t &)       __NE___;
-    };
-
-
-
     //
     // Thread Manager
     //
@@ -58,18 +22,13 @@ namespace AE::Threading
         {
         // variables
             EThreadArray            threads;
-            Ptr<ThreadWakeup>       wakeup;
             FixedString<64>         name;
 
         // methods
-            ThreadConfig ()                                                                         __NE___ {}
-            ThreadConfig (ThreadConfig &&)                                                          __NE___ = default;
-            ThreadConfig (const ThreadConfig &)                                                     __NE___ = default;
-
-            ThreadConfig (const EThreadArray &threads, StringView name)                             __NE___ : threads{threads},  name{name} {}
-            ThreadConfig (const EThreadArray &threads, Ptr<ThreadWakeup> wakeup, StringView name)   __NE___ : threads{threads},  wakeup{wakeup},  name{name} {}
-
-            ND_ static ThreadConfig  CreateNonSleep ()                                              __NE___ { return ThreadConfig( EThreadArray{ ETaskQueue::PerFrame }, "worker" ); }
+            ThreadConfig (ThreadConfig &&)                              __NE___ = default;
+            ThreadConfig (const ThreadConfig &)                         __NE___ = default;
+            ThreadConfig (const EThreadArray &threads, StringView name) __NE___ : threads{threads},  name{name} {}
+            ThreadConfig ()                                             __NE___ : ThreadConfig{ EThreadArray{ ETaskQueue::PerFrame }, "worker" } {}
         };
 
 
@@ -79,24 +38,25 @@ namespace AE::Threading
 
         ND_ static bool  SetupThreads (const TaskScheduler::Config  &cfg,
                                        EnumBitSet<EThread>           mask,
-                                       Ptr<ThreadWakeup>             wakeup,            
                                        uint                          maxThreads,
+                                       Bool                          bindThreadToPhysicalCore,
                                        OUT EThreadArray             &allowProcessInMain)        __NE___;
 
     private:
         friend class TaskScheduler;
         ND_ static RC<IThread>  _CreateMainThread ()                                            __NE___;
 
-        ND_ static bool  _SetupThreads_v1 (TaskScheduler                &scheduler,
+        ND_ static bool  _SetupThreads_v1 (TaskScheduler::Config         cfg,
+                                           const CpuArchInfo            &cpuInfo,
                                            const EnumBitSet<EThread>     mask,
                                            const uint                    maxThreads,
                                            OUT EThreadArray             &allowProcessInMain)    __NE___;
 
-        ND_ static bool  _SetupThreads_v2 (TaskScheduler                &scheduler,
+        ND_ static bool  _SetupThreads_v2 (TaskScheduler::Config         cfg,
                                            const CpuArchInfo            &cpuInfo,
                                            const EnumBitSet<EThread>     mask,
-                                           Ptr<ThreadWakeup>             wakeup,
                                            const uint                    maxThreads,
+                                           bool                          bindThreadToPhysicalCore,
                                            OUT EThreadArray             &allowProcessInMain)    __NE___;
     };
 
diff --git a/AE/engine/src/vfs/Archive/ArchivePacker.cpp b/AE/engine/src/vfs/Archive/ArchivePacker.cpp
index 13dd133d..44243abb 100644
--- a/AE/engine/src/vfs/Archive/ArchivePacker.cpp
+++ b/AE/engine/src/vfs/Archive/ArchivePacker.cpp
@@ -261,14 +261,14 @@ namespace AE::VFS
     bool  ArchivePacker::AddArchive (const Path &filename)
     {
         ArchiveStaticStorage    tmp_archive;
-        CHECK_ERR( tmp_archive.Create( filename ));
+        CHECK_ERR( tmp_archive._Create( filename ));
         return _AddArchive( tmp_archive );
     }
 
     bool  ArchivePacker::AddArchive (RC<RDataSource> archiveDS)
     {
         ArchiveStaticStorage    tmp_archive;
-        CHECK_ERR( tmp_archive.Create( archiveDS ));
+        CHECK_ERR( tmp_archive._Create( archiveDS ));
         return _AddArchive( tmp_archive );
     }
 
diff --git a/AE/engine/src/vfs/Archive/ArchiveStaticStorage.cpp b/AE/engine/src/vfs/Archive/ArchiveStaticStorage.cpp
index 01859e9b..6141bb84 100644
--- a/AE/engine/src/vfs/Archive/ArchiveStaticStorage.cpp
+++ b/AE/engine/src/vfs/Archive/ArchiveStaticStorage.cpp
@@ -11,10 +11,10 @@ namespace AE::VFS
 
 /*
 =================================================
-    Create
+    _Create
 =================================================
 */
-    bool  ArchiveStaticStorage::Create (RC<RDataSource> archive)
+    bool  ArchiveStaticStorage::_Create (RC<RDataSource> archive) __NE___
     {
         DRC_EXLOCK( _drCheck );
         CHECK_ERR( archive and archive->IsOpen() );
@@ -31,14 +31,14 @@ namespace AE::VFS
 
 /*
 =================================================
-    Create
+    _Create
 =================================================
 */
-    bool  ArchiveStaticStorage::Create (const Path &filename)
+    bool  ArchiveStaticStorage::_Create (const Path &filename) __NE___
     {
         auto    file = MakeRC<TSFileRDataSource_t>( filename );
         CHECK_ERR( file );
-        return Create( file );
+        return _Create( file );
     }
 
 /*
@@ -48,7 +48,7 @@ namespace AE::VFS
 */
     bool  ArchiveStaticStorage::_ReadHeader (RDataSource &inDS) __NE___
     {
-        try{
+        TRY{
             ArchiveHeader   hdr;
             CHECK_ERR( inDS.ReadBlock( 0_b, OUT &hdr, Sizeof(hdr) ) == Sizeof(hdr) );
 
@@ -77,9 +77,9 @@ namespace AE::VFS
             }
             return true;
         }
-        catch (...)
-        {}
-        return false;
+        CATCH_ALL(
+            return false;
+        )
     }
 
 /*
@@ -315,6 +315,7 @@ namespace AE::VFS
 */
     bool  ArchiveStaticStorage::_OpenByIter (OUT RC<AsyncRDataSource> &, FileNameRef, const void*) C_NE___
     {
+        // TODO: replace '_archive' by asyncDS
         return false;
     }
 //-----------------------------------------------------------------------------
@@ -327,15 +328,15 @@ namespace AE::VFS
 */
     RC<IVirtualFileStorage>  VirtualFileStorageFactory::CreateStaticArchive (RC<RDataSource> archive) __NE___
     {
-        auto    result = MakeRC<ArchiveStaticStorage>();
-        CHECK_ERR( result->Create( RVRef(archive) ));
+        auto    result = RC<ArchiveStaticStorage>{ new ArchiveStaticStorage{}};
+        CHECK_ERR( result->_Create( RVRef(archive) ));
         return result;
     }
 
     RC<IVirtualFileStorage>  VirtualFileStorageFactory::CreateStaticArchive (const Path &filename) __NE___
     {
-        auto    result = MakeRC<ArchiveStaticStorage>();
-        CHECK_ERR( result->Create( filename ));
+        auto    result = RC<ArchiveStaticStorage>{ new ArchiveStaticStorage{}};
+        CHECK_ERR( result->_Create( filename ));
         return result;
     }
 
diff --git a/AE/engine/src/vfs/Archive/ArchiveStaticStorage.h b/AE/engine/src/vfs/Archive/ArchiveStaticStorage.h
index 46807236..6bfd4027 100644
--- a/AE/engine/src/vfs/Archive/ArchiveStaticStorage.h
+++ b/AE/engine/src/vfs/Archive/ArchiveStaticStorage.h
@@ -14,6 +14,7 @@ namespace AE::VFS
     class ArchiveStaticStorage final : public IVirtualFileStorage
     {
         friend class ArchivePacker;
+        friend class VirtualFileStorageFactory;
 
     // types
     private:
@@ -54,7 +55,7 @@ namespace AE::VFS
             FileName::Optimized_t   name;
             FileInfo                info;
         };
-        STATIC_ASSERT( sizeof(FileHeader) == 20 );
+        StaticAssert( sizeof(FileHeader) == 20 );
 
         using FileMap_t = FlatHashMap< FileName::Optimized_t, FileInfo >;
 
@@ -74,12 +75,6 @@ namespace AE::VFS
 
     // methods
     public:
-        ArchiveStaticStorage ()                                                                 __NE___ {}
-        ~ArchiveStaticStorage ()                                                                __NE_OV {}
-
-        ND_ bool  Create (RC<RDataSource> archive);
-        ND_ bool  Create (const Path &filename);
-
 
       // IVirtualFileStorage //
         bool  Open (OUT RC<RStream> &stream, FileNameRef name)                                  C_NE_OV;
@@ -91,6 +86,7 @@ namespace AE::VFS
         bool  Exists (FileNameRef name)                                                         C_NE_OV;
         bool  Exists (FileGroupNameRef name)                                                    C_NE_OV;
 
+
     private:
         void  _Append (INOUT GlobalFileMap_t &)                                                 C_Th_OV;
 
@@ -105,6 +101,14 @@ namespace AE::VFS
     //  bool  _Open2 (OUT RC<AsyncRDataSource> &ds, const FileInfo &info)                       C_NE___;
 
         ND_ bool  _ReadHeader (RDataSource &ds)                                                 __NE___;
+
+
+    private:
+        ArchiveStaticStorage ()                                                                 __NE___ {}
+        ~ArchiveStaticStorage ()                                                                __NE_OV {}
+
+        ND_ bool  _Create (RC<RDataSource> archive)                                             __NE___;
+        ND_ bool  _Create (const Path &filename)                                                __NE___;
     };
 
 
diff --git a/AE/engine/src/vfs/Common.h b/AE/engine/src/vfs/Common.h
index 69ef3f38..c08299d3 100644
--- a/AE/engine/src/vfs/Common.h
+++ b/AE/engine/src/vfs/Common.h
@@ -12,6 +12,13 @@ namespace AE::VFS::_hidden_
 } // AE::VFS::_hidden_
 
 
+namespace AE::Networking
+{
+    class ClientServerBase;
+
+} // AE::Networking
+
+
 namespace AE::VFS
 {
     using namespace AE::Base;
diff --git a/AE/engine/src/vfs/Disk/DiskDynamicStorage.cpp b/AE/engine/src/vfs/Disk/DiskDynamicStorage.cpp
index a93ff82a..d1c7dc23 100644
--- a/AE/engine/src/vfs/Disk/DiskDynamicStorage.cpp
+++ b/AE/engine/src/vfs/Disk/DiskDynamicStorage.cpp
@@ -8,27 +8,34 @@ namespace AE::VFS
 
 /*
 =================================================
-    Create
+    _Create
 =================================================
 */
-    bool  DiskDynamicStorage::Create (const Path &folder, StringView prefix)
+    bool  DiskDynamicStorage::_Create (const Path &folder, StringView prefix, bool createFolder) __NE___
     {
-        {
+        TRY{
             auto    file_map = _fileMap.WriteNoLock();
             EXLOCK( file_map );
 
             CHECK_ERR( _folder.empty() );
+
+            if ( createFolder )
+                FileSystem::CreateDirectories( folder );
+
             CHECK_ERR( FileSystem::IsDirectory( folder ));
 
             file_map->map.clear();
-            file_map->map.reserve( 128 );
+            file_map->map.reserve( 128 );   // throw
             file_map->lastUpdate = Default;
 
             _folder = FileSystem::ToAbsolute( folder );
             _prefix = String{prefix};
         }
+        CATCH_ALL(
+            return false;
+        )
 
-        CHECK_ERR( _Update() );
+        Unused( _Update() );
         return true;
     }
 
@@ -39,7 +46,7 @@ namespace AE::VFS
 */
     bool  DiskDynamicStorage::_Update () C_NE___
     {
-        try{
+        TRY{
             auto    cur_time = TimePoint_t::clock::now();
 
             if ( TimeCast<seconds>( cur_time - _fileMap.ConstPtr()->lastUpdate ) < _UpdateInterval )
@@ -84,8 +91,8 @@ namespace AE::VFS
 
             _fileMap->lastUpdate = TimePoint_t::clock::now();
         }
-        catch (...)
-        {}
+        CATCH_ALL()
+
         return true;
     }
 
@@ -192,7 +199,9 @@ namespace AE::VFS
     bool  DiskDynamicStorage::CreateFile (OUT FileName &name, const Path &inPath) C_NE___
     {
         Path    path = (_folder / inPath).lexically_normal();   // path without '..'
-                path = FileSystem::ToRelative( path, _folder );
+        FileSystem::CreateDirectories( path.parent_path() );
+
+        path = FileSystem::ToRelative( path, _folder );
 
         String  str;
         CHECK_ERR( Convert<Path::value_type>( OUT str, path.native() ));
@@ -289,10 +298,10 @@ namespace AE::VFS
     CreateDynamicFolder
 =================================================
 */
-    RC<IVirtualFileStorage>  VirtualFileStorageFactory::CreateDynamicFolder (const Path &folder, StringView prefix) __NE___
+    RC<IVirtualFileStorage>  VirtualFileStorageFactory::CreateDynamicFolder (const Path &folder, StringView prefix, Bool createFolder) __NE___
     {
-        auto    result = MakeRC<DiskDynamicStorage>();
-        CHECK_ERR( result->Create( folder, prefix ));
+        auto    result = RC<DiskDynamicStorage>{ new DiskDynamicStorage{}};
+        CHECK_ERR( result->_Create( folder, prefix, createFolder ));
         return result;
     }
 
diff --git a/AE/engine/src/vfs/Disk/DiskDynamicStorage.h b/AE/engine/src/vfs/Disk/DiskDynamicStorage.h
index 7d82146a..2734faae 100644
--- a/AE/engine/src/vfs/Disk/DiskDynamicStorage.h
+++ b/AE/engine/src/vfs/Disk/DiskDynamicStorage.h
@@ -41,11 +41,6 @@ namespace AE::VFS
 
     // methods
     public:
-        DiskDynamicStorage ()                                                       __NE___ {}
-        ~DiskDynamicStorage ()                                                      __NE_OV {}
-
-        ND_ bool  Create (const Path &folder, StringView prefix = Default);
-
 
       // IVirtualFileStorage //
         bool  Open (OUT RC<RStream> &stream, FileNameRef name)                      C_NE_OV;
@@ -79,6 +74,14 @@ namespace AE::VFS
         ND_ bool  _Open2 (OUT ResultType &, FileNameRef name)                       C_NE___;
 
         ND_ bool  _Update ()                                                        C_NE___;
+
+
+    private:
+        friend class VirtualFileStorageFactory;
+        DiskDynamicStorage ()                                                       __NE___ {}
+        ~DiskDynamicStorage ()                                                      __NE_OV {}
+
+        ND_ bool  _Create (const Path &folder, StringView prefix, bool createFolder)__NE___;
     };
 
 
diff --git a/AE/engine/src/vfs/Disk/DiskStaticStorage.cpp b/AE/engine/src/vfs/Disk/DiskStaticStorage.cpp
index 78de2a29..cde7cfe6 100644
--- a/AE/engine/src/vfs/Disk/DiskStaticStorage.cpp
+++ b/AE/engine/src/vfs/Disk/DiskStaticStorage.cpp
@@ -8,17 +8,17 @@ namespace AE::VFS
 
 /*
 =================================================
-    Create
+    _Create
 =================================================
 */
-    bool  DiskStaticStorage::Create (const Path &folder, StringView prefix) __NE___
+    bool  DiskStaticStorage::_Create (const Path &folder, StringView prefix) __NE___
     {
-        CATCH_ERR(
-            return _Create( folder, prefix );
+        NOTHROW_ERR(
+            return _Create2( folder, prefix );
         )
     }
 
-    bool  DiskStaticStorage::_Create (const Path &folder, StringView prefix) __Th___
+    bool  DiskStaticStorage::_Create2 (const Path &folder, StringView prefix) __Th___
     {
         DRC_EXLOCK( _drCheck );
 
@@ -117,7 +117,7 @@ namespace AE::VFS
             Path    path{ _folder };
             path /= Path{ iter->second };
 
-            auto    file = MakeRC<ImplType>( path );    // throw
+            auto    file = MakeRC<ImplType>( path );
             if_likely( file->IsOpen() )
             {
                 result = file;
@@ -187,6 +187,32 @@ namespace AE::VFS
     #endif
     }
 
+/*
+=================================================
+    _OpenByIter
+=================================================
+*/
+    bool  DiskStaticStorage::_OpenByIter (OUT RC<WStream> &stream, FileNameRef name, const void* ref) C_NE___
+    {
+        return _OpenByIter2<FileWStream>( OUT stream, name, ref );
+    }
+
+    bool  DiskStaticStorage::_OpenByIter (OUT RC<WDataSource> &ds, FileNameRef name, const void* ref) C_NE___
+    {
+        return _OpenByIter2<FileWDataSource>( OUT ds, name, ref );
+    }
+
+    bool  DiskStaticStorage::_OpenByIter (OUT RC<AsyncWDataSource> &ds, FileNameRef name, const void* ref) C_NE___
+    {
+    #if defined(AE_PLATFORM_WINDOWS)
+        return _OpenByIter2< Threading::WinAsyncWDataSource >( OUT ds, name, ref );
+
+    #else
+        Unused( ds, name, ref );
+        return false;
+    #endif
+    }
+
 /*
 =================================================
     _OpenByIter2
@@ -223,8 +249,8 @@ namespace AE::VFS
 */
     RC<IVirtualFileStorage>  VirtualFileStorageFactory::CreateStaticFolder (const Path &folder, StringView prefix) __NE___
     {
-        auto    result = MakeRC<DiskStaticStorage>();
-        CHECK_ERR( result->Create( folder, prefix ));
+        auto    result = RC<DiskStaticStorage>{ new DiskStaticStorage{}};
+        CHECK_ERR( result->_Create( folder, prefix ));
         return result;
     }
 
diff --git a/AE/engine/src/vfs/Disk/DiskStaticStorage.h b/AE/engine/src/vfs/Disk/DiskStaticStorage.h
index 1bf6d021..754d1564 100644
--- a/AE/engine/src/vfs/Disk/DiskStaticStorage.h
+++ b/AE/engine/src/vfs/Disk/DiskStaticStorage.h
@@ -35,11 +35,6 @@ namespace AE::VFS
 
     // methods
     public:
-        DiskStaticStorage ()                                                                    __NE___ {}
-        ~DiskStaticStorage ()                                                                   __NE_OV {}
-
-        ND_ bool  Create (const Path &folder, StringView prefix = Default)                      __NE___;
-
 
       // IVirtualFileStorage //
         bool  Open (OUT RC<RStream> &stream, FileNameRef name)                                  C_NE_OV;
@@ -51,15 +46,18 @@ namespace AE::VFS
         bool  Exists (FileNameRef name)                                                         C_NE_OV;
         bool  Exists (FileGroupNameRef name)                                                    C_NE_OV;
 
-    private:
-        bool  _Create (const Path &folder, StringView prefix)                                   __Th___;
 
+    private:
         void  _Append (INOUT GlobalFileMap_t &)                                                 C_Th_OV;
 
         bool  _OpenByIter (OUT RC<RStream> &stream, FileNameRef name, const void* ref)          C_NE_OV;
         bool  _OpenByIter (OUT RC<RDataSource> &ds, FileNameRef name, const void* ref)          C_NE_OV;
         bool  _OpenByIter (OUT RC<AsyncRDataSource> &ds, FileNameRef name, const void* ref)     C_NE_OV;
 
+        bool  _OpenByIter (OUT RC<WStream> &stream, FileNameRef name, const void* ref)          C_NE_OV;
+        bool  _OpenByIter (OUT RC<WDataSource> &ds, FileNameRef name, const void* ref)          C_NE_OV;
+        bool  _OpenByIter (OUT RC<AsyncWDataSource> &ds, FileNameRef name, const void* ref)     C_NE_OV;
+
         using IVirtualFileStorage::_OpenByIter;
 
         template <typename ImplType, typename ResultType>
@@ -67,6 +65,15 @@ namespace AE::VFS
 
         template <typename ImplType, typename ResultType>
         ND_ bool  _OpenByIter2 (OUT ResultType &, FileNameRef name, const void* ref)            C_NE___;
+
+
+    private:
+        friend class VirtualFileStorageFactory;
+        DiskStaticStorage ()                                                                    __NE___ {}
+        ~DiskStaticStorage ()                                                                   __NE_OV {}
+
+        ND_ bool  _Create (const Path &folder, StringView prefix)                               __NE___;
+        ND_ bool  _Create2 (const Path &folder, StringView prefix)                              __Th___;
     };
 
 
diff --git a/AE/engine/src/vfs/Network/Messages.h b/AE/engine/src/vfs/Network/Messages.h
new file mode 100644
index 00000000..37c8956f
--- /dev/null
+++ b/AE/engine/src/vfs/Network/Messages.h
@@ -0,0 +1,172 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_ENABLE_NETWORKING
+# include "networking/HighLevel/Messages.h"
+# include "vfs/Common.h"
+
+namespace AE::CSMessageGroup
+{
+    static constexpr auto                                       NetVFS          = CSMessageGroupID(2);
+    static constexpr Base::CT_Counter< _MsgCounterCtx<NetVFS> > NetVFS_MsgCounter;
+}
+
+namespace AE::Networking
+{
+    // tag: HandleTmpl UID
+    using NetDataSourceID   = HandleTmpl< 16, 16, (9 << 24) + 1 >;
+    using NDSRequestID      = HandleTmpl< 16, 16, (9 << 24) + 2 >;
+
+
+    // Open for read
+    DECL_CSMSG( VFS_OpenForReadRequest,  NetVFS,
+        NetDataSourceID             fileId;
+        VFS::FileName::Optimized_t  name;
+    );
+
+    DECL_CSMSG( VFS_OpenForReadResult,  NetVFS,
+        NetDataSourceID             fileId;
+        bool                        ok      = false;
+        IDataSource::ESourceType    type;
+        Bytes                       size;
+    );
+
+
+    // Open for write
+    DECL_CSMSG( VFS_OpenForWriteRequest,  NetVFS,
+        NetDataSourceID             fileId;
+        VFS::FileName::Optimized_t  name;
+    );
+
+    DECL_CSMSG( VFS_OpenForWriteResult,  NetVFS,
+        NetDataSourceID             fileId;
+        IDataSource::ESourceType    type;
+        bool                        ok      = false;
+    );
+
+
+    // Close
+    DECL_CSMSG( VFS_CloseReadFile,  NetVFS,
+        NetDataSourceID     fileId;
+    );
+
+    DECL_CSMSG( VFS_CloseWriteFile,  NetVFS,
+        NetDataSourceID     fileId;
+    );
+
+
+    // CancelAll
+    DECL_CSMSG( VFS_CancelAllReadRequests,  NetVFS,
+        NetDataSourceID     fileId;
+    );
+
+    DECL_CSMSG( VFS_CancelAllWriteRequests,  NetVFS,
+        NetDataSourceID     fileId;
+    );
+
+
+    // Read
+    DECL_CSMSG( VFS_ReadRequest,  NetVFS,
+        NetDataSourceID     fileId;
+        NDSRequestID        reqId;
+        Bytes               pos;
+        Byte32u             size;
+    );
+
+    DECL_CSMSG( VFS_ReadResult,  NetVFS,
+        NDSRequestID        reqId;
+        ushort              index;
+        Byte16u             size;
+        char                data [1];
+    );
+
+    DECL_CSMSG( VFS_ReadComplete,  NetVFS,
+        NDSRequestID        reqId;
+        Byte32u             size;
+        HashVal64           hash;
+    );
+
+
+    // Write
+    DECL_CSMSG( VFS_WriteBegin,  NetVFS,
+        NetDataSourceID     fileId;
+        NDSRequestID        reqId;
+        Byte32u             size;
+    );
+
+    DECL_CSMSG( VFS_WritePart,  NetVFS,
+        NDSRequestID        reqId;
+        ushort              index;
+        Byte16u             size;
+        char                data [1];
+    );
+
+    DECL_CSMSG( VFS_WriteEnd,  NetVFS,
+        NDSRequestID        reqId;
+        HashVal64           hash;
+        Bytes               pos;
+    );
+
+    DECL_CSMSG( VFS_WriteComplete,  NetVFS,
+        NDSRequestID        reqId;
+        Byte32u             size;
+    );
+
+//-----------------------------------------------------------------------------
+
+
+    CSMSG_ENC_DEC( VFS_OpenForReadRequest,      fileId, name );
+    CSMSG_ENC_DEC( VFS_OpenForReadResult,       fileId, ok, size );
+
+    CSMSG_ENC_DEC( VFS_OpenForWriteRequest,     fileId, name );
+    CSMSG_ENC_DEC( VFS_OpenForWriteResult,      fileId, ok );
+
+    CSMSG_ENC_DEC( VFS_CloseReadFile,           fileId );
+    CSMSG_ENC_DEC( VFS_CloseWriteFile,          fileId );
+
+    CSMSG_ENC_DEC( VFS_CancelAllReadRequests,   fileId );
+    CSMSG_ENC_DEC( VFS_CancelAllWriteRequests,  fileId );
+
+    CSMSG_ENC_DEC( VFS_ReadRequest,             fileId, reqId, pos, size );
+    CSMSG_ENC_DEC( VFS_ReadComplete,            reqId, size, hash );
+
+    CSMSG_ENC_DEC( VFS_WriteBegin,              fileId, reqId, size );
+    CSMSG_ENC_DEC( VFS_WriteEnd,                reqId, hash, pos );
+    CSMSG_ENC_DEC( VFS_WriteComplete,           reqId, size );
+
+    CSMSG_ENC_DEC_INPLACEARR( VFS_ReadResult,   size, data,  AE_ARGS( reqId, index, size ));
+    CSMSG_ENC_DEC_INPLACEARR( VFS_WritePart,    size, data,  AE_ARGS( reqId, index, size ));
+//-----------------------------------------------------------------------------
+
+
+/*
+=================================================
+    Register_NetVFS
+=================================================
+*/
+    ND_ inline bool  Register_NetVFS (MessageFactory &mf) __NE___
+    {
+        return  mf.Register<
+                    CSMsg_VFS_OpenForReadRequest,
+                    CSMsg_VFS_OpenForReadResult,
+                    CSMsg_VFS_OpenForWriteRequest,
+                    CSMsg_VFS_OpenForWriteResult,
+                    CSMsg_VFS_CloseReadFile,
+                    CSMsg_VFS_CloseWriteFile,
+                    CSMsg_VFS_CancelAllReadRequests,
+                    CSMsg_VFS_CancelAllWriteRequests,
+                    CSMsg_VFS_ReadRequest,
+                    CSMsg_VFS_ReadResult,
+                    CSMsg_VFS_ReadComplete,
+                    CSMsg_VFS_WriteBegin,
+                    CSMsg_VFS_WritePart,
+                    CSMsg_VFS_WriteEnd,
+                    CSMsg_VFS_WriteComplete
+                >
+                ( True{"lock group"} );
+    }
+
+} // AE::Networking
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorage.cpp b/AE/engine/src/vfs/Network/NetworkStorage.cpp
new file mode 100644
index 00000000..676c4f64
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorage.cpp
@@ -0,0 +1,130 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/NetworkStorage.h"
+
+namespace AE::VFS
+{
+
+/*
+=================================================
+    Open
+=================================================
+*/
+    bool  NetworkStorage::Open (OUT RC<RStream> &stream, FileNameRef name) C_NE___
+    {
+        auto    async = _client.OpenForRead( name );
+        if_likely( async ) {
+            stream = MakeRC<SyncRStream2>( RVRef(async) );
+            return true;
+        }
+        return false;
+    }
+
+    bool  NetworkStorage::Open (OUT RC<RDataSource> &ds, FileNameRef name) C_NE___
+    {
+        auto    async = _client.OpenForRead( name );
+        if_likely( async ) {
+            ds = MakeRC<SyncRDataSource>( RVRef(async) );
+            return true;
+        }
+        return false;
+    }
+
+    bool  NetworkStorage::Open (OUT RC<AsyncRDataSource> &ds, FileNameRef name) C_NE___
+    {
+        ds = _client.OpenForRead( name );
+        return ds != null;
+    }
+
+    bool  NetworkStorage::Open (OUT RC<WStream> &stream, FileNameRef name) C_NE___
+    {
+        auto    async = _client.OpenForWrite( name );
+        if_likely( async ) {
+            stream = MakeRC<SyncWStream2>( RVRef(async) );
+            return true;
+        }
+        return false;
+    }
+
+    bool  NetworkStorage::Open (OUT RC<WDataSource> &ds, FileNameRef name) C_NE___
+    {
+        auto    async = _client.OpenForWrite( name );
+        if_likely( async ) {
+            ds = MakeRC<SyncWDataSource>( RVRef(async) );
+            return true;
+        }
+        return false;
+    }
+
+    bool  NetworkStorage::Open (OUT RC<AsyncWDataSource> &ds, FileNameRef name) C_NE___
+    {
+        ds = _client.OpenForWrite( name );
+        return ds != null;
+    }
+
+/*
+=================================================
+    CreateFile
+=================================================
+*/
+    bool  NetworkStorage::CreateFile (OUT FileName &, const Path &) C_NE___
+    {
+        // TODO ?
+        return false;
+    }
+
+/*
+=================================================
+    CreateUniqueFile
+=================================================
+*/
+    bool  NetworkStorage::CreateUniqueFile (OUT FileName &, INOUT Path &) C_NE___
+    {
+        // TODO ?
+        return false;
+    }
+
+/*
+=================================================
+    Exists
+=================================================
+*/
+    bool  NetworkStorage::Exists (FileNameRef) C_NE___
+    {
+        // TODO ?
+        return false;
+    }
+
+    bool  NetworkStorage::Exists (FileGroupNameRef) C_NE___
+    {
+        // TODO ?
+        return false;
+    }
+//-----------------------------------------------------------------------------
+
+
+/*
+=================================================
+    CreateNetworkStorage
+=================================================
+*/
+    RC<IVirtualFileStorage>  VirtualFileStorageFactory::CreateNetworkStorage (Networking::ClientServerBase &cs) __NE___
+    {
+        auto    result = RC<NetworkStorage>{ new NetworkStorage{}};
+
+        if_unlikely( not (cs.Add( result->_client.GetMessageConsumer().GetRC() ) and
+                          cs.Add( result->_client.GetMessageProducer().GetRC() )) )
+        {
+            cs.Remove( &result->_client.GetMessageConsumer() );
+            cs.Remove( &result->_client.GetMessageProducer() );
+            return null;
+        }
+
+        return result;
+    }
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorage.h b/AE/engine/src/vfs/Network/NetworkStorage.h
new file mode 100644
index 00000000..0bc33204
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorage.h
@@ -0,0 +1,60 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/NetworkStorageClient.h"
+
+namespace AE::VFS
+{
+
+    //
+    // Network Virtual File Storage
+    //
+
+    class NetworkStorage final : public IVirtualFileStorage
+    {
+    // variables
+    private:
+        mutable NetworkStorageClient    _client;
+
+
+    // methods
+    public:
+
+      // IVirtualFileStorage //
+        bool  Open (OUT RC<RStream> &stream, FileNameRef name)                      C_NE_OV;
+        bool  Open (OUT RC<RDataSource> &ds, FileNameRef name)                      C_NE_OV;
+        bool  Open (OUT RC<AsyncRDataSource> &ds, FileNameRef name)                 C_NE_OV;
+
+        bool  Open (OUT RC<WStream> &stream, FileNameRef name)                      C_NE_OV;
+        bool  Open (OUT RC<WDataSource> &ds, FileNameRef name)                      C_NE_OV;
+        bool  Open (OUT RC<AsyncWDataSource> &ds, FileNameRef name)                 C_NE_OV;
+
+        bool  CreateFile (OUT FileName &name, const Path &path)                     C_NE_OV;
+        bool  CreateUniqueFile (OUT FileName &name, INOUT Path &path)               C_NE_OV;
+
+        bool  Exists (FileNameRef name)                                             C_NE_OV;
+        bool  Exists (FileGroupNameRef name)                                        C_NE_OV;
+
+
+    private:
+        void  _Append (INOUT GlobalFileMap_t &)                                     C_Th_OV {}
+
+        bool  _OpenByIter (OUT RC<RStream>&, FileNameRef, const void*)              C_NE_OV { DBG_WARNING("not supported");  return false; }
+        bool  _OpenByIter (OUT RC<RDataSource>&, FileNameRef, const void*)          C_NE_OV { DBG_WARNING("not supported");  return false; }
+        bool  _OpenByIter (OUT RC<AsyncRDataSource>&, FileNameRef, const void*)     C_NE_OV { DBG_WARNING("not supported");  return false; }
+
+        using IVirtualFileStorage::_OpenByIter;
+
+
+    private:
+        friend class VirtualFileStorageFactory;
+        NetworkStorage ()                                                           __NE___ {}
+        ~NetworkStorage ()                                                          __NE_OV {}
+    };
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorageBase.h b/AE/engine/src/vfs/Network/NetworkStorageBase.h
new file mode 100644
index 00000000..8e216111
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorageBase.h
@@ -0,0 +1,69 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/Messages.h"
+# include "vfs/VirtualFileSystem.h"
+
+namespace AE::VFS
+{
+    using namespace AE::Threading;
+    using namespace AE::Networking;
+
+    //
+    // Network Storage Base
+    //
+    class NetworkStorageBase
+    {
+    // types
+    protected:
+        using Index_t       = uint;
+
+        using ReqGen_t      = NDSRequestID::Generation_t;
+        using DSGen_t       = NetDataSourceID::Generation_t;
+        using FileNameRef   = IVirtualFileStorage::FileNameRef;
+
+        using _SpinLock_t   = TRWSpinLock< false, true >;
+
+        static constexpr uint   _FileCount  = 1u << 8;
+        static constexpr uint   _ReqCount   = 1u << 10;
+
+
+        class MsgProducer final : public AsyncCSMessageProducer< LfLinearAllocator< usize{4_Mb}, usize{16_b}, 16 >>
+        {
+        public:
+            EnumBitSet<EChannel>  GetChannels ()    C_NE_OV { return {EChannel::Reliable}; }
+        };
+
+
+        static constexpr Bytes  _partSize = AlignDown(  Min( Min( NetConfig::TCP_MaxMsgSize - SizeOf<CSMsg_VFS_ReadResult>,
+                                                                  MaxValue< decltype(CSMsg_VFS_ReadResult::size) >() ),
+                                                             Min( NetConfig::TCP_MaxMsgSize - SizeOf<CSMsg_VFS_WritePart>,
+                                                                  MaxValue< decltype(CSMsg_VFS_WritePart::size) >() )),
+                                                        64 );
+        static constexpr uint   _maxParts = 32;
+
+
+    // variables
+    protected:
+        StaticRC<MsgProducer>   _msgProducer;
+
+
+    // methods
+    protected:
+        template <typename T>
+        ND_ auto  _CreateMsg (Bytes extraSize = 0_b)    __NE___ { return _msgProducer->CreateMsg<T>( extraSize ); }
+
+        template <typename T>
+        ND_ auto  _CreateMsgOpt (Bytes extraSize = 0_b) __NE___ { return _msgProducer->CreateMsgOpt<T>( extraSize ); }
+
+        template <typename T>
+        ND_ bool  _AddMessage (T &msg)                  __NE___ { return _msgProducer->AddMessage( msg ); }
+    };
+
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorageClient.cpp b/AE/engine/src/vfs/Network/NetworkStorageClient.cpp
new file mode 100644
index 00000000..75e413c9
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorageClient.cpp
@@ -0,0 +1,895 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/NetworkStorageClient.h"
+
+namespace AE::VFS
+{
+    using RWReqPromise_t = AsyncDSRequest::Value_t::Promise_t;
+
+    INTERNAL_LINKAGE( Ptr<NetworkStorageClient>  s_NetVFS );
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    _Cleanup
+=================================================
+*/
+    void  NetworkStorageClient::_RequestBase::_Cleanup () __NE___
+    {
+        _actualSize.store( 0_b );
+
+        ASSERT( AnyEqual( _status.load(), EStatus::Cancelled, EStatus::Completed ));
+        _status.store( EStatus::Destroyed );
+
+        DEBUG_ONLY({
+            EXLOCK( _depsGuard );
+            CHECK( _deps.empty() );
+        })
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    Init
+=================================================
+*/
+    bool  NetworkStorageClient::NetReadRequest::Init (Bytes pos, Bytes size, void* data, RC<> mem) __NE___
+    {
+        ASSERT( _guard.is_locked() );
+
+        _pos        = pos;
+        _dataSize   = size;
+        _memRC      = RVRef(mem);
+        _data       = data;
+        _partCount  = 0;
+        _actualSize.store( 0_b );
+
+        CHECK( _status.exchange( EStatus::InProgress ) == EStatus::Destroyed );
+        return true;
+    }
+
+/*
+=================================================
+    Complete
+=================================================
+*/
+    void  NetworkStorageClient::NetReadRequest::Complete (const Bytes inSize, const HashVal64 inHash) __NE___
+    {
+        ASSERT( _guard.is_locked() );
+
+        // content of '_data' changed only in message processing thread
+        //MemoryBarrier( EMemoryOrder::Acquire );
+
+        const auto      hash        = XXHash64( _data, usize(_actualSize.load()) );
+        const bool      complete    = (Bytes{_actualSize.load()} == inSize) and (inHash == hash) and (inSize > 0) and (inHash != HashVal64{0});
+        const EStatus   stat        = _status.exchange( complete ? EStatus::Completed : EStatus::Cancelled );
+
+        ASSERT( complete );
+        ASSERT( stat == EStatus::InProgress );  Unused( stat );
+
+        _SetDependencyCompleteStatus( complete );
+    }
+
+/*
+=================================================
+    Update
+=================================================
+*/
+    void  NetworkStorageClient::NetReadRequest::Update (const ushort partIdx, const void* data, const Bytes size) __NE___
+    {
+        ASSERT( _guard.is_locked() );
+        CHECK( partIdx == ushort(_partCount++) );   // TODO: skip?
+
+        Bytes   pos = _actualSize.fetch_add( size );
+        MemCopy( OUT _data + pos, data, size );
+
+        // content of '_data' changed only in message processing thread
+        //MemoryBarrier( EMemoryOrder::Release );
+    }
+
+/*
+=================================================
+    GetResult
+=================================================
+*/
+    NetworkStorageClient::NetReadRequest::Result  NetworkStorageClient::NetReadRequest::GetResult () C_NE___
+    {
+        SHAREDLOCK( _guard );
+        ASSERT( IsFinished() );
+
+        Result  res;
+        res.pos         = _pos;
+        res.dataSize    = _actualSize.load();
+        res.data        = IsCompleted() ? _data : null;
+        return res;
+    }
+
+/*
+=================================================
+    Cancel
+=================================================
+*/
+    bool  NetworkStorageClient::NetReadRequest::Cancel () __NE___
+    {
+        // TODO ?
+        return false;
+    }
+
+/*
+=================================================
+    _GetResult
+=================================================
+*/
+    NetworkStorageClient::NetReadRequest::ResultWithRC  NetworkStorageClient::NetReadRequest::_GetResult () __NE___
+    {
+        SHAREDLOCK( _guard );
+        ASSERT( IsFinished() );
+
+        ResultWithRC    res;
+        res.pos         = _pos;
+        res.dataSize    = _actualSize.load();
+        res.data        = IsCompleted() ? _data : null;
+        res.rc          = _memRC;
+        return res;
+    }
+
+/*
+=================================================
+    AsPromise
+=================================================
+*/
+    RWReqPromise_t  NetworkStorageClient::NetReadRequest::AsPromise (Threading::ETaskQueue queueType) __NE___
+    {
+        auto    result = MakeDelayedPromise( [self = GetRC<NetReadRequest>()] () { return self->_GetResult(); }, "AsyncReadRequest", queueType );
+        if_likely( Scheduler().Run( AsyncTask{result}, Tuple{GetRC()} ))
+            return result;
+        else
+            return Default;
+    }
+
+/*
+=================================================
+    _ReleaseObject
+=================================================
+*/
+    void  NetworkStorageClient::NetReadRequest::_ReleaseObject () __NE___
+    {
+        EXLOCK( _guard );
+
+        // TODO: cancel read request if not complete
+
+        ++_generation;
+        _memRC = null;
+        _Cleanup();
+
+        s_NetVFS->_readResultPool.Unassign( this );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    AsyncWriteBlockTask::Run
+=================================================
+*/
+    void  NetworkStorageClient::AsyncWriteBlockTask::Run () __Th___
+    {
+        // is alive
+        {
+            auto    req = s_NetVFS->_GetWriteReq( _id );
+            if_unlikely( not req )
+                return OnFailure();
+        }
+
+        for (uint i = 0; (i < _maxParts) and (_dataSize > _sent); ++i)
+        {
+            const Bytes size    = Min( _dataSize - _sent, _partSize );
+            auto        msg     = s_NetVFS->_CreateMsgOpt< CSMsg_VFS_WritePart >( size-1 );
+
+            if_likely( msg )
+            {
+                msg->reqId  = _id;
+                msg->size   = size;
+                msg->index  = ushort(_partIdx);
+                MemCopy( OUT msg->data, _data + _sent, size );
+
+                if_likely( s_NetVFS->_AddMessage( msg ))
+                {
+                    _sent += size;
+                    _partIdx ++;
+                    continue;
+                }
+            }
+            break;
+        }
+
+        if ( _dataSize > _sent )
+            return Continue();  // try again
+
+        ASSERT( _dataSize == _sent );
+        _memRC = null;
+
+        // send completion message
+        auto    msg = s_NetVFS->_CreateMsgOpt< CSMsg_VFS_WriteEnd >();
+        if_likely( msg )
+        {
+            msg->reqId  = _id;
+            msg->hash   = XXHash64( _data, usize(_dataSize) );
+            msg->pos    = _pos;
+
+            if_likely( s_NetVFS->_AddMessage( msg ))
+            {
+                return;  // complete
+            }
+        }
+
+        return Continue();  // try again
+    }
+
+/*
+=================================================
+    AsyncWriteBlockTask::OnCancel
+=================================================
+*/
+    void  NetworkStorageClient::AsyncWriteBlockTask::OnCancel () __NE___
+    {
+        DEBUG_ONLY( IAsyncTask::OnCancel();)
+
+        _memRC = null;
+
+        {
+            Exclusive<NetWriteRequest>  req {s_NetVFS->_GetWriteReq( _id )};
+            if_likely( req )
+                req->Failed();
+        }
+
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_WriteEnd >();
+        CHECK_ERRV( msg );
+
+        msg->reqId  = _id;
+        msg->hash   = HashVal64{0};  // error
+        msg->pos    = _pos;
+
+        CHECK( s_NetVFS->_AddMessage( msg ));
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    Init
+=================================================
+*/
+    bool  NetworkStorageClient::NetWriteRequest::Init (AsyncTask task, Bytes pos) __NE___
+    {
+        ASSERT( _guard.is_locked() );
+        ASSERT( task );
+
+        _task   = RVRef(task);
+        _pos    = pos;
+        _actualSize.store( 0_b );
+
+        CHECK( _status.exchange( EStatus::InProgress ) == EStatus::Destroyed );
+        return true;
+    }
+
+/*
+=================================================
+    Complete
+=================================================
+*/
+    void  NetworkStorageClient::NetWriteRequest::Complete (const Bytes written) __NE___
+    {
+        ASSERT( _guard.is_locked() );
+
+        const bool      complete = written > 0_b;
+        EStatus         exp      = EStatus::InProgress;
+        const EStatus   des      = complete ? EStatus::Completed : EStatus::Cancelled;
+
+        if ( complete )
+            _actualSize.store( written );
+
+        for (;;)
+        {
+            exp = EStatus::InProgress;
+
+            if_likely( _status.CAS( INOUT exp, des ))
+                break;
+
+            if_likely( AnyEqual( exp, EStatus::Completed, EStatus::Cancelled ))
+                break;  // already complete
+        }
+
+        // only one thread will execute it
+        if ( exp == EStatus::InProgress )
+        {
+            // if used in message consumer
+            if ( _task and not _task->IsFinished() )
+            {
+                ASSERT( not complete );
+                Scheduler().Cancel( _task );
+            }
+
+            _task = null;
+            _SetDependencyCompleteStatus( complete );
+        }
+    }
+
+/*
+=================================================
+    GetResult
+=================================================
+*/
+    NetworkStorageClient::NetWriteRequest::Result  NetworkStorageClient::NetWriteRequest::GetResult () C_NE___
+    {
+        SHAREDLOCK( _guard );
+        ASSERT( IsFinished() );
+
+        Result  res;
+        res.pos         = _pos;
+        res.dataSize    = _actualSize.load();
+        res.data        = null;
+        return res;
+    }
+
+/*
+=================================================
+    Cancel
+=================================================
+*/
+    bool  NetworkStorageClient::NetWriteRequest::Cancel () __NE___
+    {
+        // TODO ?
+        return false;
+    }
+
+/*
+=================================================
+    _GetResult
+=================================================
+*/
+    NetworkStorageClient::NetWriteRequest::ResultWithRC  NetworkStorageClient::NetWriteRequest::_GetResult () __NE___
+    {
+        SHAREDLOCK( _guard );
+        ASSERT( IsFinished() );
+
+        ResultWithRC    res;
+        res.pos         = _pos;
+        res.dataSize    = _actualSize.load();
+        res.data        = null;
+        return res;
+    }
+
+/*
+=================================================
+    AsPromise
+=================================================
+*/
+    RWReqPromise_t  NetworkStorageClient::NetWriteRequest::AsPromise (Threading::ETaskQueue queueType) __NE___
+    {
+        auto    result = MakeDelayedPromise( [self = GetRC<NetWriteRequest>()] () { return self->_GetResult(); }, "AsyncWriteRequest", queueType );
+        if_likely( Scheduler().Run( AsyncTask{result}, Tuple{GetRC()} ))
+            return result;
+        else
+            return Default;
+    }
+
+/*
+=================================================
+    _ReleaseObject
+=================================================
+*/
+    void  NetworkStorageClient::NetWriteRequest::_ReleaseObject () __NE___
+    {
+        EXLOCK( _guard );
+
+        ++_generation;
+        _Cleanup();
+
+        s_NetVFS->_writeResultPool.Unassign( this );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    GetSourceType
+=================================================
+*/
+    IDataSource::ESourceType  NetworkStorageClient::NetRDataSource::GetSourceType () C_NE___
+    {
+        return  ESourceType::RandomAccess | ESourceType::Async | ESourceType::FixedSize |
+                ESourceType::ThreadSafe | ESourceType::ReadAccess | ESourceType::DeferredOpen;
+    }
+
+/*
+=================================================
+    ReadBlock
+=================================================
+*/
+    bool  NetworkStorageClient::NetRDataSource::_ReadBlockImpl (OUT ReadRequestPtr &outReq, const Bytes pos, void* data, const Bytes dataSize, RC<> mem) __NE___
+    {
+        CHECK_ERR( IsOpen() );
+
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_ReadRequest >();
+        CHECK_ERR( msg );
+
+        Index_t     idx;
+        CHECK_ERR( s_NetVFS->_readResultPool.Assign( OUT idx ));
+
+        RC<NetReadRequest>  req{ &s_NetVFS->_readResultPool[ idx ]};
+        EXLOCK( req->Guard() );
+
+        if_unlikely( not req->Init( pos, dataSize, data, RVRef(mem) ))
+        {
+            UNTESTED;
+            s_NetVFS->_readResultPool.Unassign( idx );
+            RETURN_ERR( "failed to init read request" );
+        }
+
+        msg->fileId = ID();
+        msg->reqId  = NDSRequestID{ idx, req->Generation() };
+        msg->pos    = pos;
+        msg->size   = dataSize;
+
+        if_unlikely( not s_NetVFS->_AddMessage( msg ))
+        {
+            UNTESTED;
+            s_NetVFS->_readResultPool.Unassign( idx );
+            RETURN_ERR( "failed to add message" );
+        }
+
+        outReq = RVRef(req);
+        return true;
+    }
+
+    AsyncDSRequest  NetworkStorageClient::NetRDataSource::ReadBlock (Bytes pos, void* data, Bytes dataSize, RC<> mem) __NE___
+    {
+        AsyncDSRequest  req;
+        if_likely( _ReadBlockImpl( OUT req, pos, data, dataSize, RVRef(mem) ));
+        else
+            req = AsyncDSRequest{Scheduler().GetCanceledDSRequest()};
+        return req;
+    }
+
+    AsyncDSRequest  NetworkStorageClient::NetRDataSource::ReadBlock (Bytes pos, Bytes size) __NE___
+    {
+        RC<SharedMem>   mem     = SharedMem::Create( AE::GetDefaultAllocator(), size ); // TODO: optimize
+        void*           data    = mem->Data();
+        return ReadBlock( pos, data, size, RVRef(mem) );
+    }
+
+/*
+=================================================
+    CancelAllRequests
+=================================================
+*/
+    bool  NetworkStorageClient::NetRDataSource::CancelAllRequests () __NE___
+    {
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_CancelAllReadRequests >();
+        CHECK_ERR( msg );
+
+        msg->fileId = NetDataSourceID{ _index.load(), Generation() };
+
+        CHECK_ERR( s_NetVFS->_AddMessage( msg ));
+        return true;
+    }
+
+/*
+=================================================
+    _ReleaseObject
+=================================================
+*/
+    void  NetworkStorageClient::NetRDataSource::_ReleaseObject () __NE___
+    {
+        // close
+        {
+            auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_CloseReadFile >();
+            if ( msg ) {
+                msg->fileId = ID();
+                Unused( s_NetVFS->_AddMessage( msg ));
+            }
+        }
+
+        _generation.fetch_add( 1 );
+        _open.store( EStatus::Initial );
+        _fileSize.store( 0_b );
+
+        s_NetVFS->_readDSPool.Unassign( _index.load() );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    GetSourceType
+=================================================
+*/
+    IDataSource::ESourceType  NetworkStorageClient::NetWDataSource::GetSourceType () C_NE___
+    {
+        return  ESourceType::RandomAccess | ESourceType::WriteAccess |
+                ESourceType::ThreadSafe | ESourceType::Async | ESourceType::DeferredOpen;
+    }
+
+/*
+=================================================
+    Alloc
+=================================================
+*/
+    RC<SharedMem>  NetworkStorageClient::NetWDataSource::Alloc (const SizeAndAlign value) __NE___
+    {
+        return SharedMem::Create( AE::GetDefaultAllocator(), value );   // TODO: optimize
+    }
+
+/*
+=================================================
+    WriteBlock
+=================================================
+*/
+    bool  NetworkStorageClient::NetWDataSource::_WriteBlockImpl (OUT WriteRequestPtr &outReq, Bytes pos, const void* data, const Bytes dataSize, RC<> mem) __NE___
+    {
+        CHECK_ERR( IsOpen() );
+
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_WriteBegin >();
+        CHECK_ERR( msg );
+
+        Index_t idx;
+        CHECK_ERR( s_NetVFS->_writeResultPool.Assign( OUT idx ));
+
+        RC<NetWriteRequest>  req{ &s_NetVFS->_writeResultPool[ idx ]};
+        EXLOCK( req->Guard() );
+
+        auto    task = Scheduler().Run<AsyncWriteBlockTask>(
+                            Tuple{  NDSRequestID{ idx, req->Generation() },
+                                    data,
+                                    dataSize,
+                                    pos,
+                                    RVRef(mem) },
+                            Tuple{} );
+
+        if_unlikely( not req->Init( RVRef(task), pos ))
+        {
+            UNTESTED;
+            s_NetVFS->_writeResultPool.Unassign( idx );
+            RETURN_ERR( "failed to init write request" );
+        }
+
+        msg->fileId = ID();
+        msg->reqId  = NDSRequestID{ idx, req->Generation() };
+        msg->size   = dataSize;
+
+        if_unlikely( not s_NetVFS->_AddMessage( msg ))
+        {
+            UNTESTED;
+            s_NetVFS->_writeResultPool.Unassign( idx );
+            RETURN_ERR( "failed to add message" );
+        }
+
+        outReq = RVRef(req);
+        return true;
+    }
+
+    AsyncDSRequest  NetworkStorageClient::NetWDataSource::WriteBlock (Bytes pos, const void* data, Bytes dataSize, RC<> mem) __NE___
+    {
+        AsyncDSRequest  req;
+        if_likely( _WriteBlockImpl( OUT req, pos, data, dataSize, RVRef(mem) ));
+        else
+            req = AsyncDSRequest{Scheduler().GetCanceledDSRequest()};
+        return req;
+    }
+
+/*
+=================================================
+    CancelAllRequests
+=================================================
+*/
+    bool  NetworkStorageClient::NetWDataSource::CancelAllRequests () __NE___
+    {
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_CancelAllWriteRequests >();
+        CHECK_ERR( msg );
+
+        msg->fileId = NetDataSourceID{ _index.load(), Generation() };
+
+        CHECK( s_NetVFS->_AddMessage( msg ));
+        return true;
+    }
+
+/*
+=================================================
+    _ReleaseObject
+=================================================
+*/
+    void  NetworkStorageClient::NetWDataSource::_ReleaseObject () __NE___
+    {
+        // close
+        {
+            auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_CloseWriteFile >();
+            if ( msg ) {
+                msg->fileId = ID();
+                Unused( s_NetVFS->_AddMessage( msg ));
+            }
+        }
+
+        _generation.fetch_add( 1 );
+        _open.store( EStatus::Initial );
+
+        s_NetVFS->_writeDSPool.Unassign( _index.load() );
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    NetworkStorageClient::MsgConsumer::MsgConsumer (NetworkStorageClient &c) __NE___ :
+        _client{c}
+    {}
+
+    NetworkStorageClient::NetworkStorageClient () __NE___ :
+        _msgConsumer{ *this }
+    {
+        CHECK_FATAL( s_NetVFS == null );
+        s_NetVFS = this;
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    NetworkStorageClient::~NetworkStorageClient () __NE___
+    {
+        s_NetVFS = null;
+    }
+
+/*
+=================================================
+    _OpenForReadResult
+=================================================
+*/
+    inline void  NetworkStorageClient::_OpenForReadResult (CSMsg_VFS_OpenForReadResult const& msg) __NE___
+    {
+        auto*   ds = _GetReadDS( msg.fileId );
+        CHECK_ERRV( ds != null );
+
+        if ( msg.ok ){
+            ds->_fileSize.store( msg.size );
+            CHECK( ds->_open.exchange( EStatus::Open ) == EStatus::Pending );
+        }else{
+            CHECK( ds->_open.exchange( EStatus::Failed ) == EStatus::Pending );
+            AE_LOGI( "OpenForReadResult: fail" );
+        }
+    }
+
+/*
+=================================================
+    _OpenForWriteResult
+=================================================
+*/
+    inline void  NetworkStorageClient::_OpenForWriteResult (CSMsg_VFS_OpenForWriteResult const& msg) __NE___
+    {
+        auto*   ds = _GetWriteDS( msg.fileId );
+        CHECK_ERRV( ds != null );
+
+        if ( msg.ok ){
+            CHECK( ds->_open.exchange( EStatus::Open ) == EStatus::Pending );
+        }else{
+            CHECK( ds->_open.exchange( EStatus::Failed ) == EStatus::Pending );
+            AE_LOGI( "OpenForWriteResult: fail" );
+        }
+    }
+
+/*
+=================================================
+    _CloseReadFile / _CloseWriteFile
+=================================================
+*/
+    inline void  NetworkStorageClient::_CloseReadFile (CSMsg_VFS_CloseReadFile const& msg) __NE___
+    {
+        auto*   ds = _GetReadDS( msg.fileId );
+        if ( ds != null ) {
+            CHECK( AnyEqual( ds->_open.exchange( EStatus::Closed ), EStatus::Pending, EStatus::Open )); // TODO: CAS
+        }
+    }
+
+    inline void  NetworkStorageClient::_CloseWriteFile (CSMsg_VFS_CloseWriteFile const& msg) __NE___
+    {
+        auto*   ds = _GetWriteDS( msg.fileId );
+        if ( ds != null ) {
+            CHECK( AnyEqual( ds->_open.exchange( EStatus::Closed ), EStatus::Pending, EStatus::Open )); // TODO: CAS
+        }
+    }
+
+/*
+=================================================
+    _ReadResult
+=================================================
+*/
+    inline void  NetworkStorageClient::_ReadResult (CSMsg_VFS_ReadResult const& msg) __NE___
+    {
+        Exclusive<NetReadRequest>   req {_GetReadReq( msg.reqId )};
+        CHECK_ERRV( req );
+
+        req->Update( msg.index, msg.data, msg.size );
+    }
+
+/*
+=================================================
+    _ReadComplete
+=================================================
+*/
+    inline void  NetworkStorageClient::_ReadComplete (CSMsg_VFS_ReadComplete const& msg) __NE___
+    {
+        Exclusive<NetReadRequest>   req {_GetReadReq( msg.reqId )};
+        CHECK_ERRV( req );
+
+        req->Complete( msg.size, msg.hash );
+    }
+
+/*
+=================================================
+    _WriteComplete
+=================================================
+*/
+    inline void  NetworkStorageClient::_WriteComplete (CSMsg_VFS_WriteComplete const& msg) __NE___
+    {
+        Exclusive<NetWriteRequest>  req {_GetWriteReq( msg.reqId )};
+        CHECK_ERRV( req );
+
+        req->Complete( msg.size );
+    }
+
+/*
+=================================================
+    OpenForRead
+=================================================
+*/
+    auto  NetworkStorageClient::OpenForRead (FileNameRef name) __NE___ -> RC<AsyncRDataSource>
+    {
+        auto    msg = _CreateMsg< CSMsg_VFS_OpenForReadRequest >();
+        CHECK_ERR( msg );
+
+        Index_t idx;
+        CHECK_ERR( _readDSPool.Assign( OUT idx ));
+
+        auto&   file = _readDSPool[idx];
+
+        file._open.store( EStatus::Pending );
+        file._index.store( idx );
+
+        msg->fileId = NetDataSourceID{ idx, file.Generation() };
+        msg->name   = FileName::Optimized_t{name};
+
+        CHECK_ERR( _AddMessage( msg ));
+
+        return file.GetRC<AsyncRDataSource>();
+    }
+
+/*
+=================================================
+    OpenForWrite
+=================================================
+*/
+    auto  NetworkStorageClient::OpenForWrite (FileNameRef name) __NE___ -> RC<AsyncWDataSource>
+    {
+        auto    msg = _CreateMsg< CSMsg_VFS_OpenForWriteRequest >();
+        CHECK_ERR( msg );
+
+        Index_t idx;
+        CHECK_ERR( _writeDSPool.Assign( OUT idx ));
+
+        auto&   file = _writeDSPool[idx];
+
+        file._open.store( EStatus::Pending );
+        file._index.store( idx );
+
+        msg->fileId = NetDataSourceID{ idx, file.Generation() };
+        msg->name   = FileName::Optimized_t{name};
+
+        CHECK_ERR( _AddMessage( msg ));
+
+        return file.GetRC<AsyncWDataSource>();
+    }
+
+/*
+=================================================
+    _GetReadReq / _GetWriteReq
+=================================================
+*/
+    auto  NetworkStorageClient::_GetReadReq (NDSRequestID id) __NE___ -> Shared<NetReadRequest>
+    {
+        auto*   req = _readResultPool.At( id.Index() );
+        if_likely( req != null )
+        {
+            req->Guard().lock_shared();
+
+            if_likely( req->Generation() == id.Generation() )
+                return Shared{ req };
+
+            req->Guard().unlock_shared();
+        }
+        return Default;
+    }
+
+    auto  NetworkStorageClient::_GetWriteReq (NDSRequestID id) __NE___ -> Shared<NetWriteRequest>
+    {
+        auto*   req = _writeResultPool.At( id.Index() );
+        if_likely( req != null )
+        {
+            req->Guard().lock_shared();
+
+            if_likely( req->Generation() == id.Generation() )
+                return Shared{ req };
+
+            req->Guard().unlock_shared();
+        }
+        return Default;
+    }
+
+/*
+=================================================
+    _GetReadDS / _GetWriteDS
+=================================================
+*/
+    auto  NetworkStorageClient::_GetReadDS (NetDataSourceID id) __NE___ -> NetRDataSource*
+    {
+        auto*   ds = _readDSPool.At( id.Index() );
+
+        if_likely( ds != null and ds->Generation() == id.Generation() )
+            return ds;
+
+        return null;
+    }
+
+    auto  NetworkStorageClient::_GetWriteDS (NetDataSourceID id) __NE___ -> NetWDataSource*
+    {
+        auto*   ds = _writeDSPool.At( id.Index() );
+
+        if_likely( ds != null and ds->Generation() == id.Generation() )
+            return ds;
+
+        return null;
+    }
+
+/*
+=================================================
+    MsgConsumer::Consume
+=================================================
+*/
+    void  NetworkStorageClient::MsgConsumer::Consume (ChunkList<const CSMessagePtr> msgList) __NE___
+    {
+        for (auto& msg : msgList)
+        {
+            ASSERT( msg->GroupId() == CSMessageGroup::NetVFS );
+            switch ( msg->UniqueId() )
+            {
+                #define CASE( _name_ )      case CSMsg_VFS_ ## _name_::UID :    _client._ ## _name_( *msg->As< CSMsg_VFS_ ## _name_ >() );  break;
+                CASE( OpenForReadResult )
+                CASE( OpenForWriteResult )
+                CASE( CloseReadFile )
+                CASE( CloseWriteFile )
+                CASE( ReadResult )
+                CASE( ReadComplete )
+                CASE( WriteComplete )
+                default :   DBG_WARNING( "unknown message id" ); break;
+                #undef CASE
+            }
+        }
+    }
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorageClient.h b/AE/engine/src/vfs/Network/NetworkStorageClient.h
new file mode 100644
index 00000000..ecc9feea
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorageClient.h
@@ -0,0 +1,310 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/NetworkStorageBase.h"
+
+namespace AE::VFS
+{
+
+    //
+    // Network Storage Client
+    //
+    class NetworkStorageClient final : public NetworkStorageBase
+    {
+    // types
+    public:
+    private:
+        enum class EStatus : ubyte
+        {
+            Initial,
+            Pending,
+            Open,
+            Failed,
+            Closed,
+        };
+
+
+        //
+        // Async Write Block Task
+        //
+        class AsyncWriteBlockTask final : public IAsyncTask
+        {
+        // variables
+        private:
+            const NDSRequestID  _id;
+            const void *        _data;
+            const Bytes         _dataSize;
+            Bytes               _sent;
+            uint                _partIdx    = 0;
+            Bytes               _pos;
+            RC<>                _memRC;             // keep memory alive
+
+        // methods
+        public:
+            AsyncWriteBlockTask (NDSRequestID id, const void* data, Bytes dataSize, Bytes pos, RC<> mem) __NE___ :
+                IAsyncTask{ ETaskQueue::Background },
+                _id{id}, _data{data}, _dataSize{dataSize},
+                _pos{pos}, _memRC{RVRef(mem)}
+            {}
+
+            void        Run ()          __Th_OV;
+            void        OnCancel ()     __NE_OV;
+            StringView  DbgName ()      C_NE_OV { return "AsyncWriteBlockTask"; }
+        };
+
+
+
+        //
+        // Request Protected Pointer
+        //
+        template <typename T>
+        struct Shared : MovableOnly
+        {
+            T*      _req    = null;
+
+            Shared ()                               __NE___ {}
+            explicit Shared (T* req)                __NE___ : _req{req} {}
+            Shared (Shared &&other)                 __NE___ : _req{other._req} { other._req = null; }
+            ~Shared ()                              __NE___ { if_likely( _req ) _req->Guard().unlock_shared(); }
+
+            ND_ T*  operator -> ()                  __NE___ { ASSERT( _req != null );  return _req; }
+            ND_ explicit operator bool ()           C_NE___ { return _req != null; }
+        };
+
+        template <typename T>
+        struct Exclusive : MovableOnly
+        {
+            T*      _req    = null;
+
+            Exclusive ()                            __NE___ {}
+            Exclusive (Exclusive &&other)           __NE___ : _req{other._req} { other._req = null; }
+            explicit Exclusive (T* req)             __NE___ : _req{req} {}
+            explicit Exclusive (Shared<T> &&other)  __NE___ : _req{other._req} { other._req = null;  if_likely( _req ) _req->Guard().shared_to_exclusive(); }
+            ~Exclusive ()                           __NE___ { if_likely( _req ) _req->Guard().unlock(); }
+
+            ND_ T*  operator -> ()                  __NE___ { ASSERT( _req != null );  return _req; }
+            ND_ explicit operator bool ()           C_NE___ { return _req != null; }
+        };
+
+
+
+        //
+        // Request Base
+        //
+        class _RequestBase : public Threading::_hidden_::IAsyncDataSourceRequest
+        {
+        // variables
+        protected:
+            mutable RWSpinLock  _guard;
+            ReqGen_t            _generation {0};
+            Bytes               _pos;
+
+
+        // methods
+        protected:
+            void  _Cleanup ()                               __NE___;
+
+        public:
+            ND_ ReqGen_t        Generation ()               C_NE___ { ASSERT( not _guard.is_unlocked() );  return _generation; }
+            ND_ RWSpinLock&     Guard ()                    __NE___ { return _guard; }
+        };
+
+
+        //
+        // Read Request
+        //
+        class NetReadRequest final : public _RequestBase
+        {
+        // variables
+        private:
+            Bytes       _dataSize;          // requested, actual may be less
+            void*       _data       = null;
+            uint        _partCount  = 0;
+            RC<>        _memRC;             // keep memory alive
+
+
+        // methods
+        public:
+            ND_ bool    Init (Bytes pos, Bytes size, void* data, RC<> mem)      __NE___;
+                void    Complete (Bytes size, HashVal64 hash)                   __NE___;
+                void    Update (ushort partIdx, const void* data, Bytes size)   __NE___;
+
+            // IAsyncDataSourceRequest //
+            Result      GetResult ()                        C_NE_OV;
+            bool        Cancel ()                           __NE_OV;
+            Promise_t   AsPromise (ETaskQueue)              __NE_OV;
+
+        private:
+                void    _ReleaseObject ()                   __NE_OV;
+
+            ND_ ResultWithRC  _GetResult ()                 __NE___;
+        };
+
+
+        //
+        // Write Request
+        //
+        class NetWriteRequest final : public _RequestBase
+        {
+        // variables
+        private:
+            AsyncTask   _task;
+
+
+        // methods
+        public:
+            ND_ bool    Init (AsyncTask task, Bytes pos)    __NE___;
+                void    Complete (Bytes written)            __NE___;
+                void    Failed ()                           __NE___ { Complete( 0_b ); }
+
+            // IAsyncDataSourceRequest //
+            Result      GetResult ()                        C_NE_OV;
+            bool        Cancel ()                           __NE_OV;
+            Promise_t   AsPromise (ETaskQueue)              __NE_OV;
+
+        private:
+                void    _ReleaseObject ()                   __NE_OV;
+
+            ND_ ResultWithRC  _GetResult ()                 __NE___;
+        };
+
+
+        //
+        // Network Async Read-only Data Source
+        //
+        class NetRDataSource final : public AsyncRDataSource
+        {
+        // variables
+        public:
+            Atomic<DSGen_t>         _generation     {0};
+            Atomic<EStatus>         _open           {EStatus::Initial};
+            AtomicByte<Bytes>       _fileSize;
+            Atomic<Index_t>         _index          {~Index_t{0}};
+
+
+        // methods
+        public:
+            ND_ DSGen_t         Generation ()                                                   C_NE___ { return _generation.load(); }
+            ND_ NetDataSourceID ID ()                                                           C_NE___ { return NetDataSourceID{ _index.load(), Generation() }; }
+
+            // AsyncRDataSource //
+            bool            IsOpen ()                                                           C_NE_OV { return AnyEqual( _open.load(), EStatus::Open, EStatus::Pending ); }
+            ESourceType     GetSourceType ()                                                    C_NE_OV;
+            Bytes           Size ()                                                             C_NE_OV { return _fileSize.load(); }
+            ReadRequestPtr  ReadBlock (Bytes pos, void* data, Bytes dataSize, RC<> mem)         __NE_OV;
+            ReadRequestPtr  ReadBlock (Bytes pos, Bytes size)                                   __NE_OV;
+            bool            CancelAllRequests ()                                                __NE_OV;
+
+            // EnableRC //
+            void            _ReleaseObject ()                                                   __NE_OV;
+
+            ND_ bool        _ReadBlockImpl (OUT ReadRequestPtr &, Bytes pos, void* data,
+                                            Bytes dataSize, RC<> mem)                           __NE___;
+        };
+
+
+        //
+        // Network Async Write-only Data Source
+        //
+        class NetWDataSource final : public AsyncWDataSource
+        {
+        // variables
+        public:
+            Atomic<DSGen_t>         _generation     {0};
+            Atomic<EStatus>         _open           {EStatus::Initial};
+            Atomic<Index_t>         _index          {~Index_t{0}};
+
+
+        // methods
+        public:
+            ND_ DSGen_t         Generation ()                                                   C_NE___ { return _generation.load(); }
+            ND_ NetDataSourceID ID ()                                                           C_NE___ { return NetDataSourceID{ _index.load(), Generation() }; }
+
+            // AsyncWDataSource //
+            bool            IsOpen ()                                                           C_NE_OV { return AnyEqual( _open.load(), EStatus::Open, EStatus::Pending ); }
+            ESourceType     GetSourceType ()                                                    C_NE_OV;
+            RC<SharedMem>   Alloc (SizeAndAlign)                                                __NE_OV;
+            WriteRequestPtr WriteBlock (Bytes pos, const void* data, Bytes dataSize, RC<> mem)  __NE_OV;
+            bool            CancelAllRequests ()                                                __NE_OV;
+
+            // EnableRC //
+            void            _ReleaseObject ()                                                   __NE_OV;
+
+            ND_ bool        _WriteBlockImpl (OUT WriteRequestPtr &, Bytes pos, const void* data,
+                                             Bytes dataSize, RC<> mem)                          __NE___;
+        };
+
+
+    private:
+        template <typename T, usize Count>
+        using PoolTmpl              = LfStaticIndexedPool< T, Index_t, Count, GlobalLinearAllocatorRef >;
+
+        using ReadRequestPool_t     = PoolTmpl< NetReadRequest,  _ReqCount >;
+        using WriteRequestPool_t    = PoolTmpl< NetWriteRequest, _ReqCount >;
+        using RDataSourcePool_t     = PoolTmpl< NetRDataSource,  _FileCount >;
+        using WDataSourcePool_t     = PoolTmpl< NetWDataSource,  _FileCount >;
+
+
+        class MsgConsumer final : public ICSMessageConsumer
+        {
+        private:
+            NetworkStorageClient&   _client;
+
+        public:
+            MsgConsumer (NetworkStorageClient &)                __NE___;
+
+            // ICSMessageConsumer //
+            CSMessageGroupID  GetGroupID ()                     C_NE_OV { return CSMessageGroup::NetVFS; }
+            void  Consume (ChunkList<const CSMessagePtr>)       __NE_OV;
+        };
+
+
+    // variables
+    private:
+        StaticRC<MsgConsumer>   _msgConsumer;
+
+        ReadRequestPool_t       _readResultPool;
+        WriteRequestPool_t      _writeResultPool;
+
+        RDataSourcePool_t       _readDSPool;
+        WDataSourcePool_t       _writeDSPool;
+
+
+    // methods
+    public:
+        NetworkStorageClient ()                                             __NE___;
+        ~NetworkStorageClient ()                                            __NE___;
+
+        ND_ auto  OpenForRead (FileNameRef name)                            __NE___ -> RC<AsyncRDataSource>;
+        ND_ auto  OpenForWrite (FileNameRef name)                           __NE___ -> RC<AsyncWDataSource>;
+
+        ND_ ICSMessageProducer&  GetMessageProducer ()                      __NE___ { return *_msgProducer; }
+        ND_ ICSMessageConsumer&  GetMessageConsumer ()                      __NE___ { return *_msgConsumer; }
+
+
+    private:
+        ND_ auto  _GetReadReq (NDSRequestID id)                             __NE___ -> Shared<NetReadRequest>;
+        ND_ auto  _GetWriteReq (NDSRequestID id)                            __NE___ -> Shared<NetWriteRequest>;
+
+        ND_ auto  _GetReadDS (NetDataSourceID id)                           __NE___ -> NetRDataSource*;
+        ND_ auto  _GetWriteDS (NetDataSourceID id)                          __NE___ -> NetWDataSource*;
+
+    private:
+        void  _OpenForReadResult (CSMsg_VFS_OpenForReadResult const&)       __NE___;
+        void  _OpenForWriteResult (CSMsg_VFS_OpenForWriteResult const&)     __NE___;
+
+        void  _CloseReadFile (CSMsg_VFS_CloseReadFile const&)               __NE___;
+        void  _CloseWriteFile (CSMsg_VFS_CloseWriteFile const&)             __NE___;
+
+        void  _ReadResult (CSMsg_VFS_ReadResult const&)                     __NE___;
+        void  _ReadComplete (CSMsg_VFS_ReadComplete const&)                 __NE___;
+
+        void  _WriteComplete (CSMsg_VFS_WriteComplete const&)               __NE___;
+    };
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorageServer.cpp b/AE/engine/src/vfs/Network/NetworkStorageServer.cpp
new file mode 100644
index 00000000..cf531a3c
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorageServer.cpp
@@ -0,0 +1,463 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/NetworkStorageServer.h"
+
+namespace AE::VFS
+{
+    INTERNAL_LINKAGE( Ptr<NetworkStorageServer>  s_NetVFS );
+
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    SendReadResultTask::Run
+=================================================
+*/
+    void  NetworkStorageServer::SendReadResultTask::Run () __Th___
+    {
+        auto    res = _req->GetResult();
+
+        for (uint i = 0; (i < _maxParts) and (res.dataSize > _sent); ++i)
+        {
+            const Bytes size    = Min( res.dataSize - _sent, _partSize );
+            auto        msg     = s_NetVFS->_CreateMsgOpt< CSMsg_VFS_ReadResult >( size-1 );
+
+            if_likely( msg )
+            {
+                msg->reqId  = _id;
+                msg->size   = size;
+                msg->index  = ushort(_partIdx);
+                MemCopy( OUT msg->data, res.data + _sent, size );
+
+                if_likely( s_NetVFS->_AddMessage( msg ))
+                {
+                    _sent += size;
+                    _partIdx ++;
+                    continue;
+                }
+            }
+            break;
+        }
+
+        if ( res.dataSize > _sent )
+            return Continue();  // try again
+
+        ASSERT( res.dataSize == _sent );
+
+        // complete
+        auto    msg = s_NetVFS->_CreateMsgOpt< CSMsg_VFS_ReadComplete >();
+        if_likely( msg )
+        {
+            msg->reqId  = _id;
+            msg->size   = res.dataSize;
+            msg->hash   = XXHash64( res.data, usize(res.dataSize) );
+
+            if_likely( s_NetVFS->_AddMessage( msg ))
+            {
+                _req = null;
+                return;  // complete
+            }
+        }
+
+        return Continue();  // try again
+    }
+
+/*
+=================================================
+    SendReadResultTask::OnCancel
+=================================================
+*/
+    void  NetworkStorageServer::SendReadResultTask::OnCancel () __NE___
+    {
+        DEBUG_ONLY( IAsyncTask::OnCancel();)
+        AE_LOGI( "failed to read data" );
+
+        _req = null;
+
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_ReadComplete >();
+        CHECK_ERRV( msg );
+
+        msg->reqId  = _id;
+        msg->size   = 0_b;  // error
+        msg->hash   = HashVal64{0};
+
+        CHECK( s_NetVFS->_AddMessage( msg ));
+    }
+//-----------------------------------------------------------------------------
+
+
+
+/*
+=================================================
+    constructor
+=================================================
+*/
+    NetworkStorageServer::MsgConsumer::MsgConsumer (NetworkStorageServer &s) __NE___ :
+        _server{s}
+    {}
+
+    NetworkStorageServer::NetworkStorageServer () __NE___ :
+        _msgConsumer{ *this },
+        _readDSPool{ new NetRDataSource[_FileCount] },
+        _writeDSPool{ new NetWDataSource[_FileCount] },
+        _writeReqPool{ new NetWriteRequest[_ReqCount] }
+    {
+        CHECK_FATAL( s_NetVFS == null );
+        s_NetVFS = this;
+    }
+
+/*
+=================================================
+    destructor
+=================================================
+*/
+    NetworkStorageServer::~NetworkStorageServer () __NE___
+    {
+        if ( _readDSPool )
+        {
+            for (uint i = 0; i < _FileCount; ++i)
+            {
+                CHECK( _readDSPool[i].gen == 0 );
+                CHECK( _readDSPool[i].ds == null );
+            }
+        }
+        if ( _writeDSPool )
+        {
+            for (uint i = 0; i < _FileCount; ++i)
+            {
+                CHECK( _writeDSPool[i].gen == 0 );
+                CHECK( _writeDSPool[i].ds == null );
+            }
+        }
+
+        s_NetVFS = null;
+    }
+
+/*
+=================================================
+    _OpenForReadRequest
+=================================================
+*/
+    inline void  NetworkStorageServer::_OpenForReadRequest (CSMsg_VFS_OpenForReadRequest const& inMsg) __NE___
+    {
+        CHECK_ERRV( inMsg.fileId.Index() < _FileCount );
+
+        auto    out_msg = _CreateMsg< CSMsg_VFS_OpenForReadResult >();
+        CHECK_ERRV( out_msg );
+
+        out_msg->ok     = false;
+        out_msg->fileId = inMsg.fileId;
+
+        [this, &inMsg, &out_msg] ()
+        {{
+            auto    ds  = GetVFS().Open<AsyncRDataSource>( FileName{inMsg.name} );
+            CHECK_ERRV( ds );
+
+            out_msg->ok     = true;
+            out_msg->size   = ds->Size();
+
+            auto&   dst = _readDSPool[ inMsg.fileId.Index() ];
+            ASSERT( dst.gen == 0 );
+            dst.gen = inMsg.fileId.Generation();
+            dst.ds  = RVRef(ds);
+        }}();
+
+        if_unlikely( not _AddMessage( out_msg ))
+        {
+            // cleanup
+            auto&   dst = _readDSPool[ inMsg.fileId.Index() ];
+            dst.ds = null;
+
+            DBG_WARNING( "failed to add message" );
+        }
+    }
+
+/*
+=================================================
+    _OpenForWriteRequest
+=================================================
+*/
+    inline void  NetworkStorageServer::_OpenForWriteRequest (CSMsg_VFS_OpenForWriteRequest const& inMsg) __NE___
+    {
+        CHECK_ERRV( inMsg.fileId.Index() < _FileCount );
+
+        auto    out_msg = _CreateMsg< CSMsg_VFS_OpenForWriteResult >();
+        CHECK_ERRV( out_msg );
+
+        out_msg->ok     = false;
+        out_msg->fileId = inMsg.fileId;
+
+        [this, &inMsg, &out_msg] ()
+        {{
+            auto    ds  = GetVFS().Open<AsyncWDataSource>( FileName{inMsg.name} );
+            CHECK_ERRV( ds );
+
+            out_msg->ok = true;
+
+            auto&   dst = _writeDSPool[ inMsg.fileId.Index() ];
+            ASSERT( dst.gen == 0 );
+            dst.gen = inMsg.fileId.Generation();
+            dst.ds  = RVRef(ds);
+        }}();
+
+        if_unlikely( not _AddMessage( out_msg ))
+        {
+            // cleanup
+            auto&   dst = _writeDSPool[ inMsg.fileId.Index() ];
+            dst.ds = null;
+
+            DBG_WARNING( "failed to add message" );
+        }
+    }
+
+/*
+=================================================
+    _CloseReadFile / _CloseWriteFile
+=================================================
+*/
+    inline void  NetworkStorageServer::_CloseReadFile (CSMsg_VFS_CloseReadFile const& msg) __NE___
+    {
+        auto*   dst = _GetReadDS( msg.fileId );
+        if_likely( dst != null )
+        {
+            ASSERT( dst->ds );
+            dst->ds  = null;
+            dst->gen = 0;
+        }
+    }
+
+    inline void  NetworkStorageServer::_CloseWriteFile (CSMsg_VFS_CloseWriteFile const& msg) __NE___
+    {
+        auto*   dst = _GetWriteDS( msg.fileId );
+        if_likely( dst != null )
+        {
+            // write request will keep ref to 'ds' until complete
+            ASSERT( dst->ds );
+            dst->ds  = null;
+            dst->gen = 0;
+        }
+    }
+
+/*
+=================================================
+    _CancelAllReadRequests / _CancelAllWriteRequests
+=================================================
+*/
+    inline void  NetworkStorageServer::_CancelAllReadRequests (CSMsg_VFS_CancelAllReadRequests const& msg) __NE___
+    {
+        auto*   dst = _GetReadDS( msg.fileId );
+        if_likely( dst != null )
+        {
+            dst->ds->CancelAllRequests();
+        }
+    }
+
+    inline void  NetworkStorageServer::_CancelAllWriteRequests (CSMsg_VFS_CancelAllWriteRequests const& msg) __NE___
+    {
+        auto*   dst = _GetWriteDS( msg.fileId );
+        if_likely( dst != null )
+        {
+            dst->ds->CancelAllRequests();
+        }
+    }
+
+/*
+=================================================
+    _ReadRequest
+=================================================
+*/
+    inline void  NetworkStorageServer::_ReadRequest (CSMsg_VFS_ReadRequest const& inMsg) __NE___
+    {
+        auto*   dst = _GetReadDS( inMsg.fileId );
+
+        if_unlikely( dst == null )
+        {
+            AE_LOGI( "failed to find file" );
+
+            auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_ReadComplete >();
+            CHECK_ERRV( msg );
+
+            msg->reqId  = inMsg.reqId;
+            msg->size   = 0_b;  // error
+            msg->hash   = HashVal64{0};
+
+            CHECK( s_NetVFS->_AddMessage( msg ));
+            return;
+        }
+
+        auto    req = dst->ds->ReadBlock( inMsg.pos, inMsg.size );
+
+        Scheduler().Run<SendReadResultTask>( Tuple{ inMsg.reqId, req }, Tuple{req} );
+    }
+
+/*
+=================================================
+    _WriteRequestComplete
+=================================================
+*/
+    inline void  NetworkStorageServer::_WriteRequestComplete (NDSRequestID reqId, Bytes written) __NE___
+    {
+        auto    msg = s_NetVFS->_CreateMsg< CSMsg_VFS_WriteComplete >();
+        CHECK_ERRV( msg );
+
+        msg->reqId  = reqId;
+        msg->size   = written;
+
+        CHECK( s_NetVFS->_AddMessage( msg ));
+    }
+
+/*
+=================================================
+    _WriteBegin
+=================================================
+*/
+    inline void  NetworkStorageServer::_WriteBegin (CSMsg_VFS_WriteBegin const& inMsg) __NE___
+    {
+        CHECK_ERRV( inMsg.fileId.Index() < _FileCount );
+        CHECK_ERRV( inMsg.reqId.Index()  < _ReqCount );
+
+        auto*   dst = _GetWriteDS( inMsg.fileId );
+        if_unlikely( dst == null )
+        {
+            AE_LOGI( "failed to find file" );
+            _WriteRequestFailed( inMsg.reqId );
+            return;
+        }
+
+        auto    mem = dst->ds->Alloc( inMsg.size );
+        if_unlikely( not mem )
+        {
+            AE_LOGI( "failed to allocate dst memory" );
+            _WriteRequestFailed( inMsg.reqId );
+            return;
+        }
+
+        auto&   req = _writeReqPool[ inMsg.reqId.Index() ];
+        ASSERT( req.gen == 0 );
+
+        req.gen     = inMsg.reqId.Generation();
+        req.dst     = RVRef(mem);
+        req.recv    = 0_b;
+        req.partIdx = 0;
+        req.fileId  = inMsg.fileId;
+    }
+
+/*
+=================================================
+    _WritePart
+=================================================
+*/
+    inline void  NetworkStorageServer::_WritePart (CSMsg_VFS_WritePart const& inMsg) __NE___
+    {
+        CHECK_ERRV( inMsg.reqId.Index() < _ReqCount );
+
+        auto&   req = _writeReqPool[ inMsg.reqId.Index() ];
+
+        if_unlikely( req.gen != inMsg.reqId.Generation()    or
+                     ushort(req.partIdx) != inMsg.index     or  // invalid order
+                     not req.dst                            or
+                     req.recv + inMsg.size > req.dst->Size() )
+        {
+            _WriteRequestFailed( inMsg.reqId );
+            return;
+        }
+
+        MemCopy( OUT req.dst->Data() + req.recv, inMsg.data, inMsg.size );
+        req.partIdx ++;
+        req.recv += inMsg.size;
+    }
+
+/*
+=================================================
+    _WriteEnd
+=================================================
+*/
+    inline void  NetworkStorageServer::_WriteEnd (CSMsg_VFS_WriteEnd const& inMsg) __NE___
+    {
+        CHECK_ERRV( inMsg.reqId.Index() < _ReqCount );
+
+        auto&   req = _writeReqPool[ inMsg.reqId.Index() ];
+        CHECK_ERRV( req.gen == inMsg.reqId.Generation() );
+
+        const HashVal64 hash = XXHash64( req.dst->Data(), usize{req.dst->Size()} );
+        auto*           file = _GetWriteDS( req.fileId );
+
+        if_unlikely( hash != inMsg.hash or
+                     file == null       or
+                     file->ds == null )
+        {
+            _WriteRequestFailed( inMsg.reqId );
+            return;
+        }
+
+        file->ds->WriteBlock( inMsg.pos, req.recv, RVRef(req.dst) )->AsPromise( ETaskQueue::Background )
+            .Then(  [req_id = inMsg.reqId] (const AsyncWDataSource::Result_t &res)
+                    {
+                        if ( s_NetVFS )
+                            s_NetVFS->_WriteRequestComplete( req_id, res.dataSize );
+                    });
+    }
+
+/*
+=================================================
+    MsgConsumer::Consume
+=================================================
+*/
+    void  NetworkStorageServer::MsgConsumer::Consume (ChunkList<const CSMessagePtr> msgList) __NE___
+    {
+        for (auto& msg : msgList)
+        {
+            ASSERT( msg->GroupId() == CSMessageGroup::NetVFS );
+            switch ( msg->UniqueId() )
+            {
+                #define CASE( _name_ )      case CSMsg_VFS_ ## _name_::UID :    _server._ ## _name_( *msg->As< CSMsg_VFS_ ## _name_ >() );  break;
+                CASE( OpenForReadRequest )
+                CASE( OpenForWriteRequest )
+                CASE( CloseReadFile )
+                CASE( CloseWriteFile )
+                CASE( CancelAllReadRequests )
+                CASE( CancelAllWriteRequests )
+                CASE( ReadRequest )
+                CASE( WriteBegin )
+                CASE( WritePart )
+                CASE( WriteEnd )
+                default :   DBG_WARNING( "unknown message id" ); break;
+                #undef CASE
+            }
+        }
+    }
+
+/*
+=================================================
+    _GetReadDS / _GetWriteDS
+=================================================
+*/
+    NetworkStorageServer::NetRDataSource*  NetworkStorageServer::_GetReadDS (NetDataSourceID id) __NE___
+    {
+        if_likely( id.Index() < _FileCount )
+        {
+            auto&   dst = _readDSPool[ id.Index() ];
+            ASSERT( dst.gen == id.Generation() );
+            return dst.gen == id.Generation() ? &dst : null;
+        }
+        return null;
+    }
+
+    NetworkStorageServer::NetWDataSource*  NetworkStorageServer::_GetWriteDS (NetDataSourceID id) __NE___
+    {
+        if_likely( id.Index() < _FileCount )
+        {
+            auto&   dst = _writeDSPool[ id.Index() ];
+            ASSERT( dst.gen == id.Generation() );
+            return dst.gen == id.Generation() ? &dst : null;
+        }
+        return null;
+    }
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/Network/NetworkStorageServer.h b/AE/engine/src/vfs/Network/NetworkStorageServer.h
new file mode 100644
index 00000000..fd72bab2
--- /dev/null
+++ b/AE/engine/src/vfs/Network/NetworkStorageServer.h
@@ -0,0 +1,127 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#ifdef AE_ENABLE_NETWORKING
+# include "vfs/Network/NetworkStorageBase.h"
+
+namespace AE::VFS
+{
+
+    //
+    // Network Storage Server
+    //
+    class NetworkStorageServer final : public NetworkStorageBase
+    {
+    // types
+    private:
+        struct NetWriteRequest
+        {
+            RC<SharedMem>           dst;
+            DSGen_t                 gen {0};
+            Byte32u                 recv;
+            uint                    partIdx {0};
+            NetDataSourceID         fileId;
+        };
+
+        struct NetRDataSource
+        {
+            DSGen_t                 gen {0};
+            RC<AsyncRDataSource>    ds;
+        };
+
+        struct NetWDataSource
+        {
+            DSGen_t                 gen {0};
+            RC<AsyncWDataSource>    ds;
+        };
+
+        using WRequestPool_t        = Unique< NetWriteRequest []>;  // [_ReqCount]
+        using RDataSourcePool_t     = Unique< NetRDataSource []>;   // [_FileCount]
+        using WDataSourcePool_t     = Unique< NetWDataSource []>;   // [_FileCount]
+
+
+        class MsgConsumer final : public ICSMessageConsumer
+        {
+        private:
+            NetworkStorageServer&   _server;
+
+        public:
+            MsgConsumer (NetworkStorageServer &)                __NE___;
+
+            // ICSMessageConsumer //
+            CSMessageGroupID  GetGroupID ()                     C_NE_OV { return CSMessageGroup::NetVFS; }
+            void  Consume (ChunkList<const CSMessagePtr>)       __NE_OV;
+        };
+
+
+        class SendReadResultTask final : public IAsyncTask
+        {
+        // variables
+        private:
+            const NDSRequestID  _id;
+            AsyncDSRequest      _req;
+            Bytes               _sent;
+            uint                _partIdx    = 0;
+
+        // methods
+        public:
+            SendReadResultTask (NDSRequestID id, AsyncDSRequest req)    __NE___ :
+                IAsyncTask{ ETaskQueue::Background },
+                _id{id}, _req{ RVRef(req) }
+            {}
+
+            void  Run ()            __Th_OV;
+            void  OnCancel ()       __NE_OV;
+
+            StringView  DbgName ()  C_NE_OV { return "SendReadResultTask"; }
+        };
+
+
+    // variables
+    private:
+        StaticRC<MsgConsumer>   _msgConsumer;
+
+        RDataSourcePool_t       _readDSPool;    // -.
+        WDataSourcePool_t       _writeDSPool;   //  |-- used in single thread
+                                                //  |
+        WRequestPool_t          _writeReqPool;  // -'
+
+
+    // methods
+    public:
+        NetworkStorageServer ()                                                 __NE___;
+        ~NetworkStorageServer ()                                                __NE___;
+
+        ND_ ICSMessageProducer&  GetMessageProducer ()                          __NE___ { return *_msgProducer; }
+        ND_ ICSMessageConsumer&  GetMessageConsumer ()                          __NE___ { return *_msgConsumer; }
+
+
+    private:
+        ND_ NetRDataSource*     _GetReadDS (NetDataSourceID id)                 __NE___;
+        ND_ NetWDataSource*     _GetWriteDS (NetDataSourceID id)                __NE___;
+
+        void  _WriteRequestComplete (NDSRequestID id, Bytes written)            __NE___;
+        void  _WriteRequestFailed (NDSRequestID id)                             __NE___ { _WriteRequestComplete( id, 0_b ); }
+
+    private:
+        void  _OpenForReadRequest (CSMsg_VFS_OpenForReadRequest const&)         __NE___;
+        void  _OpenForWriteRequest (CSMsg_VFS_OpenForWriteRequest const&)       __NE___;
+
+        void  _CloseReadFile (CSMsg_VFS_CloseReadFile const&)                   __NE___;
+        void  _CloseWriteFile (CSMsg_VFS_CloseWriteFile const&)                 __NE___;
+
+        void  _CancelAllReadRequests (CSMsg_VFS_CancelAllReadRequests const&)   __NE___;
+        void  _CancelAllWriteRequests (CSMsg_VFS_CancelAllWriteRequests const&) __NE___;
+
+        void  _ReadRequest (CSMsg_VFS_ReadRequest const&)                       __NE___;
+
+        void  _WriteBegin (CSMsg_VFS_WriteBegin const&)                         __NE___;
+        void  _WritePart (CSMsg_VFS_WritePart const&)                           __NE___;
+        void  _WriteEnd (CSMsg_VFS_WriteEnd const&)                             __NE___;
+    };
+
+
+} // AE::VFS
+
+#endif // AE_ENABLE_NETWORKING
diff --git a/AE/engine/src/vfs/VirtualFileSystem.cpp b/AE/engine/src/vfs/VirtualFileSystem.cpp
index 601d8a77..0acebb2a 100644
--- a/AE/engine/src/vfs/VirtualFileSystem.cpp
+++ b/AE/engine/src/vfs/VirtualFileSystem.cpp
@@ -20,22 +20,17 @@ namespace AE::VFS
 
 /*
 =================================================
-    CreateInstance
+    InstanceCtor
 =================================================
 */
-    void  VirtualFileSystem::CreateInstance () __NE___
+    void  VirtualFileSystem::InstanceCtor::Create () __NE___
     {
         s_VirtualFileSystem.Create();
 
         MemoryBarrier( EMemoryOrder::Release );
     }
 
-/*
-=================================================
-    DestroyInstance
-=================================================
-*/
-    void  VirtualFileSystem::DestroyInstance () __NE___
+    void  VirtualFileSystem::InstanceCtor::Destroy () __NE___
     {
         MemoryBarrier( EMemoryOrder::Acquire );
 
@@ -50,29 +45,44 @@ namespace AE::VFS
 =================================================
 */
     bool  VirtualFileSystem::AddStorage (const StorageName &name, RC<IVirtualFileStorage> storage) __NE___
+    {
+        return _AddStorage( StorageName::Optimized_t{name}, RVRef(storage) );
+    }
+
+    bool  VirtualFileSystem::AddStorage (RC<IVirtualFileStorage> storage) __NE___
     {
         DRC_EXLOCK( _drCheck );
-        CHECK_ERR( storage );
 
-        CHECK_ERR( _storageMap.emplace( StorageName::Optimized_t{name}, storage ).second );
+        StorageName::Optimized_t    st_name {HashVal32{uint(_storageMap.size())}};
 
-        CATCH_ERR( storage->_Append( INOUT _globalMap );)
-        return true;
+        return _AddStorage( st_name, RVRef(storage) );
     }
 
-    bool  VirtualFileSystem::AddStorage (RC<IVirtualFileStorage> storage) __NE___
+    bool  VirtualFileSystem::_AddStorage (StorageName::Optimized_t name, RC<IVirtualFileStorage> storage) __NE___
     {
         DRC_EXLOCK( _drCheck );
-        CHECK_ERR( storage );
+        CHECK_ERR( not _isImmutable.load() );
 
-        StorageName::Optimized_t    st_name {HashVal32{uint(_storageMap.size())}};
+        CHECK_ERR( storage );
 
-        CHECK_ERR( _storageMap.emplace( st_name, storage ).second );
+        auto [it, inserted] = _storageMap.emplace( name, RVRef(storage) );
+        CHECK_ERR( inserted );
 
-        CATCH_ERR( storage->_Append( INOUT _globalMap );)
+        NOTHROW_ERR( it->second->_Append( INOUT _globalMap );)
         return true;
     }
 
+/*
+=================================================
+    MakeImmutable
+=================================================
+*/
+    bool  VirtualFileSystem::MakeImmutable () __NE___
+    {
+        DRC_EXLOCK( _drCheck );
+        return not _isImmutable.exchange( true );
+    }
+
 /*
 =================================================
     Open
@@ -107,17 +117,17 @@ namespace AE::VFS
 
     bool  VirtualFileSystem::Open (OUT RC<WStream> &stream, FileNameRef name) C_NE___
     {
-        return _OpenForRead( OUT stream, name );
+        return _OpenForWrite( OUT stream, name );
     }
 
     bool  VirtualFileSystem::Open (OUT RC<WDataSource> &ds, FileNameRef name) C_NE___
     {
-        return _OpenForRead( OUT ds, name );
+        return _OpenForWrite( OUT ds, name );
     }
 
     bool  VirtualFileSystem::Open (OUT RC<AsyncWDataSource> &ds, FileNameRef name) C_NE___
     {
-        return _OpenForRead( OUT ds, name );
+        return _OpenForWrite( OUT ds, name );
     }
 
     bool  VirtualFileSystem::Open (OUT RC<AsyncWStream> &stream, FileNameRef name) C_NE___
@@ -140,7 +150,7 @@ namespace AE::VFS
     template <typename ResultType>
     bool  VirtualFileSystem::_OpenForRead (OUT ResultType &result, FileNameRef name) C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        CHECK_ERR( _isImmutable.load() );
 
         // find in global map
         {
@@ -155,7 +165,7 @@ namespace AE::VFS
                     for (auto& st : _storageMap.GetValueArray()) {
                         found |= (st.get() == iter->second.storage);
                     }
-                    ASSERT( found );
+                    ASSERT_MSG( found, "memory corruption - iterator contains pointer to storage which is not exists" );
                 )
 
                 return iter->second.storage->_OpenByIter( OUT result, name, iter->second.ref );
@@ -183,7 +193,7 @@ namespace AE::VFS
     template <typename ResultType>
     bool  VirtualFileSystem::_OpenForWrite (OUT ResultType &result, FileNameRef name) C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        CHECK_ERR( _isImmutable.load() );
 
         // find in global map
         {
@@ -198,7 +208,7 @@ namespace AE::VFS
                     for (auto& st : _storageMap.GetValueArray()) {
                         found |= (st.get() == iter->second.storage);
                     }
-                    ASSERT( found );
+                    ASSERT_MSG( found, "memory corruption - iterator contains pointer to storage which is not exists" );
                 )
 
                 return iter->second.storage->_OpenByIter( OUT result, name, iter->second.ref );
@@ -225,7 +235,7 @@ namespace AE::VFS
 */
     bool  VirtualFileSystem::Exists (FileNameRef name) C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        CHECK_ERR( _isImmutable.load() );
 
         // find in global map
         {
@@ -251,7 +261,7 @@ namespace AE::VFS
 */
     bool  VirtualFileSystem::Exists (FileGroupNameRef name) C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        CHECK_ERR( _isImmutable.load() );
 
         for (auto& st : _storageMap.GetValueArray())
         {
@@ -267,9 +277,9 @@ namespace AE::VFS
     CreateFile
 =================================================
 */
-    bool  VirtualFileSystem::CreateFile (const StorageName &stName, OUT FileName &name, const Path &path) C_NE___
+    bool  VirtualFileSystem::CreateFile (OUT FileName &name, const Path &path, const StorageName &stName) C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        CHECK_ERR( _isImmutable.load() );
 
         auto    it = _storageMap.find( stName );
         CHECK_ERR( it != _storageMap.end() );
@@ -282,9 +292,9 @@ namespace AE::VFS
     CreateUniqueFile
 =================================================
 */
-    bool  VirtualFileSystem::CreateUniqueFile (const StorageName &stName, OUT FileName &name, INOUT Path &path) C_NE___
+    bool  VirtualFileSystem::CreateUniqueFile (OUT FileName &name, INOUT Path &path, const StorageName &stName) C_NE___
     {
-        DRC_SHAREDLOCK( _drCheck );
+        CHECK_ERR( _isImmutable.load() );
 
         auto    it = _storageMap.find( stName );
         CHECK_ERR( it != _storageMap.end() );
diff --git a/AE/engine/src/vfs/VirtualFileSystem.h b/AE/engine/src/vfs/VirtualFileSystem.h
index b1020ad9..d00e89ac 100644
--- a/AE/engine/src/vfs/VirtualFileSystem.h
+++ b/AE/engine/src/vfs/VirtualFileSystem.h
@@ -8,10 +8,10 @@
 ----
 
     RStream, RDataSource, AsyncRDataSource
-        Thread-safe:    depends on implementation
+        Thread-safe:    depends on implementation, use 'IsThreadSafe()' method.
 
     WStream, WDataSource, AsyncWDataSource
-        Thread-safe:    depends on implementation
+        Thread-safe:    depends on implementation, use 'IsThreadSafe()' method.
 
     IVirtualFileStorage
         Thread-safe:    yes (interface methods only)
@@ -20,7 +20,7 @@
         Thread-safe:    yes (const methods only)
 ----
 
-    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/VirtualFileSystem.md)
+    [docs](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/VirtualFileSystem-ru.md)
 */
 
 #pragma once
@@ -32,18 +32,6 @@ namespace AE { VFS::VirtualFileSystem&  GetVFS () __NE___; }
 namespace AE::VFS
 {
 
-    /*enum class EVFStorageType : uint
-    {
-        Unknown     = 0,
-        Dynamic     = 1 << 0,       // allows to create files and rewrite existing, by default all storages are static
-        Remote      = 1 << 1,       // removable disk, network, etc
-        Cache       = 1 << 2,       // files may be lost
-        Temporary   = 1 << 3,       // files will be deleted at exit
-    };
-    AE_BIT_OPERATORS( EVFStorageType );*/
-
-
-
     //
     // Virtual File System Storage interface
     //
@@ -61,6 +49,7 @@ namespace AE::VFS
 
         using GlobalFileMap_t   = FlatHashMap< FileName::Optimized_t, GlobalFileRef >;
 
+    public:
       #if AE_OPTIMIZE_IDS
         using FileNameRef       = FileName::Optimized_t;
         using FileGroupNameRef  = FileGroupName::Optimized_t;
@@ -76,12 +65,12 @@ namespace AE::VFS
         ND_ virtual bool  Open (OUT RC<RDataSource> &ds, FileNameRef name)                                  C_NE___ = 0;
         ND_ virtual bool  Open (OUT RC<AsyncRDataSource> &ds, FileNameRef name)                             C_NE___ = 0;
 
-        ND_ virtual bool  Open (OUT RC<WStream> &stream, FileNameRef name)                                  C_NE___ { Unused( stream, name );  return false; }
-        ND_ virtual bool  Open (OUT RC<WDataSource> &ds, FileNameRef name)                                  C_NE___ { Unused( ds, name );  return false; }
-        ND_ virtual bool  Open (OUT RC<AsyncWDataSource> &ds, FileNameRef name)                             C_NE___ { Unused( ds, name );  return false; }
+        ND_ virtual bool  Open (OUT RC<WStream> &stream, FileNameRef name)                                  C_NE___ { Unused( stream, name );   return false; }
+        ND_ virtual bool  Open (OUT RC<WDataSource> &ds, FileNameRef name)                                  C_NE___ { Unused( ds, name );       return false; }
+        ND_ virtual bool  Open (OUT RC<AsyncWDataSource> &ds, FileNameRef name)                             C_NE___ { Unused( ds, name );       return false; }
 
-        ND_ virtual bool  CreateFile (OUT FileName &name, const Path &path)                                 C_NE___ { Unused( name, path );  return false; }
-        ND_ virtual bool  CreateUniqueFile (OUT FileName &name, INOUT Path &path)                           C_NE___ { Unused( name, path );  return false; }
+        ND_ virtual bool  CreateFile (OUT FileName &name, const Path &path)                                 C_NE___ { Unused( name, path );     return false; }
+        ND_ virtual bool  CreateUniqueFile (OUT FileName &name, INOUT Path &path)                           C_NE___ { Unused( name, path );     return false; }
 
         ND_ virtual bool  Exists (FileNameRef name)                                                         C_NE___ = 0;
         ND_ virtual bool  Exists (FileGroupNameRef name)                                                    C_NE___ = 0;
@@ -95,8 +84,8 @@ namespace AE::VFS
         ND_ virtual bool  _OpenByIter (OUT RC<AsyncRDataSource> &ds, FileNameRef name, const void* ref)     C_NE___ = 0;
 
         ND_ virtual bool  _OpenByIter (OUT RC<WStream> &stream, FileNameRef name, const void* ref)          C_NE___ { Unused( stream, name, ref );  return false; }
-        ND_ virtual bool  _OpenByIter (OUT RC<WDataSource> &ds, FileNameRef name, const void* ref)          C_NE___ { Unused( ds, name, ref );  return false; }
-        ND_ virtual bool  _OpenByIter (OUT RC<AsyncWDataSource> &ds, FileNameRef name, const void* ref)     C_NE___ { Unused( ds, name, ref );  return false; }
+        ND_ virtual bool  _OpenByIter (OUT RC<WDataSource> &ds, FileNameRef name, const void* ref)          C_NE___ { Unused( ds, name, ref );      return false; }
+        ND_ virtual bool  _OpenByIter (OUT RC<AsyncWDataSource> &ds, FileNameRef name, const void* ref)     C_NE___ { Unused( ds, name, ref );      return false; }
     };
 
 
@@ -114,31 +103,44 @@ namespace AE::VFS
         using FileNameRef       = IVirtualFileStorage::FileNameRef;
         using FileGroupNameRef  = IVirtualFileStorage::FileGroupNameRef;
 
-        using StorageArray_t    = FixedMap< StorageName::Optimized_t, RC<IVirtualFileStorage>, 16 >;
+        using StorageArray_t    = FixedMap< StorageName::Optimized_t, RC<IVirtualFileStorage>, 8 >;
+
+    public:
+        class InstanceCtor {
+        public:
+            static void  Create ()  __NE___;
+            static void  Destroy () __NE___;
+        };
 
 
     // variables
     private:
-        GlobalFileMap_t             _globalMap;
-        StorageArray_t              _storageMap;
+        Atomic<bool>                _isImmutable    {false};
+
+        GlobalFileMap_t             _globalMap;     // \__ immutable if '_isImmutable' is 'true'.
+        StorageArray_t              _storageMap;    // /
 
         DRC_ONLY( RWDataRaceCheck   _drCheck;)
 
 
     // methods
     public:
-            static void  CreateInstance ()                                                      __NE___;
-            static void  DestroyInstance ()                                                     __NE___;
 
         // Add VF storage to the VFS.
         // All static files will be added to the global map.
         // FileName hash must be unique for all files in the VFS.
-        // Must be externally synchronized with 'Open()' and 'Exists()' methods.
         //
         ND_ bool  AddStorage (const StorageName &name, RC<IVirtualFileStorage> storage)         __NE___;
         ND_ bool  AddStorage (RC<IVirtualFileStorage> storage)                                  __NE___;
 
 
+        // VFS has 2 stages:
+        //  1 - mutable: you can add storage, but can not open files.
+        //  2 - immutable: you can open files for read/write, but can not add new storages.
+        //
+            bool  MakeImmutable ()                                                              __NE___;
+
+
         ND_ bool  Open (OUT RC<RStream> &stream, FileNameRef name)                              C_NE___;
         ND_ bool  Open (OUT RC<RDataSource> &ds, FileNameRef name)                              C_NE___;
         ND_ bool  Open (OUT RC<AsyncRDataSource> &ds, FileNameRef name)                         C_NE___;
@@ -152,13 +154,13 @@ namespace AE::VFS
         template <typename T>
         ND_ RC<T>  Open (FileNameRef name)                                                      C_NE___;
 
-        ND_ bool  CreateFile (const StorageName &storage,
-                              OUT FileName      &name,
-                              const Path        &path)                                          C_NE___;
+        ND_ bool  CreateFile (OUT FileName      &name,
+                              const Path        &path,
+                              const StorageName &storage)                                       C_NE___;
 
-        ND_ bool  CreateUniqueFile (const StorageName   &storage,
-                                    OUT FileName        &name,
-                                    INOUT Path          &path)                                  C_NE___;
+        ND_ bool  CreateUniqueFile (OUT FileName        &name,
+                                    INOUT Path          &path,
+                                    const StorageName   &storage)                               C_NE___;
 
         ND_ bool  Exists (FileNameRef name)                                                     C_NE___;
         ND_ bool  Exists (FileGroupNameRef name)                                                C_NE___;
@@ -168,6 +170,8 @@ namespace AE::VFS
         VirtualFileSystem ()                                                                    __NE___ {}
         ~VirtualFileSystem ()                                                                   __NE___ {}
 
+        ND_ bool  _AddStorage (StorageName::Optimized_t name, RC<IVirtualFileStorage>)          __NE___;
+
         template <typename ResultType>
         ND_ bool  _OpenForRead (OUT ResultType &, FileNameRef name)                             C_NE___;
 
@@ -190,9 +194,10 @@ namespace AE::VFS
         ND_ static RC<IVirtualFileStorage>  CreateStaticArchive (const Path &filename)                              __NE___;
 
         ND_ static RC<IVirtualFileStorage>  CreateStaticFolder (const Path &folder, StringView prefix = Default)    __NE___;
-        ND_ static RC<IVirtualFileStorage>  CreateDynamicFolder (const Path &folder, StringView prefix = Default)   __NE___;
+        ND_ static RC<IVirtualFileStorage>  CreateDynamicFolder (const Path &folder, StringView prefix = Default,
+                                                                 Bool createFolder = False{})                       __NE___;
 
-        ND_ static RC<IVirtualFileStorage>  CreateNetworkStorage (StringView url)                                   __NE___;
+        ND_ static RC<IVirtualFileStorage>  CreateNetworkStorage (Networking::ClientServerBase &)                   __NE___;
     };
 
 
diff --git a/AE/engine/src/video/FFmpeg/FFmpegLoader.cpp b/AE/engine/src/video/FFmpeg/FFmpegLoader.cpp
index b9a08e7f..d978b25a 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegLoader.cpp
+++ b/AE/engine/src/video/FFmpeg/FFmpegLoader.cpp
@@ -21,7 +21,7 @@
 
 
 namespace AE::Video
-{   
+{
 /*
 =================================================
     FFMpegLib
@@ -171,7 +171,7 @@ namespace {
     _ffmpeg_CheckError
 =================================================
 */
-    bool  _ffmpeg_CheckError (int err, const char *ffcall, const char *func, const SourceLoc &loc)
+    bool  _ffmpeg_CheckError (int err, const char* ffcall, const char* func, const SourceLoc &loc)
     {
         if_likely( err == 0 )
             return true;
diff --git a/AE/engine/src/video/FFmpeg/FFmpegLoader.h b/AE/engine/src/video/FFmpeg/FFmpegLoader.h
index 81e026d2..f0fcfebc 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegLoader.h
+++ b/AE/engine/src/video/FFmpeg/FFmpegLoader.h
@@ -135,7 +135,7 @@ namespace AE::Video
             static void  Unload ()  __NE___;
     };
 
-    ND_ bool  _ffmpeg_CheckError (int err, const char *ffcall, const char *func, const SourceLoc &loc);
+    ND_ bool  _ffmpeg_CheckError (int err, const char* ffcall, const char* func, const SourceLoc &loc);
 
 } // AE::Video
 
diff --git a/AE/engine/src/video/FFmpeg/FFmpegUtils.cpp.h b/AE/engine/src/video/FFmpeg/FFmpegUtils.cpp.h
index aa644e57..a6bb39fa 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegUtils.cpp.h
+++ b/AE/engine/src/video/FFmpeg/FFmpegUtils.cpp.h
@@ -68,7 +68,7 @@ namespace AE::Video
 */
     ND_ inline EVideoFormat  EnumCast (AVPixelFormat fmt)
     {
-        STATIC_ASSERT( uint(EVideoFormat::_Count) == 8 );
+        StaticAssert( uint(EVideoFormat::_Count) == 8 );
         switch ( fmt )
         {
             case AV_PIX_FMT_YUV420P :           return EVideoFormat::YUV420P;
@@ -118,7 +118,7 @@ namespace AE::Video
 */
     ND_ inline int  EnumCast (EFilter value)
     {
-        STATIC_ASSERT( uint(EFilter::_Count) == 3 );
+        StaticAssert( uint(EFilter::_Count) == 3 );
         switch ( value )
         {
             case EFilter::Fast :        return SWS_FAST_BILINEAR;
@@ -137,7 +137,7 @@ namespace AE::Video
 */
     ND_ inline EMediaType  EnumCast (AVMediaType value)
     {
-        STATIC_ASSERT( uint(EMediaType::_Count) == 2 );
+        StaticAssert( uint(EMediaType::_Count) == 2 );
         switch ( value )
         {
             case AVMEDIA_TYPE_VIDEO :   return EMediaType::Video;
@@ -153,7 +153,7 @@ namespace AE::Video
 */
     ND_ inline EVideoCodec  EnumCast (AVCodecID value)
     {
-        STATIC_ASSERT( uint(EVideoCodec::_Count) == 8 );
+        StaticAssert( uint(EVideoCodec::_Count) == 8 );
         switch ( value )
         {
             case AV_CODEC_ID_GIF :      return EVideoCodec::GIF;
diff --git a/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.cpp b/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.cpp
index 61d7dd61..870e296d 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.cpp
+++ b/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.cpp
@@ -150,6 +150,17 @@ namespace {
             _codecCtx = ffmpeg.avcodec_alloc_context3( _codec );
             CHECK_ERR( _codecCtx != null );
 
+            if ( AllBits( _codec->capabilities, AV_CODEC_CAP_SLICE_THREADS ))
+            {
+                _codecCtx->thread_type  = FF_THREAD_SLICE;
+                _codecCtx->thread_count = Max( _codecCtx->thread_count, int(_config.threadCount) );
+            }else
+            if ( AllBits( _codec->capabilities, AV_CODEC_CAP_FRAME_THREADS ))
+            {
+                _codecCtx->thread_type  = FF_THREAD_FRAME;
+                _codecCtx->thread_count = Max( _codecCtx->thread_count, int(_config.threadCount) );
+            }
+
             FF_CHECK_ERR( ffmpeg.avcodec_parameters_to_context( _codecCtx, video_stream->codecpar ));
             FF_CHECK_ERR( ffmpeg.avcodec_open2( _codecCtx, _codec, null ));
         }
@@ -161,19 +172,12 @@ namespace {
 
             _videoPacket = ffmpeg.av_packet_alloc();
             CHECK_ERR( _videoPacket != null );
-
-            const auto&     fmt_info = EPixelFormat_GetInfo( _config.dstFormat );
-            _frameRowPitch  = ImageUtils::RowSize( _codecCtx->width, fmt_info.bitsPerBlock, fmt_info.TexBlockDim() );
-            _frameDataSize  = _frameRowPitch * _codecCtx->height;
-            _frameData      = Cast<ubyte>( Allocator_t::Allocate( SizeAndAlign{ _frameDataSize, 16_b }));
-
-            CHECK_ERR( _frameData != null );
         }
 
-        const uint2     src_size { _codecCtx->width, _codecCtx->height };
+        const uint2     src_dim { _codecCtx->width, _codecCtx->height };
 
-        if ( All( IsZero( _config.dstSize )) )
-            _config.dstSize = src_size;
+        if ( All( IsZero( _config.dstDim )) )
+            _config.dstDim = src_dim;
 
         // create scaler
         {
@@ -184,8 +188,8 @@ namespace {
             CHECK_ERR( src_fmt != AV_PIX_FMT_NONE and
                        dst_fmt != AV_PIX_FMT_NONE );
 
-            _swsCtx = ffmpeg.sws_getContext( int(src_size.x), int(src_size.y), src_fmt,
-                                             int(_config.dstSize.x), int(_config.dstSize.y), dst_fmt,
+            _swsCtx = ffmpeg.sws_getContext( int(src_dim.x), int(src_dim.y), src_fmt,
+                                             int(_config.dstDim.x), int(_config.dstDim.y), dst_fmt,
                                              filter, null, null, null );
             CHECK_ERR( _swsCtx != null );
         }
@@ -296,11 +300,11 @@ namespace {
 
 /*
 =================================================
-    GetFrame
+    GetNextFrame
 =================================================
 */
-    bool  FFmpegVideoDecoder::GetFrame (OUT ImageMemView &  outView,
-                                        OUT FrameInfo &     outInfo) __NE___
+    bool  FFmpegVideoDecoder::GetNextFrame (INOUT ImageMemView &    memView,
+                                            OUT FrameInfo &         outInfo) __NE___
     {
         EXLOCK( _guard );
 
@@ -313,6 +317,9 @@ namespace {
                 _swsCtx         != null     and
                 _config.videoStreamIdx >= 0 and
                 _config.videoStreamIdx < int(_formatCtx->nb_streams) );
+        ASSERT( memView.Parts().size() == 1 );
+        ASSERT( memView.Format() == _config.dstFormat );
+        ASSERT( All( memView.Dimension() == uint3{_config.dstDim, 1} ));
 
         AVStream*   vstream = _formatCtx->streams[ _config.videoStreamIdx ];
 
@@ -335,7 +342,7 @@ namespace {
                 outInfo.duration    = Second_t{ _videoPacket->duration * av_q2d( vstream->time_base )};
                 outInfo.frameIdx    = _PTStoFrameIdx( _videoPacket->pts );
 
-                ASSERT_Eq( _videoPacket->pts, _FrameIdxToPTS( outInfo.frameIdx ));
+                //ASSERT_Eq( _videoPacket->pts, _FrameIdxToPTS( outInfo.frameIdx ));
 
                 ffmpeg.av_packet_unref( _videoPacket );
                 FF_CHECK_ERR( err );
@@ -361,19 +368,18 @@ namespace {
                 //ASSERT( packed_pts == _videoFrame->pts );
 
                 const int   src_slice_y                         = 0;
-                const int   dst_stride [AV_NUM_DATA_POINTERS]   = { int(_frameRowPitch) };
-                ubyte*      dst_data   [AV_NUM_DATA_POINTERS]   = { _frameData };
+                const int   dst_stride [AV_NUM_DATA_POINTERS]   = { int(memView.RowPitch()) };
+                ubyte*      dst_data   [AV_NUM_DATA_POINTERS]   = { Cast<ubyte>(memView.Parts().front().ptr) };
 
                 const int   scaled_h = ffmpeg.sws_scale( _swsCtx, _videoFrame->data, _videoFrame->linesize, src_slice_y, _videoFrame->height,
                                                          OUT dst_data, dst_stride );
 
-                if_unlikely( scaled_h < 0 or scaled_h != int(_config.dstSize.y) )
+                if_unlikely( scaled_h < 0 or scaled_h != int(_config.dstDim.y) )
                 {
                     FF_CHECK( scaled_h );
                     return false;
                 }
 
-                outView = ImageMemView{ _frameData, _frameDataSize, uint3{}, uint3{_config.dstSize, 1u}, 0_b, 0_b, _config.dstFormat, EImageAspect::Color };
                 return true;
             }
         }
@@ -385,7 +391,7 @@ namespace {
 =================================================
     GetFrame
 =================================================
-*/
+*
     bool  FFmpegVideoDecoder::GetFrame (OUT VideoImageID &, OUT FrameInfo &) __NE___
     {
         // not supported
@@ -422,9 +428,6 @@ namespace {
         if ( _swsCtx != null )
             ffmpeg.sws_freeContext( _swsCtx );
 
-        if ( _frameData != null )
-            Allocator_t::Deallocate( _frameData, SizeAndAlign{ _frameDataSize, 16_b });
-
         if ( _videoPacket != null )
             ffmpeg.av_packet_free( &_videoPacket );
 
@@ -448,9 +451,6 @@ namespace {
         _formatCtx          = null;
         _codecCtx           = null;
         _codec              = null;
-        _frameData          = null;
-        _frameDataSize      = 0_b;
-        _frameRowPitch      = 0_b;
         _swsCtx             = null;
         _ioCtx              = null;
 
@@ -476,7 +476,7 @@ namespace {
     _IOReadPacket
 =================================================
 */
-    int  FFmpegVideoDecoder::_IOReadPacket (void *opaque, ubyte *buf, int buf_size)
+    int  FFmpegVideoDecoder::_IOReadPacket (void* opaque, ubyte* buf, int buf_size)
     {
         auto*   stream = Cast<RStream>( opaque );
 
@@ -499,7 +499,7 @@ namespace {
     _IOSeek
 =================================================
 */
-    slong  FFmpegVideoDecoder::_IOSeek (void *opaque, slong offset, int whence)
+    slong  FFmpegVideoDecoder::_IOSeek (void* opaque, slong offset, int whence)
     {
         auto*   stream = Cast<RStream>( opaque );
 
@@ -553,8 +553,8 @@ namespace {
             dst.avgFrameRate    = ToFractional( stream->avg_frame_rate );
             dst.minFrameRate    = ToFractional( stream->r_frame_rate );
             dst.bitrate         = Bitrate_t{ulong( params->bit_rate > 0 ? params->bit_rate : formatCtx->bit_rate )};
-            dst.size.x          = params->width;
-            dst.size.y          = params->height;
+            dst.dimension.x     = params->width;
+            dst.dimension.y     = params->height;
         }
 
         return result;
@@ -616,7 +616,7 @@ namespace {
     PrintFileProperties
 =================================================
 */
-    String  FFmpegVideoDecoder::PrintFileProperties (RC<RStream> rstream) C_NE___
+    String  FFmpegVideoDecoder::PrintFileProperties (RC<RStream> rstream) C_Th___
     {
         struct Context
         {
@@ -721,7 +721,7 @@ namespace {
         return str;
     }
 
-    String  FFmpegVideoDecoder::PrintFileProperties (const Path &filename) C_NE___
+    String  FFmpegVideoDecoder::PrintFileProperties (const Path &filename) C_Th___
     {
         return  "\nfile: "s << ToString( filename ) <<
                 PrintFileProperties( MakeRC<FileRStream>( filename ));
diff --git a/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.h b/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.h
index cf5854b0..276b17be 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.h
+++ b/AE/engine/src/video/FFmpeg/FFmpegVideoDecoder.h
@@ -15,11 +15,6 @@ namespace AE::Video
 
     class FFmpegVideoDecoder final : public IVideoDecoder
     {
-    // types
-    private:
-        using Allocator_t = UntypedAllocator;
-
-
     // variables
     private:
         mutable SharedMutex     _guard;
@@ -37,10 +32,6 @@ namespace AE::Video
         AVIOContext *           _ioCtx              = null;     // wrapper for file stream
         RC<RStream>             _rstream;
 
-        Bytes32u                _frameDataSize;
-        Bytes32u                _frameRowPitch;
-        ubyte *                 _frameData          = null;     // allocated by Allocator_t
-
         bool                    _decodingStarted    = false;
         const bool              _ffmpegLoaded       = false;
 
@@ -57,18 +48,18 @@ namespace AE::Video
         bool  SeekTo (ulong frameIdx)                               __NE_OV;
         bool  SeekTo (Second_t timestamp)                           __NE_OV;
 
-        bool  GetFrame (OUT ImageMemView &  view,
-                        OUT FrameInfo &     info)                   __NE_OV;
+        bool  GetNextFrame (INOUT ImageMemView &    memView,
+                            OUT FrameInfo &         info)           __NE_OV;
 
-        bool  GetFrame (OUT VideoImageID &  id,
-                        OUT FrameInfo &     info)                   __NE_OV;
+    //  bool  GetNextFrame (OUT VideoImageID &  id,
+    //                      OUT FrameInfo &     info)               __NE_OV;
 
         bool  End ()                                                __NE_OV;
 
         Properties  GetFileProperties (const Path &filename)        C_NE_OV;
         Properties  GetFileProperties (RC<RStream> stream)          C_NE_OV;
-        String      PrintFileProperties (const Path &filename)      C_NE_OV;
-        String      PrintFileProperties (RC<RStream> stream)        C_NE_OV;
+        String      PrintFileProperties (const Path &filename)      C_Th_OV;
+        String      PrintFileProperties (RC<RStream> stream)        C_Th_OV;
 
         Config      GetConfig ()                                    C_NE_OV { SHAREDLOCK( _guard );  return _config; }
         Properties  GetProperties ()                                C_NE_OV;
@@ -86,8 +77,8 @@ namespace AE::Video
 
         static Properties  _ReadProperties (AVFormatContext* formatCtx);
 
-        static int      _IOReadPacket (void *opaque, ubyte *buf, int buf_size);
-        static slong    _IOSeek (void *opaque, slong offset, int whence);
+        static int      _IOReadPacket (void* opaque, ubyte* buf, int buf_size);
+        static slong    _IOSeek (void* opaque, slong offset, int whence);
     };
 
 
diff --git a/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.cpp b/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.cpp
index 870a3308..766e2439 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.cpp
+++ b/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.cpp
@@ -124,8 +124,8 @@ namespace {
     void  FFmpegVideoEncoder::_ValidateResolution ()
     {
         // round to multiple of 4
-        _config.dstSize.x = AlignDown( _config.srcSize.x, 2_pot );
-        _config.dstSize.y = AlignDown( _config.srcSize.y, 2_pot );
+        _config.dstDim.x = AlignDown( _config.srcDim.x, 2_pot );
+        _config.dstDim.y = AlignDown( _config.srcDim.y, 2_pot );
     }
 
 /*
@@ -137,8 +137,8 @@ namespace {
     {
         bool    scaling = false;
 
-        if ( All( IsZero( _config.dstSize )) )
-            _config.dstSize = _config.srcSize;
+        if ( All( IsZero( _config.dstDim )) )
+            _config.dstDim = _config.srcDim;
 
         if ( _config.bitrate == Bitrate_t{0} )
             _config.bitrate = _CalcBitrate( _config );
@@ -318,7 +318,7 @@ namespace {
     _CreateStream
 =================================================
 */
-    bool  FFmpegVideoEncoder::_CreateStream (const AVCodec* codec, const char *videoFormat)
+    bool  FFmpegVideoEncoder::_CreateStream (const AVCodec* codec, const char* videoFormat)
     {
         _DestroyStream();
 
@@ -343,8 +343,8 @@ namespace {
 
             _videoStream->codecpar->codec_id    = _codec->id;
             _videoStream->codecpar->codec_type  = _codec->type;
-            _videoStream->codecpar->width       = int(_config.dstSize.x);
-            _videoStream->codecpar->height      = int(_config.dstSize.y);
+            _videoStream->codecpar->width       = int(_config.dstDim.x);
+            _videoStream->codecpar->height      = int(_config.dstDim.y);
             _videoStream->codecpar->format      = EnumCast( _config.dstFormat );
             _videoStream->codecpar->bit_rate    = slong(_config.bitrate.GetNonScaled());
             _videoStream->time_base             = ToAVRational( _config.framerate );
@@ -406,8 +406,8 @@ namespace {
 
             _videoFrame                     = ffmpeg.av_frame_alloc();
             _videoFrame->format             = _codecCtx->pix_fmt;
-            _videoFrame->width              = int(_config.dstSize.x);
-            _videoFrame->height             = int(_config.dstSize.y);
+            _videoFrame->width              = int(_config.dstDim.x);
+            _videoFrame->height             = int(_config.dstDim.y);
             _videoFrame->color_range        = _codecCtx->color_range;
             _videoFrame->color_primaries    = _codecCtx->color_primaries;
             _videoFrame->color_trc          = _codecCtx->color_trc;
@@ -424,7 +424,7 @@ namespace {
 
             CHECK_ERR( src_fmt != AV_PIX_FMT_NONE );
 
-            _swsCtx = ffmpeg.sws_getContext( int(_config.srcSize.x), int(_config.srcSize.y), src_fmt,
+            _swsCtx = ffmpeg.sws_getContext( int(_config.srcDim.x), int(_config.srcDim.y), src_fmt,
                                              _codecCtx->width, _codecCtx->height, _codecCtx->pix_fmt,
                                              filter, null, null, null );
             CHECK_ERR( _swsCtx != null );
@@ -565,7 +565,7 @@ namespace {
 =================================================
     AddFrame
 =================================================
-*/
+*
     bool  FFmpegVideoEncoder::AddFrame (VideoImageID, Bool) __NE___
     {
         // not supported
@@ -588,7 +588,7 @@ namespace {
         const ubyte*    src_slice   [AV_NUM_DATA_POINTERS]  = { Cast<ubyte>( view.Parts().front().ptr )};
         const int       src_slice_y                         = 0;
 
-        const int   scaled_h = ffmpeg.sws_scale( _swsCtx, src_slice, src_stride, src_slice_y, int(_config.srcSize.y),
+        const int   scaled_h = ffmpeg.sws_scale( _swsCtx, src_slice, src_stride, src_slice_y, int(_config.srcDim.y),
                                                  OUT _videoFrame->data, _videoFrame->linesize );
 
         if_unlikely( scaled_h < 0 or scaled_h != _codecCtx->height )
@@ -917,7 +917,7 @@ namespace {
     _IOWritePacket
 =================================================
 */
-    int  FFmpegVideoEncoder::_IOWritePacket (void *opaque, ubyte *buf, int buf_size)
+    int  FFmpegVideoEncoder::_IOWritePacket (void* opaque, ubyte* buf, int buf_size)
     {
         auto*   stream = Cast<WStream>( opaque );
 
diff --git a/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.h b/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.h
index daa48f89..79c290c2 100644
--- a/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.h
+++ b/AE/engine/src/video/FFmpeg/FFmpegVideoEncoder.h
@@ -70,7 +70,7 @@ namespace AE::Video
         bool  Begin (const Config &cfg, RC<WStream> temp, RC<WStream> dst)  __NE_OV;
 
         bool  AddFrame (const ImageMemView &view, Bool endOnError)          __NE_OV;
-        bool  AddFrame (VideoImageID id, Bool endOnError)                   __NE_OV;
+    //  bool  AddFrame (VideoImageID id, Bool endOnError)                   __NE_OV;
 
         bool  End ()                                                        __NE_OV;
 
@@ -86,7 +86,7 @@ namespace AE::Video
 
             void  _ValidateResolution ();
 
-        ND_ bool  _CreateStream (const AVCodec* codec, const char *videoFormat);
+        ND_ bool  _CreateStream (const AVCodec* codec, const char* videoFormat);
             void  _DestroyStream ();
             void  _ValidatePixelFormat (OUT int &) const;
             void  _SetOptions (INOUT AVDictionary **dict) const;
@@ -101,7 +101,7 @@ namespace AE::Video
         ND_ static Bitrate_t  _CalcBitrate (const Config &cfg);
         ND_ static CodecInfo  _GetEncoderInfo (const Config &cfg);
 
-        static int  _IOWritePacket (void *opaque, ubyte *buf, int buf_size);
+        static int  _IOWritePacket (void* opaque, ubyte* buf, int buf_size);
     };
 
 
diff --git a/AE/engine/src/video/Impl/VideoDecoder.cpp b/AE/engine/src/video/Impl/VideoDecoder.cpp
index dae9009a..01960e80 100644
--- a/AE/engine/src/video/Impl/VideoDecoder.cpp
+++ b/AE/engine/src/video/Impl/VideoDecoder.cpp
@@ -27,7 +27,7 @@ namespace AE::Video
                 << "\n  avgFrameRate: " << Base::ToString( info.avgFrameRate )
                 << "\n  minFrameRate: " << Base::ToString( info.minFrameRate )
                 << "\n  bitrate:      " << Base::ToString( info.bitrate.GetScaled() )
-                << "\n  size: . . . . " << Base::ToString( info.size )
+                << "\n  dimension:  . " << Base::ToString( info.dimension )
                 << "\n--------";
         }
         return str;
diff --git a/AE/engine/src/video/Public/VideoDecoder.h b/AE/engine/src/video/Public/VideoDecoder.h
index 75e9d192..86737506 100644
--- a/AE/engine/src/video/Public/VideoDecoder.h
+++ b/AE/engine/src/video/Public/VideoDecoder.h
@@ -24,7 +24,7 @@ namespace AE::Video
 
         struct Config
         {
-            uint2               dstSize         = {};               // can be used for scaling
+            uint2               dstDim          = {};               // can be used for scaling
             EPixelFormat        dstFormat       = Default;
             EFilter             filter          = Default;
         //  bool                hwAccelerated   = false;            // use hardware acceleration on GPU or CPU
@@ -32,6 +32,7 @@ namespace AE::Video
         //  ECPUVendor          targetCPU       = Default;
             int                 videoStreamIdx  = -1;               // use 'GetFileProperties()' to enum all streams
         //  int                 audioStreamIdx  = -1;
+            uint                threadCount     = 0;
         };
 
         struct StreamInfo
@@ -47,7 +48,9 @@ namespace AE::Video
             FrameRate_t         avgFrameRate;               // average
             FrameRate_t         minFrameRate;               // minimal
             Bitrate_t           bitrate;
-            uint2               size            = {};       // video only
+            uint2               dimension       = {};       // video only
+
+            StreamInfo ()   __NE___ {}
         };
         using StreamInfos_t = FixedArray< StreamInfo, 8 >;
 
@@ -76,13 +79,11 @@ namespace AE::Video
         ND_ virtual bool  SeekTo (ulong frameIdx)                               __NE___ = 0;
         ND_ virtual bool  SeekTo (Second_t timestamp)                           __NE___ = 0;
 
-        ND_ virtual bool  GetFrame (OUT ImageMemView &  view,
-                                    OUT FrameInfo &     info)                   __NE___ = 0;
-
-        ND_ virtual bool  GetFrame (OUT VideoImageID &  id,
-                                    OUT FrameInfo &     info)                   __NE___ = 0;
+        ND_ virtual bool  GetNextFrame (INOUT ImageMemView &    memView,
+                                        OUT FrameInfo &         info)           __NE___ = 0;
 
-        // TODO: GetFrameAsync()
+    //  ND_ virtual bool  GetNextFrame (OUT VideoImageID &  id,
+    //                                  OUT FrameInfo &     info)               __NE___ = 0;
 
         ND_ virtual bool  End ()                                                __NE___ = 0;
 
@@ -93,10 +94,37 @@ namespace AE::Video
         // stateless
         ND_ virtual Properties  GetFileProperties (const Path &filename)        C_NE___ = 0;
         ND_ virtual Properties  GetFileProperties (RC<RStream> stream)          C_NE___ = 0;
-        ND_ virtual String      PrintFileProperties (const Path &filename)      C_NE___ = 0;
-        ND_ virtual String      PrintFileProperties (RC<RStream> stream)        C_NE___ = 0;
+        ND_ virtual String      PrintFileProperties (const Path &filename)      C_Th___ = 0;
+        ND_ virtual String      PrintFileProperties (RC<RStream> stream)        C_Th___ = 0;
         // TODO: get codecs
+
+        // helpers
+        template <typename A>
+        ND_ static bool  AllocMemView (const Config         &cfg,
+                                       OUT ImageMemView     &memView,
+                                       A                    &allocator)         __NE___;
     };
 
 
+/*
+=================================================
+    AllocMemView
+=================================================
+*/
+    template <typename A>
+    bool  IVideoDecoder::AllocMemView (const Config         &cfg,
+                                       OUT ImageMemView     &memView,
+                                       A                    &allocator) __NE___
+    {
+        auto&   fmt_info    = EPixelFormat_GetInfo( cfg.dstFormat );
+        Bytes   row_pitch   = Graphics::ImageUtils::RowSize( cfg.dstDim.x, fmt_info.bitsPerBlock, fmt_info.TexBlockDim() );
+        Bytes   img_size    = row_pitch * cfg.dstDim.y;
+        void*   data        = allocator.Allocate( SizeAndAlign{ img_size, AE_CACHE_LINE });
+        CHECK_ERR( data != null );
+
+        memView = ImageMemView{ data, img_size, uint3{}, uint3{cfg.dstDim, 1}, row_pitch, img_size, cfg.dstFormat, Graphics::EImageAspect::Color };
+        return true;
+    }
+
+
 } // AE::Video
diff --git a/AE/engine/src/video/Public/VideoEncoder.h b/AE/engine/src/video/Public/VideoEncoder.h
index 02076921..0c3daf4f 100644
--- a/AE/engine/src/video/Public/VideoEncoder.h
+++ b/AE/engine/src/video/Public/VideoEncoder.h
@@ -32,8 +32,8 @@ namespace AE::Video
             EFilter             filter          = Default;
             float               quality         = -1.f;                     // valid: 0..1,  1.0 - high quality
             FrameRate_t         framerate       {30, 1};
-            uint2               srcSize         = {1920, 1080};
-            uint2               dstSize         = {0, 0};                   // can be used for scaling
+            uint2               srcDim          = {1920, 1080};
+            uint2               dstDim          = {0, 0};                   // can be used for scaling
             Bitrate_t           bitrate         = BitrateMb_t{50};
             bool                hwAccelerated   = false;                    // use hardware acceleration on GPU or CPU
             EGraphicsDeviceID   targetGPU       = Default;                  // hint for hardware acceleration on GPU
@@ -49,14 +49,14 @@ namespace AE::Video
         ND_ virtual bool  Begin (const Config &cfg, RC<WStream> temp, RC<WStream> dst)  __NE___ = 0;
 
         ND_ virtual bool  AddFrame (const ImageMemView &view, Bool endOnError)          __NE___ = 0;
-        ND_ virtual bool  AddFrame (VideoImageID id, Bool endOnError)                   __NE___ = 0;
+    //  ND_ virtual bool  AddFrame (VideoImageID id, Bool endOnError)                   __NE___ = 0;
 
         // TODO: AddFrameAsync()
 
         ND_ virtual bool  End ()                                                        __NE___ = 0;
 
-        ND_ virtual bool        IsEncoding ()                                           C_NE___ = 0;
-        ND_ virtual Config      GetConfig ()                                            C_NE___ = 0;
+        ND_ virtual bool    IsEncoding ()                                               C_NE___ = 0;
+        ND_ virtual Config  GetConfig ()                                                C_NE___ = 0;
 
 
         // stateless
diff --git a/AE/engine/tests/.gitignore b/AE/engine/tests/.gitignore
index 93ced910..1f70d655 100644
--- a/AE/engine/tests/.gitignore
+++ b/AE/engine/tests/.gitignore
@@ -3,7 +3,7 @@
 /crash_report_server/output
 /build_server/output
 /ecs-st/Vulkan/temp
-/vfs/vfs_test
+/vfs/vfs_test*
 /base/ds_test/*.bin
 /threading/ds_test/*.bin
 /video/video_test
\ No newline at end of file
diff --git a/AE/engine/tests/CMakeLists.txt b/AE/engine/tests/CMakeLists.txt
index 5c11672e..48ebfcaf 100644
--- a/AE/engine/tests/CMakeLists.txt
+++ b/AE/engine/tests/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory( "graphics_hl" )
 add_subdirectory( "ecs-st" )
 add_subdirectory( "vfs" )
 add_subdirectory( "video" )
+add_subdirectory( "network_stress_test" )
 
 if (${AE_DESKTOP})
     add_subdirectory( "atlas_tools" )
@@ -22,6 +23,4 @@ if (${AE_DESKTOP})
     add_subdirectory( "pipeline_compiler" )
 endif ()
 
-if (DEFINED ANDROID)
-    add_subdirectory( "test_launcher" )
-endif ()
+add_subdirectory( "test_launcher" )
diff --git a/AE/engine/tests/asset_packer/Test_Common.h b/AE/engine/tests/asset_packer/Test_Common.h
index 1703e1ae..06e2745b 100644
--- a/AE/engine/tests/asset_packer/Test_Common.h
+++ b/AE/engine/tests/asset_packer/Test_Common.h
@@ -17,7 +17,7 @@ using namespace AE::PipelineCompiler;
 using namespace AE::InputActions;
 using namespace AE::AssetPacker;
 
-using LinearAlloc_t = AllocatorImpl2< LinearAllocator<> >;
+using LinearAlloc_t = IAllocatorAdaptor< LinearAllocator<> >;
 
 
 template <typename T>
diff --git a/AE/engine/tests/asset_packer/Test_PipelinePack.cpp b/AE/engine/tests/asset_packer/Test_PipelinePack.cpp
index ace3fffe..73e63070 100644
--- a/AE/engine/tests/asset_packer/Test_PipelinePack.cpp
+++ b/AE/engine/tests/asset_packer/Test_PipelinePack.cpp
@@ -81,7 +81,8 @@ namespace
             TEST( hash_to_name.Deserialize( des ));
         }
 
-        AE::Serializing::Deserializer   des{ mem_stream, MakeRC<LinearAlloc_t>() };
+        RC<IAllocator>                  alloc = MakeRC<LinearAlloc_t>();
+        AE::Serializing::Deserializer   des{ mem_stream, alloc.get() };
         {
             uint    version = 0;
             uint    name    = 0;
diff --git a/AE/engine/tests/asset_packer/Test_RenderPassPack.cpp b/AE/engine/tests/asset_packer/Test_RenderPassPack.cpp
index 9cc08b9f..736f339d 100644
--- a/AE/engine/tests/asset_packer/Test_RenderPassPack.cpp
+++ b/AE/engine/tests/asset_packer/Test_RenderPassPack.cpp
@@ -58,7 +58,8 @@ namespace
             TEST( mem_stream->LoadRemaining( *file, Bytes{offsets.renderPassDataSize} ));
         }
 
-        AE::Serializing::Deserializer   des{ mem_stream, MakeRC<LinearAlloc_t>() };
+        RC<IAllocator>                  alloc = MakeRC<LinearAlloc_t>();
+        AE::Serializing::Deserializer   des{ mem_stream, alloc.get() };
         {
             uint    version = 0;
             uint    name    = 0;
diff --git a/AE/engine/tests/asset_packer/Test_SamplerPack.cpp b/AE/engine/tests/asset_packer/Test_SamplerPack.cpp
index ec1b8057..c2bf6ba5 100644
--- a/AE/engine/tests/asset_packer/Test_SamplerPack.cpp
+++ b/AE/engine/tests/asset_packer/Test_SamplerPack.cpp
@@ -58,7 +58,8 @@ namespace
             TEST( mem_stream->LoadRemaining( *file, Bytes{offsets.samplerDataSize} ));
         }
 
-        AE::Serializing::Deserializer   des{ mem_stream, MakeRC<LinearAlloc_t>() };
+        RC<IAllocator>                  alloc = MakeRC<LinearAlloc_t>();
+        AE::Serializing::Deserializer   des{ mem_stream, alloc.get() };
         {
             uint    version = 0;
             uint    name    = 0;
diff --git a/AE/engine/tests/asset_packer/pipeline_test/layouts/vb_layouts.as b/AE/engine/tests/asset_packer/pipeline_test/layouts/vb_layouts.as
index a6dc3b3f..9b5dcc38 100644
--- a/AE/engine/tests/asset_packer/pipeline_test/layouts/vb_layouts.as
+++ b/AE/engine/tests/asset_packer/pipeline_test/layouts/vb_layouts.as
@@ -5,7 +5,8 @@ void VertexBuffers ()
     // layouts
     {
         RC<ShaderStructType>    st = ShaderStructType( "vb_layout1" );
-        st.Set( "float3     Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "float3     Position;" +
                 "float2     Texcoord;" );
 
         RC<VertexBufferInput>   vb = VertexBufferInput( "vb_layout1" );
@@ -13,7 +14,8 @@ void VertexBuffers ()
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "vb_layout2" );
-        st.Set( "float2     Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "float2     Position;" +
                 "float2     Texcoord;" );
 
         RC<VertexBufferInput>   vb = VertexBufferInput( "vb_layout2" );
@@ -23,7 +25,8 @@ void VertexBuffers ()
     // definition
     {
         RC<ShaderStructType>    st = ShaderStructType( "vb_input1" );
-        st.Set( "packed_float3          Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_float3          Position;" +
                 "packed_ushort_norm2    Texcoord;" );
 
         RC<VertexBufferInput>   vb = VertexBufferInput( "vb_input1" );
@@ -34,7 +37,8 @@ void VertexBuffers ()
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "vb_input2" );
-        st.Set( "packed_float2          Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_float2          Position;" +
                 "packed_ushort_norm2    Texcoord;" );
 
         RC<VertexBufferInput>   vb = VertexBufferInput( "vb_input2" );
@@ -43,10 +47,12 @@ void VertexBuffers ()
     }
     {
         RC<ShaderStructType>    st1 = ShaderStructType( "VB_3_Pos" );
-        st1.Set( "packed_float3     Position;" );
+        st1.Set( EStructLayout::InternalIO,
+                 "packed_float3     Position;" );
 
         RC<ShaderStructType>    st2 = ShaderStructType( "VB_3_Attribs" );
-        st2.Set( "packed_float2     Texcoord;" );
+        st2.Set( EStructLayout::InternalIO,
+                 "packed_float2     Texcoord;" );
 
         RC<VertexBufferInput>   vb = VertexBufferInput( "vb_input3" );
         vb.Add( "Position", st1 );
diff --git a/AE/engine/tests/asset_packer/pipeline_test/mtl_types.h b/AE/engine/tests/asset_packer/pipeline_test/mtl_types.h
index 6041c24e..5aafbe1f 100644
--- a/AE/engine/tests/asset_packer/pipeline_test/mtl_types.h
+++ b/AE/engine/tests/asset_packer/pipeline_test/mtl_types.h
@@ -7,8 +7,8 @@
 
         packed_float3  Position;
     };
-    STATIC_ASSERT( offsetof(VB_3_Pos, Position) == 0 );
-    STATIC_ASSERT( sizeof(VB_3_Pos) == 12 );
+    StaticAssert( offsetof(VB_3_Pos, Position) == 0 );
+    StaticAssert( sizeof(VB_3_Pos) == 12 );
 #endif
 
 #ifndef PushConst1_DEFINED
@@ -21,9 +21,9 @@
         float2  scale;
         float2  bias;
     };
-    STATIC_ASSERT( offsetof(PushConst1, scale) == 0 );
-    STATIC_ASSERT( offsetof(PushConst1, bias) == 8 );
-    STATIC_ASSERT( sizeof(PushConst1) == 16 );
+    StaticAssert( offsetof(PushConst1, scale) == 0 );
+    StaticAssert( offsetof(PushConst1, bias) == 8 );
+    StaticAssert( sizeof(PushConst1) == 16 );
 #endif
 
 #ifndef PushConst2_DEFINED
@@ -35,8 +35,8 @@
 
         float4  color;
     };
-    STATIC_ASSERT( offsetof(PushConst2, color) == 0 );
-    STATIC_ASSERT( sizeof(PushConst2) == 16 );
+    StaticAssert( offsetof(PushConst2, color) == 0 );
+    StaticAssert( sizeof(PushConst2) == 16 );
 #endif
 
 #ifndef UBlock_DEFINED
@@ -48,8 +48,8 @@
 
         float4x4_storage  mvp;
     };
-    STATIC_ASSERT( offsetof(UBlock, mvp) == 0 );
-    STATIC_ASSERT( sizeof(UBlock) == 64 );
+    StaticAssert( offsetof(UBlock, mvp) == 0 );
+    StaticAssert( sizeof(UBlock) == 64 );
 #endif
 
 #ifndef BufferRef_DEFINED
@@ -62,9 +62,9 @@
         float3  Position;
         float2  Texcoord;
     };
-    STATIC_ASSERT( offsetof(BufferRef, Position) == 0 );
-    STATIC_ASSERT( offsetof(BufferRef, Texcoord) == 16 );
-    STATIC_ASSERT( sizeof(BufferRef) == 32 );
+    StaticAssert( offsetof(BufferRef, Position) == 0 );
+    StaticAssert( offsetof(BufferRef, Texcoord) == 16 );
+    StaticAssert( sizeof(BufferRef) == 32 );
 #endif
 
 #ifndef vb_input1_DEFINED
@@ -77,9 +77,9 @@
         packed_float3  Position;
         packed_ushort2  Texcoord;
     };
-    STATIC_ASSERT( offsetof(vb_input1, Position) == 0 );
-    STATIC_ASSERT( offsetof(vb_input1, Texcoord) == 12 );
-    STATIC_ASSERT( sizeof(vb_input1) == 16 );
+    StaticAssert( offsetof(vb_input1, Position) == 0 );
+    StaticAssert( offsetof(vb_input1, Texcoord) == 12 );
+    StaticAssert( sizeof(vb_input1) == 16 );
 #endif
 
 #ifndef VB_3_Attribs_DEFINED
@@ -91,7 +91,7 @@
 
         packed_float2  Texcoord;
     };
-    STATIC_ASSERT( offsetof(VB_3_Attribs, Texcoord) == 0 );
-    STATIC_ASSERT( sizeof(VB_3_Attribs) == 8 );
+    StaticAssert( offsetof(VB_3_Attribs, Texcoord) == 0 );
+    StaticAssert( sizeof(VB_3_Attribs) == 8 );
 #endif
 
diff --git a/AE/engine/tests/asset_packer/pipeline_test/test1_ref.txt b/AE/engine/tests/asset_packer/pipeline_test/test1_ref.txt
index e6bbde45..37cb7aa3 100644
--- a/AE/engine/tests/asset_packer/pipeline_test/test1_ref.txt
+++ b/AE/engine/tests/asset_packer/pipeline_test/test1_ref.txt
@@ -654,74 +654,74 @@ RTShaderBindingTable {
 
 SpirvShaders {
   [0]  offset = 0 b
-  [1]  offset = 2672 b
-  [2]  offset = 5 Kb
-  [3]  offset = 7 Kb
-  [4]  offset = 10 Kb
-  [5]  offset = 14 Kb
-  [6]  offset = 17 Kb
-  [7]  offset = 21 Kb
-  [8]  offset = 23 Kb
-  [9]  offset = 26 Kb
-  [10]  offset = 29 Kb
-  [11]  offset = 32 Kb
-  [12]  offset = 35 Kb
-  [13]  offset = 37 Kb
-  [14]  offset = 50 Kb
-  [15]  offset = 53 Kb
-  [16]  offset = 57 Kb
+  [1]  offset = 1680 b
+  [2]  offset = 3900 b
+  [3]  offset = 5 Kb
+  [4]  offset = 6 Kb
+  [5]  offset = 10 Kb
+  [6]  offset = 12 Kb
+  [7]  offset = 16 Kb
+  [8]  offset = 18 Kb
+  [9]  offset = 20 Kb
+  [10]  offset = 23 Kb
+  [11]  offset = 26 Kb
+  [12]  offset = 28 Kb
+  [13]  offset = 29 Kb
+  [14]  offset = 37 Kb
+  [15]  offset = 39 Kb
+  [16]  offset = 43 Kb
 }
 
 SpirvShaderData {
   [0]
-    codeSize = 2668 b
-    codeHash = b3950e514acc33c6
+    codeSize = 1676 b
+    codeHash = f0a0c49806cd73b
   [1]
-    codeSize = 2552 b
-    codeHash = 24310dd6aef364e8
+    codeSize = 2216 b
+    codeHash = 633bee99e3cbee99
   [2]
-    codeSize = 2924 b
-    codeHash = af818025ed49b4e5
+    codeSize = 1784 b
+    codeHash = b9d8c86147ad6f9f
   [3]
-    codeSize = 2336 b
-    codeHash = 397405a55e65fffc
+    codeSize = 1196 b
+    codeHash = 15adaab0348ad250
   [4]
-    codeSize = 4 Kb
-    codeHash = 2447bbf52bbd0ba4
+    codeSize = 3920 b
+    codeHash = 984e449be0cb12f
   [5]
-    codeSize = 2928 b
-    codeHash = fa654f63e60738b2
+    codeSize = 2316 b
+    codeHash = 1b5a727cad74671e
   [6]
-    codeSize = 3696 b
-    codeHash = 416378d30a6b4068
+    codeSize = 3360 b
+    codeHash = 7d77b21f4747cef9
   [7]
-    codeSize = 2340 b
-    codeHash = 5cb35b6b5c5763bb
+    codeSize = 2004 b
+    codeHash = fb53c37ac3be1517
   [8]
-    codeSize = 2828 b
-    codeHash = 1bb70a7abea360ac
+    codeSize = 2492 b
+    codeHash = 88621de7e940d42d
   [9]
-    codeSize = 3108 b
-    codeHash = 43efcc9677bf8b35
+    codeSize = 2772 b
+    codeHash = c6ccec97cc6861eb
   [10]
-    codeSize = 3532 b
-    codeHash = 3e2836f6ce2ffaa7
+    codeSize = 3196 b
+    codeHash = f3ddafee17e99ea6
   [11]
-    codeSize = 2924 b
-    codeHash = 6d692fbb29592512
+    codeSize = 1784 b
+    codeHash = 7b3067ff83bdfe68
   [12]
-    codeSize = 2472 b
-    codeHash = 885a693c34e06aaf
+    codeSize = 1332 b
+    codeHash = 1496b1b57654325b
   [13]
-    codeSize = 6 Kb
+    codeSize = 5 Kb
     withTrace
   [14]
-    codeSize = 2912 b
-    codeHash = a34fb0cad499d505
+    codeSize = 1688 b
+    codeHash = 2135ee13a9d39fd6
   [15]
-    codeSize = 4 Kb
-    codeHash = 2a23c8f7f2223332
+    codeSize = 3856 b
+    codeHash = 24867565a0594119
   [16]
     codeSize = 4 Kb
-    codeHash = 1205accacefe4e70
+    codeHash = bcb285134fb20fd8
 }
\ No newline at end of file
diff --git a/AE/engine/tests/asset_packer/pipeline_test/vk_types.h b/AE/engine/tests/asset_packer/pipeline_test/vk_types.h
index c14969ec..098a5900 100644
--- a/AE/engine/tests/asset_packer/pipeline_test/vk_types.h
+++ b/AE/engine/tests/asset_packer/pipeline_test/vk_types.h
@@ -1,6 +1,6 @@
 #ifndef VB_3_Pos_DEFINED
 #   define VB_3_Pos_DEFINED
-    // size: 12, align: 4 (16)
+    // size: 12, align: 4
     struct VB_3_Pos
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0xea1d5fa6u}};  // 'VB_3_Pos'
@@ -8,8 +8,8 @@
         packed_float3  Position;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_3_Pos, Position) == 0 );
-    STATIC_ASSERT( sizeof(VB_3_Pos) == 12 );
+    StaticAssert( offsetof(VB_3_Pos, Position) == 0 );
+    StaticAssert( sizeof(VB_3_Pos) == 12 );
 
 #ifndef PushConst1_DEFINED
 #   define PushConst1_DEFINED
@@ -22,9 +22,9 @@
         float2  bias;
     };
 #endif
-    STATIC_ASSERT( offsetof(PushConst1, scale) == 0 );
-    STATIC_ASSERT( offsetof(PushConst1, bias) == 8 );
-    STATIC_ASSERT( sizeof(PushConst1) == 16 );
+    StaticAssert( offsetof(PushConst1, scale) == 0 );
+    StaticAssert( offsetof(PushConst1, bias) == 8 );
+    StaticAssert( sizeof(PushConst1) == 16 );
 
 #ifndef PushConst2_DEFINED
 #   define PushConst2_DEFINED
@@ -36,8 +36,8 @@
         float4  color;
     };
 #endif
-    STATIC_ASSERT( offsetof(PushConst2, color) == 0 );
-    STATIC_ASSERT( sizeof(PushConst2) == 16 );
+    StaticAssert( offsetof(PushConst2, color) == 0 );
+    StaticAssert( sizeof(PushConst2) == 16 );
 
 #ifndef UBlock_DEFINED
 #   define UBlock_DEFINED
@@ -49,8 +49,8 @@
         float4x4_storage  mvp;
     };
 #endif
-    STATIC_ASSERT( offsetof(UBlock, mvp) == 0 );
-    STATIC_ASSERT( sizeof(UBlock) == 64 );
+    StaticAssert( offsetof(UBlock, mvp) == 0 );
+    StaticAssert( sizeof(UBlock) == 64 );
 
 #ifndef BufferRef_DEFINED
 #   define BufferRef_DEFINED
@@ -63,13 +63,13 @@
         float2  Texcoord;
     };
 #endif
-    STATIC_ASSERT( offsetof(BufferRef, Position) == 0 );
-    STATIC_ASSERT( offsetof(BufferRef, Texcoord) == 16 );
-    STATIC_ASSERT( sizeof(BufferRef) == 32 );
+    StaticAssert( offsetof(BufferRef, Position) == 0 );
+    StaticAssert( offsetof(BufferRef, Texcoord) == 16 );
+    StaticAssert( sizeof(BufferRef) == 32 );
 
 #ifndef vb_input1_DEFINED
 #   define vb_input1_DEFINED
-    // size: 16, align: 4 (16)
+    // size: 16, align: 4
     struct vb_input1
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x892b138u}};  // 'vb_input1'
@@ -78,13 +78,13 @@
         packed_ushort2  Texcoord;
     };
 #endif
-    STATIC_ASSERT( offsetof(vb_input1, Position) == 0 );
-    STATIC_ASSERT( offsetof(vb_input1, Texcoord) == 12 );
-    STATIC_ASSERT( sizeof(vb_input1) == 16 );
+    StaticAssert( offsetof(vb_input1, Position) == 0 );
+    StaticAssert( offsetof(vb_input1, Texcoord) == 12 );
+    StaticAssert( sizeof(vb_input1) == 16 );
 
 #ifndef VB_3_Attribs_DEFINED
 #   define VB_3_Attribs_DEFINED
-    // size: 8, align: 4 (16)
+    // size: 8, align: 4
     struct VB_3_Attribs
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x93789f1bu}};  // 'VB_3_Attribs'
@@ -92,6 +92,6 @@
         packed_float2  Texcoord;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_3_Attribs, Texcoord) == 0 );
-    STATIC_ASSERT( sizeof(VB_3_Attribs) == 8 );
+    StaticAssert( offsetof(VB_3_Attribs, Texcoord) == 0 );
+    StaticAssert( sizeof(VB_3_Attribs) == 8 );
 
diff --git a/AE/engine/tests/asset_packer/sampler_test/samplers.as b/AE/engine/tests/asset_packer/sampler_test/samplers.as
index 29270ceb..03fd8121 100644
--- a/AE/engine/tests/asset_packer/sampler_test/samplers.as
+++ b/AE/engine/tests/asset_packer/sampler_test/samplers.as
@@ -33,7 +33,7 @@ void ASmain ()
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
     }
     {
-        RC<Sampler>     samp = Sampler( "AnisotrophyRepeat" );
+        RC<Sampler>     samp = Sampler( "AnisotropyRepeat" );
         samp.AddFeatureSet( "MinDesktop" );
         samp.Filter( EFilter::Linear, EFilter::Linear, EMipmapFilter::Linear );
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
diff --git a/AE/engine/tests/asset_packer/sampler_test/test1_ref.txt b/AE/engine/tests/asset_packer/sampler_test/test1_ref.txt
index c40a9ec9..555422b4 100644
--- a/AE/engine/tests/asset_packer/sampler_test/test1_ref.txt
+++ b/AE/engine/tests/asset_packer/sampler_test/test1_ref.txt
@@ -28,27 +28,28 @@ Sampler{
   reductionMode: Average
   features:      { 'MinimalFS' }
 --------------
-name:  'LinearMipmapClamp'
+name:  'AnisotropyRepeat'
 Sampler{
   usage:         Default
   magFilter:     Linear
   minFilter:     Linear
   mipmapMode:    Linear
-  addressMode:   ( ClampToEdge, ClampToEdge, ClampToEdge )
+  addressMode:   ( Repeat, Repeat, Repeat )
   mipLodBias:    0.000000
+  maxAnisotropy: 12.000000
   minLod:        -1000.000000
   maxLod:        1000.000000
   borderColor:   FloatTransparentBlack
   unnormCoord:   false
   reductionMode: Average
-  features:      { 'MinimalFS' }
+  features:      { 'MinimalFS', 'MinDesktop' }
 --------------
-name:  'LinearClamp'
+name:  'LinearMipmapClamp'
 Sampler{
   usage:         Default
   magFilter:     Linear
   minFilter:     Linear
-  mipmapMode:    Nearest
+  mipmapMode:    Linear
   addressMode:   ( ClampToEdge, ClampToEdge, ClampToEdge )
   mipLodBias:    0.000000
   minLod:        -1000.000000
@@ -58,13 +59,13 @@ Sampler{
   reductionMode: Average
   features:      { 'MinimalFS' }
 --------------
-name:  'NearestRepeat'
+name:  'LinearClamp'
 Sampler{
   usage:         Default
-  magFilter:     Nearest
-  minFilter:     Nearest
+  magFilter:     Linear
+  minFilter:     Linear
   mipmapMode:    Nearest
-  addressMode:   ( Repeat, Repeat, Repeat )
+  addressMode:   ( ClampToEdge, ClampToEdge, ClampToEdge )
   mipLodBias:    0.000000
   minLod:        -1000.000000
   maxLod:        1000.000000
@@ -73,21 +74,20 @@ Sampler{
   reductionMode: Average
   features:      { 'MinimalFS' }
 --------------
-name:  'AnisotrophyRepeat'
+name:  'NearestRepeat'
 Sampler{
   usage:         Default
-  magFilter:     Linear
-  minFilter:     Linear
-  mipmapMode:    Linear
+  magFilter:     Nearest
+  minFilter:     Nearest
+  mipmapMode:    Nearest
   addressMode:   ( Repeat, Repeat, Repeat )
   mipLodBias:    0.000000
-  maxAnisotropy: 12.000000
   minLod:        -1000.000000
   maxLod:        1000.000000
   borderColor:   FloatTransparentBlack
   unnormCoord:   false
   reductionMode: Average
-  features:      { 'MinimalFS', 'MinDesktop' }
+  features:      { 'MinimalFS' }
 --------------
 name:  'LinearRepeat'
 Sampler{
diff --git a/AE/engine/tests/base/UnitTest_ChunkList.cpp b/AE/engine/tests/base/UnitTest_ChunkList.cpp
new file mode 100644
index 00000000..bd08818d
--- /dev/null
+++ b/AE/engine/tests/base/UnitTest_ChunkList.cpp
@@ -0,0 +1,78 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static void  ChunkList_Test1 ()
+    {
+        using C = ChunkList< void* >::Chunk;
+        StaticAssert( alignof(C) == AE_CACHE_LINE );
+        TEST( C::CalcChunkSize( 62 ) == sizeof(void*)*64 );
+    }
+
+
+    static void  ChunkList_Test2 ()
+    {
+        using T = DebugInstanceCounter< uint, 1 >;
+
+        T::ClearStatistic();
+        {
+            UntypedAllocator    alloc;
+            ChunkList<T>        list;
+            uint                i   = 0;
+
+            for (uint j = 0; j < 10; ++j)
+            {
+                auto    chunk = list.AddChunk( alloc, 64 );
+                TEST( not chunk.empty() );
+
+                for (; not chunk->IsFull();) {
+                    chunk->emplace_back( T{++i} );
+                }
+            }
+
+            {
+                // empty chunk
+                auto    chunk = list.AddChunk( alloc, 64 );
+                TEST( not chunk.empty() );
+            }{
+                // empty chunk
+                auto    chunk = list.AddChunk( alloc, 64 );
+                TEST( not chunk.empty() );
+            }
+
+            // test iterator
+            {
+                uint    a = 0;
+                for (auto it = list.begin(); it != list.end(); ++it)
+                {
+                    TEST( *it == T{++a} );
+                }
+                TEST( a == i );
+            }
+
+            //
+            {
+                auto    last = list.LastChunk();
+                uint    a    = 0;
+                for (auto it = last.begin(); it != last.end(); ++it) {
+                    ++a;
+                }
+                TEST( a == 0 );
+            }
+
+            list.Destroy( alloc );
+        }
+        TEST( T::CheckStatistic() );
+    }
+}
+
+
+extern void UnitTest_ChunkList ()
+{
+    ChunkList_Test1();
+    ChunkList_Test2();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/base/UnitTest_Color.cpp b/AE/engine/tests/base/UnitTest_Color.cpp
index 59845b41..fe10a754 100644
--- a/AE/engine/tests/base/UnitTest_Color.cpp
+++ b/AE/engine/tests/base/UnitTest_Color.cpp
@@ -30,12 +30,12 @@ namespace
         HSVColor    hsv3{ 0.5f, 0.75f, 0.5f };
         RGBA32f     rgba2{ hsv3 };
         HSVColor    hsv4{ rgba2 };
-        TEST(All(Equals( hsv3, hsv4 )));
+        TEST(All(Equal( hsv3, hsv4 )));
 
         HSVColor    hsv5{ 0.75f, 0.87f, 0.95f };
         RGBA32f     rgba3{ hsv5 };
         HSVColor    hsv6{ rgba3 };
-        TEST(All(Equals( hsv5, hsv6 )));
+        TEST(All(Equal( hsv5, hsv6 )));
     }
 }
 
diff --git a/AE/engine/tests/base/UnitTest_DataSource.cpp b/AE/engine/tests/base/UnitTest_DataSource.cpp
index eacf0acf..b7a34766 100644
--- a/AE/engine/tests/base/UnitTest_DataSource.cpp
+++ b/AE/engine/tests/base/UnitTest_DataSource.cpp
@@ -346,7 +346,7 @@ namespace
     {
         const ulong file_size   = 128ull << 20; // Mb
         const uint  buf_size    = 4u << 10;     // Kb
-        STATIC_ASSERT( IsMultipleOf( file_size, buf_size ));
+        StaticAssert( IsMultipleOf( file_size, buf_size ));
 
         const Path      fname {"stream1_data.bin"};
         {
@@ -399,7 +399,7 @@ namespace
     {
         const ulong file_size   = 128ull << 20; // Mb
         const uint  buf_size    = 4u << 10;     // Kb
-        STATIC_ASSERT( IsMultipleOf( file_size, buf_size ));
+        StaticAssert( IsMultipleOf( file_size, buf_size ));
 
         const Path      fname {"file1_data.bin"};
         {
@@ -456,13 +456,6 @@ namespace
 
 extern void UnitTest_DataSource ()
 {
-    const Path  curr    = FileSystem::CurrentPath();
-    const Path  folder  {AE_CURRENT_DIR "/ds_test"};
-
-    FileSystem::RemoveAll( folder );
-    FileSystem::CreateDirectories( folder );
-    TEST( FileSystem::SetCurrentPath( folder ));
-
     #ifdef AE_ENABLE_BROTLI
     BrotliStream_Test1();
     BrotliStream_Test2();
@@ -477,8 +470,17 @@ extern void UnitTest_DataSource ()
     FastStream_Test3();
     FastStream_Test4();
 
+
     // minimize disk usage for debug build
-  #ifdef AE_RELEASE
+  #if defined(AE_RELEASE) and not defined(AE_PLATFORM_ANDROID)
+
+    const Path  curr    = FileSystem::CurrentPath();
+    const Path  folder  {AE_CURRENT_DIR "/ds_test"};
+
+    FileSystem::RemoveAll( folder );
+    FileSystem::CreateDirectories( folder );
+    TEST( FileSystem::SetCurrentPath( folder ));
+
     Stream_Test1< FileRStream,      FileWStream >();
     File_Test1<   FileRDataSource,  FileWDataSource >( false );
 
@@ -491,9 +493,9 @@ extern void UnitTest_DataSource ()
         File_Test1<   FileRDataSource,      WinWFileDataSource  >( false );
         File_Test1<   WinRFileDataSource,   WinWFileDataSource  >( true );
     #endif
-  #endif
 
     FileSystem::SetCurrentPath( curr );
+  #endif
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_Date.cpp b/AE/engine/tests/base/UnitTest_Date.cpp
index bc973c02..02debd8f 100644
--- a/AE/engine/tests/base/UnitTest_Date.cpp
+++ b/AE/engine/tests/base/UnitTest_Date.cpp
@@ -6,14 +6,14 @@ namespace
 {
     static void  Date_Test1 ()
     {
-        STATIC_ASSERT( sizeof(Date) == sizeof(ulong) );
+        StaticAssert( sizeof(Date) == sizeof(ulong) );
 
         Date    d = Date::Now();
 
         Date    d0 = d;
         TEST( d0 == d );
 
-        ThreadUtils::Sleep( milliseconds{1000} );
+        ThreadUtils::MilliSleep( milliseconds{1000} );
         d0 = Date::Now();
 
         TEST( d0 != d  );
@@ -22,12 +22,68 @@ namespace
 
         d0.SetMillisecondsSince1970( d.ToMillisecondsSince1970() );
         TEST( d0 == d );
+        TEST( d0.Month() == d.Month() );
+        TEST_Eq( d0.DayOfMonth(), d.DayOfMonth() );
+        TEST_Eq( d0.WeekOfYear(), d.WeekOfYear() );
+        TEST_Eq( d0.DayOfYear(), d.DayOfYear() );
+        TEST( d0.DayOfWeek() == d.DayOfWeek() );
+    }
+
+
+    static void  Date_Test2 ()
+    {
+        const char      format1[]   = "yyyy/mm.dm - hh:mi:ss ms";
+        const char      format2[]   = "yy//mm/dm (dee), dww|mmm  dwww -> mmmm";
+
+        const ulong     min_ms      = Date::MillisInMinute();
+        const ulong     hour_ms     = Date::MillisInHour();
+        const ulong     day_ms      = Date::MillisInDay();
+        const ulong     y2024_ms    = ulong(365*54 + 13) * day_ms;
+
+        {
+            Date    d;
+            d.SetMillisecondsSince1970( y2024_ms );
+
+            TEST_Eq( "2024/01.01 - 00:00:00 000", d.ToString( format1 ));
+            TEST_Eq( "24//01/01 (001), Mon|Jan  Monday -> January", d.ToString( format2 ));
+        }{
+            Date    d;
+            d.SetMillisecondsSince1970( y2024_ms + 2*day_ms + 12*hour_ms + 59*min_ms + 22'000 + 999 );
+
+            TEST_Eq( "2024/01.03 - 12:59:22 999", d.ToString( format1 ));
+            TEST_Eq( "24//01/03 (003), Wed|Jan  Wednesday -> January", d.ToString( format2 ));
+        }
+    }
+
+
+    static void  Date_Test3 ()
+    {
+        const ulong     y2024_ms = ulong(365*54 + 13) * Date::MillisInDay();
+        Date            d;  d.SetMillisecondsSince1970( y2024_ms );
+
+        TEST( d.Year() == 2024 );
+        TEST( d.Month() == Date::EMonth::Jan );
+        TEST( d.DayOfMonth() == 1 );
+        TEST( d.DayOfYear() == 1 );
+        TEST( d.DayOfWeek() == Date::EWeekDay::Mon );
+        TEST( d.IsLeapYear() );
+
+        Date::Builder   b {d};
+
+        for (uint dw = 1, dy = 1;; ++dw, ++dy)
+        {
+            if ( dw >= uint(Date::EWeekDay::_Count) )
+                dw = uint(Date::EWeekDay::Mon);
+
+            if ( dy >= b->DaysInYear() )
+                break;
 
-        const char format1[] = "yyyy/mm.dm - hh:mi:ss ms";
-        const char format2[] = "yy//mm/dm (dee), dww|mmm  dwww -> mmmm";
+            b.DayOfYear( dy );
+            b.CalcMonthAndDayOfMonth();
+            b.CalcDayOfWeek();
 
-        AE_LOGI( "Date with format \""s << format1 << "\":\n" << d.ToString( format1 ));
-        AE_LOGI( "Date with format \""s << format2 << "\":\n" << d.ToString( format2 ));
+            TEST( b->DayOfWeek() == Date::EWeekDay(dw) );
+        }
     }
 }
 
@@ -35,6 +91,8 @@ namespace
 extern void UnitTest_Date ()
 {
     Date_Test1();
+    Date_Test2();
+    Date_Test3();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_FileSystem.cpp b/AE/engine/tests/base/UnitTest_FileSystem.cpp
index 2c5fb589..14c3e598 100644
--- a/AE/engine/tests/base/UnitTest_FileSystem.cpp
+++ b/AE/engine/tests/base/UnitTest_FileSystem.cpp
@@ -41,7 +41,9 @@ namespace
 
 extern void UnitTest_FileSystem ()
 {
-#ifndef AE_PLATFORM_EMSCRIPTEN
+#if not defined(AE_PLATFORM_EMSCRIPTEN) and\
+    not defined(AE_PLATFORM_ANDROID)
+
     if ( not FileSystem::SetCurrentPath( AE_CURRENT_DIR "/fs_test" ))
         TEST( FileSystem::FindAndSetCurrent( "fs_test", 5 ));
 
diff --git a/AE/engine/tests/base/UnitTest_FixedArray.cpp b/AE/engine/tests/base/UnitTest_FixedArray.cpp
index 4cc2e8bf..f186cd79 100644
--- a/AE/engine/tests/base/UnitTest_FixedArray.cpp
+++ b/AE/engine/tests/base/UnitTest_FixedArray.cpp
@@ -103,19 +103,19 @@ namespace
         constexpr usize a1 = sizeof(FixedArray<char, 8>);
         constexpr usize a2 = alignof(FixedArray<char, 8>);
 
-        STATIC_ASSERT( a1 == (1 + 8) );
-        STATIC_ASSERT( a2 == 1 );
+        StaticAssert( a1 == (1 + 8) );
+        StaticAssert( a2 == 1 );
 
         constexpr usize b1 = sizeof(FixedArray<double, 8>);
         constexpr usize b2 = alignof(FixedArray<double, 8>);
 
     #if defined(AE_PLATFORM_ANDROID) and defined(__i386__)
-        STATIC_ASSERT( alignof(double) == 4 );
-        STATIC_ASSERT( b1 == (4 + 8*8) );
-        STATIC_ASSERT( b2 == 4 );
+        StaticAssert( alignof(double) == 4 );
+        StaticAssert( b1 == (4 + 8*8) );
+        StaticAssert( b2 == 4 );
     #else
-        STATIC_ASSERT( b1 == (8 + 8*8) );
-        STATIC_ASSERT( b2 == 8 );
+        StaticAssert( b1 == (8 + 8*8) );
+        StaticAssert( b2 == 8 );
     #endif
     }
 
@@ -145,6 +145,16 @@ namespace
         }
         TEST( T::CheckStatistic() );
     }
+
+
+    static void  FixedArray_Test6 ()
+    {
+        struct alignas(64) Elem {};
+
+        using Arr_t = FixedArray< Elem, 8 >;
+
+        StaticAssert( alignof(Arr_t) == alignof(Elem) );
+    }
 }
 
 
@@ -155,6 +165,7 @@ extern void UnitTest_FixedArray ()
     FixedArray_Test3();
     FixedArray_Test4();
     FixedArray_Test5();
+    FixedArray_Test6();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_FixedMap.cpp b/AE/engine/tests/base/UnitTest_FixedMap.cpp
index 7af2c6a8..7cb35a4c 100644
--- a/AE/engine/tests/base/UnitTest_FixedMap.cpp
+++ b/AE/engine/tests/base/UnitTest_FixedMap.cpp
@@ -176,6 +176,16 @@ namespace
         TEST( T1::CheckStatistic() );
         TEST( T2::CheckStatistic() );
     }
+
+
+    static void  FixedMap_Test7 ()
+    {
+        struct alignas(64) Elem {};
+
+        using Map_t = FixedMap< int, Elem, 8 >;
+
+        StaticAssert( alignof(Map_t) == alignof(Elem) );
+    }
 }
 
 
@@ -187,6 +197,7 @@ extern void UnitTest_FixedMap ()
     FixedMap_Test4();
     FixedMap_Test5();
     FixedMap_Test6();
+    FixedMap_Test7();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_FixedSet.cpp b/AE/engine/tests/base/UnitTest_FixedSet.cpp
index fce0fa29..8b2b9853 100644
--- a/AE/engine/tests/base/UnitTest_FixedSet.cpp
+++ b/AE/engine/tests/base/UnitTest_FixedSet.cpp
@@ -166,6 +166,16 @@ namespace
         }
         TEST( T1::CheckStatistic() );
     }
+
+
+    static void  FixedSet_Test7 ()
+    {
+        struct alignas(64) Elem {};
+
+        using Set_t = FixedSet< Elem, 8 >;
+
+        StaticAssert( alignof(Set_t) == alignof(Elem) );
+    }
 }
 
 
@@ -177,6 +187,7 @@ extern void UnitTest_FixedSet ()
     FixedSet_Test4();
     FixedSet_Test5();
     FixedSet_Test6();
+    FixedSet_Test7();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_FixedTupleArray.cpp b/AE/engine/tests/base/UnitTest_FixedTupleArray.cpp
index 07f3d7e1..ecfa07f9 100644
--- a/AE/engine/tests/base/UnitTest_FixedTupleArray.cpp
+++ b/AE/engine/tests/base/UnitTest_FixedTupleArray.cpp
@@ -197,6 +197,18 @@ namespace
         TEST( T1::CheckStatistic() );
         TEST( T2::CheckStatistic() );
     }
+
+
+    static void  FixedTupleArray_Test6 ()
+    {
+        struct alignas(64) Elem1 {};
+        struct alignas(16) Elem2 {};
+
+        using TupleArr_t = FixedTupleArray< 8, Elem1, Elem2 >;
+
+        StaticAssert( alignof(TupleArr_t) >= alignof(Elem1) );
+        StaticAssert( alignof(TupleArr_t) >= alignof(Elem2) );
+    }
 }
 
 
@@ -207,6 +219,7 @@ extern void UnitTest_FixedTupleArray ()
     FixedTupleArray_Test3();
     FixedTupleArray_Test4();
     FixedTupleArray_Test5();
+    FixedTupleArray_Test6();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_FunctionInfo.cpp b/AE/engine/tests/base/UnitTest_FunctionInfo.cpp
index c9f1391a..ad08d599 100644
--- a/AE/engine/tests/base/UnitTest_FunctionInfo.cpp
+++ b/AE/engine/tests/base/UnitTest_FunctionInfo.cpp
@@ -19,37 +19,37 @@ extern void UnitTest_FunctionInfo ()
 {
     {
         using fi = FunctionInfo< decltype(&Cl::F1) >;
-        STATIC_ASSERT( fi::is_const );
-        STATIC_ASSERT( not fi::is_volatile );
-        STATIC_ASSERT( not fi::is_noexcept );
-        STATIC_ASSERT( IsSameTypes< Cl, fi::clazz > );
-        STATIC_ASSERT( IsSameTypes< fi::type, void (Cl::*)(int) const > );
+        StaticAssert( fi::is_const );
+        StaticAssert( not fi::is_volatile );
+        StaticAssert( not fi::is_noexcept );
+        StaticAssert( IsSameTypes< Cl, fi::clazz > );
+        StaticAssert( IsSameTypes< fi::type, void (Cl::*)(int) const > );
     }{
         using fi = FunctionInfo< decltype(&Cl::F2) >;
-        STATIC_ASSERT( not fi::is_const );
-        STATIC_ASSERT( fi::is_volatile );
-        STATIC_ASSERT( not fi::is_noexcept );
-        STATIC_ASSERT( IsSameTypes< Cl, fi::clazz > );
-        STATIC_ASSERT( IsSameTypes< fi::type, bool (Cl::*)(float, int) volatile > );
+        StaticAssert( not fi::is_const );
+        StaticAssert( fi::is_volatile );
+        StaticAssert( not fi::is_noexcept );
+        StaticAssert( IsSameTypes< Cl, fi::clazz > );
+        StaticAssert( IsSameTypes< fi::type, bool (Cl::*)(float, int) volatile > );
     }{
         using fi = FunctionInfo< decltype(&Cl::F3) >;
-        STATIC_ASSERT( fi::is_const );
-        STATIC_ASSERT( fi::is_volatile );
-        STATIC_ASSERT( not fi::is_noexcept );
-        STATIC_ASSERT( IsSameTypes< Cl, fi::clazz > );
-        STATIC_ASSERT( IsSameTypes< fi::type, int (Cl::*)() const volatile > );
+        StaticAssert( fi::is_const );
+        StaticAssert( fi::is_volatile );
+        StaticAssert( not fi::is_noexcept );
+        StaticAssert( IsSameTypes< Cl, fi::clazz > );
+        StaticAssert( IsSameTypes< fi::type, int (Cl::*)() const volatile > );
     }{
         using fi = FunctionInfo< decltype(&Cl::F4) >;
-        STATIC_ASSERT( not fi::is_const );
-        STATIC_ASSERT( not fi::is_volatile );
-        STATIC_ASSERT( not fi::is_noexcept );
-        STATIC_ASSERT( IsSameTypes< void, fi::clazz > );
-        STATIC_ASSERT( IsSameTypes< fi::type, void (*)(double, int) > );
+        StaticAssert( not fi::is_const );
+        StaticAssert( not fi::is_volatile );
+        StaticAssert( not fi::is_noexcept );
+        StaticAssert( IsSameTypes< void, fi::clazz > );
+        StaticAssert( IsSameTypes< fi::type, void (*)(double, int) > );
     }{
         using fi = FunctionInfo< decltype(&Cl::F5) >;
-        STATIC_ASSERT( not fi::is_const );
-        STATIC_ASSERT( not fi::is_volatile );
-        STATIC_ASSERT( fi::is_noexcept );
+        StaticAssert( not fi::is_const );
+        StaticAssert( not fi::is_volatile );
+        StaticAssert( fi::is_noexcept );
     }
 
     TEST_PASSED();
diff --git a/AE/engine/tests/base/UnitTest_Iterators.cpp b/AE/engine/tests/base/UnitTest_Iterators.cpp
index 2c7ae9ed..556220b5 100644
--- a/AE/engine/tests/base/UnitTest_Iterators.cpp
+++ b/AE/engine/tests/base/UnitTest_Iterators.cpp
@@ -7,7 +7,8 @@ namespace
     static void  Iterators_Test1 ()
     {
         {
-            ArrayView<float>    arr { 1.f, 2.f, 3.f, 4.f, 5.f };
+            const float         temp[] = { 1.f, 2.f, 3.f, 4.f, 5.f };
+            ArrayView<float>    arr {temp};
             usize               j = 0;
 
             for (usize i : IndicesOnly(arr))
@@ -48,13 +49,14 @@ namespace
     static void  Iterators_Test2 ()
     {
         {
-            ArrayView<float>    arr { 1.f, 2.f, 3.f, 4.f, 5.f };
+            const float         temp[] = { 1.f, 2.f, 3.f, 4.f, 5.f };
+            ArrayView<float>    arr {temp};
             usize               j = 0;
 
             for (auto [e, i] : WithIndex(arr))
             {
-                STATIC_ASSERT( IsSameTypes< decltype(e), const float >);
-                STATIC_ASSERT( IsSameTypes< decltype(i), usize >);
+                StaticAssert( IsSameTypes< decltype(e), const float >);
+                StaticAssert( IsSameTypes< decltype(i), usize >);
 
                 TEST( i == j );
                 TEST( e == arr[j] );
@@ -67,8 +69,8 @@ namespace
                 j = 0;
                 for (const auto& [e, i] : WithIndex(arr))       // error in clang
                 {
-                    STATIC_ASSERT( IsSameTypes< decltype(e), const float >);
-                    STATIC_ASSERT( IsSameTypes< decltype(i), const usize >);
+                    StaticAssert( IsSameTypes< decltype(e), const float >);
+                    StaticAssert( IsSameTypes< decltype(i), const usize >);
 
                     TEST( i == j );
                     TEST( e == arr[j] );
@@ -84,8 +86,8 @@ namespace
 
             for (auto&& [e, i] : WithIndex(arr))
             {
-                STATIC_ASSERT( IsSameTypes< decltype(e), float >);
-                STATIC_ASSERT( IsSameTypes< decltype(i), usize >);
+                StaticAssert( IsSameTypes< decltype(e), float >);
+                StaticAssert( IsSameTypes< decltype(i), usize >);
 
                 TEST( i == j );
                 TEST( e == arr[j] );
diff --git a/AE/engine/tests/base/UnitTest_Math.cpp b/AE/engine/tests/base/UnitTest_Math.cpp
index 4068b78c..63ea9e94 100644
--- a/AE/engine/tests/base/UnitTest_Math.cpp
+++ b/AE/engine/tests/base/UnitTest_Math.cpp
@@ -59,7 +59,10 @@ namespace
         float e3 = MirroredWrap( 5.0f, 1.0f, 5.0f );                TEST( BitEqual( e3, 5.0f ));
         float e4 = MirroredWrap( 0.0f, 1.0f, 5.0f );                TEST( BitEqual( e4, 2.0f ));
     //  float e5 = MirroredWrap( Infinity<float>(), 1.0f, 5.0f );   TEST( BitEqual( e5, 1.0f ));
+
+      #ifndef AE_CFG_RELEASE
         float e6 = MirroredWrap( NaN<float>(), 1.0f, 5.0f );        TEST( IsNaN( e6 ));
+      #endif
     }
 
 
@@ -76,8 +79,8 @@ namespace
 
     static void  Float16_Test1 ()
     {
-        STATIC_ASSERT( IsScalar<SFloat16> );
-        STATIC_ASSERT( IsAnyFloatPoint<SFloat16> );
+        StaticAssert( IsScalar<SFloat16> );
+        StaticAssert( IsAnyFloatPoint<SFloat16> );
 
         const float     f1  = 0.f;
         const half      h1  {f1};
@@ -87,40 +90,40 @@ namespace
         const float     f2  = 1.11f;
         const half      h2  {f2};
         const float     hf2 = float{h2};
-        TEST( Equals( hf2, f2, 0.0004f ));
+        TEST( Equal( hf2, f2, 0.0004f ));
 
         const float     f3  = -0.3456f;
         const half      h3  {f3};
         const float     hf3 = float{h3};
-        TEST( Equals( hf3, f3, 0.0004f ));
+        TEST( Equal( hf3, f3, 0.0004f ));
 
         const half      h4  = half::Max();
         const float     hf4 = float{h4};
-        TEST( Equals( hf4, 65504.0f, half::Epsilon() ));
+        TEST( Equal( hf4, 65504.0f, half::Epsilon() ));
 
         const half      h5  = half::Min();
         const float     hf5 = float{h5};
-        TEST( Equals( hf5, 0.000000059604645f, half::Epsilon() ));
+        TEST( Equal( hf5, 0.000000059604645f, half::Epsilon() ));
     }
 
 
     static void  UFloat16_Test1 ()
     {
-        STATIC_ASSERT( IsScalar<UFloat16> );
-        STATIC_ASSERT( IsAnyFloatPoint<UFloat16> );
+        StaticAssert( IsScalar<UFloat16> );
+        StaticAssert( IsAnyFloatPoint<UFloat16> );
 
         const UFloat16  h1  = UFloat16::Max();
         const float     hf1 = float{h1};
-        TEST( Equals( hf1, 4292870144.0f, UFloat16::Epsilon() ));
+        TEST( Equal( hf1, 4292870144.0f, UFloat16::Epsilon() ));
 
         const float     f2  = 4292870144.0f;
         const UFloat16  h2  {f2};
         const float     hf2 = float{h2};
-        TEST( Equals( hf2, f2, UFloat16::Epsilon() ));
+        TEST( Equal( hf2, f2, UFloat16::Epsilon() ));
 
         const UFloat16  h3  = UFloat16::Min();
         const float     hf3 = float{h3};
-        TEST( Equals( hf3, 9.09494701772928e-13f, UFloat16::Epsilon() ));
+        TEST( Equal( hf3, 9.09494701772928e-13f, UFloat16::Epsilon() ));
 
         const float     f4  = 0.f;
         const UFloat16  h4  {f4};
@@ -136,14 +139,15 @@ namespace
         const float     f6  = 1.11f;
         const UFloat16  h6  {f6};
         const float     hf6 = float{h6};
-        TEST( Equals( hf6, f6, 0.0004f ));
+        TEST( Equal( hf6, f6, 0.0004f ));
 
         const UFloat16  h7  = UFloat16{}.SetFast( f6 );
         TEST( h6 == h7 );
 
         const float     hf7 = h7.GetFast();
-        TEST( Equals( hf7, f6, 0.0004f ));
+        TEST( Equal( hf7, f6, 0.0004f ));
 
+      #ifndef AE_CFG_RELEASE
         const UFloat16  h8  = UFloat16::Inf();
         const float     hf8 = float{h8};
         TEST( IsInfinity( hf8 ));
@@ -151,42 +155,44 @@ namespace
         const UFloat16  h9  = UFloat16::NaN();
         const float     hf9 = float{h9};
         TEST( IsNaN( hf9 ));
+      #endif
     }
 
 
     static void  UFloat8_Test1 ()
     {
-        STATIC_ASSERT( IsScalar<UFloat8> );
-        STATIC_ASSERT( IsAnyFloatPoint<UFloat8> );
+        StaticAssert( IsScalar<UFloat8> );
+        StaticAssert( IsAnyFloatPoint<UFloat8> );
 
         const UFloat8   a1  {1.0f};
         const float     af1 = float{a1};
-        TEST( Equals( af1, 1.0f, UFloat8::Epsilon() ));
+        TEST( Equal( af1, 1.0f, UFloat8::Epsilon() ));
 
         const UFloat8   a2  {0.0f};
         const float     af2 = float{a2};
-        TEST( Equals( af2, 0.0f, UFloat8::Epsilon() ));
+        TEST( Equal( af2, 0.0f, UFloat8::Epsilon() ));
 
         const UFloat8   a4  {4.0f};
         const float     af4 = float{a4};
-        TEST( Equals( af4, 4.0f, UFloat8::Epsilon() ));
+        TEST( Equal( af4, 4.0f, UFloat8::Epsilon() ));
 
         const UFloat8   a6  {UFloat8::Max()};
         const float     af6 = float{a6};
-        TEST( Equals( af6, 248.0f, UFloat8::Epsilon() ));
+        TEST( Equal( af6, 248.0f, UFloat8::Epsilon() ));
 
         const UFloat8   a7  {UFloat8::Min()};
         const float     af7 = float{a7};
-        TEST( Equals( af7, 1.52587891e-5f, UFloat8::Epsilon() ));
+        TEST( Equal( af7, 1.52587891e-5f, UFloat8::Epsilon() ));
 
         const UFloat8   a8  {1.1f};
         const float     af8 = float{a8};
-        TEST( Equals( af8, 1.0625f, UFloat8::Epsilon() ));
+        TEST( Equal( af8, 1.0625f, UFloat8::Epsilon() ));
 
         const UFloat8   a9  {1.2f};
         const float     af9 = float{a9};
-        TEST( Equals( af9, 1.1875f, UFloat8::Epsilon() ));
+        TEST( Equal( af9, 1.1875f, UFloat8::Epsilon() ));
 
+      #ifndef AE_CFG_RELEASE
         const UFloat8   a10 {UFloat8::Inf()};
         const float     af10 = float{a10};
         TEST( IsInfinity( af10 ));
@@ -194,46 +200,54 @@ namespace
         const UFloat8   a11 {UFloat8::NaN()};
         const float     af11 = float{a11};
         TEST( IsNaN( af11 ));
+      #endif
     }
 
 
-    static void  EqualsWithPercent_Test1 ()
+    static void  EqualWithPercent_Test1 ()
     {
         {
             float   a = 1.f;
             float   b = 1.f;
-            TEST( Equals( a, b, 1_pct ));
+            TEST( Equal( a, b, 1_pct ));
         }{
             float   a = 1.f;
             float   b = 2.f;
-            TEST( Equals( a, b, 50_pct ));
+            TEST( Equal( a, b, 50_pct ));
         }{
             float   a = 2.f;
             float   b = 1.f;
-            TEST( Equals( a, b, 50_pct ));
+            TEST( Equal( a, b, 50_pct ));
         }{
             float   a = 2.0e+20f;
             float   b = 1.0e+20f;
-            TEST( Equals( a, b, 50_pct ));
+            TEST( Equal( a, b, 50_pct ));
         }{
             float   a = 1.0e+20f;
             float   b = 1.1e+20f;
-            TEST( Equals( a, b, 10_pct ));
+            TEST( Equal( a, b, 10_pct ));
         }{
             float   a = 0.f;
             float   b = 0.f;
-            TEST( Equals( a, b, 1_pct ));
+            TEST( Equal( a, b, 1_pct ));
         }{
             float   a = 0.f;
             float   b = 1.f;
-            TEST( not Equals( a, b, 99_pct ));
-            TEST( Equals( a, b, 100_pct ));
+            TEST( not Equal( a, b, 99_pct ));
+            TEST( Equal( a, b, 100_pct ));
         }{
             float   a = 0.f;
             float   b = Epsilon<float>();
-            TEST( Equals( a, b, 0_pct ));
+            TEST( Equal( a, b, 0_pct ));
         }
     }
+
+
+    static void  Bytes_Test1 ()
+    {
+        StaticAssert( not IsScalar<Bytes> );
+        StaticAssert( IsBytes<Bytes> );
+    }
 }
 
 
@@ -252,7 +266,9 @@ extern void UnitTest_Math ()
     UFloat16_Test1();
     UFloat8_Test1();
 
-    EqualsWithPercent_Test1();
+    EqualWithPercent_Test1();
+
+    Bytes_Test1();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_Math_BitMath.cpp b/AE/engine/tests/base/UnitTest_Math_BitMath.cpp
index b92b1980..e28cdbbb 100644
--- a/AE/engine/tests/base/UnitTest_Math_BitMath.cpp
+++ b/AE/engine/tests/base/UnitTest_Math_BitMath.cpp
@@ -8,18 +8,18 @@ namespace
     {
         int val;
         val = IntLog2( 0 );             TEST( val < 0 );
-        val = IntLog2( 0x100 );         TEST( val == 8 );
-        val = IntLog2( 0x101 );         TEST( val == 8 );
-        val = IntLog2( 0x80000000u );   TEST( val == 31 );
-
-        STATIC_ASSERT( CT_IntLog2<0> < 0 );
-        STATIC_ASSERT( CT_IntLog2<0x100> == 8 );
-        STATIC_ASSERT( CT_IntLog2<0x101> == 8 );
-        STATIC_ASSERT( CT_IntLog2<0x80000000u> == 31 );
-        STATIC_ASSERT( CT_IntLog2<0x8000000000000000ull> == 63 );
-
-        STATIC_ASSERT( CT_CeilIntLog2<0x100> == 8 );
-        STATIC_ASSERT( CT_CeilIntLog2<0x101> == 9 );
+        val = IntLog2( 0x100 );         TEST( val == 8 );   TEST( (1u << val) == 0x100 );
+        val = IntLog2( 0x101 );         TEST( val == 8 );   TEST( (1u << val) == 0x100 );
+        val = IntLog2( 0x80000000u );   TEST( val == 31 );  TEST( (1u << val) == 0x80000000u );
+
+        StaticAssert( CT_IntLog2<0> < 0 );
+        StaticAssert( CT_IntLog2<0x100> == 8 );
+        StaticAssert( CT_IntLog2<0x101> == 8 );
+        StaticAssert( CT_IntLog2<0x80000000u> == 31 );
+        StaticAssert( CT_IntLog2<0x8000000000000000ull> == 63 );
+
+        StaticAssert( CT_CeilIntLog2<0x100> == 8 );
+        StaticAssert( CT_CeilIntLog2<0x101> == 9 );
     }
 
 
@@ -60,11 +60,11 @@ namespace
 
     static void  ToBitMask_Test1 ()
     {
-        uint    a0 = ToBitMask<uint>( 0u );                 TEST( a0 == 0 );                STATIC_ASSERT( CT_ToBitMask<uint, 0u >              == 0             );
-        uint    a1 = ToBitMask<uint>( 32u );                TEST( a1 == ~0u );              STATIC_ASSERT( CT_ToBitMask<uint, 32u >             == ~0u           );
-        uint    a2 = ToBitMask<uint>( 5u );                 TEST( a2 == ((1u << 5)-1) );    STATIC_ASSERT( CT_ToBitMask<uint, 5u >              == ((1u << 5)-1) );
-        uint    a3 = ToBitMask<uint>( -1 );                 TEST( a3 == 0 );                //STATIC_ASSERT( CT_ToBitMask<uint, -1 >                == 0         );
-        uint    a4 = ToBitMask<uint>( MinValue<int>() );    TEST( a4 == 0 );                //STATIC_ASSERT( CT_ToBitMask<uint, MinValue<int>() >   == 0         );
+        uint    a0 = ToBitMask<uint>( 0u );                 TEST( a0 == 0 );                StaticAssert( CT_ToBitMask<uint, 0u >               == 0             );
+        uint    a1 = ToBitMask<uint>( 32u );                TEST( a1 == ~0u );              StaticAssert( CT_ToBitMask<uint, 32u >              == ~0u           );
+        uint    a2 = ToBitMask<uint>( 5u );                 TEST( a2 == ((1u << 5)-1) );    StaticAssert( CT_ToBitMask<uint, 5u >               == ((1u << 5)-1) );
+        uint    a3 = ToBitMask<uint>( -1 );                 TEST( a3 == 0 );            //  StaticAssert( CT_ToBitMask<uint, -1 >               == 0             );
+        uint    a4 = ToBitMask<uint>( MinValue<int>() );    TEST( a4 == 0 );            //  StaticAssert( CT_ToBitMask<uint, MinValue<int>() >  == 0             );
     }
 
 
@@ -93,12 +93,12 @@ namespace
 
     static void  IntLog10_Test1 ()
     {
-        constexpr uint  a0 = IntLog10( 0 );     STATIC_ASSERT( a0 == 0 );
-        constexpr uint  a1 = IntLog10( 9 );     STATIC_ASSERT( a1 == 0 );
-        constexpr uint  a2 = IntLog10( 10 );    STATIC_ASSERT( a2 == 1 );
-        constexpr uint  a3 = IntLog10( 99 );    STATIC_ASSERT( a3 == 1 );
-        constexpr uint  a4 = IntLog10( 100 );   STATIC_ASSERT( a4 == 2 );
-        constexpr uint  a5 = IntLog10( ~0u );   STATIC_ASSERT( a5 == 9 );
+        constexpr uint  a0 = IntLog10( 0 );     StaticAssert( a0 == 0 );
+        constexpr uint  a1 = IntLog10( 9 );     StaticAssert( a1 == 0 );
+        constexpr uint  a2 = IntLog10( 10 );    StaticAssert( a2 == 1 );
+        constexpr uint  a3 = IntLog10( 99 );    StaticAssert( a3 == 1 );
+        constexpr uint  a4 = IntLog10( 100 );   StaticAssert( a4 == 2 );
+        constexpr uint  a5 = IntLog10( ~0u );   StaticAssert( a5 == 9 );
 
         uint    b0 = IntLog10( 0 );     TEST_Eq( b0, 0 );
         uint    b1 = IntLog10( 9 );     TEST_Eq( b1, 0 );
@@ -107,6 +107,28 @@ namespace
         uint    b4 = IntLog10( 100 );   TEST_Eq( b4, 2 );
         uint    b5 = IntLog10( ~0u );   TEST_Eq( b5, 9 );
     }
+
+
+    static void  ShuffleBitScan_Test1 ()
+    {
+        {
+            // bits: 4, 28..31
+            const uint  bits = 0xF000'0010;
+
+            int a0 = ShuffleBitScan( bits,  0 );    TEST_Eq( a0,  4 );  TEST( HasBit( bits, a0 ));
+            int a1 = ShuffleBitScan( bits,  1 );    TEST_Eq( a1, 31 );  TEST( HasBit( bits, a1 ));
+            int a2 = ShuffleBitScan( bits, 16 );    TEST_Eq( a2, 28 );  TEST( HasBit( bits, a2 ));
+        }{
+            // bits: 0, 12, 20, 31
+            const uint  bits = 0x8010'1001;
+
+            int a0 = ShuffleBitScan( bits,  0 );    TEST_Eq( a0,  0 );  TEST( HasBit( bits, a0 ));
+            int a1 = ShuffleBitScan( bits,  1 );    TEST_Eq( a1, 31 );  TEST( HasBit( bits, a1 ));
+            int a2 = ShuffleBitScan( bits,  2 );    TEST_Eq( a2, 31 );  TEST( HasBit( bits, a2 ));
+            int a3 = ShuffleBitScan( bits, 12 );    TEST_Eq( a3, 20 );  TEST( HasBit( bits, a3 ));
+            int a4 = ShuffleBitScan( bits, 20 );    TEST_Eq( a4, 12 );  TEST( HasBit( bits, a4 ));
+        }
+    }
 }
 
 
@@ -120,6 +142,7 @@ extern void UnitTest_Math_BitMath ()
     AllBits_Test1();
     AnyBits_Test1();
     IntLog10_Test1();
+    ShuffleBitScan_Test1();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_Math_Frustum.cpp b/AE/engine/tests/base/UnitTest_Math_Frustum.cpp
index b2b638ef..7b5bf577 100644
--- a/AE/engine/tests/base/UnitTest_Math_Frustum.cpp
+++ b/AE/engine/tests/base/UnitTest_Math_Frustum.cpp
@@ -37,10 +37,10 @@ namespace
         float3  rays[4];
         TEST( frustum.GetRays( OUT rays[0], OUT rays[1], OUT rays[2], OUT rays[3] ));
 
-        TEST( All(Equals( rays[0], float3{ 0.6f, -0.4f, -0.69f}, 5_pct )));
-        TEST( All(Equals( rays[1], float3{ 0.6f,  0.4f, -0.69f}, 5_pct )));
-        TEST( All(Equals( rays[2], float3{-0.6f, -0.4f, -0.69f}, 5_pct )));
-        TEST( All(Equals( rays[3], float3{-0.6f,  0.4f, -0.69f}, 5_pct )));
+        TEST( All(Equal( rays[0], float3{ 0.6f, -0.4f, -0.69f}, 5_pct )));
+        TEST( All(Equal( rays[1], float3{ 0.6f,  0.4f, -0.69f}, 5_pct )));
+        TEST( All(Equal( rays[2], float3{-0.6f, -0.4f, -0.69f}, 5_pct )));
+        TEST( All(Equal( rays[3], float3{-0.6f,  0.4f, -0.69f}, 5_pct )));
     }
 
 
diff --git a/AE/engine/tests/base/UnitTest_Math_Matrix.cpp b/AE/engine/tests/base/UnitTest_Math_Matrix.cpp
index d76b7688..57c2dacd 100644
--- a/AE/engine/tests/base/UnitTest_Math_Matrix.cpp
+++ b/AE/engine/tests/base/UnitTest_Math_Matrix.cpp
@@ -10,17 +10,17 @@ namespace
         using CMat4x2_t = MatrixStorage< float, 4, 2, EMatrixOrder::ColumnMajor >;
         using RMat4x2_t = MatrixStorage< float, 2, 4, EMatrixOrder::RowMajor >;
 
-        STATIC_ASSERT( VecSize<CMat4x2_t::Column_t> == 2 );
-        STATIC_ASSERT( VecSize<CMat4x2_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(CMat4x2_t) == sizeof(float) * 4 * 2 );
+        StaticAssert( VecSize<CMat4x2_t::Column_t> == 2 );
+        StaticAssert( VecSize<CMat4x2_t::Row_t> == 4 );
+        StaticAssert( sizeof(CMat4x2_t) == sizeof(float) * 4 * 2 );
 
-        STATIC_ASSERT( VecSize<RMat4x2_t::Column_t> == 2 );
-        STATIC_ASSERT( VecSize<RMat4x2_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(RMat4x2_t) == sizeof(float) * 4 * 2 );
+        StaticAssert( VecSize<RMat4x2_t::Column_t> == 2 );
+        StaticAssert( VecSize<RMat4x2_t::Row_t> == 4 );
+        StaticAssert( sizeof(RMat4x2_t) == sizeof(float) * 4 * 2 );
 
-        STATIC_ASSERT( CMat4x2_t::Dimension().columns == 4 );
-        STATIC_ASSERT( CMat4x2_t::Dimension().rows == 2 );
-        STATIC_ASSERT( CMat4x2_t::Dimension() == RMat4x2_t::Dimension() );
+        StaticAssert( CMat4x2_t::Dimension().columns == 4 );
+        StaticAssert( CMat4x2_t::Dimension().rows == 2 );
+        StaticAssert( CMat4x2_t::Dimension() == RMat4x2_t::Dimension() );
     };
 
 
@@ -30,17 +30,17 @@ namespace
         using CMat4x2_t = MatrixStorage< float, 4, 2, EMatrixOrder::ColumnMajor, sizeof(float)*4 >;
         using RMat4x2_t = MatrixStorage< float, 2, 4, EMatrixOrder::RowMajor, sizeof(float)*4 >;
 
-        STATIC_ASSERT( VecSize<CMat4x2_t::Column_t> == 2 );
-        STATIC_ASSERT( VecSize<CMat4x2_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(CMat4x2_t) == sizeof(float) * 4 * 4 );
+        StaticAssert( VecSize<CMat4x2_t::Column_t> == 2 );
+        StaticAssert( VecSize<CMat4x2_t::Row_t> == 4 );
+        StaticAssert( sizeof(CMat4x2_t) == sizeof(float) * 4 * 4 );
 
-        STATIC_ASSERT( VecSize<RMat4x2_t::Column_t> == 2 );
-        STATIC_ASSERT( VecSize<RMat4x2_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(RMat4x2_t) == sizeof(float) * 4 * 2 );
+        StaticAssert( VecSize<RMat4x2_t::Column_t> == 2 );
+        StaticAssert( VecSize<RMat4x2_t::Row_t> == 4 );
+        StaticAssert( sizeof(RMat4x2_t) == sizeof(float) * 4 * 2 );
 
-        STATIC_ASSERT( CMat4x2_t::Dimension().columns == 4 );
-        STATIC_ASSERT( CMat4x2_t::Dimension().rows == 2 );
-        STATIC_ASSERT( CMat4x2_t::Dimension() == RMat4x2_t::Dimension() );
+        StaticAssert( CMat4x2_t::Dimension().columns == 4 );
+        StaticAssert( CMat4x2_t::Dimension().rows == 2 );
+        StaticAssert( CMat4x2_t::Dimension() == RMat4x2_t::Dimension() );
     };
 
 
@@ -50,17 +50,17 @@ namespace
         using CMat4x3_t = MatrixStorage< float, 4, 3, EMatrixOrder::ColumnMajor >;
         using RMat4x3_t = MatrixStorage< float, 3, 4, EMatrixOrder::RowMajor >;
 
-        STATIC_ASSERT( VecSize<CMat4x3_t::Column_t> == 3 );
-        STATIC_ASSERT( VecSize<CMat4x3_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(CMat4x3_t) == sizeof(float) * 4 * 3 );
+        StaticAssert( VecSize<CMat4x3_t::Column_t> == 3 );
+        StaticAssert( VecSize<CMat4x3_t::Row_t> == 4 );
+        StaticAssert( sizeof(CMat4x3_t) == sizeof(float) * 4 * 3 );
 
-        STATIC_ASSERT( VecSize<RMat4x3_t::Column_t> == 3 );
-        STATIC_ASSERT( VecSize<RMat4x3_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(RMat4x3_t) == sizeof(float) * 4 * 3 );
+        StaticAssert( VecSize<RMat4x3_t::Column_t> == 3 );
+        StaticAssert( VecSize<RMat4x3_t::Row_t> == 4 );
+        StaticAssert( sizeof(RMat4x3_t) == sizeof(float) * 4 * 3 );
 
-        STATIC_ASSERT( CMat4x3_t::Dimension().columns == 4 );
-        STATIC_ASSERT( CMat4x3_t::Dimension().rows == 3 );
-        STATIC_ASSERT( CMat4x3_t::Dimension() == RMat4x3_t::Dimension() );
+        StaticAssert( CMat4x3_t::Dimension().columns == 4 );
+        StaticAssert( CMat4x3_t::Dimension().rows == 3 );
+        StaticAssert( CMat4x3_t::Dimension() == RMat4x3_t::Dimension() );
     };
 
 
@@ -70,17 +70,17 @@ namespace
         using CMat4x3_t = MatrixStorage< float, 4, 3, EMatrixOrder::ColumnMajor, sizeof(float)*4 >;
         using RMat4x3_t = MatrixStorage< float, 3, 4, EMatrixOrder::RowMajor, sizeof(float)*4 >;
 
-        STATIC_ASSERT( VecSize<CMat4x3_t::Column_t> == 3 );
-        STATIC_ASSERT( VecSize<CMat4x3_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(CMat4x3_t) == sizeof(float) * 4 * 4 );
+        StaticAssert( VecSize<CMat4x3_t::Column_t> == 3 );
+        StaticAssert( VecSize<CMat4x3_t::Row_t> == 4 );
+        StaticAssert( sizeof(CMat4x3_t) == sizeof(float) * 4 * 4 );
 
-        STATIC_ASSERT( VecSize<RMat4x3_t::Column_t> == 3 );
-        STATIC_ASSERT( VecSize<RMat4x3_t::Row_t> == 4 );
-        STATIC_ASSERT( sizeof(RMat4x3_t) == sizeof(float) * 4 * 3 );
+        StaticAssert( VecSize<RMat4x3_t::Column_t> == 3 );
+        StaticAssert( VecSize<RMat4x3_t::Row_t> == 4 );
+        StaticAssert( sizeof(RMat4x3_t) == sizeof(float) * 4 * 3 );
 
-        STATIC_ASSERT( CMat4x3_t::Dimension().columns == 4 );
-        STATIC_ASSERT( CMat4x3_t::Dimension().rows == 3 );
-        STATIC_ASSERT( CMat4x3_t::Dimension() == RMat4x3_t::Dimension() );
+        StaticAssert( CMat4x3_t::Dimension().columns == 4 );
+        StaticAssert( CMat4x3_t::Dimension().rows == 3 );
+        StaticAssert( CMat4x3_t::Dimension() == RMat4x3_t::Dimension() );
     };
 
 
@@ -222,10 +222,10 @@ namespace
         TEST( All( m4.get<3>() == float3(10.f, 11.f, 12.f) ));
 
         float4x3    m5{ m2 };
-        TEST( All( m4.get<0>() == float3(1.0f, 2.0f, 3.0f) ));
-        TEST( All( m4.get<1>() == float3(4.0f, 5.0f, 6.0f) ));
-        TEST( All( m4.get<2>() == float3(7.0f, 8.0f, 9.0f) ));
-        TEST( All( m4.get<3>() == float3(10.f, 11.f, 12.f) ));
+        TEST( All( m5.get<0>() == float3(1.0f, 2.0f, 3.0f) ));
+        TEST( All( m5.get<1>() == float3(4.0f, 5.0f, 6.0f) ));
+        TEST( All( m5.get<2>() == float3(7.0f, 8.0f, 9.0f) ));
+        TEST( All( m5.get<3>() == float3(10.f, 11.f, 12.f) ));
 
         rm_float4x3_t   m6{ m2 };
         TEST( All( m6.get<0>() == float4(1.0f, 4.0f, 7.0f, 10.f) ));
@@ -286,23 +286,23 @@ namespace
         {{
             float4  a = p * float4{0.f, 0.f, n, 1.f};   a /= a.w;
             float4  b = p * float4{0.f, 0.f, f, 1.f};   b /= b.w;
-            TEST( Equals( a.z, 0.f ));
-            TEST( Equals( b.z, 1.f ));
+            TEST( Equal( a.z, 0.f ));
+            TEST( Equal( b.z, 1.f ));
         }};
         const auto  TestNearFarInverseZ = [n, f] (const float4x4 &p)
         {{
             float4  a = p * float4{0.f, 0.f, n, 1.f};   a /= a.w;
             float4  b = p * float4{0.f, 0.f, f, 1.f};   b /= b.w;
-            TEST( Equals( a.z, 1.f ));
-            TEST( Equals( b.z, 0.f ));
+            TEST( Equal( a.z, 1.f ));
+            TEST( Equal( b.z, 0.f ));
         }};
         const auto  TestInfinite = [n] (const float4x4 &p)
         {{
             float   i = 1.0e+8f;
             float4  a = p * float4{0.f, 0.f, n, 1.f};   a /= a.w;
             float4  b = p * float4{0.f, 0.f, i, 1.f};   b /= b.w;
-            TEST( Equals( a.z, 0.f ));
-            TEST( Equals( b.z, 1.f ));
+            TEST( Equal( a.z, 0.f ));
+            TEST( Equal( b.z, 1.f ));
 
             i = 6710886.50f;
             for (float z = n + 0.1f, prev = 0.f; z < i; z *= 2.f)
@@ -317,8 +317,8 @@ namespace
             float   i = 1.0e+8f;
             float4  a = p * float4{0.f, 0.f, n, 1.f};   a /= a.w;
             float4  b = p * float4{0.f, 0.f, i, 1.f};   b /= b.w;
-            TEST( Equals( a.z, 1.f ));
-            TEST( Equals( b.z, 0.f ));
+            TEST( Equal( a.z, 1.f ));
+            TEST( Equal( b.z, 0.f ));
         }};
 
         auto    p0 = float4x4::Perspective( 60_deg, 1.5f, float2{n, f} );
diff --git a/AE/engine/tests/base/UnitTest_Math_PhysicalQuantity.cpp b/AE/engine/tests/base/UnitTest_Math_PhysicalQuantity.cpp
index 34e89241..ed44c3e8 100644
--- a/AE/engine/tests/base/UnitTest_Math_PhysicalQuantity.cpp
+++ b/AE/engine/tests/base/UnitTest_Math_PhysicalQuantity.cpp
@@ -8,17 +8,17 @@ namespace
     {
         using Dim = DefaultPhysicalDimensions;
 
-        STATIC_ASSERT( Dim::MeterPerSecond::meters.num == 1 );
-        STATIC_ASSERT( Dim::MeterPerSecond::meters.den == 1 );
-        STATIC_ASSERT( Dim::MeterPerSecond::seconds.num == -1 );
-        STATIC_ASSERT( Dim::MeterPerSecond::seconds.den == 1 );
+        StaticAssert( Dim::MeterPerSecond::meters.num == 1 );
+        StaticAssert( Dim::MeterPerSecond::meters.den == 1 );
+        StaticAssert( Dim::MeterPerSecond::seconds.num == -1 );
+        StaticAssert( Dim::MeterPerSecond::seconds.den == 1 );
 
         using M2 = DefaultPhysicalDimensions::Meter::Pow<2>;
 
-        STATIC_ASSERT( M2::meters.num == 2 );
-        STATIC_ASSERT( M2::meters.den == 1 );
-        STATIC_ASSERT( M2::seconds.num == 0 );
-        STATIC_ASSERT( M2::seconds.den == 1 );
+        StaticAssert( M2::meters.num == 2 );
+        StaticAssert( M2::meters.den == 1 );
+        StaticAssert( M2::seconds.num == 0 );
+        StaticAssert( M2::seconds.den == 1 );
     }
 
 
@@ -53,7 +53,7 @@ namespace
 
         Kilogram    a1 = SolarMass{3.0e+6};                     TEST(BitEqual( a1.GetNonScaled(),   1.98847e+30 * 3.0e+6 ));
         auto        a2 = GConstant{1.0} * SolarMass{3.0e+6};    TEST(BitEqual( a2.GetScaled(),      6.6740831e-11 * 1.98847e+30 * 3.0e+6 ));
-        Accel       a3 = a2 / LightYear{26000.0}.Pow<2>();      TEST(Equals( a3.GetScaled(),        6.58e-15,  10_pct ));
+        Accel       a3 = a2 / LightYear{26000.0}.Pow<2>();      TEST(Equal( a3.GetScaled(),     6.58e-15,  10_pct ));
 
         TEST_Eq( ToString( GConstant{1.0},  2, True{"exponent"} ), "6.67e-11[m^3 / (s^-2 * kg^-1)]" );
         TEST_Eq( ToString( a2,              2, True{"exponent"} ), "3.98e+26[m^3 / s^-2]" );
diff --git a/AE/engine/tests/base/UnitTest_Math_Transform.cpp b/AE/engine/tests/base/UnitTest_Math_Transform.cpp
index 5c4ce5e6..66239f1b 100644
--- a/AE/engine/tests/base/UnitTest_Math_Transform.cpp
+++ b/AE/engine/tests/base/UnitTest_Math_Transform.cpp
@@ -14,16 +14,9 @@ namespace
 
         Transform_t t{ m };
 
-        TEST( BitEqual( q.x, t.orientation.x ));
-        TEST( BitEqual( q.y, t.orientation.y ));
-        TEST( BitEqual( q.z, t.orientation.z ));
-        TEST( BitEqual( q.w, t.orientation.w ));
-
-        TEST( BitEqual( p.x, t.position.x ));
-        TEST( BitEqual( p.y, t.position.y ));
-        TEST( BitEqual( p.z, t.position.z ));
-
-        TEST( BitEqual( 1.0f, t.scale ));
+        TEST( All( BitEqual( q, t.orientation )));
+        TEST( All( BitEqual( p, t.position )));
+        TEST( All( BitEqual( 1.0f, t.scale )));
     }
 
 
@@ -44,13 +37,8 @@ namespace
         const float3    tr_point0   = tr.ToGlobalPosition( point0 );
         const float3    tr_point1   = tr.ToGlobalPosition( point1 );
 
-        TEST( BitEqual( mat_point0.x, tr_point0.x ));
-        TEST( BitEqual( mat_point0.y, tr_point0.y ));
-        TEST( BitEqual( mat_point0.z, tr_point0.z ));
-
-        TEST( BitEqual( mat_point1.x, tr_point1.x ));
-        TEST( BitEqual( mat_point1.y, tr_point1.y ));
-        TEST( BitEqual( mat_point1.z, tr_point1.z ));
+        TEST( All( BitEqual( mat_point0, tr_point0 )));
+        TEST( All( BitEqual( mat_point1, tr_point1 )));
     }
 
 
diff --git a/AE/engine/tests/base/UnitTest_Math_Vec.cpp b/AE/engine/tests/base/UnitTest_Math_Vec.cpp
index c3f974b0..41f44567 100644
--- a/AE/engine/tests/base/UnitTest_Math_Vec.cpp
+++ b/AE/engine/tests/base/UnitTest_Math_Vec.cpp
@@ -8,27 +8,27 @@ namespace
     static void  TestVec2Align ()
     {
         using Self = Vec<T,2>;
-        STATIC_ASSERT( offsetof(Self, x) + sizeof(T) == offsetof(Self, y) );
-        STATIC_ASSERT( sizeof(T)*(2-1) == (offsetof(Self, y) - offsetof(Self, x)) );
+        StaticAssert( offsetof(Self, x) + sizeof(T) == offsetof(Self, y) );
+        StaticAssert( sizeof(T)*(2-1) == (offsetof(Self, y) - offsetof(Self, x)) );
     }
 
     template <typename T>
     static void  TestVec3Align ()
     {
         using Self = Vec<T,3>;
-        STATIC_ASSERT( offsetof(Self, x) + sizeof(T) == offsetof(Self, y) );
-        STATIC_ASSERT( offsetof(Self, y) + sizeof(T) == offsetof(Self, z) );
-        STATIC_ASSERT( sizeof(T)*(3-1) == (offsetof(Self, z) - offsetof(Self, x)) );
+        StaticAssert( offsetof(Self, x) + sizeof(T) == offsetof(Self, y) );
+        StaticAssert( offsetof(Self, y) + sizeof(T) == offsetof(Self, z) );
+        StaticAssert( sizeof(T)*(3-1) == (offsetof(Self, z) - offsetof(Self, x)) );
     }
 
     template <typename T>
     static void  TestVec4Align ()
     {
         using Self = Vec<T,4>;
-        STATIC_ASSERT( offsetof(Self, x) + sizeof(T) == offsetof(Self, y) );
-        STATIC_ASSERT( offsetof(Self, y) + sizeof(T) == offsetof(Self, z) );
-        STATIC_ASSERT( offsetof(Self, z) + sizeof(T) == offsetof(Self, w) );
-        STATIC_ASSERT( sizeof(T)*(4-1) == (offsetof(Self, w) - offsetof(Self, x)) );
+        StaticAssert( offsetof(Self, x) + sizeof(T) == offsetof(Self, y) );
+        StaticAssert( offsetof(Self, y) + sizeof(T) == offsetof(Self, z) );
+        StaticAssert( offsetof(Self, z) + sizeof(T) == offsetof(Self, w) );
+        StaticAssert( sizeof(T)*(4-1) == (offsetof(Self, w) - offsetof(Self, x)) );
     }
 
     template <typename T>
@@ -49,13 +49,13 @@ namespace
         TestVecAlign<slong>();
         TestVecAlign<ushort>();
 
-        STATIC_ASSERT( alignof(ushort3) == sizeof(ushort)*4 );
-        STATIC_ASSERT( alignof(uint3)   == sizeof(uint)*4 );
-        STATIC_ASSERT( alignof(uint4)   == sizeof(uint)*4);
+        StaticAssert( alignof(ushort3)  == sizeof(ushort)*4 );
+        StaticAssert( alignof(uint3)    == sizeof(uint)*4 );
+        StaticAssert( alignof(uint4)    == sizeof(uint)*4);
 
-        STATIC_ASSERT( alignof(packed_uint3) == sizeof(uint) );
-        STATIC_ASSERT( alignof(uint3) == 16 );
-        STATIC_ASSERT( alignof(float4) == 16 );
+        StaticAssert( alignof(packed_uint3) == sizeof(uint) );
+        StaticAssert( alignof(uint3) == 16 );
+        StaticAssert( alignof(float4) == 16 );
     }
 
 
@@ -84,13 +84,20 @@ namespace
     }
 
 
+    static void  Vec_Test5 ()
+    {
+        auto    a0 = AlignUp( uint2{3}, uint2{2} );     TEST( All( a0 == uint2{4} ));
+        auto    a1 = AlignDown( uint2{3}, uint2{2} );   TEST( All( a1 == uint2{2} ));
+    }
+
+
     static void  VecSwizzle_Test1 ()
     {
         constexpr VecSwizzle    a1 = "XYZW"_vecSwizzle;
-        STATIC_ASSERT( a1.Get() == 0x1234 );
+        StaticAssert( a1.Get() == 0x1234 );
 
         constexpr VecSwizzle    a2 = "yZx1"_vecSwizzle;
-        STATIC_ASSERT( a2.Get() == 0x2316 );
+        StaticAssert( a2.Get() == 0x2316 );
 
         const int4  a3 = int3{6} * "010"_vecSwizzle;
         TEST( All( a3 == int4{0,1,0,0} ));
@@ -104,6 +111,56 @@ namespace
         const int4  a6 = int3{7} * "0-0+"_vecSwizzle;
         TEST( All( a6 == int4{0,-1,0,1} ));
     }
+
+
+    static void  Quat_Test1 ()
+    {
+        const float3    up {0.f, -1.f, 0.f};
+
+        float3  a0 { 0.780720f, 0.390360f, 0.487950f };
+        auto    b0 = Quat::FromDirection( a0, up );
+        auto    c0  = b0.ToDirection();
+        TEST( All( Equal( a0, c0, 1_pct )));
+    }
+
+
+    static void  Quat_Test2 ()
+    {
+        auto    a0 = Quat::Rotate2(Rad3{ 0_deg, 0_deg, 0_deg });
+        TEST( All( Equal( a0, Quat::Identity() )));
+
+        auto    a1 = Quat::Rotate2(Rad3{ 0_deg, 0_deg, 90_deg });
+        auto    b1 = Quat::RotateZ( 90_deg );
+        TEST( All( Equal( a1, b1 )));
+
+        auto    a2 = Quat::Rotate2(Rad3{ 0_deg, 90_deg, 0_deg });
+        auto    b2 = Quat::RotateY( 90_deg );
+        TEST( All( Equal( a2, b2 )));
+
+        auto    a3 = Quat::Rotate2(Rad3{ 90_deg, 0_deg, 0_deg });
+        auto    b3 = Quat::RotateX( 90_deg );
+        TEST( All( Equal( a3, b3 )));
+    }
+
+
+    static void  Spherical_Test1 ()
+    {
+        float3  a0 { 0.780720f, 0.390360f, 0.487950f };
+        auto    b0 = Spherical::FromCartesian( a0 ).first;
+        float3  c0 = b0.ToCartesian();
+        TEST( All( Equal( a0, c0, 1_pct )));
+        /*
+        for (Rad phi; phi < Rad::Pi2(); phi += 0.1f)
+        for (Rad theta; theta < Rad::Pi(); theta += 0.1f)
+        {
+            Spherical   s       { phi, theta };
+            float3      n       = s.ToCartesian();
+            auto        [sp, r] = Spherical::FromCartesian( n );
+
+            TEST( All( Equal( s, sp, 1_pct )));
+            TEST( Equal( r, 1.f, 1_pct ));
+        }*/
+    }
 }
 
 
@@ -113,8 +170,14 @@ extern void UnitTest_Math_Vec ()
     Vec_Test2();
     Vec_Test3();
     Vec_Test4();
+    Vec_Test5();
 
     VecSwizzle_Test1();
 
+    Quat_Test1();
+    Quat_Test2();
+
+    Spherical_Test1();
+
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/UnitTest_MemChunkList.cpp b/AE/engine/tests/base/UnitTest_MemChunkList.cpp
new file mode 100644
index 00000000..6d14edfd
--- /dev/null
+++ b/AE/engine/tests/base/UnitTest_MemChunkList.cpp
@@ -0,0 +1,75 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static void  MemChunkList_Test1 ()
+    {
+        UntypedAllocator    alloc;
+        MemChunkList        view {256_b};
+
+        TEST( view.ChunkCount() == 0 );
+        TEST( view.Size() == 0 );
+        TEST( view.ChunkDataSize() == (256_b - sizeof(void*)) );
+        TEST( view.Capacity() == 0 );
+
+        Unused( view.AddChunk( alloc ));
+        TEST( view.ChunkCount() == 1 );
+        TEST( view.Size() == 0 );
+
+        Unused( view.AddChunk( alloc ));
+        TEST( view.ChunkCount() == 2 );
+
+        view.Destroy( alloc );
+    }
+
+
+    static void  MemChunkList_Test2 ()
+    {
+        LinearAllocator<>   alloc;
+        alloc.SetBlockSize( 4_Kb );
+
+        MemChunkList    view {256_b};
+
+        {
+            auto*   c = view.AddChunk( alloc );
+            std::memset( c->Data(), 0x12, usize{view.ChunkDataSize()} );
+        }{
+            auto*   c = view.AddChunk( alloc );
+            std::memset( c->Data(), 0x34, usize{view.ChunkDataSize()} );
+        }{
+            auto*   c = view.AddChunk( alloc );
+            std::memset( c->Data(), 0x56, usize{view.ChunkDataSize()} );
+        }
+        TEST( view.ChunkCount() == 3 );
+
+        view.SetSize( view.Capacity() );
+        TEST( view.Size() == (256_b - sizeof(void*))*3 );
+
+        {
+            const usize     a0 = usize{view.ChunkDataSize()} / 2;
+            const usize     a1 = a0 + usize{view.ChunkDataSize()};
+            const usize     a2 = a1 + usize{view.ChunkDataSize()} / 2;
+
+            Array<ubyte>    dst;
+            dst.resize( a2 );
+
+            Bytes   copied = view.Read( Bytes{a0}, OUT dst.data(), Bytes{dst.size()} );
+            TEST( copied == Bytes{dst.size()} );
+
+            for (usize i =  0; i < a0; ++i) { TEST( dst[i] == 0x12 ); }
+            for (usize i = a0; i < a1; ++i) { TEST( dst[i] == 0x34 ); }
+            for (usize i = a1; i < a2; ++i) { TEST( dst[i] == 0x56 ); }
+        }
+    }
+}
+
+
+extern void UnitTest_MemChunkList ()
+{
+    MemChunkList_Test1();
+    MemChunkList_Test2();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/base/UnitTest_RC.cpp b/AE/engine/tests/base/UnitTest_RC.cpp
index 361fea85..32a4ded4 100644
--- a/AE/engine/tests/base/UnitTest_RC.cpp
+++ b/AE/engine/tests/base/UnitTest_RC.cpp
@@ -9,9 +9,8 @@ namespace
     class RCObj final : public EnableRC<RCObj>, public Obj_t
     {
     public:
-        RCObj () : Obj_t{ 0 } {}
-
-        explicit RCObj (int i) : Obj_t{ i } {}
+        RCObj ()                __NE___ : Obj_t{ 0 } {}
+        explicit RCObj (int i)  __NE___ : Obj_t{ i } {}
     };
 
     using RC_t          = RC<RCObj>;
@@ -30,6 +29,25 @@ namespace
     }
 
 
+    static void  RC_Test2 ()
+    {
+        struct C1 : EnableRC<C1> {};
+        struct C2 : C1 {};
+
+        StaticAssert( IsBaseOfNotSame< C1, C2 >);
+        StaticAssert( not IsBaseOfNotSame< C2, C1 >);
+        StaticAssert( not IsBaseOfNotSame< C1, C1 >);
+
+        RC<C1>  a0;
+        RC<C2>  a1;
+
+        a0 = a1;
+    //  a1 = a0;            // error
+        a1 = RC<C2>{ a0 };
+        a0 = RC<C1>{ a1 };
+    }
+
+
     static void  AtomicRC_Test1 ()
     {
         Obj_t::ClearStatistic();
@@ -40,7 +58,7 @@ namespace
             AtomicRC_t  b0;
             RC_t        b1;
 
-            b0 = a0;
+            b0.store( a0 );
 
             TEST( a0.use_count() == 2 );
             TEST( a1.use_count() == 1 );
@@ -57,7 +75,7 @@ namespace
             TEST( a0.use_count() == 2 );    // b1
             TEST( a1.use_count() == 2 );    // b0
 
-            b0 = null;
+            b0.reset();
             b1.reset( null );
             TEST( a0.use_count() == 1 );
             TEST( a1.use_count() == 1 );
@@ -70,6 +88,7 @@ namespace
 extern void UnitTest_RC ()
 {
     RC_Test1();
+    RC_Test2();
 
     AtomicRC_Test1();
 
diff --git a/AE/engine/tests/base/UnitTest_SparseArray.cpp b/AE/engine/tests/base/UnitTest_SparseArray.cpp
new file mode 100644
index 00000000..eebc3986
--- /dev/null
+++ b/AE/engine/tests/base/UnitTest_SparseArray.cpp
@@ -0,0 +1,47 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#if 0
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static void  SparseArray_Test1 ()
+    {
+        using T = DebugInstanceCounter< int, 1 >;
+
+        T::ClearStatistic();
+        {
+            SparseArray< T >    arr;
+
+            arr.push_back( T{1} );
+            arr.push_back( T{2} );
+            arr.push_back( T{3} );
+
+            TEST( arr.size() == 3 );
+            TEST( arr[0] == T(1) );
+            TEST( arr[1] == T(2) );
+            TEST( arr[2] == T(3) );
+
+            arr.resize( 6 );
+            TEST( arr[0] == T(1) );
+            TEST( arr[1] == T(2) );
+            TEST( arr[2] == T(3) );
+            TEST( arr[3] == T(0) );
+            TEST( arr[4] == T(0) );
+            TEST( arr[5] == T(0) );
+
+            arr.resize( 2 );
+            TEST( arr[0] == T(1) );
+            TEST( arr[1] == T(2) );
+        }
+        TEST( T::CheckStatistic() );
+    }
+}
+
+
+extern void UnitTest_SparseArray ()
+{
+    SparseArray_Test1();
+
+    TEST_PASSED();
+}
+#endif
diff --git a/AE/engine/tests/base/UnitTest_StructView.cpp b/AE/engine/tests/base/UnitTest_StructView.cpp
index 7dc183f4..ad77f65c 100644
--- a/AE/engine/tests/base/UnitTest_StructView.cpp
+++ b/AE/engine/tests/base/UnitTest_StructView.cpp
@@ -89,7 +89,7 @@ namespace
         for (usize i = 0; i < view2.size(); ++i)
         {
             double  d = double(view2[i]);
-            TEST( Equals( data[i].field2, d, 10_pct ));
+            TEST( Equal( data[i].field2, d, 10_pct ));
         }
     }
 }
diff --git a/AE/engine/tests/base/UnitTest_TypeList.cpp b/AE/engine/tests/base/UnitTest_TypeList.cpp
index 44b25eb4..d0a4eef0 100644
--- a/AE/engine/tests/base/UnitTest_TypeList.cpp
+++ b/AE/engine/tests/base/UnitTest_TypeList.cpp
@@ -4,12 +4,12 @@
 
 namespace
 {
-    struct TL_Visitor 
+    struct TL_Visitor
     {
         usize sizeof_sum = 0;
 
         template <typename T, usize I>
-        void operator () () {
+        void operator () () __NE___ {
             sizeof_sum += sizeof(T);
         }
     };
@@ -29,36 +29,36 @@ namespace
 extern void UnitTest_TypeList ()
 {
     {
-        STATIC_ASSERT(( TypeList<int, bool, float>::Count == 3 ));
-        STATIC_ASSERT(( TypeList<int, int, int>::Count == 3 ));
+        StaticAssert(( TypeList<int, bool, float>::Count == 3 ));
+        StaticAssert(( TypeList<int, int, int>::Count == 3 ));
     }
     {
         using TL = TypeList< int, float, bool, double >;
-        STATIC_ASSERT( IsTypeList< TL > );
-        STATIC_ASSERT( not IsTypeList< int > );
+        StaticAssert( IsTypeList< TL > );
+        StaticAssert( not IsTypeList< int > );
     }
     {
         using TL = TypeList< int, float, bool, double >;
-        STATIC_ASSERT( IsSameTypes< TL::Get<0>, int > );
-        STATIC_ASSERT( IsSameTypes< TL::Get<1>, float > );
-        STATIC_ASSERT( IsSameTypes< TL::Get<2>, bool > );
-        STATIC_ASSERT( IsSameTypes< TL::Get<3>, double > );
-        STATIC_ASSERT( TL::Index<int> == 0 );
-        STATIC_ASSERT( TL::Index<float> == 1 );
-        STATIC_ASSERT( TL::Index<bool> == 2 );
-        STATIC_ASSERT( TL::Index<double> == 3 );
-        STATIC_ASSERT( TL::Index<slong> == UMax );
+        StaticAssert( IsSameTypes< TL::Get<0>, int > );
+        StaticAssert( IsSameTypes< TL::Get<1>, float > );
+        StaticAssert( IsSameTypes< TL::Get<2>, bool > );
+        StaticAssert( IsSameTypes< TL::Get<3>, double > );
+        StaticAssert( TL::Index<int> == 0 );
+        StaticAssert( TL::Index<float> == 1 );
+        StaticAssert( TL::Index<bool> == 2 );
+        StaticAssert( TL::Index<double> == 3 );
+        StaticAssert( TL::Index<slong> == UMax );
     }
     {
         using TL = TypeList< int, bool, int, float >;
-        STATIC_ASSERT( TL::FirstIndex<int> == 0 );
-        STATIC_ASSERT( TL::FirstIndex<bool> == 1 );
-        STATIC_ASSERT( TL::FirstIndex<float> == 3 );
-        STATIC_ASSERT( TL::FirstIndex<double> == UMax );
-        STATIC_ASSERT( TL::LastIndex<int> == 2 );
-        STATIC_ASSERT( TL::LastIndex<bool> == 1 );
-        STATIC_ASSERT( TL::LastIndex<float> == 3 );
-        STATIC_ASSERT( TL::LastIndex<double> == UMax );
+        StaticAssert( TL::FirstIndex<int> == 0 );
+        StaticAssert( TL::FirstIndex<bool> == 1 );
+        StaticAssert( TL::FirstIndex<float> == 3 );
+        StaticAssert( TL::FirstIndex<double> == UMax );
+        StaticAssert( TL::LastIndex<int> == 2 );
+        StaticAssert( TL::LastIndex<bool> == 1 );
+        StaticAssert( TL::LastIndex<float> == 3 );
+        StaticAssert( TL::LastIndex<double> == UMax );
     }
     {
         using TL = TypeList< int, float, bool, double >;
@@ -68,60 +68,60 @@ extern void UnitTest_TypeList ()
     }
     {
         using TL = TypeList<>;
-        STATIC_ASSERT( TL::Count == 0 );
+        StaticAssert( TL::Count == 0 );
 
         using TL2 = TL::PushBack<int>;
-        STATIC_ASSERT( TL2::Count == 1 );
-        STATIC_ASSERT( IsSameTypes< TL2::Get<0>, int >);
-        STATIC_ASSERT( IsSameTypes< TL2, TypeList<int> >);
+        StaticAssert( TL2::Count == 1 );
+        StaticAssert( IsSameTypes< TL2::Get<0>, int >);
+        StaticAssert( IsSameTypes< TL2, TypeList<int> >);
 
         using TL3 = TL2::PushBack<float>;
-        STATIC_ASSERT( TL3::Count == 2 );
-        STATIC_ASSERT( IsSameTypes< TL3::Get<0>, int >);
-        STATIC_ASSERT( IsSameTypes< TL3::Get<1>, float >);
-        STATIC_ASSERT(( IsSameTypes< TL3, TypeList<int, float> >));
+        StaticAssert( TL3::Count == 2 );
+        StaticAssert( IsSameTypes< TL3::Get<0>, int >);
+        StaticAssert( IsSameTypes< TL3::Get<1>, float >);
+        StaticAssert(( IsSameTypes< TL3, TypeList<int, float> >));
 
         using TL4 = TL3::PushFront<bool>;
-        STATIC_ASSERT( TL4::Count == 3 );
-        STATIC_ASSERT( IsSameTypes< TL4::Get<0>, bool >);
-        STATIC_ASSERT( IsSameTypes< TL4::Get<1>, int >);
-        STATIC_ASSERT( IsSameTypes< TL4::Get<2>, float >);
-        STATIC_ASSERT(( IsSameTypes< TL4, TypeList<bool, int, float> >));
+        StaticAssert( TL4::Count == 3 );
+        StaticAssert( IsSameTypes< TL4::Get<0>, bool >);
+        StaticAssert( IsSameTypes< TL4::Get<1>, int >);
+        StaticAssert( IsSameTypes< TL4::Get<2>, float >);
+        StaticAssert(( IsSameTypes< TL4, TypeList<bool, int, float> >));
 
         using TL5 = TL4::PopBack::type;
-        STATIC_ASSERT( TL5::Count == 2 );
-        STATIC_ASSERT( IsSameTypes< TL5::Get<0>, bool >);
-        STATIC_ASSERT( IsSameTypes< TL5::Get<1>, int >);
-        STATIC_ASSERT(( IsSameTypes< TL5, TypeList<bool, int> >));
+        StaticAssert( TL5::Count == 2 );
+        StaticAssert( IsSameTypes< TL5::Get<0>, bool >);
+        StaticAssert( IsSameTypes< TL5::Get<1>, int >);
+        StaticAssert(( IsSameTypes< TL5, TypeList<bool, int> >));
 
         using TL6 = TL5::PopFront::type;
-        STATIC_ASSERT( TL6::Count == 1 );
-        STATIC_ASSERT( IsSameTypes< TL6::Get<0>, int >);
-        STATIC_ASSERT(( IsSameTypes< TL6, TypeList<int> >));
+        StaticAssert( TL6::Count == 1 );
+        StaticAssert( IsSameTypes< TL6::Get<0>, int >);
+        StaticAssert(( IsSameTypes< TL6, TypeList<int> >));
     }
     {
         using TL = TypeList< int, float, bool, double >;
 
         constexpr bool      val1    = TL::ForEach_Or< GreaterThen4 >();
-        STATIC_ASSERT( val1 );
+        StaticAssert( val1 );
 
         constexpr bool      val2    = TL::ForEach_And< GreaterThen4 >();
-        STATIC_ASSERT( not val2 );
+        StaticAssert( not val2 );
 
         constexpr usize val3    = TL::ForEach_Add< TypeSize >();
-        STATIC_ASSERT( val3 == 4+4+1+8 );
+        StaticAssert( val3 == 4+4+1+8 );
 
         constexpr usize val4    = TL::ForEach_Max< TypeSize >();
-        STATIC_ASSERT( val4 == 8 );
+        StaticAssert( val4 == 8 );
 
         constexpr usize val5    = TL::ForEach_Min< TypeSize >();
-        STATIC_ASSERT( val5 == 1 );
+        StaticAssert( val5 == 1 );
     }
     {
         using TL = TypeList< int, float, Pair<int, float>, Tuple<int, float>, Pair<float, int> >;
 
-        STATIC_ASSERT( TL::FirstSpecializationOf< std::pair > == 2 );
-        STATIC_ASSERT( TL::FirstSpecializationOf< Tuple > == 3 );
+        StaticAssert( TL::FirstSpecializationOf< std::pair > == 2 );
+        StaticAssert( TL::FirstSpecializationOf< Tuple > == 3 );
     }
 
     TEST_PASSED();
diff --git a/AE/engine/tests/base/UnitTest_TypeTraits.cpp b/AE/engine/tests/base/UnitTest_TypeTraits.cpp
index 8e54feba..7b5ffba2 100644
--- a/AE/engine/tests/base/UnitTest_TypeTraits.cpp
+++ b/AE/engine/tests/base/UnitTest_TypeTraits.cpp
@@ -5,79 +5,86 @@
 
 namespace
 {
-    STATIC_ASSERT( sizeof(bool)   == 1 );
-    STATIC_ASSERT( sizeof(Bool32) == 4 );
+    StaticAssert( sizeof(bool)   == 1 );
+    StaticAssert( sizeof(Bool32) == 4 );
 
-    STATIC_ASSERT( sizeof(char)  == 1 );        STATIC_ASSERT( IsInteger<         char >);
-    STATIC_ASSERT( sizeof(sbyte) == 1 );        STATIC_ASSERT( IsSignedInteger<   sbyte >);
-    STATIC_ASSERT( sizeof(ubyte) == 1 );        STATIC_ASSERT( IsUnsignedInteger< ubyte >);
+    StaticAssert( sizeof(char)  == 1 );         StaticAssert( IsInteger<         char >);
+    StaticAssert( sizeof(sbyte) == 1 );         StaticAssert( IsSignedInteger<   sbyte >);
+    StaticAssert( sizeof(ubyte) == 1 );         StaticAssert( IsUnsignedInteger< ubyte >);
 
-    STATIC_ASSERT( sizeof(short)  == 2 );
-    STATIC_ASSERT( sizeof(sshort) == 2 );       STATIC_ASSERT( IsSignedInteger<   sshort >);
-    STATIC_ASSERT( sizeof(ushort) == 2 );       STATIC_ASSERT( IsUnsignedInteger< ushort >);
+    StaticAssert( sizeof(short)  == 2 );
+    StaticAssert( sizeof(sshort) == 2 );        StaticAssert( IsSignedInteger<   sshort >);
+    StaticAssert( sizeof(ushort) == 2 );        StaticAssert( IsUnsignedInteger< ushort >);
 
-    STATIC_ASSERT( sizeof(int)  == 4 );         STATIC_ASSERT( IsSignedInteger<   int  >);
-    STATIC_ASSERT( sizeof(sint) == 4 );         STATIC_ASSERT( IsSignedInteger<   sint >);
-    STATIC_ASSERT( sizeof(uint) == 4 );         STATIC_ASSERT( IsUnsignedInteger< uint >);
+    StaticAssert( sizeof(int)  == 4 );          StaticAssert( IsSignedInteger<   int  >);
+    StaticAssert( sizeof(sint) == 4 );          StaticAssert( IsSignedInteger<   sint >);
+    StaticAssert( sizeof(uint) == 4 );          StaticAssert( IsUnsignedInteger< uint >);
 
-    STATIC_ASSERT( sizeof(slong) == 8 );        STATIC_ASSERT( IsSignedInteger<   slong >);
-    STATIC_ASSERT( sizeof(ulong) == 8 );        STATIC_ASSERT( IsUnsignedInteger< ulong >);
+    StaticAssert( sizeof(slong) == 8 );         StaticAssert( IsSignedInteger<   slong >);
+    StaticAssert( sizeof(ulong) == 8 );         StaticAssert( IsUnsignedInteger< ulong >);
 
-    STATIC_ASSERT( sizeof(float)  == 4 );       STATIC_ASSERT( IsFloatPoint< float  >);
-    STATIC_ASSERT( sizeof(double) == 8 );       STATIC_ASSERT( IsFloatPoint< double >);
+    StaticAssert( sizeof(float)  == 4 );        StaticAssert( IsFloatPoint< float  >);
+    StaticAssert( sizeof(double) == 8 );        StaticAssert( IsFloatPoint< double >);
 
-    STATIC_ASSERT( sizeof(UFloat8) == 1 );      STATIC_ASSERT( IsAnyFloatPoint< UFloat8 >);
-    STATIC_ASSERT( sizeof(SFloat16) == 2 );     STATIC_ASSERT( IsAnyFloatPoint< SFloat16 >);
-    STATIC_ASSERT( sizeof(UFloat16) == 2 );     STATIC_ASSERT( IsAnyFloatPoint< UFloat16 >);
+    StaticAssert( sizeof(UFloat8)  == 1 );      StaticAssert( IsAnyFloatPoint< UFloat8 >);
+    StaticAssert( sizeof(SFloat16) == 2 );      StaticAssert( IsAnyFloatPoint< SFloat16 >);
+    StaticAssert( sizeof(UFloat16) == 2 );      StaticAssert( IsAnyFloatPoint< UFloat16 >);
 
-    STATIC_ASSERT( not IsSameTypes< CharAnsi,  CharUtf8  >);
-    STATIC_ASSERT( not IsSameTypes< CharAnsi,  CharUtf16 >);
-    STATIC_ASSERT( not IsSameTypes< CharAnsi,  CharUtf32 >);
-    STATIC_ASSERT( not IsSameTypes< CharAnsi,  wchar_t   >);
+    StaticAssert( not IsSameTypes< CharAnsi,  CharUtf8  >);
+    StaticAssert( not IsSameTypes< CharAnsi,  CharUtf16 >);
+    StaticAssert( not IsSameTypes< CharAnsi,  CharUtf32 >);
+    StaticAssert( not IsSameTypes< CharAnsi,  wchar_t   >);
 
-    STATIC_ASSERT( not IsSameTypes< CharUtf8,  CharUtf16 >);
-    STATIC_ASSERT( not IsSameTypes< CharUtf8,  CharUtf32 >);
-    STATIC_ASSERT( not IsSameTypes< CharUtf8,  wchar_t   >);
+    StaticAssert( not IsSameTypes< CharUtf8,  CharUtf16 >);
+    StaticAssert( not IsSameTypes< CharUtf8,  CharUtf32 >);
+    StaticAssert( not IsSameTypes< CharUtf8,  wchar_t   >);
 
-    STATIC_ASSERT( not IsSameTypes< CharUtf16, CharUtf32 >);
-    STATIC_ASSERT( not IsSameTypes< CharUtf16, wchar_t   >);
+    StaticAssert( not IsSameTypes< CharUtf16, CharUtf32 >);
+    StaticAssert( not IsSameTypes< CharUtf16, wchar_t   >);
 
-    STATIC_ASSERT( not IsSameTypes< CharUtf32, wchar_t   >);
+    StaticAssert( not IsSameTypes< CharUtf32, wchar_t   >);
 
+    #if AE_PLATFORM_BITS == 32
+    StaticAssert( sizeof(ssize) == 4 );         StaticAssert( IsSignedInteger<   ssize >);
+    StaticAssert( sizeof(usize) == 4 );         StaticAssert( IsUnsignedInteger< usize >);
+    #endif
+
+    #if AE_PLATFORM_BITS == 64
+    StaticAssert( sizeof(ssize) == 8 );         StaticAssert( IsSignedInteger<   ssize >);
+    StaticAssert( sizeof(usize) == 8 );         StaticAssert( IsUnsignedInteger< usize >);
+    #endif
 
     static void  Test_IsSpecializationOf ()
     {
         using T1 = ArrayView<int>;
-        STATIC_ASSERT( IsSpecializationOf< T1, ArrayView > );
-        STATIC_ASSERT( not IsSpecializationOf< T1, std::tuple > );
+        StaticAssert( IsSpecializationOf< T1, ArrayView > );
+        StaticAssert( not IsSpecializationOf< T1, std::tuple > );
 
         using T2 = ArrayView<int> *;
-        STATIC_ASSERT( not IsSpecializationOf< T2, ArrayView > );
-        STATIC_ASSERT( not IsSpecializationOf< T2, std::tuple > );
+        StaticAssert( not IsSpecializationOf< T2, ArrayView > );
+        StaticAssert( not IsSpecializationOf< T2, std::tuple > );
 
         using T3 = std::tuple< int >;
-        STATIC_ASSERT( IsSpecializationOf< T3, std::tuple > );
-        STATIC_ASSERT( not IsSpecializationOf< T3, ArrayView > );
+        StaticAssert( IsSpecializationOf< T3, std::tuple > );
+        StaticAssert( not IsSpecializationOf< T3, ArrayView > );
     }
 
 
     static void  Test_IsTrivial ()
     {
-        STATIC_ASSERT( IsPOD<int> );
-
-        STATIC_ASSERT( IsZeroMemAvailable<int> );
-        STATIC_ASSERT( IsZeroMemAvailable<int2> );
-        STATIC_ASSERT( IsZeroMemAvailable<float3> );
-        STATIC_ASSERT( IsZeroMemAvailable<float4x4> );
-        STATIC_ASSERT( IsZeroMemAvailable<float[4]> );
-        STATIC_ASSERT( IsZeroMemAvailable<const int[8]> );
-
-        STATIC_ASSERT( IsMemCopyAvailable<int> );
-        STATIC_ASSERT( IsMemCopyAvailable<int2> );
-        STATIC_ASSERT( IsMemCopyAvailable<float3> );
-        STATIC_ASSERT( IsMemCopyAvailable<float4x4> );
-        STATIC_ASSERT( IsMemCopyAvailable<float[4]> );
-        STATIC_ASSERT( IsMemCopyAvailable<const int[8]> );
+        StaticAssert( IsZeroMemAvailable<int> );
+        StaticAssert( IsZeroMemAvailable<int2> );
+        StaticAssert( IsZeroMemAvailable<float3> );
+        StaticAssert( IsZeroMemAvailable<float4x4> );
+        StaticAssert( IsZeroMemAvailable<float[4]> );
+        StaticAssert( IsZeroMemAvailable<const int[8]> );
+
+        StaticAssert( IsMemCopyAvailable<int> );
+        StaticAssert( IsMemCopyAvailable<int2> );
+        StaticAssert( IsMemCopyAvailable<float3> );
+        StaticAssert( IsMemCopyAvailable<float4x4> );
+        StaticAssert( IsMemCopyAvailable<float[4]> );
+        StaticAssert( IsMemCopyAvailable<const int[8]> );
 
         struct PODType
         {
@@ -94,18 +101,18 @@ namespace
             TrivialType (const TrivialType &) = default;
         };
 
-        STATIC_ASSERT( IsPOD<PODType> );
-        STATIC_ASSERT( not IsPOD<TrivialType> );
+        //StaticAssert( IsPOD<PODType> );
+        //StaticAssert( not IsPOD<TrivialType> );
 
-        STATIC_ASSERT( IsTrivial<PODType> );
-        STATIC_ASSERT( IsTrivial<TrivialType> );
+        StaticAssert( IsTrivial<PODType> );
+        StaticAssert( IsTrivial<TrivialType> );
     }
 
 
     static void  Test_RemoveAllQualifiers ()
     {
         using T1 = RemoveAllQualifiers< const int* const* const& >;
-        STATIC_ASSERT(( IsSameTypes< int, T1 >));
+        StaticAssert(( IsSameTypes< int, T1 >));
     }
 
 
@@ -153,27 +160,43 @@ namespace
     }
 
 
-    static void  Test_Nothrow ()
+    struct TrivialThrowable
     {
-        struct TrivialThrowable
-        {
-            int i;
+        int i;
 
-            TrivialThrowable ()                 __Th___ = default;
-            explicit TrivialThrowable (int ii)  __Th___ : i{ii} {}
-        };
+        TrivialThrowable ()                 __Th___ = default;
+        explicit TrivialThrowable (int ii)  __Th___ : i{ii} {}
+    };
 
-        struct NontrivialNothrowable
-        {
-            String  str;
+    struct NontrivialNothrowable
+    {
+        String  str;
 
-            NontrivialNothrowable ()                        __NE___ { str = "11111"; }
-            explicit NontrivialNothrowable (const String &s)__NE___ : str{s} {}
-            ~NontrivialNothrowable ()                       __NE___ {}
-        };
+        NontrivialNothrowable ()                        __NE___ { str = "11111"; }
+        explicit NontrivialNothrowable (const String &s)__NE___ : str{s} {}
+        ~NontrivialNothrowable ()                       __NE___ {}
 
-        STATIC_ASSERT( IsNothrowCtor< TrivialThrowable, int >);
-        STATIC_ASSERT( IsNothrowCtor< NontrivialNothrowable, String >);
+        template <typename A, typename B>
+        NontrivialNothrowable (A a, B b)                __NE___ { str = ToString(a) + ToString(b); }
+    };
+
+    struct NontrivialThrowable
+    {
+        int i;
+
+        NontrivialThrowable ()                  __Th___ {}
+        explicit NontrivialThrowable (int ii)   __Th___ : i{ii} {}
+    };
+
+    static void  Test_Nothrow ()
+    {
+        CheckNothrow( IsNothrowCtor< TrivialThrowable >);
+        CheckNothrow( not IsNothrowCtor< TrivialThrowable, int >);
+        CheckNothrow( IsNothrowCtor< NontrivialNothrowable >);
+        CheckNothrow( IsNothrowCtor< NontrivialNothrowable, String >);
+        CheckNothrow( IsNothrowCtor< NontrivialNothrowable, float, int >);
+        CheckNothrow( not IsNothrowCtor< NontrivialThrowable >);
+        CheckNothrow( not IsNothrowCtor< NontrivialThrowable, int >);
     }
 
 
@@ -182,45 +205,91 @@ namespace
         {
             std::vector<int>    a1 {0,1,2};
             auto                a2 = ArrayView{a1};
-            STATIC_ASSERT( IsSameTypes< decltype(a2), ArrayView<int> >);
+            StaticAssert( IsSameTypes< decltype(a2), ArrayView<int> >);
         }{
             std::vector<int>    b1 {0,1,2};
             auto                b2 = ArrayView{b1.data(), b1.size()};
-            STATIC_ASSERT( IsSameTypes< decltype(b2), ArrayView<int> >);
+            StaticAssert( IsSameTypes< decltype(b2), ArrayView<int> >);
         }/*{
             int     c1[]    = {0,1,2};
             auto    c2      = ArrayView{c1};
-            STATIC_ASSERT( IsSameTypes< decltype(c2), ArrayView<int> >);
+            StaticAssert( IsSameTypes< decltype(c2), ArrayView<int> >);
         }*/{
             auto    d2      = ArrayView{ 0, 1, 2 };
-            STATIC_ASSERT( IsSameTypes< decltype(d2), ArrayView<int> >);
+            StaticAssert( IsSameTypes< decltype(d2), ArrayView<int> >);
         }/*{
             StaticArray< int, 5 >   e1 {0,1,2,3};
             auto                    e2 = ArrayView{e1};
-            STATIC_ASSERT( IsSameTypes< decltype(e2), ArrayView<int> >);
+            StaticAssert( IsSameTypes< decltype(e2), ArrayView<int> >);
         }*/
     }
 
 
     static void  Test_IsConst ()
     {
-        STATIC_ASSERT( not IsConst<int> );
-        STATIC_ASSERT( IsConst<const int> );
-        STATIC_ASSERT( IsConst<int const> );
-        STATIC_ASSERT( not IsConst<int const*> );
-        STATIC_ASSERT( IsConstPtr<int const*> );
-        STATIC_ASSERT( IsConstPtr<int* const*> );
-        STATIC_ASSERT( not IsConstPtr<int* const> );
-        STATIC_ASSERT( IsConst<int* const> );
-        STATIC_ASSERT( IsConstRef<int const&> );
-        STATIC_ASSERT( not IsConstRef<int &> );
-
-        STATIC_ASSERT( IsAnyConst<const int> );
-        STATIC_ASSERT( IsAnyConst<int const> );
-        STATIC_ASSERT( IsAnyConst<int const*> );
-        STATIC_ASSERT( IsAnyConst<int* const*> );
-        STATIC_ASSERT( IsAnyConst<int* const> );
-        STATIC_ASSERT( IsAnyConst<int const&> );
+        StaticAssert( not IsConst<int> );
+        StaticAssert( IsConst<const int> );
+        StaticAssert( IsConst<int const> );
+        StaticAssert( not IsConst<int const*> );
+        StaticAssert( IsConstPtr<int const*> );
+        StaticAssert( IsConstPtr<int* const*> );
+        StaticAssert( not IsConstPtr<int* const> );
+        StaticAssert( IsConst<int* const> );
+        StaticAssert( IsConstRef<int const&> );
+        StaticAssert( not IsConstRef<int &> );
+
+        StaticAssert( IsAnyConst<const int> );
+        StaticAssert( IsAnyConst<int const> );
+        StaticAssert( IsAnyConst<int const*> );
+        StaticAssert( IsAnyConst<int* const*> );
+        StaticAssert( IsAnyConst<int* const> );
+        StaticAssert( IsAnyConst<int const&> );
+    }
+
+
+    template <typename FN>
+    static void  Test_IsNothrowInvocable_FnTh (FN &&fn)
+    {
+        CheckNothrow( not IsNothrowInvocable< FN >);
+        Unused( fn );
+    }
+
+    template <typename FN>
+    static void  Test_IsNothrowInvocable_FnNE (FN &&fn)
+    {
+        CheckNothrow( IsNothrowInvocable< FN >);
+        Unused( fn );
+    }
+
+    struct Test_IsNothrowInvocable_B
+    {
+        template <typename T>
+        void operator () () __NE___ {}
+    };
+
+    static void  Test_IsNothrowInvocable ()
+    {
+        CheckNothrow( not IsNothrowInvocable< void () >);
+        CheckNothrow( IsNothrowInvocable< void () __NE___ >);
+        CheckNothrow( IsNothrowInvocable< void (*) () __NE___ >);
+
+        const auto  fn1 = [] () {};
+        CheckNothrow( not IsNothrowInvocable< decltype(fn1) >);
+        Test_IsNothrowInvocable_FnTh( fn1 );
+        Test_IsNothrowInvocable_FnTh( [] () { return true; } );
+
+        const auto  fn2 = [] () __NE___ {};
+        CheckNothrow( IsNothrowInvocable< decltype(fn2) >);
+        Test_IsNothrowInvocable_FnNE( fn2 );
+        Test_IsNothrowInvocable_FnNE( [] () __NE___ { return true; } );
+
+        struct A { void operator () () __NE___ {} };
+        A a0;
+        Test_IsNothrowInvocable_FnNE( A{} );
+        Test_IsNothrowInvocable_FnNE( a0 );
+
+        using B = Test_IsNothrowInvocable_B;
+        CheckNothrow( IsNothrowInvocable< decltype(&B::template operator()<int>), B& >);
     }
 }
 
@@ -235,6 +304,7 @@ extern void UnitTest_TypeTraits ()
     Test_Nothrow();
     Test_ArrayView();
     Test_IsConst();
+    Test_IsNothrowInvocable();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/base/main.cpp b/AE/engine/tests/base/main.cpp
index a3d497ab..3d6299a5 100644
--- a/AE/engine/tests/base/main.cpp
+++ b/AE/engine/tests/base/main.cpp
@@ -2,9 +2,9 @@
 
 #include "UnitTest_Common.h"
 
-
 extern void UnitTest_Array ();
 extern void UnitTest_Atomic ();
+extern void UnitTest_ChunkList ();
 extern void UnitTest_Color ();
 extern void UnitTest_Cast ();
 extern void UnitTest_Date ();
@@ -32,6 +32,7 @@ extern void UnitTest_Math_Rectangle ();
 extern void UnitTest_Math_SIMD ();
 extern void UnitTest_Math_Transformation ();
 extern void UnitTest_Math_Vec ();
+extern void UnitTest_MemChunkList ();
 extern void UnitTest_NamedID ();
 extern void UnitTest_NtStringView ();
 extern void UnitTest_RingBuffer ();
@@ -52,7 +53,6 @@ int main ()
 #endif
 {
     StaticLogger::LoggerDbgScope log{};
-    //StaticLogger::AddLogger( ILogger::CreateHtmlOutput( "log.html" ));
 
     AE_LOGI( "\nPlatform name: "s << AE_PLATFORM_NAME <<
              "\nCPU arch: " << AE_CPU_ARCH_NAME <<
@@ -63,6 +63,7 @@ int main ()
 
     UnitTest_Array();
     UnitTest_Atomic();
+    UnitTest_ChunkList();
     UnitTest_Color();
     UnitTest_Cast();
     UnitTest_Date();
@@ -91,6 +92,7 @@ int main ()
     UnitTest_Math_SIMD();
     UnitTest_Math_Transformation();
     UnitTest_Math_Vec();
+    UnitTest_MemChunkList();
     UnitTest_NamedID();
     UnitTest_NtStringView();
     UnitTest_RingBuffer();
diff --git a/AE/engine/tests/ecs-st/UnitTest_Archetype.cpp b/AE/engine/tests/ecs-st/UnitTest_Archetype.cpp
index f8e6da02..2fb3027c 100644
--- a/AE/engine/tests/ecs-st/UnitTest_Archetype.cpp
+++ b/AE/engine/tests/ecs-st/UnitTest_Archetype.cpp
@@ -117,11 +117,11 @@ namespace
 
         // a1
         {
-            TEST( a1.Equals( a1 ));
-            TEST( not a1.Equals( a2 ));
-            TEST( not a1.Equals( a3 ));
-            TEST( not a1.Equals( a4 ));
-            TEST( not a1.Equals( a5 ));
+            TEST( a1.Equal( a1 ));
+            TEST( not a1.Equal( a2 ));
+            TEST( not a1.Equal( a3 ));
+            TEST( not a1.Equal( a4 ));
+            TEST( not a1.Equal( a5 ));
 
             TEST( a1.Any( a2 ));
             TEST( a1.Any( a3 ));
@@ -136,11 +136,11 @@ namespace
 
         // a2
         {
-            TEST( not a2.Equals( a1 ));
-            TEST( a2.Equals( a2 ));
-            TEST( not a2.Equals( a3 ));
-            TEST( not a2.Equals( a4 ));
-            TEST( not a2.Equals( a5 ));
+            TEST( not a2.Equal( a1 ));
+            TEST( a2.Equal( a2 ));
+            TEST( not a2.Equal( a3 ));
+            TEST( not a2.Equal( a4 ));
+            TEST( not a2.Equal( a5 ));
 
             TEST( not a2.All( a3 ));
             TEST( not a2.All( a4 ));
@@ -153,11 +153,11 @@ namespace
 
         // a3
         {
-            TEST( not a3.Equals( a1 ));
-            TEST( not a3.Equals( a2 ));
-            TEST( a3.Equals( a3 ));
-            TEST( not a3.Equals( a4 ));
-            TEST( not a3.Equals( a5 ));
+            TEST( not a3.Equal( a1 ));
+            TEST( not a3.Equal( a2 ));
+            TEST( a3.Equal( a3 ));
+            TEST( not a3.Equal( a4 ));
+            TEST( not a3.Equal( a5 ));
 
             TEST( not a3.All( a4 ));
             TEST( a3.All( a5 ));
@@ -168,19 +168,19 @@ namespace
 
         // a4
         {
-            TEST( not a4.Equals( a1 ));
-            TEST( not a4.Equals( a2 ));
-            TEST( not a4.Equals( a3 ));
-            TEST( a4.Equals( a4 ));
-            TEST( not a4.Equals( a5 ));
+            TEST( not a4.Equal( a1 ));
+            TEST( not a4.Equal( a2 ));
+            TEST( not a4.Equal( a3 ));
+            TEST( a4.Equal( a4 ));
+            TEST( not a4.Equal( a5 ));
 
-            TEST( not a4.Equals( a1 ));
+            TEST( not a4.Equal( a1 ));
             TEST( a4.All( a1 ));
             TEST( a4.Any( a1 ));
             TEST( a4.All( a5 ));
 
             a4.Remove<Tag2>();
-            TEST( a4.Equals( a1 ));
+            TEST( a4.Equal( a1 ));
             TEST( a1.All( a4 ));
         }
 
diff --git a/AE/engine/tests/ecs-st/UnitTest_Registry.cpp b/AE/engine/tests/ecs-st/UnitTest_Registry.cpp
index c12a280e..e7265cdd 100644
--- a/AE/engine/tests/ecs-st/UnitTest_Registry.cpp
+++ b/AE/engine/tests/ecs-st/UnitTest_Registry.cpp
@@ -23,9 +23,9 @@ namespace
     struct Event2 {};
     struct Event3 {};
 
-    STATIC_ASSERT( not IsEmpty<Comp1> );
-    STATIC_ASSERT( not IsEmpty<Comp2> );
-    STATIC_ASSERT( IsEmpty<Tag1> );
+    StaticAssert( not IsEmpty<Comp1> );
+    StaticAssert( not IsEmpty<Comp2> );
+    StaticAssert( IsEmpty<Tag1> );
 
 
     template <typename ...Args>
@@ -38,7 +38,7 @@ namespace
     static QueryID  CreateQuery2 (Registry &reg, ArrayView<Tuple<Args...>> const*)
     {
         using A = TypeList< Args... >;
-        STATIC_ASSERT(( IsSameTypes< typename A::template Get<0>, usize > ));
+        StaticAssert(( IsSameTypes< typename A::template Get<0>, usize > ));
         using B = typename A::PopFront::type;
 
         return CreateQuery1( reg, (B const*)null );
@@ -64,46 +64,46 @@ namespace
     #ifdef AE_ECS_VALIDATE_SYSTEM_FN
         {
             using Types = TypeList< WriteAccess<Comp1>, ReadAccess<Comp2> >;
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
         }{
             using Types = TypeList< WriteAccess<Comp1>, WriteAccess<Comp2>, ReadAccess<Comp2> >;
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
-            STATIC_ASSERT( not _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
-            STATIC_ASSERT( not _reg_detail_::CheckForDuplicateComponents< Types::Get<2> >::Test< 2, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
+            StaticAssert( not _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
+            StaticAssert( not _reg_detail_::CheckForDuplicateComponents< Types::Get<2> >::Test< 2, Types >() );
         }{
             using Types = TypeList< WriteAccess<Comp1>, OptionalReadAccess<Comp2>, ReadAccess<Comp2> >;
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
-            STATIC_ASSERT( not _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
-            STATIC_ASSERT( not _reg_detail_::CheckForDuplicateComponents< Types::Get<2> >::Test< 2, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
+            StaticAssert( not _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
+            StaticAssert( not _reg_detail_::CheckForDuplicateComponents< Types::Get<2> >::Test< 2, Types >() );
         }{
             using Types = TypeList< WriteAccess<Comp1>, Require<Comp2, Tag1> >;
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
         }{
             using Types = TypeList< WriteAccess<Comp1>, Require<Comp1, Comp2, Tag1> >;
-            STATIC_ASSERT( not _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
+            StaticAssert( not _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
         }{
             using Types = TypeList< Comp1*, Comp2* >;
-            STATIC_ASSERT( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
-            STATIC_ASSERT( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
+            StaticAssert( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
+            StaticAssert( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
         }{
             using Types = TypeList< Comp1*, Comp2& >;
-            STATIC_ASSERT( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
-            STATIC_ASSERT( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
+            StaticAssert( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
+            StaticAssert( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
         }{
             using Types = TypeList< Comp1 const*, Comp2* >;
-            STATIC_ASSERT( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
-            STATIC_ASSERT( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
+            StaticAssert( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
+            StaticAssert( _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
         }{
             using Types = TypeList< Comp1*, Comp1& >;
-            STATIC_ASSERT( not _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
-            STATIC_ASSERT( not _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
+            StaticAssert( not _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<0> >::Test< Types, 0 >() );
+            StaticAssert( not _reg_detail_::SC_CheckForDuplicateComponents< Types::Get<1> >::Test< Types, 1 >() );
         }{
             using Types = TypeList< Require<Comp1>, Subtractive<Comp2> >;
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
-            STATIC_ASSERT( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<0> >::Test< 0, Types >() );
+            StaticAssert( _reg_detail_::CheckForDuplicateComponents< Types::Get<1> >::Test< 1, Types >() );
         }
     #endif // AE_ECS_VALIDATE_SYSTEM_FN
     }
diff --git a/AE/engine/tests/geometry_tools/UnitTest_SphericalCubeMath.cpp b/AE/engine/tests/geometry_tools/UnitTest_SphericalCubeMath.cpp
index b7069674..0a3f9068 100644
--- a/AE/engine/tests/geometry_tools/UnitTest_SphericalCubeMath.cpp
+++ b/AE/engine/tests/geometry_tools/UnitTest_SphericalCubeMath.cpp
@@ -16,15 +16,21 @@ namespace
             for (uint y = 1; y < lod+2; ++y)
             for (uint x = 1; x < lod+2; ++x)
             {
-                const double2  ncoord = double2{ double(x)/(lod+2), double(y)/(lod+2) } * 2.0 - 1.0;
+                const double2  ncoord = ToSNorm( double2{x,y} / (lod+2) );
+
+                const double2   fwd_2d  = Projection::Forward( ncoord );
+                const double2   inv_2d  = Projection::Inverse( fwd_2d );
+
+                TEST(Equal( ncoord.x, inv_2d.x, 1_pct ));
+                TEST(Equal( ncoord.x, inv_2d.x, 1_pct ));
 
                 const double3  forward = Projection::Forward( ncoord, ECubeFace(face) );
 
                 auto[inv, inv_face] = Projection::Inverse( forward );
 
+                TEST(Equal( ncoord.x, inv.x, 1_pct ));
+                TEST(Equal( ncoord.y, inv.y, 1_pct ));
                 TEST( uint(inv_face) == face );
-                TEST(BitEqual( ncoord.x, inv.x ));
-                TEST(BitEqual( ncoord.y, inv.y ));
             }
         }
     }
@@ -32,9 +38,13 @@ namespace
 
 extern void UnitTest_SphericalCubeMath ()
 {
-    Test_ForwardInverseProjection< OriginCube >();
-    Test_ForwardInverseProjection< IdentitySphericalCube >();
-    Test_ForwardInverseProjection< TangentialSphericalCube >();
+    Test_ForwardInverseProjection< SCProj2_Cube< SCProj1_Identity >>();
+    Test_ForwardInverseProjection< SCProj2_Spherical< SCProj1_Identity >>();
+    Test_ForwardInverseProjection< SCProj2_Spherical< SCProj1_Tangential >>();
+    Test_ForwardInverseProjection< SCProj2_Spherical< SCProj1_Everitt >>();
+    Test_ForwardInverseProjection< SCProj2_Spherical< SCProj1_5thPoly >>();
+    Test_ForwardInverseProjection< SCProj2_Spherical< SCProj1_COBE >>();
+    Test_ForwardInverseProjection< SCProj2_Spherical< SCProj1_Arvo >>();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/geometry_tools/UnitTest_Triangulation.cpp b/AE/engine/tests/geometry_tools/UnitTest_Triangulation.cpp
index 0a0b64f7..cd3a82d1 100644
--- a/AE/engine/tests/geometry_tools/UnitTest_Triangulation.cpp
+++ b/AE/engine/tests/geometry_tools/UnitTest_Triangulation.cpp
@@ -81,7 +81,7 @@ namespace
     {
         //         5(2,4)
         //         2(2,2)
-        //            
+        //
         //    1(1,1)     3(3,1)
         //  0(0,0)         4(4,0)
 
@@ -107,7 +107,7 @@ namespace
     {
         //         5(2,4)
         //         2(2,2)
-        //            
+        //
         //    1(1,1)     3(3,1)
         //  0(0,0)         4(4,0)
 
diff --git a/AE/engine/tests/graphics/CMakeLists.txt b/AE/engine/tests/graphics/CMakeLists.txt
index 58dbfee9..ad5a48e3 100644
--- a/AE/engine/tests/graphics/CMakeLists.txt
+++ b/AE/engine/tests/graphics/CMakeLists.txt
@@ -25,7 +25,6 @@ if (TARGET "Graphics")
     target_compile_definitions( "Tests.Graphics" PRIVATE
         AE_PIPELINE_COMPILER_LIBRARY="${MAIN_BINARY_DIR}"
         AE_SHARED_DATA="${AE_ENGINE_SHARED_DATA}"
-        AE_CURRENT_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
     )
 
     if (TARGET "OfflinePacker")
@@ -39,15 +38,22 @@ if (TARGET "Graphics")
         add_dependencies( "PACK_RES" "Tests.Graphics.PackRes" )
     endif()
 
-    if (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_REMOTE_GRAPHICS})
+    if (DEFINED ANDROID AND ${AE_ENABLE_VULKAN})
         target_compile_definitions( "Tests.Graphics" PRIVATE
+            AE_REFDUMP_PATH="tests_graphics_vulkan_refdump"
+            AE_REF_IMG_PATH="tests_graphics_vulkan_refimg"
+            AE_RES_PACK="pipelines.bin" )
+
+    elseif (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_REMOTE_GRAPHICS})
+        target_compile_definitions( "Tests.Graphics" PRIVATE
+            AE_REFDUMP_PATH="${CMAKE_CURRENT_SOURCE_DIR}/Vulkan/ref"
             AE_REF_IMG_PATH="${AE_EXTERNAL_REP_PATH}/tests/graphics/vulkan"
             AE_RES_PACK="${AE_TEMP_FOLDER}/engine/graphics/vk/pipelines.bin" )
 
     elseif (${AE_ENABLE_METAL})
         target_compile_definitions( "Tests.Graphics" PRIVATE
             AE_REF_IMG_PATH="${AE_EXTERNAL_REP_PATH}/tests/graphics/metal"
-            AE_RES_PACK="${AE_TEMP_FOLDER}/engine/graphics/mac/pipelines.bin"  )
+            AE_RES_PACK="${AE_TEMP_FOLDER}/engine/graphics/mac/pipelines.bin" )
     endif()
 
     if (NOT ${AE_CI_BUILD_NO_GRAPHICS})
diff --git a/AE/engine/tests/graphics/Metal/Test_MetalDevice.cpp b/AE/engine/tests/graphics/Metal/Test_MetalDevice.cpp
index 2c0afc27..775dc326 100644
--- a/AE/engine/tests/graphics/Metal/Test_MetalDevice.cpp
+++ b/AE/engine/tests/graphics/Metal/Test_MetalDevice.cpp
@@ -7,16 +7,18 @@
 
 extern void Test_MetalDevice ()
 {
-    using namespace AE::Graphics;
     {
         MDeviceInitializer  dev;
 
         CHECK_FATAL( dev.CreateDefaultQueue() );
         CHECK_FATAL( dev.CreateLogicalDevice() );
+
+        CHECK_FATAL( dev.IsInitialized() );
         CHECK_FATAL( dev.CheckConstantLimits() );
         CHECK_FATAL( dev.CheckExtensions() );
 
         CHECK_FATAL( dev.DestroyLogicalDevice() );
+        CHECK_FATAL( not dev.IsInitialized() );
     }
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/graphics/Remote/Test_RemoteDevice.cpp b/AE/engine/tests/graphics/Remote/Test_RemoteDevice.cpp
new file mode 100644
index 00000000..29b0f7ec
--- /dev/null
+++ b/AE/engine/tests/graphics/Remote/Test_RemoteDevice.cpp
@@ -0,0 +1,109 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#ifdef AE_ENABLE_REMOTE_GRAPHICS
+# include "graphics/Remote/RDevice.h"
+# include "graphics/Remote/RSwapchain.h"
+# include "platform/Public/IWindow.h"
+# include "platform/Public/IApplication.h"
+# include "../UnitTest_Common.h"
+
+using namespace AE::Networking;
+using namespace AE::Threading;
+using namespace AE::App;
+
+namespace
+{
+    class ServerProvider final : public IServerProvider
+    {
+        IpAddress   _addr4;
+
+    public:
+        ServerProvider (const IpAddress &addr4) __NE___ : _addr4{addr4} {}
+
+        void  GetAddress (EChannel, uint, Bool, OUT IpAddress &addr)    __NE_OV { addr = _addr4; }
+        void  GetAddress (EChannel, uint, Bool, OUT IpAddress6 &)       __NE_OV {}
+    };
+}
+
+
+extern void Test_RemoteDevice (IApplication &, IWindow &wnd)
+{
+    #if 0
+    {
+        // TODO: start remote server
+
+        RDeviceInitializer  dev;
+
+        RDeviceInitializer::InstanceCreateInfo  inst_ci;
+        inst_ci.appName         = "TestApp";
+        inst_ci.serverProvider  = MakeRC<ServerProvider>( IpAddress::FromLocalPortTCP( 3000 ));
+
+        CHECK_FATAL( dev.CreateInstance( inst_ci ));
+        CHECK_FATAL( dev.CreateDefaultQueue() );
+        CHECK_FATAL( dev.CreateLogicalDevice() );
+
+        CHECK_FATAL( dev.IsInitialized() );
+        CHECK_FATAL( dev.CheckConstantLimits() );
+        CHECK_FATAL( dev.CheckExtensions() );
+
+        CHECK_FATAL( dev.DestroyLogicalDevice() );
+        CHECK_FATAL( dev.DestroyInstance() );
+        CHECK_FATAL( not dev.IsInitialized() );
+    }
+    #else
+    {
+        // TODO: start remote server
+
+        RDeviceInitializer      dev {True{}};
+        GraphicsCreateInfo      info;
+        RSwapchainInitializer   swapchain;
+
+        info.staging.readStaticSize .fill( 2_Mb );
+        info.staging.writeStaticSize.fill( 2_Mb );
+        info.staging.maxReadDynamicSize     = 16_Mb;
+        info.staging.maxWriteDynamicSize    = 256_Mb;
+        info.staging.dynamicBlockSize       = 16_Mb;
+        info.staging.vstreamSize            = 4_Mb;
+
+        info.device.appName         = "TestApp";
+        info.device.requiredQueues  = EQueueMask::Graphics;
+        info.device.optionalQueues  = Default; //EQueueMask::AsyncCompute | EQueueMask::AsyncTransfer;
+        info.device.validation      = EDeviceValidation::Enabled;
+    //  info.device.devFlags        = EDeviceFlags::SetStableClock;
+
+        info.swapchain.colorFormat  = EPixelFormat::RGBA8_UNorm;
+        info.swapchain.usage        = EImageUsage::ColorAttachment | EImageUsage::Sampled | EImageUsage::TransferDst;
+        info.swapchain.options      = EImageOpt::BlitDst;
+        info.swapchain.presentMode  = EPresentMode::FIFO;
+        info.swapchain.minImageCount= 2;
+
+        CHECK_FATAL( dev.Init( info,
+                               MakeRC<ServerProvider>( IpAddress::FromLocalPortTCP( 3000 )),
+                               EThreadArray{ EThread::Main }
+                              ));
+
+        CHECK_FATAL( dev.IsInitialized() );
+        CHECK_FATAL( dev.CheckConstantLimits() );
+        CHECK_FATAL( dev.CheckExtensions() );
+
+        RenderTaskScheduler::InstanceCtor::Create( dev );
+        CHECK_FATAL( GraphicsScheduler().Initialize( info ));
+
+        CHECK_FATAL( swapchain.CreateSurface( wnd.GetNative() ));
+        CHECK_FATAL( swapchain.Create( uint2{1024, 768}, info.swapchain ));
+
+        swapchain.Destroy();
+        swapchain.DestroySurface();
+
+        RenderTaskScheduler::InstanceCtor::Destroy();
+
+        CHECK_FATAL( dev.DestroyLogicalDevice() );
+        CHECK_FATAL( dev.DestroyInstance() );
+        CHECK_FATAL( not dev.IsInitialized() );
+    }
+    #endif
+
+    TEST_PASSED();
+}
+
+#endif // AE_ENABLE_REMOTE_GRAPHICS
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Allocator.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Allocator.cpp
index 2bd0ad16..1fa9d7ff 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Allocator.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Allocator.cpp
@@ -14,7 +14,7 @@ namespace
     {
         CHECK_ERR( allocator );
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         auto    buf_id = res_mngr.CreateBuffer( BufferDesc{ 1_Kb, EBufferUsage::Storage }.SetMemory( memType ), "", allocator );
         CHECK_ERR( buf_id );
@@ -44,6 +44,22 @@ namespace
     }
 #endif
 
+#ifdef AE_ENABLE_METAL
+    ND_ static bool  TestCustomAllocators ()
+    {
+        // TODO
+        return true;
+    }
+#endif
+
+#ifdef AE_ENABLE_REMOTE_GRAPHICS
+    ND_ static bool  TestCustomAllocators ()
+    {
+        // TODO
+        return true;
+    }
+#endif
+
 } // namespace
 
 
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute1.cpp
index 675363e4..f995f942 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute1.cpp
@@ -58,7 +58,7 @@ namespace
         AC1_TestData&   t;
         const uint      fi;
 
-        AC1_GraphicsTask (AC1_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) :
+        AC1_GraphicsTask (AC1_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t },
             fi{ frameIdx & 1 }
@@ -79,7 +79,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.imageSize }
                                     .AddViewport( t.imageSize )
@@ -106,7 +106,7 @@ namespace
         AC1_TestData&   t;
         const uint      fi;
 
-        AC1_ComputeTask (AC1_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) :
+        AC1_ComputeTask (AC1_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t },
             fi{ frameIdx & 1 }
@@ -136,7 +136,7 @@ namespace
     public:
         AC1_TestData&   t;
 
-        AC1_CopyTask (AC1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        AC1_CopyTask (AC1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -180,26 +180,27 @@ namespace
         AC1_TestData&       t;
         CommandBatchPtr     lastBatch;
 
-        AC1_FrameTask (AC1_TestData& t) :
+        AC1_FrameTask (AC1_TestData& t) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ t }
         {}
 
         void  Run () __Th_OV
         {
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
 
             if ( t.frameIdx.load() == 3 )
             {
                 // frame 3
-                AsyncTask   begin = rts.BeginFrame();
+                CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+                CHECK_TE( rts.BeginFrame() );
 
                 auto        batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"copy task"} );
                 CHECK_TE( batch );
 
                 CHECK_TE( batch->AddInputDependency( lastBatch ));
 
-                AsyncTask   read_task   = batch->Run< AC1_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"Readback task"} );
+                AsyncTask   read_task   = batch->Run< AC1_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"Readback task"} );
                 AsyncTask   end         = rts.EndFrame( Tuple{read_task} );
 
                 ++t.frameIdx;
@@ -210,7 +211,8 @@ namespace
                 return; // frame 4+
 
             // frames [0..2]:
-            AsyncTask   begin       = rts.BeginFrame();
+            CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+            CHECK_TE( rts.BeginFrame() );
 
             auto        batch_gfx   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"graphics batch"} );
             CHECK_TE( batch_gfx );
@@ -224,7 +226,7 @@ namespace
             // graphics to compute sync
             CHECK_TE( batch_ac->AddInputDependency( batch_gfx ));
 
-            AsyncTask   gfx_task    = batch_gfx->Run< AC1_GraphicsTask<CtxTypes> >( Tuple{ ArgRef(t), t.frameIdx.load() },  Tuple{begin},    True{"Last"}, {"graphics task"} );
+            AsyncTask   gfx_task    = batch_gfx->Run< AC1_GraphicsTask<CtxTypes> >( Tuple{ ArgRef(t), t.frameIdx.load() },  Tuple{},         True{"Last"}, {"graphics task"} );
             AsyncTask   comp_task   = batch_ac ->Run< AC1_ComputeTask<CtxTypes>  >( Tuple{ ArgRef(t), t.frameIdx.load() },  Tuple{gfx_task}, True{"Last"}, {"async compute task"} );
             AsyncTask   end         = rts.EndFrame( Tuple{ gfx_task, comp_task });
 
@@ -239,9 +241,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  AsyncCompute1Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  AsyncCompute1Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         AC1_TestData    t;
         const auto      format      = EPixelFormat::RGBA8_UNorm;
@@ -295,12 +297,12 @@ namespace
         // draw 3 frames
         auto    task = Scheduler().Run< AC1_FrameTask<CtxTypes, CopyCtx> >( Tuple{ArgRef(t)} );
 
-        CHECK_ERR( Scheduler().Wait( {task} ));
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( Scheduler().Wait( {task}, c_MaxTimeout ));
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
         CHECK_ERR( t.frameIdx.load() == 4 );
 
-        CHECK_ERR( Scheduler().Wait({ t.result[0], t.result[1] }));
+        CHECK_ERR( Scheduler().Wait( {t.result[0], t.result[1]}, c_MaxTimeout ));
         CHECK_ERR( t.result[0]->Status() == EStatus::Completed );
         CHECK_ERR( t.result[1]->Status() == EStatus::Completed );
         CHECK_ERR( t.isOK[0] );
@@ -314,7 +316,7 @@ namespace
 
 bool RGTest::Test_AsyncCompute1 ()
 {
-    if ( not AllBits( RenderTaskScheduler().GetDevice().GetAvailableQueues(), EQueueMask::Graphics | EQueueMask::AsyncCompute ))
+    if ( not AllBits( GraphicsScheduler().GetDevice().GetAvailableQueues(), EQueueMask::Graphics | EQueueMask::AsyncCompute ))
         return true; // skip
 
     auto    img_cmp = _LoadReference( TEST_NAME );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute2.cpp
index ce796f32..b558de67 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute2.cpp
@@ -55,7 +55,7 @@ namespace
         AC2_TestData&   t;
         const uint      fi;
 
-        AC2_GraphicsTask (AC2_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) :
+        AC2_GraphicsTask (AC2_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t },
             fi{ frameIdx & 1 }
@@ -73,7 +73,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.imageSize }
                                     .AddViewport( t.imageSize )
@@ -97,7 +97,7 @@ namespace
         AC2_TestData&   t;
         const uint      fi;
 
-        AC2_ComputeTask (AC2_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) :
+        AC2_ComputeTask (AC2_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t },
             fi{ frameIdx & 1 }
@@ -127,7 +127,7 @@ namespace
     public:
         AC2_TestData&   t;
 
-        AC2_CopyTask (AC2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        AC2_CopyTask (AC2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -165,7 +165,7 @@ namespace
         AC2_TestData&       t;
         CommandBatchPtr     lastBatch;
 
-        AC2_FrameTask (AC2_TestData& t) :
+        AC2_FrameTask (AC2_TestData& t) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ t }
         {}
@@ -175,12 +175,13 @@ namespace
             constexpr auto  img_gfx_state   = EResourceState::ShaderSample | EResourceState::FragmentShader;
             constexpr auto  img_comp_state  = EResourceState::ShaderStorage_RW | EResourceState::ComputeShader;
 
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
 
             if ( t.frameIdx.load() == 3 )
             {
                 // frame 3
-                AsyncTask   begin = rts.BeginFrame();
+                CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+                CHECK_TE( rts.BeginFrame() );
 
                 auto        batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"copy task"} );
                 CHECK_TE( batch );
@@ -196,7 +197,7 @@ namespace
                 auto    final = batch->DeferredBarriers();
                 final.MemoryBarrier( EResourceState::CopyDst, EResourceState::Host_Read );
 
-                AsyncTask   read_task   = batch->Run< AC2_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{begin},
+                AsyncTask   read_task   = batch->Run< AC2_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{},
                                                                                initial.Get(), final.Get(),
                                                                                True{"Last"}, {"Readback task"} );
                 AsyncTask   end         = rts.EndFrame( Tuple{read_task} );
@@ -209,8 +210,9 @@ namespace
                 return; // frame 4+
 
             // frames [0..2]:
-            const uint      fi      = t.frameIdx.load() & 1;
-            AsyncTask       begin   = rts.BeginFrame();
+            const uint      fi = t.frameIdx.load() & 1;
+            CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+            CHECK_TE( rts.BeginFrame() );
 
             CommandBatchPtr batch_gfx;
             AsyncTask       gfx_task;
@@ -230,7 +232,7 @@ namespace
                 auto    final = batch_gfx->DeferredBarriers();
                 final.ReleaseImageOwnership( t.image[fi], img_gfx_state, img_comp_state, EQueueType::AsyncCompute );
 
-                gfx_task = batch_gfx->Run< AC2_GraphicsTask<CtxTypes> >( Tuple{ ArgRef(t), t.frameIdx.load() }, Tuple{begin},
+                gfx_task = batch_gfx->Run< AC2_GraphicsTask<CtxTypes> >( Tuple{ ArgRef(t), t.frameIdx.load() }, Tuple{},
                                                                          initial.Get(), final.Get(),
                                                                          True{"Last"}, {"graphics task"} );
             }
@@ -268,9 +270,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  AsyncCompute2Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  AsyncCompute2Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         AC2_TestData    t;
         const auto      format      = EPixelFormat::RGBA8_UNorm;
@@ -322,12 +324,12 @@ namespace
         // draw 3 frames
         auto    task = Scheduler().Run< AC2_FrameTask<CtxTypes, CopyCtx> >( Tuple{ArgRef(t)} );
 
-        CHECK_ERR( Scheduler().Wait( {task} ));
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( Scheduler().Wait( {task}, c_MaxTimeout ));
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
         CHECK_ERR( t.frameIdx.load() == 4 );
 
-        CHECK_ERR( Scheduler().Wait({ t.result[0], t.result[1] }));
+        CHECK_ERR( Scheduler().Wait( {t.result[0], t.result[1]}, c_MaxTimeout ));
         CHECK_ERR( t.result[0]->Status() == EStatus::Completed );
         CHECK_ERR( t.result[1]->Status() == EStatus::Completed );
         CHECK_ERR( t.isOK[0] );
@@ -341,7 +343,7 @@ namespace
 
 bool RGTest::Test_AsyncCompute2 ()
 {
-    if ( not AllBits( RenderTaskScheduler().GetDevice().GetAvailableQueues(), EQueueMask::Graphics | EQueueMask::AsyncCompute ))
+    if ( not AllBits( GraphicsScheduler().GetDevice().GetAvailableQueues(), EQueueMask::Graphics | EQueueMask::AsyncCompute ))
         return true; // skip
 
     auto    img_cmp = _LoadReference( TEST_NAME );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute3.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute3.cpp
index 47b7af8a..8abaaabb 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute3.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_AsyncCompute3.cpp
@@ -56,7 +56,7 @@ namespace
         AC3_TestData&   t;
         const uint      fi;
 
-        AC3_GraphicsTask (AC3_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) :
+        AC3_GraphicsTask (AC3_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t },
             fi{ frameIdx & 1 }
@@ -74,7 +74,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.imageSize }
                                     .AddViewport( t.imageSize )
@@ -98,7 +98,7 @@ namespace
         AC3_TestData&   t;
         const uint      fi;
 
-        AC3_ComputeTask (AC3_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) :
+        AC3_ComputeTask (AC3_TestData& t, uint frameIdx, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t },
             fi{ frameIdx & 1 }
@@ -128,7 +128,7 @@ namespace
     public:
         AC3_TestData&   t;
 
-        AC3_CopyTask (AC3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        AC3_CopyTask (AC3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -165,29 +165,31 @@ namespace
     public:
         AC3_TestData&       t;
 
-        AC3_FrameTask (AC3_TestData& t) :
+        AC3_FrameTask (AC3_TestData& t) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ t }
         {}
 
         void  Run () __Th_OV
         {
-            auto&   rg = RenderTaskScheduler().GetRenderGraph();
+            auto&   rg = GraphicsScheduler().GetRenderGraph();
 
             if ( t.frameIdx.load() == 3 )
             {
                 // frame 3
-                AsyncTask   begin       = rg.BeginFrame();
-                auto        batch       = rg.CmdBatch( EQueueType::AsyncCompute, {"copy task"} )
-                                                .UseResource( t.image[0] )
-                                                .UseResource( t.image[1] )
-                                                .ReadbackMemory()
-                                                .Begin();
+                CHECK_TE( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+                CHECK_TE( rg.BeginFrame() );
+
+                auto    batch   = rg.CmdBatch( EQueueType::AsyncCompute, {"copy task"} )
+                                        .UseResource( t.image[0] )
+                                        .UseResource( t.image[1] )
+                                        .ReadbackMemory()
+                                        .Begin();
                 CHECK_TE( batch );
 
-                AsyncTask   read_task   = batch.template Task< AC3_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, {"Readback task"} )
-                                                .SubmitBatch().Run( Tuple{begin} );
-                AsyncTask   end         = rg.EndFrame( Tuple{read_task} );
+                auto    read_task   = batch.template Task< AC3_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, {"Readback task"} )
+                                                .SubmitBatch().Run();
+                auto    end         = rg.EndFrame( Tuple{read_task} );
 
                 ++t.frameIdx;
                 return Continue( Tuple{end} );
@@ -197,27 +199,31 @@ namespace
                 return; // frame 4+
 
             // frames [0..2]:
-            const uint  fi      = t.frameIdx.load() & 1;
-            AsyncTask   begin   = rg.BeginFrame();
+            const uint  fi = t.frameIdx.load() & 1;
+
+            CHECK_TE( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+            CHECK_TE( rg.BeginFrame() );
 
 
             // batch graph
-            auto        batch_gfx = rg.CmdBatch( EQueueType::Graphics, {"graphics batch"} )
-                                        .UseResource( t.image[fi], EResourceState::ShaderSample | EResourceState::FragmentShader )
-                                        .Begin();
+            auto    batch_gfx = rg.CmdBatch( EQueueType::Graphics, {"graphics batch"} )
+                                    .UseResource( t.image[fi], EResourceState::ShaderSample | EResourceState::FragmentShader )
+                                    .Begin();
             CHECK_TE( batch_gfx );
 
-            auto        batch_ac = rg.CmdBatch( EQueueType::AsyncCompute, {"compute batch"} )
-                                        .UseResource( t.image[fi], EResourceState::ShaderStorage_RW | EResourceState::ComputeShader )
-                                        .Begin();
+            auto    batch_ac = rg.CmdBatch( EQueueType::AsyncCompute, {"compute batch"} )
+                                    .UseResource( t.image[fi], EResourceState::ShaderStorage_RW | EResourceState::ComputeShader )
+                                    .Begin();
             CHECK_TE( batch_ac );
 
 
             // add tasks to cmd batches
-            AsyncTask   gfx_task    = batch_gfx.template Task< AC3_GraphicsTask<CtxTypes> >( Tuple{ ArgRef(t), t.frameIdx.load() }, {"graphics task"}      ).SubmitBatch().Run( Tuple{begin} );
-            AsyncTask   comp_task   = batch_ac .template Task< AC3_ComputeTask<CtxTypes>  >( Tuple{ ArgRef(t), t.frameIdx.load() }, {"async compute task"} ).SubmitBatch().Run( Tuple{gfx_task} );
+            auto    gfx_task    = batch_gfx.template Task< AC3_GraphicsTask<CtxTypes> >( Tuple{ ArgRef(t), t.frameIdx.load() }, {"graphics task"} )
+                                        .SubmitBatch().Run();
+            auto    comp_task   = batch_ac .template Task< AC3_ComputeTask<CtxTypes>  >( Tuple{ ArgRef(t), t.frameIdx.load() }, {"async compute task"} )
+                                        .SubmitBatch().Run( Tuple{gfx_task} );
 
-            AsyncTask   end         = rg.EndFrame( Tuple{ gfx_task, comp_task });
+            auto    end         = rg.EndFrame( Tuple{ gfx_task, comp_task });
 
             ++t.frameIdx;
             return Continue( Tuple{end} );
@@ -228,12 +234,12 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  AsyncCompute3Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  AsyncCompute3Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&           res_mngr    = GraphicsScheduler().GetResourceManager();
         AC3_TestData    t;
         const auto      format      = EPixelFormat::RGBA8_UNorm;
-        auto&           rg          = RenderTaskScheduler().GetRenderGraph();
+        auto&           rg          = GraphicsScheduler().GetRenderGraph();
 
         t.rtech     = renderTech;
         t.gfxAlloc  = res_mngr.CreateLinearGfxMemAllocator();
@@ -282,12 +288,12 @@ namespace
         // draw 3 frames
         auto    task = Scheduler().Run< AC3_FrameTask<CtxTypes, CopyCtx> >( Tuple{ArgRef(t)} );
 
-        CHECK_ERR( Scheduler().Wait( {task} ));
-        CHECK_ERR( rg.WaitAll() );
+        CHECK_ERR( Scheduler().Wait( {task}, c_MaxTimeout ));
+        CHECK_ERR( rg.WaitAll( c_MaxTimeout ));
 
         CHECK_ERR( t.frameIdx.load() == 4 );
 
-        CHECK_ERR( Scheduler().Wait({ t.result[0], t.result[1] }));
+        CHECK_ERR( Scheduler().Wait( {t.result[0], t.result[1]}, c_MaxTimeout ));
         CHECK_ERR( t.result[0]->Status() == EStatus::Completed );
         CHECK_ERR( t.result[1]->Status() == EStatus::Completed );
         CHECK_ERR( t.isOK[0] );
@@ -301,7 +307,7 @@ namespace
 
 bool RGTest::Test_AsyncCompute3 ()
 {
-    if ( not AllBits( RenderTaskScheduler().GetDevice().GetAvailableQueues(), EQueueMask::Graphics | EQueueMask::AsyncCompute ))
+    if ( not AllBits( GraphicsScheduler().GetDevice().GetAvailableQueues(), EQueueMask::Graphics | EQueueMask::AsyncCompute ))
         return true; // skip
 
     auto    img_cmp = _LoadReference( TEST_NAME );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute1.cpp
index 5ffe8c9b..808c7fec 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute1.cpp
@@ -52,8 +52,8 @@ namespace
                 const uint  r   = uint(float(x % blockSize) * 255.0f / float(blockSize) + 0.5f);
                 const uint  g   = uint(float(y % blockSize) * 255.0f / float(blockSize) + 0.5f);
 
-                const bool  is_equal = (Equals( dst[0], r, 1u ) and
-                                        Equals( dst[1], g, 1u ) and
+                const bool  is_equal = (Equal( dst[0], r, 1u )  and
+                                        Equal( dst[1], g, 1u )  and
                                         dst[2] == 255           and
                                         dst[3] == 0);
 
@@ -71,7 +71,7 @@ namespace
     public:
         C1_TestData&    t;
 
-        C1_ComputeTask (C1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        C1_ComputeTask (C1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -117,7 +117,7 @@ namespace
     public:
         C1_TestData&    t;
 
-        C1_CopyTask (C1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        C1_CopyTask (C1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -155,7 +155,7 @@ namespace
     template <typename CompCtx, typename CopyCtx>
     static bool  Compute1Test ()
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         C1_TestData     t;
         const uint2     img_dim     {16, 16};
@@ -217,22 +217,25 @@ namespace
             CHECK_ERR( updater.Flush() );
         }
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Compute1"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< C1_ComputeTask<CompCtx> >( Tuple{ArgRef(t)}, Tuple{begin},                {"Compute task"} );
+        AsyncTask   task1   = batch->Run< C1_ComputeTask<CompCtx> >( Tuple{ArgRef(t)}, Tuple{},                     {"Compute task"} );
         AsyncTask   task2   = batch->Run< C1_CopyTask<CopyCtx>    >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"},  {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result0, t.result1, t.result2 }));
+        CHECK_ERR( Scheduler().Wait( {t.result0, t.result1, t.result2}, c_MaxTimeout ));
         CHECK_ERR( t.result0->Status() == EStatus::Completed );
         CHECK_ERR( t.result1->Status() == EStatus::Completed );
         CHECK_ERR( t.result2->Status() == EStatus::Completed );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute2.cpp
index 9a9cd8de..0bb2e756 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Compute2.cpp
@@ -53,8 +53,8 @@ namespace
                 const uint  r   = uint(float(x % blockSize) * 255.0f / float(blockSize) + 0.5f);
                 const uint  g   = uint(float(y % blockSize) * 255.0f / float(blockSize) + 0.5f);
 
-                const bool  is_equal = (Equals( dst[0], r, 1u ) and
-                                        Equals( dst[1], g, 1u ) and
+                const bool  is_equal = (Equal( dst[0], r, 1u )  and
+                                        Equal( dst[1], g, 1u )  and
                                         dst[2] == 255           and
                                         dst[3] == 0);
 
@@ -72,7 +72,7 @@ namespace
     public:
         C2_TestData&    t;
 
-        C2_ComputeTask (C2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        C2_ComputeTask (C2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -106,7 +106,7 @@ namespace
     public:
         C2_TestData&    t;
 
-        C2_CopyTask (C2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        C2_CopyTask (C2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -142,8 +142,8 @@ namespace
     template <typename CompCtx, typename CopyCtx>
     static bool  Compute2Test ()
     {
-        auto&           res_mngr    = RenderTaskScheduler().GetResourceManager();
-        auto&           rg          = RenderTaskScheduler().GetRenderGraph();
+        auto&           res_mngr    = GraphicsScheduler().GetResourceManager();
+        auto&           rg          = GraphicsScheduler().GetRenderGraph();
         C2_TestData     t;
         const uint2     img_dim     {16, 16};
         const auto      format      = EPixelFormat::RGBA8_UNorm;
@@ -207,7 +207,9 @@ namespace
             CHECK_ERR( updater.Flush() );
         }
 
-        AsyncTask   begin   = rg.BeginFrame();
+
+        CHECK_ERR( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rg.BeginFrame() );
 
         auto        batch   = rg.CmdBatch( EQueueType::Graphics, {"Compute1"} )
                                     .UseResources( t.img0, t.img1, t.img2 )
@@ -216,7 +218,7 @@ namespace
         CHECK_ERR( batch );
 
         AsyncTask   task1   = batch.Task< C2_ComputeTask<CompCtx> >( Tuple{ArgRef(t)}, {"Compute task"} )
-                                    .Run( Tuple{begin} );
+                                    .Run();
 
         AsyncTask   task2   = batch.Task< C2_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, {"Readback task"} )
                                     .UseResources( ArrayView<ImageID>{t.img0, t.img1, t.img2}, EResourceState::CopySrc )
@@ -225,12 +227,13 @@ namespace
 
         AsyncTask   end     = rg.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rg.WaitAll() );
+        CHECK_ERR( rg.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result0, t.result1, t.result2 }));
+        CHECK_ERR( Scheduler().Wait( {t.result0, t.result1, t.result2}, c_MaxTimeout ));
         CHECK_ERR( t.result0->Status() == EStatus::Completed );
         CHECK_ERR( t.result1->Status() == EStatus::Completed );
         CHECK_ERR( t.result2->Status() == EStatus::Completed );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer1.cpp
index 4d4ccf90..a2c9ca3d 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer1.cpp
@@ -23,7 +23,7 @@ namespace
     public:
         CB1_TestData&   t;
 
-        CB1_CopyBufferTask (CB1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        CB1_CopyBufferTask (CB1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -59,7 +59,7 @@ namespace
     template <typename Ctx>
     static bool  CopyBuffer1Test ()
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         EMemoryType     host_mem    = Default;
         CB1_TestData    t;
@@ -84,20 +84,23 @@ namespace
             t.buffer_data[i] = ubyte(i);
         }
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"CopyBuffer1"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< CB1_CopyBufferTask<Ctx> >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"Copy buffer task"} );
+        AsyncTask   task1   = batch->Run< CB1_CopyBufferTask<Ctx> >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"Copy buffer task"} );
         AsyncTask   end     = rts.EndFrame( Tuple{task1} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer2.cpp
index 0335c682..1203e154 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyBuffer2.cpp
@@ -23,7 +23,7 @@ namespace
     public:
         CB2_TestData&   t;
 
-        CB2_CopyBufferTask (CB2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        CB2_CopyBufferTask (CB2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -56,7 +56,7 @@ namespace
     template <typename Ctx>
     static bool  CopyBuffer2Test ()
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         EMemoryType     host_mem    = Default;
         CB2_TestData    t;
@@ -81,20 +81,23 @@ namespace
             t.buffer_data[i] = ubyte(i);
         }
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"CopyBuffer2"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< CB2_CopyBufferTask<Ctx> >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"Copy buffer task"} );
+        AsyncTask   task1   = batch->Run< CB2_CopyBufferTask<Ctx> >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"Copy buffer task"} );
         AsyncTask   end     = rts.EndFrame( Tuple{task1} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage1.cpp
index eb867ea0..89113502 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage1.cpp
@@ -25,7 +25,7 @@ namespace
     public:
         CI1_TestData&   t;
 
-        CI1_CopyImageTask (CI1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        CI1_CopyImageTask (CI1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -84,7 +84,7 @@ namespace
     template <typename Ctx>
     static bool  CopyImage1Test ()
     {
-        auto&           rts             = RenderTaskScheduler();
+        auto&           rts             = GraphicsScheduler();
         auto&           res_mngr        = rts.GetResourceManager();
         Array<ubyte>    img_data;
         CI1_TestData    t;
@@ -119,20 +119,23 @@ namespace
         t.copy_dim      = src_dim;
         t.img_view      = ImageMemView{ img_data, uint3{}, uint3{src_dim, 0}, 0_b, 0_b, format, EImageAspect::Color };
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"CopyImage2"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< CI1_CopyImageTask<Ctx> >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"Copy image task"} );
+        AsyncTask   task1   = batch->Run< CI1_CopyImageTask<Ctx> >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"Copy image task"} );
         AsyncTask   end     = rts.EndFrame( Tuple{task1} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage2.cpp
index c48804ef..7c085aa7 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_CopyImage2.cpp
@@ -26,7 +26,7 @@ namespace
     public:
         CI2_TestData&   t;
 
-        CI2_CopyImageTask (CI2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        CI2_CopyImageTask (CI2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -81,7 +81,7 @@ namespace
         const Bytes     bpp             = 4_b;
         const Bytes     src_row_pitch   = src_dim.x * bpp;
         const auto      format          = EPixelFormat::RGBA8_UNorm;
-        auto&           rg              = RenderTaskScheduler().GetRenderGraph();
+        auto&           rg              = GraphicsScheduler().GetRenderGraph();
 
         t.gfxAlloc = rg.GetResourceManager().CreateLinearGfxMemAllocator();
 
@@ -107,7 +107,9 @@ namespace
         t.copy_dim      = src_dim;
         t.img_view      = ImageMemView{ img_data, uint3{}, uint3{src_dim, 0}, 0_b, 0_b, format, EImageAspect::Color };
 
-        AsyncTask   begin   = rg.BeginFrame();
+
+        CHECK_ERR( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rg.BeginFrame() );
 
         auto        batch   = rg.CmdBatch( EQueueType::Graphics, {"CopyImage2"} )
                                 .UseResource( t.img_1 )
@@ -118,15 +120,16 @@ namespace
 
         AsyncTask   task1   = batch.Task< CI2_CopyImageTask<Ctx> >( Tuple{ArgRef(t)}, {"Copy image task"} )
                                 .UseResource( t.img_2 )
-                                .SubmitBatch().Run( Tuple{begin} );
+                                .SubmitBatch().Run();
         AsyncTask   end     = rg.EndFrame( Tuple{task1} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rg.WaitAll() );
+        CHECK_ERR( rg.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger1.cpp
index ca41b91f..0b8157cc 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger1.cpp
@@ -41,8 +41,8 @@ namespace
                 const uint  r   = uint(float(x % blockSize) * 255.0f / float(blockSize) + 0.5f);
                 const uint  g   = uint(float(y % blockSize) * 255.0f / float(blockSize) + 0.5f);
 
-                const bool  is_equal = (Equals( dst[0], r, 1u ) and
-                                        Equals( dst[1], g, 1u ) and
+                const bool  is_equal = (Equal( dst[0], r, 1u )  and
+                                        Equal( dst[1], g, 1u )  and
                                         dst[2] == 255           and
                                         dst[3] == 0);
 
@@ -60,7 +60,7 @@ namespace
     public:
         Db1_TestData&   t;
 
-        Db1_ComputeTask (Db1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db1_ComputeTask (Db1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -100,7 +100,7 @@ namespace
     public:
         Db1_TestData&   t;
 
-        Db1_CopyTask (Db1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db1_CopyTask (Db1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -161,7 +161,7 @@ no source
     template <typename CtxTypes, typename CopyCtx>
     static bool  Debugger1Test ()
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         Db1_TestData    t;
         const uint2     img_dim     {16, 16};
@@ -194,22 +194,25 @@ no source
             CHECK_ERR( updater.Flush() );
         }
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Debugger1"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< Db1_ComputeTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Compute task"} );
+        AsyncTask   task1   = batch->Run< Db1_ComputeTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{},                    {"Compute task"} );
         AsyncTask   task2   = batch->Run< Db1_CopyTask<CopyCtx>     >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
@@ -222,6 +225,9 @@ no source
 
 bool RGTest::Test_Debugger1 ()
 {
+    if ( not _dbgPipelines )
+        return true;
+
     bool    result = true;
 
     RG_CHECK( Debugger1Test< DirectCtx, DirectCtx::Transfer >());
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger2.cpp
index 6b358274..8ef41362 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger2.cpp
@@ -28,7 +28,7 @@ namespace
         GfxMemAllocatorPtr          gfxAlloc;
     };
 
-    static constexpr auto&  RTech = RenderTechs::DrawTestRT;
+    static constexpr auto&  RTech = RenderTechs::DebugDrawTestRT;
 
 
     template <typename CtxType>
@@ -37,7 +37,7 @@ namespace
     public:
         Db2_TestData&   t;
 
-        Db2_DrawTask (Db2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db2_DrawTask (Db2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -62,7 +62,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -88,7 +88,7 @@ namespace
     public:
         Db2_TestData&   t;
 
-        Db2_CopyTask (Db2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db2_CopyTask (Db2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -129,7 +129,7 @@ no source
 23. v_Color     = g_Colors[gl_VertexIndex];
 
 )";
-                        const StringView    vs2_ref_str = 
+                        const StringView    vs2_ref_str =
 R"(//> gl_VertexIndex: int {2}
 //> gl_InstanceIndex: int {0}
 no source
@@ -145,7 +145,6 @@ no source
 )";
                         const StringView    fs_ref_str =
 R"(//> gl_FragCoord: float4 {400.500000, 300.500000, 0.000000, 1.000000}
-//> gl_PrimitiveID: int {0}
 //> v_Color: float3 {0.498333, 0.252083, 0.249583}
 no source
 
@@ -176,9 +175,9 @@ no source
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  Debugger2Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Debugger2Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         Db2_TestData    t;
@@ -201,22 +200,25 @@ no source
         t.ppln = t.rtech->GetGraphicsPipeline( RTech.Draw_1.dbg2_draw );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Debugger2"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< Db2_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw task"} );
+        AsyncTask   task1   = batch->Run< Db2_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw task"} );
         AsyncTask   task2   = batch->Run< Db2_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
@@ -228,10 +230,13 @@ no source
 
 bool RGTest::Test_Debugger2 ()
 {
+    if ( not _dbgPipelines )
+        return true;
+
     auto    img_cmp = _LoadReference( TEST_NAME );
     bool    result  = true;
 
-    RG_CHECK( Debugger2Test< DirectCtx, DirectCtx::Transfer >( _pipelines, img_cmp.get() ));
+    RG_CHECK( Debugger2Test< DirectCtx, DirectCtx::Transfer >( _dbgPipelines, img_cmp.get() ));
 
     RG_CHECK( _CompareDumps( TEST_NAME ));
 
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger3.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger3.cpp
index a9079a1d..628f49ef 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger3.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger3.cpp
@@ -28,7 +28,7 @@ namespace
         GfxMemAllocatorPtr          gfxAlloc;
     };
 
-    static constexpr auto&  RTech = RenderTechs::DrawTestRT;
+    static constexpr auto&  RTech = RenderTechs::DrawMeshesTestRT;
 
 
     template <typename CtxType>
@@ -37,7 +37,7 @@ namespace
     public:
         Db3_TestData&   t;
 
-        Db3_DrawTask (Db3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db3_DrawTask (Db3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -61,8 +61,8 @@ namespace
 
             // draw
             {
-                constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                constexpr auto&     rtech_pass = RTech.DrawMeshes_1;
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -88,7 +88,7 @@ namespace
     public:
         Db3_TestData&   t;
 
-        Db3_CopyTask (Db3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db3_CopyTask (Db3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -151,9 +151,9 @@ no source
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  Debugger3Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Debugger3Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         Db3_TestData    t;
@@ -173,25 +173,28 @@ no source
         t.view = res_mngr.CreateImageView( ImageViewDesc{}, t.img, "ImageView" );
         CHECK_ERR( t.view );
 
-        t.ppln = t.rtech->GetMeshPipeline( RTech.Draw_1.dbg3_draw );
+        t.ppln = t.rtech->GetMeshPipeline( RTech.DrawMeshes_1.dbg3_draw );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Debugger3"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< Db3_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw mesh task"} );
+        AsyncTask   task1   = batch->Run< Db3_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw mesh task"} );
         AsyncTask   task2   = batch->Run< Db3_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
@@ -203,10 +206,13 @@ no source
 
 bool RGTest::Test_Debugger3 ()
 {
+    if ( _msPipelines == null )
+        return true; // skip
+
     auto    img_cmp = _LoadReference( TEST_NAME );
     bool    result  = true;
 
-    RG_CHECK( Debugger3Test< DirectCtx, DirectCtx::Transfer >( _pipelines, img_cmp.get() ));
+    RG_CHECK( Debugger3Test< DirectCtx, DirectCtx::Transfer >( _msPipelines, img_cmp.get() ));
 
     RG_CHECK( _CompareDumps( TEST_NAME ));
 
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger4.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger4.cpp
index 54cb52df..6947fc13 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger4.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger4.cpp
@@ -54,7 +54,7 @@ namespace
     public:
         Db4_TestData&   t;
 
-        Db4_UploadTask (Db4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db4_UploadTask (Db4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -110,7 +110,7 @@ namespace
     public:
         Db4_TestData&   t;
 
-        Db4_RayTracingTask (Db4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db4_RayTracingTask (Db4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -154,7 +154,7 @@ namespace
     public:
         Db4_TestData&   t;
 
-        Db4_CopyTask (Db4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db4_CopyTask (Db4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -293,7 +293,7 @@ no source
     template <typename CtxTypes, typename CopyCtx>
     static bool  Debugger4Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         Db4_TestData    t;
@@ -366,23 +366,26 @@ no source
         }
         CHECK_ERR( t.ds );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Debugger4"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< Db4_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{begin},                 {"Upload RTAS task"} );
+        AsyncTask   task1   = t.batch->Run< Db4_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{},                      {"Upload RTAS task"} );
         AsyncTask   task2   = t.batch->Run< Db4_RayTracingTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{task1},                 {"Ray tracing task"} );
         AsyncTask   task3   = t.batch->Run< Db4_CopyTask<CopyCtx>        >( Tuple{ArgRef(t)}, Tuple{task2}, True{"Last"},   {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger5.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger5.cpp
index a81ab7b6..f161b39c 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger5.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Debugger5.cpp
@@ -53,7 +53,7 @@ namespace
     public:
         Db5_TestData&   t;
 
-        Db5_UploadTask (Db5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db5_UploadTask (Db5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -109,7 +109,7 @@ namespace
     public:
         Db5_TestData&   t;
 
-        Db5_RayTracingTask (Db5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db5_RayTracingTask (Db5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -152,7 +152,7 @@ namespace
     public:
         Db5_TestData&   t;
 
-        Db5_CopyTask (Db5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        Db5_CopyTask (Db5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -251,9 +251,9 @@ no source
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  Debugger5Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Debugger5Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         Db5_TestData    t;
@@ -323,23 +323,26 @@ no source
         }
         CHECK_ERR( t.ds );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Debugger5"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< Db5_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{begin},                 {"Upload RTAS task"} );
+        AsyncTask   task1   = t.batch->Run< Db5_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{},                      {"Upload RTAS task"} );
         AsyncTask   task2   = t.batch->Run< Db5_RayTracingTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{task1},                 {"Ray tracing task"} );
         AsyncTask   task3   = t.batch->Run< Db5_CopyTask<CopyCtx>        >( Tuple{ArgRef(t)}, Tuple{task2}, True{"Last"},   {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw1.cpp
index bf15be10..54d75166 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw1.cpp
@@ -34,7 +34,7 @@ namespace
     public:
         D1_TestData&    t;
 
-        D1_DrawTask (D1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D1_DrawTask (D1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -54,7 +54,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -79,7 +79,7 @@ namespace
     public:
         D1_TestData&    t;
 
-        D1_CopyTask (D1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D1_CopyTask (D1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -105,9 +105,9 @@ namespace
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  Draw1Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Draw1Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         D1_TestData     t;
@@ -130,22 +130,25 @@ namespace
         t.ppln = t.rtech->GetGraphicsPipeline( RTech.Draw_1.draw1 );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Draw1"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< D1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw task"} );
+        AsyncTask   task1   = batch->Run< D1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw task"} );
         AsyncTask   task2   = batch->Run< D1_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw2.cpp
index 7f791f33..72ba96ba 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw2.cpp
@@ -42,7 +42,7 @@ namespace
     public:
         D2_TestData&    t;
 
-        D2_DrawTask (D2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D2_DrawTask (D2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -72,7 +72,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -99,7 +99,7 @@ namespace
     public:
         D2_TestData&    t;
 
-        D2_CopyTask (D2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D2_CopyTask (D2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -125,9 +125,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  Draw2Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Draw2Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         D2_TestData     t;
@@ -154,22 +154,25 @@ namespace
         t.ppln = t.rtech->GetGraphicsPipeline( RTech.Draw_1.draw2 );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Draw2"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< D2_DrawTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{begin},                {"Draw task"} );
+        AsyncTask   task1   = t.batch->Run< D2_DrawTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{},                     {"Draw task"} );
         AsyncTask   task2   = t.batch->Run< D2_CopyTask<CopyCtx>  >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"},  {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw3.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw3.cpp
index c9d79412..db64c741 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw3.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw3.cpp
@@ -41,7 +41,7 @@ namespace
     public:
         D3_TestData&    t;
 
-        D3_DrawTask (D3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D3_DrawTask (D3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -61,7 +61,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.Draw_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -87,7 +87,7 @@ namespace
     public:
         D3_TestData&    t;
 
-        D3_CopyTask (D3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D3_CopyTask (D3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -113,9 +113,9 @@ namespace
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  Draw3Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Draw3Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         D3_TestData     t;
@@ -140,22 +140,25 @@ namespace
 
         t.pcIdx = res_mngr.GetPushConstantIndex< ShaderTypes::PC_draw3 >( t.ppln, PushConstantName{"pc"} );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Draw3"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< D3_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw task"} );
+        AsyncTask   task1   = batch->Run< D3_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw task"} );
         AsyncTask   task2   = batch->Run< D3_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw4.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw4.cpp
index 64c661e9..dca9cf58 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw4.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw4.cpp
@@ -51,7 +51,7 @@ namespace
         D4_TestData&    t;
         const uint      mode;
 
-        D4_DrawTask (D4_TestData& t, uint mode, CommandBatchPtr batch, DebugLabel dbg) :
+        D4_DrawTask (D4_TestData& t, uint mode, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }, mode{ mode }
         {}
@@ -64,7 +64,7 @@ namespace
             if ( mode == 0 )
             {
                 constexpr auto&     rtech_pass = RTech.Test4_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -86,7 +86,7 @@ namespace
             if ( mode == 0 )
             {
                 constexpr auto&     rtech_pass = RTech.Test4_2;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -108,7 +108,7 @@ namespace
             if ( mode == 1 )
             {
                 constexpr auto&     rtech_pass = RTech.Test4_2;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -137,7 +137,7 @@ namespace
     public:
         D4_TestData&    t;
 
-        D4_CopyTask (D4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D4_CopyTask (D4_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -158,10 +158,10 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  Draw4Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Draw4Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           res_mngr    = RenderTaskScheduler().GetResourceManager();
-        auto&           rg          = RenderTaskScheduler().GetRenderGraph();
+        auto&           res_mngr    = GraphicsScheduler().GetResourceManager();
+        auto&           rg          = GraphicsScheduler().GetRenderGraph();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         D4_TestData     t;
 
@@ -184,7 +184,9 @@ namespace
         t.ppln1 = t.rtech->GetGraphicsPipeline( RTech.Test4_2.draw4_2 );
         CHECK_ERR( t.ppln0 and t.ppln1 );
 
-        AsyncTask   begin   = rg.BeginFrame();
+
+        CHECK_ERR( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rg.BeginFrame() );
 
         auto        batch   = rg.CmdBatch( EQueueType::Graphics, {"Draw4"} )
                                     .UploadMemory()
@@ -194,10 +196,10 @@ namespace
 
         AsyncTask   task1   = batch.template Task< D4_DrawTask<CtxTypes> >( Tuple{ArgRef(t), 0u}, {"Draw task1"} )
                                     .UseResource( t.img, EResourceState::ColorAttachment )
-                                    .Run( Tuple{begin} );
+                                    .Run();
         AsyncTask   task2   = batch.template Task< D4_DrawTask<CtxTypes> >( Tuple{ArgRef(t), 1u}, {"Draw task2"} )
                                     .UseResource( t.img, EResourceState::ColorAttachment )
-                                    .Run( Tuple{begin} );
+                                    .Run();
 
         AsyncTask   task3   = batch.template Task< D4_CopyTask<CopyCtx>  >( Tuple{ArgRef(t)}, {"Readback task"} )
                                     .UseResource( t.img, EResourceState::CopySrc )
@@ -205,12 +207,13 @@ namespace
 
         AsyncTask   end     = rg.EndFrame( Tuple{task1, task2, task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rg.WaitAll() );
+        CHECK_ERR( rg.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw5.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw5.cpp
index ded62078..c408a6ef 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw5.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_Draw5.cpp
@@ -51,7 +51,7 @@ namespace
         D5_TestData&    t;
         const uint      mode;
 
-        D5_DrawTask (D5_TestData& t, uint mode, CommandBatchPtr batch, DebugLabel dbg) :
+        D5_DrawTask (D5_TestData& t, uint mode, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }, mode{ mode }
         {}
@@ -64,7 +64,7 @@ namespace
             if ( mode == 0 )
             {
                 constexpr auto&     rtech_pass = RTech.Test4_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -86,7 +86,7 @@ namespace
             if ( mode == 0 )
             {
                 constexpr auto&     rtech_pass = RTech.Test4_2;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -108,7 +108,7 @@ namespace
             if ( mode == 1 )
             {
                 constexpr auto&     rtech_pass = RTech.Test4_2;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -137,7 +137,7 @@ namespace
     public:
         D5_TestData&    t;
 
-        D5_CopyTask (D5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        D5_CopyTask (D5_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -158,10 +158,10 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  Draw5Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  Draw5Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           res_mngr    = RenderTaskScheduler().GetResourceManager();
-        auto&           rg          = RenderTaskScheduler().GetRenderGraph();
+        auto&           res_mngr    = GraphicsScheduler().GetResourceManager();
+        auto&           rg          = GraphicsScheduler().GetRenderGraph();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         D5_TestData     t;
 
@@ -184,7 +184,9 @@ namespace
         t.ppln1 = t.rtech->GetGraphicsPipeline( RTech.Test4_2.draw4_2 );
         CHECK_ERR( t.ppln0 and t.ppln1 );
 
-        AsyncTask   begin   = rg.BeginFrame();
+
+        CHECK_ERR( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rg.BeginFrame() );
 
         // pass1
         auto        batch1  = rg.CmdBatch( EQueueType::Graphics, {"Draw4-pass1"} )
@@ -194,10 +196,10 @@ namespace
         CHECK_ERR( batch1 );
 
         AsyncTask   task1   = batch1.template Task< D5_DrawTask<CtxTypes> >( Tuple{ArgRef(t), 0u}, {"Draw task1"} )
-                                    .Run( Tuple{begin} );
+                                    .Run();
         AsyncTask   task2   = batch1.template Task< D5_DrawTask<CtxTypes> >( Tuple{ArgRef(t), 1u}, {"Draw task2"} )
                                     .SubmitBatch()
-                                    .Run( Tuple{begin, task1} );
+                                    .Run( Tuple{task1} );
 
 
         // pass2
@@ -209,17 +211,18 @@ namespace
 
         AsyncTask   task3   = batch2.template Task< D5_CopyTask<CopyCtx>  >( Tuple{ArgRef(t)}, {"Readback task"} )
                                     .UseResource( t.img, EResourceState::CopySrc )
-                                    .SubmitBatch().Run( Tuple{begin} );
+                                    .SubmitBatch().Run();
 
 
         AsyncTask   end     = rg.EndFrame( Tuple{task1, task2, task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rg.WaitAll() );
+        CHECK_ERR( rg.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawAsync1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawAsync1.cpp
index 6d3f5828..e778ff77 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawAsync1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawAsync1.cpp
@@ -55,8 +55,8 @@ namespace
         DA1_TestData&   t;
         const uint      firstVertex;
 
-        DA1_DrawTask (DA1_TestData* t, uint first, RC<DrawCommandBatch> batch, DebugLabel dbg) :
-            DrawTask{ batch, dbg }, // throw
+        DA1_DrawTask (DA1_TestData* t, uint first, RC<DrawCommandBatch> batch, DebugLabel dbg) __NE___ :
+            DrawTask{ batch, dbg },
             t{ *t },
             firstVertex{ first }
         {}
@@ -90,7 +90,7 @@ namespace
         RC<DrawCommandBatch>                drawBatch;
         typename CtxTypes::CommandBuffer    cmdbuf;
 
-        DA1_RenderPassTask (DA1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        DA1_RenderPassTask (DA1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -103,7 +103,7 @@ namespace
             const auto  img_state = EResourceState::ShaderSample | EResourceState::FragmentShader;
 
             constexpr auto&     rtech_pass = RTech.Draw_1;
-            STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+            StaticAssert( rtech_pass.attachmentsCount == 1 );
 
             const auto  rp_desc = RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -211,7 +211,7 @@ namespace
     public:
         DA1_TestData&   t;
 
-        DA1_CopyTask (DA1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        DA1_CopyTask (DA1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -237,9 +237,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  DrawAsync1Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  DrawAsync1Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         DA1_TestData    t;
@@ -266,22 +266,25 @@ namespace
         t.ppln = t.rtech->GetGraphicsPipeline( RTech.Draw_1.draw2 );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"DrawAsync1"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< DA1_RenderPassTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw task"} );
+        AsyncTask   task1   = t.batch->Run< DA1_RenderPassTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw task"} );
         AsyncTask   task2   = t.batch->Run< DA1_CopyTask<CopyCtx>        >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh1.cpp
index 8520f5c8..9e5dc541 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh1.cpp
@@ -35,7 +35,7 @@ namespace
     public:
         DM1_TestData&   t;
 
-        DM1_DrawTask (DM1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        DM1_DrawTask (DM1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -55,7 +55,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.DrawMeshes_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -80,7 +80,7 @@ namespace
     public:
         DM1_TestData&   t;
 
-        DM1_CopyTask (DM1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        DM1_CopyTask (DM1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -106,9 +106,9 @@ namespace
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  DrawMesh1Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  DrawMesh1Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         DM1_TestData    t;
@@ -129,22 +129,25 @@ namespace
         t.ppln = t.rtech->GetMeshPipeline( RTech.DrawMeshes_1.draw_mesh1 );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"DrawMesh1"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< DM1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},                {"Draw task"} );
+        AsyncTask   task1   = t.batch->Run< DM1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                     {"Draw task"} );
         AsyncTask   task2   = t.batch->Run< DM1_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"},  {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh2.cpp
index ad927609..f1d58241 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_DrawMesh2.cpp
@@ -35,7 +35,7 @@ namespace
     public:
         DM2_TestData&   t;
 
-        DM2_DrawTask (DM2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        DM2_DrawTask (DM2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -55,7 +55,7 @@ namespace
             // draw
             {
                 constexpr auto&     rtech_pass = RTech.DrawMeshes_1;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = ctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -80,7 +80,7 @@ namespace
     public:
         DM2_TestData&   t;
 
-        DM2_CopyTask (DM2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        DM2_CopyTask (DM2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -106,9 +106,9 @@ namespace
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  DrawMesh2Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  DrawMesh2Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         DM2_TestData    t;
@@ -131,22 +131,25 @@ namespace
         t.ppln = t.rtech->GetMeshPipeline( RTech.DrawMeshes_1.draw_mesh2 );
         CHECK_ERR( t.ppln );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"DrawMesh1"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< DM2_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},                {"Draw task"} );
+        AsyncTask   task1   = t.batch->Run< DM2_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                     {"Draw task"} );
         AsyncTask   task2   = t.batch->Run< DM2_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"},  {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_FeatureSets.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_FeatureSets.cpp
index 57194845..0b7200d1 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_FeatureSets.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_FeatureSets.cpp
@@ -52,9 +52,9 @@ bool RGTest::Test_FeatureSets ()
     #endif
 
     #if defined(AE_ENABLE_VULKAN)
-        const EVendorID         vendor  = GetVendorTypeByID( _vulkan.GetVProperties().properties.vendorID );
-        const EGraphicsDeviceID dev     = GetEGraphicsDeviceByName( _vulkan.GetDeviceName() );
-        const bool              sra     = _vulkan.GetVProperties().fragShadingRateFeats.attachmentFragmentShadingRate;
+        const EVendorID         vendor  = GetVendorTypeByID( _device.GetVProperties().properties.vendorID );
+        const EGraphicsDeviceID dev     = GetEGraphicsDeviceByName( _device.GetDeviceName() );
+        const bool              sra     = _device.GetVProperties().fragShadingRateFeats.attachmentFragmentShadingRate;
 
         if ( sra )
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"part.ShadingRate.compat"} ));
@@ -98,23 +98,22 @@ bool RGTest::Test_FeatureSets ()
         }
         if ( (dev >= EGraphicsDeviceID::Adreno_600_QC5      and dev <= EGraphicsDeviceID::_Adreno_End)  or
              (dev >= EGraphicsDeviceID::Apple_A12           and dev <= EGraphicsDeviceID::_Apple_End)   or
-             (dev >= EGraphicsDeviceID::NV_Maxwell          and dev <= EGraphicsDeviceID::_NV_End)      or
-             (dev >= EGraphicsDeviceID::Mali_Valhall_Gen1   and dev <= EGraphicsDeviceID::_Mali_End) )
+             (dev >= EGraphicsDeviceID::NV_Maxwell          and dev <= EGraphicsDeviceID::_NV_End) )
         {
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"part.MinNonUniformDescriptorIndexing"} ));
         }
 
-        if ( _vulkan.GetVExtensions().rayQuery )
+        if ( _device.GetVExtensions().rayQuery )
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"MinInlineRayTracing"} ));
 
-        if ( _vulkan.GetVExtensions().rayTracingPipeline )
+        if ( _device.GetVExtensions().rayTracingPipeline )
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"MinRecursiveRayTracing"} ));
 
-        if ( _vulkan.GetVExtensions().meshShader )
+        if ( _device.GetVExtensions().meshShader )
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"MinMeshShader"} ));
 
     #elif defined(AE_ENABLE_METAL)
-        StringView  dev_name = _metal.GetDeviceName();
+        StringView  dev_name = _device.GetDeviceName();
 
         if ( HasSubStringIC( dev_name, "Apple" ))
         {
@@ -160,13 +159,13 @@ bool RGTest::Test_FeatureSets ()
             }
         }
 
-        if ( _metal.GetFeatures().rayTracing() )
+        if ( _device.GetFeatures().rayTracing() )
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"MinInlineRayTracing"} ));
 
-        //if ( _metal.GetFeatures().rayTracing() )
+        //if ( _device.GetFeatures().rayTracing() )
         //  TEST( _pipelines->FeatureSetSupported( FeatureSetName{"MinRecursiveRayTracing"} ));
 
-        if ( _metal.GetFeatures().meshShader )
+        if ( _device.GetFeatures().meshShader )
             TEST( _pipelines->FeatureSetSupported( FeatureSetName{"MinMeshShader"} ));
 
     #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_FrameCounter.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_FrameCounter.cpp
index c01021de..e32680ec 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_FrameCounter.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_FrameCounter.cpp
@@ -20,7 +20,7 @@ namespace
     public:
         FC_TestData&    t;
 
-        FC_TestTask (FC_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        FC_TestTask (FC_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -41,7 +41,7 @@ namespace
     public:
         FC_TestData&    t;
 
-        FC_FrameTask (FC_TestData& t) :
+        FC_FrameTask (FC_TestData& t) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ t }
         {}
@@ -51,14 +51,15 @@ namespace
             if ( t.counter.load() >= t.maxCount )
                 return;
 
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
 
-            AsyncTask   begin = rts.BeginFrame();
+            CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+            CHECK_TE( rts.BeginFrame() );
 
             t.batch  = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"FrameCounter"} );
             CHECK_TE( t.batch );
 
-            AsyncTask   test    = t.batch->Run< FC_TestTask >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"test task"} );
+            AsyncTask   test    = t.batch->Run< FC_TestTask >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"test task"} );
             AsyncTask   end     = rts.EndFrame( Tuple{test} );
 
             return Continue( Tuple{end} );
@@ -70,7 +71,7 @@ namespace
 
     static bool  FrameCounterTest ()
     {
-        auto&       rts         = RenderTaskScheduler();
+        auto&       rts         = GraphicsScheduler();
         auto&       res_mngr    = rts.GetResourceManager();
         FC_TestData t;
 
@@ -80,8 +81,10 @@ namespace
 
         auto    task = Scheduler().Run<FC_FrameTask>( Tuple{ArgRef(t)} );
 
-        CHECK_ERR( Scheduler().Wait( {task} ));
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( Scheduler().Wait( {task}, c_MaxTimeout ));
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
+
+        CHECK_ERR( task->IsCompleted() );
         CHECK_ERR( t.counter.load() >= t.maxCount );
 
         return true;
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_ImageFormat.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_ImageFormat.cpp
index a893976a..269341a0 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_ImageFormat.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_ImageFormat.cpp
@@ -6,7 +6,7 @@ namespace
 {
     static bool  ImageFormat1Test1 ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         GfxMemAllocatorPtr          gfx_alloc = res_mngr.CreateLinearGfxMemAllocator();
         GAutorelease<ImageID>       image_id;
@@ -39,7 +39,7 @@ namespace
 
     static bool  ImageFormat1Test2 ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         GfxMemAllocatorPtr          gfx_alloc = res_mngr.CreateLinearGfxMemAllocator();
         GAutorelease<ImageID>       image_id;
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayQuery1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayQuery1.cpp
index d6792eff..3cbdcec0 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayQuery1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayQuery1.cpp
@@ -51,7 +51,7 @@ namespace
     public:
         RQ1_TestData&   t;
 
-        RQ1_UploadTask (RQ1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RQ1_UploadTask (RQ1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -107,7 +107,7 @@ namespace
     public:
         RQ1_TestData&   t;
 
-        RQ1_RayTracingTask (RQ1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RQ1_RayTracingTask (RQ1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -143,7 +143,7 @@ namespace
     public:
         RQ1_TestData&   t;
 
-        RQ1_CopyTask (RQ1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RQ1_CopyTask (RQ1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -169,9 +169,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  RayQuery1Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  RayQuery1Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         RQ1_TestData    t;
@@ -241,23 +241,26 @@ namespace
         }
         CHECK_ERR( t.ds );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"RayQuery1"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< RQ1_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{begin},                 {"Upload RTAS task"} );
+        AsyncTask   task1   = t.batch->Run< RQ1_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{},                      {"Upload RTAS task"} );
         AsyncTask   task2   = t.batch->Run< RQ1_RayTracingTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{task1},                 {"Ray tracing task"} );
         AsyncTask   task3   = t.batch->Run< RQ1_CopyTask<CopyCtx>        >( Tuple{ArgRef(t)}, Tuple{task2}, True{"Last"},   {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing1.cpp
index b1d8e9b5..06d4c9b9 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing1.cpp
@@ -52,7 +52,7 @@ namespace
     public:
         RT1_TestData&   t;
 
-        RT1_UploadTask (RT1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT1_UploadTask (RT1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -108,7 +108,7 @@ namespace
     public:
         RT1_TestData&   t;
 
-        RT1_RayTracingTask (RT1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT1_RayTracingTask (RT1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -147,7 +147,7 @@ namespace
     public:
         RT1_TestData&   t;
 
-        RT1_CopyTask (RT1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT1_CopyTask (RT1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -173,9 +173,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  RayTracing1Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  RayTracing1Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         RT1_TestData    t;
@@ -248,23 +248,26 @@ namespace
         }
         CHECK_ERR( t.ds );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"RayTracing1"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< RT1_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{begin},                 {"Upload RTAS task"} );
+        AsyncTask   task1   = t.batch->Run< RT1_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{},                      {"Upload RTAS task"} );
         AsyncTask   task2   = t.batch->Run< RT1_RayTracingTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{task1},                 {"Ray tracing task"} );
         AsyncTask   task3   = t.batch->Run< RT1_CopyTask<CopyCtx>        >( Tuple{ArgRef(t)}, Tuple{task2}, True{"Last"},   {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing2.cpp
index 0bc784b1..3735326d 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing2.cpp
@@ -53,7 +53,7 @@ namespace
     public:
         RT2_TestData&   t;
 
-        RT2_UploadTask (RT2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT2_UploadTask (RT2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -117,7 +117,7 @@ namespace
     public:
         RT2_TestData&   t;
 
-        RT2_RayTracingTask (RT2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT2_RayTracingTask (RT2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -156,7 +156,7 @@ namespace
     public:
         RT2_TestData&   t;
 
-        RT2_CopyTask (RT2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT2_CopyTask (RT2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -182,9 +182,9 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  RayTracing2Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  RayTracing2Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         RT2_TestData    t;
@@ -262,23 +262,26 @@ namespace
         }
         CHECK_ERR( t.ds );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"RayTracing1"} );
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch->Run< RT2_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{begin},                 {"Upload RTAS task"} );
+        AsyncTask   task1   = t.batch->Run< RT2_UploadTask<CtxTypes>     >( Tuple{ArgRef(t)}, Tuple{},                      {"Upload RTAS task"} );
         AsyncTask   task2   = t.batch->Run< RT2_RayTracingTask<CtxTypes> >( Tuple{ArgRef(t)}, Tuple{task1},                 {"Ray tracing task"} );
         AsyncTask   task3   = t.batch->Run< RT2_CopyTask<CopyCtx>        >( Tuple{ArgRef(t)}, Tuple{task2}, True{"Last"},   {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
@@ -293,7 +296,7 @@ bool RGTest::Test_RayTracing2 ()
     if ( _rtPipelines == null )
         return true; // skip
 
-    if ( RenderTaskScheduler().GetFeatureSet().accelerationStructureIndirectBuild != EFeature::RequireTrue )
+    if ( GraphicsScheduler().GetFeatureSet().accelerationStructureIndirectBuild != EFeature::RequireTrue )
         return true; // skip
 
     auto    img_cmp = _LoadReference( TEST_NAME );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing3.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing3.cpp
index dbe62d0d..162a147e 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing3.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_RayTracing3.cpp
@@ -53,7 +53,7 @@ namespace
     public:
         RT3_TestData&   t;
 
-        RT3_UploadTask (RT3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT3_UploadTask (RT3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -100,7 +100,7 @@ namespace
     public:
         RT3_TestData&   t;
 
-        RT3_RayTracingTask (RT3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT3_RayTracingTask (RT3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -127,7 +127,7 @@ namespace
     public:
         RT3_TestData&   t;
 
-        RT3_CopyTask (RT3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        RT3_CopyTask (RT3_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -151,11 +151,11 @@ namespace
 
 
     template <typename CtxTypes, typename CopyCtx>
-    static bool  RayTracing3Test (RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  RayTracing3Test (RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         RT3_TestData    t;
-        auto&           rg          = RenderTaskScheduler().GetRenderGraph();
+        auto&           rg          = GraphicsScheduler().GetRenderGraph();
         auto&           res_mngr    = rg.GetResourceManager();
 
         t.gfxAlloc  = res_mngr.CreateLinearGfxMemAllocator();
@@ -226,14 +226,16 @@ namespace
         }
         CHECK_ERR( t.ds );
 
-        AsyncTask   begin   = rg.BeginFrame();
+
+        CHECK_ERR( rg.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rg.BeginFrame() );
 
         t.batch = rg.CmdBatch( EQueueType::Graphics, {"RayTracing1"} )
                     .UseResource( t.img )
                     .Begin();
         CHECK_ERR( t.batch );
 
-        AsyncTask   task1   = t.batch.template Task< RT3_UploadTask<CtxTypes> >( Tuple{ArgRef(t)}, {"Upload RTAS task"} ).Run( Tuple{begin} );
+        AsyncTask   task1   = t.batch.template Task< RT3_UploadTask<CtxTypes> >( Tuple{ArgRef(t)}, {"Upload RTAS task"} ).Run();
 
         AsyncTask   task2   = t.batch.template Task< RT3_RayTracingTask<CtxTypes> >( Tuple{ArgRef(t)}, {"Ray tracing task"} )
                                 .UseResource( t.img, EResourceState::ShaderStorage_Write | EResourceState::RayTracingShaders )
@@ -245,12 +247,13 @@ namespace
 
         AsyncTask   end     = rg.EndFrame( Tuple{task3} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rg.WaitAll() );
+        CHECK_ERR( rg.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_ShadingRate1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_ShadingRate1.cpp
index 5dfd1ecf..146f9440 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_ShadingRate1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_ShadingRate1.cpp
@@ -65,7 +65,7 @@ namespace
     public:
         SR1_TestData&   t;
 
-        SR1_DrawTask (SR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        SR1_DrawTask (SR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -116,7 +116,7 @@ namespace
             // per draw
             {
                 constexpr auto&     rtech_pass = RTech.nonVRS;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = gctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -134,7 +134,7 @@ namespace
             // per primitive
             {
                 constexpr auto&     rtech_pass = RTech.nonVRS;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+                StaticAssert( rtech_pass.attachmentsCount == 1 );
 
                 auto    dctx = gctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -158,7 +158,7 @@ namespace
             // VRS attachment
             {
                 constexpr auto&     rtech_pass = RTech.VRS;
-                STATIC_ASSERT( rtech_pass.attachmentsCount == 2 );
+                StaticAssert( rtech_pass.attachmentsCount == 2 );
 
                 auto    dctx = gctx.BeginRenderPass( RenderPassDesc{ t.rtech, rtech_pass, t.viewSize }
                                     .AddViewport( t.viewSize )
@@ -192,7 +192,7 @@ namespace
     public:
         SR1_TestData&   t;
 
-        SR1_CopyTask (SR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        SR1_CopyTask (SR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg },
             t{ t }
         {}
@@ -223,7 +223,7 @@ namespace
     template <typename CtxType, typename CopyCtx>
     static bool  ShadingRate1Test (RenderTechPipelinesPtr renderTech, Array<ImageComparator*> imgCmps)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         SR1_TestData    t;
 
@@ -261,22 +261,25 @@ namespace
         t.ppln[2] = renderTech->GetGraphicsPipeline( RTech.VRS.vrs_attachment );
         CHECK_ERR( t.ppln[0] and t.ppln[1] and t.ppln[2] );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Draw1"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< SR1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw task"} );
+        AsyncTask   task1   = batch->Run< SR1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw task"} );
         AsyncTask   task2   = batch->Run< SR1_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result[0]->Status() == EStatus::Completed );
         CHECK_ERR( t.result[1]->Status() == EStatus::Completed );
         CHECK_ERR( t.result[2]->Status() == EStatus::Completed );
@@ -290,6 +293,9 @@ namespace
 
 bool RGTest::Test_ShadingRate1 ()
 {
+    if ( _vrsPipelines == null )
+        return true; // skip
+
     auto    img_cmp1    = _LoadReference( TEST_NAME + "-1" );
     auto    img_cmp2    = _LoadReference( TEST_NAME + "-2" );
     auto    img_cmp3    = _LoadReference( TEST_NAME + "-3" );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream1.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream1.cpp
index 04817cc0..2841e86d 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream1.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream1.cpp
@@ -23,7 +23,7 @@ namespace
     public:
         US1_TestData&   t;
 
-        US1_UploadStreamTask (US1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        US1_UploadStreamTask (US1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg }, t{ t }
         {}
 
@@ -41,8 +41,8 @@ namespace
 
             Execute( ctx );
 
-            const auto  stat = RenderTaskScheduler().GetResourceManager().GetStagingBufferFrameStat( GetFrameId() );
-            ASSERT( stat.dynamicWrite <= upload_limit );
+            const auto  stat = GraphicsScheduler().GetResourceManager().GetStagingBufferFrameStat( GetFrameId() );
+            CHECK( stat.dynamicWrite <= upload_limit );
         }
     };
 
@@ -52,7 +52,7 @@ namespace
     public:
         US1_TestData&   t;
 
-        US1_FrameTask (US1_TestData& t) :
+        US1_FrameTask (US1_TestData& t) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ t }
         {}
@@ -64,17 +64,18 @@ namespace
 
             ++t.counter;
 
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
 
             BeginFrameConfig    cfg;
             cfg.stagingBufferPerFrameLimits.write = upload_limit;
 
-            AsyncTask   begin = rts.BeginFrame( cfg );
+            CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+            CHECK_TE( rts.BeginFrame( cfg ));
 
             t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"UploadStream1"} );
             CHECK_TE( t.batch );
 
-            AsyncTask   test    = t.batch->Run< US1_UploadStreamTask >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"test task"} );
+            AsyncTask   test    = t.batch->Run< US1_UploadStreamTask >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"test task"} );
             AsyncTask   end     = rts.EndFrame( Tuple{test} );
 
             return Continue( Tuple{end} );
@@ -86,7 +87,7 @@ namespace
 
     static bool  UploadStream1Test ()
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         US1_TestData    t;
 
@@ -103,8 +104,8 @@ namespace
 
         auto    task = Scheduler().Run<US1_FrameTask>( Tuple{ArgRef(t)} );
 
-        CHECK_ERR( Scheduler().Wait( {task} ));
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( Scheduler().Wait( {task}, c_MaxTimeout ));
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
         CHECK_ERR( t.stream.IsCompleted() );
         CHECK_ERR( t.counter.load() >= uint(t.buf_size / upload_limit) );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream2.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream2.cpp
index 939a9d81..cb1eecbd 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream2.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RG_UploadStream2.cpp
@@ -23,7 +23,7 @@ namespace
     public:
         US2_TestData&   t;
 
-        US2_UploadStreamTask (US2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        US2_UploadStreamTask (US2_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ RVRef(batch), dbg }, t{ t }
         {}
 
@@ -36,7 +36,7 @@ namespace
             if ( t.counter.fetch_add(1) == 0 )
             {
                 ctx.AccumBarriers()
-                    .ImageBarrier( t.stream.Image(), EResourceState::Invalidate, EResourceState::CopyDst );
+                    .ImageBarrier( t.stream.ImageId(), EResourceState::Invalidate, EResourceState::CopyDst );
             }
 
             ImageMemView    mem_view;
@@ -48,8 +48,8 @@ namespace
 
             Execute( ctx );
 
-            const auto  stat = RenderTaskScheduler().GetResourceManager().GetStagingBufferFrameStat( GetFrameId() );
-            ASSERT( stat.dynamicWrite <= upload_limit );
+            const auto  stat = GraphicsScheduler().GetResourceManager().GetStagingBufferFrameStat( GetFrameId() );
+            CHECK( stat.dynamicWrite <= upload_limit );
         }
     };
 
@@ -59,7 +59,7 @@ namespace
     public:
         US2_TestData&   t;
 
-        US2_FrameTask (US2_TestData& t) :
+        US2_FrameTask (US2_TestData& t) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ t }
         {}
@@ -69,12 +69,13 @@ namespace
             if ( t.stream.IsCompleted() )
                 return;
 
-            auto&   rts = RenderTaskScheduler();
+            auto&   rts = GraphicsScheduler();
 
             BeginFrameConfig    cfg;
             cfg.stagingBufferPerFrameLimits.write = upload_limit;
 
-            AsyncTask   begin = rts.BeginFrame( cfg );
+            CHECK_TE( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+            CHECK_TE( rts.BeginFrame( cfg ));
 
             t.batch = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"UploadStream2"} );
             CHECK_TE( t.batch );
@@ -97,7 +98,7 @@ namespace
                     if ( t.counter.fetch_add(1) == 0 )
                     {
                         ctx.AccumBarriers()
-                            .ImageBarrier( t.stream.Image(), EResourceState::Invalidate, EResourceState::CopyDst );
+                            .ImageBarrier( t.stream.ImageId(), EResourceState::Invalidate, EResourceState::CopyDst );
                     }
 
                     ImageMemView    mem_view;
@@ -109,14 +110,14 @@ namespace
 
                     co_await RenderTask_Execute( ctx );
 
-                    const auto  stat = RenderTaskScheduler().GetResourceManager().GetStagingBufferFrameStat( self.GetFrameId() );
+                    const auto  stat = GraphicsScheduler().GetResourceManager().GetStagingBufferFrameStat( self.GetFrameId() );
                     ASSERT( stat.dynamicWrite <= upload_limit );
 
                     co_return;
                 }( t ),
-                Tuple{begin}, True{"Last"}, {"test task"} );
+                Tuple{}, True{"Last"}, {"test task"} );
         #else
-            AsyncTask   test = t.batch->Run< US2_UploadStreamTask >( Tuple{ArgRef(t)}, Tuple{begin}, True{"Last"}, {"test task"} );
+            AsyncTask   test = t.batch->Run< US2_UploadStreamTask >( Tuple{ArgRef(t)}, Tuple{}, True{"Last"}, {"test task"} );
         #endif
 
             AsyncTask   end = rts.EndFrame( Tuple{test} );
@@ -130,7 +131,7 @@ namespace
 
     static bool  UploadStream2Test ()
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         Array<ubyte>    img_data;
         US2_TestData    t;
@@ -165,8 +166,8 @@ namespace
 
         auto    task = Scheduler().Run<US2_FrameTask>( Tuple{ArgRef(t)} );
 
-        CHECK_ERR( Scheduler().Wait( {task} ));
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( Scheduler().Wait( {task}, c_MaxTimeout ));
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
         CHECK_ERR( t.stream.IsCompleted() );
         CHECK_ERR( t.counter.load() >= uint(t.imageData.Image2DSize() / upload_limit) );
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.cpp b/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.cpp
index 64b44681..0d544b19 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.cpp
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.cpp
@@ -27,21 +27,7 @@ static constexpr uint  c_MaxRenderThreads = 3;
 =================================================
 */
 RGTest::RGTest () :
-    #if defined(AE_ENABLE_VULKAN)
-        _refDumpPath{ AE_CURRENT_DIR "/Vulkan/ref" },
-        _vulkan{ True{"enable info log"} }
-
-    #elif defined(AE_ENABLE_METAL)
-        _refDumpPath{ AE_CURRENT_DIR "/Metal/ref" },
-        _metal{ True{"enable info log"} }
-
-    #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        _refDumpPath{ AE_CURRENT_DIR "/Remote/ref" },
-        _remote{ True{"enable info log"} }
-
-    #else
-    #   error not implemented
-    #endif
+    _device{ True{"enable info log"} }
 {
     // too slow
     //_tests.emplace_back( &RGTest::Test_Buffer );
@@ -94,13 +80,13 @@ RGTest::RGTest () :
 */
 bool  RGTest::Test_Image ()
 {
-    ::Test_Image( RenderTaskScheduler().GetResourceManager() );
+    ::Test_Image( GraphicsScheduler().GetResourceManager() );
     return true;
 }
 
 bool  RGTest::Test_Buffer ()
 {
-    ::Test_Buffer( RenderTaskScheduler().GetResourceManager() );
+    ::Test_Buffer( GraphicsScheduler().GetResourceManager() );
     return true;
 }
 
@@ -113,14 +99,22 @@ Unique<ImageComparator>  RGTest::_LoadReference (StringView name) const
 {
     Unique<ImageComparator> img_cmp{ new ImageComparator{} };
 
-    Path    path{ AE_REF_IMG_PATH };
-    FileSystem::CreateDirectories( path );
-
-    path.append( name );
-    path.replace_extension( "dds" );
+    const Path  path = (_refImagePath / name).replace_extension( "dds" );
 
-    img_cmp->LoadReference( RVRef(path) );
+    RC<RStream> rfile;
+    if ( _refImageStorage->Open( OUT rfile, VFS::FileName{path.string()} ))
+    {
+        img_cmp->LoadReference( RVRef(rfile), path );
+    }
+    else
+    {
+        VFS::FileName   fname;
+        CHECK_ERR( _refImageStorage->CreateFile( fname, path ));
 
+        RC<WStream>     wfile;
+        if ( _refImageStorage->Open( OUT wfile, fname ))
+            img_cmp->Reset( RVRef(wfile), path );
+    }
     return img_cmp;
 }
 
@@ -129,22 +123,22 @@ Unique<ImageComparator>  RGTest::_LoadReference (StringView name) const
     SaveImage
 =================================================
 */
-bool  RGTest::SaveImage (StringView name, const ImageMemView &view)
+bool  RGTest::SaveImage (StringView name, const ImageMemView &view) const
 {
     using namespace AE::ResLoader;
 
-    Path    path{ AE_CURRENT_DIR };
-    path.append( "img" );
+    const Path  path = (_refImagePath / name).replace_extension( "dds" );
 
-    FileSystem::CreateDirectories( path );
+    VFS::FileName   fname;
+    CHECK_ERR( _refImageStorage->CreateFile( fname, path ));
 
-    path.append( name );
-    path.replace_extension( "dds" );
+    RC<WStream>     wfile;
+    CHECK_ERR( _refImageStorage->Open( OUT wfile, fname ));
 
     DDSImageSaver   saver;
     IntermImage     img;    CHECK( img.SetData( view, null ));
 
-    CHECK_ERR( Cast<IImageSaver>(&saver)->SaveImage( path, img ));
+    CHECK_ERR( Cast<IImageSaver>(&saver)->SaveImage( *wfile, img, EImageFormat::DDS ));
     return true;
 }
 
@@ -157,6 +151,14 @@ bool  RGTest::Run (IApplication &app, IWindow &wnd)
 {
     CHECK_ERR( _Create( app, wnd ));
 
+    for (uint i = 0; i < c_MaxRenderThreads; ++i) {
+        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
+                EThreadArray{ EThread::PerFrame, EThread::Renderer },
+                "render thread"s << ToString(i)
+            }));
+    }
+    CHECK_ERR( _CompilePipelines( app ));
+
     bool    result = _RunTests();
 
     _Destroy();
@@ -164,18 +166,55 @@ bool  RGTest::Run (IApplication &app, IWindow &wnd)
     return result;
 }
 
+/*
+=================================================
+    _Destroy
+=================================================
+*/
+void  RGTest::_Destroy ()
+{
+  #ifdef AE_ENABLE_VULKAN
+    _syncLog.Deinitialize( INOUT _device.EditDeviceFnTable() );
+  #endif
+
+    _pipelines      = null;
+    _dbgPipelines   = null;
+    _acPipelines    = null;
+    _msPipelines    = null;
+    _rtPipelines    = null;
+    _rqPipelines    = null;
+    _vrsPipelines   = null;
+
+    _swapchain.Destroy();
+    _swapchain.DestroySurface();
+
+    RenderTaskScheduler::InstanceCtor::Destroy();
+
+    CHECK( _device.DestroyLogicalDevice() );
+    CHECK( _device.DestroyInstance() );
+}
+
 /*
 =================================================
     _CompilePipelines
 =================================================
 */
-bool  RGTest::_CompilePipelines ()
+bool  RGTest::_CompilePipelines (IApplication &app)
 {
-    auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+    auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
     {
-        auto    file = MakeRC<FileRStream>( AE_RES_PACK );
+    #ifdef AE_PLATFORM_ANDROID
+        auto    storage = app.OpenStorage( EAppStorage::Builtin );
+        CHECK_ERR( storage );
+
+        RC<RStream> file;
+        CHECK_ERR( storage->Open( OUT file, VFS::FileName{AE_RES_PACK} ));
+    #else
+        RC<RStream> file = MakeRC<FileRStream>( AE_RES_PACK );
         CHECK_ERR( file->IsOpen() );
+        Unused( app );
+    #endif
 
         PipelinePackDesc    desc;
         desc.stream         = file;
@@ -188,6 +227,7 @@ bool  RGTest::_CompilePipelines ()
     _pipelines = res_mngr.LoadRenderTech( Default, RenderTechs::DrawTestRT, Default );
     CHECK_ERR( _pipelines );
 
+    _dbgPipelines   = res_mngr.LoadRenderTech( Default, RenderTechs::DebugDrawTestRT,   Default );
     _acPipelines    = res_mngr.LoadRenderTech( Default, RenderTechs::AsyncCompTestRT,   Default );
     _msPipelines    = res_mngr.LoadRenderTech( Default, RenderTechs::DrawMeshesTestRT,  Default );
     _rtPipelines    = res_mngr.LoadRenderTech( Default, RenderTechs::RayTracingTestRT,  Default );
@@ -212,6 +252,8 @@ GraphicsCreateInfo  RGTest::_GetGraphicsCreateInfo ()
     info.staging.maxWriteDynamicSize    = 16_Mb;
     info.staging.dynamicBlockSize       = 4_Mb;
 
+    info.swapchain.colorFormat  = EPixelFormat::RGBA8_UNorm;
+
     info.useRenderGraph = true;
 
     return info;
@@ -231,7 +273,7 @@ bool  RGTest::_Create (IApplication &app, IWindow &wnd)
     {
         VDeviceInitializer::InstanceCreateInfo  inst_ci;
         inst_ci.appName             = "TestApp";
-        inst_ci.instanceLayers      = _vulkan.GetRecommendedInstanceLayers();
+        inst_ci.instanceLayers      = _device.GetRecommendedInstanceLayers();
         inst_ci.instanceExtensions  = app.GetVulkanInstanceExtensions();
         inst_ci.version             = {1,3};
 
@@ -243,52 +285,61 @@ bool  RGTest::_Create (IApplication &app, IWindow &wnd)
         inst_ci.disableValidations  = sync_disable_feats;
         #endif
 
-        CHECK_ERR( _vulkan.CreateInstance( inst_ci ));
+        CHECK_ERR( _device.CreateInstance( inst_ci ));
     }
 
     // this is a test and the test should fail for any validation error
-    _vulkan.CreateDebugCallback( DefaultDebugMessageSeverity,
+    _device.CreateDebugCallback( DefaultDebugMessageSeverity,
                                  [] (const VDeviceInitializer::DebugReport &rep) { AE_LOG_SE(rep.message);  CHECK_FATAL(not rep.isError); });
 
-    CHECK_ERR( _vulkan.ChooseHighPerformanceDevice() );
-    CHECK_ERR( _vulkan.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
-    CHECK_ERR( _vulkan.CreateLogicalDevice() );
-    CHECK_ERR( _vulkan.CheckConstantLimits() );
-    CHECK_ERR( _vulkan.CheckExtensions() );
-
-    _refDumpPath /= _vulkan.GetDeviceName();
-    FileSystem::CreateDirectories( _refDumpPath );
+    CHECK_ERR( _device.ChooseHighPerformanceDevice() );
+    CHECK_ERR( _device.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
+    CHECK_ERR( _device.CreateLogicalDevice() );
+    CHECK_ERR( _device.CheckConstantLimits() );
+    CHECK_ERR( _device.CheckExtensions() );
 
     {
         FlatHashMap<VkQueue, String>    qnames;
-        for (auto& q : _vulkan.GetQueues()) {
+        for (auto& q : _device.GetQueues()) {
             qnames.emplace( q.handle, q.debugName );
         }
-        _syncLog.Initialize( INOUT _vulkan.EditDeviceFnTable(), RVRef(qnames) );
+        _syncLog.Initialize( INOUT _device.EditDeviceFnTable(), RVRef(qnames) );
     }
 
-    VRenderTaskScheduler::CreateInstance( _vulkan );
+    RenderTaskScheduler::InstanceCtor::Create( _device );
 
     const GraphicsCreateInfo    info = _GetGraphicsCreateInfo();
 
-    auto&   rts = RenderTaskScheduler();
+    auto&   rts = GraphicsScheduler();
     CHECK_ERR( rts.Initialize( info ));
 
     CHECK_ERR( _swapchain.CreateSurface( wnd.GetNative() ));
     CHECK_ERR( rts.GetResourceManager().OnSurfaceCreated( _swapchain ));
 
-    VSwapchainInitializer::VSwapchainDesc   swapchain_ci;
-    swapchain_ci.viewSize = wnd.GetSurfaceSize();
-    CHECK_ERR( _swapchain.Create( swapchain_ci ));
-
-    for (uint i = 0; i < c_MaxRenderThreads; ++i) {
-        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
-                EThreadArray{ EThread::PerFrame, EThread::Renderer },
-                "render thread"s << ToString(i)
-            }));
-    }
+  #ifdef AE_PLATFORM_ANDROID
+    // android tests executed in separate thread and can not access to window size
+    CHECK_ERR( _swapchain.Create( uint2{800,600}, info.swapchain ));
+  #else
+    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), info.swapchain ));
+  #endif
 
-    CHECK_ERR( _CompilePipelines() );
+  #ifdef AE_PLATFORM_ANDROID
+    _refDumpStorage = app.OpenStorage( EAppStorage::Cache );
+    _refDumpPath    = Path{AE_REFDUMP_PATH} / _device.GetDeviceName();
+  #else
+    _refDumpStorage = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REFDUMP_PATH, Default, True{"createFolder"} );
+    _refDumpPath    = _device.GetDeviceName();
+  #endif
+    CHECK_ERR( _refDumpStorage );
+
+  #ifdef AE_PLATFORM_ANDROID
+    _refImageStorage    = app.OpenStorage( EAppStorage::Cache );
+    _refImagePath       = Path{AE_REF_IMG_PATH} / _device.GetDeviceName();
+  #else
+    _refImageStorage    = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REF_IMG_PATH, Default, True{"createFolder"} );
+    _refImagePath       = _device.GetDeviceName();
+  #endif
+    CHECK_ERR( _refImageStorage );
 
     return true;
 }
@@ -315,7 +366,7 @@ bool  RGTest::_RunTests ()
             _testsFailed += uint(not passed);
             _tests.pop_front();
 
-            Scheduler().ProcessTask( ETaskQueue::Main, 0 );
+            for (; Scheduler().ProcessTask( ETaskQueue::Main, EThreadSeed(0) );) {}
         }
         else
         {
@@ -326,31 +377,6 @@ bool  RGTest::_RunTests ()
     return not _testsFailed;
 }
 
-/*
-=================================================
-    _Destroy
-=================================================
-*/
-void  RGTest::_Destroy ()
-{
-    _syncLog.Deinitialize( INOUT _vulkan.EditDeviceFnTable() );
-
-    _pipelines      = null;
-    _acPipelines    = null;
-    _msPipelines    = null;
-    _rtPipelines    = null;
-    _rqPipelines    = null;
-    _vrsPipelines   = null;
-
-    _swapchain.Destroy();
-    _swapchain.DestroySurface();
-
-    VRenderTaskScheduler::DestroyInstance();
-
-    CHECK( _vulkan.DestroyLogicalDevice() );
-    CHECK( _vulkan.DestroyInstance() );
-}
-
 /*
 =================================================
     _CompareDumps
@@ -358,7 +384,8 @@ void  RGTest::_Destroy ()
 */
 bool  RGTest::_CompareDumps (StringView filename) const
 {
-    Path    fname = _refDumpPath;   fname.append( String{filename} << ".txt" );
+    Path    fname = _refDumpPath;
+    fname.append( String{filename} << ".txt" );
 
     String  right;
     _syncLog.GetLog( OUT right );
@@ -366,18 +393,23 @@ bool  RGTest::_CompareDumps (StringView filename) const
     // override dump
     if ( UpdateAllReferenceDumps )
     {
-        FileWStream     wfile{ fname };
-        CHECK_ERR( wfile.IsOpen() );
-        CHECK_ERR( wfile.Write( StringView{right} ));
+        VFS::FileName   name;
+        CHECK_ERR( _refDumpStorage->CreateFile( name, fname ));
+
+        RC<WStream>     wfile;
+        CHECK_ERR( _refDumpStorage->Open( OUT wfile, name ));
+
+        CHECK_ERR( wfile->Write( StringView{right} ));
         return true;
     }
 
     // read from file
     String  left;
     {
-        FileRStream     rfile{ fname };
-        CHECK_ERR( rfile.IsOpen() );
-        CHECK_ERR( rfile.Read( usize(rfile.Size()), OUT left ));
+        RC<RStream>     rfile;
+        CHECK_ERR( _refDumpStorage->Open( OUT rfile, VFS::FileName{fname.string()} ));
+
+        CHECK_ERR( rfile->Read( usize(rfile->Size()), OUT left ));
     }
 
     return Parser::CompareLineByLine( left, right,
@@ -417,88 +449,125 @@ extern void Test_VulkanRenderGraph (IApplication &app, IWindow &wnd)
 */
 bool  RGTest::_Create (IApplication &, IWindow &wnd)
 {
-    CHECK_ERR( _metal.ChooseHighPerformanceDevice() );
-    CHECK_ERR( _metal.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
-    CHECK_ERR( _metal.CreateLogicalDevice() );
-    CHECK_ERR( _metal.CheckConstantLimits() );
-    CHECK_ERR( _metal.CheckExtensions() );
+    CHECK_ERR( _device.ChooseHighPerformanceDevice() );
+    CHECK_ERR( _device.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
+    CHECK_ERR( _device.CreateLogicalDevice() );
+    CHECK_ERR( _device.CheckConstantLimits() );
+    CHECK_ERR( _device.CheckExtensions() );
 
-    MRenderTaskScheduler::CreateInstance( _metal );
+    RenderTaskScheduler::InstanceCtor::Create( _device );
 
     const GraphicsCreateInfo    info = _GetGraphicsCreateInfo();
 
-    auto&   rts = RenderTaskScheduler();
+    auto&   rts = GraphicsScheduler();
     CHECK_ERR( rts.Initialize( info ));
 
     CHECK_ERR( _swapchain.CreateSurface( wnd.GetNative() ));
     CHECK_ERR( rts.GetResourceManager().OnSurfaceCreated( _swapchain ));
+    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), info.swapchain ));
 
-    SwapchainDesc   swapchain_ci;
-    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), swapchain_ci ));
+    _refImageStorage    = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REF_IMG_PATH, Default, True{"createFolder"} );
+    _refImagePath       = _device.GetDeviceName();
+    CHECK_ERR( _refImageStorage );
 
-    for (uint i = 0; i < c_MaxRenderThreads; ++i) {
-        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
-                EThreadArray{ EThread::PerFrame, EThread::Renderer },
-                "render thread"s << ToString(i)
-            }));
-    }
+    return true;
+}
 
-    CHECK_ERR( _CompilePipelines() );
+/*
+=================================================
+    Test_MetalRenderGraph
+=================================================
+*/
+extern void Test_MetalRenderGraph (IApplication &app, IWindow &wnd)
+{
+    RGTest      test;
+    CHECK_FATAL( test.Run( app, wnd ));
 
-    return true;
+    TEST_PASSED();
 }
 
+#endif // AE_ENABLE_METAL
+//-----------------------------------------------------------------------------
+
+
+
+#ifdef AE_ENABLE_REMOTE_GRAPHICS
 /*
 =================================================
-    _RunTests
+    _Create
 =================================================
 */
-bool  RGTest::_RunTests ()
+bool  RGTest::_Create (IApplication &, IWindow &wnd)
 {
-    for (;;)
+    using namespace AE::Networking;
+
+    class ServerProvider final : public IServerProvider
     {
-        if ( not _tests.empty() )
-        {
-            TestFunc_t& func    = _tests.front();
-            bool        passed  = (this->*func)();
+        IpAddress   _addr4;
 
-            _testsPassed += uint(passed);
-            _testsFailed += uint(not passed);
-            _tests.pop_front();
+    public:
+        ServerProvider (const IpAddress &addr4) __NE___ : _addr4{addr4} {}
 
-            Scheduler().ProcessTask( ETaskQueue::Main, 0 );
-        }
-        else
-        {
-            AE_LOGI( "Tests passed: " + ToString( _testsPassed ) + ", failed: " + ToString( _testsFailed ));
-            break;
-        }
-    }
-    return not _testsFailed;
+        void  GetAddress (EChannel, uint, Bool, OUT IpAddress &addr)    __NE_OV { addr = _addr4; }
+        void  GetAddress (EChannel, uint, Bool, OUT IpAddress6 &)       __NE_OV {}
+    };
+
+    GraphicsCreateInfo  info = _GetGraphicsCreateInfo();
+
+    info.device.appName         = "TestApp";
+    info.device.requiredQueues  = EQueueMask::Graphics;
+    info.device.optionalQueues  = EQueueMask::All;
+    info.device.validation      = EDeviceValidation::Enabled;
+
+    info.swapchain.colorFormat  = EPixelFormat::RGBA8_UNorm;
+    info.swapchain.usage        = EImageUsage::ColorAttachment | EImageUsage::Sampled | EImageUsage::TransferDst;
+    info.swapchain.options      = EImageOpt::BlitDst;
+    info.swapchain.presentMode  = EPresentMode::FIFO;
+    info.swapchain.minImageCount= 2;
+
+    CHECK_ERR( _device.Init( info,
+                             MakeRC<ServerProvider>( IpAddress::FromLocalPortTCP( _serverPort )),
+                             EThreadArray{ EThread::Main, EThread::PerFrame, EThread::Renderer }
+                            ));
+
+    CHECK_ERR( _device.CheckConstantLimits() );
+    CHECK_ERR( _device.CheckExtensions() );
+
+    RenderTaskScheduler::InstanceCtor::Create( _device );
+
+    auto&   rts = GraphicsScheduler();
+    CHECK_ERR( rts.Initialize( info ));
+
+    CHECK_ERR( _swapchain.CreateSurface( wnd.GetNative() ));
+    CHECK_ERR( rts.GetResourceManager().OnSurfaceCreated( _swapchain ));
+    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), info.swapchain ));
+
+    _refImageStorage    = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REF_IMG_PATH, Default, True{"createFolder"} );
+    _refImagePath       = _device.GetDeviceName();
+    CHECK_ERR( _refImageStorage );
+
+    return true;
 }
 
 /*
 =================================================
-    _Destroy
+    Test_RemoteRenderGraph
 =================================================
 */
-void  RGTest::_Destroy ()
+extern void Test_RemoteRenderGraph (IApplication &app, IWindow &wnd)
 {
-    _pipelines      = null;
-    _acPipelines    = null;
-    _msPipelines    = null;
-    _rtPipelines    = null;
-    _rqPipelines    = null;
-    _vrsPipelines   = null;
+    RGTest      test;
+    CHECK_FATAL( test.Run( app, wnd ));
 
-    _swapchain.Destroy();
-    _swapchain.DestroySurface();
+    TEST_PASSED();
+}
+
+#endif // AE_ENABLE_REMOTE_GRAPHICS
+//-----------------------------------------------------------------------------
 
-    MRenderTaskScheduler::DestroyInstance();
 
-    CHECK( _metal.DestroyLogicalDevice() );
-}
 
+#if defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
 /*
 =================================================
     _CompareDumps
@@ -506,20 +575,36 @@ void  RGTest::_Destroy ()
 */
 bool  RGTest::_CompareDumps (StringView) const
 {
-    return true;    // not supported for Metal
+    return true;    // not supported for Metal / Remote
 }
 
 /*
 =================================================
-    Test_MetalRenderGraph
+    _RunTests
 =================================================
 */
-extern void Test_MetalRenderGraph (IApplication &app, IWindow &wnd)
+bool  RGTest::_RunTests ()
 {
-    RGTest      test;
-    CHECK_FATAL( test.Run( app, wnd ));
+    for (;;)
+    {
+        if ( not _tests.empty() )
+        {
+            TestFunc_t& func    = _tests.front();
+            bool        passed  = (this->*func)();
 
-    TEST_PASSED();
+            _testsPassed += uint(passed);
+            _testsFailed += uint(not passed);
+            _tests.pop_front();
+
+            Scheduler().ProcessTask( ETaskQueue::Main, 0 );
+        }
+        else
+        {
+            AE_LOGI( "Tests passed: " + ToString( _testsPassed ) + ", failed: " + ToString( _testsFailed ));
+            break;
+        }
+    }
+    return not _testsFailed;
 }
 
-#endif // AE_ENABLE_METAL
+#endif
diff --git a/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.h b/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.h
index cb7468fb..65dcaa03 100644
--- a/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.h
+++ b/AE/engine/tests/graphics/RenderGraph/Test_RenderGraph.h
@@ -27,6 +27,9 @@ using EStatus = AE::Threading::IAsyncTask::EStatus;
 
 using ImageComparator = GraphicsTest::ImageComparator;
 
+static constexpr seconds    c_MaxTimeout    {100};
+static const EThreadArray   c_ThreadArr     {EThread::PerFrame, EThread::Renderer};
+
 
 class RGTest
 {
@@ -34,6 +37,7 @@ class RGTest
 protected:
     using TestFunc_t    = bool (RGTest::*) ();
     using TestQueue_t   = Deque< TestFunc_t >;
+    using FStorage_t    = RC<AE::VFS::IVirtualFileStorage>;
 
     static constexpr bool   UpdateAllReferenceDumps = true;
 
@@ -41,6 +45,7 @@ class RGTest
 // variables
 protected:
     RenderTechPipelinesPtr      _pipelines;
+    RenderTechPipelinesPtr      _dbgPipelines;
     RenderTechPipelinesPtr      _acPipelines;       // async compute
     RenderTechPipelinesPtr      _msPipelines;       // mesh shader
     RenderTechPipelinesPtr      _rtPipelines;       // ray tracing
@@ -51,20 +56,24 @@ class RGTest
     uint                        _testsPassed        = 0;
     uint                        _testsFailed        = 0;
 
-    Path                        _refDumpPath;
+    FStorage_t                  _refImageStorage;
+    Path                        _refImagePath;
 
   #if defined(AE_ENABLE_VULKAN)
-    VDeviceInitializer          _vulkan;
+    FStorage_t                  _refDumpStorage;
+    Path                        _refDumpPath;
+    VDeviceInitializer          _device;
     VSwapchainInitializer       _swapchain;
     VulkanSyncLog               _syncLog;
 
   #elif defined(AE_ENABLE_METAL)
-    MDeviceInitializer          _metal;
+    MDeviceInitializer          _device;
     MSwapchainInitializer       _swapchain;
 
   #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-    RDeviceInitializer          _remote;
+    RDeviceInitializer          _device;
     RSwapchainInitializer       _swapchain;
+    const ushort                _serverPort     = 3000;
 
   #else
   # error not implemented
@@ -78,7 +87,7 @@ class RGTest
 
     bool  Run (AE::App::IApplication &app, AE::App::IWindow &wnd);
 
-    static bool  SaveImage (StringView name, const ImageMemView &view);
+    bool  SaveImage (StringView name, const ImageMemView &view) const;
 
 private:
     ND_ Unique<ImageComparator>  _LoadReference (StringView filename) const;
@@ -89,7 +98,7 @@ class RGTest
     ND_ bool  _RunTests ();
         void  _Destroy ();
 
-    ND_ bool  _CompilePipelines ();
+    ND_ bool  _CompilePipelines (AE::App::IApplication &app);
 
     ND_ static GraphicsCreateInfo  _GetGraphicsCreateInfo ();
 
diff --git a/AE/engine/tests/graphics/RenderGraph/cpp/mac_names.h b/AE/engine/tests/graphics/RenderGraph/cpp/mac_names.h
new file mode 100644
index 00000000..29d13ec4
--- /dev/null
+++ b/AE/engine/tests/graphics/RenderGraph/cpp/mac_names.h
@@ -0,0 +1,191 @@
+namespace RenderTechs
+{
+    using Hash_t                = AE::Base::HashVal32;
+    using RenderTechName_t      = AE::Graphics::RenderTechName;
+    using RenderTechPassName_t  = AE::Graphics::RenderTechPassName;
+    using AttachmentName_t      = AE::Graphics::AttachmentName;
+    using PipelineName_t        = AE::Graphics::PipelineName;
+    using RTShaderBindingName_t = AE::Graphics::RTShaderBindingName;
+    using DescriptorSetName_t   = AE::Graphics::DescriptorSetName;
+
+    static constexpr struct _AsyncCompTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x5e0c4c21u}};}  // 'AsyncCompTestRT'
+
+        // graphics (0)
+        static constexpr struct _Draw_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x18c0f564u}};}  // 'Draw_1'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  async_comp1_graphics {Hash_t{0xae150324u}};  // 'async_comp1.graphics'
+        } Draw_1;
+
+        // compute (1)
+        static constexpr struct _Compute_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1e10a981u}};}  // 'Compute_1'
+
+            // pipelines
+            static constexpr PipelineName_t  async_comp1_compute {Hash_t{0x47053fe0u}};  // 'async_comp1.compute'
+        } Compute_1;
+    } AsyncCompTestRT;
+
+    static constexpr struct _DebugDrawTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x403d33e7u}};}  // 'DebugDrawTestRT'
+
+        // graphics (0)
+        static constexpr struct _Draw_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x18c0f564u}};}  // 'Draw_1'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } Draw_1;
+
+        // graphics (1)
+        static constexpr struct _Test4_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1a76367eu}};}  // 'Test4-1'
+
+            // RenderPass 'DrawTest4.Pass1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } Test4_1;
+
+        // graphics (2)
+        static constexpr struct _Test4_2
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x837f67c4u}};}  // 'Test4-2'
+
+            // RenderPass 'DrawTest4.Pass2' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } Test4_2;
+    } DebugDrawTestRT;
+
+    static constexpr struct _DrawMeshesTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x564eaca5u}};}  // 'DrawMeshesTestRT'
+
+        // graphics (0)
+        static constexpr struct _DrawMeshes_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x3d490784u}};}  // 'DrawMeshes_1'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } DrawMeshes_1;
+    } DrawMeshesTestRT;
+
+    static constexpr struct _DrawTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x9734bd66u}};}  // 'DrawTestRT'
+
+        // graphics (0)
+        static constexpr struct _Draw_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x18c0f564u}};}  // 'Draw_1'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  draw1 {Hash_t{0x1313009bu}};  // 'draw1'
+            static constexpr PipelineName_t  draw2 {Hash_t{0x8a1a5121u}};  // 'draw2'
+            static constexpr PipelineName_t  draw3 {Hash_t{0xfd1d61b7u}};  // 'draw3'
+        } Draw_1;
+
+        // graphics (1)
+        static constexpr struct _Test4_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1a76367eu}};}  // 'Test4-1'
+
+            // RenderPass 'DrawTest4.Pass1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  draw4_1 {Hash_t{0xa453ca03u}};  // 'draw4-1'
+        } Test4_1;
+
+        // graphics (2)
+        static constexpr struct _Test4_2
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x837f67c4u}};}  // 'Test4-2'
+
+            // RenderPass 'DrawTest4.Pass2' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  draw4_2 {Hash_t{0x3d5a9bb9u}};  // 'draw4-2'
+        } Test4_2;
+    } DrawTestRT;
+
+    static constexpr struct _RayQueryTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x5d4d9296u}};}  // 'RayQueryTestRT'
+
+        // compute (0)
+        static constexpr struct _RayTrace_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x983c0e4bu}};}  // 'RayTrace_1'
+        } RayTrace_1;
+    } RayQueryTestRT;
+
+    static constexpr struct _RayTracingTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0xc5f2e05fu}};}  // 'RayTracingTestRT'
+
+        // compute (0)
+        static constexpr struct _RayTrace_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x983c0e4bu}};}  // 'RayTrace_1'
+        } RayTrace_1;
+    } RayTracingTestRT;
+
+    static constexpr struct _VRSTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0xea4bfcdau}};}  // 'VRSTestRT'
+
+        // graphics (0)
+        static constexpr struct _nonVRS
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x5179c2bfu}};}  // 'nonVRS'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } nonVRS;
+
+        // graphics (1)
+        static constexpr struct _VRS
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0xed9fb488u}};}  // 'VRS'
+
+            // RenderPass 'VRSTest.Draw' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 2;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+            static constexpr AttachmentName_t  att_ShadingRate {Hash_t{0xe0af6b1u}};  // 'ShadingRate'
+        } VRS;
+    } VRSTestRT;
+}
diff --git a/AE/engine/tests/graphics/RenderGraph/cpp/mac_types.h b/AE/engine/tests/graphics/RenderGraph/cpp/mac_types.h
new file mode 100644
index 00000000..31816474
--- /dev/null
+++ b/AE/engine/tests/graphics/RenderGraph/cpp/mac_types.h
@@ -0,0 +1,28 @@
+#ifndef Vertex_draw2_DEFINED
+#   define Vertex_draw2_DEFINED
+    // size: 12, align: 4
+    struct Vertex_draw2
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x208fe808u}};  // 'Vertex_draw2'
+
+        packed_float2  Position;
+        packed_ubyte4  Color;
+    };
+#endif
+    StaticAssert( offsetof(Vertex_draw2, Position) == 0 );
+    StaticAssert( offsetof(Vertex_draw2, Color) == 8 );
+    StaticAssert( sizeof(Vertex_draw2) == 12 );
+
+#ifndef PC_draw3_DEFINED
+#   define PC_draw3_DEFINED
+    // size: 48, align: 16
+    struct PC_draw3
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x83006fc3u}};  // 'PC_draw3'
+
+        StaticArray< float4, 3 >    PositionColorArr;
+    };
+#endif
+    StaticAssert( offsetof(PC_draw3, PositionColorArr) == 0 );
+    StaticAssert( sizeof(PC_draw3) == 48 );
+
diff --git a/AE/engine/tests/graphics/RenderGraph/cpp/vk_names.h b/AE/engine/tests/graphics/RenderGraph/cpp/vk_names.h
index 40c3aefb..16481d74 100644
--- a/AE/engine/tests/graphics/RenderGraph/cpp/vk_names.h
+++ b/AE/engine/tests/graphics/RenderGraph/cpp/vk_names.h
@@ -36,6 +36,47 @@ namespace RenderTechs
         } Compute_1;
     } AsyncCompTestRT;
 
+    static constexpr struct _DebugDrawTestRT
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x403d33e7u}};}  // 'DebugDrawTestRT'
+
+        // graphics (0)
+        static constexpr struct _Draw_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x18c0f564u}};}  // 'Draw_1'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  dbg2_draw {Hash_t{0x991e8d04u}};  // 'dbg2_draw'
+        } Draw_1;
+
+        // graphics (1)
+        static constexpr struct _Test4_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1a76367eu}};}  // 'Test4-1'
+
+            // RenderPass 'DrawTest4.Pass1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } Test4_1;
+
+        // graphics (2)
+        static constexpr struct _Test4_2
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x837f67c4u}};}  // 'Test4-2'
+
+            // RenderPass 'DrawTest4.Pass2' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } Test4_2;
+    } DebugDrawTestRT;
+
     static constexpr struct _DrawMeshesTestRT
     {
         constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x564eaca5u}};}  // 'DrawMeshesTestRT'
@@ -51,6 +92,7 @@ namespace RenderTechs
             static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
 
             // pipelines
+            static constexpr PipelineName_t  dbg3_draw {Hash_t{0x52425ea1u}};  // 'dbg3_draw'
             static constexpr PipelineName_t  draw_mesh1 {Hash_t{0xea9250dcu}};  // 'draw_mesh1'
             static constexpr PipelineName_t  draw_mesh2 {Hash_t{0x739b0166u}};  // 'draw_mesh2'
         } DrawMeshes_1;
@@ -71,8 +113,6 @@ namespace RenderTechs
             static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
 
             // pipelines
-            static constexpr PipelineName_t  dbg2_draw {Hash_t{0x991e8d04u}};  // 'dbg2_draw'
-            static constexpr PipelineName_t  dbg3_draw {Hash_t{0x52425ea1u}};  // 'dbg3_draw'
             static constexpr PipelineName_t  draw1 {Hash_t{0x1313009bu}};  // 'draw1'
             static constexpr PipelineName_t  draw2 {Hash_t{0x8a1a5121u}};  // 'draw2'
             static constexpr PipelineName_t  draw3 {Hash_t{0xfd1d61b7u}};  // 'draw3'
diff --git a/AE/engine/tests/graphics/RenderGraph/cpp/vk_types.h b/AE/engine/tests/graphics/RenderGraph/cpp/vk_types.h
index 42adb77e..172586b9 100644
--- a/AE/engine/tests/graphics/RenderGraph/cpp/vk_types.h
+++ b/AE/engine/tests/graphics/RenderGraph/cpp/vk_types.h
@@ -1,6 +1,6 @@
 #ifndef Vertex_draw2_DEFINED
 #   define Vertex_draw2_DEFINED
-    // size: 12, align: 4 (16)
+    // size: 12, align: 4
     struct Vertex_draw2
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x208fe808u}};  // 'Vertex_draw2'
@@ -9,9 +9,9 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(Vertex_draw2, Position) == 0 );
-    STATIC_ASSERT( offsetof(Vertex_draw2, Color) == 8 );
-    STATIC_ASSERT( sizeof(Vertex_draw2) == 12 );
+    StaticAssert( offsetof(Vertex_draw2, Position) == 0 );
+    StaticAssert( offsetof(Vertex_draw2, Color) == 8 );
+    StaticAssert( sizeof(Vertex_draw2) == 12 );
 
 #ifndef Vertex_VRS_DEFINED
 #   define Vertex_VRS_DEFINED
@@ -24,9 +24,9 @@
         int  ShadingRate;
     };
 #endif
-    STATIC_ASSERT( offsetof(Vertex_VRS, Position) == 0 );
-    STATIC_ASSERT( offsetof(Vertex_VRS, ShadingRate) == 8 );
-    STATIC_ASSERT( sizeof(Vertex_VRS) == 12 );
+    StaticAssert( offsetof(Vertex_VRS, Position) == 0 );
+    StaticAssert( offsetof(Vertex_VRS, ShadingRate) == 8 );
+    StaticAssert( sizeof(Vertex_VRS) == 12 );
 
 #ifndef PC_draw3_DEFINED
 #   define PC_draw3_DEFINED
@@ -38,6 +38,6 @@
         StaticArray< float4, 3 >    PositionColorArr;
     };
 #endif
-    STATIC_ASSERT( offsetof(PC_draw3, PositionColorArr) == 0 );
-    STATIC_ASSERT( sizeof(PC_draw3) == 48 );
+    StaticAssert( offsetof(PC_draw3, PositionColorArr) == 0 );
+    StaticAssert( sizeof(PC_draw3) == 48 );
 
diff --git a/AE/engine/tests/graphics/RenderGraph/pipeline/dbg2_draw.as b/AE/engine/tests/graphics/RenderGraph/pipeline/dbg2_draw.as
index 0d567650..18dea25a 100644
--- a/AE/engine/tests/graphics/RenderGraph/pipeline/dbg2_draw.as
+++ b/AE/engine/tests/graphics/RenderGraph/pipeline/dbg2_draw.as
@@ -7,6 +7,7 @@ void ASmain ()
 
     {
         RC<PipelineLayout>      pl = PipelineLayout( "dbg2_draw.pl" );
+        pl.AddFeatureSet( "MinDesktop" );
         pl.AddDebugDSLayout( EShaderOpt::Trace, EShaderStages::Fragment | EShaderStages::Vertex );
         pl.Define( "DEBUG" );
     }
@@ -30,7 +31,7 @@ void ASmain ()
     // specialization
     {
         RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "dbg2_draw" );
-        spec.AddToRenderTech( "DrawTestRT", "Draw_1" );
+        spec.AddToRenderTech( "DebugDrawTestRT", "Draw_1" );
 
         RenderState rs;
         rs.inputAssembly.topology = EPrimitive::TriangleList;
diff --git a/AE/engine/tests/graphics/RenderGraph/pipeline/dbg3_draw_mesh.as b/AE/engine/tests/graphics/RenderGraph/pipeline/dbg3_draw_mesh.as
index e0d2fae1..6687ffeb 100644
--- a/AE/engine/tests/graphics/RenderGraph/pipeline/dbg3_draw_mesh.as
+++ b/AE/engine/tests/graphics/RenderGraph/pipeline/dbg3_draw_mesh.as
@@ -38,7 +38,7 @@ void ASmain ()
     // specialization
     {
         RC<MeshPipelineSpec>    spec = ppln.AddSpecialization( "dbg3_draw" );
-        spec.AddToRenderTech( "DrawTestRT", "Draw_1" );
+        spec.AddToRenderTech( "DrawMeshesTestRT", "DrawMeshes_1" );
 
         spec.SetMeshLocalSize( 3 );
 
diff --git a/AE/engine/tests/graphics/RenderGraph/pipeline/draw2.as b/AE/engine/tests/graphics/RenderGraph/pipeline/draw2.as
index a4eb9e15..4d7fe905 100644
--- a/AE/engine/tests/graphics/RenderGraph/pipeline/draw2.as
+++ b/AE/engine/tests/graphics/RenderGraph/pipeline/draw2.as
@@ -3,7 +3,8 @@
 void ASmain ()
 {
     RC<ShaderStructType>    st = ShaderStructType( "Vertex_draw2" );
-    st.Set( "packed_float2      Position;" +
+    st.Set( EStructLayout::InternalIO,
+            "packed_float2      Position;" +
             "packed_ubyte_norm4 Color;" );
 
     RC<VertexBufferInput>   vb = VertexBufferInput( "draw2.vb" );
diff --git a/AE/engine/tests/graphics/RenderGraph/rtech/ren_tech.as b/AE/engine/tests/graphics/RenderGraph/rtech/ren_tech.as
index 259e78b0..0e6a3ae6 100644
--- a/AE/engine/tests/graphics/RenderGraph/rtech/ren_tech.as
+++ b/AE/engine/tests/graphics/RenderGraph/rtech/ren_tech.as
@@ -132,6 +132,28 @@ void DeclRenderTech ()
 }
 
 
+void DeclDebugRenderTech ()
+{
+    RC<RenderTechnique> rtech = RenderTechnique( "DebugDrawTestRT" );
+
+    {
+        RC<GraphicsPass>    pass = rtech.AddGraphicsPass( "Draw_1" );
+
+        pass.SetRenderPass( "DrawTest.Draw_1", /*subpass*/"Main" );
+    }
+    {
+        RC<GraphicsPass>    pass = rtech.AddGraphicsPass( "Test4-1" );
+
+        pass.SetRenderPass( "DrawTest4.Pass1", /*subpass*/"Main" );
+    }
+    {
+        RC<GraphicsPass>    pass = rtech.AddGraphicsPass( "Test4-2" );
+
+        pass.SetRenderPass( "DrawTest4.Pass2", /*subpass*/"Main" );
+    }
+}
+
+
 void DeclAsyncCompRenderTech ()
 {
     RC<RenderTechnique> rtech = RenderTechnique( "AsyncCompTestRT" );
@@ -203,6 +225,7 @@ void ASmain ()
     DeclVRSRenderPass();
 
     DeclRenderTech();
+    DeclDebugRenderTech();
     DeclAsyncCompRenderTech();
     DeclMeshShaderRenderTech();
     DeclRayTracingRenderTech();
diff --git a/AE/engine/tests/graphics/RenderGraph/sampler/samplers.as b/AE/engine/tests/graphics/RenderGraph/sampler/samplers.as
index 03fab1f8..0a3e1c01 100644
--- a/AE/engine/tests/graphics/RenderGraph/sampler/samplers.as
+++ b/AE/engine/tests/graphics/RenderGraph/sampler/samplers.as
@@ -33,7 +33,7 @@ void ASmain ()
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
     }
     {
-        RC<Sampler>     samp = Sampler( "AnisotrophyRepeat" );
+        RC<Sampler>     samp = Sampler( "AnisotropyRepeat" );
         samp.AddFeatureSet( "MinDesktop" );
         samp.Filter( EFilter::Linear, EFilter::Linear, EMipmapFilter::Linear );
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
diff --git a/AE/engine/tests/graphics/UnitTest_FeatureSet.cpp b/AE/engine/tests/graphics/UnitTest_FeatureSet.cpp
index 043732b4..07e78189 100644
--- a/AE/engine/tests/graphics/UnitTest_FeatureSet.cpp
+++ b/AE/engine/tests/graphics/UnitTest_FeatureSet.cpp
@@ -183,7 +183,7 @@ namespace
 extern void UnitTest_FeatureSet ()
 {
     const auto  h = FeatureSet::GetHashOfFS();
-    ASSERT( h == FeatureSet::GetHashOfFS_Precalculated() );
+    TEST( h == FeatureSet::GetHashOfFS_Precalculated() );
 
     FeatureSet_Test1();
     FeatureSet_Test2();
diff --git a/AE/engine/tests/graphics/UnitTest_ImageMemView.cpp b/AE/engine/tests/graphics/UnitTest_ImageMemView.cpp
index c12ee757..685adf3a 100644
--- a/AE/engine/tests/graphics/UnitTest_ImageMemView.cpp
+++ b/AE/engine/tests/graphics/UnitTest_ImageMemView.cpp
@@ -164,11 +164,11 @@ namespace
 
         RGBA32f     b0;
         image.Load( uint3{0,0,0}, OUT b0 );
-        TEST( All( Equals( a0, b0, 0.002f )));
+        TEST( All( Equal( a0, b0, 0.002f )));
 
         RGBA32u     c0;
         image.Load( uint3{0,0,0}, OUT c0 );
-        TEST( All( Equals( RGBA32u{ 0x33, 0x99, 0xE5, 0xFF }, c0 )));
+        TEST( All( Equal( RGBA32u{ 0x33, 0x99, 0xE5, 0xFF }, c0 )));
 
 
         RGBA32f     a1{ -0.5f, 0.8f, 0.3f, 0.0f };
@@ -176,11 +176,11 @@ namespace
 
         RGBA32f     b1;
         image.Load( uint3{1,1,0}, OUT b1 );
-        TEST( All( Equals( Max( RGBA32f{}, a1 ), b1, 0.002f )));
+        TEST( All( Equal( Max( RGBA32f{}, a1 ), b1, 0.002f )));
 
         RGBA32u     c1;
         image.Load( uint3{1,1,0}, OUT c1 );
-        TEST( All( Equals( RGBA32u{ 0x00, 0xCC, 0x4C, 0x00 }, c1 )));
+        TEST( All( Equal( RGBA32u{ 0x00, 0xCC, 0x4C, 0x00 }, c1 )));
     }
 
 
@@ -198,11 +198,11 @@ namespace
 
         RGBA32f     b0;
         image.Load( uint3{0,0,0}, OUT b0 );
-        TEST( All( Equals( a0, b0 )));
+        TEST( All( Equal( a0, b0 )));
 
         RGBA32u     c0;
         image.Load( uint3{0,0,0}, OUT c0 );
-        TEST( All( Equals( RGBA32u{ 0x3e4ccccd, 0x3f19999a, 0x3f666666, 0x3f800000 }, c0 )));
+        TEST( All( Equal( RGBA32u{ 0x3e4ccccd, 0x3f19999a, 0x3f666666, 0x3f800000 }, c0 )));
 
 
         RGBA32f     a1{ -0.5f, 0.8f, 0.3f, 1000.0f };
@@ -210,11 +210,11 @@ namespace
 
         RGBA32f     b1;
         image.Load( uint3{1,1,0}, OUT b1 );
-        TEST( All( Equals( a1, b1 )));
+        TEST( All( Equal( a1, b1 )));
 
         RGBA32u     c1;
         image.Load( uint3{1,1,0}, OUT c1 );
-        TEST( All( Equals( RGBA32u{ 0xbf000000, 0x3f4ccccd, 0x3e99999a, 0x447a0000 }, c1 )));
+        TEST( All( Equal( RGBA32u{ 0xbf000000, 0x3f4ccccd, 0x3e99999a, 0x447a0000 }, c1 )));
     }
 
 
@@ -232,11 +232,11 @@ namespace
 
         RGBA32f     b0;
         image.Load( uint3{0,0,0}, OUT b0 );
-        TEST( All( Equals( a0, b0, 0.001f )));
+        TEST( All( Equal( a0, b0, 0.001f )));
 
         RGBA32u     c0;
         image.Load( uint3{0,0,0}, OUT c0 );
-        TEST( All( Equals( RGBA32u{ 0x3266, 0x38CD, 0x3B33, 0x3C00 }, c0 )));
+        TEST( All( Equal( RGBA32u{ 0x3266, 0x38CD, 0x3B33, 0x3C00 }, c0 )));
 
 
         RGBA32f     a1{ -0.5f, 0.8f, 0.3f, 100.0f };
@@ -244,11 +244,11 @@ namespace
 
         RGBA32f     b1;
         image.Load( uint3{1,1,0}, OUT b1 );
-        TEST( All( Equals( a1, b1, 0.001f )));
+        TEST( All( Equal( a1, b1, 0.001f )));
 
         RGBA32u     c1;
         image.Load( uint3{1,1,0}, OUT c1 );
-        TEST( All( Equals( RGBA32u{ 0xB800, 0x3A66, 0x34CD, 0x5640 }, c1 )));
+        TEST( All( Equal( RGBA32u{ 0xB800, 0x3A66, 0x34CD, 0x5640 }, c1 )));
     }
 
 
@@ -266,11 +266,11 @@ namespace
 
         RGBA32f     b0;
         image.Load( uint3{0,0,0}, OUT b0 );
-        TEST( All( Equals( a0, b0, 0.01f )));
+        TEST( All( Equal( a0, b0, 0.01f )));
 
         RGBA32u     c0;
         image.Load( uint3{0,0,0}, OUT c0 );
-        TEST( All( Equals( RGBA32u{ 0x19, 0x4C, 0x73, 0x7F }, c0 )));
+        TEST( All( Equal( RGBA32u{ 0x19, 0x4C, 0x73, 0x7F }, c0 )));
 
 
         RGBA32f     a1{ -0.2f, -0.6f, -0.9f, -1.0f };
@@ -278,11 +278,11 @@ namespace
 
         RGBA32f     b1;
         image.Load( uint3{2,2,0}, OUT b1 );
-        TEST( All( Equals( a1, b1, 0.01f )));
+        TEST( All( Equal( a1, b1, 0.01f )));
 
         RGBA32u     c1;
         image.Load( uint3{2,2,0}, OUT c1 );
-        TEST( All( Equals( RGBA32u{ 0xE6, 0xB3, 0x8C, 0x80 }, c1 )));
+        TEST( All( Equal( RGBA32u{ 0xE6, 0xB3, 0x8C, 0x80 }, c1 )));
     }
 }
 
diff --git a/AE/engine/tests/graphics/UnitTest_ImageSwizzle.cpp b/AE/engine/tests/graphics/UnitTest_ImageSwizzle.cpp
index fd6e133c..2b6fda86 100644
--- a/AE/engine/tests/graphics/UnitTest_ImageSwizzle.cpp
+++ b/AE/engine/tests/graphics/UnitTest_ImageSwizzle.cpp
@@ -8,15 +8,15 @@ namespace
     static void ImageSwizzle_Test1 ()
     {
         constexpr ImageSwizzle  s1 = "RGBA"_swizzle;
-        STATIC_ASSERT( s1.Get() == 0x1234 );
+        StaticAssert( s1.Get() == 0x1234 );
         TEST(All( s1.ToVec() == uint4(1, 2, 3, 4) ));
 
         constexpr ImageSwizzle  s2 = "R000"_swizzle;
-        STATIC_ASSERT( s2.Get() == 0x1555 );
+        StaticAssert( s2.Get() == 0x1555 );
         TEST(All( s2.ToVec() == uint4(1, 5, 5, 5) ));
 
         constexpr ImageSwizzle  s3 = "0G01"_swizzle;
-        STATIC_ASSERT( s3.Get() == 0x5256 );
+        StaticAssert( s3.Get() == 0x5256 );
         TEST(All( s3.ToVec() == uint4(5, 2, 5, 6) ));
     }
 }
diff --git a/AE/engine/tests/graphics/UnitTest_PixelFormat.cpp b/AE/engine/tests/graphics/UnitTest_PixelFormat.cpp
index db564e61..0e79138f 100644
--- a/AE/engine/tests/graphics/UnitTest_PixelFormat.cpp
+++ b/AE/engine/tests/graphics/UnitTest_PixelFormat.cpp
@@ -204,7 +204,7 @@ namespace
         EnumBitSet<EVertexType> bits;
 
         #define AE_VERTEXTYPE_VISIT( _name_, _value_ )                                          \
-            STATIC_ASSERT( EVertexType::_name_ < EVertexType::_Count );                         \
+            StaticAssert( EVertexType::_name_ < EVertexType::_Count );                          \
             TEST( unique.insert( EVertexType::_name_ ).second );                                \
             TEST( (bits & EnumBitSet<EVertexType>{}.insert( EVertexType::_name_ )).None() );    \
             bits.insert( EVertexType::_name_ );
diff --git a/AE/engine/tests/graphics/Vulkan/Test_VulkanDevice.cpp b/AE/engine/tests/graphics/Vulkan/Test_VulkanDevice.cpp
index 1b87b98c..7a6e59e6 100644
--- a/AE/engine/tests/graphics/Vulkan/Test_VulkanDevice.cpp
+++ b/AE/engine/tests/graphics/Vulkan/Test_VulkanDevice.cpp
@@ -7,7 +7,6 @@
 
 extern void Test_VulkanDevice ()
 {
-    using namespace AE::Graphics;
     {
         VDeviceInitializer  dev;
 
@@ -19,10 +18,14 @@ extern void Test_VulkanDevice ()
         CHECK_FATAL( dev.ChooseHighPerformanceDevice() );
         CHECK_FATAL( dev.CreateDefaultQueue() );
         CHECK_FATAL( dev.CreateLogicalDevice() );
+
+        CHECK_FATAL( dev.IsInitialized() );
         CHECK_FATAL( dev.CheckConstantLimits() );
         CHECK_FATAL( dev.CheckExtensions() );
+
         CHECK_FATAL( dev.DestroyLogicalDevice() );
         CHECK_FATAL( dev.DestroyInstance() );
+        CHECK_FATAL( not dev.IsInitialized() );
     }
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Compute1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Compute1.txt
new file mode 100644
index 00000000..d4f4f9ff
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Compute1.txt	
@@ -0,0 +1,350 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Compute1 |0| Compute task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-8'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-0', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-9'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-1', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-10'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-2', layout: GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Compute1 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image-0'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-1'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-2'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-11'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-0', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-12'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-1', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-13'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-2', layout: GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-0'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-1'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-2'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Compute1 |0| Compute task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-14'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-0', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-15'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-1', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-16'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-2', layout: GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+  CopyImageToBuffer
+    src:       'Image-0'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-1'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-2'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Compute2.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Compute2.txt
new file mode 100644
index 00000000..ad3e7dd3
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Compute2.txt	
@@ -0,0 +1,397 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Compute1 |0| Compute task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-17'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-0', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-18'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-1', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-19'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-2', layout: GENERAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Compute1 |1| Readback task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-0'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-1'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-2'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-20'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-0', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-21'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-1', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-22'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-2', layout: GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-0'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-1'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-2'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Compute1 |0| Compute task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-23'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-0', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-24'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-1', layout: GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-25'
+    layout:    '0'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '0'
+      image: 'Image-2', layout: GENERAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-0'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-1'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image-2'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'Image-1'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'Image-2'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'Image-0'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyBuffer1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyBuffer1.txt
new file mode 100644
index 00000000..f08f2f7b
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyBuffer1.txt	
@@ -0,0 +1,90 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'CopyBuffer1 |0| Copy buffer task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buf_1'
+    dst: 'buf_2'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buf_2'
+    dst: 'SSRB {f:0} {q:Graphics}'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buf_1'
+    dst: 'buf_2'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buf_2'
+    dst: 'SSRB {f:1} {q:Graphics}'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyBuffer2.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyBuffer2.txt
new file mode 100644
index 00000000..0984b454
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyBuffer2.txt	
@@ -0,0 +1,90 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'CopyBuffer2 |0| Copy buffer task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:0} {q:Graphics}'
+    dst: 'buf_1'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buf_1'
+    dst: 'buf_2'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:1} {q:Graphics}'
+    dst: 'buf_1'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buf_1'
+    dst: 'buf_2'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyImage1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyImage1.txt
new file mode 100644
index 00000000..20a07c15
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyImage1.txt	
@@ -0,0 +1,152 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'CopyImage2 |0| Copy image task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'SSWB {f:0} {q:Graphics}'
+    dst:       'SrcImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'SrcImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'DstImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'DstImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'SSRB {f:0} {q:Graphics}'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'SSWB {f:1} {q:Graphics}'
+    dst:       'SrcImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'SrcImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'DstImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'DstImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'SSRB {f:1} {q:Graphics}'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyImage2.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyImage2.txt
new file mode 100644
index 00000000..cd034ea6
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_CopyImage2.txt	
@@ -0,0 +1,198 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'CopyImage2 |0| Copy image task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   ALL_COMMANDS ---> ALL_COMMANDS
+      access:  0 ---> MEMORY_READ | MEMORY_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   ALL_COMMANDS ---> COPY
+      access:  MEMORY_READ | MEMORY_WRITE ---> TRANSFER_WRITE
+      layout:  GENERAL ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'SSWB {f:0} {q:Graphics}'
+    dst:       'SrcImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'SrcImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'DstImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'DstImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'SSRB {f:0} {q:Graphics}'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   ALL_COMMANDS ---> ALL_COMMANDS
+      access:  0 ---> MEMORY_READ | MEMORY_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   ALL_COMMANDS ---> COPY
+      access:  MEMORY_READ | MEMORY_WRITE ---> TRANSFER_WRITE
+      layout:  GENERAL ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'SSWB {f:1} {q:Graphics}'
+    dst:       'SrcImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'SrcImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'DstImage'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'DstImage'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'SSRB {f:1} {q:Graphics}'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'SrcImage'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'DstImage'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Debugger1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Debugger1.txt
new file mode 100644
index 00000000..a4fdf348
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Debugger1.txt	
@@ -0,0 +1,100 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Debugger1 |0| Compute task'
+{
+  FillBuffer
+    dst:     'debug storage buffer'
+    offset:  16
+    size:    1048560
+  ----------
+
+  UpdateBuffer
+    dst:     'debug storage buffer'
+    offset:  0
+    size:    16
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COMPUTE_SHADER
+      access: TRANSFER_WRITE ---> SHADER_STORAGE_READ | SHADER_STORAGE_WRITE
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  BindPipeline
+    pipeline:  'compute-ppln-26'
+    layout:    '2'
+    bindPoint: COMPUTE
+  ----------
+
+  Dispatch
+    descriptors:
+    [0] pl: '2'
+      image: 'Image', layout: GENERAL
+    [1] pl: '2'
+      buffer: 'debug storage buffer'
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Debugger1 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COMPUTE_SHADER ---> COPY
+      access: SHADER_STORAGE_READ | SHADER_STORAGE_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'debug storage buffer'
+    dst: 'readback dbg buffer'
+      copy [0, 1048576) ---> [0, 1048576)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Debugger2.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Debugger2.txt
new file mode 100644
index 00000000..161b915b
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Debugger2.txt	
@@ -0,0 +1,123 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Debugger2 |0| Draw task'
+{
+  FillBuffer
+    dst:     'debug storage buffer'
+    offset:  16
+    size:    1048560
+  ----------
+
+  UpdateBuffer
+    dst:     'debug storage buffer'
+    offset:  0
+    size:    16
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> VERTEX_SHADER | TESSELLATION_CONTROL_SHADER | TESSELLATION_EVALUATION_SHADER | FRAGMENT_SHADER
+      access: TRANSFER_WRITE ---> SHADER_STORAGE_READ | SHADER_STORAGE_WRITE
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'dbg2_draw'
+    layout:    '3'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+    descriptors:
+    [0] pl: '3'
+      buffer: 'debug storage buffer'
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Debugger2 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  VERTEX_SHADER | TESSELLATION_CONTROL_SHADER | TESSELLATION_EVALUATION_SHADER | FRAGMENT_SHADER ---> COPY
+      access: SHADER_STORAGE_READ | SHADER_STORAGE_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'debug storage buffer'
+    dst: 'readback dbg buffer'
+      copy [0, 1048576) ---> [0, 1048576)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw1.txt
new file mode 100644
index 00000000..d9673258
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw1.txt	
@@ -0,0 +1,320 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw1 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw1'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw1 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw1 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw1'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw1'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw1 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw1'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw2.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw2.txt
new file mode 100644
index 00000000..bf2b7700
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw2.txt	
@@ -0,0 +1,400 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw2 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:0} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vertex buffer', offset: 0
+  ----------
+
+  BindPipeline
+    pipeline:  'draw2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw2 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw2 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:1} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vertex buffer', offset: 0
+  ----------
+
+  BindPipeline
+    pipeline:  'draw2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:0} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vertex buffer', offset: 0
+  ----------
+
+  BindPipeline
+    pipeline:  'draw2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw2 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:1} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vertex buffer', offset: 0
+  ----------
+
+  BindPipeline
+    pipeline:  'draw2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw3.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw3.txt
new file mode 100644
index 00000000..37de9807
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw3.txt	
@@ -0,0 +1,320 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw3 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw3'
+    layout:    '8'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw3 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw3 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw3'
+    layout:    '8'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw3'
+    layout:    '8'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw3 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindPipeline
+    pipeline:  'draw3'
+    layout:    '8'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw4.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw4.txt
new file mode 100644
index 00000000..441d3253
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw4.txt	
@@ -0,0 +1,170 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw4 |0| Draw task1'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+      layout:  UNDEFINED ---> COLOR_ATTACHMENT_OPTIMAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest4.Pass1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vstream', offset: 64
+  ----------
+
+  BindPipeline
+    pipeline:  'draw4-1'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest4.Pass2'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vstream', offset: 128
+  ----------
+
+  BindPipeline
+    pipeline:  'draw4-2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw4 |1| Draw task2'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest4.Pass2'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vstream', offset: 0
+  ----------
+
+  BindPipeline
+    pipeline:  'draw4-2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw4 |2| Readback task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COPY
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> TRANSFER_READ
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw5.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw5.txt
new file mode 100644
index 00000000..a5dc201e
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_Draw5.txt	
@@ -0,0 +1,174 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'Draw4-pass1 |0| Draw task1'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access:  0 ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+      layout:  UNDEFINED ---> COLOR_ATTACHMENT_OPTIMAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest4.Pass1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vstream', offset: 0
+  ----------
+
+  BindPipeline
+    pipeline:  'draw4-1'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest4.Pass2'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vstream', offset: 64
+  ----------
+
+  BindPipeline
+    pipeline:  'draw4-2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'Draw4-pass1 |1| Draw task2'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest4.Pass2'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'vstream', offset: 128
+  ----------
+
+  BindPipeline
+    pipeline:  'draw4-2'
+    layout:    '7'
+    bindPoint: GRAPHICS
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+--------------------------------------------------
+name: 'Draw4-pass2 |0| Readback task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COPY
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> TRANSFER_READ
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_DrawAsync1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_DrawAsync1.txt
new file mode 100644
index 00000000..b6211422
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_DrawAsync1.txt	
@@ -0,0 +1,352 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'DrawAsync1 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:0} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'DrawAsync1 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'DrawAsync1 |0| Draw task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:1} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:0} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'DrawAsync1 |1| Readback task'
+{
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'IndirectCmdBuffers'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'SSWB {f:1} {q:Graphics}'
+    dst: 'vertex buffer'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'DrawTest.Draw_1'
+    color attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'ImageView'
+      image:   'Image'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'Image'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'Image'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'dynamic staging buffer'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_FrameCounter.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_FrameCounter.txt
new file mode 100644
index 00000000..0bdbf17d
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_FrameCounter.txt	
@@ -0,0 +1,17000 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  0
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  4
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  8
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  12
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  16
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-4',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  20
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-5',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  24
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-6',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  28
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-7',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  32
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-8',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  36
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-9',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  40
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-10',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  44
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-11',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  48
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-12',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  52
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-13',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  56
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-14',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  60
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-15',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  64
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-16',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  68
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-17',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  72
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-18',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  76
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-19',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  80
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-20',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  84
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-21',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  88
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-22',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  92
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-23',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  96
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-24',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  100
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-25',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  104
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-26',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  108
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-27',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  112
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-28',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  116
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-29',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  120
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-30',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  124
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-31',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  128
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-32',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  132
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-33',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  136
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-34',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  140
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-35',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  144
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-36',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  148
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-37',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  152
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-38',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  156
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-39',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  160
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-40',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  164
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-41',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  168
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-42',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  172
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-43',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  176
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-44',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  180
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-45',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  184
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-46',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  188
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-47',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  192
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-48',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  196
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-49',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  200
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-50',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  204
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-51',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  208
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-52',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  212
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-53',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  216
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-54',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  220
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-55',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  224
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-56',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  228
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-57',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  232
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-58',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  236
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-59',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  240
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-60',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  244
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-61',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  248
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-62',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  252
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-63',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  256
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-64',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  260
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-65',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  264
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-66',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  268
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-67',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  272
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-68',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  276
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-69',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  280
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-70',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  284
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-71',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  288
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-72',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  292
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-73',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  296
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-74',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  300
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-75',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  304
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-76',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  308
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-77',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  312
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-78',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  316
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-79',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  320
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-80',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  324
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-81',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  328
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-82',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  332
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-83',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  336
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-84',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  340
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-85',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  344
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-86',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  348
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-87',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  352
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-88',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  356
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-89',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  360
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-90',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  364
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-91',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  368
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-92',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  372
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-93',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  376
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-94',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  380
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-95',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  384
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-96',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  388
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-97',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  392
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-98',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  396
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-99',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  400
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-100',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  404
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-101',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  408
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-102',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  412
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-103',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  416
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-104',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  420
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-105',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  424
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-106',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  428
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-107',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  432
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-108',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  436
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-109',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  440
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-110',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  444
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-111',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  448
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-112',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  452
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-113',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  456
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-114',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  460
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-115',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  464
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-116',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  468
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-117',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  472
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-118',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  476
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-119',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  480
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-120',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  484
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-121',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  488
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-122',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  492
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-123',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  496
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-124',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  500
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-125',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  504
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-126',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  508
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-127',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  512
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-128',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  516
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-129',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  520
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-130',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  524
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-131',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  528
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-132',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  532
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-133',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  536
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-134',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  540
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-135',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  544
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-136',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  548
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-137',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  552
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-138',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  556
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-139',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  560
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-140',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  564
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-141',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  568
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-142',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  572
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-143',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  576
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-144',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  580
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-145',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  584
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-146',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  588
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-147',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  592
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-148',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  596
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-149',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  600
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-150',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  604
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-151',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  608
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-152',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  612
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-153',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  616
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-154',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  620
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-155',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  624
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-156',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  628
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-157',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  632
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-158',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  636
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-159',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  640
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-160',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  644
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-161',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  648
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-162',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  652
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-163',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  656
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-164',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  660
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-165',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  664
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-166',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  668
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-167',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  672
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-168',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  676
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-169',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  680
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-170',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  684
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-171',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  688
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-172',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  692
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-173',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  696
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-174',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  700
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-175',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  704
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-176',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  708
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-177',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  712
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-178',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  716
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-179',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  720
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-180',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  724
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-181',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  728
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-182',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  732
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-183',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  736
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-184',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  740
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-185',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  744
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-186',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  748
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-187',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  752
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-188',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  756
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-189',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  760
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-190',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  764
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-191',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  768
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-192',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  772
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-193',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  776
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-194',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  780
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-195',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  784
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-196',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  788
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-197',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  792
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-198',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  796
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-199',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  800
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-200',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  804
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-201',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  808
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-202',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  812
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-203',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  816
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-204',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  820
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-205',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  824
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-206',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  828
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-207',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  832
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-208',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  836
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-209',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  840
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-210',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  844
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-211',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  848
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-212',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  852
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-213',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  856
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-214',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  860
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-215',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  864
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-216',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  868
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-217',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  872
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-218',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  876
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-219',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  880
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-220',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  884
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-221',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  888
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-222',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  892
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-223',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  896
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-224',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  900
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-225',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  904
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-226',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  908
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-227',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  912
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-228',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  916
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-229',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  920
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-230',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  924
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-231',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  928
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-232',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  932
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-233',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  936
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-234',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  940
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-235',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  944
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-236',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  948
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-237',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  952
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-238',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  956
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-239',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  960
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-240',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  964
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-241',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  968
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-242',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  972
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-243',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  976
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-244',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  980
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-245',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  984
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-246',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  988
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-247',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  992
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-248',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  996
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-249',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1000
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-250',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1004
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-251',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1008
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-252',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1012
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-253',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1016
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-254',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1020
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-255',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1024
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-256',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1028
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-257',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1032
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-258',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1036
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-259',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1040
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-260',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1044
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-261',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1048
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-262',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1052
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-263',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1056
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-264',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1060
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-265',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1064
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-266',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1068
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-267',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1072
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-268',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1076
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-269',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1080
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-270',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1084
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-271',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1088
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-272',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1092
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-273',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1096
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-274',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1100
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-275',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1104
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-276',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1108
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-277',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1112
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-278',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1116
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-279',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1120
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-280',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1124
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-281',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1128
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-282',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1132
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-283',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1136
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-284',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1140
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-285',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1144
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-286',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1148
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-287',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1152
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-288',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1156
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-289',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1160
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-290',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1164
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-291',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1168
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-292',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1172
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-293',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1176
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-294',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1180
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-295',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1184
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-296',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1188
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-297',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1192
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-298',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1196
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-299',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1200
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-300',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1204
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-301',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1208
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-302',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1212
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-303',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1216
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-304',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1220
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-305',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1224
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-306',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1228
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-307',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1232
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-308',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1236
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-309',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1240
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-310',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1244
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-311',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1248
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-312',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1252
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-313',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1256
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-314',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1260
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-315',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1264
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-316',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1268
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-317',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1272
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-318',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1276
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-319',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1280
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-320',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1284
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-321',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1288
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-322',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1292
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-323',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1296
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-324',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1300
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-325',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1304
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-326',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1308
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-327',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1312
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-328',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1316
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-329',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1320
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-330',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1324
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-331',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1328
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-332',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1332
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-333',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1336
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-334',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1340
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-335',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1344
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-336',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1348
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-337',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1352
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-338',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1356
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-339',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1360
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-340',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1364
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-341',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1368
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-342',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1372
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-343',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1376
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-344',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1380
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-345',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1384
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-346',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1388
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-347',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1392
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-348',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1396
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-349',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1400
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-350',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1404
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-351',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1408
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-352',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1412
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-353',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1416
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-354',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1420
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-355',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1424
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-356',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1428
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-357',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1432
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-358',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1436
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-359',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1440
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-360',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1444
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-361',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1448
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-362',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1452
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-363',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1456
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-364',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1460
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-365',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1464
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-366',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1468
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-367',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1472
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-368',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1476
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-369',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1480
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-370',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1484
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-371',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1488
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-372',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1492
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-373',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1496
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-374',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1500
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-375',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1504
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-376',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1508
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-377',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1512
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-378',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1516
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-379',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1520
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-380',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1524
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-381',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1528
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-382',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1532
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-383',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1536
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-384',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1540
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-385',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1544
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-386',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1548
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-387',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1552
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-388',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1556
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-389',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1560
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-390',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1564
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-391',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1568
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-392',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1572
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-393',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1576
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-394',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1580
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-395',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1584
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-396',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1588
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-397',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1592
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-398',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1596
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-399',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1600
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-400',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1604
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-401',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1608
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-402',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1612
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-403',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1616
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-404',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1620
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-405',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1624
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-406',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1628
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-407',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1632
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-408',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1636
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-409',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1640
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-410',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1644
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-411',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1648
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-412',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1652
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-413',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1656
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-414',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1660
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-415',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1664
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-416',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1668
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-417',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1672
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-418',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1676
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-419',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1680
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-420',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1684
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-421',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1688
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-422',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1692
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-423',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1696
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-424',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1700
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-425',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1704
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-426',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1708
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-427',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1712
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-428',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1716
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-429',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1720
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-430',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1724
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-431',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1728
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-432',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1732
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-433',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1736
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-434',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1740
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-435',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1744
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-436',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1748
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-437',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1752
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-438',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1756
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-439',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1760
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-440',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1764
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-441',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1768
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-442',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1772
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-443',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1776
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-444',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1780
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-445',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1784
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-446',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1788
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-447',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1792
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-448',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1796
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-449',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1800
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-450',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1804
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-451',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1808
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-452',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1812
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-453',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1816
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-454',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1820
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-455',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1824
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-456',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1828
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-457',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1832
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-458',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1836
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-459',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1840
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-460',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1844
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-461',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1848
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-462',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1852
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-463',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1856
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-464',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1860
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-465',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1864
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-466',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1868
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-467',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1872
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-468',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1876
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-469',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1880
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-470',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1884
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-471',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1888
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-472',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1892
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-473',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1896
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-474',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1900
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-475',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1904
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-476',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1908
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-477',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1912
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-478',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1916
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-479',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1920
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-480',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1924
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-481',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1928
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-482',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1932
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-483',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1936
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-484',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1940
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-485',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1944
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-486',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1948
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-487',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1952
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-488',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1956
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-489',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1960
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-490',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1964
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-491',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1968
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-492',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1972
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-493',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1976
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-494',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1980
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-495',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1984
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-496',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1988
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-497',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1992
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-498',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  1996
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-499',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2000
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-500',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2004
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-501',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2008
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-502',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2012
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-503',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2016
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-504',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2020
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-505',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2024
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-506',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2028
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-507',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2032
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-508',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2036
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-509',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2040
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-510',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2044
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-511',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2048
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-512',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2052
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-513',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2056
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-514',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2060
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-515',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2064
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-516',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2068
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-517',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2072
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-518',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2076
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-519',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2080
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-520',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2084
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-521',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2088
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-522',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2092
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-523',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2096
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-524',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2100
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-525',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2104
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-526',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2108
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-527',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2112
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-528',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2116
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-529',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2120
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-530',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2124
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-531',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2128
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-532',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2132
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-533',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2136
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-534',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2140
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-535',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2144
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-536',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2148
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-537',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2152
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-538',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2156
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-539',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2160
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-540',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2164
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-541',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2168
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-542',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2172
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-543',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2176
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-544',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2180
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-545',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2184
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-546',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2188
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-547',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2192
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-548',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2196
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-549',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2200
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-550',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2204
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-551',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2208
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-552',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2212
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-553',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2216
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-554',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2220
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-555',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2224
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-556',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2228
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-557',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2232
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-558',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2236
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-559',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2240
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-560',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2244
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-561',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2248
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-562',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2252
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-563',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2256
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-564',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2260
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-565',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2264
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-566',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2268
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-567',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2272
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-568',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2276
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-569',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2280
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-570',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2284
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-571',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2288
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-572',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2292
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-573',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2296
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-574',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2300
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-575',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2304
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-576',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2308
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-577',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2312
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-578',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2316
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-579',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2320
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-580',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2324
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-581',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2328
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-582',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2332
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-583',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2336
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-584',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2340
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-585',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2344
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-586',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2348
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-587',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2352
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-588',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2356
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-589',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2360
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-590',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2364
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-591',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2368
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-592',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2372
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-593',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2376
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-594',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2380
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-595',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2384
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-596',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2388
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-597',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2392
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-598',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2396
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-599',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2400
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-600',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2404
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-601',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2408
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-602',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2412
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-603',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2416
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-604',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2420
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-605',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2424
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-606',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2428
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-607',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2432
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-608',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2436
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-609',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2440
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-610',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2444
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-611',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2448
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-612',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2452
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-613',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2456
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-614',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2460
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-615',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2464
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-616',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2468
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-617',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2472
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-618',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2476
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-619',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2480
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-620',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2484
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-621',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2488
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-622',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2492
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-623',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2496
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-624',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2500
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-625',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2504
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-626',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2508
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-627',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2512
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-628',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2516
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-629',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2520
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-630',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2524
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-631',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2528
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-632',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2532
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-633',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2536
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-634',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2540
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-635',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2544
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-636',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2548
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-637',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2552
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-638',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2556
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-639',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2560
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-640',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2564
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-641',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2568
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-642',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2572
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-643',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2576
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-644',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2580
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-645',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2584
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-646',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2588
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-647',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2592
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-648',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2596
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-649',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2600
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-650',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2604
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-651',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2608
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-652',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2612
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-653',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2616
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-654',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2620
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-655',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2624
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-656',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2628
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-657',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2632
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-658',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2636
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-659',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2640
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-660',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2644
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-661',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2648
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-662',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2652
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-663',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2656
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-664',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2660
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-665',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2664
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-666',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2668
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-667',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2672
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-668',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2676
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-669',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2680
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-670',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2684
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-671',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2688
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-672',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2692
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-673',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2696
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-674',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2700
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-675',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2704
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-676',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2708
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-677',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2712
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-678',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2716
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-679',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2720
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-680',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2724
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-681',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2728
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-682',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2732
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-683',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2736
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-684',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2740
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-685',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2744
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-686',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2748
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-687',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2752
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-688',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2756
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-689',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2760
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-690',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2764
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-691',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2768
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-692',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2772
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-693',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2776
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-694',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2780
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-695',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2784
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-696',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2788
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-697',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2792
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-698',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2796
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-699',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2800
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-700',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2804
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-701',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2808
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-702',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2812
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-703',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2816
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-704',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2820
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-705',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2824
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-706',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2828
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-707',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2832
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-708',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2836
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-709',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2840
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-710',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2844
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-711',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2848
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-712',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2852
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-713',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2856
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-714',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2860
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-715',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2864
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-716',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2868
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-717',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2872
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-718',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2876
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-719',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2880
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-720',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2884
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-721',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2888
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-722',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2892
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-723',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2896
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-724',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2900
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-725',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2904
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-726',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2908
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-727',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2912
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-728',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2916
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-729',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2920
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-730',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2924
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-731',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2928
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-732',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2932
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-733',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2936
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-734',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2940
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-735',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2944
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-736',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2948
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-737',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2952
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-738',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2956
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-739',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2960
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-740',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2964
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-741',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2968
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-742',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2972
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-743',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2976
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-744',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2980
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-745',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2984
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-746',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2988
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-747',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2992
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-748',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  2996
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-749',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3000
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-750',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3004
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-751',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3008
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-752',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3012
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-753',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3016
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-754',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3020
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-755',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3024
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-756',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3028
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-757',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3032
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-758',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3036
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-759',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3040
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-760',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3044
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-761',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3048
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-762',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3052
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-763',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3056
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-764',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3060
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-765',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3064
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-766',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3068
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-767',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3072
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-768',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3076
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-769',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3080
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-770',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3084
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-771',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3088
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-772',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3092
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-773',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3096
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-774',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3100
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-775',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3104
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-776',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3108
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-777',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3112
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-778',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3116
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-779',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3120
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-780',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3124
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-781',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3128
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-782',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3132
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-783',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3136
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-784',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3140
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-785',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3144
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-786',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3148
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-787',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3152
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-788',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3156
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-789',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3160
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-790',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3164
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-791',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3168
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-792',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3172
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-793',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3176
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-794',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3180
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-795',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3184
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-796',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3188
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-797',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3192
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-798',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3196
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-799',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3200
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-800',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3204
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-801',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3208
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-802',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3212
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-803',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3216
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-804',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3220
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-805',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3224
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-806',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3228
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-807',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3232
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-808',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3236
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-809',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3240
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-810',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3244
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-811',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3248
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-812',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3252
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-813',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3256
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-814',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3260
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-815',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3264
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-816',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3268
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-817',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3272
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-818',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3276
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-819',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3280
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-820',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3284
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-821',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3288
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-822',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3292
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-823',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3296
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-824',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3300
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-825',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3304
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-826',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3308
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-827',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3312
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-828',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3316
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-829',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3320
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-830',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3324
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-831',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3328
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-832',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3332
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-833',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3336
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-834',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3340
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-835',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3344
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-836',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3348
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-837',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3352
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-838',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3356
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-839',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3360
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-840',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3364
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-841',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3368
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-842',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3372
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-843',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3376
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-844',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3380
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-845',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3384
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-846',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3388
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-847',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3392
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-848',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3396
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-849',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3400
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-850',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3404
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-851',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3408
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-852',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3412
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-853',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3416
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-854',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3420
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-855',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3424
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-856',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3428
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-857',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3432
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-858',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3436
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-859',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3440
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-860',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3444
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-861',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3448
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-862',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3452
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-863',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3456
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-864',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3460
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-865',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3464
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-866',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3468
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-867',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3472
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-868',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3476
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-869',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3480
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-870',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3484
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-871',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3488
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-872',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3492
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-873',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3496
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-874',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3500
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-875',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3504
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-876',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3508
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-877',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3512
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-878',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3516
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-879',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3520
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-880',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3524
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-881',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3528
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-882',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3532
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-883',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3536
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-884',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3540
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-885',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3544
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-886',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3548
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-887',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3552
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-888',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3556
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-889',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3560
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-890',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3564
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-891',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3568
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-892',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3572
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-893',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3576
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-894',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3580
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-895',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3584
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-896',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3588
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-897',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3592
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-898',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3596
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-899',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3600
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-900',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3604
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-901',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3608
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-902',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3612
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-903',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3616
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-904',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3620
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-905',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3624
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-906',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3628
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-907',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3632
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-908',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3636
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-909',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3640
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-910',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3644
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-911',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3648
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-912',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3652
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-913',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3656
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-914',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3660
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-915',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3664
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-916',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3668
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-917',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3672
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-918',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3676
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-919',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3680
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-920',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3684
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-921',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3688
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-922',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3692
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-923',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3696
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-924',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3700
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-925',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3704
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-926',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3708
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-927',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3712
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-928',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3716
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-929',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3720
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-930',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3724
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-931',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3728
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-932',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3732
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-933',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3736
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-934',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3740
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-935',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3744
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-936',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3748
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-937',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3752
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-938',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3756
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-939',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3760
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-940',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3764
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-941',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3768
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-942',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3772
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-943',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3776
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-944',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3780
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-945',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3784
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-946',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3788
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-947',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3792
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-948',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3796
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-949',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3800
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-950',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3804
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-951',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3808
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-952',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3812
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-953',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3816
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-954',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3820
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-955',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3824
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-956',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3828
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-957',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3832
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-958',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3836
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-959',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3840
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-960',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3844
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-961',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3848
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-962',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3852
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-963',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3856
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-964',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3860
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-965',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3864
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-966',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3868
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-967',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3872
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-968',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3876
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-969',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3880
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-970',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3884
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-971',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3888
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-972',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3892
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-973',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3896
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-974',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3900
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-975',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3904
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-976',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3908
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-977',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3912
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-978',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3916
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-979',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3920
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-980',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3924
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-981',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3928
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-982',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3932
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-983',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3936
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-984',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3940
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-985',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3944
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-986',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3948
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-987',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3952
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-988',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3956
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-989',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3960
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-990',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3964
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-991',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3968
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-992',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3972
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-993',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3976
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-994',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3980
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-995',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3984
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-996',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3988
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-997',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3992
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-998',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'FrameCounter |0| test task'
+{
+  FillBuffer
+    dst:     'dst_buf'
+    offset:  3996
+    size:    4
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-999',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_UploadStream1.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_UploadStream1.txt
new file mode 100644
index 00000000..3614a71c
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_UploadStream1.txt	
@@ -0,0 +1,561 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [0, 1048576)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [1048576, 2097152)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [2097152, 3145728)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [3145728, 4194304)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [4194304, 5242880)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-4',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [5242880, 6291456)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-5',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [6291456, 7340032)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-6',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [7340032, 8388608)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-7',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [8388608, 9437184)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-8',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [9437184, 10485760)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-9',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [10485760, 11534336)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-10',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [11534336, 12582912)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-11',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [12582912, 13631488)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-12',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [13631488, 14680064)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-13',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [14680064, 15728640)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-14',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [15728640, 16777216)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-15',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [16777216, 17825792)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-16',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [17825792, 18874368)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-17',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [18874368, 19922944)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-18',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [19922944, 20971520)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-19',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [20971520, 22020096)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-20',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [22020096, 23068672)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-21',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [23068672, 24117248)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-22',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [24117248, 25165824)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-23',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [25165824, 26214400)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-24',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [26214400, 27262976)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-25',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [27262976, 28311552)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-26',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [28311552, 29360128)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-27',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 1048576) ---> [29360128, 30408704)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-28',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 786432) ---> [30408704, 31195136)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-29',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 589824) ---> [31195136, 31784960)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-30',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 884736) ---> [31784960, 32669696)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-31',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream1 |0| test task'
+{
+  CopyBuffer
+    src: 'dynamic staging buffer'
+    dst: 'dst_buf'
+      copy [0, 884736) ---> [32669696, 33554432)
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-32',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_UploadStream2.txt b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_UploadStream2.txt
new file mode 100644
index 00000000..40d65489
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Apple M1/Test_UploadStream2.txt	
@@ -0,0 +1,1162 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 0, 0), ext:(4096, 64, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-0',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 64, 0), ext:(4096, 128, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-1',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 128, 0), ext:(4096, 192, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-2',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 192, 0), ext:(4096, 256, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-3',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 256, 0), ext:(4096, 320, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-4',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 320, 0), ext:(4096, 384, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-5',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 384, 0), ext:(4096, 448, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-6',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 448, 0), ext:(4096, 512, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-7',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 512, 0), ext:(4096, 576, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-8',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 576, 0), ext:(4096, 640, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-9',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 640, 0), ext:(4096, 704, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-10',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 704, 0), ext:(4096, 768, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-11',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 768, 0), ext:(4096, 832, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-12',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 832, 0), ext:(4096, 896, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-13',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 896, 0), ext:(4096, 960, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-14',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 960, 0), ext:(4096, 1024, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-15',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1024, 0), ext:(4096, 1088, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-16',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1088, 0), ext:(4096, 1152, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-17',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1152, 0), ext:(4096, 1216, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-18',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1216, 0), ext:(4096, 1280, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-19',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1280, 0), ext:(4096, 1344, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-20',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1344, 0), ext:(4096, 1408, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-21',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1408, 0), ext:(4096, 1472, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-22',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1472, 0), ext:(4096, 1536, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-23',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1536, 0), ext:(4096, 1600, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-24',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1600, 0), ext:(4096, 1664, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-25',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1664, 0), ext:(4096, 1728, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-26',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1728, 0), ext:(4096, 1792, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-27',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1792, 0), ext:(4096, 1856, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-28',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1856, 0), ext:(4096, 1920, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-29',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1920, 0), ext:(4096, 1984, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-30',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1984, 0), ext:(4096, 2048, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-31',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2048, 0), ext:(4096, 2112, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-32',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2112, 0), ext:(4096, 2176, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-33',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2176, 0), ext:(4096, 2240, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-34',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2240, 0), ext:(4096, 2304, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-35',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2304, 0), ext:(4096, 2368, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-36',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2368, 0), ext:(4096, 2432, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-37',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2432, 0), ext:(4096, 2496, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-38',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2496, 0), ext:(4096, 2560, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-39',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2560, 0), ext:(4096, 2624, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-40',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2624, 0), ext:(4096, 2688, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-41',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2688, 0), ext:(4096, 2752, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-42',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2752, 0), ext:(4096, 2816, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-43',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2816, 0), ext:(4096, 2880, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-44',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2880, 0), ext:(4096, 2944, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-45',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2944, 0), ext:(4096, 3008, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-46',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3008, 0), ext:(4096, 3072, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-47',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3072, 0), ext:(4096, 3136, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-48',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3136, 0), ext:(4096, 3200, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-49',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3200, 0), ext:(4096, 3264, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-50',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3264, 0), ext:(4096, 3328, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-51',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3328, 0), ext:(4096, 3392, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-52',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3392, 0), ext:(4096, 3456, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-53',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3456, 0), ext:(4096, 3520, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-54',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3520, 0), ext:(4096, 3584, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-55',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3584, 0), ext:(4096, 3648, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-56',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3648, 0), ext:(4096, 3712, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-57',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3712, 0), ext:(4096, 3776, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-58',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3776, 0), ext:(4096, 3840, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-59',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3840, 0), ext:(4096, 3904, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-60',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3904, 0), ext:(4096, 3968, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-61',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3968, 0), ext:(4096, 4032, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-62',  stage: ALL_COMMANDS
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+--------------------------------------------------
+name: 'UploadStream2 |0| test task'
+{
+  CopyBufferToImage
+    src:       'dynamic staging buffer'
+    dst:       'image'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 4032, 0), ext:(4096, 4096, 1), COLOR }
+  ----------
+
+}
+--------------------------------------------------
+signalSemaphore = {
+  'sync-63',  stage: ALL_COMMANDS
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Compute1.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Compute1.txt
new file mode 100644
index 00000000..66af3d84
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Compute1.txt	
@@ -0,0 +1,245 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-18'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-19'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-20'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  Dispatch
+  Dispatch
+  Dispatch
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-18'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-19'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-20'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-18'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-19'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-20'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-21'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-22'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-23'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  Dispatch
+  Dispatch
+  Dispatch
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-21'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-22'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-23'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-21'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-22'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-23'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-24'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-25'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-26'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  Dispatch
+  Dispatch
+  Dispatch
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-24'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-25'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-26'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-24'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-25'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-26'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Compute2.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Compute2.txt
new file mode 100644
index 00000000..6d602ee2
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Compute2.txt	
@@ -0,0 +1,290 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-27'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-28'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-29'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  Dispatch
+  Dispatch
+  Dispatch
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-27'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-28'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-29'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-27'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-28'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-29'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'image-28'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-29'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-27'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-30'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-31'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-32'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  Dispatch
+  Dispatch
+  Dispatch
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-30'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-31'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-32'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-30'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-31'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-32'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'image-31'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-32'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-30'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-33'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-34'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+    ImageBarrier:
+      name:    'image-35'
+      stage:   COMPUTE_SHADER ---> COMPUTE_SHADER
+      access:  0 ---> SHADER_STORAGE_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  Dispatch
+  Dispatch
+  Dispatch
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-33'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-34'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-35'
+      stage:   COMPUTE_SHADER ---> COPY
+      access:  SHADER_STORAGE_WRITE ---> TRANSFER_READ
+      layout:  GENERAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-33'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-34'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-35'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'image-34'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-35'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-33'
+      stage:   COPY ---> COMPUTE_SHADER
+      access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyBuffer1.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyBuffer1.txt
new file mode 100644
index 00000000..af19eb2b
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyBuffer1.txt	
@@ -0,0 +1,84 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-25'
+    dst: 'buffer-26'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-26'
+    dst: 'buffer-3'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-27'
+    dst: 'buffer-28'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-28'
+    dst: 'buffer-4'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyBuffer2.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyBuffer2.txt
new file mode 100644
index 00000000..8979e502
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyBuffer2.txt	
@@ -0,0 +1,84 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-1'
+    dst: 'buffer-29'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-29'
+    dst: 'buffer-30'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-2'
+    dst: 'buffer-31'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> COPY
+      access: TRANSFER_WRITE ---> TRANSFER_READ
+  ----------
+
+  CopyBuffer
+    src: 'buffer-31'
+    dst: 'buffer-32'
+      copy [0, 128) ---> [0, 128)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyImage1.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyImage1.txt
new file mode 100644
index 00000000..500e2e2c
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyImage1.txt	
@@ -0,0 +1,146 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+    ImageBarrier:
+      name:    'image-10'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'buffer-1'
+    dst:       'image-10'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-10'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-11'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'image-10'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'image-11'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-11'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-11'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-3'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_READ
+    ImageBarrier:
+      name:    'image-12'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'buffer-2'
+    dst:       'image-12'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-12'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-13'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'image-12'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'image-13'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-13'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-13'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-4'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyImage2.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyImage2.txt
new file mode 100644
index 00000000..eb58636c
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_CopyImage2.txt	
@@ -0,0 +1,192 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'image-14'
+      stage:   ALL_COMMANDS ---> ALL_COMMANDS
+      access:  0 ---> MEMORY_READ | MEMORY_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-14'
+      stage:   ALL_COMMANDS ---> COPY
+      access:  MEMORY_READ | MEMORY_WRITE ---> TRANSFER_WRITE
+      layout:  GENERAL ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'buffer-1'
+    dst:       'image-14'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-14'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-15'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'image-14'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'image-15'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-15'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-15'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-3'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-15'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-14'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'image-16'
+      stage:   ALL_COMMANDS ---> ALL_COMMANDS
+      access:  0 ---> MEMORY_READ | MEMORY_WRITE
+      layout:  UNDEFINED ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-16'
+      stage:   ALL_COMMANDS ---> COPY
+      access:  MEMORY_READ | MEMORY_WRITE ---> TRANSFER_WRITE
+      layout:  GENERAL ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'buffer-2'
+    dst:       'image-16'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-16'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+    ImageBarrier:
+      name:    'image-17'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyImage
+    src:       'image-16'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'image-17'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-17'
+      stage:   COPY ---> COPY
+      access:  TRANSFER_WRITE ---> TRANSFER_READ
+      layout:  TRANSFER_DST_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-17'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-4'
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-17'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+    ImageBarrier:
+      name:    'image-16'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw1.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw1.txt
new file mode 100644
index 00000000..5145e965
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw1.txt	
@@ -0,0 +1,284 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-36'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-28 (image-36)'
+      image:   'image-36'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-28 (image-36)'
+      image:   'image-36'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-36'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-36'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-37'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-29 (image-37)'
+      image:   'image-37'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-29 (image-37)'
+      image:   'image-37'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-37'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-37'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-38'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-30 (image-38)'
+      image:   'image-38'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-30 (image-38)'
+      image:   'image-38'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-38'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-38'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-39'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-31 (image-39)'
+      image:   'image-39'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-31 (image-39)'
+      image:   'image-39'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-39'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-39'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw2.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw2.txt
new file mode 100644
index 00000000..1ca70620
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw2.txt	
@@ -0,0 +1,364 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-1'
+    dst: 'buffer-36'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-40'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-32 (image-40)'
+      image:   'image-40'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-36', offset: 0
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-32 (image-40)'
+      image:   'image-40'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-40'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-40'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-2'
+    dst: 'buffer-37'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-41'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-33 (image-41)'
+      image:   'image-41'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-37', offset: 0
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-33 (image-41)'
+      image:   'image-41'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-41'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-41'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-1'
+    dst: 'buffer-38'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-42'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-34 (image-42)'
+      image:   'image-42'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-38', offset: 0
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-34 (image-42)'
+      image:   'image-42'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-42'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-42'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-2'
+    dst: 'buffer-39'
+      copy [0, 36) ---> [0, 36)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-43'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-35 (image-43)'
+      image:   'image-43'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-39', offset: 0
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-35 (image-43)'
+      image:   'image-43'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-43'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-43'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw3.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw3.txt
new file mode 100644
index 00000000..d1313284
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw3.txt	
@@ -0,0 +1,284 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-44'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-36 (image-44)'
+      image:   'image-44'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-36 (image-44)'
+      image:   'image-44'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-44'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-44'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-45'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-37 (image-45)'
+      image:   'image-45'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-37 (image-45)'
+      image:   'image-45'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-45'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-45'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-46'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-38 (image-46)'
+      image:   'image-46'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-38 (image-46)'
+      image:   'image-46'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-46'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-46'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-47'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-39 (image-47)'
+      image:   'image-47'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-39 (image-47)'
+      image:   'image-47'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-47'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-47'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw4.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw4.txt
new file mode 100644
index 00000000..398fd9a0
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw4.txt	
@@ -0,0 +1,149 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'image-48'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+      layout:  UNDEFINED ---> COLOR_ATTACHMENT_OPTIMAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-4'
+    color attachment:
+      view:    'image-view-40 (image-48)'
+      image:   'image-48'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-6', offset: 0
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-40 (image-48)'
+      image:   'image-48'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-5'
+    color attachment:
+      view:    'image-view-40 (image-48)'
+      image:   'image-48'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-6', offset: 64
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-40 (image-48)'
+      image:   'image-48'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-5'
+    color attachment:
+      view:    'image-view-40 (image-48)'
+      image:   'image-48'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-6', offset: 128
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-40 (image-48)'
+      image:   'image-48'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-48'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COPY
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> TRANSFER_READ
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-48'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'image-48'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw5.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw5.txt
new file mode 100644
index 00000000..9e2fd884
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_Draw5.txt	
@@ -0,0 +1,149 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY | INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: HOST_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ | TRANSFER_READ
+    ImageBarrier:
+      name:    'image-49'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access:  0 ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+      layout:  UNDEFINED ---> COLOR_ATTACHMENT_OPTIMAL
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-4'
+    color attachment:
+      view:    'image-view-41 (image-49)'
+      image:   'image-49'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-7', offset: 0
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-41 (image-49)'
+      image:   'image-49'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-5'
+    color attachment:
+      view:    'image-view-41 (image-49)'
+      image:   'image-49'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-7', offset: 64
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-41 (image-49)'
+      image:   'image-49'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COLOR_ATTACHMENT_OUTPUT ---> COLOR_ATTACHMENT_OUTPUT
+      access: COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-5'
+    color attachment:
+      view:    'image-view-41 (image-49)'
+      image:   'image-49'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  LOAD
+  ----------
+
+  BindVertexBuffers
+    [0] buffer: 'buffer-7', offset: 128
+  ----------
+
+  Draw
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-41 (image-49)'
+      image:   'image-49'
+      layout:  COLOR_ATTACHMENT_OPTIMAL
+      storeOp: STORE
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-49'
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> COPY
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> TRANSFER_READ
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-49'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+    ImageBarrier:
+      name:    'image-49'
+      stage:   COPY ---> ALL_COMMANDS
+      access:  TRANSFER_READ ---> MEMORY_READ | MEMORY_WRITE
+      layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_DrawAsync1.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_DrawAsync1.txt
new file mode 100644
index 00000000..de34d5df
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_DrawAsync1.txt	
@@ -0,0 +1,340 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-1'
+    dst: 'buffer-40'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-50'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-42 (image-50)'
+      image:   'image-50'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-42 (image-50)'
+      image:   'image-50'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-50'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-50'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-2'
+    dst: 'buffer-41'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-51'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-43 (image-51)'
+      image:   'image-51'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-43 (image-51)'
+      image:   'image-51'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-51'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-51'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-33'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-1'
+    dst: 'buffer-42'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-52'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-44 (image-52)'
+      image:   'image-52'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-44 (image-52)'
+      image:   'image-52'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-52'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+}
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyImageToBuffer
+    src:       'image-52'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-34'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  HOST ---> COPY
+      access: HOST_WRITE ---> TRANSFER_WRITE
+  ----------
+
+  CopyBuffer
+    src: 'buffer-2'
+    dst: 'buffer-43'
+      copy [0, 144) ---> [0, 144)
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> INDEX_INPUT | VERTEX_ATTRIBUTE_INPUT
+      access: TRANSFER_WRITE ---> INDEX_READ | VERTEX_ATTRIBUTE_READ
+    ImageBarrier:
+      name:    'image-53'
+      stage:   FRAGMENT_SHADER ---> FRAGMENT_SHADER
+      access:  0 ---> SHADER_SAMPLED_READ
+      layout:  UNDEFINED ---> SHADER_READ_ONLY_OPTIMAL
+  ----------
+
+  BeginRenderPass2
+    renderPass:  'render-pass-1'
+    color attachment:
+      view:    'image-view-45 (image-53)'
+      image:   'image-53'
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> COLOR_ATTACHMENT_OPTIMAL
+      loadOp:  CLEAR
+    dependency:
+      subpass: External ---> 0
+      stage:   FRAGMENT_SHADER ---> COLOR_ATTACHMENT_OUTPUT
+      access:  SHADER_SAMPLED_READ ---> COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE
+  ----------
+
+  EndRenderPass2
+    attachment:
+      view:    'image-view-45 (image-53)'
+      image:   'image-53'
+      layout:  COLOR_ATTACHMENT_OPTIMAL ---> SHADER_READ_ONLY_OPTIMAL
+      storeOp: STORE
+    dependency:
+      subpass: 0 ---> External
+      stage:   COLOR_ATTACHMENT_OUTPUT ---> FRAGMENT_SHADER
+      access:  COLOR_ATTACHMENT_READ | COLOR_ATTACHMENT_WRITE ---> SHADER_SAMPLED_READ
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-53'
+      stage:   FRAGMENT_SHADER ---> COPY
+      access:  SHADER_SAMPLED_READ ---> TRANSFER_READ
+      layout:  SHADER_READ_ONLY_OPTIMAL ---> TRANSFER_SRC_OPTIMAL
+  ----------
+
+  CopyImageToBuffer
+    src:       'image-53'
+    srcLayout: TRANSFER_SRC_OPTIMAL
+    dst:       'buffer-35'
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
+  ----------
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    MemoryBarrier:
+      stage:  COPY ---> HOST
+      access: TRANSFER_WRITE ---> HOST_READ
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_FrameCounter.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_FrameCounter.txt
new file mode 100644
index 00000000..5cab9304
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_FrameCounter.txt	
@@ -0,0 +1,14000 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  0
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  4
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  8
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  12
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  16
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  20
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  24
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  28
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  32
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  36
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  40
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  44
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  48
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  52
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  56
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  60
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  64
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  68
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  72
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  76
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  80
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  84
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  88
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  92
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  96
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  100
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  104
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  108
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  112
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  116
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  120
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  124
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  128
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  132
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  136
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  140
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  144
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  148
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  152
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  156
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  160
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  164
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  168
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  172
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  176
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  180
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  184
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  188
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  192
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  196
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  200
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  204
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  208
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  212
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  216
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  220
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  224
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  228
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  232
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  236
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  240
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  244
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  248
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  252
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  256
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  260
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  264
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  268
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  272
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  276
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  280
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  284
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  288
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  292
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  296
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  300
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  304
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  308
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  312
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  316
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  320
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  324
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  328
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  332
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  336
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  340
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  344
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  348
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  352
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  356
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  360
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  364
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  368
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  372
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  376
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  380
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  384
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  388
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  392
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  396
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  400
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  404
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  408
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  412
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  416
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  420
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  424
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  428
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  432
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  436
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  440
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  444
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  448
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  452
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  456
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  460
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  464
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  468
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  472
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  476
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  480
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  484
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  488
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  492
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  496
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  500
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  504
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  508
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  512
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  516
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  520
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  524
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  528
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  532
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  536
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  540
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  544
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  548
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  552
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  556
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  560
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  564
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  568
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  572
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  576
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  580
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  584
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  588
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  592
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  596
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  600
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  604
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  608
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  612
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  616
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  620
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  624
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  628
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  632
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  636
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  640
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  644
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  648
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  652
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  656
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  660
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  664
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  668
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  672
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  676
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  680
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  684
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  688
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  692
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  696
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  700
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  704
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  708
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  712
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  716
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  720
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  724
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  728
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  732
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  736
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  740
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  744
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  748
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  752
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  756
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  760
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  764
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  768
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  772
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  776
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  780
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  784
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  788
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  792
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  796
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  800
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  804
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  808
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  812
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  816
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  820
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  824
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  828
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  832
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  836
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  840
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  844
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  848
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  852
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  856
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  860
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  864
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  868
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  872
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  876
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  880
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  884
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  888
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  892
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  896
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  900
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  904
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  908
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  912
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  916
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  920
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  924
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  928
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  932
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  936
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  940
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  944
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  948
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  952
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  956
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  960
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  964
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  968
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  972
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  976
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  980
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  984
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  988
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  992
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  996
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1000
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1004
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1008
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1012
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1016
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1020
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1024
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1028
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1032
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1036
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1040
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1044
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1048
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1052
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1056
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1060
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1064
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1068
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1072
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1076
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1080
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1084
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1088
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1092
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1096
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1100
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1104
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1108
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1112
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1116
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1120
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1124
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1128
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1132
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1136
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1140
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1144
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1148
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1152
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1156
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1160
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1164
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1168
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1172
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1176
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1180
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1184
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1188
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1192
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1196
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1200
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1204
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1208
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1212
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1216
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1220
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1224
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1228
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1232
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1236
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1240
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1244
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1248
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1252
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1256
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1260
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1264
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1268
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1272
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1276
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1280
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1284
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1288
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1292
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1296
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1300
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1304
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1308
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1312
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1316
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1320
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1324
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1328
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1332
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1336
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1340
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1344
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1348
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1352
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1356
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1360
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1364
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1368
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1372
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1376
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1380
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1384
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1388
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1392
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1396
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1400
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1404
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1408
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1412
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1416
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1420
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1424
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1428
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1432
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1436
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1440
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1444
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1448
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1452
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1456
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1460
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1464
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1468
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1472
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1476
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1480
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1484
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1488
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1492
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1496
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1500
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1504
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1508
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1512
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1516
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1520
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1524
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1528
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1532
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1536
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1540
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1544
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1548
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1552
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1556
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1560
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1564
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1568
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1572
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1576
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1580
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1584
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1588
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1592
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1596
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1600
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1604
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1608
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1612
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1616
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1620
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1624
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1628
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1632
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1636
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1640
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1644
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1648
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1652
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1656
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1660
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1664
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1668
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1672
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1676
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1680
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1684
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1688
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1692
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1696
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1700
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1704
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1708
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1712
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1716
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1720
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1724
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1728
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1732
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1736
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1740
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1744
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1748
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1752
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1756
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1760
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1764
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1768
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1772
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1776
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1780
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1784
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1788
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1792
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1796
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1800
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1804
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1808
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1812
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1816
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1820
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1824
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1828
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1832
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1836
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1840
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1844
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1848
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1852
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1856
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1860
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1864
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1868
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1872
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1876
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1880
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1884
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1888
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1892
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1896
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1900
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1904
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1908
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1912
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1916
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1920
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1924
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1928
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1932
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1936
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1940
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1944
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1948
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1952
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1956
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1960
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1964
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1968
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1972
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1976
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1980
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1984
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1988
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1992
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  1996
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2000
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2004
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2008
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2012
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2016
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2020
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2024
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2028
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2032
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2036
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2040
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2044
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2048
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2052
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2056
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2060
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2064
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2068
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2072
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2076
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2080
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2084
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2088
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2092
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2096
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2100
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2104
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2108
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2112
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2116
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2120
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2124
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2128
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2132
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2136
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2140
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2144
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2148
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2152
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2156
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2160
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2164
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2168
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2172
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2176
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2180
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2184
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2188
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2192
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2196
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2200
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2204
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2208
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2212
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2216
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2220
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2224
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2228
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2232
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2236
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2240
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2244
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2248
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2252
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2256
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2260
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2264
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2268
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2272
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2276
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2280
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2284
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2288
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2292
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2296
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2300
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2304
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2308
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2312
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2316
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2320
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2324
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2328
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2332
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2336
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2340
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2344
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2348
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2352
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2356
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2360
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2364
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2368
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2372
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2376
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2380
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2384
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2388
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2392
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2396
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2400
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2404
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2408
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2412
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2416
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2420
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2424
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2428
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2432
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2436
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2440
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2444
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2448
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2452
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2456
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2460
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2464
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2468
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2472
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2476
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2480
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2484
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2488
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2492
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2496
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2500
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2504
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2508
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2512
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2516
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2520
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2524
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2528
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2532
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2536
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2540
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2544
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2548
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2552
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2556
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2560
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2564
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2568
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2572
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2576
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2580
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2584
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2588
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2592
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2596
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2600
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2604
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2608
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2612
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2616
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2620
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2624
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2628
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2632
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2636
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2640
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2644
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2648
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2652
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2656
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2660
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2664
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2668
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2672
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2676
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2680
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2684
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2688
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2692
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2696
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2700
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2704
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2708
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2712
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2716
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2720
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2724
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2728
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2732
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2736
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2740
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2744
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2748
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2752
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2756
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2760
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2764
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2768
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2772
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2776
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2780
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2784
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2788
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2792
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2796
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2800
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2804
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2808
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2812
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2816
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2820
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2824
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2828
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2832
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2836
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2840
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2844
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2848
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2852
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2856
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2860
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2864
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2868
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2872
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2876
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2880
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2884
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2888
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2892
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2896
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2900
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2904
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2908
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2912
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2916
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2920
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2924
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2928
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2932
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2936
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2940
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2944
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2948
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2952
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2956
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2960
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2964
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2968
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2972
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2976
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2980
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2984
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2988
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2992
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  2996
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3000
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3004
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3008
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3012
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3016
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3020
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3024
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3028
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3032
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3036
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3040
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3044
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3048
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3052
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3056
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3060
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3064
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3068
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3072
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3076
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3080
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3084
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3088
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3092
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3096
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3100
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3104
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3108
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3112
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3116
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3120
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3124
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3128
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3132
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3136
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3140
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3144
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3148
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3152
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3156
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3160
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3164
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3168
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3172
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3176
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3180
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3184
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3188
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3192
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3196
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3200
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3204
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3208
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3212
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3216
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3220
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3224
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3228
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3232
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3236
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3240
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3244
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3248
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3252
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3256
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3260
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3264
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3268
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3272
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3276
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3280
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3284
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3288
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3292
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3296
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3300
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3304
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3308
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3312
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3316
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3320
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3324
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3328
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3332
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3336
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3340
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3344
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3348
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3352
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3356
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3360
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3364
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3368
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3372
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3376
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3380
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3384
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3388
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3392
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3396
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3400
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3404
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3408
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3412
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3416
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3420
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3424
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3428
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3432
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3436
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3440
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3444
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3448
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3452
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3456
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3460
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3464
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3468
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3472
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3476
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3480
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3484
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3488
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3492
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3496
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3500
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3504
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3508
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3512
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3516
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3520
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3524
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3528
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3532
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3536
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3540
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3544
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3548
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3552
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3556
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3560
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3564
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3568
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3572
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3576
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3580
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3584
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3588
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3592
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3596
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3600
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3604
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3608
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3612
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3616
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3620
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3624
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3628
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3632
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3636
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3640
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3644
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3648
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3652
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3656
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3660
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3664
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3668
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3672
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3676
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3680
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3684
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3688
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3692
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3696
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3700
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3704
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3708
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3712
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3716
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3720
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3724
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3728
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3732
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3736
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3740
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3744
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3748
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3752
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3756
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3760
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3764
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3768
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3772
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3776
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3780
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3784
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3788
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3792
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3796
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3800
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3804
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3808
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3812
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3816
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3820
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3824
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3828
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3832
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3836
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3840
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3844
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3848
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3852
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3856
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3860
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3864
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3868
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3872
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3876
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3880
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3884
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3888
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3892
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3896
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3900
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3904
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3908
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3912
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3916
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3920
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3924
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3928
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3932
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3936
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3940
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3944
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3948
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3952
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3956
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3960
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3964
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3968
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3972
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3976
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3980
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3984
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3988
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3992
+    size:    4
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  FillBuffer
+    dst:     'buffer-20'
+    offset:  3996
+    size:    4
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_UploadStream1.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_UploadStream1.txt
new file mode 100644
index 00000000..2c89d59a
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_UploadStream1.txt	
@@ -0,0 +1,462 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [0, 1048576)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [1048576, 2097152)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [2097152, 3145728)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [3145728, 4194304)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [4194304, 5242880)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [5242880, 6291456)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [6291456, 7340032)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [7340032, 8388608)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [8388608, 9437184)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [9437184, 10485760)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [10485760, 11534336)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [11534336, 12582912)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [12582912, 13631488)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [13631488, 14680064)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [14680064, 15728640)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [15728640, 16777216)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [16777216, 17825792)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [17825792, 18874368)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [18874368, 19922944)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [19922944, 20971520)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [20971520, 22020096)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [22020096, 23068672)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [23068672, 24117248)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [24117248, 25165824)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [25165824, 26214400)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [26214400, 27262976)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [27262976, 28311552)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [28311552, 29360128)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 1048576) ---> [29360128, 30408704)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 786432) ---> [30408704, 31195136)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-22'
+    dst: 'buffer-21'
+      copy [0, 589824) ---> [31195136, 31784960)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-23'
+    dst: 'buffer-21'
+      copy [0, 884736) ---> [31784960, 32669696)
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBuffer
+    src: 'buffer-24'
+    dst: 'buffer-21'
+      copy [0, 884736) ---> [32669696, 33554432)
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_UploadStream2.txt b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_UploadStream2.txt
new file mode 100644
index 00000000..ea1a2875
--- /dev/null
+++ b/AE/engine/tests/graphics/Vulkan/ref/Mali-G57 MC2/Test_UploadStream2.txt	
@@ -0,0 +1,970 @@
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+
+  PipelineBarrier2
+    dependencyFlags: 0
+    ImageBarrier:
+      name:    'image-9'
+      stage:   COPY ---> COPY
+      access:  0 ---> TRANSFER_WRITE
+      layout:  UNDEFINED ---> TRANSFER_DST_OPTIMAL
+  ----------
+
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 0, 0), ext:(4096, 64, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 64, 0), ext:(4096, 128, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 128, 0), ext:(4096, 192, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 192, 0), ext:(4096, 256, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 256, 0), ext:(4096, 320, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 320, 0), ext:(4096, 384, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 384, 0), ext:(4096, 448, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 448, 0), ext:(4096, 512, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 512, 0), ext:(4096, 576, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 576, 0), ext:(4096, 640, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 640, 0), ext:(4096, 704, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 704, 0), ext:(4096, 768, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 768, 0), ext:(4096, 832, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 832, 0), ext:(4096, 896, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 896, 0), ext:(4096, 960, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 960, 0), ext:(4096, 1024, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1024, 0), ext:(4096, 1088, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1088, 0), ext:(4096, 1152, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1152, 0), ext:(4096, 1216, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1216, 0), ext:(4096, 1280, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1280, 0), ext:(4096, 1344, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1344, 0), ext:(4096, 1408, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1408, 0), ext:(4096, 1472, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1472, 0), ext:(4096, 1536, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1536, 0), ext:(4096, 1600, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1600, 0), ext:(4096, 1664, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1664, 0), ext:(4096, 1728, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1728, 0), ext:(4096, 1792, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1792, 0), ext:(4096, 1856, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1856, 0), ext:(4096, 1920, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1920, 0), ext:(4096, 1984, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 1984, 0), ext:(4096, 2048, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2048, 0), ext:(4096, 2112, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2112, 0), ext:(4096, 2176, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2176, 0), ext:(4096, 2240, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2240, 0), ext:(4096, 2304, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2304, 0), ext:(4096, 2368, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2368, 0), ext:(4096, 2432, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2432, 0), ext:(4096, 2496, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2496, 0), ext:(4096, 2560, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2560, 0), ext:(4096, 2624, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2624, 0), ext:(4096, 2688, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2688, 0), ext:(4096, 2752, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2752, 0), ext:(4096, 2816, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2816, 0), ext:(4096, 2880, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2880, 0), ext:(4096, 2944, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 2944, 0), ext:(4096, 3008, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3008, 0), ext:(4096, 3072, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3072, 0), ext:(4096, 3136, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3136, 0), ext:(4096, 3200, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3200, 0), ext:(4096, 3264, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3264, 0), ext:(4096, 3328, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3328, 0), ext:(4096, 3392, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3392, 0), ext:(4096, 3456, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3456, 0), ext:(4096, 3520, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3520, 0), ext:(4096, 3584, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3584, 0), ext:(4096, 3648, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3648, 0), ext:(4096, 3712, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3712, 0), ext:(4096, 3776, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3776, 0), ext:(4096, 3840, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3840, 0), ext:(4096, 3904, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-23'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3904, 0), ext:(4096, 3968, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-0'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-24'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 3968, 0), ext:(4096, 4032, 1), COLOR }
+  ----------
+
+}
+==================================================
+==================================================
+Batch in queue: 'Graphics', (0)
+Fence: 'fence-1'
+--------------------------------------------------
+name: 'command-buffer'
+{
+  CopyBufferToImage
+    src:       'buffer-22'
+    dst:       'image-9'
+    dstLayout: TRANSFER_DST_OPTIMAL
+      copy { [0, 1048576) } ---> { off:(0, 4032, 0), ext:(4096, 4096, 1), COLOR }
+  ----------
+
+}
+==================================================
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute1.txt
index 75e3703d..fd880663 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute1.txt	
@@ -28,6 +28,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -71,11 +72,13 @@ name: 'compute batch |0| async compute task'
 {
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -119,6 +122,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -162,11 +166,13 @@ name: 'compute batch |0| async compute task'
 {
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-1', layout: GENERAL
   ----------
 
@@ -210,6 +216,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -253,11 +260,13 @@ name: 'compute batch |0| async compute task'
 {
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -295,14 +304,14 @@ name: 'copy task |0| Readback task'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [1920000, 3840000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [1920000, 3840000) }
   ----------
 
   PipelineBarrier2
@@ -348,6 +357,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -391,11 +401,13 @@ name: 'IndirectCmdBuffers'
 {
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -439,6 +451,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -482,11 +495,13 @@ name: 'IndirectCmdBuffers'
 {
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-1', layout: GENERAL
   ----------
 
@@ -530,6 +545,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -573,11 +589,13 @@ name: 'IndirectCmdBuffers'
 {
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -615,14 +633,14 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [1920000, 3840000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [1920000, 3840000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute2.txt
index f8da9f4a..26c26d34 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute2.txt	
@@ -28,6 +28,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -83,11 +84,13 @@ name: 'compute batch |0| async compute task'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -141,6 +144,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -196,11 +200,13 @@ name: 'compute batch |0| async compute task'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-1', layout: GENERAL
   ----------
 
@@ -255,6 +261,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -310,11 +317,13 @@ name: 'compute batch |0| async compute task'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -374,14 +383,14 @@ name: 'copy task |0| Readback task'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [1920000, 3840000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [1920000, 3840000) }
   ----------
 
   PipelineBarrier2
@@ -427,6 +436,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -482,11 +492,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -540,6 +552,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -595,11 +608,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-1', layout: GENERAL
   ----------
 
@@ -654,6 +669,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -709,11 +725,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -773,14 +791,14 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [1920000, 3840000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [1920000, 3840000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute3.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute3.txt
index 64757a1a..54133b51 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute3.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_AsyncCompute3.txt	
@@ -28,6 +28,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -83,11 +84,13 @@ name: 'compute batch |0| async compute task'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -127,6 +130,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -182,11 +186,13 @@ name: 'compute batch |0| async compute task'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-1', layout: GENERAL
   ----------
 
@@ -230,6 +236,7 @@ name: 'graphics batch |0| graphics task'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -285,11 +292,13 @@ name: 'compute batch |0| async compute task'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -318,7 +327,7 @@ name: 'copy task |0| Readback task'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -334,7 +343,7 @@ name: 'copy task |0| Readback task'
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [1920000, 3840000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [1920000, 3840000) }
   ----------
 
   PipelineBarrier2
@@ -394,6 +403,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -449,11 +459,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -493,6 +505,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -548,11 +561,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-1', layout: GENERAL
   ----------
 
@@ -596,6 +611,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.graphics'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -651,11 +667,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'async_comp1.compute'
+    layout:    '1'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '1'
       image: 'Image-0', layout: GENERAL
   ----------
 
@@ -684,7 +702,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -700,7 +718,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [1920000, 3840000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [1920000, 3840000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute1.txt
index c55251d2..36d80ca7 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute1.txt	
@@ -25,31 +25,37 @@ name: 'Compute1 |0| Compute task'
 
   BindPipeline
     pipeline:  'compute-ppln-18'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-0', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-19'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-1', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-20'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-2', layout: GENERAL
   ----------
 
@@ -80,21 +86,21 @@ name: 'Compute1 |1| Readback task'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [1024, 2048) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-2'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [2048, 3072) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
   ----------
 
   PipelineBarrier2
@@ -137,31 +143,37 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'compute-ppln-21'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-0', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-22'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-1', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-23'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-2', layout: GENERAL
   ----------
 
@@ -188,21 +200,21 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [1024, 2048) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-2'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [2048, 3072) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
   ----------
 
   PipelineBarrier2
@@ -245,31 +257,37 @@ name: 'Compute1 |0| Compute task'
 
   BindPipeline
     pipeline:  'compute-ppln-24'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-0', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-25'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-1', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-26'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-2', layout: GENERAL
   ----------
 
@@ -300,21 +318,21 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [1024, 2048) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-2'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [2048, 3072) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute2.txt
index b8f6b513..984a9700 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Compute2.txt	
@@ -25,31 +25,37 @@ name: 'Compute1 |0| Compute task'
 
   BindPipeline
     pipeline:  'compute-ppln-27'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-0', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-28'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-1', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-29'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-2', layout: GENERAL
   ----------
 
@@ -81,21 +87,21 @@ name: 'Compute1 |1| Readback task'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [1024, 2048) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-2'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [2048, 3072) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
   ----------
 
   PipelineBarrier2
@@ -153,31 +159,37 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'compute-ppln-30'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-0', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-31'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-1', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-32'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-2', layout: GENERAL
   ----------
 
@@ -204,21 +216,21 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [1024, 2048) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-2'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [2048, 3072) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
   ----------
 
   PipelineBarrier2
@@ -276,31 +288,37 @@ name: 'Compute1 |0| Compute task'
 
   BindPipeline
     pipeline:  'compute-ppln-33'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-0', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-34'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-1', layout: GENERAL
   ----------
 
   BindPipeline
     pipeline:  'compute-ppln-35'
+    layout:    '0'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '0'
       image: 'Image-2', layout: GENERAL
   ----------
 
@@ -332,21 +350,21 @@ name: 'IndirectCmdBuffers'
     src:       'Image-0'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-1'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [1024, 2048) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [1024, 2048) }
   ----------
 
   CopyImageToBuffer
     src:       'Image-2'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [2048, 3072) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [2048, 3072) }
   ----------
 
   PipelineBarrier2
@@ -355,17 +373,17 @@ name: 'IndirectCmdBuffers'
       stage:  COPY ---> HOST
       access: TRANSFER_WRITE ---> HOST_READ
     ImageBarrier:
-      name:    'Image-0'
+      name:    'Image-1'
       stage:   COPY ---> COMPUTE_SHADER
       access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
       layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
     ImageBarrier:
-      name:    'Image-1'
+      name:    'Image-2'
       stage:   COPY ---> COMPUTE_SHADER
       access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
       layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
     ImageBarrier:
-      name:    'Image-2'
+      name:    'Image-0'
       stage:   COPY ---> COMPUTE_SHADER
       access:  TRANSFER_READ ---> SHADER_STORAGE_WRITE
       layout:  TRANSFER_SRC_OPTIMAL ---> GENERAL
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage1.txt
index fb0606a5..20a07c15 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage1.txt	
@@ -20,7 +20,7 @@ name: 'CopyImage2 |0| Copy image task'
     src:       'SSWB {f:0} {q:Graphics}'
     dst:       'SrcImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -42,7 +42,7 @@ name: 'CopyImage2 |0| Copy image task'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'DstImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR }
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -58,7 +58,7 @@ name: 'CopyImage2 |0| Copy image task'
     src:       'DstImage'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'SSRB {f:0} {q:Graphics}'
-      copy { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 16384) }
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
   ----------
 
   PipelineBarrier2
@@ -96,7 +96,7 @@ name: 'IndirectCmdBuffers'
     src:       'SSWB {f:1} {q:Graphics}'
     dst:       'SrcImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -118,7 +118,7 @@ name: 'IndirectCmdBuffers'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'DstImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR }
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -134,7 +134,7 @@ name: 'IndirectCmdBuffers'
     src:       'DstImage'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'SSRB {f:1} {q:Graphics}'
-      copy { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 16384) }
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage2.txt
index 749c31ee..2e90f9a7 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_CopyImage2.txt	
@@ -29,7 +29,7 @@ name: 'CopyImage2 |0| Copy image task'
     src:       'SSWB {f:0} {q:Graphics}'
     dst:       'SrcImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -51,7 +51,7 @@ name: 'CopyImage2 |0| Copy image task'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'DstImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR }
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -67,7 +67,7 @@ name: 'CopyImage2 |0| Copy image task'
     src:       'DstImage'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'SSRB {f:0} {q:Graphics}'
-      copy { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 16384) }
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
   ----------
 
   PipelineBarrier2
@@ -128,7 +128,7 @@ name: 'IndirectCmdBuffers'
     src:       'SSWB {f:1} {q:Graphics}'
     dst:       'SrcImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 16384) } ---> { off:(0, 0, 0), ext:(64, 64, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -150,7 +150,7 @@ name: 'IndirectCmdBuffers'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'DstImage'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { off:(0, 0, 0), ext:(64, 64, 1), mip:0, layers:[0, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR }
+      copy { off:(0, 0, 0), ext:(64, 64, 1), COLOR } ---> { off:(16, 27, 0), ext:(80, 91, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -166,7 +166,7 @@ name: 'IndirectCmdBuffers'
     src:       'DstImage'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'SSRB {f:1} {q:Graphics}'
-      copy { off:(16, 27, 0), ext:(80, 91, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 16384) }
+      copy { off:(16, 27, 0), ext:(80, 91, 1), COLOR } ---> { [0, 16384) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger1.txt
index 98d1ec19..50ce9c7e 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger1.txt	
@@ -33,12 +33,15 @@ name: 'Debugger1 |0| Compute task'
 
   BindPipeline
     pipeline:  'compute-ppln-36'
+    layout:    '2'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '2'
       image: 'Image', layout: GENERAL
+    [1] pl: '2'
       buffer: 'debug storage buffer'
   ----------
 
@@ -59,7 +62,7 @@ name: 'Debugger1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(16, 16, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1024) }
+      copy { off:(0, 0, 0), ext:(16, 16, 1), COLOR } ---> { [0, 1024) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger2.txt
index 08ccc586..a79e26e3 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger2.txt	
@@ -46,11 +46,13 @@ name: 'Debugger2 |0| Draw task'
 
   BindPipeline
     pipeline:  'dbg2_draw'
+    layout:    '3'
     bindPoint: GRAPHICS
   ----------
 
   Draw
     descriptors:
+    [0] pl: '3'
       buffer: 'debug storage buffer'
   ----------
 
@@ -83,7 +85,7 @@ name: 'Debugger2 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger3.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger3.txt
index 642137c3..1525ef26 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger3.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger3.txt	
@@ -46,11 +46,13 @@ name: 'Debugger3 |0| Draw mesh task'
 
   BindPipeline
     pipeline:  'dbg3_draw'
+    layout:    '4'
     bindPoint: GRAPHICS
   ----------
 
   DrawMeshTasks
     descriptors:
+    [0] pl: '4'
       buffer: 'debug storage buffer'
   ----------
 
@@ -83,7 +85,7 @@ name: 'Debugger3 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger4.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger4.txt
index f0ffa096..b42b7503 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger4.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger4.txt	
@@ -20,13 +20,13 @@ name: 'Debugger4 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -102,13 +102,16 @@ name: 'Debugger4 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'dbg4_rtrace1.def'
+    layout:    '5'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '5'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
+    [1] pl: '5'
       buffer: 'debug storage buffer'
   ----------
 
@@ -129,7 +132,7 @@ name: 'Debugger4 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger5.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger5.txt
index af2dfe0c..e6a22f84 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger5.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Debugger5.txt	
@@ -20,13 +20,13 @@ name: 'Debugger5 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -102,13 +102,16 @@ name: 'Debugger5 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'dbg5_rquery.def'
+    layout:    '6'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '6'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
+    [1] pl: '6'
       buffer: 'debug storage buffer'
   ----------
 
@@ -129,7 +132,7 @@ name: 'Debugger5 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw1.txt
index 24a77c50..d9673258 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw1.txt	
@@ -28,6 +28,7 @@ name: 'Draw1 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -62,7 +63,7 @@ name: 'Draw1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -108,6 +109,7 @@ name: 'Draw1 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -142,7 +144,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -188,6 +190,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -222,7 +225,7 @@ name: 'Draw1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -268,6 +271,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -298,7 +302,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw2.txt
index 4a3f320a..bf2b7700 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw2.txt	
@@ -48,6 +48,7 @@ name: 'Draw2 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -82,7 +83,7 @@ name: 'Draw2 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -148,6 +149,7 @@ name: 'Draw2 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -182,7 +184,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -248,6 +250,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -282,7 +285,7 @@ name: 'Draw2 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -348,6 +351,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -378,7 +382,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw3.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw3.txt
index 0ead1fc3..37de9807 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw3.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw3.txt	
@@ -28,6 +28,7 @@ name: 'Draw3 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw3'
+    layout:    '8'
     bindPoint: GRAPHICS
   ----------
 
@@ -62,7 +63,7 @@ name: 'Draw3 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -108,6 +109,7 @@ name: 'Draw3 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw3'
+    layout:    '8'
     bindPoint: GRAPHICS
   ----------
 
@@ -142,7 +144,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -188,6 +190,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw3'
+    layout:    '8'
     bindPoint: GRAPHICS
   ----------
 
@@ -222,7 +225,7 @@ name: 'Draw3 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -268,6 +271,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw3'
+    layout:    '8'
     bindPoint: GRAPHICS
   ----------
 
@@ -298,7 +302,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw4.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw4.txt
index 187fdcaa..a6e19f89 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw4.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw4.txt	
@@ -38,6 +38,7 @@ name: 'Draw4 |0| Draw task1'
 
   BindPipeline
     pipeline:  'draw4-1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -73,6 +74,7 @@ name: 'Draw4 |0| Draw task1'
 
   BindPipeline
     pipeline:  'draw4-2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -113,6 +115,7 @@ name: 'Draw4 |1| Draw task2'
 
   BindPipeline
     pipeline:  'draw4-2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -144,7 +147,7 @@ name: 'Draw4 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw5.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw5.txt
index c1c2bf15..a5dc201e 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw5.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Draw5.txt	
@@ -38,6 +38,7 @@ name: 'Draw4-pass1 |0| Draw task1'
 
   BindPipeline
     pipeline:  'draw4-1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -73,6 +74,7 @@ name: 'Draw4-pass1 |0| Draw task1'
 
   BindPipeline
     pipeline:  'draw4-2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -113,6 +115,7 @@ name: 'Draw4-pass1 |1| Draw task2'
 
   BindPipeline
     pipeline:  'draw4-2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -148,7 +151,7 @@ name: 'Draw4-pass2 |0| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawAsync1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawAsync1.txt
index 5d09e9b8..b6211422 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawAsync1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawAsync1.txt	
@@ -71,7 +71,7 @@ name: 'DrawAsync1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -160,7 +160,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -249,7 +249,7 @@ name: 'DrawAsync1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -334,7 +334,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh1.txt
index 1db93475..6709f46e 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh1.txt	
@@ -28,6 +28,7 @@ name: 'DrawMesh1 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw_mesh1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -62,7 +63,7 @@ name: 'DrawMesh1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -108,6 +109,7 @@ name: 'DrawMesh1 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw_mesh1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -142,7 +144,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -188,6 +190,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw_mesh1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -222,7 +225,7 @@ name: 'DrawMesh1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -268,6 +271,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw_mesh1'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -298,7 +302,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh2.txt
index 893fdc2f..4807d0ad 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_DrawMesh2.txt	
@@ -28,6 +28,7 @@ name: 'DrawMesh1 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw_mesh2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -62,7 +63,7 @@ name: 'DrawMesh1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -108,6 +109,7 @@ name: 'DrawMesh1 |0| Draw task'
 
   BindPipeline
     pipeline:  'draw_mesh2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -142,7 +144,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -188,6 +190,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw_mesh2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -222,7 +225,7 @@ name: 'DrawMesh1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -268,6 +271,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'draw_mesh2'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -298,7 +302,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayQuery1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayQuery1.txt
index 43409c8b..eca73749 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayQuery1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayQuery1.txt	
@@ -20,13 +20,13 @@ name: 'RayQuery1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -84,11 +84,13 @@ name: 'RayQuery1 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'rquery1.def'
+    layout:    '9'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '9'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -110,7 +112,7 @@ name: 'RayQuery1 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -148,13 +150,13 @@ name: 'RayQuery1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -212,11 +214,13 @@ name: 'RayQuery1 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'rquery1.def'
+    layout:    '9'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '9'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -238,7 +242,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -276,13 +280,13 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -335,11 +339,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rquery1.def'
+    layout:    '9'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '9'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -361,7 +367,7 @@ name: 'RayQuery1 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -399,13 +405,13 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -458,11 +464,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rquery1.def'
+    layout:    '9'
     bindPoint: COMPUTE
   ----------
 
   Dispatch
     descriptors:
+    [0] pl: '9'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -480,7 +488,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing1.txt
index 9a971633..07911d6e 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing1.txt	
@@ -20,13 +20,13 @@ name: 'RayTracing1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -84,11 +84,13 @@ name: 'RayTracing1 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -110,7 +112,7 @@ name: 'RayTracing1 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -148,13 +150,13 @@ name: 'RayTracing1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -212,11 +214,13 @@ name: 'RayTracing1 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -238,7 +242,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -276,13 +280,13 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -335,11 +339,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -361,7 +367,7 @@ name: 'RayTracing1 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -399,13 +405,13 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -458,11 +464,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -480,7 +488,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing3.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing3.txt
index d7222ea1..8b23ee95 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing3.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_RayTracing3.txt	
@@ -36,7 +36,7 @@ name: 'RayTracing1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   PipelineBarrier2
@@ -49,7 +49,7 @@ name: 'RayTracing1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -109,11 +109,13 @@ name: 'RayTracing1 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -143,7 +145,7 @@ name: 'RayTracing1 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -199,7 +201,7 @@ name: 'RayTracing1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   PipelineBarrier2
@@ -212,7 +214,7 @@ name: 'RayTracing1 |0| Upload RTAS task'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -272,11 +274,13 @@ name: 'RayTracing1 |1| Ray tracing task'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -306,7 +310,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -362,7 +366,7 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   PipelineBarrier2
@@ -375,7 +379,7 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:0} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -430,11 +434,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -464,7 +470,7 @@ name: 'RayTracing1 |2| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -520,7 +526,7 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS index buffer'
-      copy [48, 60) ---> [0, 12)
+      copy [64, 76) ---> [0, 12)
   ----------
 
   PipelineBarrier2
@@ -533,7 +539,7 @@ name: 'IndirectCmdBuffers'
   CopyBuffer
     src: 'SSWB {f:1} {q:Graphics}'
     dst: 'RTAS instance buffer'
-      copy [60, 124) ---> [0, 64)
+      copy [128, 192) ---> [0, 64)
   ----------
 
   PipelineBarrier2
@@ -588,11 +594,13 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rtrace1.def'
+    layout:    '10'
     bindPoint: RAY_TRACING
   ----------
 
   TraceRays
     descriptors:
+    [0] pl: '10'
       image: 'Image', layout: GENERAL
       accel struct: 'RT scene'
   ----------
@@ -617,7 +625,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_ShadingRate1.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_ShadingRate1.txt
index 2d6967c8..e537b1d9 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_ShadingRate1.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_ShadingRate1.txt	
@@ -17,7 +17,7 @@ name: 'Draw1 |0| Draw task'
     src:       'SSWB {f:0} {q:Graphics}'
     dst:       'VRS-image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1024) } ---> { off:(0, 0, 0), ext:(32, 32, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1024) } ---> { off:(0, 0, 0), ext:(32, 32, 1), COLOR }
   ----------
 
   PipelineBarrier2
@@ -59,6 +59,7 @@ name: 'Draw1 |0| Draw task'
 
   BindPipeline
     pipeline:  'per_draw'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -91,6 +92,7 @@ name: 'Draw1 |0| Draw task'
 
   BindPipeline
     pipeline:  'per_primitive'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -127,6 +129,7 @@ name: 'Draw1 |0| Draw task'
 
   BindPipeline
     pipeline:  'vrs_attachment'
+    layout:    '7'
     bindPoint: GRAPHICS
   ----------
 
@@ -176,21 +179,21 @@ name: 'Draw1 |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(512, 512, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1048576) }
+      copy { off:(0, 0, 0), ext:(512, 512, 1), COLOR } ---> { [0, 1048576) }
   ----------
 
   CopyImageToBuffer
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(512, 512, 1), mip:0, layers:[0, 1), COLOR } ---> { [1048576, 2097152) }
+      copy { off:(0, 0, 0), ext:(512, 512, 1), COLOR } ---> { [1048576, 2097152) }
   ----------
 
   CopyImageToBuffer
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(512, 512, 1), mip:0, layers:[0, 1), COLOR } ---> { [2097152, 3145728) }
+      copy { off:(0, 0, 0), ext:(512, 512, 1), COLOR } ---> { [2097152, 3145728) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_UploadStream2.txt b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_UploadStream2.txt
index b2791a1e..40d65489 100644
--- a/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_UploadStream2.txt	
+++ b/AE/engine/tests/graphics/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_UploadStream2.txt	
@@ -17,7 +17,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 0, 0), ext:(4096, 64, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 0, 0), ext:(4096, 64, 1), COLOR }
   ----------
 
 }
@@ -35,7 +35,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 64, 0), ext:(4096, 128, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 64, 0), ext:(4096, 128, 1), COLOR }
   ----------
 
 }
@@ -53,7 +53,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 128, 0), ext:(4096, 192, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 128, 0), ext:(4096, 192, 1), COLOR }
   ----------
 
 }
@@ -71,7 +71,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 192, 0), ext:(4096, 256, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 192, 0), ext:(4096, 256, 1), COLOR }
   ----------
 
 }
@@ -89,7 +89,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 256, 0), ext:(4096, 320, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 256, 0), ext:(4096, 320, 1), COLOR }
   ----------
 
 }
@@ -107,7 +107,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 320, 0), ext:(4096, 384, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 320, 0), ext:(4096, 384, 1), COLOR }
   ----------
 
 }
@@ -125,7 +125,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 384, 0), ext:(4096, 448, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 384, 0), ext:(4096, 448, 1), COLOR }
   ----------
 
 }
@@ -143,7 +143,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 448, 0), ext:(4096, 512, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 448, 0), ext:(4096, 512, 1), COLOR }
   ----------
 
 }
@@ -161,7 +161,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 512, 0), ext:(4096, 576, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 512, 0), ext:(4096, 576, 1), COLOR }
   ----------
 
 }
@@ -179,7 +179,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 576, 0), ext:(4096, 640, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 576, 0), ext:(4096, 640, 1), COLOR }
   ----------
 
 }
@@ -197,7 +197,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 640, 0), ext:(4096, 704, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 640, 0), ext:(4096, 704, 1), COLOR }
   ----------
 
 }
@@ -215,7 +215,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 704, 0), ext:(4096, 768, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 704, 0), ext:(4096, 768, 1), COLOR }
   ----------
 
 }
@@ -233,7 +233,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 768, 0), ext:(4096, 832, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 768, 0), ext:(4096, 832, 1), COLOR }
   ----------
 
 }
@@ -251,7 +251,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 832, 0), ext:(4096, 896, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 832, 0), ext:(4096, 896, 1), COLOR }
   ----------
 
 }
@@ -269,7 +269,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 896, 0), ext:(4096, 960, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 896, 0), ext:(4096, 960, 1), COLOR }
   ----------
 
 }
@@ -287,7 +287,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 960, 0), ext:(4096, 1024, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 960, 0), ext:(4096, 1024, 1), COLOR }
   ----------
 
 }
@@ -305,7 +305,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1024, 0), ext:(4096, 1088, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1024, 0), ext:(4096, 1088, 1), COLOR }
   ----------
 
 }
@@ -323,7 +323,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1088, 0), ext:(4096, 1152, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1088, 0), ext:(4096, 1152, 1), COLOR }
   ----------
 
 }
@@ -341,7 +341,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1152, 0), ext:(4096, 1216, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1152, 0), ext:(4096, 1216, 1), COLOR }
   ----------
 
 }
@@ -359,7 +359,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1216, 0), ext:(4096, 1280, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1216, 0), ext:(4096, 1280, 1), COLOR }
   ----------
 
 }
@@ -377,7 +377,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1280, 0), ext:(4096, 1344, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1280, 0), ext:(4096, 1344, 1), COLOR }
   ----------
 
 }
@@ -395,7 +395,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1344, 0), ext:(4096, 1408, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1344, 0), ext:(4096, 1408, 1), COLOR }
   ----------
 
 }
@@ -413,7 +413,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1408, 0), ext:(4096, 1472, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1408, 0), ext:(4096, 1472, 1), COLOR }
   ----------
 
 }
@@ -431,7 +431,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1472, 0), ext:(4096, 1536, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1472, 0), ext:(4096, 1536, 1), COLOR }
   ----------
 
 }
@@ -449,7 +449,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1536, 0), ext:(4096, 1600, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1536, 0), ext:(4096, 1600, 1), COLOR }
   ----------
 
 }
@@ -467,7 +467,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1600, 0), ext:(4096, 1664, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1600, 0), ext:(4096, 1664, 1), COLOR }
   ----------
 
 }
@@ -485,7 +485,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1664, 0), ext:(4096, 1728, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1664, 0), ext:(4096, 1728, 1), COLOR }
   ----------
 
 }
@@ -503,7 +503,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1728, 0), ext:(4096, 1792, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1728, 0), ext:(4096, 1792, 1), COLOR }
   ----------
 
 }
@@ -521,7 +521,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1792, 0), ext:(4096, 1856, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1792, 0), ext:(4096, 1856, 1), COLOR }
   ----------
 
 }
@@ -539,7 +539,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1856, 0), ext:(4096, 1920, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1856, 0), ext:(4096, 1920, 1), COLOR }
   ----------
 
 }
@@ -557,7 +557,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1920, 0), ext:(4096, 1984, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1920, 0), ext:(4096, 1984, 1), COLOR }
   ----------
 
 }
@@ -575,7 +575,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 1984, 0), ext:(4096, 2048, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 1984, 0), ext:(4096, 2048, 1), COLOR }
   ----------
 
 }
@@ -593,7 +593,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2048, 0), ext:(4096, 2112, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2048, 0), ext:(4096, 2112, 1), COLOR }
   ----------
 
 }
@@ -611,7 +611,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2112, 0), ext:(4096, 2176, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2112, 0), ext:(4096, 2176, 1), COLOR }
   ----------
 
 }
@@ -629,7 +629,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2176, 0), ext:(4096, 2240, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2176, 0), ext:(4096, 2240, 1), COLOR }
   ----------
 
 }
@@ -647,7 +647,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2240, 0), ext:(4096, 2304, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2240, 0), ext:(4096, 2304, 1), COLOR }
   ----------
 
 }
@@ -665,7 +665,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2304, 0), ext:(4096, 2368, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2304, 0), ext:(4096, 2368, 1), COLOR }
   ----------
 
 }
@@ -683,7 +683,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2368, 0), ext:(4096, 2432, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2368, 0), ext:(4096, 2432, 1), COLOR }
   ----------
 
 }
@@ -701,7 +701,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2432, 0), ext:(4096, 2496, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2432, 0), ext:(4096, 2496, 1), COLOR }
   ----------
 
 }
@@ -719,7 +719,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2496, 0), ext:(4096, 2560, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2496, 0), ext:(4096, 2560, 1), COLOR }
   ----------
 
 }
@@ -737,7 +737,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2560, 0), ext:(4096, 2624, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2560, 0), ext:(4096, 2624, 1), COLOR }
   ----------
 
 }
@@ -755,7 +755,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2624, 0), ext:(4096, 2688, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2624, 0), ext:(4096, 2688, 1), COLOR }
   ----------
 
 }
@@ -773,7 +773,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2688, 0), ext:(4096, 2752, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2688, 0), ext:(4096, 2752, 1), COLOR }
   ----------
 
 }
@@ -791,7 +791,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2752, 0), ext:(4096, 2816, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2752, 0), ext:(4096, 2816, 1), COLOR }
   ----------
 
 }
@@ -809,7 +809,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2816, 0), ext:(4096, 2880, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2816, 0), ext:(4096, 2880, 1), COLOR }
   ----------
 
 }
@@ -827,7 +827,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2880, 0), ext:(4096, 2944, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2880, 0), ext:(4096, 2944, 1), COLOR }
   ----------
 
 }
@@ -845,7 +845,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 2944, 0), ext:(4096, 3008, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 2944, 0), ext:(4096, 3008, 1), COLOR }
   ----------
 
 }
@@ -863,7 +863,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3008, 0), ext:(4096, 3072, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3008, 0), ext:(4096, 3072, 1), COLOR }
   ----------
 
 }
@@ -881,7 +881,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3072, 0), ext:(4096, 3136, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3072, 0), ext:(4096, 3136, 1), COLOR }
   ----------
 
 }
@@ -899,7 +899,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3136, 0), ext:(4096, 3200, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3136, 0), ext:(4096, 3200, 1), COLOR }
   ----------
 
 }
@@ -917,7 +917,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3200, 0), ext:(4096, 3264, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3200, 0), ext:(4096, 3264, 1), COLOR }
   ----------
 
 }
@@ -935,7 +935,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3264, 0), ext:(4096, 3328, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3264, 0), ext:(4096, 3328, 1), COLOR }
   ----------
 
 }
@@ -953,7 +953,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3328, 0), ext:(4096, 3392, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3328, 0), ext:(4096, 3392, 1), COLOR }
   ----------
 
 }
@@ -971,7 +971,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3392, 0), ext:(4096, 3456, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3392, 0), ext:(4096, 3456, 1), COLOR }
   ----------
 
 }
@@ -989,7 +989,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3456, 0), ext:(4096, 3520, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3456, 0), ext:(4096, 3520, 1), COLOR }
   ----------
 
 }
@@ -1007,7 +1007,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3520, 0), ext:(4096, 3584, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3520, 0), ext:(4096, 3584, 1), COLOR }
   ----------
 
 }
@@ -1025,7 +1025,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3584, 0), ext:(4096, 3648, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3584, 0), ext:(4096, 3648, 1), COLOR }
   ----------
 
 }
@@ -1043,7 +1043,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3648, 0), ext:(4096, 3712, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3648, 0), ext:(4096, 3712, 1), COLOR }
   ----------
 
 }
@@ -1061,7 +1061,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3712, 0), ext:(4096, 3776, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3712, 0), ext:(4096, 3776, 1), COLOR }
   ----------
 
 }
@@ -1079,7 +1079,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3776, 0), ext:(4096, 3840, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3776, 0), ext:(4096, 3840, 1), COLOR }
   ----------
 
 }
@@ -1097,7 +1097,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3840, 0), ext:(4096, 3904, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3840, 0), ext:(4096, 3904, 1), COLOR }
   ----------
 
 }
@@ -1115,7 +1115,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3904, 0), ext:(4096, 3968, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3904, 0), ext:(4096, 3968, 1), COLOR }
   ----------
 
 }
@@ -1133,7 +1133,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 3968, 0), ext:(4096, 4032, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 3968, 0), ext:(4096, 4032, 1), COLOR }
   ----------
 
 }
@@ -1151,7 +1151,7 @@ name: 'UploadStream2 |0| test task'
     src:       'dynamic staging buffer'
     dst:       'image'
     dstLayout: TRANSFER_DST_OPTIMAL
-      copy { [0, 1048576) } ---> { off:(0, 4032, 0), ext:(4096, 4096, 1), mip:0, layers:[0, 1), COLOR }
+      copy { [0, 1048576) } ---> { off:(0, 4032, 0), ext:(4096, 4096, 1), COLOR }
   ----------
 
 }
diff --git a/AE/engine/tests/graphics/main.cpp b/AE/engine/tests/graphics/main.cpp
index 24130ce8..d5d1447b 100644
--- a/AE/engine/tests/graphics/main.cpp
+++ b/AE/engine/tests/graphics/main.cpp
@@ -24,7 +24,7 @@ extern void UnitTest_PixelFormat ();
     extern void Test_MetalRenderGraph (IApplication &app, IWindow &wnd);
 
 #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-    extern void Test_RemoteDevice ();
+    extern void Test_RemoteDevice (IApplication &, IWindow &wnd);
     extern void Test_RemoteRenderGraph (IApplication &app, IWindow &wnd);
 
 #else
@@ -55,7 +55,7 @@ static void  RenderTests (IApplication &app, IWindow &wnd)
         Test_MetalRenderGraph( app, wnd );
 
     #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
-        //Test_RemoteDevice();
+        //Test_RemoteDevice( app, wnd );
         Test_RemoteRenderGraph( app, wnd );
 
     #else
@@ -67,9 +67,18 @@ static void  RenderTests (IApplication &app, IWindow &wnd)
 #ifdef AE_PLATFORM_ANDROID
 extern int Test_Graphics (IApplication &app, IWindow &wnd)
 {
+    TaskScheduler::InstanceCtor::Create();
+
+    TaskScheduler::Config   cfg;
+    cfg.mainThreadCoreId    = ECpuCoreId(0);
+    CHECK_FATAL( Scheduler().Setup( cfg ));
+
     UnitTests();
     RenderTests( app, wnd );
 
+    Scheduler().Release();
+    TaskScheduler::InstanceCtor::Destroy();
+
     AE_LOGI( "Tests.Graphics finished" );
     return 0;
 }
@@ -81,7 +90,7 @@ extern int Test_Graphics (IApplication &app, IWindow &wnd)
         IApplication&   _app;
 
     public:
-        WndListener (IApplication &app) : _app{app} {}
+        WndListener (IApplication &app)             __NE___ : _app{app} {}
         ~WndListener ()                             __NE_OV {}
 
         void OnStateChanged (IWindow &, EState)     __NE_OV {}
@@ -103,18 +112,29 @@ extern int Test_Graphics (IApplication &app, IWindow &wnd)
         WindowPtr   _window;
 
     public:
-        AppListener ()
+        AppListener ()                              __NE___
         {
-            TaskScheduler::CreateInstance();
+            TaskScheduler::InstanceCtor::Create();
 
             TaskScheduler::Config   cfg;
+            cfg.mainThreadCoreId    = ECpuCoreId(0);
+
             CHECK_FATAL( Scheduler().Setup( cfg ));
+
+          #ifdef AE_ENABLE_REMOTE_GRAPHICS
+            CHECK_FATAL( Networking::SocketService::Instance().Initialize() );
+          #endif
         }
 
         ~AppListener ()                             __NE_OV
         {
             Scheduler().Release();
-            TaskScheduler::DestroyInstance();
+
+          #ifdef AE_ENABLE_REMOTE_GRAPHICS
+            Networking::SocketService::Instance().Deinitialize();
+          #endif
+
+            TaskScheduler::InstanceCtor::Destroy();
         }
 
         void  OnStart (IApplication &app)           __NE_OV
@@ -140,7 +160,6 @@ extern int Test_Graphics (IApplication &app, IWindow &wnd)
     Unique<IApplication::IAppListener>  AE_OnAppCreated ()
     {
         StaticLogger::InitDefault();
-        //StaticLogger::AddLogger( ILogger::CreateHtmlOutput( "log.html" ));
 
         return MakeUnique<AppListener>();
     }
diff --git a/AE/engine/tests/graphics_hl/CMakeLists.txt b/AE/engine/tests/graphics_hl/CMakeLists.txt
index 8d9e6c3f..6a30e6f2 100644
--- a/AE/engine/tests/graphics_hl/CMakeLists.txt
+++ b/AE/engine/tests/graphics_hl/CMakeLists.txt
@@ -38,8 +38,15 @@ if (TARGET "GraphicsHL")
         add_dependencies( "PACK_RES" "Tests.GraphicsHL.PackRes" )
     endif()
 
-    if (${AE_ENABLE_VULKAN})
+    if (DEFINED ANDROID AND ${AE_ENABLE_VULKAN})
         target_compile_definitions( "Tests.GraphicsHL" PRIVATE
+            AE_REFDUMP_PATH="tests_graphicshl_vulkan_refdump"
+            AE_REF_IMG_PATH="tests_graphicshl_vulkan_refimg"
+            AE_RES_PACK="pipelines.bin" )
+
+    elseif (${AE_ENABLE_VULKAN} OR ${AE_ENABLE_REMOTE_GRAPHICS})
+        target_compile_definitions( "Tests.GraphicsHL" PRIVATE
+            AE_REFDUMP_PATH="${CMAKE_CURRENT_SOURCE_DIR}/Vulkan/ref"
             AE_REF_IMG_PATH="${AE_EXTERNAL_REP_PATH}/tests/graphics_hl/vulkan"
             AE_RES_PACK="${AE_TEMP_FOLDER}/engine/graphics_hl/vk/pipelines.bin" )
 
diff --git a/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.cpp b/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.cpp
index b9802a94..3cebf9ad 100644
--- a/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.cpp
+++ b/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.cpp
@@ -16,6 +16,7 @@
 using namespace AE::App;
 using namespace AE::Threading;
 
+static constexpr uint  c_MaxRenderThreads = 3;
 
 /*
 =================================================
@@ -36,15 +37,7 @@ extern void Test_DrawTests (IApplication &app, IWindow &wnd)
 =================================================
 */
 DrawTestCore::DrawTestCore () :
-    #if defined(AE_ENABLE_VULKAN)
-        _refDumpPath{ AE_CURRENT_DIR "/Vulkan/ref" },
-        _vulkan{ True{"enable info log"} }
-    #elif defined(AE_ENABLE_METAL)
-        _refDumpPath{ AE_CURRENT_DIR "/Metal/ref" },
-        _metal{ True{"enable info log"} }
-    #else
-    #   error not implemented
-    #endif
+    _device{ True{"enable info log"} }
 {
     _tests.emplace_back( &DrawTestCore::Test_Canvas_Rect );
 }
@@ -58,6 +51,16 @@ bool  DrawTestCore::Run (IApplication &app, IWindow &wnd)
 {
     CHECK_ERR( _Create( app, wnd ));
 
+    for (uint i = 0; i < c_MaxRenderThreads; ++i) {
+        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
+                EThreadArray{ EThread::PerFrame, EThread::Renderer },
+                "render thread"s << ToString(i)
+            }));
+    }
+    CHECK_ERR( _CompilePipelines( app ));
+
+    _canvas.reset( new Canvas{} );
+
     bool    result = _RunTests();
 
     _Destroy();
@@ -65,6 +68,29 @@ bool  DrawTestCore::Run (IApplication &app, IWindow &wnd)
     return result;
 }
 
+/*
+=================================================
+    _Destroy
+=================================================
+*/
+void  DrawTestCore::_Destroy ()
+{
+  #ifdef AE_ENABLE_VULKAN
+    _syncLog.Deinitialize( INOUT _device.EditDeviceFnTable() );
+  #endif
+
+    _canvasPpln = null;
+    _canvas.reset();
+
+    _swapchain.Destroy();
+    _swapchain.DestroySurface();
+
+    RenderTaskScheduler::InstanceCtor::Destroy();
+
+    CHECK( _device.DestroyLogicalDevice() );
+    CHECK( _device.DestroyInstance() );
+}
+
 /*
 =================================================
     _LoadReference
@@ -74,14 +100,22 @@ Unique<ImageComparator>  DrawTestCore::_LoadReference (StringView name) const
 {
     Unique<ImageComparator> img_cmp{ new ImageComparator{} };
 
-    Path    path{ AE_REF_IMG_PATH };
-    FileSystem::CreateDirectories( path );
-
-    path.append( name );
-    path.replace_extension( "dds" );
+    const Path  path = (_refImagePath / name).replace_extension( "dds" );
 
-    img_cmp->LoadReference( RVRef(path) );
+    RC<RStream> rfile;
+    if ( _refImageStorage->Open( OUT rfile, VFS::FileName{path.string()} ))
+    {
+        img_cmp->LoadReference( RVRef(rfile), path );
+    }
+    else
+    {
+        VFS::FileName   fname;
+        CHECK_ERR( _refImageStorage->CreateFile( fname, path ));
 
+        RC<WStream>     wfile;
+        if ( _refImageStorage->Open( OUT wfile, fname ))
+            img_cmp->Reset( RVRef(wfile), path );
+    }
     return img_cmp;
 }
 
@@ -90,22 +124,22 @@ Unique<ImageComparator>  DrawTestCore::_LoadReference (StringView name) const
     SaveImage
 =================================================
 */
-bool  DrawTestCore::SaveImage (StringView name, const ImageMemView &view)
+bool  DrawTestCore::SaveImage (StringView name, const ImageMemView &view) const
 {
     using namespace AE::ResLoader;
 
-    Path    path{ AE_CURRENT_DIR };
-    path.append( "vulkan/img" );
+    const Path  path = (_refImagePath / name).replace_extension( "dds" );
 
-    FileSystem::CreateDirectories( path );
+    VFS::FileName   fname;
+    CHECK_ERR( _refImageStorage->CreateFile( fname, path ));
 
-    path.append( name );
-    path.replace_extension( "dds" );
+    RC<WStream>     wfile;
+    CHECK_ERR( _refImageStorage->Open( OUT wfile, fname ));
 
     DDSImageSaver   saver;
     IntermImage     img;    CHECK( img.SetData( view, null ));
 
-    CHECK_ERR( saver.SaveImage( path, img ));
+    CHECK_ERR( Cast<IImageSaver>(&saver)->SaveImage( *wfile, img, EImageFormat::DDS ));
     return true;
 }
 
@@ -114,13 +148,22 @@ bool  DrawTestCore::SaveImage (StringView name, const ImageMemView &view)
     _CompilePipelines
 =================================================
 */
-bool  DrawTestCore::_CompilePipelines ()
+bool  DrawTestCore::_CompilePipelines (IApplication &app)
 {
-    auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+    auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
     {
-        auto    file = MakeRC<FileRStream>( AE_RES_PACK );
+    #ifdef AE_PLATFORM_ANDROID
+        auto    storage = app.OpenStorage( EAppStorage::Builtin );
+        CHECK_ERR( storage );
+
+        RC<RStream> file;
+        CHECK_ERR( storage->Open( OUT file, VFS::FileName{AE_RES_PACK} ));
+    #else
+        RC<RStream> file = MakeRC<FileRStream>( AE_RES_PACK );
         CHECK_ERR( file->IsOpen() );
+        Unused( app );
+    #endif
 
         PipelinePackDesc    desc;
         desc.stream         = file;
@@ -153,6 +196,8 @@ GraphicsCreateInfo  DrawTestCore::_GetGraphicsCreateInfo ()
     info.staging.dynamicBlockSize       = 4_Mb;
     info.staging.vstreamSize            = 4_Mb;
 
+    info.swapchain.colorFormat  = EPixelFormat::RGBA8_UNorm;
+
     info.useRenderGraph = true;
 
     return info;
@@ -170,55 +215,64 @@ bool  DrawTestCore::_Create (IApplication &app, IWindow &wnd)
 {
     VDeviceInitializer::InstanceCreateInfo  inst_ci;
     inst_ci.appName             = "TestApp";
-    inst_ci.instanceLayers      = _vulkan.GetRecommendedInstanceLayers();
+    inst_ci.instanceLayers      = _device.GetRecommendedInstanceLayers();
     inst_ci.instanceExtensions  = app.GetVulkanInstanceExtensions();
-    inst_ci.version             = {1,2};
+    inst_ci.version             = {1,3};
 
-    CHECK_ERR( _vulkan.CreateInstance( inst_ci ));
+    CHECK_ERR( _device.CreateInstance( inst_ci ));
 
     // this is a test and the test should fail for any validation error
-    _vulkan.CreateDebugCallback( DefaultDebugMessageSeverity,
+    _device.CreateDebugCallback( DefaultDebugMessageSeverity,
                                  [] (const VDeviceInitializer::DebugReport &rep) { AE_LOG_SE(rep.message);  CHECK_FATAL(not rep.isError); });
 
-    CHECK_ERR( _vulkan.ChooseHighPerformanceDevice() );
-    CHECK_ERR( _vulkan.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
-    CHECK_ERR( _vulkan.CreateLogicalDevice() );
-    CHECK_ERR( _vulkan.CheckConstantLimits() );
-    CHECK_ERR( _vulkan.CheckExtensions() );
-
-    _refDumpPath /= _vulkan.GetDeviceName();
-    FileSystem::CreateDirectories( _refDumpPath );
+    CHECK_ERR( _device.ChooseHighPerformanceDevice() );
+    CHECK_ERR( _device.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
+    CHECK_ERR( _device.CreateLogicalDevice() );
+    CHECK_ERR( _device.CheckConstantLimits() );
+    CHECK_ERR( _device.CheckExtensions() );
 
     {
         FlatHashMap<VkQueue, String>    qnames;
-        for (auto& q : _vulkan.GetQueues()) {
+        for (auto& q : _device.GetQueues()) {
             qnames.emplace( q.handle, q.debugName );
         }
-        _syncLog.Initialize( INOUT _vulkan.EditDeviceFnTable(), RVRef(qnames) );
+        _syncLog.Initialize( INOUT _device.EditDeviceFnTable(), RVRef(qnames) );
     }
 
-    VRenderTaskScheduler::CreateInstance( _vulkan );
+    RenderTaskScheduler::InstanceCtor::Create( _device );
 
     const GraphicsCreateInfo    info = _GetGraphicsCreateInfo();
 
-    auto&   rts = RenderTaskScheduler();
+    auto&   rts = GraphicsScheduler();
     CHECK_ERR( rts.Initialize( info ));
 
     CHECK_ERR( _swapchain.CreateSurface( wnd.GetNative() ));
     CHECK_ERR( rts.GetResourceManager().OnSurfaceCreated( _swapchain ));
 
-    VSwapchainInitializer::VSwapchainDesc   swapchain_ci;
-    swapchain_ci.viewSize = wnd.GetSurfaceSize();
-    CHECK_ERR( _swapchain.Create( swapchain_ci ));
-
-    _canvas.reset( new Canvas{} );
-
-    Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
-            EThreadArray{ EThread::PerFrame, EThread::Renderer },
-            "render thread"
-        }));
-
-    CHECK_ERR( _CompilePipelines() );
+  #ifdef AE_PLATFORM_ANDROID
+    // android tests executed in separate thread and can not access to window size
+    CHECK_ERR( _swapchain.Create( uint2{800,600}, info.swapchain ));
+  #else
+    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), info.swapchain ));
+  #endif
+
+  #ifdef AE_PLATFORM_ANDROID
+    _refDumpStorage = app.OpenStorage( EAppStorage::Cache );
+    _refDumpPath    = Path{AE_REFDUMP_PATH} / _device.GetDeviceName();
+  #else
+    _refDumpStorage = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REFDUMP_PATH, Default, True{"createFolder"} );
+    _refDumpPath    = _device.GetDeviceName();
+  #endif
+    CHECK_ERR( _refDumpStorage );
+
+  #ifdef AE_PLATFORM_ANDROID
+    _refImageStorage    = app.OpenStorage( EAppStorage::Cache );
+    _refImagePath       = Path{AE_REF_IMG_PATH} / _device.GetDeviceName();
+  #else
+    _refImageStorage    = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REF_IMG_PATH, Default, True{"createFolder"} );
+    _refImagePath       = _device.GetDeviceName();
+  #endif
+    CHECK_ERR( _refImageStorage );
 
     return true;
 }
@@ -245,7 +299,7 @@ bool  DrawTestCore::_RunTests ()
             _testsFailed += uint(not passed);
             _tests.pop_front();
 
-            Scheduler().ProcessTask( ETaskQueue::Main, 0 );
+            Scheduler().ProcessTask( ETaskQueue::Main, EThreadSeed(0) );
         }
         else
         {
@@ -256,27 +310,6 @@ bool  DrawTestCore::_RunTests ()
     return not _testsFailed;
 }
 
-/*
-=================================================
-    _Destroy
-=================================================
-*/
-void  DrawTestCore::_Destroy ()
-{
-    _syncLog.Deinitialize( INOUT _vulkan.EditDeviceFnTable() );
-
-    _canvasPpln = null;
-    _canvas.reset();
-
-    _swapchain.Destroy();
-    _swapchain.DestroySurface();
-
-    VRenderTaskScheduler::DestroyInstance();
-
-    CHECK( _vulkan.DestroyLogicalDevice() );
-    CHECK( _vulkan.DestroyInstance() );
-}
-
 /*
 =================================================
     _CompareDumps
@@ -284,7 +317,8 @@ void  DrawTestCore::_Destroy ()
 */
 bool  DrawTestCore::_CompareDumps (StringView filename) const
 {
-    Path    fname = _refDumpPath;   fname.append( String{filename} << ".txt" );
+    Path    fname = _refDumpPath;
+    fname.append( String{filename} << ".txt" );
 
     String  right;
     _syncLog.GetLog( OUT right );
@@ -292,18 +326,23 @@ bool  DrawTestCore::_CompareDumps (StringView filename) const
     // override dump
     if ( UpdateAllReferenceDumps )
     {
-        FileWStream     wfile{ fname };
-        CHECK_ERR( wfile.IsOpen() );
-        CHECK_ERR( wfile.Write( StringView{right} ));
+        VFS::FileName   name;
+        CHECK_ERR( _refDumpStorage->CreateFile( name, fname ));
+
+        RC<WStream>     wfile;
+        CHECK_ERR( _refDumpStorage->Open( OUT wfile, name ));
+
+        CHECK_ERR( wfile->Write( StringView{right} ));
         return true;
     }
 
     // read from file
     String  left;
     {
-        FileRStream     rfile{ fname };
-        CHECK_ERR( rfile.IsOpen() );
-        CHECK_ERR( rfile.Read( usize(rfile.Size()), OUT left ));
+        RC<RStream>     rfile;
+        CHECK_ERR( _refDumpStorage->Open( OUT rfile, VFS::FileName{fname.string()} ));
+
+        CHECK_ERR( rfile->Read( usize(rfile->Size()), OUT left ));
     }
 
     return Parser::CompareLineByLine( left, right,
@@ -330,34 +369,96 @@ bool  DrawTestCore::_CompareDumps (StringView filename) const
 */
 bool  DrawTestCore::_Create (IApplication &, IWindow &wnd)
 {
-    CHECK_ERR( _metal.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
-    CHECK_ERR( _metal.CreateLogicalDevice() );
-    CHECK_ERR( _metal.CheckConstantLimits() );
-    CHECK_ERR( _metal.CheckExtensions() );
+    CHECK_ERR( _device.CreateDefaultQueues( EQueueMask::Graphics, EQueueMask::All ));
+    CHECK_ERR( _device.CreateLogicalDevice() );
+    CHECK_ERR( _device.CheckConstantLimits() );
+    CHECK_ERR( _device.CheckExtensions() );
 
-    MRenderTaskScheduler::CreateInstance( _metal );
+    RenderTaskScheduler::InstanceCtor::Create( _device );
 
     const GraphicsCreateInfo    info = _GetGraphicsCreateInfo();
 
-    auto&   rts = RenderTaskScheduler();
+    auto&   rts = GraphicsScheduler();
     CHECK_ERR( rts.Initialize( info ));
 
     CHECK_ERR( _swapchain.CreateSurface( wnd.GetNative() ));
     CHECK_ERR( rts.GetResourceManager().OnSurfaceCreated( _swapchain ));
+    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), info.swapchain ));
+
+    _refImageStorage    = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REF_IMG_PATH, Default, True{"createFolder"} );
+    _refImagePath       = _device.GetDeviceName();
+    CHECK_ERR( _refImageStorage );
+
+    return true;
+}
+#endif // AE_ENABLE_METAL
+//-----------------------------------------------------------------------------
+
+
+
+#ifdef AE_ENABLE_REMOTE_GRAPHICS
+/*
+=================================================
+    _Create
+=================================================
+*/
+bool  DrawTestCore::_Create (IApplication &, IWindow &wnd)
+{
+    using namespace AE::Networking;
+
+    class ServerProvider final : public IServerProvider
+    {
+        IpAddress   _addr4;
+
+    public:
+        ServerProvider (const IpAddress &addr4) __NE___ : _addr4{addr4} {}
+
+        void  GetAddress (EChannel, uint, Bool, OUT IpAddress &addr)    __NE_OV { addr = _addr4; }
+        void  GetAddress (EChannel, uint, Bool, OUT IpAddress6 &)       __NE_OV {}
+    };
+
+    GraphicsCreateInfo  info = _GetGraphicsCreateInfo();
+
+    info.device.appName         = "TestApp";
+    info.device.requiredQueues  = EQueueMask::Graphics;
+    info.device.optionalQueues  = EQueueMask::All;
+    info.device.validation      = EDeviceValidation::Enabled;
+
+    info.swapchain.colorFormat  = EPixelFormat::RGBA8_UNorm;
+    info.swapchain.usage        = EImageUsage::ColorAttachment | EImageUsage::Sampled | EImageUsage::TransferDst;
+    info.swapchain.options      = EImageOpt::BlitDst;
+    info.swapchain.presentMode  = EPresentMode::FIFO;
+    info.swapchain.minImageCount= 2;
 
-    SwapchainDesc   swapchain_ci;
-    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), swapchain_ci ));
+    CHECK_ERR( _device.Init( info,
+                             MakeRC<ServerProvider>( IpAddress::FromLocalPortTCP( _serverPort )),
+                             EThreadArray{ EThread::Main, EThread::PerFrame, EThread::Renderer }
+                            ));
 
-    Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
-            EThreadArray{ EThread::PerFrame, EThread::Renderer },
-            "render thread"
-        }));
+    CHECK_ERR( _device.CheckConstantLimits() );
+    CHECK_ERR( _device.CheckExtensions() );
 
-    CHECK_ERR( _CompilePipelines() );
+    RenderTaskScheduler::InstanceCtor::Create( _device );
+
+    auto&   rts = GraphicsScheduler();
+    CHECK_ERR( rts.Initialize( info ));
+
+    CHECK_ERR( _swapchain.CreateSurface( wnd.GetNative() ));
+    CHECK_ERR( rts.GetResourceManager().OnSurfaceCreated( _swapchain ));
+    CHECK_ERR( _swapchain.Create( wnd.GetSurfaceSize(), info.swapchain ));
+
+    _refImageStorage    = VFS::VirtualFileStorageFactory::CreateDynamicFolder( AE_REF_IMG_PATH, Default, True{"createFolder"} );
+    _refImagePath       = _device.GetDeviceName();
+    CHECK_ERR( _refImageStorage );
 
     return true;
 }
+#endif // AE_ENABLE_REMOTE_GRAPHICS
+//-----------------------------------------------------------------------------
 
+
+
+#if defined(AE_ENABLE_METAL) or defined(AE_ENABLE_REMOTE_GRAPHICS)
 /*
 =================================================
     _RunTests
@@ -387,24 +488,6 @@ bool  DrawTestCore::_RunTests ()
     return not _testsFailed;
 }
 
-/*
-=================================================
-    _Destroy
-=================================================
-*/
-void  DrawTestCore::_Destroy ()
-{
-    _canvasPpln = null;
-    _canvas.reset();
-
-    _swapchain.Destroy();
-    _swapchain.DestroySurface();
-
-    MRenderTaskScheduler::DestroyInstance();
-
-    CHECK( _metal.DestroyLogicalDevice() );
-}
-
 /*
 =================================================
     _CompareDumps
@@ -415,5 +498,5 @@ bool  DrawTestCore::_CompareDumps (StringView) const
     return true;    // not supported for Metal
 }
 
-#endif // AE_ENABLE_METAL
+#endif // AE_ENABLE_METAL or AE_ENABLE_REMOTE_GRAPHICS
 
diff --git a/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.h b/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.h
index b4a77339..f07e88b3 100644
--- a/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.h
+++ b/AE/engine/tests/graphics_hl/DrawTests/DrawTestCore.h
@@ -11,6 +11,7 @@
 #include "graphics_test/GraphicsTest.h"
 
 using namespace AE;
+using namespace AE::Threading;
 using namespace AE::Graphics;
 
 #ifdef AE_ENABLE_VULKAN
@@ -21,6 +22,9 @@ using EStatus = AE::Threading::IAsyncTask::EStatus;
 
 using ImageComparator = GraphicsTest::ImageComparator;
 
+static constexpr seconds    c_MaxTimeout    {100};
+static const EThreadArray   c_ThreadArr     {EThread::PerFrame, EThread::Renderer};
+
 
 class DrawTestCore
 {
@@ -28,6 +32,7 @@ class DrawTestCore
 protected:
     using TestFunc_t    = bool (DrawTestCore::*) ();
     using TestQueue_t   = Deque< TestFunc_t >;
+    using FStorage_t    = RC<AE::VFS::IVirtualFileStorage>;
 
     static constexpr bool   UpdateAllReferenceDumps = true;
 
@@ -41,17 +46,25 @@ class DrawTestCore
     uint                        _testsPassed        = 0;
     uint                        _testsFailed        = 0;
 
-    Path                        _refDumpPath;
+    FStorage_t                  _refImageStorage;
+    Path                        _refImagePath;
 
   #if defined(AE_ENABLE_VULKAN)
-    VDeviceInitializer          _vulkan;
+    FStorage_t                  _refDumpStorage;
+    Path                        _refDumpPath;
+    VDeviceInitializer          _device;
     VSwapchainInitializer       _swapchain;
     VulkanSyncLog               _syncLog;
 
   #elif defined(AE_ENABLE_METAL)
-    MDeviceInitializer          _metal;
+    MDeviceInitializer          _device;
     MSwapchainInitializer       _swapchain;
 
+  #elif defined(AE_ENABLE_REMOTE_GRAPHICS)
+    RDeviceInitializer          _device;
+    RSwapchainInitializer       _swapchain;
+    const ushort                _serverPort     = 3000;
+
   #else
   # error not implemented
   #endif
@@ -64,7 +77,7 @@ class DrawTestCore
 
     bool  Run (AE::App::IApplication &app, AE::App::IWindow &wnd);
 
-    static bool  SaveImage (StringView name, const ImageMemView &view);
+    bool  SaveImage (StringView name, const ImageMemView &view) const;
 
 protected:
     ND_ Unique<ImageComparator>  _LoadReference (StringView filename) const;
@@ -73,7 +86,7 @@ class DrawTestCore
     ND_ bool  _RunTests ();
         void  _Destroy ();
 
-    ND_ bool  _CompilePipelines ();
+    ND_ bool  _CompilePipelines (AE::App::IApplication &app);
     ND_ bool  _CompareDumps (StringView filename) const;
 
     ND_ static GraphicsCreateInfo  _GetGraphicsCreateInfo ();
diff --git a/AE/engine/tests/graphics_hl/DrawTests/Test_Canvas_Rect.cpp b/AE/engine/tests/graphics_hl/DrawTests/Test_Canvas_Rect.cpp
index 204081cd..b79225f7 100644
--- a/AE/engine/tests/graphics_hl/DrawTests/Test_Canvas_Rect.cpp
+++ b/AE/engine/tests/graphics_hl/DrawTests/Test_Canvas_Rect.cpp
@@ -37,7 +37,7 @@ namespace
     public:
         CR1_TestData&   t;
 
-        CR1_DrawTask (CR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        CR1_DrawTask (CR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t }
         {}
@@ -104,7 +104,7 @@ namespace
     public:
         CR1_TestData&   t;
 
-        CR1_CopyTask (CR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) :
+        CR1_CopyTask (CR1_TestData& t, CommandBatchPtr batch, DebugLabel dbg) __NE___ :
             RenderTask{ batch, dbg },
             t{ t }
         {}
@@ -130,9 +130,9 @@ namespace
 
 
     template <typename CtxType, typename CopyCtx>
-    static bool  CanvasRect (Canvas* canvas, RenderTechPipelinesPtr renderTech, ImageComparator *imageCmp)
+    static bool  CanvasRect (Canvas* canvas, RenderTechPipelinesPtr renderTech, ImageComparator* imageCmp)
     {
-        auto&           rts         = RenderTaskScheduler();
+        auto&           rts         = GraphicsScheduler();
         auto&           res_mngr    = rts.GetResourceManager();
         const auto      format      = EPixelFormat::RGBA8_UNorm;
         CR1_TestData    t           {*canvas};
@@ -158,22 +158,25 @@ namespace
         t.ppln_trilist_lines = renderTech->GetGraphicsPipeline( PipelineName{"rect_trilist_lines"} );
         CHECK_ERR( t.ppln_trilist_lines );
 
-        AsyncTask   begin   = rts.BeginFrame();
+
+        CHECK_ERR( rts.WaitNextFrame( c_ThreadArr, c_MaxTimeout ));
+        CHECK_ERR( rts.BeginFrame() );
 
         auto        batch   = rts.BeginCmdBatch( EQueueType::Graphics, 0, {"Canvas batch"} );
         CHECK_ERR( batch );
 
-        AsyncTask   task1   = batch->Run< CR1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{begin},               {"Draw task"} );
+        AsyncTask   task1   = batch->Run< CR1_DrawTask<CtxType> >( Tuple{ArgRef(t)}, Tuple{},                    {"Draw task"} );
         AsyncTask   task2   = batch->Run< CR1_CopyTask<CopyCtx> >( Tuple{ArgRef(t)}, Tuple{task1}, True{"Last"}, {"Readback task"} );
 
         AsyncTask   end     = rts.EndFrame( Tuple{task2} );
 
-        CHECK_ERR( Scheduler().Wait({ end }));
+
+        CHECK_ERR( Scheduler().Wait( {end}, c_MaxTimeout ));
         CHECK_ERR( end->Status() == EStatus::Completed );
 
-        CHECK_ERR( rts.WaitAll() );
+        CHECK_ERR( rts.WaitAll( c_MaxTimeout ));
 
-        CHECK_ERR( Scheduler().Wait({ t.result }));
+        CHECK_ERR( Scheduler().Wait( {t.result}, c_MaxTimeout ));
         CHECK_ERR( t.result->Status() == EStatus::Completed );
 
         CHECK_ERR( t.isOK );
diff --git a/AE/engine/tests/graphics_hl/DrawTests/cpp/mac_names.h b/AE/engine/tests/graphics_hl/DrawTests/cpp/mac_names.h
new file mode 100644
index 00000000..dd26eb03
--- /dev/null
+++ b/AE/engine/tests/graphics_hl/DrawTests/cpp/mac_names.h
@@ -0,0 +1,32 @@
+namespace RenderTechs
+{
+    using Hash_t                = AE::Base::HashVal32;
+    using RenderTechName_t      = AE::Graphics::RenderTechName;
+    using RenderTechPassName_t  = AE::Graphics::RenderTechPassName;
+    using AttachmentName_t      = AE::Graphics::AttachmentName;
+    using PipelineName_t        = AE::Graphics::PipelineName;
+    using RTShaderBindingName_t = AE::Graphics::RTShaderBindingName;
+    using DescriptorSetName_t   = AE::Graphics::DescriptorSetName;
+
+    static constexpr struct _CanvasDrawTest
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x188afcd5u}};}  // 'CanvasDrawTest'
+
+        // graphics (0)
+        static constexpr struct _Draw_1
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x18c0f564u}};}  // 'Draw_1'
+
+            // RenderPass 'DrawTest.Draw_1' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  draw2 {Hash_t{0x8a1a5121u}};  // 'draw2'
+            static constexpr PipelineName_t  rect_trilist {Hash_t{0x26dd4574u}};  // 'rect_trilist'
+            static constexpr PipelineName_t  rect_trilist_lines {Hash_t{0x2d67a3f2u}};  // 'rect_trilist_lines'
+            static constexpr PipelineName_t  rect_tristrip {Hash_t{0x6b247febu}};  // 'rect_tristrip'
+        } Draw_1;
+    } CanvasDrawTest;
+}
diff --git a/AE/engine/tests/graphics_hl/DrawTests/cpp/mac_types.h b/AE/engine/tests/graphics_hl/DrawTests/cpp/mac_types.h
new file mode 100644
index 00000000..94cc097d
--- /dev/null
+++ b/AE/engine/tests/graphics_hl/DrawTests/cpp/mac_types.h
@@ -0,0 +1,41 @@
+#ifndef VB_Position_f2_DEFINED
+#   define VB_Position_f2_DEFINED
+    // size: 8, align: 4
+    struct VB_Position_f2
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xa843e002u}};  // 'VB_Position_f2'
+
+        packed_float2  Position;
+    };
+#endif
+    StaticAssert( offsetof(VB_Position_f2, Position) == 0 );
+    StaticAssert( sizeof(VB_Position_f2) == 8 );
+
+#ifndef VB_Color8_DEFINED
+#   define VB_Color8_DEFINED
+    // size: 4, align: 1
+    struct VB_Color8
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xccba8f8eu}};  // 'VB_Color8'
+
+        packed_ubyte4  Color;
+    };
+#endif
+    StaticAssert( offsetof(VB_Color8, Color) == 0 );
+    StaticAssert( sizeof(VB_Color8) == 4 );
+
+#ifndef VB_UVf2_Col8_DEFINED
+#   define VB_UVf2_Col8_DEFINED
+    // size: 12, align: 4
+    struct VB_UVf2_Col8
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xf5d3da88u}};  // 'VB_UVf2_Col8'
+
+        packed_float2  UV;
+        packed_ubyte4  Color;
+    };
+#endif
+    StaticAssert( offsetof(VB_UVf2_Col8, UV) == 0 );
+    StaticAssert( offsetof(VB_UVf2_Col8, Color) == 8 );
+    StaticAssert( sizeof(VB_UVf2_Col8) == 12 );
+
diff --git a/AE/engine/tests/graphics_hl/DrawTests/cpp/vk_types.h b/AE/engine/tests/graphics_hl/DrawTests/cpp/vk_types.h
index e0053d2a..94cc097d 100644
--- a/AE/engine/tests/graphics_hl/DrawTests/cpp/vk_types.h
+++ b/AE/engine/tests/graphics_hl/DrawTests/cpp/vk_types.h
@@ -1,6 +1,6 @@
 #ifndef VB_Position_f2_DEFINED
 #   define VB_Position_f2_DEFINED
-    // size: 8, align: 4 (16)
+    // size: 8, align: 4
     struct VB_Position_f2
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0xa843e002u}};  // 'VB_Position_f2'
@@ -8,12 +8,12 @@
         packed_float2  Position;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_Position_f2, Position) == 0 );
-    STATIC_ASSERT( sizeof(VB_Position_f2) == 8 );
+    StaticAssert( offsetof(VB_Position_f2, Position) == 0 );
+    StaticAssert( sizeof(VB_Position_f2) == 8 );
 
 #ifndef VB_Color8_DEFINED
 #   define VB_Color8_DEFINED
-    // size: 4, align: 1 (16)
+    // size: 4, align: 1
     struct VB_Color8
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0xccba8f8eu}};  // 'VB_Color8'
@@ -21,12 +21,12 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_Color8, Color) == 0 );
-    STATIC_ASSERT( sizeof(VB_Color8) == 4 );
+    StaticAssert( offsetof(VB_Color8, Color) == 0 );
+    StaticAssert( sizeof(VB_Color8) == 4 );
 
 #ifndef VB_UVf2_Col8_DEFINED
 #   define VB_UVf2_Col8_DEFINED
-    // size: 12, align: 4 (16)
+    // size: 12, align: 4
     struct VB_UVf2_Col8
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0xf5d3da88u}};  // 'VB_UVf2_Col8'
@@ -35,7 +35,7 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_UVf2_Col8, UV) == 0 );
-    STATIC_ASSERT( offsetof(VB_UVf2_Col8, Color) == 8 );
-    STATIC_ASSERT( sizeof(VB_UVf2_Col8) == 12 );
+    StaticAssert( offsetof(VB_UVf2_Col8, UV) == 0 );
+    StaticAssert( offsetof(VB_UVf2_Col8, Color) == 8 );
+    StaticAssert( sizeof(VB_UVf2_Col8) == 12 );
 
diff --git a/AE/engine/tests/graphics_hl/DrawTests/sampler/samplers.as b/AE/engine/tests/graphics_hl/DrawTests/sampler/samplers.as
index 03fab1f8..0a3e1c01 100644
--- a/AE/engine/tests/graphics_hl/DrawTests/sampler/samplers.as
+++ b/AE/engine/tests/graphics_hl/DrawTests/sampler/samplers.as
@@ -33,7 +33,7 @@ void ASmain ()
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
     }
     {
-        RC<Sampler>     samp = Sampler( "AnisotrophyRepeat" );
+        RC<Sampler>     samp = Sampler( "AnisotropyRepeat" );
         samp.AddFeatureSet( "MinDesktop" );
         samp.Filter( EFilter::Linear, EFilter::Linear, EMipmapFilter::Linear );
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
diff --git a/AE/engine/tests/graphics_hl/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Canvas_Rect.txt b/AE/engine/tests/graphics_hl/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Canvas_Rect.txt
index 358d3ea0..4f184fe7 100644
--- a/AE/engine/tests/graphics_hl/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Canvas_Rect.txt	
+++ b/AE/engine/tests/graphics_hl/Vulkan/ref/NVIDIA GeForce RTX 2080/Test_Canvas_Rect.txt	
@@ -35,6 +35,7 @@ name: 'Canvas batch |0| Draw task'
 
   BindPipeline
     pipeline:  'rect_tristrip'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -51,6 +52,7 @@ name: 'Canvas batch |0| Draw task'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -67,6 +69,7 @@ name: 'Canvas batch |0| Draw task'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist_lines'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -111,7 +114,7 @@ name: 'Canvas batch |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -164,6 +167,7 @@ name: 'Canvas batch |0| Draw task'
 
   BindPipeline
     pipeline:  'rect_tristrip'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -180,6 +184,7 @@ name: 'Canvas batch |0| Draw task'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -196,6 +201,7 @@ name: 'Canvas batch |0| Draw task'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist_lines'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -240,7 +246,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -293,6 +299,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rect_tristrip'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -309,6 +316,7 @@ name: 'IndirectCmdBuffers'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -325,6 +333,7 @@ name: 'IndirectCmdBuffers'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist_lines'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -369,7 +378,7 @@ name: 'Canvas batch |1| Readback task'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
@@ -422,6 +431,7 @@ name: 'IndirectCmdBuffers'
 
   BindPipeline
     pipeline:  'rect_tristrip'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -438,6 +448,7 @@ name: 'IndirectCmdBuffers'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -454,6 +465,7 @@ name: 'IndirectCmdBuffers'
   DrawIndexed
   BindPipeline
     pipeline:  'rect_trilist_lines'
+    layout:    '0'
     bindPoint: GRAPHICS
   ----------
 
@@ -494,7 +506,7 @@ name: 'IndirectCmdBuffers'
     src:       'Image'
     srcLayout: TRANSFER_SRC_OPTIMAL
     dst:       'dynamic staging buffer'
-      copy { off:(0, 0, 0), ext:(800, 600, 1), mip:0, layers:[0, 1), COLOR } ---> { [0, 1920000) }
+      copy { off:(0, 0, 0), ext:(800, 600, 1), COLOR } ---> { [0, 1920000) }
   ----------
 
   PipelineBarrier2
diff --git a/AE/engine/tests/graphics_hl/main.cpp b/AE/engine/tests/graphics_hl/main.cpp
index e3403004..4b74a807 100644
--- a/AE/engine/tests/graphics_hl/main.cpp
+++ b/AE/engine/tests/graphics_hl/main.cpp
@@ -38,8 +38,7 @@ extern int Test_GraphicsHL (IApplication &app, IWindow &wnd)
         IApplication&   _app;
 
     public:
-        WndListener (IApplication &app) : _app{app} {}
-        ~WndListener () override {}
+        WndListener (IApplication &app)             __NE___ : _app{app} {}
 
         void OnStateChanged (IWindow &, EState)     __NE_OV {}
         void OnSurfaceDestroyed (IWindow &)         __NE_OV {}
@@ -59,18 +58,20 @@ extern int Test_GraphicsHL (IApplication &app, IWindow &wnd)
         WindowPtr   _window;
 
     public:
-        AppListener ()
+        AppListener ()                              __NE___
         {
-            TaskScheduler::CreateInstance();
+            TaskScheduler::InstanceCtor::Create();
 
             TaskScheduler::Config   cfg;
+            cfg.mainThreadCoreId    = ECpuCoreId(0);
+
             CHECK_FATAL( Scheduler().Setup( cfg ));
         }
 
         ~AppListener ()                             __NE_OV
         {
             Scheduler().Release();
-            TaskScheduler::DestroyInstance();
+            TaskScheduler::InstanceCtor::Destroy();
         }
 
         void  OnStart (IApplication &app)           __NE_OV
diff --git a/AE/engine/tests/network_stress_test/CMakeLists.txt b/AE/engine/tests/network_stress_test/CMakeLists.txt
new file mode 100644
index 00000000..4672baed
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/CMakeLists.txt
@@ -0,0 +1,12 @@
+# Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+file( GLOB SOURCES "*.*" )
+
+if (APPLE)
+    add_executable( "Tests.NetworkStressTest" MACOSX_BUNDLE ${SOURCES} )
+else()
+    add_executable( "Tests.NetworkStressTest" ${SOURCES} )
+endif()
+source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
+set_property( TARGET "Tests.NetworkStressTest" PROPERTY FOLDER "Engine/Tests" )
+target_link_libraries( "Tests.NetworkStressTest" PUBLIC "Networking" )
diff --git a/AE/engine/tests/network_stress_test/TCP_IPv4.cpp b/AE/engine/tests/network_stress_test/TCP_IPv4.cpp
new file mode 100644
index 00000000..5207e98b
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/TCP_IPv4.cpp
@@ -0,0 +1,109 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/Networking.h"
+
+using namespace AE;
+using namespace AE::Networking;
+
+namespace {
+    static constexpr uint   MsgSize = 1024;
+}
+
+
+extern void  TcpServerV4 (const IpAddress &serverAddr)
+{
+    TcpSocket   server;
+    CHECK_ERRV( server.Listen( serverAddr ));
+    CHECK_ERRV( server.IsOpen() );
+
+    {
+        IpAddress   addr;
+        CHECK_ERRV( server.GetAddress( addr ));
+        AE_LOGI( "TCP server: started in "s << addr.ToString() );
+    }
+
+    FixedMap< IpAddress, TcpSocket, 8 > clients;
+
+    for (;;)
+    {
+        for (;;)
+        {
+            IpAddress   addr;
+            TcpSocket   client;
+
+            if ( not client.Accept( server, OUT addr ))
+                break;
+
+            AE_LOGI( "TCP server: client connected "s << addr.ToString() );
+            clients.insert_or_assign( addr, RVRef(client) );
+        }
+
+        for (auto it = clients.begin(); it != clients.end();)
+        {
+            char    buf [MsgSize];
+            auto    [err, recv]     = it->second.Receive( buf, Sizeof(buf) );
+            bool    disconnected    = (err > SocketReceiveError::_Error);
+
+            if ( recv > 0 )
+            {
+                AE_LOGI( "TCP server: received "s << ToString(recv) );
+
+                auto    [err2, sent] = it->second.Send( buf, recv );
+                if ( sent > 0 )
+                    AE_LOGI( "TCP server: sent "s << ToString(sent) );
+
+                disconnected |= (err2 > SocketSendError::_Error);
+            }
+
+            if ( disconnected )
+            {
+                AE_LOGI( "TCP server: client disconnected: "s << it->first.ToString() );
+                it = clients.EraseByIter( it );
+            }
+            else
+                ++it;
+        }
+
+        ThreadUtils::MilliSleep( milliseconds{100} );
+    }
+}
+
+
+extern void  TcpClientV4 (const IpAddress &serverAddr)
+{
+    TcpSocket   client;
+    CHECK_ERRV( client.Connect( serverAddr ));
+    CHECK_ERRV( client.IsOpen() );
+
+    Array<char>     rnd_data;
+    for (uint i = 0; i < MsgSize; ++i) {
+        rnd_data.push_back( char(::rand() & 0x7F) );
+    }
+
+    char    buf [MsgSize];
+
+    for (;;)
+    {
+        usize   size = (::rand() + 11) % rnd_data.size();
+        if ( size == 0 )
+            continue;
+
+        auto    [err, sent] = client.Send( rnd_data.data(), Bytes{size} );
+        if ( sent > 0 )
+            AE_LOGI( "TCP client: sent "s << ToString(sent) << " to " << serverAddr.ToString() );
+
+        auto    [err2, recv] = client.Receive( OUT buf, Sizeof(buf) );
+        if ( recv > 0 )
+            AE_LOGI( "TCP client: received "s << ToString(recv) );
+
+        if ( err == SocketSendError::ConnectionResetByPeer )
+        {
+            // try to reconnect
+            client.Close();
+            CHECK_ERRV( client.Connect( serverAddr ));
+            CHECK_ERRV( client.IsOpen() );
+            continue;
+        }
+        ThreadUtils::MilliSleep( milliseconds{50} );
+    }
+}
diff --git a/AE/engine/tests/network_stress_test/TCP_IPv6.cpp b/AE/engine/tests/network_stress_test/TCP_IPv6.cpp
new file mode 100644
index 00000000..f7444763
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/TCP_IPv6.cpp
@@ -0,0 +1,109 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/Networking.h"
+
+using namespace AE;
+using namespace AE::Networking;
+
+namespace {
+    static constexpr uint   MsgSize = 1024;
+}
+
+
+extern void  TcpServerV6 (const IpAddress6 &serverAddr)
+{
+    TcpSocket   server;
+    CHECK_ERRV( server.Listen( serverAddr ));
+    CHECK_ERRV( server.IsOpen() );
+
+    {
+        IpAddress6  addr;
+        CHECK_ERRV( server.GetAddress( addr ));
+        AE_LOGI( "TCP6 server: started in "s << addr.ToString() );
+    }
+
+    FixedMap< IpAddress6, TcpSocket, 8 >    clients;
+
+    for (;;)
+    {
+        for (;;)
+        {
+            IpAddress6  addr;
+            TcpSocket   client;
+
+            if ( not client.Accept( server, OUT addr ))
+                break;
+
+            AE_LOGI( "TCP6 server: client connected "s << addr.ToString() );
+            clients.insert_or_assign( addr, RVRef(client) );
+        }
+
+        for (auto it = clients.begin(); it != clients.end();)
+        {
+            char    buf [MsgSize];
+            auto    [err, recv]     = it->second.Receive( buf, Sizeof(buf) );
+            bool    disconnected    = (err > SocketReceiveError::_Error);
+
+            if ( recv > 0 )
+            {
+                AE_LOGI( "TCP6 server: received "s << ToString(recv) );
+
+                auto    [err2, sent] = it->second.Send( buf, recv );
+                if ( sent > 0 )
+                    AE_LOGI( "TCP6 server: sent "s << ToString(sent) );
+
+                disconnected |= (err2 > SocketSendError::_Error);
+            }
+
+            if ( disconnected )
+            {
+                AE_LOGI( "TCP6 server: client disconnected: "s << it->first.ToString() );
+                it = clients.EraseByIter( it );
+            }
+            else
+                ++it;
+        }
+
+        ThreadUtils::MilliSleep( milliseconds{100} );
+    }
+}
+
+
+extern void  TcpClientV6 (const IpAddress6 &serverAddr)
+{
+    TcpSocket   client;
+    CHECK_ERRV( client.Connect( serverAddr ));
+    CHECK_ERRV( client.IsOpen() );
+
+    Array<char>     rnd_data;
+    for (uint i = 0; i < MsgSize; ++i) {
+        rnd_data.push_back( char(::rand() & 0x7F) );
+    }
+
+    char    buf [MsgSize];
+
+    for (;;)
+    {
+        usize   size = (::rand() + 11) % rnd_data.size();
+        if ( size == 0 )
+            continue;
+
+        auto    [err, sent] = client.Send( rnd_data.data(), Bytes{size} );
+        if ( sent > 0 )
+            AE_LOGI( "TCP6 client: sent "s << ToString(sent) << " to " << serverAddr.ToString() );
+
+        auto    [err2, recv] = client.Receive( OUT buf, Sizeof(buf) );
+        if ( recv > 0 )
+            AE_LOGI( "TCP6 client: received "s << ToString(recv) );
+
+        if ( err == SocketSendError::ConnectionResetByPeer )
+        {
+            // try to reconnect
+            client.Close();
+            CHECK_ERRV( client.Connect( serverAddr ));
+            CHECK_ERRV( client.IsOpen() );
+            continue;
+        }
+        ThreadUtils::MilliSleep( milliseconds{50} );
+    }
+}
diff --git a/AE/engine/tests/network_stress_test/TcpMsg.cpp b/AE/engine/tests/network_stress_test/TcpMsg.cpp
new file mode 100644
index 00000000..a200d9ed
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/TcpMsg.cpp
@@ -0,0 +1,249 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/Networking.h"
+
+using namespace AE;
+using namespace AE::Networking;
+using namespace AE::Threading;
+
+
+namespace AE::Networking
+{
+    DECL_CSMSG( Text,  Debug,
+        Byte16u     size;
+        CharAnsi    data [1];
+
+        ND_ StringView  AsString () C_NE___ { return StringView{ data, usize(size) }; }
+    );
+
+    DECL_CSMSG( RequestNextFrame,   Debug,);
+    DECL_CSMSG( NextFrameResponse,  Debug, );
+    //-------------------------------------------
+
+
+    CSMSG_ENC_DEC_INPLACEARR( Text,  size, data,  AE_ARGS( size ));
+
+    CSMSG_EMPTY_ENC_DEC( RequestNextFrame );
+    CSMSG_EMPTY_ENC_DEC( NextFrameResponse );
+}
+
+
+namespace
+{
+    static const FrameUID   c_InitialFrameId = FrameUID::Init( 2 );
+
+
+    class ClientListener final : public IClientListener
+    {
+        ushort  _id = 0;
+
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress &)     __NE_OV { return EClientLocalID(_id++); }
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress6 &)    __NE_OV { return EClientLocalID(_id++); }
+
+        void  OnClientDisconnected (EChannel, EClientLocalID)               __NE_OV {}
+    };
+    //-------------------------------------------
+
+
+    class ServerProvider final : public IServerProvider
+    {
+        Array<IpAddress>    _addr4;
+
+    public:
+        ServerProvider (ArrayView<IpAddress> addr4)                         __NE___ : _addr4{addr4} {}
+
+        void  GetAddress (EChannel, uint idx, Bool, OUT IpAddress &addr)    __NE_OV { addr = _addr4[ idx % _addr4.size() ]; }
+        void  GetAddress (EChannel, uint,     Bool, OUT IpAddress6 &)       __NE_OV {}
+    };
+    //-------------------------------------------
+
+
+    class Server final : public BaseServer
+    {
+    public:
+        explicit Server (RC<MessageFactory> mf) { CHECK_FATAL( _Initialize( RVRef(mf), MakeRC<ClientListener>(), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel (ushort port)      { return _AddChannelTCP( port ); }
+    };
+    //-------------------------------------------
+
+
+    class Client final : public BaseClient
+    {
+    public:
+        explicit Client (RC<MessageFactory> mf, ArrayView<IpAddress> addr)
+        {
+            CHECK_FATAL( _Initialize( RVRef(mf), MakeRC<ServerProvider>( addr ), null, c_InitialFrameId ));
+        }
+
+        ND_ bool  AddChannel ()     { return _AddChannelTCP(); }
+    };
+    //-------------------------------------------
+
+
+    class MsgProducer final :
+        public AsyncCSMessageProducer< LfLinearAllocator< usize{32_Mb}, AE_CACHE_LINE, 16 >>
+    {
+    public:
+        EnumBitSet<EChannel>  GetChannels ()    C_NE_OV { return {EChannel::Reliable}; }
+
+        bool  SendText (StringView txt)
+        {
+            auto    msg = CreateMsg< CSMsg_Text >( StringSizeOf(txt) - sizeof(CSMsg_Text::data) );
+            if ( msg )
+            {
+                msg->size = StringSizeOf(txt);
+                msg.PutInPlace( &CSMsg_Text::data, txt.data(), StringSizeOf(txt) );
+
+                ASSERT( msg->AsString() == txt );
+
+                return AddMessage( msg );
+            }
+            return false;
+        }
+
+        bool  RequestNextFrame ()
+        {
+            if ( auto msg = CreateMsg< CSMsg_RequestNextFrame >())
+                return AddMessage( msg );
+            return false;
+        }
+
+        bool  NextFrameResponse ()
+        {
+            if ( auto msg = CreateMsg< CSMsg_NextFrameResponse >())
+                return AddMessage( msg );
+            return false;
+        }
+    };
+    //-------------------------------------------
+
+
+    static String  GenMessage ()
+    {
+        const Date  d = Date::Now();
+        return d.ToString( "yy.mm.dm (dee) - hh:mi.ss" );
+    }
+    //-------------------------------------------
+
+
+    class MsgConsumer final : public ICSMessageConsumer
+    {
+    private:
+        MsgProducer &   _producer;
+        bool &          _nextFrame;
+
+    public:
+        MsgConsumer (MsgProducer &p, bool &nf) __NE___ : _producer{p}, _nextFrame{nf} {}
+
+        CSMessageGroupID  GetGroupID () C_NE_OV
+        {
+            return CSMessageGroup::Debug;
+        }
+
+        void  Consume (ChunkList<const CSMessagePtr> msgList) __NE_OV
+        {
+            CHECK( not msgList.empty() );
+
+            for (auto& msg : msgList)
+            {
+                switch ( msg->UniqueId() )
+                {
+                    case CSMsg_Text::UID :
+                    {
+                        auto&   text = *msg->As<CSMsg_Text>();
+                        AE_LOGI( text.AsString() );
+
+                        String  tmp {text.AsString()};
+                        if ( tmp.size() < 1300 )
+                            "|-" >> tmp;
+
+                        _producer.SendText( tmp );
+                        break;
+                    }
+
+                    case CSMsg_RequestNextFrame::UID :
+                    {
+                        _producer.NextFrameResponse();
+                        _nextFrame = true;
+                        break;
+                    }
+
+                    case CSMsg_NextFrameResponse::UID :
+                    {
+                        _nextFrame = true;
+                        break;
+                    }
+                }
+
+            }
+        }
+    };
+    //-------------------------------------------
+}
+
+
+extern void  TcpMsgServerV4 (const ushort port)
+{
+    auto        mf          = MakeRC<MessageFactory>();
+    Server      server      {mf};
+    FrameUID    fid         = c_InitialFrameId;
+    auto        producer    = MakeRC<MsgProducer>();
+    bool        next_frame  = false;
+
+    CHECK_ERRV( mf->Register< CSMsg_Text, CSMsg_RequestNextFrame, CSMsg_NextFrameResponse >( True{} ));
+
+    CHECK_ERRV( server.AddChannel( port ));
+
+    server.Add( producer );
+    server.Add( MakeRC<MsgConsumer>( *producer, next_frame ));
+
+    for (;;)
+    {
+        next_frame = false;
+        producer->SendText( "s:"s << GenMessage() );
+
+        // may change 'next_frame'
+        server.Update( fid );
+
+        if ( next_frame )
+            fid.Inc();
+
+        ThreadUtils::MilliSleep( milliseconds{100} );
+
+        if ( not producer->RequestNextFrame() )
+            fid.Inc();
+    }
+}
+
+
+extern void  TcpMsgClientV4 (ArrayView<IpAddress> serverAddr)
+{
+    auto        mf          = MakeRC<MessageFactory>();
+    Client      client      { mf, serverAddr };
+    FrameUID    fid         = c_InitialFrameId;
+    auto        producer    = MakeRC<MsgProducer>();
+    bool        next_frame  = false;
+
+    CHECK_ERRV( mf->Register< CSMsg_Text, CSMsg_RequestNextFrame, CSMsg_NextFrameResponse >( True{} ));
+
+    CHECK_ERRV( client.AddChannel() );
+
+    client.Add( producer );
+    client.Add( MakeRC<MsgConsumer>( *producer, next_frame ));
+
+    for (;;)
+    {
+        next_frame = false;
+
+        // may change 'next_frame'
+        client.Update( fid );
+
+        next_frame |= not producer->SendText( "c:"s << GenMessage() );
+
+        if ( next_frame )
+            fid.Inc();
+
+        ThreadUtils::MilliSleep( milliseconds{100} );
+    }
+}
diff --git a/AE/engine/tests/network_stress_test/UDP_IPv4.cpp b/AE/engine/tests/network_stress_test/UDP_IPv4.cpp
new file mode 100644
index 00000000..c003fe35
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/UDP_IPv4.cpp
@@ -0,0 +1,77 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/Networking.h"
+
+using namespace AE;
+using namespace AE::Networking;
+
+namespace {
+    static constexpr uint   MsgSize = 1024;
+}
+
+
+extern void  UdpServerV4 (const IpAddress &serverAddr)
+{
+    UdpSocket   server;
+    CHECK_ERRV( server.Open( serverAddr ));
+    CHECK_ERRV( server.IsOpen() );
+
+    {
+        IpAddress   addr;
+        CHECK_ERRV( server.GetAddress( addr ));
+        AE_LOGI( "UDP server: started in "s << addr.ToString() );
+    }
+
+    char    buf [MsgSize];
+
+    for (;;)
+    {
+        IpAddress   addr;
+        auto        [err, recv] = server.Receive( OUT addr, buf, Sizeof(buf) );
+
+        if ( recv > 0 )
+        {
+            AE_LOGI( "UDP server: received "s << ToString(recv) << " from " << addr.ToString() );
+
+            auto    [err2, sent] = server.Send( addr, buf, recv );
+            if ( sent > 0 )
+                AE_LOGI( "UDP server: sent "s << ToString(sent) );
+
+            continue;
+        }
+        ThreadUtils::MilliSleep( milliseconds{100} );
+    }
+}
+
+
+extern void  UdpClientV4 (const IpAddress &serverAddr, const IpAddress &clientAddr)
+{
+    UdpSocket   client;
+    CHECK_ERRV( client.Open( clientAddr ));
+    CHECK_ERRV( client.IsOpen() );
+
+    Array<char>     rnd_data;
+    for (uint i = 0; i < MsgSize; ++i) {
+        rnd_data.push_back( char(::rand() & 0x7F) );
+    }
+
+    char    buf [MsgSize];
+
+    for (;;)
+    {
+        usize   size = ::rand() % rnd_data.size();
+        if ( size == 0 )
+            continue;
+
+        auto    [err, sent] = client.Send( serverAddr, rnd_data.data(), Bytes{size} );
+        if ( sent > 0 )
+            AE_LOGI( "UDP client: sent "s << ToString(sent) << " to " << serverAddr.ToString() );
+
+        IpAddress   addr2;
+        auto    [err2, recv] = client.Receive( OUT addr2, OUT buf, Sizeof(buf) );
+        if ( recv > 0 )
+            AE_LOGI( "UDP client: received "s << ToString(recv) << " from " << addr2.ToString() );
+
+        ThreadUtils::MilliSleep( milliseconds{50} );
+    }
+}
diff --git a/AE/engine/tests/network_stress_test/UDP_IPv6.cpp b/AE/engine/tests/network_stress_test/UDP_IPv6.cpp
new file mode 100644
index 00000000..cb2f6fa8
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/UDP_IPv6.cpp
@@ -0,0 +1,77 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/Networking.h"
+
+using namespace AE;
+using namespace AE::Networking;
+
+namespace {
+    static constexpr uint   MsgSize = 1024;
+}
+
+
+extern void  UdpServerV6 (const IpAddress6 &serverAddr)
+{
+    UdpSocket   server;
+    CHECK_ERRV( server.Open( serverAddr ));
+    CHECK_ERRV( server.IsOpen() );
+
+    {
+        IpAddress6  addr;
+        CHECK_ERRV( server.GetAddress( addr ));
+        AE_LOGI( "UDP6 server: started in "s << addr.ToString() );
+    }
+
+    char    buf [MsgSize];
+
+    for (;;)
+    {
+        IpAddress6  addr;
+        auto        [err, recv] = server.Receive( OUT addr, buf, Sizeof(buf) );
+
+        if ( recv > 0 )
+        {
+            AE_LOGI( "UDP6 server: received "s << ToString(recv) << " from " << addr.ToString() );
+
+            auto    [err2, sent] = server.Send( addr, buf, recv );
+            if ( sent > 0 )
+                AE_LOGI( "UDP6 server: sent "s << ToString(sent) );
+
+            continue;
+        }
+        ThreadUtils::MilliSleep( milliseconds{100} );
+    }
+}
+
+
+extern void  UdpClientV6 (const IpAddress6 &serverAddr, const IpAddress6 &clientAddr)
+{
+    UdpSocket   client;
+    CHECK_ERRV( client.Open( clientAddr ));
+    CHECK_ERRV( client.IsOpen() );
+
+    Array<char>     rnd_data;
+    for (uint i = 0; i < MsgSize; ++i) {
+        rnd_data.push_back( char(::rand() & 0x7F) );
+    }
+
+    char    buf [MsgSize];
+
+    for (;;)
+    {
+        usize   size = ::rand() % rnd_data.size();
+        if ( size == 0 )
+            continue;
+
+        auto    [err, sent] = client.Send( serverAddr, rnd_data.data(), Bytes{size} );
+        if ( sent > 0 )
+            AE_LOGI( "UDP6 client: sent "s << ToString(sent) << " to " << serverAddr.ToString() );
+
+        IpAddress6  addr2;
+        auto    [err2, recv] = client.Receive( OUT addr2, OUT buf, Sizeof(buf) );
+        if ( recv > 0 )
+            AE_LOGI( "UDP6 client: received "s << ToString(recv) << " from " << addr2.ToString() );
+
+        ThreadUtils::MilliSleep( milliseconds{50} );
+    }
+}
diff --git a/AE/engine/tests/network_stress_test/main.cpp b/AE/engine/tests/network_stress_test/main.cpp
new file mode 100644
index 00000000..138a98d5
--- /dev/null
+++ b/AE/engine/tests/network_stress_test/main.cpp
@@ -0,0 +1,180 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/Networking.h"
+
+using namespace AE;
+using namespace AE::Networking;
+
+
+extern void  UdpServerV4 (const IpAddress &serverAddr);
+extern void  UdpClientV4 (const IpAddress &serverAddr, const IpAddress &clientAddr);
+
+extern void  TcpServerV4 (const IpAddress &serverAddr);
+extern void  TcpClientV4 (const IpAddress &serverAddr);
+
+extern void  TcpServerV6 (const IpAddress6 &serverAddr);
+extern void  TcpClientV6 (const IpAddress6 &serverAddr);
+
+extern void  UdpServerV6 (const IpAddress6 &serverAddr);
+extern void  UdpClientV6 (const IpAddress6 &serverAddr, const IpAddress6 &clientAddr);
+
+extern void  TcpMsgServerV4 (ushort port);
+extern void  TcpMsgClientV4 (ArrayView<IpAddress> serverAddr);
+
+
+
+static IpAddress  GetSelfIPv4AddressFromRouter ()
+{
+    IpAddress   addr;
+    CHECK( SocketService::Instance().GetSelfIPAddress( IpAddress::FromServiceUDP( "192.168.0.1", "8080" ), OUT addr ));
+    return addr;
+}
+
+static IpAddress6  GetSelfIPv6AddressFromRouter ()
+{
+    IpAddress6  addr;
+    #ifdef AE_PLATFORM_APPLE
+        CHECK( SocketService::Instance().GetSelfIPAddress( IpAddress6::FromServiceUDP( "IPv6 addr%en0", "80" ), OUT addr ));
+    #else
+        CHECK( SocketService::Instance().GetSelfIPAddress( IpAddress6::FromServiceUDP( "IPv6 addr", "" ), OUT addr ));
+    #endif
+    return addr;
+}
+
+static IpAddress  GetSelfIPv4AddressFromGoogleDNS ()
+{
+    IpAddress   addr;
+    CHECK( SocketService::Instance().GetSelfIPAddress( IpAddress::FromServiceUDP( "8.8.8.8", "53" ), OUT addr ));
+    return addr;
+}
+
+static IpAddress6  GetSelfIPv6AddressFromGoogleDNS ()
+{
+    IpAddress6  addr;
+    CHECK( SocketService::Instance().GetSelfIPAddress( IpAddress6::FromServiceUDP( "2001:4860:4860::8888", "53" ), OUT addr ));
+    return addr;
+}
+
+
+int main ()
+{
+    AE::Base::StaticLogger::LoggerDbgScope  log{};
+
+    auto&   mngr = SocketService::Instance();
+    CHECK_ERR( mngr.Initialize() );
+
+    // local IPv4/IPv6 using router address
+    #if 0
+        AE_LOGI( "Local address iPv4: "s << GetSelfIPv4AddressFromRouter().ToString() );
+        AE_LOGI( "Local address iPv6: "s << GetSelfIPv6AddressFromRouter().ToString() );
+    #endif
+
+    // local IPv4/IPv6 using Google DNS
+    #if 0
+        AE_LOGI( "Local address iPv4: "s << GetSelfIPv4AddressFromGoogleDNS().ToString() );
+        AE_LOGI( "Local address iPv6: "s << GetSelfIPv6AddressFromGoogleDNS().ToString() );
+    #endif
+    //-------------------------------------------
+
+
+    // server TCP/UDP IPv4
+    #if 0
+        StdThread   tcp_thread{ [](){ TcpServerV4( IpAddress::FromLocalPortTCP( 3000 )); }};
+        StdThread   udp_thread{ [](){ UdpServerV4( IpAddress::FromLocalPortUDP( 3001 )); }};
+
+        tcp_thread.join();
+        udp_thread.join();
+    #endif
+
+    // server TCP/UDP IPv6
+    #if 0
+        IpAddress6  addr = GetSelfIPv6AddressFromRouter();
+
+        StdThread   tcp_thread{ [addr]() mutable { addr.SetPort( 3000 );  TcpServerV6( addr ); }};
+        StdThread   udp_thread{ [addr]() mutable { addr.SetPort( 3001 );  UdpServerV6( addr ); }};
+
+        tcp_thread.join();
+        udp_thread.join();
+    #endif
+    //-------------------------------------------
+
+
+    // TCP client/server IPv4
+    #if 0
+        StdThread   server_thread{ [](){ TcpServerV4( IpAddress::FromLocalhostTCP( 3000 )); }};
+        StdThread   client_thread{ [](){ TcpClientV4( IpAddress::FromLocalhostTCP( 3000 )); }};
+
+        server_thread.join();
+        client_thread.join();
+    #endif
+
+    // TCP client/server IPv6
+    #if 0
+        IpAddress6  addr = GetSelfIPv6AddressFromRouter();  addr.SetPort( 3000 );
+
+        StdThread   server_thread{ [addr](){ TcpServerV6( addr ); }};
+        StdThread   client_thread{ [addr](){ TcpClientV6( addr ); }};
+
+        server_thread.join();
+        client_thread.join();
+    #endif
+    //-------------------------------------------
+
+
+    // UDP client/server IPv4
+    #if 0
+        StdThread   server_thread{ [](){ UdpServerV4( IpAddress::FromLocalhostUDP( 3000 )); }};
+        StdThread   client_thread{ [](){ UdpClientV4( IpAddress::FromLocalhostUDP( 3000 ), IpAddress::FromLocalhostUDP( 3001 )); }};
+
+        server_thread.join();
+        client_thread.join();
+    #endif
+
+    // UDP client/server IPv6
+    #if 0
+        IpAddress6  addr = GetSelfIPv6AddressFromRouter();  addr.SetPort( 3000 );
+
+        StdThread   server_thread{ [addr](){ UdpServerV6( addr ); }};
+        StdThread   client_thread{ [addr](){ UdpClientV6( addr, IpAddress6::FromLocalhostUDP( 3001 )); }};
+
+        server_thread.join();
+        client_thread.join();
+    #endif
+    //-------------------------------------------
+
+
+    // UDP client
+    #if 0
+        UdpClientV4( IpAddress::FromHostPortUDP( "IPv4 addr", 3001 ));
+    #endif
+    #if 0
+        UdpClientV6( IpAddress6::FromHostPortUDP( "IPv4 addr", 3001 ));
+    #endif
+
+    // TCP client
+    #if 0
+        TcpClientV4( IpAddress::FromHostPortTCP( "IPv4 addr", 3000 ));
+    #endif
+    #if 0
+    //  TcpClientV6( IpAddress6{ 0xfe80, 0, 0, 0, 0x8a6, 0xeb9, 0x7c2a, 0x8cab, 3000, 0 });
+        TcpClientV6( IpAddress6::FromString( "[IPv6 addr]:3000" ));
+    //  TcpClientV6( IpAddress6::FromServiceUDP( "IPv6 addr", "" ));    // error
+    #endif
+    //-------------------------------------------
+
+
+    #if 1
+        StdThread   server_thread{ [](){ TcpMsgServerV4( 3000 ); }};
+        StdThread   client_thread{ [](){ TcpMsgClientV4( {  IpAddress::FromHostPortTCP( "IPv4 addr", 3000 ),
+                                                            IpAddress::FromHostPortTCP( "IPv4 addr", 3000 )
+                                                         }); }};
+
+        server_thread.join();
+        client_thread.join();
+    #endif
+    //-------------------------------------------
+
+
+    mngr.Deinitialize();
+    return 0;
+}
diff --git a/AE/engine/tests/networking/UnitTest_AsyncCSMessageProducer.cpp b/AE/engine/tests/networking/UnitTest_AsyncCSMessageProducer.cpp
new file mode 100644
index 00000000..ab924e8a
--- /dev/null
+++ b/AE/engine/tests/networking/UnitTest_AsyncCSMessageProducer.cpp
@@ -0,0 +1,68 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "threading/TaskSystem/ThreadManager.h"
+#include "UnitTest_Common.h"
+
+namespace
+{
+    class MsgProducer final :
+        public AsyncCSMessageProducer< LfLinearAllocator< usize{32_Mb}, AE_CACHE_LINE, 16 >>
+    {
+    public:
+        EnumBitSet<EChannel>  GetChannels ()    C_NE_OV { return {EChannel::Reliable}; }
+    };
+
+
+    static void  GenRandomString (OUT char* dst, uint len, Random &rnd)
+    {
+        for (uint i = 0; i < len; ++i) {
+            dst[i] = char(0xFF); //char(rnd.Uniform( uint('a'), uint('z') ));
+        }
+    }
+
+
+    static void  AsyncCSMessageProducer_Test1 ()
+    {
+        MsgProducer     msg_prod;
+
+        const auto      ThreadFn = [&msg_prod] ()
+        {{
+            Random  rnd;
+            for (;;)
+            {
+                uint    len = rnd.Uniform( 3u, 200u );
+
+                auto    msg = msg_prod.CreateMsg< CSMsg_Log >( Bytes{len} );
+                if ( msg )
+                {
+                    GenRandomString( msg.Extra<char>(), len, rnd );
+                    msg->msg = StringView{ msg.Extra<char>(), len };
+
+                    if ( not msg_prod.AddMessage( msg ))
+                        break;
+                }else
+                    break;
+            }
+        }};
+
+        StaticArray< StdThread, 4 >     threads;
+
+        for (auto& t : threads)
+        {
+            t = StdThread{ ThreadFn };
+        }
+
+        for (auto& t : threads)
+        {
+            t.join();
+        }
+    }
+}
+
+
+extern void UnitTest_AsyncCSMessageProducer ()
+{
+    AsyncCSMessageProducer_Test1();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/networking/UnitTest_Common.h b/AE/engine/tests/networking/UnitTest_Common.h
index 9f2f66eb..9f200099 100644
--- a/AE/engine/tests/networking/UnitTest_Common.h
+++ b/AE/engine/tests/networking/UnitTest_Common.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "networking/Raw/SocketService.h"
+#include "pch/Networking.h"
 #include "../shared/UnitTest_Shared.h"
 
 using namespace AE::Threading;
@@ -13,9 +13,10 @@ struct LocalSocketMngr
 {
     LocalSocketMngr ()
     {
-        TaskScheduler::CreateInstance();
+        TaskScheduler::InstanceCtor::Create();
 
         TaskScheduler::Config   cfg;
+        cfg.mainThreadCoreId    = ECpuCoreId(0);
         TEST( Scheduler().Setup( cfg ));
 
         TEST( SocketService::Instance().Initialize() );
@@ -24,7 +25,7 @@ struct LocalSocketMngr
     ~LocalSocketMngr ()
     {
         Scheduler().Release();
-        TaskScheduler::DestroyInstance();
+        TaskScheduler::InstanceCtor::Destroy();
 
         SocketService::Instance().Deinitialize();
     }
diff --git a/AE/engine/tests/networking/UnitTest_TCP.cpp b/AE/engine/tests/networking/UnitTest_TCP.cpp
index 1772cafb..9b473ea2 100644
--- a/AE/engine/tests/networking/UnitTest_TCP.cpp
+++ b/AE/engine/tests/networking/UnitTest_TCP.cpp
@@ -5,7 +5,8 @@
 
 namespace
 {
-    static void  TCP_Test1 ()
+    template <typename Address>
+    static void  TCP_Test_IPv ()
     {
         LocalSocketMngr mngr;
 
@@ -14,7 +15,7 @@ namespace
         const Bytes send_data_size = Sizeof(send_data1) + Sizeof(send_data2);
 
         TcpSocket   server;
-        TEST( server.Listen( 4000 ));
+        TEST( server.Listen( Address::FromLocalhostTCP(4000) ));
         TEST( server.IsOpen() );
 
         StdThread   listener{ [&] ()
@@ -22,8 +23,7 @@ namespace
                 Array<char> recv_data;
                 for (uint i = 0; i < 100; ++i)
                 {
-                    IpAddress   addr;
-                    Bytes       recv;
+                    Address     addr;
                     char        buf[128];
 
                     TcpSocket   client;
@@ -31,14 +31,18 @@ namespace
                     {
                         AE_LOGI( "TCP: connected to "s << addr.ToString() );
 
-                        if ( client.Receive( OUT buf, Sizeof(buf), OUT recv ) and recv > 0 )
+                        auto [err1, recv] = client.Receive( OUT buf, Sizeof(buf) );
+
+                        if ( err1 == SocketReceiveError::Received )
                         {
+                            TEST( recv > 0 );
                             recv_data.insert( recv_data.end(), buf, buf + recv );
 
                             AE_LOGI( "TCP: received "s << ToString(recv) );
 
-                            Bytes   sent;
-                            if ( not client.Send( buf, recv, OUT sent ) or sent != recv )
+                            auto [err2, sent] = client.Send( buf, recv );
+
+                            if ( err2 > SocketSendError::_Error or sent != recv )
                             {
                                 AE_LOGI( "TCP: failed to send back" );
                             }
@@ -48,7 +52,7 @@ namespace
                     if ( ArraySizeOf(recv_data) >= send_data_size )
                         break;
 
-                    ThreadUtils::Sleep( milliseconds{100} );
+                    ThreadUtils::MilliSleep( milliseconds{100} );
                 }
 
                 TEST( ArraySizeOf(recv_data) >= send_data_size );
@@ -57,21 +61,34 @@ namespace
             }}};
 
         TcpSocket   client;
-        TEST( client.Connect( IpAddress::FromHostPortTCP( "localhost", 4000 ) ));
+        TEST( client.Connect( Address::FromHostPortTCP( "localhost", 4000 ) ));
         TEST( client.IsOpen() );
 
-        Bytes   sent;
-        TEST( client.Send( send_data1, Sizeof(send_data1), OUT sent ));
-        TEST( sent == Sizeof(send_data1) );
+        {
+            auto [err, sent] = client.Send( send_data1, Sizeof(send_data1) );
+
+            TEST( err == SocketSendError::Sent );
+            TEST( sent == Sizeof(send_data1) );
+        }{
+            auto [err, sent] = client.Send( send_data2, Sizeof(send_data2) );
 
-        TEST( client.Send( send_data2, Sizeof(send_data2), OUT sent ));
-        TEST( sent == Sizeof(send_data2) );
+            TEST( err == SocketSendError::Sent );
+            TEST( sent == Sizeof(send_data2) );
+        }
 
-        Bytes   recv;
         char    buf[128];
-        for (; client.Receive( OUT buf, Sizeof(buf), OUT recv ) and recv == 0;) {}
+        Bytes   total_recv;
+        for (;;)
+        {
+            auto [err, recv] = client.Receive( OUT buf, Sizeof(buf) );
 
-        TEST( recv == send_data_size );
+            total_recv += recv;
+
+            if ( err == SocketReceiveError::Received or err > SocketReceiveError::_Error )
+                break;
+        }
+
+        TEST( total_recv == send_data_size );
         TEST( ArrayView<char>{send_data1} == ArrayView<char>{buf}.section( 0, CountOf(send_data1) ));
         TEST( ArrayView<char>{send_data2} == ArrayView<char>{buf}.section( CountOf(send_data1), CountOf(send_data2) ));
 
@@ -79,12 +96,24 @@ namespace
 
         client.Close();
     }
+
+    static void  TCP_Test1 ()
+    {
+        TCP_Test_IPv< IpAddress >();
+    }
+
+    static void  TCP_Test2 ()
+    {
+        TCP_Test_IPv< IpAddress6 >();
+    }
+    //-----------------------------------------------------
 }
 
 
 extern void UnitTest_TCP ()
 {
     TCP_Test1();
+    TCP_Test2();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/networking/UnitTest_TcpChannel.cpp b/AE/engine/tests/networking/UnitTest_TcpChannel.cpp
new file mode 100644
index 00000000..a409bf43
--- /dev/null
+++ b/AE/engine/tests/networking/UnitTest_TcpChannel.cpp
@@ -0,0 +1,192 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static const FrameUID   c_InitialFrameId = FrameUID::Init( 2 );
+
+
+    class ClientListener final : public IClientListener
+    {
+        ushort  _id = 0;
+
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress &)     __NE_OV { return EClientLocalID(_id++); }
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress6 &)    __NE_OV { return EClientLocalID(_id++); }
+
+        void  OnClientDisconnected (EChannel, EClientLocalID)               __NE_OV {}
+    };
+
+
+    class ServerProvider final : public IServerProvider
+    {
+        IpAddress   _addr4;
+
+    public:
+        ServerProvider (const IpAddress &addr4) __NE___ : _addr4{addr4} {}
+
+        void  GetAddress (EChannel channel, uint, Bool isTCP, OUT IpAddress &addr)  __NE_OV { TEST( channel == EChannel::Reliable );  TEST( isTCP );  addr = _addr4; }
+        void  GetAddress (EChannel,         uint, Bool,       OUT IpAddress6 &)     __NE_OV { TEST(false); }
+    };
+
+
+    class Server final : public BaseServer
+    {
+    public:
+        explicit Server (RC<MessageFactory> mf) { TEST( _Initialize( RVRef(mf), MakeRC<ClientListener>(), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel (ushort port)      { return _AddChannelTCP( port ); }
+    };
+
+
+    class Client final : public BaseClient
+    {
+    public:
+        explicit Client (RC<MessageFactory> mf, const IpAddress &addr)  { TEST( _Initialize( RVRef(mf), MakeRC<ServerProvider>( addr ), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel ()                                         { return _AddChannelTCP(); }
+    };
+
+
+    class LogMsgProducer final : public ICSMessageProducer
+    {
+    private:
+        const uint          msgCount;
+        RC<MessageFactory>  mf;
+        StringView          text;
+        SourceLoc           loc;
+        ulong&              sent;
+
+    public:
+        LogMsgProducer (uint msgCount, RC<MessageFactory> mf, StringView text, SourceLoc loc, ulong& sent) __NE___ :
+            msgCount{msgCount}, mf{mf}, text{text}, loc{loc}, sent{sent} {}
+
+        EnumBitSet<EChannel>  GetChannels () C_NE_OV
+        {
+            return {EChannel::Reliable};
+        }
+
+        ChunkList<CSMessagePtr>  Produce (FrameUID fid) __NE_OV
+        {
+            ChunkList<CSMessagePtr>     first_chunk;
+            ChunkList<CSMessagePtr>     last_chunk  = first_chunk.AddChunk( mf->GetAllocator( fid ), msgCount );
+
+            for (uint j = 0; j < msgCount; ++j)
+            {
+                if ( auto msg = mf->CreateMsg< CSMsg_Log >( fid ))
+                {
+                    msg->loc    = loc;
+                    msg->msg    = text;
+
+                    last_chunk->emplace_back( msg );
+                }
+            }
+
+            sent += first_chunk.Count();
+            return first_chunk;
+        }
+    };
+
+
+    class LogMsgConsumer final : public ICSMessageConsumer
+    {
+    private:
+        StringView  text;
+        ulong&      recv;
+
+    public:
+        LogMsgConsumer (StringView text, ulong &recv) __NE___ :
+            text{text}, recv{recv} {}
+
+        CSMessageGroupID  GetGroupID () C_NE_OV
+        {
+            return CSMessageGroup::Debug;
+        }
+
+        void  Consume (ChunkList<const CSMessagePtr> msgList) __NE_OV
+        {
+            TEST( not msgList.empty() );
+
+            AE_LOGI( "Received "s << ToString(msgList.Count()) << " " << text );
+            recv += msgList.Count();
+        }
+    };
+
+
+    static void  TcpChannel_Test1 ()
+    {
+        LocalSocketMngr         mngr;
+        static constexpr uint   frame_count = 40;
+        static constexpr uint   msg_count   = 100;
+
+        ulong   client_sent_msgs    = 0;
+        ulong   server_sent_msgs    = 0;
+
+        ulong   client_recv_msgs    = 0;
+        ulong   sever_recv_msgs     = 0;
+
+        StdThread   server_thread{ [&server_sent_msgs, &sever_recv_msgs] ()
+            {{
+                auto        mf      = MakeRC<MessageFactory>();
+                Server      server  {mf};
+                FrameUID    fid     = c_InitialFrameId;
+
+                TEST( mf->Register< CSMsg_Log >( True{} ));
+                TEST( mf->Register< CSMsg_NextFrame >( True{} ));
+
+                TEST( server.AddChannel( 4000 ));
+
+                server.Add( MakeRC<LogMsgProducer>( msg_count, mf, "from server"sv, SourceLoc_Current(), server_sent_msgs ));
+                server.Add( MakeRC<LogMsgConsumer>( "from client"sv, sever_recv_msgs ));
+
+                for (uint i = 0; i < frame_count; ++i, fid.Inc())
+                {
+                    server.Update( fid );
+
+                    if ( (i & 0xF) == 0 )
+                        server.Update( fid );
+
+                    ThreadUtils::MilliSleep( milliseconds{100} );
+                }
+            }}};
+
+        StdThread   client_thread{ [&client_sent_msgs, &client_recv_msgs] ()
+            {{
+                auto        mf      = MakeRC<MessageFactory>();
+                Client      client  { mf, IpAddress::FromHostPortTCP( "localhost", 4000 )};
+                FrameUID    fid     = c_InitialFrameId;
+
+                TEST( mf->Register< CSMsg_Log >( True{} ));
+                TEST( mf->Register< CSMsg_NextFrame >( True{} ));
+
+                TEST( client.AddChannel() );
+
+                client.Add( MakeRC<LogMsgProducer>( msg_count, mf, "from client"sv, SourceLoc_Current(), client_sent_msgs ));
+                client.Add( MakeRC<LogMsgConsumer>( "from server"sv, client_recv_msgs ));
+
+                for (uint i = 0; i < frame_count; ++i, fid.Inc())
+                {
+                    client.Update( fid );
+
+                    if ( (i & 0xF) == 0 )
+                        client.Update( fid );
+
+                    ThreadUtils::MilliSleep( milliseconds{100} );
+                }
+            }}};
+
+        server_thread.join();
+        client_thread.join();
+
+        TEST( Equal( float(client_sent_msgs), float(sever_recv_msgs), 10_pct ));
+        TEST( Equal( float(server_sent_msgs), float(client_recv_msgs), 10_pct ));
+    }
+}
+
+
+extern void UnitTest_TcpChannel ()
+{
+    TcpChannel_Test1();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/networking/UnitTest_UDP.cpp b/AE/engine/tests/networking/UnitTest_UDP.cpp
index cefcdaca..bd0449e2 100644
--- a/AE/engine/tests/networking/UnitTest_UDP.cpp
+++ b/AE/engine/tests/networking/UnitTest_UDP.cpp
@@ -5,7 +5,8 @@
 
 namespace
 {
-    static void  UDP_Test1 ()
+    template <typename Address>
+    static void  UDP_Test_IPv ()
     {
         LocalSocketMngr mngr;
 
@@ -14,18 +15,19 @@ namespace
         StdThread   listener{ [&] ()
             {{
                 UdpSocket   sock2;
-                TEST( sock2.Open( 4000 ));
+                TEST( sock2.Open( Address::FromLocalhostUDP(4000) ));
                 TEST( sock2.IsOpen() );
 
                 Array<char> recv_data;
                 for (uint i = 0; i < 100; ++i)
                 {
-                    IpAddress   addr;
-                    Bytes       recv;
+                    Address     addr;
                     char        buf[128];
+                    auto        [err, recv] = sock2.Receive( OUT addr, buf, Sizeof(buf) );
 
-                    if ( sock2.Receive( OUT addr, buf, Sizeof(buf), OUT recv ) and recv > 0 )
+                    if ( err == SocketReceiveError::Received )
                     {
+                        TEST( recv > 0 );
                         recv_data.insert( recv_data.end(), buf, buf + recv );
 
                         AE_LOGI( "Received "s << ToString(recv) << " from " << addr.ToString() );
@@ -34,7 +36,7 @@ namespace
                     if ( recv_data.size() >= sizeof(send_data) )
                         break;
 
-                    ThreadUtils::Sleep( milliseconds{100} );
+                    ThreadUtils::MilliSleep( milliseconds{100} );
                 }
 
                 TEST( sizeof(send_data) == recv_data.size() );
@@ -42,23 +44,36 @@ namespace
             }}};
 
         UdpSocket   sock1;
-        TEST( sock1.Open( 3000 ));
+        TEST( sock1.Open( Address::FromLocalhostUDP(3000) ));
         TEST( sock1.IsOpen() );
 
-        Bytes   sent;
-        TEST( sock1.Send( IpAddress::FromHostPortUDP( "localhost", 4000 ), send_data, Sizeof(send_data), OUT sent ));
+        auto [err, sent] = sock1.Send( Address::FromHostPortUDP( "localhost", 4000 ), send_data, Sizeof(send_data) );
+
+        TEST( err == SocketSendError::Sent );
         TEST( sent == Sizeof(send_data) );
 
         listener.join();
 
         sock1.Close();
     }
+
+    static void  UDP_Test1 ()
+    {
+        UDP_Test_IPv< IpAddress >();
+    }
+
+    static void  UDP_Test2 ()
+    {
+        UDP_Test_IPv< IpAddress6 >();
+    }
+    //-----------------------------------------------------
 }
 
 
 extern void UnitTest_UDP ()
 {
     UDP_Test1();
+    UDP_Test2();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/networking/UnitTest_UdpChannel.cpp b/AE/engine/tests/networking/UnitTest_UdpChannel.cpp
new file mode 100644
index 00000000..24f9e27e
--- /dev/null
+++ b/AE/engine/tests/networking/UnitTest_UdpChannel.cpp
@@ -0,0 +1,194 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static const FrameUID   c_InitialFrameId = FrameUID::Init( 2 );
+
+
+    class ClientListener final : public IClientListener
+    {
+        ushort  _id = 0;
+
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress &)     __NE_OV { return EClientLocalID(_id++); }
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress6 &)    __NE_OV { return EClientLocalID(_id++); }
+
+        void  OnClientDisconnected (EChannel, EClientLocalID)               __NE_OV {}
+    };
+
+
+    class ServerProvider final : public IServerProvider
+    {
+        IpAddress   _addr4;
+
+    public:
+        ServerProvider (const IpAddress &addr4) __NE___ : _addr4{addr4} {}
+
+        void  GetAddress (EChannel channel, uint, Bool isTCP, OUT IpAddress &addr)  __NE_OV { TEST( channel == EChannel::Unreliable );  TEST( isTCP );  addr = _addr4; }
+        void  GetAddress (EChannel,         uint, Bool,       OUT IpAddress6 &)     __NE_OV { TEST(false); }
+    };
+
+
+    class Server final : public BaseServer
+    {
+    public:
+        explicit Server (RC<MessageFactory> mf) { TEST( _Initialize( RVRef(mf), MakeRC<ClientListener>(), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel (ushort port)      { return _AddChannelUnreliableUDP( port ); }
+    };
+
+
+    class Client final : public BaseClient
+    {
+    public:
+        explicit Client (RC<MessageFactory> mf, ushort port){ TEST( _Initialize( RVRef(mf), MakeRC<ServerProvider>( IpAddress::FromLocalPortUDP(port) ), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel (ushort port)                  { return _AddChannelUnreliableUDP( port ); }
+    };
+
+
+    class LogMsgProducer final : public ICSMessageProducer
+    {
+    private:
+        const uint          msgCount;
+        RC<MessageFactory>  mf;
+        StringView          text;
+        SourceLoc           loc;
+        ulong&              sent;
+
+    public:
+        LogMsgProducer (uint msgCount, RC<MessageFactory> mf, StringView text, SourceLoc loc, ulong& sent) __NE___ :
+            msgCount{msgCount}, mf{mf}, text{text}, loc{loc}, sent{sent} {}
+
+        EnumBitSet<EChannel>  GetChannels () C_NE_OV
+        {
+            return {EChannel::Reliable};
+        }
+
+        ChunkList<CSMessagePtr>  Produce (FrameUID fid) __NE_OV
+        {
+            ChunkList<CSMessagePtr>     first_chunk;
+            ChunkList<CSMessagePtr>     last_chunk  = first_chunk.AddChunk( mf->GetAllocator( fid ), msgCount );
+
+            for (uint j = 0; j < msgCount; ++j)
+            {
+                if ( auto msg = mf->CreateMsg< CSMsg_Log >( fid ))
+                {
+                    msg->loc    = loc;
+                    msg->msg    = text;
+
+                    last_chunk->emplace_back( msg );
+                }
+            }
+
+            sent += first_chunk.Count();
+            return first_chunk;
+        }
+    };
+
+
+    class LogMsgConsumer final : public ICSMessageConsumer
+    {
+    private:
+        StringView  text;
+        ulong&      recv;
+
+    public:
+        LogMsgConsumer (StringView text, ulong &recv) __NE___ :
+            text{text}, recv{recv} {}
+
+        CSMessageGroupID  GetGroupID () C_NE_OV
+        {
+            return CSMessageGroup::Debug;
+        }
+
+        void  Consume (ChunkList<const CSMessagePtr> msgList) __NE_OV
+        {
+            TEST( not msgList.empty() );
+
+            AE_LOGI( "Received "s << ToString(msgList.Count()) << " " << text );
+            recv += msgList.Count();
+        }
+    };
+
+
+    static void  UdpChannel_Test1 ()
+    {
+        LocalSocketMngr         mngr;
+        static constexpr uint   frame_count = 4000;
+        static constexpr uint   msg_count   = 100;
+        static constexpr ushort server_port = 3000;
+        static constexpr ushort client_port = 3001;
+
+        ulong   client_sent_msgs    = 0;
+        ulong   server_sent_msgs    = 0;
+
+        ulong   client_recv_msgs    = 0;
+        ulong   sever_recv_msgs     = 0;
+
+        StdThread   server_thread{ [&server_sent_msgs, &sever_recv_msgs] ()
+            {{
+                auto        mf      = MakeRC<MessageFactory>();
+                Server      server  {mf};
+                FrameUID    fid     = c_InitialFrameId;
+
+                TEST( mf->Register< CSMsg_Log >( True{} ));
+                TEST( mf->Register< CSMsg_NextFrame >( True{} ));
+
+                TEST( server.AddChannel( server_port ));
+
+                server.Add( MakeRC<LogMsgProducer>( msg_count, mf, "from server"sv, SourceLoc_Current(), server_sent_msgs ));
+                server.Add( MakeRC<LogMsgConsumer>( "from client"sv, sever_recv_msgs ));
+
+                for (uint i = 0; i < frame_count; ++i, fid.Inc())
+                {
+                    server.Update( fid );
+
+                    if ( (i & 0xF) == 0 )
+                        server.Update( fid );
+
+                    ThreadUtils::MilliSleep( milliseconds{100} );
+                }
+            }}};
+
+        StdThread   client_thread{ [&client_sent_msgs, &client_recv_msgs] ()
+            {{
+                auto        mf      = MakeRC<MessageFactory>();
+                Client      client  { mf, server_port };
+                FrameUID    fid     = c_InitialFrameId;
+
+                TEST( mf->Register< CSMsg_Log >( True{} ));
+                TEST( mf->Register< CSMsg_NextFrame >( True{} ));
+
+                TEST( client.AddChannel( client_port ));
+
+                client.Add( MakeRC<LogMsgProducer>( msg_count, mf, "from client"sv, SourceLoc_Current(), client_sent_msgs ));
+                client.Add( MakeRC<LogMsgConsumer>( "from server"sv, client_recv_msgs ));
+
+                for (uint i = 0; i < frame_count; ++i, fid.Inc())
+                {
+                    client.Update( fid );
+
+                    if ( (i & 0xF) == 0 )
+                        client.Update( fid );
+
+                    ThreadUtils::MilliSleep( milliseconds{100} );
+                }
+            }}};
+
+        server_thread.join();
+        client_thread.join();
+
+        TEST( Equal( float(client_sent_msgs), float(sever_recv_msgs), 10_pct ));
+        TEST( Equal( float(server_sent_msgs), float(client_recv_msgs), 10_pct ));
+    }
+}
+
+
+extern void UnitTest_UdpChannel ()
+{
+    UdpChannel_Test1();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/networking/main.cpp b/AE/engine/tests/networking/main.cpp
index 0e458b05..afd38e3e 100644
--- a/AE/engine/tests/networking/main.cpp
+++ b/AE/engine/tests/networking/main.cpp
@@ -4,6 +4,9 @@
 
 extern void UnitTest_UDP ();
 extern void UnitTest_TCP ();
+extern void UnitTest_TcpChannel ();
+extern void UnitTest_UdpChannel ();
+extern void UnitTest_AsyncCSMessageProducer ();
 
 
 #ifdef AE_PLATFORM_ANDROID
@@ -17,6 +20,11 @@ int main ()
     UnitTest_UDP();
     UnitTest_TCP();
 
+    UnitTest_AsyncCSMessageProducer();
+
+    UnitTest_TcpChannel();
+    //UnitTest_UdpChannel();
+
     AE_LOGI( "Tests.Network finished" );
     return 0;
 }
diff --git a/AE/engine/tests/pipeline_compiler/UnitTest_StructType.cpp b/AE/engine/tests/pipeline_compiler/UnitTest_StructType.cpp
index a19a98b8..2ff4c754 100644
--- a/AE/engine/tests/pipeline_compiler/UnitTest_StructType.cpp
+++ b/AE/engine/tests/pipeline_compiler/UnitTest_StructType.cpp
@@ -221,10 +221,10 @@ static_assert( sizeof(StType2) == 96, "size mismatch" );
         int2  ii;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType1, ff) == 0 );
-    STATIC_ASSERT( offsetof(StType1, uu) == 16 );
-    STATIC_ASSERT( offsetof(StType1, ii) == 24 );
-    STATIC_ASSERT( sizeof(StType1) == 32 );
+    StaticAssert( offsetof(StType1, ff) == 0 );
+    StaticAssert( offsetof(StType1, uu) == 16 );
+    StaticAssert( offsetof(StType1, ii) == 24 );
+    StaticAssert( sizeof(StType1) == 32 );
 
 #ifndef StType2_DEFINED
 #   define StType2_DEFINED
@@ -237,9 +237,9 @@ static_assert( sizeof(StType2) == 96, "size mismatch" );
         StaticArray< uint4, 4 >    ua;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType2, st) == 0 );
-    STATIC_ASSERT( offsetof(StType2, ua) == 32 );
-    STATIC_ASSERT( sizeof(StType2) == 96 );
+    StaticAssert( offsetof(StType2, st) == 0 );
+    StaticAssert( offsetof(StType2, ua) == 32 );
+    StaticAssert( sizeof(StType2) == 96 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -260,10 +260,10 @@ static_assert( sizeof(StType2) == 96, "size mismatch" );
         int2  ii;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType1, ff) == 0 );
-    STATIC_ASSERT( offsetof(StType1, uu) == 16 );
-    STATIC_ASSERT( offsetof(StType1, ii) == 24 );
-    STATIC_ASSERT( sizeof(StType1) == 32 );
+    StaticAssert( offsetof(StType1, ff) == 0 );
+    StaticAssert( offsetof(StType1, uu) == 16 );
+    StaticAssert( offsetof(StType1, ii) == 24 );
+    StaticAssert( sizeof(StType1) == 32 );
 
 #ifndef StType2_DEFINED
 #   define StType2_DEFINED
@@ -276,9 +276,9 @@ static_assert( sizeof(StType2) == 96, "size mismatch" );
         StaticArray< uint4, 4 >    ua;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType2, st) == 0 );
-    STATIC_ASSERT( offsetof(StType2, ua) == 32 );
-    STATIC_ASSERT( sizeof(StType2) == 96 );
+    StaticAssert( offsetof(StType2, st) == 0 );
+    StaticAssert( offsetof(StType2, ua) == 32 );
+    StaticAssert( sizeof(StType2) == 96 );
 //-----------------------------------------------------------------------------
 
 
@@ -403,11 +403,11 @@ static_assert( sizeof(StType4) == 72, "size mismatch" );
         packed_short2  s;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType3, f) == 0 );
-    STATIC_ASSERT( offsetof(StType3, u) == 4 );
-    STATIC_ASSERT( offsetof(StType3, i) == 16 );
-    STATIC_ASSERT( offsetof(StType3, s) == 28 );
-    STATIC_ASSERT( sizeof(StType3) == 32 );
+    StaticAssert( offsetof(StType3, f) == 0 );
+    StaticAssert( offsetof(StType3, u) == 4 );
+    StaticAssert( offsetof(StType3, i) == 16 );
+    StaticAssert( offsetof(StType3, s) == 28 );
+    StaticAssert( sizeof(StType3) == 32 );
 
 #ifndef StType4_DEFINED
 #   define StType4_DEFINED
@@ -421,10 +421,10 @@ static_assert( sizeof(StType4) == 72, "size mismatch" );
         StaticArray< packed_short2, 8 >    ua;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType4, h3) == 0 );
-    STATIC_ASSERT( offsetof(StType4, st) == 8 );
-    STATIC_ASSERT( offsetof(StType4, ua) == 40 );
-    STATIC_ASSERT( sizeof(StType4) == 72 );
+    StaticAssert( offsetof(StType4, h3) == 0 );
+    StaticAssert( offsetof(StType4, st) == 8 );
+    StaticAssert( offsetof(StType4, ua) == 40 );
+    StaticAssert( sizeof(StType4) == 72 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -446,11 +446,11 @@ static_assert( sizeof(StType4) == 72, "size mismatch" );
         packed_short2  s;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType3, f) == 0 );
-    STATIC_ASSERT( offsetof(StType3, u) == 4 );
-    STATIC_ASSERT( offsetof(StType3, i) == 16 );
-    STATIC_ASSERT( offsetof(StType3, s) == 28 );
-    STATIC_ASSERT( sizeof(StType3) == 32 );
+    StaticAssert( offsetof(StType3, f) == 0 );
+    StaticAssert( offsetof(StType3, u) == 4 );
+    StaticAssert( offsetof(StType3, i) == 16 );
+    StaticAssert( offsetof(StType3, s) == 28 );
+    StaticAssert( sizeof(StType3) == 32 );
 
 #ifndef StType4_DEFINED
 #   define StType4_DEFINED
@@ -464,10 +464,10 @@ static_assert( sizeof(StType4) == 72, "size mismatch" );
         StaticArray< packed_short2, 8 >    ua;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType4, h3) == 0 );
-    STATIC_ASSERT( offsetof(StType4, st) == 8 );
-    STATIC_ASSERT( offsetof(StType4, ua) == 40 );
-    STATIC_ASSERT( sizeof(StType4) == 72 );
+    StaticAssert( offsetof(StType4, h3) == 0 );
+    StaticAssert( offsetof(StType4, st) == 8 );
+    StaticAssert( offsetof(StType4, ua) == 40 );
+    StaticAssert( sizeof(StType4) == 72 );
 //-----------------------------------------------------------------------------
 
 
@@ -527,10 +527,10 @@ static_assert( sizeof(StType5) == 36, "size mismatch" );
         packed_float3  Texcoord;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType5, Position) == 0 );
-    STATIC_ASSERT( offsetof(StType5, Normal) == 12 );
-    STATIC_ASSERT( offsetof(StType5, Texcoord) == 24 );
-    STATIC_ASSERT( sizeof(StType5) == 36 );
+    StaticAssert( offsetof(StType5, Position) == 0 );
+    StaticAssert( offsetof(StType5, Normal) == 12 );
+    StaticAssert( offsetof(StType5, Texcoord) == 24 );
+    StaticAssert( sizeof(StType5) == 36 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -551,10 +551,10 @@ static_assert( sizeof(StType5) == 36, "size mismatch" );
         packed_float3  Texcoord;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType5, Position) == 0 );
-    STATIC_ASSERT( offsetof(StType5, Normal) == 12 );
-    STATIC_ASSERT( offsetof(StType5, Texcoord) == 24 );
-    STATIC_ASSERT( sizeof(StType5) == 36 );
+    StaticAssert( offsetof(StType5, Position) == 0 );
+    StaticAssert( offsetof(StType5, Normal) == 12 );
+    StaticAssert( offsetof(StType5, Texcoord) == 24 );
+    StaticAssert( sizeof(StType5) == 36 );
 //-----------------------------------------------------------------------------
 
 
@@ -657,14 +657,14 @@ Buffer {
         StaticArray< float3x3_storage, 2 >    Mat2;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType6, Count) == 0 );
-    STATIC_ASSERT( offsetof(StType6, Positions) == 4 );
-    STATIC_ASSERT( offsetof(StType6, Indices) == 28 );
-    STATIC_ASSERT( offsetof(StType6, Mat) == 40 );
-    STATIC_ASSERT( offsetof(StType6, Positions2) == 112 );
-    STATIC_ASSERT( offsetof(StType6, Indices2) == 136 );
-    STATIC_ASSERT( offsetof(StType6, Mat2) == 160 );
-    STATIC_ASSERT( sizeof(StType6) == 256 );
+    StaticAssert( offsetof(StType6, Count) == 0 );
+    StaticAssert( offsetof(StType6, Positions) == 4 );
+    StaticAssert( offsetof(StType6, Indices) == 28 );
+    StaticAssert( offsetof(StType6, Mat) == 40 );
+    StaticAssert( offsetof(StType6, Positions2) == 112 );
+    StaticAssert( offsetof(StType6, Indices2) == 136 );
+    StaticAssert( offsetof(StType6, Mat2) == 160 );
+    StaticAssert( sizeof(StType6) == 256 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -689,14 +689,14 @@ Buffer {
         StaticArray< float3x3_storage, 2 >    Mat2;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType6, Count) == 0 );
-    STATIC_ASSERT( offsetof(StType6, Positions) == 4 );
-    STATIC_ASSERT( offsetof(StType6, Indices) == 28 );
-    STATIC_ASSERT( offsetof(StType6, Mat) == 40 );
-    STATIC_ASSERT( offsetof(StType6, Positions2) == 112 );
-    STATIC_ASSERT( offsetof(StType6, Indices2) == 136 );
-    STATIC_ASSERT( offsetof(StType6, Mat2) == 160 );
-    STATIC_ASSERT( sizeof(StType6) == 256 );
+    StaticAssert( offsetof(StType6, Count) == 0 );
+    StaticAssert( offsetof(StType6, Positions) == 4 );
+    StaticAssert( offsetof(StType6, Indices) == 28 );
+    StaticAssert( offsetof(StType6, Mat) == 40 );
+    StaticAssert( offsetof(StType6, Positions2) == 112 );
+    StaticAssert( offsetof(StType6, Indices2) == 136 );
+    StaticAssert( offsetof(StType6, Mat2) == 160 );
+    StaticAssert( sizeof(StType6) == 256 );
 //-----------------------------------------------------------------------------
 
 
@@ -846,9 +846,9 @@ static_assert( sizeof(StType9) == 24, "size mismatch" );
         float3  norm;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType9A, pos) == 0 );
-    STATIC_ASSERT( offsetof(StType9A, norm) == 16 );
-    STATIC_ASSERT( sizeof(StType9A) == 32 );
+    StaticAssert( offsetof(StType9A, pos) == 0 );
+    StaticAssert( offsetof(StType9A, norm) == 16 );
+    StaticAssert( sizeof(StType9A) == 32 );
 
 #ifndef StType9B_DEFINED
 #   define StType9B_DEFINED
@@ -861,9 +861,9 @@ static_assert( sizeof(StType9) == 24, "size mismatch" );
         int  b;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType9B, a) == 0 );
-    STATIC_ASSERT( offsetof(StType9B, b) == 8 );
-    STATIC_ASSERT( sizeof(StType9B) == 16 );
+    StaticAssert( offsetof(StType9B, a) == 0 );
+    StaticAssert( offsetof(StType9B, b) == 8 );
+    StaticAssert( sizeof(StType9B) == 16 );
 
 #ifndef StType9_DEFINED
 #   define StType9_DEFINED
@@ -877,10 +877,10 @@ static_assert( sizeof(StType9) == 24, "size mismatch" );
         TDeviceAddress< StType9B *>  st_arr;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType9, ref) == 0 );
-    STATIC_ASSERT( offsetof(StType9, arr) == 8 );
-    STATIC_ASSERT( offsetof(StType9, st_arr) == 16 );
-    STATIC_ASSERT( sizeof(StType9) == 24 );
+    StaticAssert( offsetof(StType9, ref) == 0 );
+    StaticAssert( offsetof(StType9, arr) == 8 );
+    StaticAssert( offsetof(StType9, st_arr) == 16 );
+    StaticAssert( sizeof(StType9) == 24 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -900,9 +900,9 @@ static_assert( sizeof(StType9) == 24, "size mismatch" );
         float3  norm;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType9A, pos) == 0 );
-    STATIC_ASSERT( offsetof(StType9A, norm) == 16 );
-    STATIC_ASSERT( sizeof(StType9A) == 32 );
+    StaticAssert( offsetof(StType9A, pos) == 0 );
+    StaticAssert( offsetof(StType9A, norm) == 16 );
+    StaticAssert( sizeof(StType9A) == 32 );
 
 #ifndef StType9B_DEFINED
 #   define StType9B_DEFINED
@@ -915,9 +915,9 @@ static_assert( sizeof(StType9) == 24, "size mismatch" );
         int  b;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType9B, a) == 0 );
-    STATIC_ASSERT( offsetof(StType9B, b) == 8 );
-    STATIC_ASSERT( sizeof(StType9B) == 16 );
+    StaticAssert( offsetof(StType9B, a) == 0 );
+    StaticAssert( offsetof(StType9B, b) == 8 );
+    StaticAssert( sizeof(StType9B) == 16 );
 
 #ifndef StType9_DEFINED
 #   define StType9_DEFINED
@@ -931,10 +931,10 @@ static_assert( sizeof(StType9) == 24, "size mismatch" );
         TDeviceAddress< StType9B *>  st_arr;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType9, ref) == 0 );
-    STATIC_ASSERT( offsetof(StType9, arr) == 8 );
-    STATIC_ASSERT( offsetof(StType9, st_arr) == 16 );
-    STATIC_ASSERT( sizeof(StType9) == 24 );
+    StaticAssert( offsetof(StType9, ref) == 0 );
+    StaticAssert( offsetof(StType9, arr) == 8 );
+    StaticAssert( offsetof(StType9, st_arr) == 16 );
+    StaticAssert( sizeof(StType9) == 24 );
 //-----------------------------------------------------------------------------
 
 
@@ -972,8 +972,8 @@ static_assert( sizeof(StType_10) == 16, "size mismatch" );
         float4  pos;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType_10, pos) == 0 );
-    STATIC_ASSERT( sizeof(StType_10) == 16 );
+    StaticAssert( offsetof(StType_10, pos) == 0 );
+    StaticAssert( sizeof(StType_10) == 16 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -992,8 +992,8 @@ static_assert( sizeof(StType_10) == 16, "size mismatch" );
         float4  pos;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType_10, pos) == 0 );
-    STATIC_ASSERT( sizeof(StType_10) == 16 );
+    StaticAssert( offsetof(StType_10, pos) == 0 );
+    StaticAssert( sizeof(StType_10) == 16 );
 //-----------------------------------------------------------------------------
 
 
@@ -1042,10 +1042,10 @@ static_assert( sizeof(StType11) == 80, "size mismatch" );
         uint  materialIdx;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType11, transform) == 0 );
-    STATIC_ASSERT( offsetof(StType11, meshIdx) == 64 );
-    STATIC_ASSERT( offsetof(StType11, materialIdx) == 68 );
-    STATIC_ASSERT( sizeof(StType11) == 80 );
+    StaticAssert( offsetof(StType11, transform) == 0 );
+    StaticAssert( offsetof(StType11, meshIdx) == 64 );
+    StaticAssert( offsetof(StType11, materialIdx) == 68 );
+    StaticAssert( sizeof(StType11) == 80 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -1066,10 +1066,10 @@ static_assert( sizeof(StType11) == 80, "size mismatch" );
         uint  materialIdx;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType11, transform) == 0 );
-    STATIC_ASSERT( offsetof(StType11, meshIdx) == 64 );
-    STATIC_ASSERT( offsetof(StType11, materialIdx) == 68 );
-    STATIC_ASSERT( sizeof(StType11) == 80 );
+    StaticAssert( offsetof(StType11, transform) == 0 );
+    StaticAssert( offsetof(StType11, meshIdx) == 64 );
+    StaticAssert( offsetof(StType11, materialIdx) == 68 );
+    StaticAssert( sizeof(StType11) == 80 );
 //-----------------------------------------------------------------------------
 
 
@@ -1114,8 +1114,8 @@ struct StType12
     //  float4  arr [];
     };
 #endif
-    STATIC_ASSERT( offsetof(StType12, count) == 0 );
-    STATIC_ASSERT( sizeof(StType12) == 16 );
+    StaticAssert( offsetof(StType12, count) == 0 );
+    StaticAssert( sizeof(StType12) == 16 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -1135,8 +1135,8 @@ struct StType12
     //  float4  arr [];
     };
 #endif
-    STATIC_ASSERT( offsetof(StType12, count) == 0 );
-    STATIC_ASSERT( sizeof(StType12) == 16 );
+    StaticAssert( offsetof(StType12, count) == 0 );
+    StaticAssert( sizeof(StType12) == 16 );
 //-----------------------------------------------------------------------------
 
 
@@ -1220,10 +1220,10 @@ static_assert( sizeof(StType13) == 144, "size mismatch" );
         ulong  l;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType13A, pos) == 0 );
-    STATIC_ASSERT( offsetof(StType13A, norm) == 16 );
-    STATIC_ASSERT( offsetof(StType13A, l) == 32 );
-    STATIC_ASSERT( sizeof(StType13A) == 48 );
+    StaticAssert( offsetof(StType13A, pos) == 0 );
+    StaticAssert( offsetof(StType13A, norm) == 16 );
+    StaticAssert( offsetof(StType13A, l) == 32 );
+    StaticAssert( sizeof(StType13A) == 48 );
 
 #ifndef StType13_DEFINED
 #   define StType13_DEFINED
@@ -1239,12 +1239,12 @@ static_assert( sizeof(StType13) == 144, "size mismatch" );
         StaticArray< TDeviceAddress< StType13A *>, 7 >    typedArrArr;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType13, untypedAddrArr) == 0 );
-    STATIC_ASSERT( offsetof(StType13, untypedAddrArrArr) == 8 );
-    STATIC_ASSERT( offsetof(StType13, typedRef) == 72 );
-    STATIC_ASSERT( offsetof(StType13, typedArr) == 80 );
-    STATIC_ASSERT( offsetof(StType13, typedArrArr) == 88 );
-    STATIC_ASSERT( sizeof(StType13) == 144 );
+    StaticAssert( offsetof(StType13, untypedAddrArr) == 0 );
+    StaticAssert( offsetof(StType13, untypedAddrArrArr) == 8 );
+    StaticAssert( offsetof(StType13, typedRef) == 72 );
+    StaticAssert( offsetof(StType13, typedArr) == 80 );
+    StaticAssert( offsetof(StType13, typedArrArr) == 88 );
+    StaticAssert( sizeof(StType13) == 144 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -1265,10 +1265,10 @@ static_assert( sizeof(StType13) == 144, "size mismatch" );
         ulong  l;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType13A, pos) == 0 );
-    STATIC_ASSERT( offsetof(StType13A, norm) == 16 );
-    STATIC_ASSERT( offsetof(StType13A, l) == 32 );
-    STATIC_ASSERT( sizeof(StType13A) == 48 );
+    StaticAssert( offsetof(StType13A, pos) == 0 );
+    StaticAssert( offsetof(StType13A, norm) == 16 );
+    StaticAssert( offsetof(StType13A, l) == 32 );
+    StaticAssert( sizeof(StType13A) == 48 );
 
 #ifndef StType13_DEFINED
 #   define StType13_DEFINED
@@ -1284,12 +1284,12 @@ static_assert( sizeof(StType13) == 144, "size mismatch" );
         StaticArray< TDeviceAddress< StType13A *>, 7 >    typedArrArr;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType13, untypedAddrArr) == 0 );
-    STATIC_ASSERT( offsetof(StType13, untypedAddrArrArr) == 8 );
-    STATIC_ASSERT( offsetof(StType13, typedRef) == 72 );
-    STATIC_ASSERT( offsetof(StType13, typedArr) == 80 );
-    STATIC_ASSERT( offsetof(StType13, typedArrArr) == 88 );
-    STATIC_ASSERT( sizeof(StType13) == 144 );
+    StaticAssert( offsetof(StType13, untypedAddrArr) == 0 );
+    StaticAssert( offsetof(StType13, untypedAddrArrArr) == 8 );
+    StaticAssert( offsetof(StType13, typedRef) == 72 );
+    StaticAssert( offsetof(StType13, typedArr) == 80 );
+    StaticAssert( offsetof(StType13, typedArrArr) == 88 );
+    StaticAssert( sizeof(StType13) == 144 );
 //-----------------------------------------------------------------------------
 
 
@@ -1342,8 +1342,8 @@ static_assert( sizeof(StType14) == 8, "size mismatch" );
         TDeviceAddress< packed_float3 *>  normals;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType14, normals) == 0 );
-    STATIC_ASSERT( sizeof(StType14) == 8 );
+    StaticAssert( offsetof(StType14, normals) == 0 );
+    StaticAssert( sizeof(StType14) == 8 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -1362,8 +1362,8 @@ static_assert( sizeof(StType14) == 8, "size mismatch" );
         TDeviceAddress< packed_float3 *>  normals;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType14, normals) == 0 );
-    STATIC_ASSERT( sizeof(StType14) == 8 );
+    StaticAssert( offsetof(StType14, normals) == 0 );
+    StaticAssert( sizeof(StType14) == 8 );
 //-----------------------------------------------------------------------------
 
 
@@ -1422,9 +1422,9 @@ static_assert( sizeof(StType15) == 256, "size mismatch" );
         float  b;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType15A, a) == 0 );
-    STATIC_ASSERT( offsetof(StType15A, b) == 16 );
-    STATIC_ASSERT( sizeof(StType15A) == 32 );
+    StaticAssert( offsetof(StType15A, a) == 0 );
+    StaticAssert( offsetof(StType15A, b) == 16 );
+    StaticAssert( sizeof(StType15A) == 32 );
 
 #ifndef StType15_DEFINED
 #   define StType15_DEFINED
@@ -1436,8 +1436,8 @@ static_assert( sizeof(StType15) == 256, "size mismatch" );
         StaticArray< StType15A, 8 >    arr;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType15, arr) == 0 );
-    STATIC_ASSERT( sizeof(StType15) == 256 );
+    StaticAssert( offsetof(StType15, arr) == 0 );
+    StaticAssert( sizeof(StType15) == 256 );
 
 )#";
         TEST( glsl == ref_glsl );
@@ -1457,9 +1457,9 @@ static_assert( sizeof(StType15) == 256, "size mismatch" );
         float  b;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType15A, a) == 0 );
-    STATIC_ASSERT( offsetof(StType15A, b) == 16 );
-    STATIC_ASSERT( sizeof(StType15A) == 32 );
+    StaticAssert( offsetof(StType15A, a) == 0 );
+    StaticAssert( offsetof(StType15A, b) == 16 );
+    StaticAssert( sizeof(StType15A) == 32 );
 
 #ifndef StType15_DEFINED
 #   define StType15_DEFINED
@@ -1471,8 +1471,8 @@ static_assert( sizeof(StType15) == 256, "size mismatch" );
         StaticArray< StType15A, 8 >    arr;
     };
 #endif
-    STATIC_ASSERT( offsetof(StType15, arr) == 0 );
-    STATIC_ASSERT( sizeof(StType15) == 256 );
+    StaticAssert( offsetof(StType15, arr) == 0 );
+    StaticAssert( sizeof(StType15) == 256 );
 //-----------------------------------------------------------------------------
 }
 
diff --git a/AE/engine/tests/platform/Test_Application.cpp b/AE/engine/tests/platform/Test_Application.cpp
index d083c1a6..6bf2d14a 100644
--- a/AE/engine/tests/platform/Test_Application.cpp
+++ b/AE/engine/tests/platform/Test_Application.cpp
@@ -65,18 +65,19 @@ namespace
         uint        _counter    = 0;
 
     public:
-        AppListener ()
+        AppListener () __NE___
         {
-            TaskScheduler::CreateInstance();
+            TaskScheduler::InstanceCtor::Create();
 
             TaskScheduler::Config   cfg;
+            cfg.mainThreadCoreId    = ECpuCoreId(0);
             CHECK_FATAL( Scheduler().Setup( cfg ));
         }
 
         ~AppListener () __NE_OV
         {
             Scheduler().Release();
-            TaskScheduler::DestroyInstance();
+            TaskScheduler::InstanceCtor::Destroy();
         }
 
         void  OnStart (IApplication &app) __NE_OV
diff --git a/AE/engine/tests/platform/Test_Input.cpp b/AE/engine/tests/platform/Test_Input.cpp
index 0b51a84e..755dc8b9 100644
--- a/AE/engine/tests/platform/Test_Input.cpp
+++ b/AE/engine/tests/platform/Test_Input.cpp
@@ -42,18 +42,19 @@ namespace
         WindowPtr   _window;
 
     public:
-        AppListener ()
+        AppListener () __NE___
         {
-            TaskScheduler::CreateInstance();
+            TaskScheduler::InstanceCtor::Create();
 
             TaskScheduler::Config   cfg;
+            cfg.mainThreadCoreId    = ECpuCoreId(0);
             CHECK_FATAL( Scheduler().Setup( cfg ));
         }
 
         ~AppListener () __NE_OV
         {
             Scheduler().Release();
-            TaskScheduler::DestroyInstance();
+            TaskScheduler::InstanceCtor::Destroy();
         }
 
         void  OnStart (IApplication &app) __NE_OV
diff --git a/AE/engine/tests/scripting/UnitTest_Class.cpp b/AE/engine/tests/scripting/UnitTest_Class.cpp
index d0c153f8..ccbe7cad 100644
--- a/AE/engine/tests/scripting/UnitTest_Class.cpp
+++ b/AE/engine/tests/scripting/UnitTest_Class.cpp
@@ -161,7 +161,7 @@ namespace
             arr.push_back( p );
         }
 
-        Test9_1_CL*  Add2 (const String &s) { 
+        Test9_1_CL*  Add2 (const String &s) {
             return arr.emplace_back( new Test9_1_CL{ int(s.length()) }).Retain();
         }
     };
@@ -513,8 +513,8 @@ namespace
             binder.AddGenericMethod< uint(int) >( &Test10_CL::Gen1, "gen" );
         )
 
-        STATIC_ASSERT( ScriptTypeInfo<Test10_CL>::is_object );
-        STATIC_ASSERT( ScriptTypeInfo<Test10_CL>::is_ref_counted );
+        StaticAssert( ScriptTypeInfo<Test10_CL>::is_object );
+        StaticAssert( ScriptTypeInfo<Test10_CL>::is_ref_counted );
 
         static const int  line      = __LINE__ + 1;
         static const char script[]  = R"#(
diff --git a/AE/engine/tests/scripting/UnitTest_MathFunc.cpp b/AE/engine/tests/scripting/UnitTest_MathFunc.cpp
index 7f956410..248ce661 100644
--- a/AE/engine/tests/scripting/UnitTest_MathFunc.cpp
+++ b/AE/engine/tests/scripting/UnitTest_MathFunc.cpp
@@ -57,7 +57,7 @@ namespace
                 return ms.GetScaled();
             })#", "ASmain", OUT script_res );
         TEST( res );
-        TEST( Equals( script_res, (2.f / 1.1f) ));
+        TEST( Equal( script_res, (2.f / 1.1f) ));
     }
 }
 
diff --git a/AE/engine/tests/scripting/UnitTest_Preprocessor.cpp b/AE/engine/tests/scripting/UnitTest_Preprocessor.cpp
index c6d6d12c..28264b0a 100644
--- a/AE/engine/tests/scripting/UnitTest_Preprocessor.cpp
+++ b/AE/engine/tests/scripting/UnitTest_Preprocessor.cpp
@@ -6,7 +6,7 @@ namespace
 {
     static void  Preprocessor_Test1 ()
     {
-        const char  source[] = 
+        const char  source[] =
 R"(aaaj sdi kas jnd
 trurt qwa   fdgh
 #ifdef PART0
@@ -243,6 +243,63 @@ dfrkdtywb
         TEST( expected == src );
     }
     //-----------------------------------------------------
+
+
+    static void  Preprocessor_Test6 ()
+    {
+        const char  source[] = R"(
+"str1"
+#ifdef SCRIPT
+    script src1
+    ""
+    script src2
+    "1"
+    script src3
+    "12"
+    script src3
+    "123"
+    script src4
+    """"
+    script src5
+    "\n\r\n\n"
+    script src6
+#endif
+
+#ifdef SHADER
+    shader src
+#endif
+
+end)";
+        String  src;
+        TEST( ScriptEngine::_Preprocessor2( source, OUT src, ArrayView<StringView>{"SCRIPT"}, Default ));
+
+        const char  expected[] = R"(
+"str1"
+
+    script src1
+    ""
+    script src2
+    "1"
+    script src3
+    "12"
+    script src3
+    "123"
+    script src4
+    """"
+    script src5
+    "\n\r\n\n"
+    script src6
+
+
+
+
+
+
+end)";
+
+        TEST( expected == src );
+    }
+    //-----------------------------------------------------
 }
 
 
@@ -253,6 +310,7 @@ extern void UnitTest_Preprocessor ()
     Preprocessor_Test3();
     Preprocessor_Test4();
     Preprocessor_Test5();
+    Preprocessor_Test6();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/serializing/UnitTest_Serialization.cpp b/AE/engine/tests/serializing/UnitTest_Serialization.cpp
index 76fcaaf1..1e6deea7 100644
--- a/AE/engine/tests/serializing/UnitTest_Serialization.cpp
+++ b/AE/engine/tests/serializing/UnitTest_Serialization.cpp
@@ -10,20 +10,20 @@ namespace
         float   f;
         int2    v;
 
-        SerObj ()   {}
-        ~SerObj ()  {}
+        SerObj ()   __NE___ {}
+        ~SerObj ()  __NE___ {}
     };
-    STATIC_ASSERT( not IsTriviallySerializable< SerObj >);
+    StaticAssert( not IsTriviallySerializable< SerObj >);
 
 
-    static bool  SerObj_Serialize (Serializer &ser, const void *ptr) __NE___
+    static bool  SerObj_Serialize (Serializer &ser, const void* ptr) __NE___
     {
         auto*   self = Cast<SerObj>(ptr);
 
         return ser( self->i, self->f, self->v );
     }
 
-    static bool  SerObj_Deserialize (Deserializer &deser, OUT void *ptr, bool create) __NE___
+    static bool  SerObj_Deserialize (Deserializer &deser, OUT void* ptr, bool create) __NE___
     {
         auto*   self = create ? PlacementNew<SerObj>( OUT ptr ) : Cast<SerObj>( ptr );
 
@@ -91,11 +91,11 @@ namespace
 
     static void  SerializationTraits ()
     {
-        STATIC_ASSERT( IsTriviallySerializable< int >);
-        STATIC_ASSERT( IsTriviallySerializable< float >);
-        //STATIC_ASSERT( IsTriviallySerializable< Quat >);
+        StaticAssert( IsTriviallySerializable< int >);
+        StaticAssert( IsTriviallySerializable< float >);
+        //StaticAssert( IsTriviallySerializable< Quat >);
 
-        STATIC_ASSERT( not IsTriviallySerializable< String >);
+        StaticAssert( not IsTriviallySerializable< String >);
     }
 }
 
diff --git a/AE/engine/tests/shader_trace/CMakeLists.txt b/AE/engine/tests/shader_trace/CMakeLists.txt
index 88b75919..403dbacb 100644
--- a/AE/engine/tests/shader_trace/CMakeLists.txt
+++ b/AE/engine/tests/shader_trace/CMakeLists.txt
@@ -15,7 +15,7 @@ if ((TARGET "ShaderTrace") AND ${AE_ENABLE_VULKAN})
 
     file( GLOB_RECURSE SOURCES "*.*" )
     set( VK_FILES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../src/graphics/Vulkan" )
-    set( VK_SOURCES 
+    set( VK_SOURCES
         "${VK_FILES_PATH}/VDevice.h"
         "${VK_FILES_PATH}/VDevice.cpp"
         "${VK_FILES_PATH}/VDeviceFS.cpp"
diff --git a/AE/engine/tests/shader_trace/ClockMap_Test1.cpp b/AE/engine/tests/shader_trace/ClockMap_Test1.cpp
index a2f74b4c..692e7b45 100644
--- a/AE/engine/tests/shader_trace/ClockMap_Test1.cpp
+++ b/AE/engine/tests/shader_trace/ClockMap_Test1.cpp
@@ -30,7 +30,7 @@ void main()
         static const char   frag_shader_source[] = R"#(
 layout(location = 0) out vec4  out_Color;
 
-// DHash from https://www.shadertoy.com/view/4djSRW 
+// DHash from https://www.shadertoy.com/view/4djSRW
 // MIT License...
 // Copyright (c)2014 David Hoskins.
 float DHash13 (const vec3 p)
@@ -61,11 +61,11 @@ float ValueNoise (const vec3 pos)
     return  mix(
                 mix(
                     mix(hash(pi + vec3(0, 0, 0)), hash(pi + vec3(1, 0, 0)), w.x),
-                    mix(hash(pi + vec3(0, 0, 1)), hash(pi + vec3(1, 0, 1)), w.x), 
+                    mix(hash(pi + vec3(0, 0, 1)), hash(pi + vec3(1, 0, 1)), w.x),
                     w.z),
                 mix(
                     mix(hash(pi + vec3(0, 1, 0)), hash(pi + vec3(1, 1, 0)), w.x),
-                    mix(hash(pi + vec3(0, 1, 1)), hash(pi + vec3(1, 1, 1)), w.x), 
+                    mix(hash(pi + vec3(0, 1, 1)), hash(pi + vec3(1, 1, 1)), w.x),
                     w.z),
                 w.y);
 #   undef hash
diff --git a/AE/engine/tests/shader_trace/ShaderTrace_Test11.cpp b/AE/engine/tests/shader_trace/ShaderTrace_Test11.cpp
index 296c2a2c..31a8bad7 100644
--- a/AE/engine/tests/shader_trace/ShaderTrace_Test11.cpp
+++ b/AE/engine/tests/shader_trace/ShaderTrace_Test11.cpp
@@ -84,7 +84,7 @@ static bool CreatePipeline (TestDevice &vulkan, VkShaderModule compShader, Array
 =================================================
 */
 extern bool ShaderTrace_Test11 (TestDevice& vulkan)
-{   
+{
     // create image
     VkImage         image;
     VkImageView     image_view;
diff --git a/AE/engine/tests/shader_trace/ShaderTrace_Test12.cpp b/AE/engine/tests/shader_trace/ShaderTrace_Test12.cpp
index 9d8b685b..8aeeb335 100644
--- a/AE/engine/tests/shader_trace/ShaderTrace_Test12.cpp
+++ b/AE/engine/tests/shader_trace/ShaderTrace_Test12.cpp
@@ -87,7 +87,7 @@ static bool CreatePipeline (TestDevice &vulkan, VkShaderModule compShader, Array
 =================================================
 */
 extern bool ShaderTrace_Test12 (TestDevice& vulkan)
-{   
+{
     // create image
     VkImage         image;
     VkImageView     image_view;
diff --git a/AE/engine/tests/shader_trace/ShaderTrace_Test2.cpp b/AE/engine/tests/shader_trace/ShaderTrace_Test2.cpp
index 697d9be6..73832b45 100644
--- a/AE/engine/tests/shader_trace/ShaderTrace_Test2.cpp
+++ b/AE/engine/tests/shader_trace/ShaderTrace_Test2.cpp
@@ -83,7 +83,7 @@ static bool CreatePipeline (TestDevice &vulkan, VkShaderModule compShader, Array
 =================================================
 */
 extern bool ShaderTrace_Test2 (TestDevice& vulkan)
-{   
+{
     // create image
     VkImage         image;
     VkImageView     image_view;
@@ -171,7 +171,7 @@ extern bool ShaderTrace_Test2 (TestDevice& vulkan)
 
     // setup storage buffer
     {
-        const uint  data[] = { 
+        const uint  data[] = {
             width/2, height/2, 0,       // selected invocation
         };
 
diff --git a/AE/engine/tests/shader_trace/TestDevice.cpp b/AE/engine/tests/shader_trace/TestDevice.cpp
index 37f269df..f1068e37 100644
--- a/AE/engine/tests/shader_trace/TestDevice.cpp
+++ b/AE/engine/tests/shader_trace/TestDevice.cpp
@@ -4,7 +4,7 @@
 #include "base/Algorithms/Parser.h"
 #include "base/DataSource/MemStream.h"
 #include "base/DataSource/FileStream.h"
-#include "serializing/ObjectFactory.h"
+#include "serializing/Basic/ObjectFactory.h"
 
 #include "res_loaders/Intermediate/IntermImage.h"
 #include "res_loaders/DDS/DDSImageSaver.h"
@@ -481,7 +481,7 @@ bool  TestDevice::_Compile (OUT Array<uint>&            spirvData,
     #endif
 
     // disassembly
-    #if 0 //defined(ENABLE_OPT) 
+    #if 0 //defined(ENABLE_OPT)
     {
         spv_context ctx = spvContextCreate( SPV_ENV_VULKAN_1_1 );
         CHECK_ERR( ctx != null );
@@ -507,7 +507,7 @@ bool  TestDevice::_Compile (OUT Array<uint>&            spirvData,
     _GetDebugOutput
 =================================================
 */
-bool  TestDevice::_GetDebugOutput (VkShaderModule shaderModule, const void *ptr, VkDeviceSize maxSize, OUT Array<String> &result) const
+bool  TestDevice::_GetDebugOutput (VkShaderModule shaderModule, const void* ptr, VkDeviceSize maxSize, OUT Array<String> &result) const
 {
     auto    iter = _debuggableShaders.find( shaderModule );
     CHECK_ERR( iter != _debuggableShaders.end() );
@@ -1577,7 +1577,7 @@ bool  TestDevice::CreateRayTracingScene (VkPipeline rtPipeline, uint numGroups,
 
             for (uint i = 0; i < numGroups; ++i) {
                 VK_CHECK( vkGetRayTracingShaderGroupHandlesKHR( GetVkDevice(), rtPipeline, i, 1, GetRayTracingProps().shaderGroupHandleSize, OUT handles.data() + Bytes{alignment * i} ));
-            }   
+            }
             vkCmdUpdateBuffer( cmd, sbt, 0, handles.size() * sizeof(handles[0]), handles.data() );
         });
     }
diff --git a/AE/engine/tests/shader_trace/TestDevice.h b/AE/engine/tests/shader_trace/TestDevice.h
index a4a7b290..f08e2f3f 100644
--- a/AE/engine/tests/shader_trace/TestDevice.h
+++ b/AE/engine/tests/shader_trace/TestDevice.h
@@ -134,7 +134,7 @@ namespace AE::PipelineCompiler
         ND_ bool  _CreateResources ();
             void  _DestroyResources ();
 
-        ND_ bool  _GetDebugOutput (VkShaderModule shaderModule, const void *ptr, VkDeviceSize maxSize, OUT Array<String> &result) const;
+        ND_ bool  _GetDebugOutput (VkShaderModule shaderModule, const void* ptr, VkDeviceSize maxSize, OUT Array<String> &result) const;
 
         ND_ bool  _Compile (OUT Array<uint> &       spirvData,
                             OUT ShaderTrace *       dbgInfo,
diff --git a/AE/engine/tests/shader_trace/ref/ShaderTrace_Test1.txt b/AE/engine/tests/shader_trace/ref/ShaderTrace_Test1.txt
index b8b3ab8a..27808731 100644
--- a/AE/engine/tests/shader_trace/ref/ShaderTrace_Test1.txt
+++ b/AE/engine/tests/shader_trace/ref/ShaderTrace_Test1.txt
@@ -1,5 +1,4 @@
 //> gl_FragCoord: float4 {8.500000, 8.500000, 0.010625, 1.000000}
-//> gl_PrimitiveID: int {0}
 //> in_Position: float4 {0.062500, 0.062500, 0.010625, 1.000000}
 //> (out): float4 {0.915000, 0.427500, 0.021250, 0.842500}
 no source
@@ -224,7 +223,6 @@ no source
 //---------------------------
 
 //> gl_FragCoord: float4 {8.500000, 8.500000, 0.028403, 1.000000}
-//> gl_PrimitiveID: int {2}
 //> in_Position: float4 {0.062500, 0.062500, 0.028403, 1.000000}
 //> (out): float4 {0.772778, 0.640833, 0.056806, 0.913611}
 no source
diff --git a/AE/engine/tests/shader_trace/ref/ShaderTrace_Test13.txt b/AE/engine/tests/shader_trace/ref/ShaderTrace_Test13.txt
index b6ffd6ae..661c7c8c 100644
--- a/AE/engine/tests/shader_trace/ref/ShaderTrace_Test13.txt
+++ b/AE/engine/tests/shader_trace/ref/ShaderTrace_Test13.txt
@@ -1,5 +1,4 @@
 //> gl_FragCoord: float4 {8.500000, 8.500000, 0.010625, 1.000000}
-//> gl_PrimitiveID: int {0}
 //> in_Position: float4 {0.062500, 0.062500, 0.010625, 1.000000}
 //> (out): float4 {0.915000, 0.427500, 0.021250, 0.842500}
 no source
@@ -224,7 +223,6 @@ no source
 //---------------------------
 
 //> gl_FragCoord: float4 {8.500000, 8.500000, 0.028403, 1.000000}
-//> gl_PrimitiveID: int {2}
 //> in_Position: float4 {0.062500, 0.062500, 0.028403, 1.000000}
 //> (out): float4 {0.772778, 0.640833, 0.056806, 0.913611}
 no source
diff --git a/AE/engine/tests/shader_trace/ref/ShaderTrace_Test4.txt b/AE/engine/tests/shader_trace/ref/ShaderTrace_Test4.txt
index a50632b5..19ef6cf9 100644
--- a/AE/engine/tests/shader_trace/ref/ShaderTrace_Test4.txt
+++ b/AE/engine/tests/shader_trace/ref/ShaderTrace_Test4.txt
@@ -1,5 +1,4 @@
 //> gl_FragCoord: float4 {8.500000, 8.500000, 0.021250, 1.000000}
-//> gl_PrimitiveID: int {0}
 no source
 
 //> i: ulong {18446744069414584320}
diff --git a/AE/engine/tests/shared/DebugInstanceCounter.h b/AE/engine/tests/shared/DebugInstanceCounter.h
index 297c6dbb..cf3ccc9a 100644
--- a/AE/engine/tests/shared/DebugInstanceCounter.h
+++ b/AE/engine/tests/shared/DebugInstanceCounter.h
@@ -17,31 +17,31 @@ struct DebugInstanceCounter
     slong                   _magicNumber;
     T                       value;
 
-    DebugInstanceCounter () noexcept : _magicNumber( _counter + (1ll << 62)), value{}
+    DebugInstanceCounter () __NE___ : _magicNumber( _counter + (1ll << 62)), value{}
     {
         TEST( _magicNumber != 0 );
         ++_counter;
         ++_emptyCtorCnt;
     }
 
-    explicit DebugInstanceCounter (const T &val) noexcept : DebugInstanceCounter()
+    explicit DebugInstanceCounter (const T &val) __NE___ : DebugInstanceCounter()
     {
         value = val;
     }
 
-    DebugInstanceCounter (const DebugInstanceCounter &other) noexcept : _magicNumber{ other._magicNumber }, value{ other.value }
+    DebugInstanceCounter (const DebugInstanceCounter &other) __NE___ : _magicNumber{ other._magicNumber }, value{ other.value }
     {
         ++_counter;
         ++_copyCtorCnt;
     }
 
-    DebugInstanceCounter (DebugInstanceCounter &&other) noexcept : _magicNumber{ other._magicNumber }, value{ RVRef(other.value) }
+    DebugInstanceCounter (DebugInstanceCounter &&other) __NE___ : _magicNumber{ other._magicNumber }, value{ RVRef(other.value) }
     {
         ++_counter;
         ++_moveCtorCnt;
     }
 
-    ~DebugInstanceCounter () noexcept
+    ~DebugInstanceCounter () __NE___
     {
         TEST( _magicNumber != 0 );  // assert on second dtor call
         --_counter;
@@ -49,42 +49,42 @@ struct DebugInstanceCounter
         _magicNumber = 0;
     }
 
-    DebugInstanceCounter& operator = (const DebugInstanceCounter &right) noexcept
+    DebugInstanceCounter& operator = (const DebugInstanceCounter &right) __NE___
     {
         _magicNumber = right._magicNumber;
         value = right.value;
         return *this;
     }
 
-    DebugInstanceCounter& operator = (DebugInstanceCounter &&right) noexcept
+    DebugInstanceCounter& operator = (DebugInstanceCounter &&right) __NE___
     {
         _magicNumber = right._magicNumber;
         value = RVRef( right.value );
         return *this;
     }
 
-    bool operator == (const DebugInstanceCounter &right) const noexcept
+    bool operator == (const DebugInstanceCounter &right) C_NE___
     {
         return value == right.value;
     }
 
-    bool operator != (const DebugInstanceCounter &right) const noexcept
+    bool operator != (const DebugInstanceCounter &right) C_NE___
     {
         return value != right.value;
     }
 
-    bool operator < (const DebugInstanceCounter &right) const noexcept
+    bool operator < (const DebugInstanceCounter &right) C_NE___
     {
         return value < right.value;
     }
 
-    bool operator > (const DebugInstanceCounter &right) const noexcept
+    bool operator > (const DebugInstanceCounter &right) C_NE___
     {
         return value > right.value;
     }
 
 
-    static bool CheckStatistic () noexcept
+    static bool CheckStatistic () __NE___
     {
         String  str;
         str << "\nObjectID:    " << ToString( UID )
@@ -98,7 +98,7 @@ struct DebugInstanceCounter
         return _counter == 0;
     }
 
-    static void ClearStatistic () noexcept
+    static void ClearStatistic () __NE___
     {
         _counter        = 0;
         _emptyCtorCnt   = 0;
@@ -115,7 +115,7 @@ namespace std
     template <typename T, size_t UID>
     struct hash< DebugInstanceCounter<T,UID> >
     {
-        ND_ size_t  operator () (const DebugInstanceCounter<T,UID> &value) const noexcept {
+        ND_ size_t  operator () (const DebugInstanceCounter<T,UID> &value) C_NE___ {
             return hash<T>{}( value.value );
         }
     };
diff --git a/AE/engine/tests/shared/IntervalProfiler.h b/AE/engine/tests/shared/IntervalProfiler.h
index 91e75c27..df794946 100644
--- a/AE/engine/tests/shared/IntervalProfiler.h
+++ b/AE/engine/tests/shared/IntervalProfiler.h
@@ -154,7 +154,7 @@ forceinline void  IntervalProfiler::EndIteration ()
     auto&   test = _tests.back();
     CHECK_ERRV( not test.isEnded );
 
-    ASSERT( end_time > test.lastStartPoint );
+    ASSERT( end_time >= test.lastStartPoint );
     ASSERT( test.iterations.size() );
 
     test.iterations.back() = end_time - test.lastStartPoint;
diff --git a/AE/engine/tests/shared/UnitTest_Shared.h b/AE/engine/tests/shared/UnitTest_Shared.h
index 26e8804a..d011bd95 100644
--- a/AE/engine/tests/shared/UnitTest_Shared.h
+++ b/AE/engine/tests/shared/UnitTest_Shared.h
@@ -7,7 +7,7 @@
 using namespace AE;
 using namespace AE::Base;
 
-#define TEST    CHECK_FATAL
+#define TEST( ... )     CHECK_FATAL_MSG( (__VA_ARGS__), AE_TOSTRING(__VA_ARGS__) )
 
 #define __PRIVATE_TEST_OP( _lhs_, _op_, _rhs_ )                                                         \
     {                                                                                                   \
diff --git a/AE/engine/tests/test_launcher/CMakeLists.txt b/AE/engine/tests/test_launcher/CMakeLists.txt
index 972b6e57..34f20ad0 100644
--- a/AE/engine/tests/test_launcher/CMakeLists.txt
+++ b/AE/engine/tests/test_launcher/CMakeLists.txt
@@ -1,34 +1,67 @@
 # Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-file( GLOB_RECURSE SOURCES "*.*" )
-add_library( "TestLauncher" SHARED ${SOURCES} )
-source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
-target_link_libraries( "TestLauncher" PUBLIC "Platform" )
+file( GLOB_RECURSE CPP_SOURCES "*.*" )
 
-if (TARGET "Tests.Base")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Base" )
-endif()
-if (TARGET "Tests.Scripting")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Scripting" )
-endif()
-if (TARGET "Tests.Threading")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Threading" )
-endif()
-if (TARGET "Tests.Networking")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Networking" )
-endif()
-if (TARGET "Tests.Serializing")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Serializing" )
-endif()
-if (TARGET "Tests.Platform")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Platform" )
-endif()
-if (TARGET "Tests.Graphics")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.Graphics" )
-endif()
-if (TARGET "Tests.GraphicsHL")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.GraphicsHL" )
-endif()
-if (TARGET "Tests.ECS-st")
-    target_link_libraries( "TestLauncher" PUBLIC "Tests.ECS-st" )
+if (DEFINED ANDROID)
+    add_library( "TestLauncher" SHARED ${CPP_SOURCES} )
+
+    if (TARGET "Tests.Base")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Base" )
+    endif()
+    if (TARGET "Tests.Scripting")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Scripting" )
+    endif()
+    if (TARGET "Tests.Threading")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Threading" )
+    endif()
+    if (TARGET "Tests.Networking")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Networking" )
+    endif()
+    if (TARGET "Tests.Serializing")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Serializing" )
+    endif()
+    if (TARGET "Tests.Platform")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Platform" )
+    endif()
+    if (TARGET "Tests.Graphics")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.Graphics" )
+    endif()
+    if (TARGET "Tests.GraphicsHL")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.GraphicsHL" )
+    endif()
+    if (TARGET "Tests.ECS-st")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.ECS-st" )
+    endif()
+    if (TARGET "Tests.AtlasTools")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.AtlasTools" )
+    endif()
+    if (TARGET "Tests.GeometryTools")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.GeometryTools" )
+    endif()
+    if (TARGET "Tests.VFS")
+        target_link_libraries( "TestLauncher" PUBLIC "Tests.VFS" )
+    endif()
+
+    if (TARGET "Perf.Base")
+        target_link_libraries( "TestLauncher" PUBLIC "Perf.Base" )
+    endif()
+    if (TARGET "Perf.Threading")
+        target_link_libraries( "TestLauncher" PUBLIC "Perf.Threading" )
+    endif()
+
+else()
+    set( ANDROID_SRC_PATH "${MAIN_SOURCE_DIR}/android/test/src/main" )
+    if (NOT EXISTS "${ANDROID_SRC_PATH}")
+        message( FATAL_ERROR "Android source is not exists in ${ANDROID_SRC_PATH}" )
+    endif()
+    file( GLOB_RECURSE JAVA_SOURCES "${ANDROID_SRC_PATH}/*.*" )
+
+    add_executable( "TestLauncher" ${CPP_SOURCES} ${JAVA_SOURCES} )
+
+    source_group( "Apk" FILES ${JAVA_SOURCES} )
+    set_source_files_properties( ${JAVA_SOURCES} PROPERTIES HEADER_FILE_ONLY TRUE )
 endif()
+
+source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${CPP_SOURCES} )
+target_link_libraries( "TestLauncher" PUBLIC "Platform" )
+set_property( TARGET "TestLauncher" PROPERTY FOLDER "Engine/Tests" )
diff --git a/AE/engine/tests/test_launcher/main.cpp b/AE/engine/tests/test_launcher/main.cpp
index 27f3e2a3..b96df541 100644
--- a/AE/engine/tests/test_launcher/main.cpp
+++ b/AE/engine/tests/test_launcher/main.cpp
@@ -1,6 +1,9 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "platform/Android/ApplicationAndroid.h"
+#include "platform/GLFW/ApplicationGLFW.h"
+#include "platform/WinAPI/ApplicationWinAPI.h"
+
 using namespace AE::App;
 
 extern int Test_Base ();
@@ -12,18 +15,28 @@ extern int Test_Platform (IApplication &app, IWindow &wnd);
 extern int Test_Graphics (IApplication &app, IWindow &wnd);
 extern int Test_GraphicsHL (IApplication &app, IWindow &wnd);
 extern int Test_ECSst ();
+extern int Test_VFS ();
+extern int Test_AtlasTools ();
+extern int Test_GeometryTools ();
+
+extern int PerformanceTests_Base ();
+extern int PerformanceTests_Threading ();
 
 
+class AppListener;
+
 class WndListener final : public IWindow::IWndListener
 {
 private:
     IApplication&   _app;
+    AppListener&    _al;
+    IWindow*        _wnd    = null;
 
 public:
-    WndListener (IApplication &app) __NE___ : _app{app} {}
-    ~WndListener ()                 __NE_OV {}
+    WndListener (IApplication &app, AppListener &al)    __NE___ : _app{app}, _al{al} {}
+    ~WndListener ()                                     __NE_OV {}
 
-    void OnStateChanged (IWindow &, EState state) __NE_OV
+    void  OnStateChanged (IWindow &, EState state)      __NE_OV
     {
         switch ( state )
         {
@@ -37,9 +50,49 @@ class WndListener final : public IWindow::IWndListener
         }
     }
 
-    void OnSurfaceCreated (IWindow &wnd) __NE_OV
+    void  OnSurfaceCreated (IWindow &wnd) __NE_OV;
+
+    void  OnSurfaceDestroyed (IWindow &) __NE_OV
+    {
+        AE_LOGI( "OnSurfaceDestroyed" );
+    }
+};
+
+
+class AppListener final : public IApplication::IAppListener
+{
+private:
+    WindowPtr       _window;
+    StdThread       _thread;
+    Atomic<bool>    _complete   {false};
+
+public:
+    AppListener ()                              __NE___ {}
+    ~AppListener ()                             __NE_OV {}
+
+    void  OnStart (IApplication &app)           __NE_OV
+    {
+        _window = app.CreateWindow( MakeUnique<WndListener>( app, *this ), Default );
+        CHECK_FATAL( _window );
+    }
+    void  OnStop (IApplication &)               __NE_OV {}
+
+    void  BeforeWndUpdate (IApplication &a)     __NE_OV {}
+    void  AfterWndUpdate (IApplication &a)      __NE_OV
+    {
+        if ( _complete.load() )
+        {
+            a.Terminate();
+        }
+    }
+
+    void  RunTests (IApplication &app, IWindow &wnd)
+    {
+        _thread = StdThread{ [this, a = &app, w = &wnd]() { _RunTests( *a, *w ); }};
+    }
+
+    void  _RunTests (IApplication &app, IWindow &wnd)
     {
-        AE_LOGI( "OnSurfaceCreated" );
         #ifdef AE_TEST_BASE
             Test_Base();
         #endif
@@ -56,50 +109,45 @@ class WndListener final : public IWindow::IWndListener
             Test_Networking();
         #endif
         #ifdef AE_TEST_PLATFORM
-            Test_Platform( _app, wnd );
+            Test_Platform( app, wnd );
         #endif
         #ifdef AE_TEST_GRAPHICS
-            Test_Graphics( _app, wnd );
+            Test_Graphics( app, wnd );
         #endif
         #ifdef AE_TEST_GRAPHICS_HL
-            Test_GraphicsHL( _app, wnd );
+        //  Test_GraphicsHL( app, wnd );
         #endif
         #ifdef AE_TEST_ECS_ST
             Test_ECSst();
         #endif
-    }
+        #ifdef AE_TEST_VFS
+        //  Test_VFS();
+        #endif
+        #ifdef AE_TEST_ATLAS_TOOLS
+            Test_AtlasTools();
+        #endif
+        #ifdef AE_TEST_GEOMETRY_TOOLS
+            Test_GeometryTools();
+        #endif
 
-    void OnSurfaceDestroyed (IWindow &) __NE_OV
-    {
-        AE_LOGI( "OnSurfaceDestroyed" );
+        #ifdef AE_PERFTEST_BASE
+            PerformanceTests_Base();
+        #endif
+        #ifdef AE_PERFTEST_THREADING
+            PerformanceTests_Threading();
+        #endif
+
+        _complete.store( true );
     }
 };
 
 
-class AppListener final : public IApplication::IAppListener
+void  WndListener::OnSurfaceCreated (IWindow &wnd) __NE___
 {
-private:
-    WindowPtr  _window;
-    uint        _counter    = 0;
-
-public:
-    AppListener ()                          __NE___ {}
-    ~AppListener ()                         __NE_OV {}
-
-    void OnStart (IApplication &app)        __NE_OV
-    {
-        _window = app.CreateWindow( MakeUnique<WndListener>( app ), Default );
-        CHECK_FATAL( _window );
-    }
-    void OnStop (IApplication &)            __NE_OV {}
+    AE_LOGI( "OnSurfaceCreated" );
 
-    void BeforeWndUpdate (IApplication &a)  __NE_OV {}
-    void AfterWndUpdate (IApplication &a)   __NE_OV
-    {
-        if ( ++_counter > 100 )
-            a.Terminate();
-    }
-};
+    _al.RunTests( _app, wnd );
+}
 
 
 Unique<IApplication::IAppListener>  AE_OnAppCreated ()
@@ -114,12 +162,16 @@ void  AE_OnAppDestroyed ()
     AE::Base::StaticLogger::Deinitialize(true);
 }
 
-extern "C" JNIEXPORT jint  JNI_OnLoad (JavaVM* vm, void*)
-{
-    return ApplicationAndroid::OnJniLoad( vm );
-}
+#ifdef AE_PLATFORM_ANDROID
 
-extern "C" void JNI_OnUnload (JavaVM *vm, void *)
-{
-    return ApplicationAndroid::OnJniUnload( vm );
-}
+    extern "C" JNIEXPORT jint  JNI_OnLoad (JavaVM* vm, void*)
+    {
+        return ApplicationAndroid::OnJniLoad( vm );
+    }
+
+    extern "C" void JNI_OnUnload (JavaVM* vm, void *)
+    {
+        return ApplicationAndroid::OnJniUnload( vm );
+    }
+
+#endif // AE_PLATFORM_ANDROID
diff --git a/AE/engine/tests/threading/UnitTest_AsyncDataSource.cpp b/AE/engine/tests/threading/UnitTest_AsyncDataSource.cpp
index 2fb478f8..8ae5e21f 100644
--- a/AE/engine/tests/threading/UnitTest_AsyncDataSource.cpp
+++ b/AE/engine/tests/threading/UnitTest_AsyncDataSource.cpp
@@ -17,7 +17,7 @@ namespace
 
         const ulong file_size   = 128ull << 20; // Mb
         const uint  buf_size    = 4u << 10;     // Kb
-        STATIC_ASSERT( IsMultipleOf( file_size, buf_size ));
+        StaticAssert( IsMultipleOf( file_size, buf_size ));
 
         const Path      fname {"ds11_data.bin"};
         {
@@ -79,7 +79,7 @@ namespace
                 TEST( req->IsCompleted() );
                 req = null;
 
-                TEST( scheduler->Wait( {task}, EThreadArray{ EThread::PerFrame } ));
+                TEST( scheduler->Wait( {task}, EThreadArray{ EThread::PerFrame }, c_MaxTimeout ));
                 TEST( task->Status() == EStatus::Completed );
 
                 pos += buf_size;
@@ -101,7 +101,7 @@ namespace
 
         const ulong file_size   = 32ull << 20;  // Mb
         const uint  buf_size    = 4u << 10;     // Kb
-        STATIC_ASSERT( IsMultipleOf( file_size, buf_size ));
+        StaticAssert( IsMultipleOf( file_size, buf_size ));
 
         const Path      fname {"ds12_data.bin"};
         {
@@ -133,11 +133,11 @@ namespace
             class ReadFileTask final : public IAsyncTask
             {
             private:
-                RC<RFile>   rfile;
-                ulong       pos     = 0;
+                RC<AsyncRDataSource>    rfile;
+                ulong                   pos     = 0;
 
             public:
-                ReadFileTask (RC<RFile> rfile) : IAsyncTask{ETaskQueue::PerFrame}, rfile{rfile} {}
+                ReadFileTask (RC<AsyncRDataSource> rfile) __NE___ : IAsyncTask{ETaskQueue::PerFrame}, rfile{RVRef(rfile)} {}
 
                 void  Run () __Th_OV
                 {
@@ -176,7 +176,7 @@ namespace
             };
 
             auto    task = scheduler->Run<ReadFileTask>( Tuple{rfile} );
-            TEST( scheduler->Wait( {task} ));
+            TEST( scheduler->Wait( {task}, c_MaxTimeout ));
             TEST( task->Status() == EStatus::Completed );
 
             task = null;
@@ -191,7 +191,7 @@ namespace
     {
         const ulong file_size   = 32ull << 20;  // Mb
         const uint  buf_size    = 4u << 10;     // Kb
-        STATIC_ASSERT( IsMultipleOf( file_size, buf_size ));
+        StaticAssert( IsMultipleOf( file_size, buf_size ));
 
         const Path      fname {"ds13_data.bin"};
         {
@@ -227,7 +227,8 @@ namespace
                 TEST( req );    // always non-null
 
                 auto    res = co_await req->AsPromise( ETaskQueue::PerFrame );
-                req = null;
+
+                req = null;     // request is not used anymore, but memory in 'res' must be alive
 
                 TEST( res.data != null );
                 TEST( res.dataSize == (pos < file_size ? buf_size : 0) );
@@ -258,10 +259,11 @@ namespace
             }));
 
         auto    task = scheduler->Run( AsyncReadDS_Test3_Coro< RFile, WFile >() );
-        TEST( scheduler->Wait({ AsyncTask{task} }));
+        TEST( scheduler->Wait( {AsyncTask{task}}, c_MaxTimeout ));
         TEST( AsyncTask{task}->Status() == EStatus::Completed );
     }
-#endif
+
+#endif // AE_HAS_COROUTINE
 
 
     template <typename RFile, typename WFile>
@@ -272,7 +274,7 @@ namespace
 
         const ulong file_size   = 128ull << 20; // Mb
         const uint  buf_size    = 4u << 10;     // Kb
-        STATIC_ASSERT( IsMultipleOf( file_size, buf_size ));
+        StaticAssert( IsMultipleOf( file_size, buf_size ));
 
         const Path      fname {"ds21_data.bin"};
         {
@@ -317,7 +319,7 @@ namespace
                 TEST( req->IsCompleted() );
                 req = null;
 
-                TEST( scheduler->Wait( {task}, EThreadArray{ EThread::PerFrame } ));
+                TEST( scheduler->Wait( {task}, EThreadArray{ EThread::PerFrame }, c_MaxTimeout ));
                 TEST( task->Status() == EStatus::Completed );
 
                 pos += buf_size;
diff --git a/AE/engine/tests/threading/UnitTest_AsyncMutex.cpp b/AE/engine/tests/threading/UnitTest_AsyncMutex.cpp
index c8c5b000..d4ef21f9 100644
--- a/AE/engine/tests/threading/UnitTest_AsyncMutex.cpp
+++ b/AE/engine/tests/threading/UnitTest_AsyncMutex.cpp
@@ -1,5 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
+// [Performance test](https://github.com/azhirnov/as-en/blob/dev/AE/engine/performance/threading/Perf_AsyncMutex.cpp)
+
 #include "UnitTest_Common.h"
 
 #ifndef AE_DISABLE_THREADS
@@ -26,7 +28,7 @@ namespace
         Test1_SharedData&   data;
         uint                counter = 0;
 
-        Test1_Task (Test1_SharedData &d) : IAsyncTask{ ETaskQueue::PerFrame }, data{d} {}
+        Test1_Task (Test1_SharedData &d) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, data{d} {}
 
         void  Run () __Th_OV
         {
@@ -51,8 +53,8 @@ namespace
     {
         LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
         Test1_SharedData    data;
         Array<AsyncTask>    tasks;
@@ -62,7 +64,7 @@ namespace
             tasks.push_back( scheduler->Run<Test1_Task>( Tuple{ArgRef(data)} ));
         }
 
-        TEST( scheduler->Wait( tasks ));
+        TEST( scheduler->Wait( tasks, c_MaxTimeout ));
 
         TEST( not data.mutex.IsLocked() );
         TEST( data.counter == (data.repeat_count * data.task_count) );
diff --git a/AE/engine/tests/threading/UnitTest_Common.h b/AE/engine/tests/threading/UnitTest_Common.h
index 045a6e7e..822dad95 100644
--- a/AE/engine/tests/threading/UnitTest_Common.h
+++ b/AE/engine/tests/threading/UnitTest_Common.h
@@ -11,15 +11,18 @@ using namespace AE::Threading;
 enum class WorkerQueueCount : uint {};
 enum class IOThreadCount    : uint {};
 
+static constexpr seconds  c_MaxTimeout {100};
+
 
 struct LocalTaskScheduler
 {
-    explicit LocalTaskScheduler (WorkerQueueCount)
+    explicit LocalTaskScheduler (WorkerQueueCount count)
     {
         TaskScheduler::Config   cfg;
-        cfg.maxPerFrameQueues   = 2;
+        cfg.maxPerFrameQueues   = ubyte(Max( 2u, uint(count) ));
+        cfg.mainThreadCoreId    = ECpuCoreId(0);
 
-        TaskScheduler::CreateInstance();
+        TaskScheduler::InstanceCtor::Create();
         TEST( Scheduler().Setup( cfg ));
     }
 
@@ -27,16 +30,17 @@ struct LocalTaskScheduler
     {
         TaskScheduler::Config   cfg;
         cfg.maxPerFrameQueues   = 1;
-        cfg.maxIOThreads        = ubyte(count);
+        cfg.maxIOThreads        = ubyte(Max( 1u, uint(count) ));
+        cfg.mainThreadCoreId    = ECpuCoreId(0);
 
-        TaskScheduler::CreateInstance();
+        TaskScheduler::InstanceCtor::Create();
         TEST( Scheduler().Setup( cfg ));
     }
 
     ~LocalTaskScheduler ()
     {
         Scheduler().Release();
-        TaskScheduler::DestroyInstance();
+        TaskScheduler::InstanceCtor::Destroy();
     }
 
     TaskScheduler* operator -> ()
diff --git a/AE/engine/tests/threading/UnitTest_Coroutine.cpp b/AE/engine/tests/threading/UnitTest_Coroutine.cpp
index 9a6396cb..908c683a 100644
--- a/AE/engine/tests/threading/UnitTest_Coroutine.cpp
+++ b/AE/engine/tests/threading/UnitTest_Coroutine.cpp
@@ -51,9 +51,9 @@ namespace
         scheduler->Run( task2, Tuple{ task1 });
         scheduler->Run( task1, Tuple{} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( task2->Status() == EStatus::Completed );
 
@@ -92,9 +92,9 @@ namespace
         scheduler->Run( task2 );
         scheduler->Run( task1 );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( task2->Status() == EStatus::Completed );
 
@@ -126,9 +126,9 @@ namespace
                             ( value, p0, p1, p2 );
         scheduler->Run( task1 );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, AsyncTask{p0}, AsyncTask{p1}, AsyncTask{p2} }));
+        TEST( scheduler->Wait( {task1, AsyncTask{p0}, AsyncTask{p1}, AsyncTask{p2}}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( AsyncTask{p0}->Status() == EStatus::Completed );
         TEST( AsyncTask{p1}->Status() == EStatus::Completed );
@@ -171,9 +171,9 @@ namespace
                             }
                             ( value, p0, p1, p2 ));
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ AsyncTask{p3}, AsyncTask{p0}, AsyncTask{p1}, AsyncTask{p2} }));
+        TEST( scheduler->Wait( {AsyncTask{p3}, AsyncTask{p0}, AsyncTask{p1}, AsyncTask{p2}}, c_MaxTimeout ));
         TEST( AsyncTask{p3}->Status() == EStatus::Completed );
         TEST( AsyncTask{p0}->Status() == EStatus::Completed );
         TEST( AsyncTask{p1}->Status() == EStatus::Completed );
@@ -212,9 +212,9 @@ namespace
                                 co_return "";
                             }( value, p0, p1 ));
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ AsyncTask{p0}, AsyncTask{p1}, AsyncTask{p2} }));
+        TEST( scheduler->Wait( {AsyncTask{p0}, AsyncTask{p1}, AsyncTask{p2}}, c_MaxTimeout ));
         TEST( AsyncTask{p0}->Status() == EStatus::Completed );
         TEST( AsyncTask{p1} == null );
         TEST( AsyncTask{p2}->Status() == EStatus::Canceled );
diff --git a/AE/engine/tests/threading/UnitTest_LfChunkList.cpp b/AE/engine/tests/threading/UnitTest_LfChunkList.cpp
new file mode 100644
index 00000000..1d5a0b5f
--- /dev/null
+++ b/AE/engine/tests/threading/UnitTest_LfChunkList.cpp
@@ -0,0 +1,38 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static void  LfChunkList_Test1 ()
+    {
+        using T = DebugInstanceCounter< usize, 1 >;
+
+        T::ClearStatistic();
+        {
+            UntypedAllocator    alloc;
+            LfChunkList<T,31>   list;
+            uint                i   = 0;
+
+            TEST( list.Init( alloc ));
+
+            for (uint j = 0; j < 10; ++j)
+            {
+                for (uint a = 0; a < 31; ++a) {
+                    TEST( list.Emplace( alloc, T{++i} ));
+                }
+            }
+
+            list.Destroy( alloc );
+        }
+        TEST( T::CheckStatistic() );
+    }
+}
+
+
+extern void UnitTest_LfChunkList ()
+{
+    LfChunkList_Test1();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/threading/UnitTest_LfFixedBlockAllocator.cpp b/AE/engine/tests/threading/UnitTest_LfFixedBlockAllocator.cpp
deleted file mode 100644
index 6dc62427..00000000
--- a/AE/engine/tests/threading/UnitTest_LfFixedBlockAllocator.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
-#include "UnitTest_Common.h"
-
-namespace
-{
-    static void  LfFixedBlockAllocator_Test1 ()
-    {
-        LfFixedBlockAllocator< 64*64, 16 >      lf_alloc{ 1_Kb, 8_b };
-
-        TEST( lf_alloc.MaxMemorySize() == 64_Mb );
-
-        Array< RstPtr<void> >       ptrs;
-
-        for (uint i = 0; i < 10'000; ++i) {
-            ptrs.push_back( lf_alloc.Alloc() );
-        }
-
-        for (uint i = 0; i < 1'000; ++i)
-        {
-            TEST( lf_alloc.Dealloc( ptrs.back() ));
-            ptrs.pop_back();
-        }
-
-        for (auto ptr : ptrs) {
-            TEST( lf_alloc.Dealloc( ptr ));
-        }
-        ptrs.clear();
-
-        lf_alloc.Release( true );
-    }
-}
-
-
-extern void UnitTest_LfFixedBlockAllocator ()
-{
-    LfFixedBlockAllocator_Test1();
-
-    TEST_PASSED();
-}
diff --git a/AE/engine/tests/threading/UnitTest_LfFixedBlockAllocator3.cpp b/AE/engine/tests/threading/UnitTest_LfFixedBlockAllocator3.cpp
new file mode 100644
index 00000000..1a734b0b
--- /dev/null
+++ b/AE/engine/tests/threading/UnitTest_LfFixedBlockAllocator3.cpp
@@ -0,0 +1,43 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+// [Multithreading test]()
+// [Performance test](https://github.com/azhirnov/as-en/blob/dev/AE/engine/performance/threading/Perf_MtAllocator.cpp)
+
+#include "UnitTest_Common.h"
+
+namespace
+{
+    static void  LfFixedBlockAllocator3_Test1 ()
+    {
+        LfFixedBlockAllocator< usize{64*64_b}, 16 >     lf_alloc{ 1_Kb, 8_b };
+
+        TEST( lf_alloc.MaxMemorySize() == 64_Mb );
+
+        Array< RstPtr<void> >       ptrs;
+
+        for (uint i = 0; i < 10'000; ++i) {
+            ptrs.push_back( lf_alloc.AllocBlock() );
+        }
+
+        for (uint i = 0; i < 1'000; ++i)
+        {
+            TEST( lf_alloc.DeallocBlock( ptrs.back() ));
+            ptrs.pop_back();
+        }
+
+        for (auto ptr : ptrs) {
+            TEST( lf_alloc.DeallocBlock( ptr ));
+        }
+        ptrs.clear();
+
+        lf_alloc.Release( True{} );
+    }
+}
+
+
+extern void UnitTest_LfFixedBlockAllocator3 ()
+{
+    LfFixedBlockAllocator3_Test1();
+
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/threading/UnitTest_LfIndexedPool3.cpp b/AE/engine/tests/threading/UnitTest_LfIndexedPool3.cpp
index 2df57035..a8a6d848 100644
--- a/AE/engine/tests/threading/UnitTest_LfIndexedPool3.cpp
+++ b/AE/engine/tests/threading/UnitTest_LfIndexedPool3.cpp
@@ -1,17 +1,20 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
+// [Multithreading test](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/lfas/Tests/Test_LfIndexedPool3.cpp)
+// [Performance test]()
+
 #include "UnitTest_Common.h"
 
 namespace
 {
-    static void  LfIndexedPool3_Test1 ()
+    static void  LfIndexedPool_Test1 ()
     {
         using T = DebugInstanceCounter< usize, 1 >;
 
         T::ClearStatistic();
         {
             constexpr uint                          count = 1u << 10;
-            LfIndexedPool3< T, uint, count/16, 16 > pool;
+            LfIndexedPool< T, uint, count/16, 16 >  pool;
             Array<uint>                             indices;
 
             indices.reserve( count );
@@ -49,12 +52,49 @@ namespace
         }
         TEST( T::CheckStatistic() );
     }
+
+
+    static void  LfIndexedPool_Test2 ()
+    {
+        struct Value {
+            int     a;
+            float   b;
+            uint    c;
+        };
+        LfIndexedPool< Value, uint, 128, 16 >   pool;
+
+        for (usize i = 0; i < pool.capacity(); ++i)
+        {
+            auto    a = pool.Assign();
+            TEST( i == a );
+        }
+
+        {
+            uint    b0  = 125;
+            auto*   b1  = pool.At( b0 );
+            auto    b2  = pool.IndexOf( b1 );
+            TEST_Eq( b2, b0 );
+        }{
+            uint    b0  = 500;
+            auto*   b1  = pool.At( b0 );
+            auto    b2  = pool.IndexOf( &b1->b );
+            TEST_Eq( b2, b0 );
+        }{
+            uint    b0  = 600;
+            auto*   b1  = pool.At( b0 );
+            auto    b2  = pool.IndexOf( b1 );
+            TEST_Eq( b2, b0 );
+        }
+
+        pool.Release( False{} );
+    }
 }
 
 
-extern void UnitTest_LfIndexedPool3 ()
+extern void UnitTest_LfIndexedPool ()
 {
-    LfIndexedPool3_Test1();
+    LfIndexedPool_Test1();
+    LfIndexedPool_Test2();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/threading/UnitTest_LfLinearAllocator.cpp b/AE/engine/tests/threading/UnitTest_LfLinearAllocator.cpp
index 968ac4e9..52559071 100644
--- a/AE/engine/tests/threading/UnitTest_LfLinearAllocator.cpp
+++ b/AE/engine/tests/threading/UnitTest_LfLinearAllocator.cpp
@@ -10,18 +10,20 @@ namespace
         static constexpr uint   MaxThreads  = 8;
         static constexpr uint   ElemSize    = 8;
 
-        FixedArray< StdThread, MaxThreads >     worker_thread;
+        StaticArray< StdThread, MaxThreads >    worker_thread;
         StaticArray< Array<void*>, MaxThreads > thread_data;
-        LfLinearAllocator< 4<<10 >              alloc;
+        LfLinearAllocator< usize{2_Mb} >        alloc;
 
         for (uint i = 0; i < MaxThreads; ++i)
         {
-            worker_thread.emplace_back( StdThread{
+            thread_data[i].reserve( 1024 );
+
+            worker_thread[i] = StdThread{
                 [&alloc, data = &thread_data[i]] ()
                 {
                     for (;;)
                     {
-                        ThreadUtils::Yield();
+                        ThreadUtils::Sleep_1us();
 
                         void*   ptr = alloc.Allocate( SizeAndAlign{ Bytes{ElemSize}, 8_b });
                         if ( ptr == null )
@@ -31,7 +33,7 @@ namespace
                         data->push_back( ptr );
                     }
                 }
-            });
+            };
         }
 
         for (uint i = 0; i < MaxThreads; ++i) {
@@ -43,7 +45,6 @@ namespace
             for (usize i = 0; i < items.size(); ++i)
             {
                 StaticArray< ubyte, ElemSize >  ref;
-
                 ref.fill( ubyte(i) );
 
                 TEST( MemEqual( ref.data(), items[i], Bytes{ElemSize} ));
diff --git a/AE/engine/tests/threading/UnitTest_LfStaticIndexedPool.cpp b/AE/engine/tests/threading/UnitTest_LfStaticIndexedPool.cpp
index 502661b1..c50ba062 100644
--- a/AE/engine/tests/threading/UnitTest_LfStaticIndexedPool.cpp
+++ b/AE/engine/tests/threading/UnitTest_LfStaticIndexedPool.cpp
@@ -49,12 +49,49 @@ namespace
         }
         TEST( T::CheckStatistic() );
     }
+
+
+    static void  LfStaticIndexedPool_Test2 ()
+    {
+        struct Value {
+            int     a;
+            float   b;
+            uint    c;
+        };
+        LfStaticIndexedPool< Value, uint, 128*8 >   pool;
+
+        for (usize i = 0; i < pool.capacity(); ++i)
+        {
+            auto    a = pool.Assign();
+            TEST( a != UMax );  // unordered
+        }
+
+        {
+            uint    b0  = 125;
+            auto*   b1  = pool.At( b0 );
+            auto    b2  = pool.IndexOf( b1 );
+            TEST_Eq( b2, b0 );
+        }{
+            uint    b0  = 500;
+            auto*   b1  = pool.At( b0 );
+            auto    b2  = pool.IndexOf( &b1->b );
+            TEST_Eq( b2, b0 );
+        }{
+            uint    b0  = 600;
+            auto*   b1  = pool.At( b0 );
+            auto    b2  = pool.IndexOf( b1 );
+            TEST_Eq( b2, b0 );
+        }
+
+        pool.Release( False{} );
+    }
 }
 
 
 extern void UnitTest_LfStaticIndexedPool ()
 {
     LfStaticIndexedPool_Test1();
+    LfStaticIndexedPool_Test2();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/threading/UnitTest_LfStaticPool.cpp b/AE/engine/tests/threading/UnitTest_LfStaticPool.cpp
index 6c95d02b..ff71dac1 100644
--- a/AE/engine/tests/threading/UnitTest_LfStaticPool.cpp
+++ b/AE/engine/tests/threading/UnitTest_LfStaticPool.cpp
@@ -1,5 +1,8 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
+// [Multithreading test](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/lfas/Tests/Test_LfStaticPool.cpp)
+// [Performance test]()
+
 #include "UnitTest_Common.h"
 
 namespace
diff --git a/AE/engine/tests/threading/UnitTest_LfTaskQueue.cpp b/AE/engine/tests/threading/UnitTest_LfTaskQueue.cpp
index 6233c722..bbbb420b 100644
--- a/AE/engine/tests/threading/UnitTest_LfTaskQueue.cpp
+++ b/AE/engine/tests/threading/UnitTest_LfTaskQueue.cpp
@@ -9,7 +9,7 @@ namespace
     class DummyTask final : public IAsyncTask
     {
     public:
-        DummyTask (uint id) : IAsyncTask{ETaskQueue::PerFrame}
+        DummyTask (uint id) __NE___ : IAsyncTask{ETaskQueue::PerFrame}
         {
             Unused( id );
             _DbgSet( EStatus::Pending );
@@ -26,21 +26,22 @@ namespace
     {
         LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
 
-        LfTaskQueue     q{ Default, "" };
-        const uint      count = 1'000;
+        LfTaskQueue     q       { Default, "" };
+        const uint      count   = 1'000;
+        const auto      seed    = scheduler->GetDefaultSeed();
 
         for (uint i = 0; i < count; ++i) {
-            q.Add( MakeRC<DummyTask>( i ), 0 );
+            q.Add( MakeRC<DummyTask>( i ), seed );
         }
 
-        for (; q.Process( 0 );) {}
+        for (; q.Process( seed );) {}
     }
 
 
     static void  LfTaskQueue_Test2 ()
     {
-        LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
-        LfTaskQueue         q{ Default, "" };
+        LocalTaskScheduler  scheduler   {WorkerQueueCount(1)};
+        LfTaskQueue         q           { Default, "" };
 
         const uint  thread_count = Max( 2u, ThreadUtils::MaxThreadCount() );
 
@@ -51,16 +52,18 @@ namespace
         {
             threads.push_back( StdThread{ [&q, tid]()
                 {
+                    const auto  seed = Scheduler().GetDefaultSeed();
+
                     for (uint c = 0; c < 1000; ++c)
                     {
                         const uint  count = (tid & 0xF) * 10;
 
                         for (uint i = 0; i < count; ++i) {
-                            q.Add( MakeRC<DummyTask>( i ), 0 );
+                            q.Add( MakeRC<DummyTask>( i ), seed );
                         }
 
                         for (uint i = 0; i < 100; ++i) {
-                            if ( q.Process( 0 ))
+                            if ( q.Process( seed ))
                                 i = 0;
                         }
                     }
@@ -71,7 +74,8 @@ namespace
             t.join();
         }
 
-        for (; q.Process( 0 );) {}
+        const auto  seed = Scheduler().GetDefaultSeed();
+        for (; q.Process( seed );) {}
     }
 }
 
diff --git a/AE/engine/tests/threading/UnitTest_Promise.cpp b/AE/engine/tests/threading/UnitTest_Promise.cpp
index 2437e294..8711aa73 100644
--- a/AE/engine/tests/threading/UnitTest_Promise.cpp
+++ b/AE/engine/tests/threading/UnitTest_Promise.cpp
@@ -11,9 +11,9 @@ namespace
     template <typename T>
     static void  TestResult (Promise<T> &p, const T &expected)
     {
-        auto    task = AsyncTask{ p.Then( [expected] (const T& res) { TEST( res == expected ); })};
+        auto    task = AsyncTask{ p.Then( [expected] (const T& res) __NE___ { TEST( res == expected ); })};
 
-        TEST( Scheduler().Wait( {task} ));
+        TEST( Scheduler().Wait( {task}, c_MaxTimeout ));
         TEST( task->Status() == EStatus::Completed );
     }
 
@@ -21,10 +21,10 @@ namespace
     static void  Promise_Test1 ()
     {
         LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
         auto p = MakePromise( [] () { return "a"s; })
-            .Then([] (const String &in) { return in + "b"; });
+            .Then([] (const String &in) __NE___ { return in + "b"; });
 
         TestResult( p, "ab"s );
     }
@@ -42,9 +42,9 @@ namespace
         TEST( AsyncTask{p0}->Status() == EStatus::Pending );
         TEST( AsyncTask{p1}->Status() == EStatus::Completed );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        auto p4 = p3.Then( [] (const Tuple<String, String, uint> &in) {
+        auto p4 = p3.Then( [] (const Tuple<String, String, uint> &in) __NE___ {
                 return in.Get<0>() + in.Get<1>() + ToString( in.Get<2>() );
             });
 
@@ -55,7 +55,7 @@ namespace
     static void  Promise_Test3 ()
     {
         LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
         auto p0 = MakePromise( [] () { return PromiseResult<String>{ "a"s }; });
         auto p1 = MakePromise( [] () -> PromiseResult<String> { return CancelPromise; });   // canceled promise
@@ -64,11 +64,11 @@ namespace
         StdAtomic<bool> p3_ok = false;
         StdAtomic<bool> p4_ok = false;
 
-        auto p2 = p0.Then( [&p2_ok] (const String &in) { p2_ok = (in == "a"); });
-        auto p3 = p1.Except( [&p3_ok] () { p3_ok = true; });
-        auto p4 = p3.Then( [&p4_ok] () { p4_ok = true; });
+        auto p2 = p0.Then( [&p2_ok] (const String &in) __NE___ { p2_ok = (in == "a"); });
+        auto p3 = p1.Except( [&p3_ok] () __NE___ { p3_ok = true; });
+        auto p4 = p3.Then( [&p4_ok] () __NE___ { p4_ok = true; });
 
-        TEST( Scheduler().Wait({ AsyncTask(p2), AsyncTask(p3), AsyncTask(p4) }));
+        TEST( Scheduler().Wait( {AsyncTask(p2), AsyncTask(p3), AsyncTask(p4)}, c_MaxTimeout ));
         TEST( AsyncTask(p0)->Status() == EStatus::Completed );
         TEST( AsyncTask(p1)->Status() == EStatus::Failed );
         TEST( AsyncTask(p2)->Status() == EStatus::Completed );
@@ -83,7 +83,7 @@ namespace
     static void  Promise_Test4 ()
     {
         LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
         Promise<int> pe;
 
@@ -92,7 +92,7 @@ namespace
         auto p2 = MakePromise( [] () { return 1u; });
         auto p3 = MakePromiseFrom( p0, p1, p2, pe );
 
-        auto p4 = p3.Then( [] (const Tuple<String, String, uint, int> &in) {
+        auto p4 = p3.Then( [] (const Tuple<String, String, uint, int> &in) __NE___ {
                 return in.Get<0>()  + '.' + in.Get<1>() + '.' + ToString( in.Get<2>() ) + '.' + ToString( in.Get<3>() );
             });
 
@@ -103,22 +103,22 @@ namespace
     static void  Promise_Test5 ()
     {
         LocalTaskScheduler  scheduler {WorkerQueueCount(1)};
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
         auto p0 = MakePromise( [] () { return PromiseResult<String>{ "a"s }; });
         auto p1 = MakePromise( [] () -> PromiseResult<String> { return CancelPromise; });   // canceled promise
 
-        TEST( Scheduler().Wait({ AsyncTask(p0), AsyncTask(p1) }));
+        TEST( Scheduler().Wait( {AsyncTask(p0), AsyncTask(p1)}, c_MaxTimeout ));
         TEST( AsyncTask(p0)->Status() == EStatus::Completed );
         TEST( AsyncTask(p1)->Status() == EStatus::Failed );
 
         StdAtomic<bool> p2_ok = false;
         StdAtomic<bool> p3_ok = false;
 
-        auto p2 = p1.Except( [&p2_ok] () { p2_ok = true; });
-        auto p3 = p2.Then( [&p3_ok] () { p3_ok = true; });
+        auto p2 = p1.Except( [&p2_ok] () __NE___ { p2_ok = true; });
+        auto p3 = p2.Then( [&p3_ok] () __NE___ { p3_ok = true; });
 
-        TEST( Scheduler().Wait({ AsyncTask(p3) }));
+        TEST( Scheduler().Wait( {AsyncTask(p3)}, c_MaxTimeout ));
 
         TEST( p2_ok );
         TEST( p3_ok );
diff --git a/AE/engine/tests/threading/UnitTest_SpinLock.cpp b/AE/engine/tests/threading/UnitTest_SpinLock.cpp
index 86ce7559..ba610872 100644
--- a/AE/engine/tests/threading/UnitTest_SpinLock.cpp
+++ b/AE/engine/tests/threading/UnitTest_SpinLock.cpp
@@ -8,20 +8,98 @@ namespace
     {
         using LackablePtr   = PtrWithSpinLockRelaxed< int >;
 
-        int         i = 0;
-        LackablePtr p {&i};
+        int         a = 0;
+        LackablePtr p {&a};
 
-        TEST( p.get() == &i );
+        TEST( p.get() == &a );
 
         p.lock();
         TEST( not p.try_lock() );
-        TEST( p.IsLocked() );
-        TEST( p.get() == &i );
+        TEST( p.is_locked() );
+        TEST( p.get() == &a );
         p.unlock();
 
-        TEST( p.get() == &i );
+        TEST( p.get() == &a );
         TEST( p.try_lock() );
         p.unlock();
+
+        int b = 1;
+        TEST( p.try_set( &b ));
+        TEST( p.get() == &b );
+        TEST( p.is_unlocked() );
+
+        TEST( p.try_lock() );
+        TEST( p.get() == &b );
+        TEST( p.try_set( &a ));
+        TEST( p.get() == &a );
+        p.unlock();
+    }
+
+
+    static void  SpinLock_Test1 ()
+    {
+        SpinLock    guard;
+
+        TEST( guard.try_lock() );
+        TEST( guard.is_locked() );
+        guard.unlock();
+
+        TEST( guard.is_unlocked() );
+
+        TEST( guard.try_lock() );
+        TEST( guard.is_locked() );
+        TEST( not guard.is_unlocked() );
+        guard.unlock();
+
+        TEST( guard.is_unlocked() );
+    }
+
+
+    static void  RWSpinLock_Test1 ()
+    {
+        RWSpinLock  guard;
+
+        TEST( guard.try_lock() );
+        TEST( guard.is_locked() );
+        guard.unlock();
+
+        TEST( guard.is_unlocked() );
+
+        TEST( guard.try_lock() );
+        TEST( guard.is_locked() );
+        TEST( not guard.is_unlocked() );
+        TEST( not guard.try_lock_shared() );
+        guard.unlock();
+
+        TEST( guard.is_unlocked() );
+
+        TEST( guard.try_lock_shared() );
+        TEST( not guard.is_unlocked() );
+        TEST( not guard.is_locked() );
+        TEST( guard.is_shared_locked() );
+        guard.unlock_shared();
+
+        TEST( guard.try_lock_shared() );
+        TEST( guard.try_lock_shared() );
+        TEST( guard.try_lock_shared() );
+
+        TEST( not guard.try_lock() );
+
+        guard.unlock_shared();
+        guard.unlock_shared();
+        guard.unlock_shared();
+
+        TEST( guard.is_unlocked() );
+
+        TEST( guard.try_lock() );
+        TEST( guard.try_exclusive_to_shared() );
+        TEST( guard.is_shared_locked() );
+        guard.unlock_shared();
+
+        TEST( guard.try_lock_shared() );
+        TEST( guard.try_shared_to_exclusive() );
+        TEST( guard.is_locked() );
+        guard.unlock();
     }
 }
 
@@ -30,5 +108,9 @@ extern void UnitTest_SpinLock ()
 {
     PtrSpinLock_Test1();
 
+    SpinLock_Test1();
+
+    RWSpinLock_Test1();
+
     TEST_PASSED();
 }
diff --git a/AE/engine/tests/threading/UnitTest_Synchronized.cpp b/AE/engine/tests/threading/UnitTest_Synchronized.cpp
index 93ba73ae..f67620b7 100644
--- a/AE/engine/tests/threading/UnitTest_Synchronized.cpp
+++ b/AE/engine/tests/threading/UnitTest_Synchronized.cpp
@@ -42,16 +42,16 @@ namespace
         int     _value  = 0;
 
     public:
-        ProtectedObject ()                                                      {}
-        explicit ProtectedObject (int val) : _value{val}                        {}
+        ProtectedObject ()                                      __NE___ {}
+        explicit ProtectedObject (int val)                      __NE___ : _value{val}   {}
 
-        ProtectedObject (const ProtectedObject &other) : _value{other._value}   { s_Events->push_back( Event::ObjCopyCtor ); }
+        ProtectedObject (const ProtectedObject &other)          __NE___ : _value{other._value}  { s_Events->push_back( Event::ObjCopyCtor ); }
 
-        ProtectedObject&  operator = (const ProtectedObject &)                  = delete;
-        ProtectedObject&  operator = (ProtectedObject &&)                       = delete;
+        ProtectedObject&  operator = (const ProtectedObject &)          = delete;
+        ProtectedObject&  operator = (ProtectedObject &&)               = delete;
 
-            void    Set (int val)                                               { _value = val;  s_Events->push_back( Event::ObjSet ); }
-        ND_ int     Get ()                                              const   { s_Events->push_back( Event::ObjGet );  return _value; }
+            void    Set (int val)                               __NE___ { _value = val;  s_Events->push_back( Event::ObjSet ); }
+        ND_ int     Get ()                                      C_NE___ { s_Events->push_back( Event::ObjGet );  return _value; }
     };
 
 
diff --git a/AE/engine/tests/threading/UnitTest_TaskDeps.cpp b/AE/engine/tests/threading/UnitTest_TaskDeps.cpp
index 202485f0..785c09c5 100644
--- a/AE/engine/tests/threading/UnitTest_TaskDeps.cpp
+++ b/AE/engine/tests/threading/UnitTest_TaskDeps.cpp
@@ -28,7 +28,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test1_Task1 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test1_Task1 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -45,7 +45,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test1_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test1_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -65,9 +65,9 @@ namespace
         AsyncTask   task1   = scheduler->Run<Test1_Task1>( Tuple{ArgRef(value)} );
         AsyncTask   task2   = scheduler->Run<Test1_Task2>( Tuple{ArgRef(value)}, Tuple{task1} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( task2->Status() == EStatus::Completed );
 
@@ -84,7 +84,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test2_Task1 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test2_Task1 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -108,7 +108,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test2_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test2_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -138,9 +138,9 @@ namespace
 
         AsyncTask       task2   = scheduler->Run<Test2_Task2>( Tuple{ArgRef(value)}, Tuple{StrongDep{task1}} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Canceled );
         TEST( task2->Status() == EStatus::Canceled );
 
@@ -157,7 +157,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test3_Task1 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test3_Task1 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -181,7 +181,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test3_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test3_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -211,9 +211,9 @@ namespace
 
         AsyncTask   task2   = scheduler->Run<Test3_Task2>( Tuple{ArgRef(value)}, Tuple{WeakDep{task1}} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Canceled );
         TEST( task2->Status() == EStatus::Completed );
 
@@ -247,7 +247,7 @@ namespace
         public:
             RC<Test4_TaskDepManager>    _mngr;
 
-            UpdateTask (const RC<Test4_TaskDepManager> &mngr) : IAsyncTask{ ETaskQueue::PerFrame }, _mngr{mngr}
+            UpdateTask (const RC<Test4_TaskDepManager> &mngr) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, _mngr{mngr}
             {}
 
             void  Run () __Th_OV
@@ -303,7 +303,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test4_Task1 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test4_Task1 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -327,7 +327,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test4_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test4_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -360,15 +360,15 @@ namespace
         AsyncTask   task1   = scheduler->Run<Test4_Task1>( Tuple{ArgRef(value)} );
         AsyncTask   task2   = scheduler->Run<Test4_Task2>( Tuple{ArgRef(value)}, Tuple{task1, custom_dep} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait( {task1} ));
+        TEST( scheduler->Wait( {task1}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
-        TEST( not scheduler->Wait( {task2}, Default, nanoseconds{100'000} ));
+        TEST( not scheduler->Wait( {task2}, nanoseconds{100'000} ));
 
         flag.store( true );
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task2->Status() == EStatus::Completed );
         TEST( flag.load() == true );
 
@@ -381,7 +381,7 @@ namespace
 
 extern void UnitTest_TaskDeps ()
 {
-    STATIC_ASSERT( alignof(IAsyncTask) == AE_CACHE_LINE );
+    StaticAssert( alignof(IAsyncTask) == AE_CACHE_LINE );
 
     TaskDeps_Test1();
     TaskDeps_Test2();
diff --git a/AE/engine/tests/threading/UnitTest_TaskUsage.cpp b/AE/engine/tests/threading/UnitTest_TaskUsage.cpp
index 2d495315..6512093a 100644
--- a/AE/engine/tests/threading/UnitTest_TaskUsage.cpp
+++ b/AE/engine/tests/threading/UnitTest_TaskUsage.cpp
@@ -30,7 +30,7 @@ namespace
         uint        iter    = 0;
 
     public:
-        Test1_Task1 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test1_Task1 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -67,7 +67,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test1_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test1_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -86,9 +86,9 @@ namespace
         ExeOrder    value;  // access to value protected by internal synchronizations
         auto        task1 = Cast<Test1_Task1>( scheduler->Run<Test1_Task1>( Tuple{ArgRef(value)} ));
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1 }));
+        TEST( scheduler->Wait( {task1}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
 
         TEST( value.guard.try_lock() );
@@ -101,7 +101,7 @@ namespace
 
         AsyncTask   task2 = scheduler->Run<Test1_Task2>( Tuple{ArgRef(value)}, Tuple{StrongDep{task1}} );
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( task2->Status() == EStatus::Completed );
 
@@ -120,7 +120,7 @@ namespace
         uint        iter    = 0;
 
     public:
-        Test2_Task1 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test2_Task1 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -153,7 +153,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test2_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test2_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -173,9 +173,9 @@ namespace
         AsyncTask   task1   = scheduler->Run<Test2_Task1>( Tuple{ArgRef(value)} );
         AsyncTask   task2   = scheduler->Run<Test2_Task2>( Tuple{ArgRef(value)}, Tuple{StrongDep{task1}} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( task2->Status() == EStatus::Completed );
 
@@ -194,7 +194,7 @@ namespace
         const uint  id;
 
     public:
-        Test3_Task1 (ExeOrder &val, uint id) : IAsyncTask{ ETaskQueue::PerFrame }, value{val}, id{id} {}
+        Test3_Task1 (ExeOrder &val, uint id) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val}, id{id} {}
 
         void  Run () __Th_OV
         {
@@ -213,7 +213,7 @@ namespace
         uint        iter    = 0;
 
     public:
-        Test3_Task2 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test3_Task2 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -256,7 +256,7 @@ namespace
     public:
         ExeOrder&   value;
 
-        Test3_Task3 (ExeOrder &val) : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
+        Test3_Task3 (ExeOrder &val) __NE___ : IAsyncTask{ ETaskQueue::PerFrame }, value{val} {}
 
         void  Run () __Th_OV
         {
@@ -276,10 +276,10 @@ namespace
         AsyncTask   task1   = scheduler->Run<Test3_Task2>( Tuple{ArgRef(value)} );
         AsyncTask   task2   = scheduler->Run<Test3_Task3>( Tuple{ArgRef(value)}, Tuple{StrongDep{task1}} );
 
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
-        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig::CreateNonSleep() ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
+        scheduler->AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{} ));
 
-        TEST( scheduler->Wait({ task1, task2 }));
+        TEST( scheduler->Wait( {task1, task2}, c_MaxTimeout ));
         TEST( task1->Status() == EStatus::Completed );
         TEST( task2->Status() == EStatus::Completed );
 
diff --git a/AE/engine/tests/threading/UnitTest_TsSharedMem.cpp b/AE/engine/tests/threading/UnitTest_TsSharedMem.cpp
index 734b0b4a..72b4b5b4 100644
--- a/AE/engine/tests/threading/UnitTest_TsSharedMem.cpp
+++ b/AE/engine/tests/threading/UnitTest_TsSharedMem.cpp
@@ -6,7 +6,7 @@ namespace
 {
     static void  TsSharedMem_Test1 ()
     {
-        using Alloc_t = AllocatorImpl< UntypedAllocator >;
+        using Alloc_t = IAllocatorAdaptor< UntypedAllocator >;
 
         RC<IAllocator>  alloc = MakeRC<Alloc_t>();
         {
@@ -14,7 +14,7 @@ namespace
             TEST( mem );
             TEST( mem->Size() == 1024_b );
             TEST( mem->Align() == 16_b );
-            TEST( mem->Allocator() == alloc );
+            TEST( mem->AllocatorRC() == alloc );
         }
         TEST( alloc.use_count() == 1 );
     }
diff --git a/AE/engine/tests/threading/main.cpp b/AE/engine/tests/threading/main.cpp
index 3f55c010..6b2f6918 100644
--- a/AE/engine/tests/threading/main.cpp
+++ b/AE/engine/tests/threading/main.cpp
@@ -8,14 +8,14 @@ extern void UnitTest_Promise ();
 extern void UnitTest_TaskDeps ();
 extern void UnitTest_TaskUsage ();
 
-extern void UnitTest_LfIndexedPool2 ();
-extern void UnitTest_LfIndexedPool3 ();
+extern void UnitTest_LfChunkList ();
+extern void UnitTest_LfIndexedPool ();
 extern void UnitTest_LfStaticPool ();
 extern void UnitTest_LfStaticIndexedPool ();
 extern void UnitTest_LfTaskQueue ();
 extern void UnitTest_LfStaticQueue ();
 
-extern void UnitTest_LfFixedBlockAllocator ();
+extern void UnitTest_LfFixedBlockAllocator3 ();
 extern void UnitTest_LfLinearAllocator ();
 
 extern void UnitTest_SpinLock ();
@@ -34,20 +34,20 @@ int main ()
     AE::Base::StaticLogger::LoggerDbgScope log{};
 
     // minimize disk usage for debug build
-  #ifdef AE_RELEASE
+  #if defined(AE_RELEASE) and not defined(AE_PLATFORM_ANDROID)
     UnitTest_AsyncDataSource();
   #endif
 
     UnitTest_TsSharedMem();
 
-    UnitTest_LfIndexedPool2();
-    UnitTest_LfIndexedPool3();
+    UnitTest_LfChunkList();
+    UnitTest_LfIndexedPool();
     UnitTest_LfStaticPool();
     UnitTest_LfStaticIndexedPool();
     UnitTest_LfTaskQueue();
     UnitTest_LfStaticQueue();
 
-    UnitTest_LfFixedBlockAllocator();
+    UnitTest_LfFixedBlockAllocator3();
     UnitTest_LfLinearAllocator();
 
     UnitTest_SpinLock();
diff --git a/AE/engine/tests/vfs/UnitTest_ArchiveStorage.cpp b/AE/engine/tests/vfs/UnitTest_ArchiveStorage.cpp
index 37944425..51a9a955 100644
--- a/AE/engine/tests/vfs/UnitTest_ArchiveStorage.cpp
+++ b/AE/engine/tests/vfs/UnitTest_ArchiveStorage.cpp
@@ -1,12 +1,8 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-#include "../shared/UnitTest_Shared.h"
-#include "base/Math/Random.h"
-#include "base/DataSource/FileStream.h"
-#include "base/DataSource/DataSourceAsStream.h"
+#include "UnitTest_Common.h"
 #include "vfs/Archive/ArchiveStaticStorage.h"
 #include "vfs/Archive/ArchivePacker.h"
-using namespace AE::VFS;
 
 namespace
 {
@@ -98,24 +94,24 @@ namespace
 
         // read archive
         {
-            ArchiveStaticStorage    storage;
-            TEST( storage.Create( arch ));
+            auto    storage = VirtualFileStorageFactory::CreateStaticArchive( arch );
+            TEST( storage );
 
             {
                 RC<RStream>     stream;
-                TEST( storage.Open( OUT stream, name1 ));
+                TEST( storage->Open( OUT stream, name1 ));
                 TEST( CompareFiles( file1, *stream, file1_size ));
             }{
                 RC<RStream>     stream;
-                TEST( storage.Open( OUT stream, name2 ));
+                TEST( storage->Open( OUT stream, name2 ));
                 TEST( CompareFiles( file2, *stream, file2_size ));
             }{
                 RC<RStream>     stream;
-                TEST( storage.Open( OUT stream, name3 ));
+                TEST( storage->Open( OUT stream, name3 ));
                 TEST( CompareFiles( file3, *stream, file3_size ));
             }{
                 RC<RDataSource> ds;
-                TEST( storage.Open( OUT ds, name4 ));
+                TEST( storage->Open( OUT ds, name4 ));
                 TEST( CompareFiles( file4, *ds, file4_size ));
             }
         }
@@ -125,7 +121,7 @@ namespace
 extern void UnitTest_ArchiveStorage ()
 {
     const Path  curr    = FileSystem::CurrentPath();
-    const Path  folder  {AE_CURRENT_DIR "/vfs_test"};
+    const Path  folder  {AE_CURRENT_DIR "/vfs_test1"};
 
     FileSystem::RemoveAll( folder );
     FileSystem::CreateDirectories( folder );
diff --git a/AE/engine/tests/vfs/UnitTest_Common.h b/AE/engine/tests/vfs/UnitTest_Common.h
new file mode 100644
index 00000000..5c60e1fc
--- /dev/null
+++ b/AE/engine/tests/vfs/UnitTest_Common.h
@@ -0,0 +1,38 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#pragma once
+
+#include "pch/VFS.h"
+#include "../shared/UnitTest_Shared.h"
+
+using namespace AE::Threading;
+using namespace AE::VFS;
+
+static constexpr seconds    c_MaxTimeout {100};
+
+
+struct LocalVFS
+{
+    LocalVFS ()
+    {
+        TaskScheduler::Config   cfg;
+        cfg.maxIOThreads        = 1;
+        cfg.mainThreadCoreId    = ECpuCoreId(0);
+
+        TaskScheduler::InstanceCtor::Create();
+        TEST( Scheduler().Setup( cfg ));
+
+        TEST( Networking::SocketService::Instance().Initialize() );
+
+        VirtualFileSystem::InstanceCtor::Create();
+    }
+
+    ~LocalVFS ()
+    {
+        Scheduler().Release();
+        Networking::SocketService::Instance().Deinitialize();
+        VirtualFileSystem::InstanceCtor::Destroy();
+        TaskScheduler::InstanceCtor::Destroy();
+    }
+};
+
diff --git a/AE/engine/tests/vfs/UnitTest_NetworkStorage.cpp b/AE/engine/tests/vfs/UnitTest_NetworkStorage.cpp
new file mode 100644
index 00000000..c8ec9021
--- /dev/null
+++ b/AE/engine/tests/vfs/UnitTest_NetworkStorage.cpp
@@ -0,0 +1,220 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "UnitTest_Common.h"
+#include "vfs/Network/NetworkStorageClient.h"
+#include "vfs/Network/NetworkStorageServer.h"
+
+namespace
+{
+    static const FrameUID   c_InitialFrameId = FrameUID::Init( 2 );
+
+
+    class ClientListener final : public IClientListener
+    {
+        ushort  _id = 0;
+
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress &)     __NE_OV { return EClientLocalID(_id++); }
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress6 &)    __NE_OV { return EClientLocalID(_id++); }
+
+        void  OnClientDisconnected (EChannel, EClientLocalID)               __NE_OV {}
+    };
+
+
+    class ServerProvider final : public IServerProvider
+    {
+        IpAddress   _addr4;
+
+    public:
+        ServerProvider (const IpAddress &addr4) __NE___ : _addr4{addr4} {}
+
+        void  GetAddress (EChannel channel, uint, Bool isTCP, OUT IpAddress &addr)  __NE_OV { TEST( channel == EChannel::Reliable );  TEST( isTCP );  addr = _addr4; }
+        void  GetAddress (EChannel,         uint, Bool,       OUT IpAddress6 &)     __NE_OV {}
+    };
+
+
+    class Server final : public BaseServer
+    {
+    public:
+        explicit Server (RC<MessageFactory> mf) { TEST( _Initialize( RVRef(mf), MakeRC<ClientListener>(), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel (ushort port)      { return _AddChannelTCP( port ); }
+    };
+
+
+    class Client final : public BaseClient
+    {
+    public:
+        explicit Client (RC<MessageFactory> mf, const IpAddress &addr)  { TEST( _Initialize( RVRef(mf), MakeRC<ServerProvider>( addr ), null, c_InitialFrameId )); }
+
+        ND_ bool  AddChannel ()                                         { return _AddChannelTCP(); }
+    };
+
+
+    ND_ static Array<ubyte>  GenRandomArray (Bytes size)
+    {
+        Array<ubyte>    temp;
+        temp.resize( usize(size) );
+
+        Math::Random    rnd;
+        for (usize i = 0; i < temp.size(); ++i)
+        {
+            temp[i] = rnd.Uniform<ubyte>() & 0xF;
+        }
+        return temp;
+    }
+//---------------------------------------------------------
+
+
+    static void  NetworkStorage_Test1 ()
+    {
+        LocalVFS                vfs;
+        Atomic<bool>            stop        {false};
+        NetworkStorageServer    vfs_server;
+        NetworkStorageClient    vfs_client;
+
+        const String            a1_name     = "a1.bin";
+        const Array<ubyte>      a1_data     = GenRandomArray( 128_Kb );
+
+        const String            a2_name     = "a2.bin";
+        const Array<ubyte>      a2_data     = GenRandomArray( 128_Kb );
+
+        // setup server folders
+        {
+            {
+                FileWStream file {a1_name};
+                TEST( file.IsOpen() );
+                TEST( file.Write( ArrayView<ubyte>{a1_data} ));
+            }{
+                FileWStream file {a2_name};
+                TEST( file.IsOpen() );
+            }
+
+            TEST( GetVFS().AddStorage( VirtualFileStorageFactory::CreateStaticFolder( FileSystem::CurrentPath() )));
+            TEST( GetVFS().MakeImmutable() );
+        }
+
+        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
+                EThreadArray{ EThread::PerFrame, EThread::Background, EThread::FileIO },
+                ""
+            }));
+
+        // run client and server
+        StdThread   server_thread{ [&] ()
+            {{
+                auto        mf      = MakeRC<MessageFactory>();
+                Server      server  {mf};
+                FrameUID    fid     = c_InitialFrameId;
+
+                TEST( Register_NetVFS( *mf ));
+                TEST( server.AddChannel( 4000 ));
+
+                TEST( server.Add( vfs_server.GetMessageProducer().GetRC() ));
+                TEST( server.Add( vfs_server.GetMessageConsumer().GetRC() ));
+
+                for (; not stop.load(); fid.Inc())
+                {
+                    server.Update( fid );
+
+                    ThreadUtils::Sleep_15ms();
+                }
+            }}};
+
+        StdThread   client_thread{ [&] ()
+            {{
+                auto        mf      = MakeRC<MessageFactory>();
+                Client      client  { mf, IpAddress::FromHostPortTCP( "localhost", 4000 )};
+                FrameUID    fid     = c_InitialFrameId;
+
+                TEST( Register_NetVFS( *mf ));
+                TEST( client.AddChannel() );
+
+                TEST( client.Add( vfs_client.GetMessageProducer().GetRC() ));
+                TEST( client.Add( vfs_client.GetMessageConsumer().GetRC() ));
+
+                for (; not stop.load(); fid.Inc())
+                {
+                    client.Update( fid );
+
+                    ThreadUtils::Sleep_15ms();
+                }
+            }}};
+
+        // try to read from server
+        {
+            auto    file = vfs_client.OpenForRead( FileName{a1_name} );
+            TEST( file );
+
+            auto    req = file->ReadBlock( 0_b, ArraySizeOf(a1_data) );
+            TEST( req );
+
+            bool    ok   = false;
+            auto    task = AsyncTask{req->AsPromise().Then(
+                            [&a1_data, &ok] (const AsyncRDataSource::Result_t &res)
+                            {
+                                TEST( res.pos == 0_b );
+                                TEST( res.dataSize == ArraySizeOf(a1_data) );
+                                TEST( res.AsArray<ubyte>() == a1_data );
+                                ok = true;
+                            })};
+
+            TEST( Scheduler().Wait( {task}, c_MaxTimeout ));
+
+            TEST( req->IsCompleted() );
+            TEST( ok );
+        }
+
+        // try to write to server
+        {
+            auto    file = vfs_client.OpenForWrite( FileName{a2_name} );
+            TEST( file );
+
+            auto    req = file->WriteBlock( 0_b, a2_data.data(), ArraySizeOf(a2_data), null );
+            TEST( req );
+
+            bool    ok   = false;
+            auto    task = AsyncTask{req->AsPromise().Then(
+                            [&a2_data, &ok] (const AsyncWDataSource::Result_t &res)
+                            {
+                                TEST( res.pos == 0_b );
+                                TEST( res.dataSize == ArraySizeOf(a2_data) );
+                                TEST( res.data == null );
+                                ok = true;
+                            })};
+
+            TEST( Scheduler().Wait( {task}, c_MaxTimeout ));
+
+            TEST( req->IsCompleted() );
+            TEST( ok );
+        }{
+            // need some time to process close file request
+            ThreadUtils::MilliSleep( milliseconds{100} );
+
+            FileRStream     rfile {a2_name};
+            Array<ubyte>    data2;
+            TEST( rfile.IsOpen() );
+            TEST( rfile.Read( rfile.RemainingSize(), OUT data2 ));
+            TEST( data2 == a2_data );
+        }
+
+        stop.store( true );
+
+        server_thread.join();
+        client_thread.join();
+    }
+}
+
+
+extern void UnitTest_NetworkStorage ()
+{
+    const Path  curr    = FileSystem::CurrentPath();
+    const Path  folder  {AE_CURRENT_DIR "/vfs_test2"};
+
+    FileSystem::RemoveAll( folder );
+    FileSystem::CreateDirectories( folder );
+    TEST( FileSystem::SetCurrentPath( folder ));
+
+    NetworkStorage_Test1();
+
+    FileSystem::SetCurrentPath( curr );
+    TEST_PASSED();
+}
diff --git a/AE/engine/tests/vfs/main.cpp b/AE/engine/tests/vfs/main.cpp
index da24d130..7ea6c814 100644
--- a/AE/engine/tests/vfs/main.cpp
+++ b/AE/engine/tests/vfs/main.cpp
@@ -3,6 +3,7 @@
 #include "base/Common.h"
 
 extern void UnitTest_ArchiveStorage ();
+extern void UnitTest_NetworkStorage ();
 
 
 #ifdef AE_PLATFORM_ANDROID
@@ -14,6 +15,7 @@ int main ()
     AE::Base::StaticLogger::LoggerDbgScope log{};
 
     UnitTest_ArchiveStorage();
+    UnitTest_NetworkStorage();
 
     AE_LOGI( "Tests.VFS finished" );
     return 0;
diff --git a/AE/engine/tests/video/Test_FFmpeg.cpp b/AE/engine/tests/video/Test_FFmpeg.cpp
index b33ad40e..2d953e7d 100644
--- a/AE/engine/tests/video/Test_FFmpeg.cpp
+++ b/AE/engine/tests/video/Test_FFmpeg.cpp
@@ -13,6 +13,9 @@ using namespace AE::Video;
 
 namespace
 {
+    using Allocator_t = LinearAllocator<>;
+
+
     // H264/H265 supported only in GPL version
     static const auto   c_Codec = EVideoCodec::VP9;
 
@@ -32,8 +35,8 @@ namespace
             cfg.srcFormat       = EPixelFormat::RGBA8_UNorm;
             cfg.dstFormat       = EVideoFormat::YUV420P;
             cfg.colorPreset     = EColorPreset::JPEG_BT709;
-            cfg.srcSize         = uint2{320, 320};
-            cfg.dstSize         = cfg.srcSize;
+            cfg.srcDim          = uint2{320, 320};
+            cfg.dstDim          = cfg.srcDim;
             cfg.codec           = c_Codec;
             cfg.filter          = Video::EFilter::Bilinear;
             cfg.quality         = 0.5f;
@@ -48,8 +51,7 @@ namespace
 
             for (uint i = 0; i < frame_count; ++i)
             {
-                const float     h   = Wrap( i * 0.2f, 0.f, 0.75f );
-                const RGBA8u    col { RGBA32f{ HSVColor{ h }}};
+                const RGBA8u    col {RainbowWrap( i * 0.2f )};
                 for (auto& c : pixels) { c = col; }
 
                 TEST( enc->AddFrame( view, True{} ));
@@ -77,7 +79,7 @@ namespace
             TEST( info.avgFrameRate == IVideoDecoder::FrameRate_t{fps} );
             TEST( info.minFrameRate == IVideoDecoder::FrameRate_t{fps} );
             //TEST( info.bitrate > 0 );
-            TEST( All( info.size == uint2{320, 320} ));
+            TEST( All( info.dimension == uint2{320, 320} ));
 
             AE_LOGI( dec->PrintFileProperties( path ));
         }
@@ -95,16 +97,18 @@ namespace
             RGBA8u          pixels [320 * 320] = {};
             ImageMemView    ref_view{ pixels, Sizeof(pixels), uint3{}, uint3{320, 320, 1}, 0_b, 0_b, cfg.dstFormat, EImageAspect::Color };
             ImageMemView    view;
+            Allocator_t     alloc;
+
+            TEST( IVideoDecoder::AllocMemView( dec->GetConfig(), OUT view, alloc ));
 
             IVideoDecoder::FrameInfo    fi;
 
             for (uint i = 0; i < frame_count; ++i)
             {
-                const float     h   = Wrap( i * 0.2f, 0.f, 0.75f );
-                const RGBA8u    col { RGBA32f{ HSVColor{ h }}};
+                const RGBA8u    col {RainbowWrap( i * 0.2f )};
                 for (auto& c : pixels) { c = col; }
 
-                TEST( dec->GetFrame( OUT view, OUT fi ));
+                TEST( dec->GetNextFrame( INOUT view, OUT fi ));
 
                 //TEST( view == ref_view );
                 TEST( view.Format() == cfg.dstFormat );
@@ -131,8 +135,8 @@ namespace
             cfg.srcFormat       = EPixelFormat::RGBA8_UNorm;
             cfg.dstFormat       = EVideoFormat::YUV420P;
             cfg.colorPreset     = EColorPreset::MPEG_BT709;
-            cfg.srcSize         = uint2{320, 320};
-            cfg.dstSize         = cfg.srcSize;
+            cfg.srcDim          = uint2{320, 320};
+            cfg.dstDim          = cfg.srcDim;
             cfg.codec           = c_Codec;
             cfg.filter          = Video::EFilter::Bilinear;
             cfg.quality         = 0.5f;
@@ -147,8 +151,7 @@ namespace
 
             for (uint i = 0; i < frame_count; ++i)
             {
-                const float     h   = Wrap( i * 0.2f, 0.f, 0.75f );
-                const RGBA8u    col { RGBA32f{ HSVColor{ h }}};
+                const RGBA8u    col {RainbowWrap( i * 0.2f )};
                 for (auto& c : pixels) { c = col; }
 
                 TEST( enc->AddFrame( view, True{} ));
@@ -173,16 +176,18 @@ namespace
             RGBA8u          pixels [320 * 320] = {};
             ImageMemView    ref_view{ pixels, Sizeof(pixels), uint3{}, uint3{320, 320, 1}, 0_b, 0_b, cfg.dstFormat, EImageAspect::Color };
             ImageMemView    view;
+            Allocator_t     alloc;
+
+            TEST( IVideoDecoder::AllocMemView( dec->GetConfig(), OUT view, alloc ));
 
             IVideoDecoder::FrameInfo    fi;
 
             for (uint i = 0; i < frame_count; ++i)
             {
-                const float     h   = Wrap( i * 0.2f, 0.f, 0.75f );
-                const RGBA8u    col { RGBA32f{ HSVColor{ h }}};
+                const RGBA8u    col {RainbowWrap( i * 0.2f )};
                 for (auto& c : pixels) { c = col; }
 
-                TEST( dec->GetFrame( OUT view, OUT fi ));
+                TEST( dec->GetNextFrame( INOUT view, OUT fi ));
 
                 //TEST( view == ref_view );
                 TEST( view.Format() == cfg.dstFormat );
diff --git a/AE/engine/tools/CMakeLists.txt b/AE/engine/tools/CMakeLists.txt
index 0f76b211..d5d92cad 100644
--- a/AE/engine/tools/CMakeLists.txt
+++ b/AE/engine/tools/CMakeLists.txt
@@ -7,6 +7,7 @@ if (${AE_DESKTOP})
     add_subdirectory( "vulkan_image_zcurve" )
     add_subdirectory( "feature_set_gen" )
     add_subdirectory( "lfas" )
+    add_subdirectory( "net_storage_server" )
 endif()
 
 add_subdirectory( "atlas_tools" )
@@ -16,6 +17,6 @@ add_subdirectory( "vulkan_ext_emulator" )
 add_subdirectory( "res_loaders" )
 add_subdirectory( "graphics_test" )
 
-if (${AE_DESKTOP} AND (DEFINED AE_CPU_ARCH_X64))
+if (${AE_DESKTOP} AND (DEFINED AE_CPU_ARCH_X64) AND ${AE_ENABLE_EXCEPTIONS})
     add_subdirectory( "res_pack" )
 endif()
diff --git a/AE/engine/tools/feature_set_gen/FeatureSetUtils.cpp b/AE/engine/tools/feature_set_gen/FeatureSetUtils.cpp
index 80d3bffe..bfd5ac3b 100644
--- a/AE/engine/tools/feature_set_gen/FeatureSetUtils.cpp
+++ b/AE/engine/tools/feature_set_gen/FeatureSetUtils.cpp
@@ -102,6 +102,11 @@ namespace
         return tokens;
     }
 
+/*
+=================================================
+    GetToken
+=================================================
+*/
     ND_ static StringView  GetToken (ArrayView<StringView> tokens)
     {
         // TODO: -value "-value"
@@ -123,6 +128,16 @@ namespace
         return tokens[0];
     }
 
+    ND_ static StringView  GetToken1Of3 (ArrayView<StringView> tokens)
+    {
+        CHECK( tokens.size() == 7 );
+        CHECK( tokens[0] == "[" );
+        CHECK( tokens[2] == "," );
+        CHECK( tokens[4] == "," );
+        CHECK( tokens[6] == "]" );
+        return tokens[1];
+    }
+
     ND_ static int  GetUIntToken (ArrayView<StringView> tokens)
     {
         StringView  value_str = GetToken( tokens );
@@ -131,14 +146,29 @@ namespace
         return val;
     }
 
+/*
+=================================================
+    FS_ParseJSON_1
+=================================================
+*/
     ND_ static StringView  FS_ParseJSON_1 (StringView json, StringView name)
     {
         Array<StringView>   tokens = FS_ParseJSON_N( json, name );
         if ( tokens.empty() )
             return {};
+
+        if ( name == "\"maxTaskWorkGroupSize\"" or
+             name == "\"maxMeshWorkGroupSize\"" )
+            return GetToken1Of3( tokens );
+
         return GetToken( tokens );
     }
 
+/*
+=================================================
+    FS_ParseJSON_Str
+=================================================
+*/
     ND_ static StringView  FS_ParseJSON_Str (StringView json, StringView name)
     {
         usize   pos = json.find( name );
@@ -372,7 +402,7 @@ namespace
             prev.maxStorageImages   = FS_ParseJSON( 0u,     json, "maxDescriptorSetStorageImages" );
             prev.maxUniformBuffers  = FS_ParseJSON( 0u,     json, "maxDescriptorSetUniformBuffers" );
             prev.maxAccelStructures = FS_ParseJSON( 0u,     json, "maxDescriptorSetAccelerationStructures" );
-            prev.maxTotalResources  = FS_ParseJSON( 1024u,  json, "maxPerSetDescriptors" );
+            prev.maxTotalResources  = FS_ParseJSON( 512u,   json, "maxPerSetDescriptors" );
         }
         else
         if ( name == "\"perStage\"" )
@@ -1650,7 +1680,7 @@ namespace
 
         if ( val ) {
             str << "\tfset.fragmentShadingRateTexelSize ( {" << ToStr( val.minX ) << ", " << ToStr( val.minY )
-                << "}, {" << ToStr( val.maxX ) << ", " << ToStr( val.maxY ) << "}, " << ToStr( val.aspect ) << " );\n"; 
+                << "}, {" << ToStr( val.maxX ) << ", " << ToStr( val.maxY ) << "}, " << ToStr( val.aspect ) << " );\n";
         }
     }
 
diff --git a/AE/engine/tools/feature_set_gen/Readme.md b/AE/engine/tools/feature_set_gen/Readme.md
index 3ccb06d1..5e245b8b 100644
--- a/AE/engine/tools/feature_set_gen/Readme.md
+++ b/AE/engine/tools/feature_set_gen/Readme.md
@@ -1,5 +1,5 @@
 ## FeatureSet Generator
 
-* Generates [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/FeatureSet.md) script files and put them to the [shared_data](https://github.com/azhirnov/as-en/blob/dev/AE/engine/shared_data/feature_set) folder.
+* Generates [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/FeatureSet.md) script files and put them to the [shared_data](https://github.com/azhirnov/as-en/blob/dev/AE/engine/shared_data/feature_set) folder.
 * Used JSON files from [vulkan.gpuinfo](https://vulkan.gpuinfo.org/) for Vulkan devices.
 * Used [Metal Feature Set Tables](https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf) for Metal devices.
diff --git a/AE/engine/tools/feature_set_gen/main.cpp b/AE/engine/tools/feature_set_gen/main.cpp
index 2c5178fc..39fae941 100644
--- a/AE/engine/tools/feature_set_gen/main.cpp
+++ b/AE/engine/tools/feature_set_gen/main.cpp
@@ -584,7 +584,7 @@ static bool  GenMinMobileMali (ArrayView<FeatureSetInfo> fsInfo)
     AssignMin( min_fs.maxComputeWorkGroupSizeZ,         64u );
 
     min_fs.maxShaderVersion.metal = 0;
-    min_fs.hwCompressedAttachmentFormats.insert( EPixelFormat::RGBA8_UNorm );
+    //min_fs.hwCompressedAttachmentFormats.insert( EPixelFormat::RGBA8_UNorm );
 
     ValidateFS( INOUT min_fs );
     min_fs.Validate();
diff --git a/AE/engine/tools/geometry_tools/Cube/CubeGen.cpp b/AE/engine/tools/geometry_tools/Cube/CubeGen.cpp
index 2fd3418f..f2411624 100644
--- a/AE/engine/tools/geometry_tools/Cube/CubeGen.cpp
+++ b/AE/engine/tools/geometry_tools/Cube/CubeGen.cpp
@@ -47,10 +47,10 @@ namespace AE::GeometryTools
              0.f,  0.f,  1.f,   // +Y
              0.f,  1.f,  0.f,   // -X
         };
-        STATIC_ASSERT( CountOf(a_positions) == (CountOf(a_texcoords2d)*3/2)*6 );
-        STATIC_ASSERT( CountOf(a_positions) == CountOf(a_normals)*4 );
-        STATIC_ASSERT( CountOf(a_positions) == CountOf(a_tangents)*4 );
-        STATIC_ASSERT( CountOf(a_positions) == CountOf(a_bitangents)*4 );
+        StaticAssert( CountOf(a_positions) == (CountOf(a_texcoords2d)*3/2)*6 );
+        StaticAssert( CountOf(a_positions) == CountOf(a_normals)*4 );
+        StaticAssert( CountOf(a_positions) == CountOf(a_tangents)*4 );
+        StaticAssert( CountOf(a_positions) == CountOf(a_bitangents)*4 );
 
         _vertices.resize( CountOf(a_positions)/3 );
 
@@ -136,9 +136,9 @@ namespace AE::GeometryTools
                         pos2, uv2,
                         OUT normal, OUT tangent, OUT bitangent );
 
-            ASSERT( All(Equals( normal, norm0 )));
-            ASSERT( All(Equals( tangent, tan0 )));
-            ASSERT( All(Equals( bitangent, bitan0 )));
+            ASSERT( All(Equal( normal, norm0 )));
+            ASSERT( All(Equal( tangent, tan0 )));
+            ASSERT( All(Equal( bitangent, bitan0 )));
         }
     #endif
 
diff --git a/AE/engine/tools/geometry_tools/Cube/CubeGen.h b/AE/engine/tools/geometry_tools/Cube/CubeGen.h
index 58ddbe39..0cc59467 100644
--- a/AE/engine/tools/geometry_tools/Cube/CubeGen.h
+++ b/AE/engine/tools/geometry_tools/Cube/CubeGen.h
@@ -25,7 +25,7 @@ namespace AE::GeometryTools
             packed_short4   tangent;
             packed_short4   bitangent;
         };
-        STATIC_ASSERT( sizeof(Vertex) == 40 );
+        StaticAssert( sizeof(Vertex) == 40 );
 
         struct UnpackedVertex
         {
diff --git a/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.cpp b/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.cpp
index a184f514..f7b0c515 100644
--- a/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.cpp
+++ b/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.cpp
@@ -135,9 +135,9 @@ namespace AE::GeometryTools
 
             CheckTBN( normal, tangent, bitangent );
 
-            ASSERT( All(Equals( normal,     norm0,  0.1f )));
-            ASSERT( All(Equals( tangent,    tan0,   0.1f )));
-            ASSERT( All(Equals( bitangent,  bitan0, 0.1f )));
+            ASSERT( All(Equal( normal,      norm0,  0.1f )));
+            ASSERT( All(Equal( tangent, tan0,   0.1f )));
+            ASSERT( All(Equal( bitangent,   bitan0, 0.1f )));
         }
     #endif
 
diff --git a/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.h b/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.h
index 07d7b87c..ad2703f9 100644
--- a/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.h
+++ b/AE/engine/tools/geometry_tools/Cylinder/CylinderGen.h
@@ -25,7 +25,7 @@ namespace AE::GeometryTools
             packed_short4   tangent;
             packed_short4   bitangent;
         };
-        STATIC_ASSERT( sizeof(Vertex) == 40 );
+        StaticAssert( sizeof(Vertex) == 40 );
 
         struct UnpackedVertex
         {
diff --git a/AE/engine/tools/geometry_tools/Grid/GridGen.h b/AE/engine/tools/geometry_tools/Grid/GridGen.h
index 09e9ccae..3db7d72f 100644
--- a/AE/engine/tools/geometry_tools/Grid/GridGen.h
+++ b/AE/engine/tools/geometry_tools/Grid/GridGen.h
@@ -21,7 +21,7 @@ namespace AE::GeometryTools
         {
             float2  uv;     // TODO: unorm
         };
-        STATIC_ASSERT( sizeof(Vertex) == 8 );
+        StaticAssert( sizeof(Vertex) == 8 );
 
         using Index = ushort;
 
diff --git a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.cpp b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.cpp
index 329e3ee6..9bb07634 100644
--- a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.cpp
+++ b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.cpp
@@ -1,9 +1,60 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "geometry_tools/SphericalCube/SphericalCubeGen.h"
+#include "geometry_tools/Utils/TBN.h"
 
 namespace AE::GeometryTools
 {
+namespace
+{
+
+    ND_ static uint  GetSCLod (uint lod) __NE___
+    {
+        return lod * 2 - 1;
+    }
+
+/*
+=================================================
+    RotateTangent
+=================================================
+*/
+    ND_ inline double3  RotateTangent (const double3 &c, ECubeFace face) __NE___
+    {
+        switch ( face )
+        {
+            case ECubeFace::XPos : return double3( c.x,  c.y,  c.z);    // X+   | +z
+            case ECubeFace::XNeg : return double3(-c.x,  c.y, -c.z);    // X-   | -z
+            case ECubeFace::YPos : return double3( c.z,  c.y, -c.x);    // Y+   | +x
+            case ECubeFace::YNeg : return double3( c.z,  c.y, -c.x);    // Y-   | +x
+            case ECubeFace::ZPos : return double3(-c.z,  c.y,  c.x);    // Z+   | -x
+            case ECubeFace::ZNeg : return double3( c.z,  c.y, -c.x);    // Z-   | +x
+        }
+        return {};
+    }
+
+/*
+=================================================
+    RotateBiTangent
+=================================================
+*/
+    ND_ inline double3  RotateBiTangent (const double3 &c, ECubeFace face) __NE___
+    {
+        switch ( face )
+        {
+            case ECubeFace::XPos : return double3( c.x,  c.z, -c.y);    // X+   | -y
+            case ECubeFace::XNeg : return double3( c.x,  c.z, -c.y);    // X-   | -y
+            case ECubeFace::YPos : return double3(-c.x,  c.y, -c.z);    // Y+   | -z
+            case ECubeFace::YNeg : return double3( c.x,  c.y,  c.z);    // Y-   | +z
+            case ECubeFace::ZPos : return double3( c.x,  c.z, -c.y);    // Z+   | -y
+            case ECubeFace::ZNeg : return double3( c.x,  c.z, -c.y);    // Z-   | -y
+        }
+        return {};
+    }
+
+} // namespace
+//-----------------------------------------------------------------------------
+
+
 
 /*
 =================================================
@@ -13,11 +64,13 @@ namespace AE::GeometryTools
     uint2  SphericalCubeGen::CalcFaceVertCount2 (uint lod) __NE___
     {
         // on X/Y axis
+        lod = GetSCLod( lod );
         return uint2{ lod+2 };
     }
 
-    uint  SphericalCubeGen::CalcFaceVertCount (const uint lod) __NE___
+    uint  SphericalCubeGen::CalcFaceVertCount (uint lod) __NE___
     {
+        lod = GetSCLod( lod );
         return (lod+2) * (lod+2);
     }
 
@@ -26,8 +79,9 @@ namespace AE::GeometryTools
         return CalcFaceVertCount( lod ) * FaceCount;
     }
 
-    uint  SphericalCubeGen::CalcFaceIndexCount (const uint lod, const Bool useQuads) __NE___
+    uint  SphericalCubeGen::CalcFaceIndexCount (uint lod, const Bool useQuads) __NE___
     {
+        lod = GetSCLod( lod );
         return (useQuads ? 4 : 6) * (lod+1) * (lod+1);
     }
 
@@ -77,16 +131,14 @@ namespace AE::GeometryTools
             index_count += CalcIndexCount( lod, Bool{_quads} );
 
             // for cube sides
-            const uint  vcount  = lod + 2;
-            const uint  icount  = lod + 1;
+            const uint  vcount  = GetSCLod( lod ) + 2;
+            const uint  icount  = GetSCLod( lod ) + 1;
             uint        vert_i  = 0;
             uint        index_i = 0;
 
             // for top/bottom faces
             for (uint face = 0; face < 6; ++face)
             {
-                //AE_LOGI( "Lod: "s << ToString(lod) << ", Face: " << ToString(face) );
-
                 // generate indices
                 for (uint y = 0; y < icount; ++y)
                 for (uint x = 0; x < icount; ++x)
@@ -103,61 +155,56 @@ namespace AE::GeometryTools
                     {
                         if ( (x < icount/2 and y < icount/2) or (x >= icount/2 and y >= icount/2) )
                         {
-                            dst_indices[index_i++] = indices[0];    dst_indices[index_i++] = indices[1];    dst_indices[index_i++] = indices[3];
-                            dst_indices[index_i++] = indices[0];    dst_indices[index_i++] = indices[3];    dst_indices[index_i++] = indices[2];
+                            dst_indices[index_i++] = indices[0];    dst_indices[index_i++] = indices[3];    dst_indices[index_i++] = indices[1];
+                            dst_indices[index_i++] = indices[0];    dst_indices[index_i++] = indices[2];    dst_indices[index_i++] = indices[3];
                         }
                         else
                         if ( (x >= icount/2 and y < icount/2) or (x < icount/2 and y >= icount/2) )
                         {
-                            dst_indices[index_i++] = indices[0];    dst_indices[index_i++] = indices[1];    dst_indices[index_i++] = indices[2];
-                            dst_indices[index_i++] = indices[2];    dst_indices[index_i++] = indices[1];    dst_indices[index_i++] = indices[3];
+                            dst_indices[index_i++] = indices[0];    dst_indices[index_i++] = indices[2];    dst_indices[index_i++] = indices[1];
+                            dst_indices[index_i++] = indices[2];    dst_indices[index_i++] = indices[3];    dst_indices[index_i++] = indices[1];
                         }
                     }
-
-                    //AE_LOGI( "Indices: "s << ToString(dst_indices[index_i-6]) << ", " << ToString(dst_indices[index_i-5]) << ", "
-                    //              << ToString(dst_indices[index_i-4]) << ", " << ToString(dst_indices[index_i-3]) << ", "
-                    //              << ToString(dst_indices[index_i-2]) << ", " << ToString(dst_indices[index_i-1]) );
                 }
 
                 // generate vertices
                 for (uint y = 0; y < vcount; ++y)
                 for (uint x = 0; x < vcount; ++x)
                 {
-                    double2     ncoord      = ToSNorm( double2{ double(x)/(vcount-1), double(y)/(vcount-1) });
+                    double2     ncoord      = ToSNorm( double2{x,y} / double(vcount-1) );
                     auto&       vert        = dst_vertices[vert_i++];
-                    double3     pos         = Projection_t::Forward( ncoord, ECubeFace(face) );
+                    double3     pos         = ForwardProjection( ncoord, ECubeFace(face) );
+                    double2     proj        = VertexProjection_t::Forward( ncoord );
+                    double3     texc        = ForwardTexProjection( ncoord, ECubeFace(face) );
 
-                    vert.position   = FloatToSNormShort(float4{ pos, 0.f });
+                    // from https://iquilezles.org/articles/patchedsphere/
+                    double3     tangent     = VertexProjection_t::Forward2( -Normalize( double3{ 1.0 + Square(proj.y), -proj.x * proj.y, -proj.x }), ECubeFace(face) );
+                    double3     bitangent   = VertexProjection_t::Forward2( Normalize( double3{ -proj.x * proj.y, 1.0 + Square(proj.x), -proj.y }), ECubeFace(face) );
 
-                    if ( cubeMap )
+                    if ( AnyEqual( ECubeFace(face), ECubeFace::YPos, ECubeFace::YNeg ))
                     {
-                        double2     proj        = Projection_t::Forward( ncoord );
-                        double3     texc        = ForwardTexProjection( ncoord, ECubeFace(face) );  texc.y = -texc.y;
-
-                        // from https://iquilezles.org/articles/patchedsphere/
-                        double3     tangent     = Normalize( double3{ 1.0 + Square(proj.y), -proj.x * proj.y, -proj.x });
-                        double3     bitangent   = Normalize( double3{ -proj.x * proj.y, 1.0 + Square(proj.x), -proj.y });
-                        double3     norm2       = Normalize( Cross( tangent, bitangent ));
-                        double3     norm        {norm2.z, norm2.y, -norm2.x};
+                        tangent     = -tangent;
+                        bitangent   = -bitangent;
+                    }
 
+                    //CheckTBN( float3{pos}, float3{tangent}, float3{bitangent} );
 
-                        //ASSERT( All( Equals( norm, pos, 0.000001 )));
+                    vert.position   = FloatToSNormShort(float4{ pos, float(face)/5.f });
+                    vert.texcoord   = FloatToSNormShort(float4{ texc, 0.f });
+                    vert.tangent    = FloatToSNormShort(float4{ tangent, 0.f });
+                    vert.bitangent  = FloatToSNormShort(float4{ bitangent, 0.f });
 
-                        vert.texcoord   = FloatToSNormShort(float4{ texc, 0.f });
-                        vert.tangent    = FloatToSNormShort(float4{ Projection_t::Forward2( tangent, ECubeFace(face) ), 0.f });
-                        vert.bitangent  = FloatToSNormShort(float4{ Projection_t::Forward2( bitangent, ECubeFace(face) ), 0.f });
-                    }
-                    else
+                    if ( not cubeMap )
                     {
-                        vert.texcoord   = FloatToSNormShort(float4{ ToUNorm(ncoord), 0.f, 0.f });
-                    }
+                        if ( AnyEqual( ECubeFace(face), ECubeFace::YPos, ECubeFace::YNeg ))
+                            ncoord.y = -ncoord.y;
+                        else
+                            ncoord.x = -ncoord.x;
 
-                    //AE_LOGI( "Vertex["s << ToString(vert_i-1) << "] = " << ToString(pos)
-                    //          << "; TC: " << ToString(dst_vertices[vert_i-1].texcoord) );
+                        vert.texcoord   = FloatToSNormShort(float4{ ToUNorm( ncoord ), 0.f, 0.f });
+                    }
                 }
             }
-
-            //AE_LOGI( "--------------------------------\n\n" );
         }
 
         return true;
@@ -265,7 +312,7 @@ namespace AE::GeometryTools
         float   c = Square(center.x) + Square(center.y) + Square(center.z) + Square(begin.x) + Square(begin.y) + Square(begin.z) -
                     2.0f * ( center.x*begin.x + center.y*begin.y + center.z*begin.z ) - Square(radius);
 
-        float   i = b * b - 4 * a * c;
+        float   i = b * b - 4.f * a * c;
 
         // no intersection
         if ( i < 0.0f )
@@ -290,16 +337,10 @@ namespace AE::GeometryTools
         bool    mu2_valid   = (mu2 > -0.0001f) & (mu2 < 1.0001f);
         float   mu;
 
-        if ( mu1_valid & mu2_valid )
-            mu = Min( mu1, mu2 );
-        else
-        if ( mu1_valid )
-            mu = mu1;
-        else
-        if ( mu2_valid )
-            mu = mu2;
-        else
-            return false;
+        if ( mu1_valid & mu2_valid )    mu = Min( mu1, mu2 );   else
+        if ( mu1_valid )                mu = mu1;               else
+        if ( mu2_valid )                mu = mu2;               else
+                                        return false;
 
         outIntersection = begin + mu * (end - begin);
         return true;
diff --git a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.h b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.h
index 7d22fccd..02995790 100644
--- a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.h
+++ b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeGen.h
@@ -11,24 +11,24 @@ namespace AE::GeometryTools
     // Spherical Cube Generator
     //
 
-    class SphericalCubeGen : public SphericalCubeProjection< TangentialSphericalCube, TextureProjection >
+    class SphericalCubeGen final : public SphericalCubeProjection< SCProj2_Spherical< SCProj1_Tangential >,
+                                                                   SCProj2_Texture< SCProj1_Identity >>
     {
     // types
     public:
         struct Vertex
         {
-            packed_short4   position;   // position == normal
+            packed_short4   position;   // position == normal, w - face/5
             packed_short4   texcoord;
             packed_short4   tangent;
             packed_short4   bitangent;
         };
-        STATIC_ASSERT( sizeof(Vertex) == 32 );
+        StaticAssert( sizeof(Vertex) == 32 );
 
         struct UnpackedVertex
         {
             float3      position;   // in normalized coords, position == normal
             float3      texcoord;
-            //float3    projection; // TODO: use it for distortion correction and for tessellation (instead of linear interpolation)
             float3      tangent;
             float3      bitangent;
 
diff --git a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeMath.h b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeMath.h
index e1372dd7..cc0f9c29 100644
--- a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeMath.h
+++ b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeMath.h
@@ -1,5 +1,9 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-
+/*
+    based on
+    "Cube-to-sphere Projections for Procedural Texturing and Beyond"
+    https://www.jcgt.org/published/0007/02/01/paper.pdf
+*/
 #pragma once
 
 #include "geometry_tools/GeometryTools.pch.h"
@@ -10,14 +14,27 @@ namespace AE::GeometryTools
 
     enum class ECubeFace : uint
     {
-        XPos    = 0,
-        XNeg    = 1,
-        YPos    = 2,
-        YNeg    = 3,
-        ZPos    = 4,
-        ZNeg    = 5,
+        XPos    = 0,    // right
+        XNeg    = 1,    // left
+        YPos    = 2,    // down
+        YNeg    = 3,    // up
+        ZPos    = 4,    // front
+        ZNeg    = 5,    // back
     };
 
+    struct SCProj1_Identity;
+    struct SCProj1_Tangential;
+    struct SCProj1_Everitt;
+    struct SCProj1_5thPoly;
+    struct SCProj1_COBE;
+    struct SCProj1_Arvo;
+
+    template <typename TProj>   struct SCProj2_Cube;
+    template <typename TProj>   struct SCProj2_Spherical;
+    template <typename TProj>   struct SCProj2_Texture;
+    template <typename TProj>   struct SCProj2_TextureYFlip;
+
+
 
     //
     // Spherical Cube Projection
@@ -28,47 +45,44 @@ namespace AE::GeometryTools
     {
     // types
     public:
-        using Projection_t          = PosProj;
+        using Base_t                = SphericalCubeProjection< PosProj, TexProj >;
+        using VertexProjection_t    = PosProj;
         using TextureProjection_t   = TexProj;
 
 
     // methods
     public:
         // position projection
-        ND_ static double3  ForwardProjection (const double2 &ncoord, ECubeFace face)       __NE___;
-        ND_ static float3   ForwardProjection (const float2 &ncoord, ECubeFace face)        __NE___;
+        ND_ static double3  ForwardProjection (const double2 &snormCoord, ECubeFace face)       __NE___;
+        ND_ static float3   ForwardProjection (const float2 &snormCoord, ECubeFace face)        __NE___;
 
-        ND_ static Pair<double2, ECubeFace>  InverseProjection (const double3 &coord)       __NE___;
-        ND_ static Pair<float2, ECubeFace>   InverseProjection (const float3 &coord)        __NE___;
+        ND_ static Pair<double2, ECubeFace>  InverseProjection (const double3 &coord)           __NE___;
+        ND_ static Pair<float2, ECubeFace>   InverseProjection (const float3 &coord)            __NE___;
 
         // texture coordinate projection
-        ND_ static double3  ForwardTexProjection (const double2 &ncoord, ECubeFace face)    __NE___;
-        ND_ static float3   ForwardTexProjection (const float2 &ncoord, ECubeFace face)     __NE___;
+        ND_ static double3  ForwardTexProjection (const double2 &snormCoord, ECubeFace face)    __NE___;
+        ND_ static float3   ForwardTexProjection (const float2 &snormCoord, ECubeFace face)     __NE___;
 
-        ND_ static Pair<double2, ECubeFace>  InverseTexProjection (const double3 &coord)    __NE___;
-        ND_ static Pair<float2, ECubeFace>   InverseTexProjection (const float3 &coord)     __NE___;
+        ND_ static Pair<double2, ECubeFace>  InverseTexProjection (const double3 &coord)        __NE___;
+        ND_ static Pair<float2, ECubeFace>   InverseTexProjection (const float3 &coord)         __NE___;
     };
 
 
 /*
 =================================================
-    RotateVec, RotateTexcoord
+    RotateVec
 ----
     project 2D coord to cube face
 =================================================
 */
     ND_ inline double3  RotateVec (const double3 &c, ECubeFace face) __NE___
     {
-        switch ( face )
-        {
-            case ECubeFace::XPos : return double3( c.z,  c.y, -c.x);    // X+
-            case ECubeFace::XNeg : return double3(-c.z,  c.y,  c.x);    // X-
-            case ECubeFace::YPos : return double3( c.x, -c.z,  c.y);    // Y+
-            case ECubeFace::YNeg : return double3( c.x,  c.z, -c.y);    // Y-
-            case ECubeFace::ZPos : return double3( c.x,  c.y,  c.z);    // Z+
-            case ECubeFace::ZNeg : return double3(-c.x,  c.y, -c.z);    // Z-
-        }
-        return {};
+        return  double3( c.z, -c.y, -c.x) * double(face == ECubeFace::XPos) +   // X+
+                double3(-c.z, -c.y,  c.x) * double(face == ECubeFace::XNeg) +   // X-
+                double3( c.x,  c.z,  c.y) * double(face == ECubeFace::YPos) +   // Y+
+                double3( c.x, -c.z, -c.y) * double(face == ECubeFace::YNeg) +   // Y-
+                double3( c.x, -c.y,  c.z) * double(face == ECubeFace::ZPos) +   // Z+
+                double3(-c.x, -c.y, -c.z) * double(face == ECubeFace::ZNeg);    // Z-
     }
 
 /*
@@ -78,173 +92,295 @@ namespace AE::GeometryTools
     project 3D coord on cube/sphere to face 2D coord
 =================================================
 */
-    ND_ inline Tuple<double2, double, ECubeFace>  InverseRotation (const double3 &c) __NE___
+    ND_ inline Tuple<double2, double, ECubeFace>  InverseRotation (double3 c) __NE___
     {
+        c.y = -c.y;
+
         // front (xy space)
         if ( (Abs(c.x) <= c.z) & (c.z > 0.0) & (Abs(c.y) <= c.z) )
-            return Tuple{ double2(c.x, c.y), c.z, ECubeFace::ZPos };
+            return Tuple{ double2{c.x, c.y}, c.z, ECubeFace::ZPos };
 
         // right (zy space)
         if ( (Abs(c.z) <= c.x) & (c.x > 0.0) & (Abs(c.y) <= c.x) )
-            return Tuple{ double2(-c.z, c.y), c.x, ECubeFace::XPos };
+            return Tuple{ double2{-c.z, c.y}, c.x, ECubeFace::XPos };
 
         // back (xy space)
         if ( (Abs(c.x) <= -c.z) & (c.z < 0.0) & (Abs(c.y) <= -c.z) )
-            return Tuple{ double2(-c.x, c.y), -c.z, ECubeFace::ZNeg };
+            return Tuple{ double2{-c.x, c.y}, -c.z, ECubeFace::ZNeg };
 
         // left (zy space)
         if ( (Abs(c.z) <= -c.x) & (c.x < 0.0) & (Abs(c.y) <= -c.x) )
-            return Tuple{ double2(c.z, c.y), -c.x, ECubeFace::XNeg };
+            return Tuple{ double2{c.z, c.y}, -c.x, ECubeFace::XNeg };
 
         // up (xz space)
         if ( c.y > 0.0 )
-            return Tuple{ double2(c.x, -c.z), c.y, ECubeFace::YNeg };
+            return Tuple{ double2{c.x, -c.z}, c.y, ECubeFace::YNeg };
 
         // down (xz space)
-        return Tuple{ double2(c.x, c.z), -c.y, ECubeFace::YPos };
+        return Tuple{ double2{c.x, c.z}, -c.y, ECubeFace::YPos };
     }
+//-----------------------------------------------------------------------------
+
+
+// First level projection //
 
 /*
 =================================================
-    OriginCube
+    SCProj1_Identity
 =================================================
 */
-    struct OriginCube
+    struct SCProj1_Identity
     {
-        ND_ static double3  Forward (const double2 &ncoord, ECubeFace face) __NE___
+        // 2D regular grid on cube face --> 2D regular grid on cube face
+        ND_ static double2  Forward (const double2 &snormCoord) __NE___ { return snormCoord; }
+        ND_ static double2  Inverse (const double2 &snormCoord) __NE___ { return snormCoord; }
+    };
+
+/*
+=================================================
+    SCProj1_Tangential
+=================================================
+*/
+    struct SCProj1_Tangential
+    {
+    private:
+      #if 1
+        // Angle from "Cube-to-sphere Projections for Procedural Texturing and Beyond", is better than Pi/4
+        // ~49.8 deg
+        static constexpr double  warp_theta     = 0.868734829276;
+        static constexpr double  tan_warp_theta = 1.182286685546; //tan( warp_theta );
+      #else
+        // 45 deg
+        static constexpr double  warp_theta     = double{TRadian<double>::Pi()} / 4.0;
+        static constexpr double  tan_warp_theta = 1.0; //tan( warp_theta );
+      #endif
+
+    public:
+        // 2D regular grid on cube face --> 2D irregular grid on cube face
+        ND_ static double2  Forward (const double2 &snormCoord) __NE___
         {
-            return RotateVec( double3{ ncoord, 1.0 }, face );
+            return glm::tan( warp_theta * snormCoord ) / tan_warp_theta;
         }
 
-        ND_ static Pair<double2, ECubeFace>  Inverse (const double3 &coord) __NE___
+        // 2D irregular grid on cube face --> 2D regular grid on cube face
+        ND_ static double2  Inverse (const double2 &snormCoord) __NE___
         {
-            auto[c, z, face] = InverseRotation( coord );
-            return { c, face };
+            return glm::atan( snormCoord * tan_warp_theta ) / warp_theta;
         }
     };
 
 /*
 =================================================
-    IdentitySphericalCube
+    SCProj1_Everitt
 =================================================
 */
-    struct IdentitySphericalCube
+    struct SCProj1_Everitt
     {
-        // 2D regular grid on cube face --> 2D regular grid on cube face
-        ND_ static double2  Forward (const double2 &ncoord) __NE___ { return ncoord; }
-        ND_ static double2  Inverse (const double2 &ncoord) __NE___ { return ncoord; }
+    private:
+      #if 1
+        // Parameter from "Cube-to-sphere Projections for Procedural Texturing and Beyond"
+        static constexpr double  e  = 1.4511;
+      #else
+    //  static constexpr double  e  = 1.375;
+      #endif
 
+    public:
+        // 2D regular grid on cube face --> 2D irregular grid on cube face
+        ND_ static double2  Forward (const double2 &snormCoord) __NE___
+        {
+            return Sign( snormCoord ) * (e - Sqrt( e*e - 4.0 * (e - 1.0) * Abs(snormCoord) )) / (2.0 * (e - 1.0));
+        }
 
-        // 2D regular grid on cube face + face --> 3D on sphere
-        ND_ static double3  Forward (const double2 &ncoord, ECubeFace face) __NE___
+        // 2D irregular grid on cube face --> 2D regular grid on cube face
+        ND_ static double2  Inverse (const double2 &snormCoord) __NE___
         {
-            return Normalize( RotateVec( double3{ ncoord, 1.0 }, face ));
+            return snormCoord * (e + (1.0 - e) * Abs(snormCoord));
         }
+    };
 
-        // 3D on sphere --> 2D regular grid on cube face + face
-        ND_ static Pair<double2, ECubeFace>  Inverse (const double3 &coord) __NE___
+/*
+=================================================
+    SCProj1_5thPoly
+=================================================
+*/
+    struct SCProj1_5thPoly
+    {
+        // 2D regular grid on cube face --> 2D irregular grid on cube face
+        ND_ static double2  Forward (const double2 &snormCoord) __NE___
         {
-            auto[c, z, face] = InverseRotation( coord );
-            c /= z;
-            return { c, face };
+            double2 sq = snormCoord * snormCoord;
+            return (0.745558715593 + (0.130546850193 + 0.123894434214 * sq) * sq) * snormCoord;
+        }
+
+        // 2D irregular grid on cube face --> 2D regular grid on cube face
+        ND_ static double2  Inverse (const double2 &snormCoord) __NE___
+        {
+            double2 sq = snormCoord * snormCoord;
+            return (1.34318229552 + (-0.486514066449 + 0.143331770927 * sq) * sq) * snormCoord;
         }
     };
 
 /*
 =================================================
-    TangentialSphericalCube
+    SCProj1_COBE
 =================================================
 */
-    struct TangentialSphericalCube
+    struct SCProj1_COBE
     {
-        static constexpr double  warp_theta     = 0.868734829276;
-        static constexpr double  tan_warp_theta = 1.182286685546; //tan( warp_theta );
+        // 2D regular grid on cube face --> 2D irregular grid on cube face
+        ND_ static double2  Forward (const double2 &snormCoord) __NE___
+        {
+            double2 sq1 = snormCoord * snormCoord;
+            double2 sq2 {sq1.y, sq1.x};
+            double2 sum = ((-0.0941180085824 + 0.0409125981187 * sq2 - 0.0623272690881 * sq1) * sq1 + (0.0275922480902 + 0.0342217026979 * sq2) * sq2);
+            return (0.723951234952 + 0.276048765048 * sq1 + (1.0 - sq1) * sum) * snormCoord;
+        }
 
+        // 2D irregular grid on cube face --> 2D regular grid on cube face
+        ND_ static double2  Inverse (const double2 &snormCoord) __NE___
+        {
+            double2 sq1 = snormCoord * snormCoord;
+            double2 sq2 {sq1.y, sq1.x};
+            double2 sum = ((-0.212853382041 + 0.0941259684877 * sq2 + 0.0693532685333 * sq1) * sq1 + (-0.117847692949 + 0.0107989197181 * sq2) * sq2);
+            return (1.37738198385 - 0.377381983848 * sq1 + (1.0 - sq1) * sum) * snormCoord;
+        }
+    };
+
+/*
+=================================================
+    SCProj1_Arvo
+=================================================
+*/
+    struct SCProj1_Arvo
+    {
         // 2D regular grid on cube face --> 2D irregular grid on cube face
-        ND_ static double2  Forward (const double2 &ncoord) __NE___
+        ND_ static double2  Forward (const double2 &snormCoord) __NE___
         {
-            return double2{ tan( warp_theta * ncoord.x ) / tan_warp_theta,
-                            tan( warp_theta * ncoord.y ) / tan_warp_theta };
+            double  tan_a_term  = glm::tan( snormCoord.x * 0.523598775598 );
+            double  cos_a_term  = glm::cos( snormCoord.x * 1.0471975512 );
+            return double2{ 1.41421356237 * tan_a_term / Sqrt( 1.0 - tan_a_term * tan_a_term ),
+                            snormCoord.y / Sqrt( 1.0 + (1.0 - snormCoord.y * snormCoord.y) * cos_a_term) };
         }
 
         // 2D irregular grid on cube face --> 2D regular grid on cube face
-        ND_ static double2  Inverse (const double2 &ncoord) __NE___
+        ND_ static double2  Inverse (const double2 &snormCoord) __NE___
         {
-            return double2{ atan( ncoord.x * tan_warp_theta ) / warp_theta,
-                            atan( ncoord.y * tan_warp_theta ) / warp_theta };
+            double  ss2 = Sqrt( snormCoord.x * snormCoord.x + 2.0 );
+            return double2{ glm::atan( snormCoord.x / ss2 ) * 1.9098593171,
+                            snormCoord.y * ss2 / Sqrt( Dot( snormCoord, snormCoord ) + 1.0 )};
         }
+    };
+//-----------------------------------------------------------------------------
+
+
+// Second level projection //
 
+/*
+=================================================
+    SCProj2_Cube
+=================================================
+*/
+    template <typename TProj>
+    struct SCProj2_Cube : TProj
+    {
+        using TProj::Forward;
+        using TProj::Inverse;
 
         // 2D regular grid on cube face + face --> 3D on sphere
-        ND_ static double3  Forward (const double2 &ncoord, ECubeFace face) __NE___
+        ND_ static double3  Forward (const double2 &snormCoord, ECubeFace face) __NE___
         {
-            return Forward2( double3{Forward( ncoord ), 1.0}, face );
+            return Forward2( double3{Forward( snormCoord ), 1.0}, face );
         }
 
         // 3D on cube face --> 3D on sphere
         ND_ static double3  Forward2 (const double3 &projected, ECubeFace face) __NE___
         {
-            return Normalize( RotateVec( projected, face ));
+            return RotateVec( projected, face );
         }
 
-
         // 3D on sphere --> 2D regular grid on cube face + face
         ND_ static Pair<double2, ECubeFace>  Inverse (const double3 &coord) __NE___
         {
-            auto[c, z, face] = InverseRotation( coord );
-            c /= z;
-            return { Inverse(c), face };
+            auto [c, z, face] = InverseRotation( coord );
+            return { c, face };
         }
     };
 
 /*
 =================================================
-    AdjustedSphericalCube
+    SCProj2_Spherical
 =================================================
-*
-    struct AdjustedSphericalCube
+*/
+    template <typename TProj>
+    struct SCProj2_Spherical : TProj
     {
+        using TProj::Forward;
+        using TProj::Inverse;
+
+        // 2D regular grid on cube face + face --> 3D on sphere
+        ND_ static double3  Forward (const double2 &snormCoord, ECubeFace face) __NE___
+        {
+            return Forward2( double3{Forward( snormCoord ), 1.0}, face );
+        }
+
+        // 3D on cube face --> 3D on sphere
+        ND_ static double3  Forward2 (const double3 &projected, ECubeFace face) __NE___
+        {
+            return Normalize( RotateVec( projected, face ));
+        }
+
+        // 3D on sphere --> 2D regular grid on cube face + face
+        ND_ static Pair<double2, ECubeFace>  Inverse (const double3 &coord) __NE___
+        {
+            auto [c, z, face] = InverseRotation( coord );
+            c /= z;
+            return { Inverse(c), face };
+        }
     };
 
 /*
 =================================================
-    TextureProjection
+    SCProj2_Texture
 =================================================
 */
-    struct TextureProjection
+    template <typename TProj>
+    struct SCProj2_Texture
     {
-        ND_ static double3  Forward (const double2 &ncoord, ECubeFace face) __NE___
+        using Proj_t = SCProj2_Spherical< TProj >;
+
+        ND_ static double3  Forward (const double2 &snormCoord, ECubeFace face) __NE___
         {
-            return IdentitySphericalCube::Forward( ncoord, face ) * 0.5;
+            return Proj_t::Forward( snormCoord, face );
         }
 
         ND_ static Pair<double2, ECubeFace>  Inverse (const double3 &coord) __NE___
         {
-            return IdentitySphericalCube::Inverse( coord * 2.0 );
+            return Proj_t::Inverse( coord );
         }
     };
 
 /*
 =================================================
-    TextureYFlipProjection
+    SCProj2_TextureYFlip
 =================================================
 */
-    struct TextureYFlipProjection
+    template <typename TProj>
+    struct SCProj2_TextureYFlip
     {
-        ND_ static double3  Forward (const double2 &ncoord, ECubeFace face) __NE___
-        {
-            if ( face == ECubeFace::YPos )
-                face = ECubeFace::YNeg;
-            else
-            if ( face == ECubeFace::YNeg )
-                face = ECubeFace::YPos;
+        using Proj_t = SCProj2_Spherical< TProj >;
 
-            return IdentitySphericalCube::Forward( ncoord, face ) * 0.5;
+        ND_ static double3  Forward (const double2 &snormCoord, ECubeFace face) __NE___
+        {
+            double3 c = Proj_t::Forward( snormCoord, face );
+            c.y = -c.y;
+            return c;
         }
 
         ND_ static Pair<double2, ECubeFace>  Inverse (const double3 &coord) __NE___
         {
-            return IdentitySphericalCube::Inverse( coord * 2.0 );
+            double3 c = coord;
+            c.y = -c.y;
+            return Proj_t::Inverse( c );
         }
     };
 //-----------------------------------------------------------------------------
@@ -257,15 +393,15 @@ namespace AE::GeometryTools
 =================================================
 */
     template <typename PP, typename TP>
-    double3  SphericalCubeProjection<PP,TP>::ForwardProjection (const double2 &ncoord, ECubeFace face) __NE___
+    double3  SphericalCubeProjection<PP,TP>::ForwardProjection (const double2 &snormCoord, ECubeFace face) __NE___
     {
-        return Projection_t::Forward( ncoord, face );
+        return VertexProjection_t::Forward( snormCoord, face );
     }
 
     template <typename PP, typename TP>
-    float3  SphericalCubeProjection<PP,TP>::ForwardProjection (const float2 &ncoord, ECubeFace face) __NE___
+    float3  SphericalCubeProjection<PP,TP>::ForwardProjection (const float2 &snormCoord, ECubeFace face) __NE___
     {
-        return float3(Projection_t::Forward( double2(ncoord), face ));
+        return float3(VertexProjection_t::Forward( double2{snormCoord}, face ));
     }
 
 /*
@@ -276,14 +412,14 @@ namespace AE::GeometryTools
     template <typename PP, typename TP>
     Pair<double2, ECubeFace>  SphericalCubeProjection<PP,TP>::InverseProjection (const double3 &coord) __NE___
     {
-        auto[c, face] = Projection_t::Inverse( coord );
+        auto [c, face] = VertexProjection_t::Inverse( coord );
         return { c, face };
     }
 
     template <typename PP, typename TP>
     Pair<float2, ECubeFace>  SphericalCubeProjection<PP,TP>::InverseProjection (const float3 &coord) __NE___
     {
-        auto[c, face] = Projection_t::Inverse( double3(coord) );
+        auto [c, face] = VertexProjection_t::Inverse( double3(coord) );
         return { float2(c), face };
     }
 
@@ -293,15 +429,15 @@ namespace AE::GeometryTools
 =================================================
 */
     template <typename PP, typename TP>
-    double3  SphericalCubeProjection<PP,TP>::ForwardTexProjection (const double2 &ncoord, ECubeFace face) __NE___
+    double3  SphericalCubeProjection<PP,TP>::ForwardTexProjection (const double2 &snormCoord, ECubeFace face) __NE___
     {
-        return TextureProjection_t::Forward( ncoord, face );
+        return TextureProjection_t::Forward( snormCoord, face );
     }
 
     template <typename PP, typename TP>
-    float3  SphericalCubeProjection<PP,TP>::ForwardTexProjection (const float2 &ncoord, ECubeFace face) __NE___
+    float3  SphericalCubeProjection<PP,TP>::ForwardTexProjection (const float2 &snormCoord, ECubeFace face) __NE___
     {
-        return float3(TextureProjection_t::Forward( double2(ncoord), face ));
+        return float3(TextureProjection_t::Forward( double2{snormCoord}, face ));
     }
 
 /*
@@ -312,14 +448,14 @@ namespace AE::GeometryTools
     template <typename PP, typename TP>
     Pair<double2, ECubeFace>  SphericalCubeProjection<PP,TP>::InverseTexProjection (const double3 &coord) __NE___
     {
-        auto[c, face] = TextureProjection_t::Inverse( coord );
+        auto [c, face] = TextureProjection_t::Inverse( coord );
         return { c, face };
     }
 
     template <typename PP, typename TP>
     Pair<float2, ECubeFace>  SphericalCubeProjection<PP,TP>::InverseTexProjection (const float3 &coord) __NE___
     {
-        auto[c, face] = TextureProjection_t::Inverse( double3(coord) );
+        auto [c, face] = TextureProjection_t::Inverse( double3(coord) );
         return { float2(c), face };
     }
 
diff --git a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeRenderer.h b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeRenderer.h
index b4cec040..bb66ce88 100644
--- a/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeRenderer.h
+++ b/AE/engine/tools/geometry_tools/SphericalCube/SphericalCubeRenderer.h
@@ -14,7 +14,7 @@ namespace AE::GeometryTools
     // Spherical Cube Renderer
     //
 
-    class SphericalCubeRenderer final : public SphericalCubeProjection< TangentialSphericalCube, TextureProjection >
+    class SphericalCubeRenderer final : public SphericalCubeGen::Base_t
     {
     // types
     public:
@@ -83,7 +83,7 @@ namespace AE::GeometryTools
 =================================================
 */
     template <typename DrawCtx>
-    bool  SphericalCubeRenderer::Draw (DrawCtx &ctx, uint lod) C_NE___
+    bool  SphericalCubeRenderer::Draw (DrawCtx &ctx, const uint lod) C_NE___
     {
         CHECK_ERR( lod >= _minLod and lod <= _maxLod );
 
@@ -97,7 +97,7 @@ namespace AE::GeometryTools
 
         ctx.BindVertexBuffer( 0, vb, vb_range.Offset() );
         ctx.BindIndexBuffer( ib, ib_range.Offset(), EIndex::UInt );
-        STATIC_ASSERT( sizeof(Index) == sizeof(uint) );
+        StaticAssert( sizeof(Index) == sizeof(uint) );
 
         DrawIndexedCmd  cmd;
         cmd.indexCount      = idx_cnt;
diff --git a/AE/engine/tools/geometry_tools/Triangulation/CDT_Triangulator.cpp b/AE/engine/tools/geometry_tools/Triangulation/CDT_Triangulator.cpp
index ee8c9b9d..d366a38c 100644
--- a/AE/engine/tools/geometry_tools/Triangulation/CDT_Triangulator.cpp
+++ b/AE/engine/tools/geometry_tools/Triangulation/CDT_Triangulator.cpp
@@ -271,14 +271,14 @@ namespace
         // copy vertices
         outVertices.resize( cdt.vertices.size() );  // throw
 
-        for (auto [v,i] : WithIndex( cdt.vertices )) {
+        for (const auto [v,i] : WithIndex( cdt.vertices )) {
             outVertices[i] = float2{ v.x, v.y };
         }
 
         // copy indices
         outIndices.resize( cdt.triangles.size() * 3 );  // throw
 
-        for (const auto& [tri, i] : WithIndex( cdt.triangles ))
+        for (const auto [tri, i] : WithIndex( cdt.triangles ))
         {
             const usize j = i*3;
             outIndices[j+0] = tri.vertices[0];
@@ -304,7 +304,7 @@ namespace
             optBoundary->clear();
             optBoundary->reserve( cdt.fixedEdges.size()*2 );  // throw
 
-            for (const auto& [tri, i] : WithIndex( cdt.triangles ))
+            for (const auto [tri, i] : WithIndex( cdt.triangles ))
             {
                 if ( tri.neighbors[0] == CDT::noNeighbor )
                 {
@@ -342,13 +342,13 @@ namespace
                                          OUT OutIndices_t           &outIndices,
                                          OUT OutBoundaryEdges_t*    optBoundary) __NE___
     {
-        try {
+        TRY{
             return _Triangulate( verticesArray, indicesArray, flags,
                                  OUT outVertices, OUT outIndices, OUT optBoundary );
         }
-        catch (...) {
+        CATCH_ALL(
             return false;
-        }
+        )
     }
 
     bool  CDT_Triangulator::Triangulate (InVertices_t               vertices,
@@ -358,13 +358,13 @@ namespace
                                          OUT OutIndices_t           &outIndices,
                                          OUT OutBoundaryEdges_t*    optBoundary) __NE___
     {
-        try {
+        TRY{
             return _Triangulate( InArrayOfVertices_t{vertices}, InArrayOfIndices_t{indices}, flags,
                                  OUT outVertices, OUT outIndices, OUT optBoundary );
         }
-        catch (...) {
+        CATCH_ALL(
             return false;
-        }
+        )
     }
 
     bool  CDT_Triangulator::Triangulate (InVertices_t               contour,
@@ -373,15 +373,15 @@ namespace
                                          OUT OutIndices_t           &outIndices,
                                          OUT OutBoundaryEdges_t*    optBoundary) __NE___
     {
-        try {
+        TRY{
             CHECK_ERR( AllBits( flags, EFlags::LineStrip ));
 
             return _Triangulate( InArrayOfVertices_t{contour}, InArrayOfIndices_t{}, flags,
                                  OUT outVertices, OUT outIndices, OUT optBoundary );
         }
-        catch (...) {
+        CATCH_ALL(
             return false;
-        }
+        )
     }
 
 
diff --git a/AE/engine/tools/geometry_tools/Utils/TBN.h b/AE/engine/tools/geometry_tools/Utils/TBN.h
index 11c36aed..a6bb1f25 100644
--- a/AE/engine/tools/geometry_tools/Utils/TBN.h
+++ b/AE/engine/tools/geometry_tools/Utils/TBN.h
@@ -14,13 +14,18 @@ namespace AE::GeometryTools
 */
     inline void  CheckTBN (const float3 &normal, const float3 &tangent, const float3 &bitangent)
     {
+        ASSERT( IsNormalized( normal ));
+        ASSERT( IsNormalized( tangent ));
+        ASSERT( IsNormalized( bitangent ));
+
         const float3    normal2     = Normalize( Cross( bitangent, tangent ));
         const float3    tangent2    = Normalize( Cross( normal, bitangent ));
         const float3    bitangent2  = Normalize( Cross( tangent, normal ));
 
-        ASSERT( All(Equals( normal,     normal2,    0.0001f )));
-        ASSERT( All(Equals( tangent,    tangent2,   0.0001f )));
-        ASSERT( All(Equals( bitangent,  bitangent2, 0.0001f )));
+        ASSERT( All(Equal( normal,      normal2,    1_pct )));
+        ASSERT( All(Equal( tangent,     tangent2,   1_pct )));
+        ASSERT( All(Equal( bitangent,   bitangent2, 1_pct )));
+        Unused( normal2, tangent2, bitangent2 );
     }
 
 /*
diff --git a/AE/engine/tools/graphics_test/GraphicsTest.cpp b/AE/engine/tools/graphics_test/GraphicsTest.cpp
index c9143050..95ac926c 100644
--- a/AE/engine/tools/graphics_test/GraphicsTest.cpp
+++ b/AE/engine/tools/graphics_test/GraphicsTest.cpp
@@ -20,11 +20,11 @@ namespace AE::GraphicsTest
         EXLOCK( _guard );
         if ( _newRef )
         {
-            FileWStream file{ _fname };
-            if ( file.IsOpen() )
+            ASSERT( _dstFile );
+            if ( _dstFile )
             {
                 DDSImageSaver   saver;
-                saver.SaveImage( file, _image );
+                saver.SaveImage( *_dstFile, _image );
             }
         }
     }
@@ -34,29 +34,37 @@ namespace AE::GraphicsTest
     LoadReference
 =================================================
 */
-    bool  ImageComparator::LoadReference (Path imgName)
+    bool  ImageComparator::LoadReference (RC<RStream> imgFile, Path imgName)
     {
-        EXLOCK( _guard );
-
-        _fname  = RVRef(imgName);
-        _loaded = false;
-        _newRef = false;
+        _fname      = RVRef(imgName);
+        _loaded     = false;
+        _newRef     = false;
+        _dstFile    = null;
 
-        if ( FileSystem::IsFile( _fname ))
+        if ( imgFile and imgFile->IsOpen() )
         {
-            FileRStream     file{ _fname };
-            if ( file.IsOpen() )
-            {
-                DDSImageLoader  loader;
-                _loaded = loader.LoadImage( OUT _image, file, False{"don't flipY"}, null, Default );
+            DDSImageLoader  loader;
+            _loaded = loader.LoadImage( OUT _image, *imgFile, False{"don't flipY"}, null, Default );
 
-                CHECK_ERR( _image.MipLevels() == 1 );
-                CHECK_ERR( _image.ArrayLayers() == 1 );
-            }
+            CHECK_ERR( _image.MipLevels() == 1 );
+            CHECK_ERR( _image.ArrayLayers() == 1 );
         }
         return _loaded;
     }
 
+/*
+=================================================
+    Reset
+=================================================
+*/
+    void  ImageComparator::Reset (RC<WStream> imgFile, Path imgName)
+    {
+        _dstFile    = RVRef(imgFile);
+        _fname      = RVRef(imgName);
+        _loaded     = false;
+        _newRef     = false;
+    }
+
 /*
 =================================================
     Compare
diff --git a/AE/engine/tools/graphics_test/GraphicsTest.h b/AE/engine/tools/graphics_test/GraphicsTest.h
index 35801e64..9cd53db5 100644
--- a/AE/engine/tools/graphics_test/GraphicsTest.h
+++ b/AE/engine/tools/graphics_test/GraphicsTest.h
@@ -17,6 +17,7 @@ namespace AE::GraphicsTest
     // variables
     private:
         Mutex                   _guard;
+        RC<WStream>             _dstFile;
         Path                    _fname;
         bool                    _loaded     = false;
         bool                    _newRef     = false;
@@ -28,7 +29,9 @@ namespace AE::GraphicsTest
         ImageComparator () {}
         ~ImageComparator ();
 
-            bool  LoadReference (Path imgName);
+            bool  LoadReference (RC<RStream> imgFile, Path imgName);
+            void  Reset (RC<WStream> imgFile, Path imgName);
+
         ND_ bool  Compare (const ImageMemView &view);
     };
 
diff --git a/AE/engine/tools/lfas/CMakeLists.txt b/AE/engine/tools/lfas/CMakeLists.txt
index ad56b4e8..59f26bb4 100644
--- a/AE/engine/tools/lfas/CMakeLists.txt
+++ b/AE/engine/tools/lfas/CMakeLists.txt
@@ -7,3 +7,5 @@ set_property( TARGET "LockFreeAlgSandbox" PROPERTY FOLDER "Engine/ToolApps" )
 target_link_libraries( "LockFreeAlgSandbox" PUBLIC "Base" )
 target_include_directories( "LockFreeAlgSandbox" PRIVATE "." "../../tests" )
 target_compile_definitions( "LockFreeAlgSandbox" PUBLIC "AE_LFAS_ENABLED" )
+
+add_test( NAME "LockFreeAlgSandbox" COMMAND "LockFreeAlgSandbox" )
diff --git a/AE/engine/tools/lfas/CPP_VM/Atomic.h b/AE/engine/tools/lfas/CPP_VM/Atomic.h
index 07897e68..b72b0c94 100644
--- a/AE/engine/tools/lfas/CPP_VM/Atomic.h
+++ b/AE/engine/tools/lfas/CPP_VM/Atomic.h
@@ -30,11 +30,11 @@ namespace LFAS::CPP
     template <typename T>
     class StdAtomic
     {
-        STATIC_ASSERT( std::is_trivially_copyable_v<T> );
-        STATIC_ASSERT( std::is_copy_constructible_v<T> );
-        STATIC_ASSERT( std::is_move_constructible_v<T> );
-        STATIC_ASSERT( std::is_copy_assignable_v<T> );
-        STATIC_ASSERT( std::is_move_assignable_v<T> );
+        StaticAssert( std::is_trivially_copyable_v<T> );
+        StaticAssert( std::is_copy_constructible_v<T> );
+        StaticAssert( std::is_move_constructible_v<T> );
+        StaticAssert( std::is_copy_assignable_v<T> );
+        StaticAssert( std::is_move_assignable_v<T> );
 
     // types
     public:
@@ -305,7 +305,7 @@ namespace LFAS::CPP
     template <typename T>
     T  StdAtomic<T>::fetch_add (const T val, TMemoryOrder order)
     {
-        STATIC_ASSERT( IsInteger<T> );
+        StaticAssert( IsInteger<T> );
 
         T       result;
         auto&   vm = VirtualMachine::Instance();
@@ -330,7 +330,7 @@ namespace LFAS::CPP
     template <typename T>
     T  StdAtomic<T>::fetch_sub (const T val, TMemoryOrder order)
     {
-        STATIC_ASSERT( IsInteger<T> );
+        StaticAssert( IsInteger<T> );
 
         T       result;
         auto&   vm = VirtualMachine::Instance();
@@ -355,7 +355,7 @@ namespace LFAS::CPP
     template <typename T>
     T  StdAtomic<T>::fetch_and (const T val, TMemoryOrder order)
     {
-        STATIC_ASSERT( IsInteger<T> );
+        StaticAssert( IsInteger<T> );
 
         T       result;
         auto&   vm = VirtualMachine::Instance();
@@ -380,7 +380,7 @@ namespace LFAS::CPP
     template <typename T>
     T  StdAtomic<T>::fetch_or (const T val, TMemoryOrder order)
     {
-        STATIC_ASSERT( IsInteger<T> );
+        StaticAssert( IsInteger<T> );
 
         T       result;
         auto&   vm = VirtualMachine::Instance();
@@ -405,7 +405,7 @@ namespace LFAS::CPP
     template <typename T>
     T  StdAtomic<T>::fetch_xor (const T val, TMemoryOrder order)
     {
-        STATIC_ASSERT( IsInteger<T> );
+        StaticAssert( IsInteger<T> );
 
         T       result;
         auto&   vm = VirtualMachine::Instance();
diff --git a/AE/engine/tools/lfas/CPP_VM/Storage.h b/AE/engine/tools/lfas/CPP_VM/Storage.h
index b712e0b8..8cfb7db9 100644
--- a/AE/engine/tools/lfas/CPP_VM/Storage.h
+++ b/AE/engine/tools/lfas/CPP_VM/Storage.h
@@ -45,7 +45,7 @@ namespace LFAS::CPP::_hidden_
     template <typename T>
     class ClassStorage : public ValueStorage<T>
     {
-        STATIC_ASSERT( IsClass<T> );
+        StaticAssert( IsClass<T> );
 
     // methods
     public:
@@ -117,7 +117,7 @@ namespace LFAS::CPP::_hidden_
     template <typename T, typename Count>
     class ArrayClassStorage : public ArrayValueStorage< T, Count >
     {
-        STATIC_ASSERT( IsClass<T> );
+        StaticAssert( IsClass<T> );
 
     // methods
     public:
@@ -338,7 +338,7 @@ namespace LFAS::CPP::_hidden_
     Write
 =================================================
 */
-    template <typename T, typename C>   
+    template <typename T, typename C>
     template <typename M, typename V>
     void  ArrayClassStorage<T,C>::Write (usize idx, M T::*member, V&& value)
     {
diff --git a/AE/engine/tools/lfas/CPP_VM/VirtualMachine.cpp b/AE/engine/tools/lfas/CPP_VM/VirtualMachine.cpp
index d3d7a6b3..cde77331 100644
--- a/AE/engine/tools/lfas/CPP_VM/VirtualMachine.cpp
+++ b/AE/engine/tools/lfas/CPP_VM/VirtualMachine.cpp
@@ -2,12 +2,6 @@
 
 #include "CPP_VM/VirtualMachine.h"
 
-namespace AE::Base
-{
-    using Mutex = std::mutex;
-}
-#include "base/Platforms/Platform.h"
-
 namespace LFAS::CPP
 {
     using namespace AE::Base;
@@ -23,7 +17,7 @@ namespace LFAS::CPP
     private:
         ScriptFn                _fn;
         const String            _name;
-        std::atomic<ulong>  _invocations {0};
+        std::atomic<ulong>      _invocations {0};
 
 
     // methods
@@ -59,7 +53,7 @@ namespace LFAS::CPP
     constructor
 =================================================
 */
-    VirtualMachine::AtomicGlobalLock::AtomicGlobalLock (std::mutex *lock) :
+    VirtualMachine::AtomicGlobalLock::AtomicGlobalLock (std::mutex* lock) :
         _lock{ lock }
     {
         if ( _lock ) {
@@ -202,7 +196,7 @@ namespace LFAS::CPP
         if ( delay > 4 )
             return;
 
-        ThreadUtils::Sleep( milliseconds{delay} );
+        std::this_thread::sleep_for( milliseconds{delay} );
     }
 
 /*
@@ -229,7 +223,7 @@ namespace LFAS::CPP
     AtomicCreate
 =================================================
 */
-    void  VirtualMachine::AtomicCreate (const void *ptr)
+    void  VirtualMachine::AtomicCreate (const void* ptr)
     {
         EXLOCK( _atomicMapGuard );
 
@@ -248,7 +242,7 @@ namespace LFAS::CPP
     AtomicDestroy
 =================================================
 */
-    void  VirtualMachine::AtomicDestroy (const void *ptr)
+    void  VirtualMachine::AtomicDestroy (const void* ptr)
     {
         EXLOCK( _atomicMapGuard );
 
@@ -284,7 +278,7 @@ namespace LFAS::CPP
     StorageCreate
 =================================================
 */
-    void  VirtualMachine::StorageCreate (const void *ptr, Bytes size)
+    void  VirtualMachine::StorageCreate (const void* ptr, Bytes size)
     {
         EXLOCK( _storageMapGuard );
 
@@ -305,7 +299,7 @@ namespace LFAS::CPP
     StorageDestroy
 =================================================
 */
-    void  VirtualMachine::StorageDestroy (const void *ptr)
+    void  VirtualMachine::StorageDestroy (const void* ptr)
     {
         EXLOCK( _storageMapGuard );
 
@@ -339,7 +333,7 @@ namespace LFAS::CPP
     StorageReadAccess
 =================================================
 */
-    void  VirtualMachine::StorageReadAccess (const void *ptr, Bytes offset, Bytes size)
+    void  VirtualMachine::StorageReadAccess (const void* ptr, Bytes offset, Bytes size)
     {
         EXLOCK( _storageMapGuard );
 
@@ -356,7 +350,7 @@ namespace LFAS::CPP
     StorageWriteAccess
 =================================================
 */
-    void  VirtualMachine::StorageWriteAccess (const void *ptr, Bytes offset, Bytes size)
+    void  VirtualMachine::StorageWriteAccess (const void* ptr, Bytes offset, Bytes size)
     {
         EXLOCK( _storageMapGuard );
 
@@ -419,7 +413,7 @@ namespace LFAS::CPP
             }
         }
 
-        ThreadUtils::Sleep( timeout );
+        std::this_thread::sleep_for( timeout );     // TODO: random sleep time Nano/Micor/Milli
 
         break_all.store( true );
         AE_LOGI( "RunParallel - wait" );
diff --git a/AE/engine/tools/lfas/CPP_VM/VirtualMachine.h b/AE/engine/tools/lfas/CPP_VM/VirtualMachine.h
index 310eb1bb..06376f78 100644
--- a/AE/engine/tools/lfas/CPP_VM/VirtualMachine.h
+++ b/AE/engine/tools/lfas/CPP_VM/VirtualMachine.h
@@ -29,7 +29,7 @@ namespace LFAS::CPP
 
         public:
             AtomicGlobalLock () {}
-            explicit AtomicGlobalLock (std::mutex *lock);
+            explicit AtomicGlobalLock (std::mutex* lock);
             AtomicGlobalLock (const AtomicGlobalLock &) = delete;
             AtomicGlobalLock (AtomicGlobalLock &&);
             ~AtomicGlobalLock ();
@@ -106,19 +106,19 @@ namespace LFAS::CPP
 
 
     // atomics
-        void  AtomicCreate (const void *ptr);
-        void  AtomicDestroy (const void *ptr);
+        void  AtomicCreate (const void* ptr);
+        void  AtomicDestroy (const void* ptr);
 
-        ND_ bool  AtomicCompareExchangeWeakFalsePositive (const void *ptr);
+        ND_ bool  AtomicCompareExchangeWeakFalsePositive (const void* ptr);
 
         ND_ AtomicGlobalLock  GetAtomicGlobalLock (bool isSequentiallyConsistent);
 
 
     // memory ranges
-        void  StorageCreate (const void *ptr, Bytes size);
-        void  StorageDestroy (const void *ptr);
-        void  StorageReadAccess (const void *ptr, Bytes offset, Bytes size);
-        void  StorageWriteAccess (const void *ptr, Bytes offset, Bytes size);
+        void  StorageCreate (const void* ptr, Bytes size);
+        void  StorageDestroy (const void* ptr);
+        void  StorageReadAccess (const void* ptr, Bytes offset, Bytes size);
+        void  StorageWriteAccess (const void* ptr, Bytes offset, Bytes size);
 
 
     // instance
diff --git a/AE/engine/tools/lfas/Tests/Test_LfIndexedPool2.cpp b/AE/engine/tools/lfas/Tests/Test_LfIndexedPool2.cpp
index b6f7f756..8feb3b5a 100644
--- a/AE/engine/tools/lfas/Tests/Test_LfIndexedPool2.cpp
+++ b/AE/engine/tools/lfas/Tests/Test_LfIndexedPool2.cpp
@@ -3,7 +3,7 @@
 #include "UnitTest_Common.h"
 
 #include "threading/Primitives/SpinLock.h"
-#include "threading/Containers/LfIndexedPool2.h"
+#include "deprecated/threading/LfIndexedPool2.h"
 
 namespace
 {
diff --git a/AE/engine/tools/lfas/Tests/Test_LfIndexedPool3.cpp b/AE/engine/tools/lfas/Tests/Test_LfIndexedPool3.cpp
index 5278a388..4da61349 100644
--- a/AE/engine/tools/lfas/Tests/Test_LfIndexedPool3.cpp
+++ b/AE/engine/tools/lfas/Tests/Test_LfIndexedPool3.cpp
@@ -3,12 +3,12 @@
 #include "UnitTest_Common.h"
 
 #include "threading/Primitives/SpinLock.h"
-#include "threading/Containers/LfIndexedPool3.h"
+#include "threading/Containers/LfIndexedPool.h"
 
 
 namespace
 {
-    using AE::Threading::LfIndexedPool3;
+    using AE::Threading::LfIndexedPool;
 
     enum class EAction
     {
@@ -20,7 +20,7 @@ namespace
     };
 
 
-    void LfIndexedPool3_Test1 ()
+    void LfIndexedPool_Test1 ()
     {
         using T = DebugInstanceCounter< int, 1 >;
 
@@ -37,7 +37,7 @@ namespace
 
             struct
             {
-                LfIndexedPool3< Storage<T>, uint, 256, 16 >     pool;
+                LfIndexedPool< Storage<T>, uint, 256, 16 >      pool;
 
                 std::mutex                                      guard;
                 HashMap< std::thread::id, PerThread >           perThread;
@@ -150,7 +150,7 @@ namespace
 
 extern void Test_LfIndexedPool3 ()
 {
-    LfIndexedPool3_Test1();
+    LfIndexedPool_Test1();
 
     TEST_PASSED();
 }
diff --git a/AE/engine/tools/lfas/Tests/UnitTest_Common.h b/AE/engine/tools/lfas/Tests/UnitTest_Common.h
index 3065112a..b6b3fb7d 100644
--- a/AE/engine/tools/lfas/Tests/UnitTest_Common.h
+++ b/AE/engine/tools/lfas/Tests/UnitTest_Common.h
@@ -16,9 +16,14 @@
 # endif
 #endif
 
+#define DRC_EXLOCK( ... )
+#define DRC_SHAREDLOCK( ... )
+#define DRC_ONLY( ... )
+
 using namespace LFAS;
 using namespace LFAS::CPP;
 
 #include "base/Math/BitMath.h"
 #include "base/Math/Math.h"
 #include "base/Memory/UntypedAllocator.h"
+#include "base/Memory/IAllocator.h"
diff --git a/AE/engine/tools/lfas/Tests/main.cpp b/AE/engine/tools/lfas/Tests/main.cpp
index 71c2fa07..02d5880c 100644
--- a/AE/engine/tools/lfas/Tests/main.cpp
+++ b/AE/engine/tools/lfas/Tests/main.cpp
@@ -22,7 +22,9 @@ int main ()
     Test_LfLinearAllocator();
 
     // TODO:
-    //  LfFixedBlockAllocator, LfFixedBlockAllocator3
+    //  LfFixedBlockAllocator
     //  LfStaticQueue
     //  LfStaticIndexedPool
+
+    return 0;
 }
diff --git a/AE/engine/tools/net_storage_server/CMakeLists.txt b/AE/engine/tools/net_storage_server/CMakeLists.txt
new file mode 100644
index 00000000..a9301b6e
--- /dev/null
+++ b/AE/engine/tools/net_storage_server/CMakeLists.txt
@@ -0,0 +1,10 @@
+# Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+if (TARGET "Networking")
+    file( GLOB_RECURSE SOURCES "*.*" )
+    add_executable( "NetStorageServer" ${SOURCES} )
+    source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
+    target_link_libraries( "NetStorageServer" PUBLIC "VFS" )
+    target_include_directories( "NetStorageServer" PUBLIC ".." )
+    set_property( TARGET "NetStorageServer" PROPERTY FOLDER "Engine/ToolApps" )
+endif()
diff --git a/AE/engine/tools/net_storage_server/Server.cpp b/AE/engine/tools/net_storage_server/Server.cpp
new file mode 100644
index 00000000..8a5cbfab
--- /dev/null
+++ b/AE/engine/tools/net_storage_server/Server.cpp
@@ -0,0 +1,134 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+
+#include "pch/VFS.h"
+#include "vfs/Network/NetworkStorageServer.h"
+
+using namespace AE;
+using namespace AE::Threading;
+using namespace AE::VFS;
+
+namespace
+{
+    static const FrameUID   c_InitialFrameId = FrameUID::Init( 2 );
+
+
+    class ClientListener final : public IClientListener
+    {
+        ushort  _id = 0;
+
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress &)     __NE_OV { return EClientLocalID(_id++); }
+        EClientLocalID  OnClientConnected (EChannel, const IpAddress6 &)    __NE_OV { return EClientLocalID(_id++); }
+
+        void  OnClientDisconnected (EChannel, EClientLocalID)               __NE_OV {}
+    };
+
+
+    class Server final : public BaseServer
+    {
+    public:
+        Server () {}
+
+        ND_ bool  AddChannel (ushort port)      { return _AddChannelTCP( port ); }
+
+        using BaseServer::_Initialize;
+    };
+
+
+    ND_ static bool  Initialize ()
+    {
+        TaskScheduler::Config   cfg;
+        cfg.maxBackgroundQueues = 2;
+        cfg.maxIOThreads        = 1;
+
+        TaskScheduler::InstanceCtor::Create();
+        CHECK_ERR( Scheduler().Setup( cfg ));
+
+        CHECK_ERR( Networking::SocketService::Instance().Initialize() );
+
+        VirtualFileSystem::InstanceCtor::Create();
+        return true;
+    }
+
+
+    static void  Deinitialize ()
+    {
+        Scheduler().Release();
+        TaskScheduler::InstanceCtor::Destroy();
+
+        Networking::SocketService::Instance().Deinitialize();
+        VirtualFileSystem::InstanceCtor::Destroy();
+    }
+
+
+    ND_ static bool  RunVFSServer (const ushort port, ArrayView<Path> dirs)
+    {
+        using Clock_t = std::chrono::high_resolution_clock;
+
+        NetworkStorageServer    vfs_server;
+        auto                    mf          = MakeRC<MessageFactory>();
+        Server                  server;
+
+        CHECK_ERR( server._Initialize( mf, MakeRC<ClientListener>(), null, c_InitialFrameId ));
+
+        for (auto& dir : dirs)
+        {
+            Unused( GetVFS().AddStorage( VirtualFileStorageFactory::CreateStaticFolder( dir )));
+        }
+        CHECK_ERR( GetVFS().MakeImmutable() );
+
+        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
+                EThreadArray{ EThread::Background, EThread::FileIO },
+                "background-1"
+            }));
+
+        Scheduler().AddThread( ThreadMngr::CreateThread( ThreadMngr::ThreadConfig{
+                EThreadArray{ EThread::Background, EThread::FileIO },
+                "background-2"
+            }));
+
+        CHECK_ERR( Register_NetVFS( *mf ));
+        CHECK_ERR( server.AddChannel( port ));
+
+        CHECK_ERR( server.Add( vfs_server.GetMessageProducer().GetRC() ));
+        CHECK_ERR( server.Add( vfs_server.GetMessageConsumer().GetRC() ));
+
+        const milliseconds  server_tick {1000/30};  // ~30 FPS
+
+        for (FrameUID fid = c_InitialFrameId;; fid.Inc())
+        {
+            const auto  begin = Clock_t::now();
+
+            // don't reorder instructions
+            CompilerBarrier( EMemoryOrder::Acquire );
+
+            // send & receive messages
+            server.Update( fid );
+
+            // don't reorder instructions
+            CompilerBarrier( EMemoryOrder::Release );
+
+            const auto  dt = TimeCast<milliseconds>(Clock_t::now() - begin);
+
+            if ( dt < server_tick )
+                ThreadUtils::MilliSleep( server_tick - dt );
+        }
+
+        return true;
+    }
+}
+
+
+int main ()
+{
+    AE::Base::StaticLogger::LoggerDbgScope  log{};
+
+    Array<Path> dirs;
+    dirs.push_back( R"(C:\Projects\AllinOne\AE\engine\tests)" );
+
+    CHECK_ERR( not dirs.empty(), -1 );
+    CHECK_ERR( Initialize(), -2 );
+    CHECK_ERR( RunVFSServer( 4000, dirs ), -3 );
+    Deinitialize();
+
+    return 0;
+}
diff --git a/AE/engine/tools/res_loaders/AE/AEImageLoader.cpp b/AE/engine/tools/res_loaders/AE/AEImageLoader.cpp
index c8f5c9ba..9c7d2c64 100644
--- a/AE/engine/tools/res_loaders/AE/AEImageLoader.cpp
+++ b/AE/engine/tools/res_loaders/AE/AEImageLoader.cpp
@@ -15,7 +15,7 @@ namespace {
     LoadImage
 =================================================
 */
-    bool  AEImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool  AEImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         CHECK( not flipY );
 
diff --git a/AE/engine/tools/res_loaders/AE/AEImageLoader.h b/AE/engine/tools/res_loaders/AE/AEImageLoader.h
index dd6a5872..a6d4cd53 100644
--- a/AE/engine/tools/res_loaders/AE/AEImageLoader.h
+++ b/AE/engine/tools/res_loaders/AE/AEImageLoader.h
@@ -15,7 +15,7 @@ namespace AE::ResLoader
     {
     // methods
     public:
-        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE_OV;
+        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE_OV;
         using IImageLoader::LoadImage;
     };
 
diff --git a/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.cpp b/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.cpp
index 44a6f0bf..f29921f4 100644
--- a/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.cpp
+++ b/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.cpp
@@ -15,7 +15,7 @@ namespace AE::ResLoader
     LoadImage
 =================================================
 */
-    bool  AllImageLoaders::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool  AllImageLoaders::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         // multithreaded
         if ( fileFormat == Default or fileFormat == EImageFormat::DDS )
diff --git a/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.h b/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.h
index 7f1c1557..e2a19f65 100644
--- a/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.h
+++ b/AE/engine/tools/res_loaders/AllImages/AllImageLoaders.h
@@ -15,7 +15,7 @@ namespace AE::ResLoader
     {
     // methods
     public:
-        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE_OV;
+        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE_OV;
         using IImageLoader::LoadImage;
     };
 
diff --git a/AE/engine/tools/res_loaders/Assimp/AssimpLoader.cpp b/AE/engine/tools/res_loaders/Assimp/AssimpLoader.cpp
index 5a1de8d4..e7452bd5 100644
--- a/AE/engine/tools/res_loaders/Assimp/AssimpLoader.cpp
+++ b/AE/engine/tools/res_loaders/Assimp/AssimpLoader.cpp
@@ -201,7 +201,7 @@ namespace
     TextureTypeToMaterialKey
 =================================================
 */
-    static bool  ReadColorForTexture (const aiMaterial *src, aiTextureType texType, OUT float4 &value)
+    static bool  ReadColorForTexture (const aiMaterial* src, aiTextureType texType, OUT float4 &value)
     {
         #define GET_COLOR( _key_ )                                  \
         {                                                           \
@@ -272,7 +272,7 @@ namespace
     LoadMaterial
 =================================================
 */
-    ND_ static bool  LoadMaterial (const aiMaterial *src, OUT RC<IntermMaterial> &dst)
+    ND_ static bool  LoadMaterial (const aiMaterial* src, OUT RC<IntermMaterial> &dst)
     {
         using EKey = IntermMaterial::EKey;
 
@@ -331,7 +331,7 @@ namespace
             if ( src->GetTexture( aiTextureType(i), 0, OUT &tex_name, OUT &mapping, OUT &uv_index, null, null, OUT map_mode ) == AI_SUCCESS )
             {
                 IntermMaterial::MtrTexture  mtr_tex;
-                mtr_tex.image           = MakeRC<IntermImage>( Str( tex_name ));
+                mtr_tex.image           = MakeRC<IntermImage>( Path{Str( tex_name )});
                 mtr_tex.name            = Str( tex_name );
             //  mtr_tex.uvTransform     =
                 mtr_tex.mapping         = ConvertMapping( mapping );
@@ -394,7 +394,7 @@ namespace
     CreateVertexAttribs
 =================================================
 */
-    ND_ static bool  CreateVertexAttribs (const aiMesh *mesh, OUT Bytes &stride, OUT RC<IntermVertexAttribs> &outAttribs)
+    ND_ static bool  CreateVertexAttribs (const aiMesh* mesh, OUT Bytes &stride, OUT RC<IntermVertexAttribs> &outAttribs)
     {
         const StaticArray<EVertexType, 5>   float_vert_types = {
             EVertexType::Unknown, EVertexType::Float, EVertexType::Float2, EVertexType::Float3, EVertexType::Float4
@@ -443,7 +443,7 @@ namespace
     LoadMesh
 =================================================
 */
-    ND_ static bool  LoadMesh (const aiMesh *src, OUT RC<IntermMesh> &dst, INOUT VertexAttribsSet_t &attribsCache)
+    ND_ static bool  LoadMesh (const aiMesh* src, OUT RC<IntermMesh> &dst, INOUT VertexAttribsSet_t &attribsCache)
     {
         CHECK_ERR( src->mPrimitiveTypes == aiPrimitiveType_TRIANGLE );
         CHECK_ERR( not src->HasBones() );
@@ -548,7 +548,7 @@ namespace
     LoadLight
 =================================================
 */
-    ND_ static bool  LoadLight (const aiLight *src, OUT RC<IntermLight> &dst)
+    ND_ static bool  LoadLight (const aiLight* src, OUT RC<IntermLight> &dst)
     {
         using ELightType = IntermLight::ELightType;
 
@@ -589,7 +589,7 @@ namespace
     LoadMaterials
 =================================================
 */
-    ND_ static bool  LoadMaterials (const aiScene *scene, OUT Array<RC<IntermMaterial>> &outMaterials)
+    ND_ static bool  LoadMaterials (const aiScene* scene, OUT Array<RC<IntermMaterial>> &outMaterials)
     {
         outMaterials.resize( scene->mNumMaterials );  // throw
 
@@ -605,7 +605,7 @@ namespace
     LoadMeshes
 =================================================
 */
-    ND_ static bool  LoadMeshes (const aiScene *scene, OUT Array<RC<IntermMesh>> &outMeshes, INOUT VertexAttribsSet_t &attribsCache)
+    ND_ static bool  LoadMeshes (const aiScene* scene, OUT Array<RC<IntermMesh>> &outMeshes, INOUT VertexAttribsSet_t &attribsCache)
     {
         outMeshes.resize( scene->mNumMeshes );  // throw
 
@@ -621,7 +621,7 @@ namespace
     LoadLights
 =================================================
 */
-    ND_ static bool  LoadLights (const aiScene *scene, OUT Array<RC<IntermLight>> &outLights)
+    ND_ static bool  LoadLights (const aiScene* scene, OUT Array<RC<IntermLight>> &outLights)
     {
         outLights.resize( scene->mNumLights );  // throw
 
@@ -637,7 +637,7 @@ namespace
     RecursiveLoadHierarchy
 =================================================
 */
-    ND_ static bool  RecursiveLoadHierarchy (const aiScene *aiScene, const aiNode *node, const SceneData &scene, INOUT IntermScene::SceneNode &parent)
+    ND_ static bool  RecursiveLoadHierarchy (const aiScene* aiScene, const aiNode* node, const SceneData &scene, INOUT IntermScene::SceneNode &parent)
     {
         IntermScene::SceneNode  snode;
         snode.localTransform    = ConvertMatrix( node->mTransformation );
@@ -673,7 +673,7 @@ namespace
     LoadHierarchy
 =================================================
 */
-    ND_ static bool  LoadHierarchy (const aiScene *aiScene, INOUT SceneData &scene)
+    ND_ static bool  LoadHierarchy (const aiScene* aiScene, INOUT SceneData &scene)
     {
         scene.root.localTransform   = ConvertMatrix( aiScene->mRootNode->mTransformation );
         scene.root.name             = aiScene->mRootNode->mName.C_Str();
@@ -697,7 +697,7 @@ namespace
                 | aiProcess_Triangulate
                 | (config.smoothNormals     ? aiProcess_GenSmoothNormals : aiProcess_GenNormals)
                 | aiProcess_RemoveRedundantMaterials
-                | aiProcess_GenUVCoords 
+                | aiProcess_GenUVCoords
                 | aiProcess_TransformUVCoords
                 | (config.splitLargeMeshes  ? aiProcess_SplitLargeMeshes : 0)
                 | (not config.optimize      ? 0 :
@@ -744,11 +744,11 @@ namespace
         CHECK_ERR( stream.IsOpen() );
 
         Array<ubyte>    data;
-        CATCH_ERR( data.resize( usize(stream.RemainingSize()) ));  // throw
+        NOTHROW_ERR( data.resize( usize(stream.RemainingSize()) ));
 
         CHECK_ERR( stream.ReadSeq( OUT data.data(), ArraySizeOf(data) ) == ArraySizeOf(data) );
 
-        try {
+        TRY{
             AssimpInit();
             Assimp::Importer    importer;
 
@@ -763,9 +763,9 @@ namespace
 
             return LoadScene( OUT outScene, scene );
         }
-        catch (...) {
+        CATCH_ALL(
             return false;
-        }
+        )
     }
 
 /*
@@ -777,7 +777,7 @@ namespace
                                    const Path       &scenePath,
                                    const Config     &config) __NE___
     {
-        try {
+        TRY{
             AssimpInit();
             Assimp::Importer    importer;
 
@@ -792,9 +792,9 @@ namespace
 
             return LoadScene( OUT outScene, scene );
         }
-        catch (...) {
+        CATCH_ALL(
             return false;
-        }
+        )
     }
 
 
diff --git a/AE/engine/tools/res_loaders/Assimp/AssimpLoader.h b/AE/engine/tools/res_loaders/Assimp/AssimpLoader.h
index 66fa0741..233a6bd0 100644
--- a/AE/engine/tools/res_loaders/Assimp/AssimpLoader.h
+++ b/AE/engine/tools/res_loaders/Assimp/AssimpLoader.h
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    Thread-safe:    yes (mutex)
+    Thread-safe:    yes (locks in allocator)
 */
 
 #pragma once
diff --git a/AE/engine/tools/res_loaders/DDS/DDSImageLoader.cpp b/AE/engine/tools/res_loaders/DDS/DDSImageLoader.cpp
index ce5cd749..50dd732c 100644
--- a/AE/engine/tools/res_loaders/DDS/DDSImageLoader.cpp
+++ b/AE/engine/tools/res_loaders/DDS/DDSImageLoader.cpp
@@ -13,7 +13,7 @@ namespace
     LoadDX10Image
 =================================================
 */
-    static bool  LoadDX10Image (INOUT IntermImage &image, const DDS_HEADER &header, const DDS_HEADER_DXT10 &headerDX10, RStream &stream, SharedMem::Allocator_t allocator)
+    static bool  LoadDX10Image (INOUT IntermImage &image, const DDS_HEADER &header, const DDS_HEADER_DXT10 &headerDX10, RStream &stream, RC<IAllocator> allocator)
     {
         CHECK_ERR( AllBits( header.dwFlags, DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT ));
 
@@ -126,7 +126,7 @@ namespace
     LoadDDSImage
 =================================================
 */
-    static bool  LoadDDSImage (INOUT IntermImage &image, const DDS_HEADER &header, RStream &stream, SharedMem::Allocator_t allocator)
+    static bool  LoadDDSImage (INOUT IntermImage &image, const DDS_HEADER &header, RStream &stream, RC<IAllocator> allocator)
     {
         Unused( image, header, stream );
         // TODO
@@ -143,7 +143,7 @@ namespace
     LoadImage
 =================================================
 */
-    bool  DDSImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool  DDSImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         CHECK( not flipY );
 
@@ -168,11 +168,11 @@ namespace
         {
             header_10 = DDS_HEADER_DXT10{};
             CHECK_ERR( stream.Read( OUT *header_10 ));
-            CHECK_ERR( LoadDX10Image( INOUT image, header, *header_10, stream, allocator ));
+            CHECK_ERR( LoadDX10Image( INOUT image, header, *header_10, stream, RVRef(allocator) ));
         }
         else
         {
-            CHECK_ERR( LoadDDSImage( INOUT image, header, stream, allocator ));
+            CHECK_ERR( LoadDDSImage( INOUT image, header, stream, RVRef(allocator) ));
         }
         return true;
     }
diff --git a/AE/engine/tools/res_loaders/DDS/DDSImageLoader.h b/AE/engine/tools/res_loaders/DDS/DDSImageLoader.h
index 80abea2f..29d08b98 100644
--- a/AE/engine/tools/res_loaders/DDS/DDSImageLoader.h
+++ b/AE/engine/tools/res_loaders/DDS/DDSImageLoader.h
@@ -15,7 +15,7 @@ namespace AE::ResLoader
     {
     // methods
     public:
-        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE_OV;
+        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE_OV;
         using IImageLoader::LoadImage;
     };
 
diff --git a/AE/engine/tools/res_loaders/DDS/DDSUtils.cpp.h b/AE/engine/tools/res_loaders/DDS/DDSUtils.cpp.h
index 46ad12a7..42c29f15 100644
--- a/AE/engine/tools/res_loaders/DDS/DDSUtils.cpp.h
+++ b/AE/engine/tools/res_loaders/DDS/DDSUtils.cpp.h
@@ -321,9 +321,9 @@ namespace AE::ResLoader
         DDS_MISC_FLAGS2           miscFlags2;
     };
 
-    STATIC_ASSERT( sizeof(DDS_PIXELFORMAT)  == 32 );
-    STATIC_ASSERT( sizeof(DDS_HEADER)       == 128 );
-    STATIC_ASSERT( sizeof(DDS_HEADER_DXT10) == 20 );
+    StaticAssert( sizeof(DDS_PIXELFORMAT)  == 32 );
+    StaticAssert( sizeof(DDS_HEADER)       == 128 );
+    StaticAssert( sizeof(DDS_HEADER_DXT10) == 20 );
 
 
 /*
diff --git a/AE/engine/tools/res_loaders/DevIL/DevILLoader.cpp b/AE/engine/tools/res_loaders/DevIL/DevILLoader.cpp
index 58a0beae..f41d8e19 100644
--- a/AE/engine/tools/res_loaders/DevIL/DevILLoader.cpp
+++ b/AE/engine/tools/res_loaders/DevIL/DevILLoader.cpp
@@ -176,7 +176,7 @@ namespace {
     LoadFromDevIL
 =================================================
 */
-    ND_ static bool  LoadFromDevIL (OUT IntermImage::Level &imageLevel, SharedMem::Allocator_t allocator)
+    ND_ static bool  LoadFromDevIL (OUT IntermImage::Level &imageLevel, RC<IAllocator> allocator)
     {
         auto&           devil           = DevILUtils::Instance();
 
@@ -203,7 +203,7 @@ namespace {
         {
             ILuint  dxt_size = devil.ilGetDXTCData( null, 0, dxtc );
 
-            CHECK_ERR( imageLevel.SetPixelData( SharedMem::Create( allocator, Bytes{dxt_size} )));
+            CHECK_ERR( imageLevel.SetPixelData( SharedMem::Create( RVRef(allocator), Bytes{dxt_size} )));
 
             CHECK_ERR( devil.ilGetDXTCData( OUT imageLevel.PixelData(), dxt_size, dxtc ) == dxt_size );
         }
@@ -212,7 +212,7 @@ namespace {
             Bytes   data_size {ulong( Max( 0, devil.ilGetInteger(IL_IMAGE_SIZE_OF_DATA) ))};
             CHECK_ERR( data_size == calc_data_size );
 
-            CHECK_ERR( imageLevel.SetPixelData( SharedMem::Create( allocator, data_size )));
+            CHECK_ERR( imageLevel.SetPixelData( SharedMem::Create( RVRef(allocator), data_size )));
 
             MemCopy( OUT imageLevel.PixelData(), devil.ilGetData(), data_size );
         }
@@ -229,7 +229,7 @@ namespace {
     LoadImage
 =================================================
 */
-    bool DevILLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool DevILLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         CHECK_ERR( stream.IsOpen() );
 
diff --git a/AE/engine/tools/res_loaders/DevIL/DevILLoader.h b/AE/engine/tools/res_loaders/DevIL/DevILLoader.h
index 1134df09..370129a4 100644
--- a/AE/engine/tools/res_loaders/DevIL/DevILLoader.h
+++ b/AE/engine/tools/res_loaders/DevIL/DevILLoader.h
@@ -16,7 +16,7 @@ namespace AE::ResLoader
     {
     // methods
     public:
-        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE_OV;
+        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE_OV;
         using IImageLoader::LoadImage;
     };
 
diff --git a/AE/engine/tools/res_loaders/Intermediate/IntermImage.cpp b/AE/engine/tools/res_loaders/Intermediate/IntermImage.cpp
index 26fbce39..7b723e0c 100644
--- a/AE/engine/tools/res_loaders/Intermediate/IntermImage.cpp
+++ b/AE/engine/tools/res_loaders/Intermediate/IntermImage.cpp
@@ -104,7 +104,7 @@ namespace AE::ResLoader
     operator =
 =================================================
 */
-    IntermImage&  IntermImage::operator = (IntermImage && rhs) __NE___
+    IntermImage&  IntermImage::operator = (IntermImage &&rhs) __NE___
     {
         _srcPath    = RVRef(rhs._srcPath);
         _data       = RVRef(rhs._data);
@@ -177,7 +177,7 @@ namespace AE::ResLoader
         return Copy( memView, null );
     }
 
-    bool  IntermImage::Copy (const ImageMemView &memView, SharedMem::Allocator_t allocator) __NE___
+    bool  IntermImage::Copy (const ImageMemView &memView, RC<IAllocator> allocator) __NE___
     {
         CHECK_ERR( IsMutable() );
 
@@ -295,11 +295,11 @@ namespace AE::ResLoader
         auto&   fmt_info = EPixelFormat_GetInfo( fmt );
         CHECK_ERR( fmt_info.IsValid() );
 
-        CATCH_ERR( _data.resize( mipmaps.Get() ));
+        NOTHROW_ERR( _data.resize( mipmaps.Get() ));
 
         for (usize mip = 0; mip < _data.size(); ++mip)
         {
-            CATCH_ERR( _data[mip].resize( layers.Get() ));
+            NOTHROW_ERR( _data[mip].resize( layers.Get() ));
 
             for (uint layer = 0; layer < layers.Get(); ++layer)
             {
@@ -325,7 +325,7 @@ namespace AE::ResLoader
     Allocate
 =================================================
 */
-    bool  IntermImage::Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, ImageLayer layers, MipmapLevel mipmaps, SharedMem::Allocator_t allocator) __NE___
+    bool  IntermImage::Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, ImageLayer layers, MipmapLevel mipmaps, RC<IAllocator> allocator) __NE___
     {
         if ( not allocator )
             allocator = AE::GetDefaultAllocator();
@@ -347,7 +347,7 @@ namespace AE::ResLoader
         return true;
     }
 
-    bool  IntermImage::Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, SharedMem::Allocator_t allocator) __NE___
+    bool  IntermImage::Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, RC<IAllocator> allocator) __NE___
     {
         return Allocate( type, fmt, dim, ImageLayer{1u}, MipmapLevel{1u}, RVRef(allocator) );
     }
diff --git a/AE/engine/tools/res_loaders/Intermediate/IntermImage.h b/AE/engine/tools/res_loaders/Intermediate/IntermImage.h
index 4647baed..1cf00f25 100644
--- a/AE/engine/tools/res_loaders/Intermediate/IntermImage.h
+++ b/AE/engine/tools/res_loaders/Intermediate/IntermImage.h
@@ -88,12 +88,12 @@ namespace AE::ResLoader
         ND_ bool  SetData (Mipmaps_t data, EImage type)                                                             __NE___;
         ND_ bool  SetData (const ImageMemView &memView, RC<SharedMem> storage)                                      __NE___;
 
-        ND_ bool  Copy (const ImageMemView &memView, SharedMem::Allocator_t allocator)                              __NE___;
+        ND_ bool  Copy (const ImageMemView &memView, RC<IAllocator> allocator)                                      __NE___;
         ND_ bool  Copy (const ImageMemView &memView)                                                                __NE___;
 
         ND_ bool  Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, ImageLayer layers,
-                            MipmapLevel mipmaps, SharedMem::Allocator_t allocator)                                  __NE___;
-        ND_ bool  Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, SharedMem::Allocator_t allocator)      __NE___;
+                            MipmapLevel mipmaps, RC<IAllocator> allocator)                                          __NE___;
+        ND_ bool  Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, RC<IAllocator> allocator)              __NE___;
 
         // with default allocator
         ND_ bool  Allocate (EImage type, EPixelFormat fmt, const uint3 &dim, ImageLayer layers, MipmapLevel mipmaps)__NE___;
diff --git a/AE/engine/tools/res_loaders/Intermediate/IntermMesh.h b/AE/engine/tools/res_loaders/Intermediate/IntermMesh.h
index b0f15a25..259bbfa2 100644
--- a/AE/engine/tools/res_loaders/Intermediate/IntermMesh.h
+++ b/AE/engine/tools/res_loaders/Intermediate/IntermMesh.h
@@ -90,7 +90,7 @@ namespace AE::ResLoader
         _vertexStride{ SizeOf<V> }, _attribs{ RVRef(attribs) },
         _topology{ topology }, _indexType{ sizeof(I) == sizeof(uint) ? EIndex::UInt : EIndex::UShort }
     {
-        STATIC_ASSERT(( IsSameTypes< I, uint > or IsSameTypes< I, ushort >));
+        StaticAssert(( IsSameTypes< I, uint > or IsSameTypes< I, ushort >));
 
         auto*   verts   = vertices.data();
         auto*   indcs   = indices.data();
diff --git a/AE/engine/tools/res_loaders/KTX/KTXImageLoader.cpp b/AE/engine/tools/res_loaders/KTX/KTXImageLoader.cpp
index c8e06619..ef64fc07 100644
--- a/AE/engine/tools/res_loaders/KTX/KTXImageLoader.cpp
+++ b/AE/engine/tools/res_loaders/KTX/KTXImageLoader.cpp
@@ -94,7 +94,7 @@ namespace
     CopyData2
 =================================================
 */
-    ND_ static bool  CopyData2 (INOUT IntermImage &image, SharedMem::Allocator_t allocator, ktxTexture* ktx_tex, EPixelFormat format) __NE___
+    ND_ static bool  CopyData2 (INOUT IntermImage &image, RC<IAllocator> allocator, ktxTexture* ktx_tex, EPixelFormat format) __NE___
     {
         CHECK_ERR( format != Default );
 
@@ -221,14 +221,14 @@ namespace
     CopyData
 =================================================
 */
-    ND_ static bool  CopyData (INOUT IntermImage &image, SharedMem::Allocator_t allocator, ktxTexture2* ktx_tex2) __NE___
+    ND_ static bool  CopyData (INOUT IntermImage &image, RC<IAllocator> allocator, ktxTexture2* ktx_tex2) __NE___
     {
         const EPixelFormat  format = VkFormatToEPixelFormat( ktx_tex2->vkFormat );
 
         return CopyData2( image, RVRef(allocator), ktxTexture(ktx_tex2), format );
     }
 
-    ND_ static bool  CopyData (INOUT IntermImage &image, SharedMem::Allocator_t allocator, ktxTexture1* ktx_tex1) __NE___
+    ND_ static bool  CopyData (INOUT IntermImage &image, RC<IAllocator> allocator, ktxTexture1* ktx_tex1) __NE___
     {
         const EPixelFormat  format = GLFormatToEPixelFormat( ktx_tex1->glInternalformat );
 
@@ -243,7 +243,7 @@ namespace
     LoadImage
 =================================================
 */
-    bool  KTXImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool  KTXImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         CHECK( not flipY );
 
@@ -289,14 +289,14 @@ namespace
 
         if ( temp_tex2 != null )
         {
-            ktx_tex = { ktxTexture(temp_tex2), [](ktxTexture *tex){ ktxTexture_Destroy(tex); }};
+            ktx_tex = { ktxTexture(temp_tex2), [](ktxTexture* tex){ ktxTexture_Destroy(tex); }};
 
             CHECK_ERR( CopyData( INOUT image, RVRef(allocator), temp_tex2 ));
         }
         else
         if ( temp_tex1 != null )
         {
-            ktx_tex = { ktxTexture(temp_tex1), [](ktxTexture *tex){ ktxTexture_Destroy(tex); }};
+            ktx_tex = { ktxTexture(temp_tex1), [](ktxTexture* tex){ ktxTexture_Destroy(tex); }};
 
             CHECK_ERR( CopyData( INOUT image, RVRef(allocator), temp_tex1 ));
         }
diff --git a/AE/engine/tools/res_loaders/KTX/KTXImageLoader.h b/AE/engine/tools/res_loaders/KTX/KTXImageLoader.h
index 4038fa8d..f9f7c349 100644
--- a/AE/engine/tools/res_loaders/KTX/KTXImageLoader.h
+++ b/AE/engine/tools/res_loaders/KTX/KTXImageLoader.h
@@ -16,7 +16,7 @@ namespace AE::ResLoader
     {
     // methods
     public:
-        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE_OV;
+        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE_OV;
         using IImageLoader::LoadImage;
     };
 
diff --git a/AE/engine/tools/res_loaders/KTX/KTXImageSaver.cpp b/AE/engine/tools/res_loaders/KTX/KTXImageSaver.cpp
index 21099655..3744f0f1 100644
--- a/AE/engine/tools/res_loaders/KTX/KTXImageSaver.cpp
+++ b/AE/engine/tools/res_loaders/KTX/KTXImageSaver.cpp
@@ -92,7 +92,7 @@ namespace
                 case EImage_Cube :      ci.numDimensions = 2;   ci.isArray = false;     ci.numFaces = 6;    break;
                 case EImage_CubeArray : ci.numDimensions = 2;   ci.isArray = true;      ci.numFaces = 6;    break;
                 case EImage::Unknown :
-                case EImage::_Count :   
+                case EImage::_Count :
                 default :               RETURN_ERR( "unsupported image type" );
             }
             END_ENUM_CHECKS();
diff --git a/AE/engine/tools/res_loaders/KTX/KTXUtils.cpp.h b/AE/engine/tools/res_loaders/KTX/KTXUtils.cpp.h
index 87bcee68..5e40c395 100644
--- a/AE/engine/tools/res_loaders/KTX/KTXUtils.cpp.h
+++ b/AE/engine/tools/res_loaders/KTX/KTXUtils.cpp.h
@@ -38,7 +38,7 @@ namespace
 {
 
     //
-    // RStream as ktxStream 
+    // RStream as ktxStream
     //
     class ktxStream_RStream
     {
@@ -62,7 +62,7 @@ namespace
                         KTX_SUCCESS : KTX_FILE_SEEK_ERROR;
         }
 
-        static KTX_error_code  Write (ktxStream* str, const void *src, const ktx_size_t size, const ktx_size_t count) __NE___
+        static KTX_error_code  Write (ktxStream* str, const void* src, const ktx_size_t size, const ktx_size_t count) __NE___
         {
             Unused( str, src, size, count );
             return  KTX_FILE_WRITE_ERROR;
@@ -93,7 +93,7 @@ namespace
 
 
     //
-    // WStream as ktxStream 
+    // WStream as ktxStream
     //
     class ktxStream_WStream
     {
@@ -117,7 +117,7 @@ namespace
                         KTX_SUCCESS : KTX_FILE_SEEK_ERROR;
         }
 
-        static KTX_error_code  Write (ktxStream* str, const void *src, const ktx_size_t size, const ktx_size_t count) __NE___
+        static KTX_error_code  Write (ktxStream* str, const void* src, const ktx_size_t size, const ktx_size_t count) __NE___
         {
             return  _Cast(str).Write( src, Bytes{size * count} ) ?
                         KTX_SUCCESS : KTX_FILE_WRITE_ERROR;
diff --git a/AE/engine/tools/res_loaders/Private/ImageLoader.cpp b/AE/engine/tools/res_loaders/Private/ImageLoader.cpp
index f3fda50c..9a311264 100644
--- a/AE/engine/tools/res_loaders/Private/ImageLoader.cpp
+++ b/AE/engine/tools/res_loaders/Private/ImageLoader.cpp
@@ -110,7 +110,7 @@ namespace {
     LoadImage
 =================================================
 */
-    bool  IImageLoader::LoadImage (INOUT IntermImage &image, ArrayView<Path> directories, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool  IImageLoader::LoadImage (INOUT IntermImage &image, ArrayView<Path> directories, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         Path    filename;
         CHECK_ERR( _FindImage( image.GetPath(), directories, OUT filename ));
@@ -121,7 +121,7 @@ namespace {
         if ( fileFormat == Default )
             fileFormat = PathToImageFileFormat( filename );
 
-        CHECK_ERR( LoadImage( INOUT image, file, flipY, allocator, fileFormat ));
+        CHECK_ERR( LoadImage( INOUT image, file, flipY, RVRef(allocator), fileFormat ));
         return true;
     }
 
diff --git a/AE/engine/tools/res_loaders/Public/ImageLoader.h b/AE/engine/tools/res_loaders/Public/ImageLoader.h
index bec9846a..15d2613f 100644
--- a/AE/engine/tools/res_loaders/Public/ImageLoader.h
+++ b/AE/engine/tools/res_loaders/Public/ImageLoader.h
@@ -24,11 +24,6 @@ namespace AE::ResLoader
 
     class IImageLoader
     {
-    // types
-    public:
-        using Allocator_t   = SharedMem::Allocator_t;
-
-
     // methods
     public:
         virtual ~IImageLoader ()                                            __NE___ {}
@@ -36,13 +31,13 @@ namespace AE::ResLoader
         virtual bool  LoadImage (INOUT IntermImage& image,
                                  RStream &          stream,
                                  Bool               flipY       = False{},
-                                 Allocator_t        allocator   = null,
+                                 RC<IAllocator>     allocator   = null,
                                  EImageFormat       fileFormat  = Default)  __NE___ = 0;
 
         bool  LoadImage (INOUT IntermImage& image,
                          ArrayView<Path>    directories,
                          Bool               flipY       = False{},
-                         Allocator_t        allocator   = null,
+                         RC<IAllocator>     allocator   = null,
                          EImageFormat       fileFormat  = Default)          __NE___;
 
 
diff --git a/AE/engine/tools/res_loaders/Public/ModelLoader.h b/AE/engine/tools/res_loaders/Public/ModelLoader.h
index 5b70589c..85376240 100644
--- a/AE/engine/tools/res_loaders/Public/ModelLoader.h
+++ b/AE/engine/tools/res_loaders/Public/ModelLoader.h
@@ -2,8 +2,8 @@
 /*
     Thread-safe: yes
 
-    Assimp  - internal mutex for instance
-    glTF    - 
+    Assimp  - locks in allocator
+    glTF    -
 */
 
 #pragma once
@@ -23,8 +23,6 @@ namespace AE::ResLoader
     {
     // types
     public:
-        using Allocator_t   = SharedMem::Allocator_t;
-
         struct Config
         {
             uint    maxTrianglesPerMesh = UMax;
diff --git a/AE/engine/tools/res_loaders/Public/ModelSaver.h b/AE/engine/tools/res_loaders/Public/ModelSaver.h
index 27505d6b..9f7f10a9 100644
--- a/AE/engine/tools/res_loaders/Public/ModelSaver.h
+++ b/AE/engine/tools/res_loaders/Public/ModelSaver.h
@@ -2,8 +2,8 @@
 /*
     Thread-safe: yes
 
-    Assimp  - 
-    glTF    - 
+    Assimp  - locks in allocator
+    glTF    -
 */
 
 #pragma once
@@ -21,11 +21,6 @@ namespace AE::ResLoader
 
     class IModelSaver
     {
-    // types
-    public:
-        using Allocator_t   = SharedMem::Allocator_t;
-
-
     // methods
     public:
         virtual ~IModelSaver ()                                 __NE___ {}
diff --git a/AE/engine/tools/res_loaders/STB/STBImageLoader.cpp b/AE/engine/tools/res_loaders/STB/STBImageLoader.cpp
index ee9d3325..3c594a59 100644
--- a/AE/engine/tools/res_loaders/STB/STBImageLoader.cpp
+++ b/AE/engine/tools/res_loaders/STB/STBImageLoader.cpp
@@ -44,7 +44,7 @@ namespace AE::ResLoader
     LoadImage
 =================================================
 */
-    bool  STBImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE___
+    bool  STBImageLoader::LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE___
     {
         Unused( fileFormat );
 
@@ -102,7 +102,7 @@ namespace AE::ResLoader
         }
 
         bool    result = false;
-        if ( image_level.SetPixelData( SharedMem::Create( allocator, image_level.slicePitch * image_level.dimension.z )))
+        if ( image_level.SetPixelData( SharedMem::Create( RVRef(allocator), image_level.slicePitch * image_level.dimension.z )))
         {
             MemCopy( OUT image_level.PixelData(), data_ptr, image_level.DataSize() );
             result = true;
diff --git a/AE/engine/tools/res_loaders/STB/STBImageLoader.h b/AE/engine/tools/res_loaders/STB/STBImageLoader.h
index 947f5b78..62fd7ca3 100644
--- a/AE/engine/tools/res_loaders/STB/STBImageLoader.h
+++ b/AE/engine/tools/res_loaders/STB/STBImageLoader.h
@@ -16,7 +16,7 @@ namespace AE::ResLoader
     {
     // methods
     public:
-        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, Allocator_t allocator, EImageFormat fileFormat) __NE_OV;
+        bool  LoadImage (INOUT IntermImage &image, RStream &stream, Bool flipY, RC<IAllocator> allocator, EImageFormat fileFormat) __NE_OV;
         using IImageLoader::LoadImage;
     };
 
diff --git a/AE/engine/tools/res_loaders/STB/STBImageSaver.cpp b/AE/engine/tools/res_loaders/STB/STBImageSaver.cpp
index 676c9a86..4a5062e5 100644
--- a/AE/engine/tools/res_loaders/STB/STBImageSaver.cpp
+++ b/AE/engine/tools/res_loaders/STB/STBImageSaver.cpp
@@ -42,7 +42,7 @@ namespace AE::ResLoader
 
 namespace
 {
-    static void  StbiWriteFn (void *context, void *data, int size)
+    static void  StbiWriteFn (void* context, void* data, int size)
     {
         WStream&    stream = *Cast<WStream>(context);
         Unused( stream.WriteSeq( data, Bytes{uint(size)} ));
diff --git a/AE/engine/tools/res_pack/asset_packer/AssetPacker.h b/AE/engine/tools/res_pack/asset_packer/AssetPacker.h
index b6db1604..fd0f6ec6 100644
--- a/AE/engine/tools/res_pack/asset_packer/AssetPacker.h
+++ b/AE/engine/tools/res_pack/asset_packer/AssetPacker.h
@@ -33,7 +33,7 @@ namespace AE::AssetPacker
     };
 
 
-    extern "C" bool AE_AP_API PackAssets (const AssetInfo *info);
+    extern "C" bool AE_AP_API PackAssets (const AssetInfo* info);
 
 
 } // AE::AssetPacker
diff --git a/AE/engine/tools/res_pack/asset_packer/Packer/AssetPacker.cpp b/AE/engine/tools/res_pack/asset_packer/Packer/AssetPacker.cpp
index 8ac7ff55..b04d457b 100644
--- a/AE/engine/tools/res_pack/asset_packer/Packer/AssetPacker.cpp
+++ b/AE/engine/tools/res_pack/asset_packer/Packer/AssetPacker.cpp
@@ -17,7 +17,7 @@ namespace
     PackAssetsImpl
 =================================================
 */
-    ND_ static bool  PackAssetsImpl (const AssetInfo *info)
+    ND_ static bool  PackAssetsImpl (const AssetInfo* info)
     {
         CHECK_ERR( info != null );
         CHECK_ERR( (info->inFileCount > 0) and (info->inFiles != null) );
@@ -30,7 +30,7 @@ namespace
         ObjectStorage::SetInstance( &obj_storage );
 
         CHECK_ERR( obj_storage.Initialize( Path{info->tempFile} ));
-        CATCH_ERR( ObjectStorage::Bind( script_engine ));
+        NOTHROW_ERR( ObjectStorage::Bind( script_engine ));
 
         Array<Path>     script_include_dirs;
         for (usize i = 0; i < info->inIncludeFolderCount; ++i)
@@ -109,7 +109,7 @@ namespace
     PackAssets
 =================================================
 */
-    extern "C" bool AE_AP_API  PackAssets (const AssetInfo *info)
+    extern "C" bool AE_AP_API  PackAssets (const AssetInfo* info)
     {
         AE::Base::StaticLogger::LoggerScope log{};
 
diff --git a/AE/engine/tools/res_pack/asset_packer/Packer/ImageAtlasPacker.h b/AE/engine/tools/res_pack/asset_packer/Packer/ImageAtlasPacker.h
index 78f4759c..e4dd608d 100644
--- a/AE/engine/tools/res_pack/asset_packer/Packer/ImageAtlasPacker.h
+++ b/AE/engine/tools/res_pack/asset_packer/Packer/ImageAtlasPacker.h
@@ -32,7 +32,7 @@ namespace AE::AssetPacker
             Header2 ()                                      __NE___ = default;
             explicit Header2 (const ImagePacker::Header &h) __NE___ : hdr{h} {}
         };
-        STATIC_ASSERT( sizeof(Header2) == 24 );
+        StaticAssert( sizeof(Header2) == 24 );
 
 
     // variables
diff --git a/AE/engine/tools/res_pack/asset_packer/Packer/ImagePacker.h b/AE/engine/tools/res_pack/asset_packer/Packer/ImagePacker.h
index 72a701e7..cc51d2b8 100644
--- a/AE/engine/tools/res_pack/asset_packer/Packer/ImagePacker.h
+++ b/AE/engine/tools/res_pack/asset_packer/Packer/ImagePacker.h
@@ -30,7 +30,7 @@ namespace AE::AssetPacker
     // Image Packer
     //
 
-    class ImagePacker final 
+    class ImagePacker final
     {
     // types
     public:
@@ -54,8 +54,8 @@ namespace AE::AssetPacker
             ND_ ImageDesc       ToDesc ()       C_NE___;
             ND_ ImageViewDesc   ToViewDesc ()   C_NE___;
         };
-        STATIC_ASSERT( sizeof(Header) == 16 );
-        STATIC_ASSERT( alignof(Header) == 2 );
+        StaticAssert( sizeof(Header) == 16 );
+        StaticAssert( alignof(Header) == 2 );
 
 
         struct Header2
@@ -67,7 +67,7 @@ namespace AE::AssetPacker
             Header2 ()                          __NE___ = default;
             explicit Header2 (const Header &h)  __NE___ : hdr{h} {};
         };
-        STATIC_ASSERT( sizeof(Header2) == 24 );
+        StaticAssert( sizeof(Header2) == 24 );
 
 
     // variables
diff --git a/AE/engine/tools/res_pack/asset_packer/Packer/ImagePackerUtils.cpp.h b/AE/engine/tools/res_pack/asset_packer/Packer/ImagePackerUtils.cpp.h
index 6357efdf..fc032797 100644
--- a/AE/engine/tools/res_pack/asset_packer/Packer/ImagePackerUtils.cpp.h
+++ b/AE/engine/tools/res_pack/asset_packer/Packer/ImagePackerUtils.cpp.h
@@ -45,7 +45,7 @@ using ImageUtils_t      = Graphics::ImageUtils;
         dataOffset = 0_b;
         for (uint mip = 0;; ++mip)
         {
-            imageDim    = ImageUtils_t::MipmapDimension( uint3{header.dimension}, mipmap.Get(), texblock_dim );
+            imageDim    = ImageUtils_t::MipmapDimension( uint3{header.dimension}, mip, texblock_dim );
             rowSize     = AlignUp( ImageUtils_t::RowSize( imageDim.x, fmt_info.bitsPerBlock, texblock_dim ), row_align );
             sliceSize   = ImageUtils_t::SliceSize( imageDim.y, rowSize, texblock_dim );
 
diff --git a/AE/engine/tools/res_pack/asset_packer/Packer/RasterFontPacker.h b/AE/engine/tools/res_pack/asset_packer/Packer/RasterFontPacker.h
index 2af1755a..fccdc16e 100644
--- a/AE/engine/tools/res_pack/asset_packer/Packer/RasterFontPacker.h
+++ b/AE/engine/tools/res_pack/asset_packer/Packer/RasterFontPacker.h
@@ -27,7 +27,7 @@ namespace AE::AssetPacker
         //  |      |          |     |
         //  |   left         right  |
         //  |<--------------------->|
-        //           advance       
+        //           advance
         //
 
         struct Glyph
@@ -91,7 +91,7 @@ namespace AE::AssetPacker
             Header2 ()                                      __NE___ = default;
             explicit Header2 (const ImagePacker::Header &h) __NE___ : hdr{h} {}
         };
-        STATIC_ASSERT( sizeof(Header2) == 24 );
+        StaticAssert( sizeof(Header2) == 24 );
 
 
     // variables
diff --git a/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ObjectStorage.h b/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ObjectStorage.h
index adee1b0d..71236d3a 100644
--- a/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ObjectStorage.h
+++ b/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ObjectStorage.h
@@ -37,6 +37,8 @@ namespace AE::AssetPacker
             String              _name;
 
         public:
+            ImageAtlasInfo ()                       __NE___ {}
+
             void  SetName (const String &name)      __Th___;
             void  Add (const String &name)          __Th___;
             void  Contains (const String &name)     C_Th___;
diff --git a/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptImageAtlas.cpp b/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptImageAtlas.cpp
index b3800a17..e5f274bb 100644
--- a/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptImageAtlas.cpp
+++ b/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptImageAtlas.cpp
@@ -5,7 +5,7 @@
 
 #include "graphics/Private/EnumUtils.h"
 
-#include "serializing/ObjectFactory.h"
+#include "serializing/Basic/ObjectFactory.h"
 
 #include "scripting/Impl/ClassBinder.h"
 
diff --git a/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptRasterFont.cpp b/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptRasterFont.cpp
index 0e4146f0..aa6ac2ff 100644
--- a/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptRasterFont.cpp
+++ b/AE/engine/tools/res_pack/asset_packer/ScriptObjects/ScriptRasterFont.cpp
@@ -367,7 +367,7 @@ namespace AE::AssetPacker
 
             binder.Comment( "Multichannel SDF font, can be scaled, have sharp angles, but a bit less performance." );
             binder.AddValue( "MC_SDF",  ERasterFontMode::MC_SDF );
-            STATIC_ASSERT( uint(ERasterFontMode::_Count) == 3 );
+            StaticAssert( uint(ERasterFontMode::_Count) == 3 );
         }
         {
             Scripting::ClassBinder<ScriptRasterFont>    binder{ se };
@@ -448,7 +448,7 @@ namespace AE::AssetPacker
         const uint  w           = ft_face->glyph->bitmap.width;
         const uint  h           = ft_face->glyph->bitmap.rows;
         const uint  img_size    = w * h;
-        void *      data_ptr    = allocator.Allocate( SizeAndAlign{ Bytes{img_size}, 1_b });
+        void *      data_ptr    = allocator.Allocate( Bytes{img_size} );
         CHECK_ERR( data_ptr != null );
 
         MemCopy( OUT data_ptr, ft_face->glyph->bitmap.buffer, Bytes{img_size} );
@@ -612,7 +612,7 @@ namespace AE::AssetPacker
 
                 result.format   = EPixelFormat::R32F;
                 result.dataSize = uint(dst_row_size * region.Height());
-                result.data     = allocator.Allocate( SizeAndAlign{ Bytes{result.dataSize}, 1_b });
+                result.data     = allocator.Allocate( Bytes{result.dataSize} );
                 CHECK_ERR( result.data != null );
 
                 const uint  h   = region.Height();
@@ -642,7 +642,7 @@ namespace AE::AssetPacker
 
                 result.format   = EPixelFormat::RGB32F;
                 result.dataSize = uint(dst_row_size * region.Height());
-                result.data     = allocator.Allocate( SizeAndAlign{ Bytes{result.dataSize}, 1_b });
+                result.data     = allocator.Allocate( Bytes{result.dataSize} );
                 CHECK_ERR( result.data != null );
 
                 const uint  h   = region.Height();
@@ -657,7 +657,7 @@ namespace AE::AssetPacker
                              dst_row_size );
                 }
                 break;
-            }   
+            }
 
             case ERasterFontMode::Raster :
             case ERasterFontMode::_Count :
@@ -824,7 +824,7 @@ namespace AE::AssetPacker
                     tx_max = Max( tx_max, ptr[i] );
 
                     float   res = ptr[i] * outSdfScale + outSdfBias;
-                    CHECK( Equals( res, src, 1.0e-5f ));
+                    CHECK( Equal( res, src, 1.0e-5f ));
                   #endif
                 }
             }
@@ -851,7 +851,7 @@ namespace AE::AssetPacker
             RWImageMemView  src_view{ BufferMemView{ glyph.data, Bytes{glyph.dataSize} }, uint3{}, dim, 0_b, 0_b, glyph.format, EImageAspect::Color };
 
             glyph.dataSize  = glyph.dimension.x * glyph.dimension.y * (fmt_info.BitsPerPixel() / 8);
-            glyph.data      = allocator.Allocate( SizeAndAlign{ Bytes{glyph.dataSize}, 1_b });
+            glyph.data      = allocator.Allocate( Bytes{glyph.dataSize} );
             glyph.format    = _intermFormat;
 
             CHECK_ERR( glyph.data != null );
diff --git a/AE/engine/tools/res_pack/input_actions/Impl/InputActionsBinding.cpp b/AE/engine/tools/res_pack/input_actions/Impl/InputActionsBinding.cpp
index c7bf9f8e..7ce7bf7c 100644
--- a/AE/engine/tools/res_pack/input_actions/Impl/InputActionsBinding.cpp
+++ b/AE/engine/tools/res_pack/input_actions/Impl/InputActionsBinding.cpp
@@ -13,7 +13,7 @@ namespace
     ConvertInputActionsImpl
 =================================================
 */
-    static bool  ConvertInputActionsImpl (const InputActionsInfo *info)
+    static bool  ConvertInputActionsImpl (const InputActionsInfo* info)
     {
         CHECK_ERR( info != null );
         CHECK_ERR( (info->inFileCount > 0) == (info->inFiles != null) );
@@ -23,7 +23,7 @@ namespace
         const Path          pack_fname      = FileSystem::ToAbsolute( info->outputPackName );
         ObjectStorage       obj_storage;
 
-        CATCH_ERR( obj_storage.Bind( script_engine ));
+        NOTHROW_ERR( obj_storage.Bind( script_engine ));
         ObjectStorage::SetInstance( &obj_storage );
 
         // run script files
@@ -63,7 +63,7 @@ namespace
     ConvertInputActions
 =================================================
 */
-    extern "C" bool AE_IA_API ConvertInputActions (const InputActionsInfo *info)
+    extern "C" bool AE_IA_API ConvertInputActions (const InputActionsInfo* info)
     {
         AE::Base::StaticLogger::LoggerScope log{};
 
diff --git a/AE/engine/tools/res_pack/input_actions/InputActionsBinding.h b/AE/engine/tools/res_pack/input_actions/InputActionsBinding.h
index 1027078d..87317b3d 100644
--- a/AE/engine/tools/res_pack/input_actions/InputActionsBinding.h
+++ b/AE/engine/tools/res_pack/input_actions/InputActionsBinding.h
@@ -37,6 +37,6 @@ namespace AE::InputActions
         const CharType *        outputCppFile       = null;     // reflection
     };
 
-    extern "C" bool AE_IA_API ConvertInputActions (const InputActionsInfo *info);
+    extern "C" bool AE_IA_API ConvertInputActions (const InputActionsInfo* info);
 
 } // AE::InputActions
diff --git a/AE/engine/tools/res_pack/offline/main.cpp b/AE/engine/tools/res_pack/offline/main.cpp
index 307c2516..4d011352 100644
--- a/AE/engine/tools/res_pack/offline/main.cpp
+++ b/AE/engine/tools/res_pack/offline/main.cpp
@@ -500,7 +500,7 @@ namespace
             binder.Create();
             binder.AddValue( "Unknown",     EPathParamsFlags::Unknown   );
             binder.AddValue( "Recursive",   EPathParamsFlags::Recursive );
-            STATIC_ASSERT( uint(EPathParamsFlags::All) == 1 );
+            StaticAssert( uint(EPathParamsFlags::All) == 1 );
         }
 
         // pipeline compiler path params
@@ -511,10 +511,10 @@ namespace
             binder.AddValue( "Brotli",          EFileType::Brotli   );
             binder.AddValue( "InMemory",        EFileType::InMemory );
             binder.AddValue( "BrotliInMemory",  EFileType::BrotliInMemory   );
-            STATIC_ASSERT( uint(EFileType::All) == 7 );
+            StaticAssert( uint(EFileType::All) == 7 );
         }
 
-        // 
+        //
         {
             EnumBinder<EReflectionFlags>    binder{ se };
             binder.Create();
@@ -522,7 +522,7 @@ namespace
             binder.AddValue( "RTechPass_Pipelines",         EReflectionFlags::RTechPass_Pipelines   );
             binder.AddValue( "RTech_ShaderBindingTable",    EReflectionFlags::RTech_ShaderBindingTable  );
             binder.AddValue( "All",                         EReflectionFlags::All   );
-            STATIC_ASSERT( uint(EReflectionFlags::All) == 7 );
+            StaticAssert( uint(EReflectionFlags::All) == 7 );
         }
 
         // pipeline compiler
@@ -617,7 +617,7 @@ namespace
         ScriptEnginePtr se = MakeRC<ScriptEngine>();
         CHECK_ERR( se->Create( True{"gen cpp header"} ));
 
-        CATCH_ERR( Bind( se ));
+        NOTHROW_ERR( Bind( se ));
 
         auto    mod = se->CreateModule({ScriptEngine::ModuleSource{ "def"s, RVRef(script), SourceLoc{ansi_path}, True{"preprocessor"} }});
         CHECK_ERR( mod );
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/AEStyleGLSLPreprocessor.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/AEStyleGLSLPreprocessor.cpp
index 667d969b..d1840332 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/AEStyleGLSLPreprocessor.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/AEStyleGLSLPreprocessor.cpp
@@ -21,129 +21,156 @@ namespace {
 */
     AEStyleGLSLPreprocessor::AEStyleGLSLPreprocessor ()
     {
-        // TODO: optimize - group by prefixes
-
         // types
-        _typeMap.emplace( "float2",     "vec2" );
-        _typeMap.emplace( "float3",     "vec3" );
-        _typeMap.emplace( "float4",     "vec4" );
-        _typeMap.emplace( "float2x2",   "mat2x2" );
-        _typeMap.emplace( "float2x3",   "mat2x3" );
-        _typeMap.emplace( "float2x4",   "mat2x4" );
-        _typeMap.emplace( "float3x2",   "mat3x2" );
-        _typeMap.emplace( "float3x3",   "mat3x3" );
-        _typeMap.emplace( "float3x4",   "mat3x4" );
-        _typeMap.emplace( "float4x2",   "mat4x2" );
-        _typeMap.emplace( "float4x3",   "mat4x3" );
-        _typeMap.emplace( "float4x4",   "mat4x4" );
-
-        _typeMap.emplace( "double2",    "dvec2" );
-        _typeMap.emplace( "double3",    "dvec3" );
-        _typeMap.emplace( "double4",    "dvec4" );
-        _typeMap.emplace( "double2x2",  "dmat2x2" );
-        _typeMap.emplace( "double2x3",  "dmat2x3" );
-        _typeMap.emplace( "double2x4",  "dmat2x4" );
-        _typeMap.emplace( "double3x2",  "dmat3x2" );
-        _typeMap.emplace( "double3x3",  "dmat3x3" );
-        _typeMap.emplace( "double3x4",  "dmat3x4" );
-        _typeMap.emplace( "double4x2",  "dmat4x2" );
-        _typeMap.emplace( "double4x3",  "dmat4x3" );
-        _typeMap.emplace( "double4x4",  "dmat4x4" );
-
-        _typeMap.emplace( "int2",       "ivec2" );
-        _typeMap.emplace( "int3",       "ivec3" );
-        _typeMap.emplace( "int4",       "ivec4" );
-
-        _typeMap.emplace( "uint2",      "uvec2" );
-        _typeMap.emplace( "uint3",      "uvec3" );
-        _typeMap.emplace( "uint4",      "uvec4" );
-
-        _typeMap.emplace( "bool2",      "bvec2" );
-        _typeMap.emplace( "bool3",      "bvec3" );
-        _typeMap.emplace( "bool4",      "bvec4" );
+      #if 1
+        _typeMap.emplace( "float2",         "vec2" );
+        _typeMap.emplace( "float3",         "vec3" );
+        _typeMap.emplace( "float4",         "vec4" );
+        _typeMap.emplace( "float_vec_t",    "vec" );
+        _typeMap.emplace( "float2x2",       "mat2x2" );
+        _typeMap.emplace( "float2x3",       "mat2x3" );
+        _typeMap.emplace( "float2x4",       "mat2x4" );
+        _typeMap.emplace( "float3x2",       "mat3x2" );
+        _typeMap.emplace( "float3x3",       "mat3x3" );
+        _typeMap.emplace( "float3x4",       "mat3x4" );
+        _typeMap.emplace( "float4x2",       "mat4x2" );
+        _typeMap.emplace( "float4x3",       "mat4x3" );
+        _typeMap.emplace( "float4x4",       "mat4x4" );
+        _typeMap.emplace( "float_mat_t",    "mat" );
+      #else
+        // GL_EXT_shader_explicit_arithmetic_types
+        _typeMap.emplace( "float",          "float32_t" );
+        _typeMap.emplace( "float2",         "f32vec2" );
+        _typeMap.emplace( "float3",         "f32vec3" );
+        _typeMap.emplace( "float4",         "f32vec4" );
+        _typeMap.emplace( "float_vec_t",    "f32vec" );
+        _typeMap.emplace( "float2x2",       "f32mat2x2" );
+        _typeMap.emplace( "float2x3",       "f32mat2x3" );
+        _typeMap.emplace( "float2x4",       "f32mat2x4" );
+        _typeMap.emplace( "float3x2",       "f32mat3x2" );
+        _typeMap.emplace( "float3x3",       "f32mat3x3" );
+        _typeMap.emplace( "float3x4",       "f32mat3x4" );
+        _typeMap.emplace( "float4x2",       "f32mat4x2" );
+        _typeMap.emplace( "float4x3",       "f32mat4x3" );
+        _typeMap.emplace( "float4x4",       "f32mat4x4" );
+        _typeMap.emplace( "float_mat_t",    "f32mat" );
+      #endif
+
+      #if 1
+        _typeMap.emplace( "double2",        "dvec2" );
+        _typeMap.emplace( "double3",        "dvec3" );
+        _typeMap.emplace( "double4",        "dvec4" );
+        _typeMap.emplace( "double_vec_t",   "dvec" );
+        _typeMap.emplace( "double2x2",      "dmat2x2" );
+        _typeMap.emplace( "double2x3",      "dmat2x3" );
+        _typeMap.emplace( "double2x4",      "dmat2x4" );
+        _typeMap.emplace( "double3x2",      "dmat3x2" );
+        _typeMap.emplace( "double3x3",      "dmat3x3" );
+        _typeMap.emplace( "double3x4",      "dmat3x4" );
+        _typeMap.emplace( "double4x2",      "dmat4x2" );
+        _typeMap.emplace( "double4x3",      "dmat4x3" );
+        _typeMap.emplace( "double4x4",      "dmat4x4" );
+        _typeMap.emplace( "double_mat_t",   "dmat" );
+      #else
+        // GL_EXT_shader_explicit_arithmetic_types
+        _typeMap.emplace( "double",         "float64_t" );
+        _typeMap.emplace( "double2",        "f64vec2" );
+        _typeMap.emplace( "double3",        "f64vec3" );
+        _typeMap.emplace( "double4",        "f64vec4" );
+        _typeMap.emplace( "double_vec_t",   "f64vec" );
+        _typeMap.emplace( "double2x2",      "f64mat2x2" );
+        _typeMap.emplace( "double2x3",      "f64mat2x3" );
+        _typeMap.emplace( "double2x4",      "f64mat2x4" );
+        _typeMap.emplace( "double3x2",      "f64mat3x2" );
+        _typeMap.emplace( "double3x3",      "f64mat3x3" );
+        _typeMap.emplace( "double3x4",      "f64mat3x4" );
+        _typeMap.emplace( "double4x2",      "f64mat4x2" );
+        _typeMap.emplace( "double4x3",      "f64mat4x3" );
+        _typeMap.emplace( "double4x4",      "f64mat4x4" );
+        _typeMap.emplace( "double_mat_t",   "f64mat" );
+      #endif
+
+      #if 1
+        _typeMap.emplace( "int2",           "ivec2" );
+        _typeMap.emplace( "int3",           "ivec3" );
+        _typeMap.emplace( "int4",           "ivec4" );
+        _typeMap.emplace( "int_vec_t",      "ivec" );
+        _typeMap.emplace( "uint2",          "uvec2" );
+        _typeMap.emplace( "uint3",          "uvec3" );
+        _typeMap.emplace( "uint4",          "uvec4" );
+        _typeMap.emplace( "uint_vec_t",     "uvec" );
+      #else
+        // GL_EXT_shader_explicit_arithmetic_types
+        _typeMap.emplace( "int",            "int32_t" );
+        _typeMap.emplace( "int2",           "i32vec2" );
+        _typeMap.emplace( "int3",           "i32vec3" );
+        _typeMap.emplace( "int4",           "i32vec4" );
+        _typeMap.emplace( "int_vec_t",      "i32vec" );
+        _typeMap.emplace( "uint",           "uint32_t" );
+        _typeMap.emplace( "uint2",          "u32vec2" );
+        _typeMap.emplace( "uint3",          "u32vec3" );
+        _typeMap.emplace( "uint4",          "u32vec4" );
+        _typeMap.emplace( "uint_vec_t",     "u32vec" );
+      #endif
+
+        _typeMap.emplace( "bool2",          "bvec2" );
+        _typeMap.emplace( "bool3",          "bvec3" );
+        _typeMap.emplace( "bool4",          "bvec4" );
+        _typeMap.emplace( "bool_vec_t",     "bvec4" );
 
         // https://github.com/KhronosGroup/GLSL/blob/master/extensions/ext/GL_EXT_shader_explicit_arithmetic_types.txt
-        _typeMap.emplace( "byte",       "int8_t" );
-        _typeMap.emplace( "byte2",      "i8vec2" );
-        _typeMap.emplace( "byte3",      "i8vec3" );
-        _typeMap.emplace( "byte4",      "i8vec4" );
-
-        _typeMap.emplace( "ubyte",      "uint8_t" );
-        _typeMap.emplace( "ubyte2",     "u8vec2" );
-        _typeMap.emplace( "ubyte3",     "u8vec3" );
-        _typeMap.emplace( "ubyte4",     "u8vec4" );
-
-        _typeMap.emplace( "short",      "int16_t" );
-        _typeMap.emplace( "short2",     "i16vec2" );
-        _typeMap.emplace( "short3",     "i16vec3" );
-        _typeMap.emplace( "short4",     "i16vec4" );
-
-        _typeMap.emplace( "ushort",     "uint16_t" );
-        _typeMap.emplace( "ushort2",    "u16vec2" );
-        _typeMap.emplace( "ushort3",    "u16vec3" );
-        _typeMap.emplace( "ushort4",    "u16vec4" );
-
-        _typeMap.emplace( "half",       "float16_t" );
-        _typeMap.emplace( "half2",      "f16vec2" );
-        _typeMap.emplace( "half3",      "f16vec3" );
-        _typeMap.emplace( "half4",      "f16vec4" );
-        _typeMap.emplace( "half2x2",    "f16mat2x2" );
-        _typeMap.emplace( "half2x3",    "f16mat2x3" );
-        _typeMap.emplace( "half2x4",    "f16mat2x4" );
-        _typeMap.emplace( "half3x2",    "f16mat3x2" );
-        _typeMap.emplace( "half3x3",    "f16mat3x3" );
-        _typeMap.emplace( "half3x4",    "f16mat3x4" );
-        _typeMap.emplace( "half4x2",    "f16mat4x2" );
-        _typeMap.emplace( "half4x3",    "f16mat4x3" );
-        _typeMap.emplace( "half4x4",    "f16mat4x4" );
-        /*
-        _typeMap.emplace( "float",      "float32_t" );
-        _typeMap.emplace( "float2",     "f32vec2" );
-        _typeMap.emplace( "float3",     "f32vec3" );
-        _typeMap.emplace( "float4",     "f32vec4" );
-        _typeMap.emplace( "float2x2",   "f32mat2x2" );
-        _typeMap.emplace( "float2x3",   "f32mat2x3" );
-        _typeMap.emplace( "float2x4",   "f32mat2x4" );
-        _typeMap.emplace( "float3x2",   "f32mat3x2" );
-        _typeMap.emplace( "float3x3",   "f32mat3x3" );
-        _typeMap.emplace( "float3x4",   "f32mat3x4" );
-        _typeMap.emplace( "float4x2",   "f32mat4x2" );
-        _typeMap.emplace( "float4x3",   "f32mat4x3" );
-        _typeMap.emplace( "float4x4",   "f32mat4x4" );
-        *//*
-        _typeMap.emplace( "double",     "float64_t" );
-        _typeMap.emplace( "double2",    "f64vec2" );
-        _typeMap.emplace( "double3",    "f64vec3" );
-        _typeMap.emplace( "double4",    "f64vec4" );
-        _typeMap.emplace( "double2x2",  "f64mat2x2" );
-        _typeMap.emplace( "double2x3",  "f64mat2x3" );
-        _typeMap.emplace( "double2x4",  "f64mat2x4" );
-        _typeMap.emplace( "double3x2",  "f64mat3x2" );
-        _typeMap.emplace( "double3x3",  "f64mat3x3" );
-        _typeMap.emplace( "double3x4",  "f64mat3x4" );
-        _typeMap.emplace( "double4x2",  "f64mat4x2" );
-        _typeMap.emplace( "double4x3",  "f64mat4x3" );
-        _typeMap.emplace( "double4x4",  "f64mat4x4" );
-
-        _typeMap.emplace( "int",        "int32_t" );
-        _typeMap.emplace( "int2",       "i32vec2" );
-        _typeMap.emplace( "int3",       "i32vec3" );
-        _typeMap.emplace( "int4",       "i32vec4" );
-
-        _typeMap.emplace( "uint",       "uint32_t" );
-        _typeMap.emplace( "uint2",      "u32vec2" );
-        _typeMap.emplace( "uint3",      "u32vec3" );
-        _typeMap.emplace( "uint4",      "u32vec4" );
-        */
-        _typeMap.emplace( "long",       "int64_t" );
-        _typeMap.emplace( "long2",      "i64vec2" );
-        _typeMap.emplace( "long3",      "i64vec3" );
-        _typeMap.emplace( "long4",      "i64vec4" );
-
-        _typeMap.emplace( "ulong",      "uint64_t" );
-        _typeMap.emplace( "ulong2",     "u64vec2" );
-        _typeMap.emplace( "ulong3",     "u64vec3" );
-        _typeMap.emplace( "ulong4",     "u64vec4" );
+        _typeMap.emplace( "sbyte",          "int8_t" );
+        _typeMap.emplace( "sbyte2",         "i8vec2" );
+        _typeMap.emplace( "sbyte3",         "i8vec3" );
+        _typeMap.emplace( "sbyte4",         "i8vec4" );
+        _typeMap.emplace( "sbyte_vec_t",    "i8vec" );
+
+        _typeMap.emplace( "ubyte",          "uint8_t" );
+        _typeMap.emplace( "ubyte2",         "u8vec2" );
+        _typeMap.emplace( "ubyte3",         "u8vec3" );
+        _typeMap.emplace( "ubyte4",         "u8vec4" );
+        _typeMap.emplace( "ubyte_vec_t",    "u8vec" );
+
+        _typeMap.emplace( "sshort",         "int16_t" );
+        _typeMap.emplace( "sshort2",        "i16vec2" );
+        _typeMap.emplace( "sshort3",        "i16vec3" );
+        _typeMap.emplace( "sshort4",        "i16vec4" );
+        _typeMap.emplace( "sshort_vec_t",   "i16vec" );
+
+        _typeMap.emplace( "ushort",         "uint16_t" );
+        _typeMap.emplace( "ushort2",        "u16vec2" );
+        _typeMap.emplace( "ushort3",        "u16vec3" );
+        _typeMap.emplace( "ushort4",        "u16vec4" );
+        _typeMap.emplace( "ushort_vec_t",   "u16vec" );
+
+        _typeMap.emplace( "half",           "float16_t" );
+        _typeMap.emplace( "half2",          "f16vec2" );
+        _typeMap.emplace( "half3",          "f16vec3" );
+        _typeMap.emplace( "half4",          "f16vec4" );
+        _typeMap.emplace( "half_vec_t",     "f16vec" );
+        _typeMap.emplace( "half2x2",        "f16mat2x2" );
+        _typeMap.emplace( "half2x3",        "f16mat2x3" );
+        _typeMap.emplace( "half2x4",        "f16mat2x4" );
+        _typeMap.emplace( "half3x2",        "f16mat3x2" );
+        _typeMap.emplace( "half3x3",        "f16mat3x3" );
+        _typeMap.emplace( "half3x4",        "f16mat3x4" );
+        _typeMap.emplace( "half4x2",        "f16mat4x2" );
+        _typeMap.emplace( "half4x3",        "f16mat4x3" );
+        _typeMap.emplace( "half4x4",        "f16mat4x4" );
+        _typeMap.emplace( "half_mat_t",     "f16mat" );
+
+        _typeMap.emplace( "slong",          "int64_t" );
+        _typeMap.emplace( "slong2",         "i64vec2" );
+        _typeMap.emplace( "slong3",         "i64vec3" );
+        _typeMap.emplace( "slong4",         "i64vec4" );
+        _typeMap.emplace( "slong_vec_t",    "i64vec" );
+
+        _typeMap.emplace( "ulong",          "uint64_t" );
+        _typeMap.emplace( "ulong2",         "u64vec2" );
+        _typeMap.emplace( "ulong3",         "u64vec3" );
+        _typeMap.emplace( "ulong4",         "u64vec4" );
+        _typeMap.emplace( "ulong_vec_t",    "u64vec" );
+
 
         _typeMap.emplace( "gl::SubpassInput<float>",    "subpassInput" );
         _typeMap.emplace( "gl::SubpassInputMS<float>",  "subpassInputMS" );
@@ -608,9 +635,9 @@ namespace {
 
         // https://github.com/KhronosGroup/GLSL/blob/master/extensions/khr/GLSL_KHR_cooperative_matrix.txt
         _typeMap.emplace( "gl::CoopMat",                                "coopmat" );
-        _typeMap.emplace( "gl.CoopMatLoad",                             "coopmatLoad" );
-        _typeMap.emplace( "gl.CoopMatStore",                            "coopmatStore" );
-        _typeMap.emplace( "gl.CoopMatMulAdd",                           "coopmatMulAdd" );
+        _typeMap.emplace( "gl.CoopMatLoad",                             "coopMatLoad" );
+        _typeMap.emplace( "gl.CoopMatStore",                            "coopMatStore" );
+        _typeMap.emplace( "gl.CoopMatMulAdd",                           "coopMatMulAdd" );
         _typeMap.emplace( "gl::MatrixOperands",                         "int" );
         _typeMap.emplace( "gl::MatrixOperands::None",                   "0" );
         _typeMap.emplace( "gl::MatrixOperands::SaturatingAccumulation", "gl_MatrixOperandsSaturatingAccumulation" );
@@ -618,6 +645,7 @@ namespace {
         _typeMap.emplace( "gl::MatrixUse::A",                           "gl_MatrixUseA" );
         _typeMap.emplace( "gl::MatrixUse::B",                           "gl_MatrixUseB" );
         _typeMap.emplace( "gl::MatrixUse::Accumulator",                 "gl_MatrixUseAccumulator" );
+        _typeMap.emplace( "gl::MatrixUse::C",                           "gl_MatrixUseAccumulator" );
         _typeMap.emplace( "gl::CooperativeMatrixLayout",                "int" );
         _typeMap.emplace( "gl::CooperativeMatrixLayout::RowMajor",      "gl_CooperativeMatrixLayoutRowMajor" );
         _typeMap.emplace( "gl::CooperativeMatrixLayout::ColumnMajor",   "gl_CooperativeMatrixLayoutColumnMajor" );
@@ -666,6 +694,7 @@ namespace {
             {{
                 if ( dst.size() <= 1 )  return;
                 if ( dst == "uint" )    return;
+                if ( dst == "int" )     return;
 
                 for (usize i = 0; i < source.size();)
                 {
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.cpp
index d727b45c..b14c24a5 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.cpp
@@ -68,7 +68,7 @@ namespace
     constructor
 =================================================
 */
-    MetalCompiler::MetalCompiler (ArrayView<Path> includeDirs)
+    MetalCompiler::MetalCompiler (ArrayView<Path> includeDirs) __NE___
     {
         _directories.reserve( includeDirs.size() );
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.h b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.h
index b5c919c5..98c12523 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/MetalCompiler.h
@@ -12,7 +12,7 @@ namespace AE::PipelineCompiler
     // Metal Compiler
     //
 
-    struct MetalCompiler
+    struct MetalCompiler : NothrowAllocatable
     {
     // types
     public:
@@ -47,7 +47,7 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        explicit MetalCompiler (ArrayView<Path> includeDirs);
+        explicit MetalCompiler (ArrayView<Path> includeDirs)    __NE___;
         ~MetalCompiler ();
 
             void  SetPreprocessor (IShaderPreprocessor*);
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.cpp
index 57907e90..6ba96544 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.cpp
@@ -309,8 +309,16 @@ namespace AE::PipelineCompiler
     constructor
 =================================================
 */
-    SpirvCompiler::SpirvCompiler (Array<Path> dirs) : _directories{ RVRef(dirs) }
+    SpirvCompiler::SpirvCompiler (ArrayView<Path> includeDirs) __NE___
     {
+        _directories.reserve( includeDirs.size() );
+
+        for (auto& path : includeDirs)
+        {
+            CHECK( path.is_absolute() );
+            _directories.push_back( path.string() );
+        }
+
         glslang::InitializeProcess();
 
         _GenerateResources( OUT _builtinResource );
@@ -911,8 +919,8 @@ namespace AE::PipelineCompiler
         const String        path_str    = ToString( in.fileLoc.path );
         String              str;        str.reserve( log.length() );
 
-        STATIC_ASSERT( CountOf(num_lines) == src_count );
-        STATIC_ASSERT( CountOf(sources) == src_count );
+        StaticAssert( CountOf(num_lines) == src_count );
+        StaticAssert( CountOf(sources) == src_count );
 
         for (;;)
         {
@@ -996,7 +1004,7 @@ namespace AE::PipelineCompiler
 
 /*
 =================================================
-    _BuildReflection 
+    _BuildReflection
 =================================================
 */
     bool  SpirvCompiler::_BuildReflection (const GLSLangResult &glslangData, OUT ShaderReflection &result)
@@ -1320,7 +1328,7 @@ namespace AE::PipelineCompiler
     ExtractNodeName
 =================================================
 */
-    ND_ static String  ExtractNodeName (TIntermNode *node)
+    ND_ static String  ExtractNodeName (TIntermNode* node)
     {
         CHECK_ERR( node and node->getAsSymbolNode() );
 
@@ -1340,28 +1348,28 @@ namespace AE::PipelineCompiler
     Extract***ID
 =================================================
 */
-    ND_ static UniformName  ExtractUniformID (TIntermNode *node)
+    ND_ static UniformName  ExtractUniformID (TIntermNode* node)
     {
         String  name = ExtractNodeName( node );
         ObjectStorage::Instance()->AddName<UniformName>( name );
         return UniformName{ name };
     }
 
-    ND_ static ShaderIOName  ExtractShaderIOName (TIntermNode *node)
+    ND_ static ShaderIOName  ExtractShaderIOName (TIntermNode* node)
     {
         String  name = ExtractNodeName( node );
         ObjectStorage::Instance()->AddName<ShaderIOName>( name );
         return ShaderIOName{ name };
     }
 
-    ND_ static SpecializationName  ExtractSpecializationID (TIntermNode *node)
+    ND_ static SpecializationName  ExtractSpecializationID (TIntermNode* node)
     {
         String  name = ExtractNodeName( node );
         ObjectStorage::Instance()->AddName<SpecializationName>( name );
         return SpecializationName{ name };
     }
 
-    ND_ static PushConstantName  ExtractPushConstant (TIntermNode *node)
+    ND_ static PushConstantName  ExtractPushConstant (TIntermNode* node)
     {
         String  name = ExtractNodeName( node );
         ObjectStorage::Instance()->AddName<PushConstantName>( name );
@@ -1467,7 +1475,7 @@ namespace AE::PipelineCompiler
 
         if ( type.isSubpass() )
         {
-            STATIC_ASSERT( uint(EShaderIO::_Count) == 13 );
+            StaticAssert( uint(EShaderIO::_Count) == 13 );
             switch( type.getSampler().type )
             {
                 case TBasicType::EbtFloat :     return EShaderIO::Float;
@@ -1481,7 +1489,7 @@ namespace AE::PipelineCompiler
 
         COMP_CHECK_ERR( type.getVectorSize() == 4 );
 
-        STATIC_ASSERT( uint(EShaderIO::_Count) == 13 );
+        StaticAssert( uint(EShaderIO::_Count) == 13 );
         switch ( type.getBasicType() )
         {
             case TBasicType::EbtFloat :     return EShaderIO::Float;
@@ -1500,12 +1508,12 @@ namespace AE::PipelineCompiler
     based on TParseContext::fixBlockUniformOffsets
 =================================================
 */
-    bool  SpirvCompiler::_CalculateStructSize (const glslang::TType &bufferType, OUT Bytes32u &staticSize, OUT Bytes32u &arrayStride, OUT Bytes32u &minOffset) const
+    bool  SpirvCompiler::_CalculateStructSize (const glslang::TType &bufferType, OUT Byte32u &staticSize, OUT Byte32u &arrayStride, OUT Byte32u &minOffset) const
     {
         using namespace glslang;
 
-        staticSize = arrayStride = Bytes32u{0u};
-        minOffset = Bytes32u::Max();
+        staticSize = arrayStride = Byte32u{0u};
+        minOffset = Byte32u::Max();
 
         COMP_CHECK_ERR( bufferType.isStruct() );
         COMP_CHECK_ERR( bufferType.getQualifier().isUniformOrBuffer() or bufferType.getQualifier().layoutPushConstant );
@@ -1555,14 +1563,14 @@ namespace AE::PipelineCompiler
             // for last member
             if ( member+1 == struct_fields.size() and member_type.isUnsizedArray() )
             {
-                arrayStride = Bytes32u{uint( dummy_stride )};
+                arrayStride = Byte32u{uint( dummy_stride )};
             }else{
                 offset += member_size;
             }
         }
 
         glslang::RoundToPow2( INOUT offset, max_align );
-        staticSize = Bytes32u{uint( offset )};
+        staticSize = Byte32u{uint( offset )};
 
         return true;
     }
@@ -1654,7 +1662,7 @@ namespace AE::PipelineCompiler
         // push constants
         if ( qual.layoutPushConstant )
         {
-            Bytes32u    size, stride, offset;
+            Byte32u size, stride, offset;
             COMP_CHECK_ERR( _CalculateStructSize( type, OUT size, OUT stride, OUT offset ), "failed to calculate struct size for '"s << node_name << "'");
             size -= offset;
 
@@ -1675,7 +1683,7 @@ namespace AE::PipelineCompiler
         auto&   descriptor_set = _GetDescriptorSet( uint(qual.layoutSet), INOUT reflection );
 
         if ( type.getBasicType() == TBasicType::EbtSampler )
-        {   
+        {
             TSampler const& samp = type.getSampler();
 
             COMP_CHECK_ERR( not samp.isYuv() );
@@ -1821,13 +1829,13 @@ namespace AE::PipelineCompiler
 
                 un.buffer                   = Default;
                 un.buffer.state             = EResourceState::ShaderUniform | EResourceState_FromShaders( _currentStage );
-                un.buffer.arrayStride       = Bytes32u{0u};
+                un.buffer.arrayStride       = Byte32u{0u};
                 un.buffer.dynamicOffsetIndex= UMax;
                 un.buffer.typeName          = GetShaderStructName( type.getTypeName() );
 
                 COMP_CHECK_ERR( name.IsDefined() );
 
-                Bytes32u    stride, offset;
+                Byte32u stride, offset;
                 COMP_CHECK_ERR( _CalculateStructSize( type, OUT un.buffer.staticSize, OUT stride, OUT offset ));
                 COMP_CHECK_ERR( offset == 0u );
                 return true;
@@ -1850,7 +1858,7 @@ namespace AE::PipelineCompiler
 
                 COMP_CHECK_ERR( name.IsDefined() );
 
-                Bytes32u    offset;
+                Byte32u offset;
                 COMP_CHECK_ERR( _CalculateStructSize( type, OUT un.buffer.staticSize, OUT un.buffer.arrayStride, OUT offset ));
                 COMP_CHECK_ERR( offset == 0u );
                 return true;
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.h b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.h
index c59b9458..f1ec8df8 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Compiler/SpirvCompiler.h
@@ -23,7 +23,7 @@ namespace AE::PipelineCompiler
     // SPIRV Compiler
     //
 
-    class SpirvCompiler final
+    class SpirvCompiler final : public NothrowAllocatable
     {
     // types
     private:
@@ -108,7 +108,7 @@ namespace AE::PipelineCompiler
             StringView      source;
             PathAndLine     fileLoc;                        // only for output parser
             bool            shaderSubgroupClock = false;    // \__ only for shader profiling
-            bool            shaderDeviceClock   = false;    // / 
+            bool            shaderDeviceClock   = false;    // /
         };
 
         struct Output
@@ -135,7 +135,7 @@ namespace AE::PipelineCompiler
 
     // variables
     private:
-        const Array< Path >             _directories;
+        Array< Path >                   _directories;
 
         glslang::TIntermediate *        _intermediate       = null;
         EShaderStages                   _currentStage       = Default;
@@ -150,7 +150,7 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        explicit SpirvCompiler (Array<Path> includeDirs);
+        explicit SpirvCompiler (ArrayView<Path> includeDirs) __NE___;
         ~SpirvCompiler ();
 
             bool  SetDefaultResourceLimits ();
@@ -182,7 +182,7 @@ namespace AE::PipelineCompiler
 
         ND_ bool  _ProcessShaderInfo (INOUT ShaderReflection &result) const;
 
-        ND_ bool  _CalculateStructSize (const glslang::TType &bufferType, OUT Bytes32u &staticSize, OUT Bytes32u &arrayStride, OUT Bytes32u &offset) const;
+        ND_ bool  _CalculateStructSize (const glslang::TType &bufferType, OUT Byte32u &staticSize, OUT Byte32u &arrayStride, OUT Byte32u &offset) const;
 
             void  _MergeWithGeometryInputPrimitive (INOUT TopologyBits_t &topologyBits, /*TLayoutGeometry*/uint type) const;
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/HashToName.h b/AE/engine/tools/res_pack/pipeline_compiler/Packer/HashToName.h
index 673c72e3..827bedcb 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/HashToName.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/HashToName.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include "serializing/ObjectFactory.h"
+#include "serializing/Basic/ObjectFactory.h"
 #include "base/Algorithms/StringUtils.h"
 
 namespace AE::Base
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/MetalEnums.h b/AE/engine/tools/res_pack/pipeline_compiler/Packer/MetalEnums.h
index 3fd0f29b..150a79e3 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/MetalEnums.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/MetalEnums.h
@@ -80,7 +80,7 @@ namespace AE::PipelineCompiler
 
 
     //
-    // MTLPixelFormat 
+    // MTLPixelFormat
     //
     enum class MtlPixelFormat : ushort
     {
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PackCommon.h b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PackCommon.h
index 268257da..cffb1eaf 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PackCommon.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PackCommon.h
@@ -23,7 +23,7 @@ namespace AE::PipelineCompiler
     static constexpr uint   RenderPassPack_Name         = "RPpack"_Hash;
     static constexpr uint   RenderPassPack_VkRpBlock    = "VKRP"_Hash;
     static constexpr uint   RenderPassPack_MtlRpBlock   = "MtlRP"_Hash;
-    STATIC_ASSERT( RenderPassPack_VkRpBlock != RenderPassPack_MtlRpBlock );
+    StaticAssert( RenderPassPack_VkRpBlock != RenderPassPack_MtlRpBlock );
 
     static constexpr uint   SamplerPack_Version         = 1;
     static constexpr uint   SamplerPack_Name            = "SampPack"_Hash;
@@ -35,32 +35,32 @@ namespace AE::PipelineCompiler
     static constexpr uint   ShaderPack_Name             = "ShPack"_Hash;
 
 
-    STATIC_ASSERT( PackOffsets_Name != NameMapping_Name );
-    STATIC_ASSERT( PackOffsets_Name != FeatureSetPack_Name );
-    STATIC_ASSERT( PackOffsets_Name != RenderPassPack_Name );
-    STATIC_ASSERT( PackOffsets_Name != SamplerPack_Name );
-    STATIC_ASSERT( PackOffsets_Name != PipelinePack_Name );
-    STATIC_ASSERT( PackOffsets_Name != ShaderPack_Name );
+    StaticAssert( PackOffsets_Name != NameMapping_Name );
+    StaticAssert( PackOffsets_Name != FeatureSetPack_Name );
+    StaticAssert( PackOffsets_Name != RenderPassPack_Name );
+    StaticAssert( PackOffsets_Name != SamplerPack_Name );
+    StaticAssert( PackOffsets_Name != PipelinePack_Name );
+    StaticAssert( PackOffsets_Name != ShaderPack_Name );
 
-    STATIC_ASSERT( NameMapping_Name != FeatureSetPack_Name );
-    STATIC_ASSERT( NameMapping_Name != RenderPassPack_Name );
-    STATIC_ASSERT( NameMapping_Name != SamplerPack_Name );
-    STATIC_ASSERT( NameMapping_Name != PipelinePack_Name );
-    STATIC_ASSERT( NameMapping_Name != ShaderPack_Name );
+    StaticAssert( NameMapping_Name != FeatureSetPack_Name );
+    StaticAssert( NameMapping_Name != RenderPassPack_Name );
+    StaticAssert( NameMapping_Name != SamplerPack_Name );
+    StaticAssert( NameMapping_Name != PipelinePack_Name );
+    StaticAssert( NameMapping_Name != ShaderPack_Name );
 
-    STATIC_ASSERT( FeatureSetPack_Name != RenderPassPack_Name );
-    STATIC_ASSERT( FeatureSetPack_Name != SamplerPack_Name );
-    STATIC_ASSERT( FeatureSetPack_Name != PipelinePack_Name );
-    STATIC_ASSERT( FeatureSetPack_Name != ShaderPack_Name );
+    StaticAssert( FeatureSetPack_Name != RenderPassPack_Name );
+    StaticAssert( FeatureSetPack_Name != SamplerPack_Name );
+    StaticAssert( FeatureSetPack_Name != PipelinePack_Name );
+    StaticAssert( FeatureSetPack_Name != ShaderPack_Name );
 
-    STATIC_ASSERT( RenderPassPack_Name != SamplerPack_Name );
-    STATIC_ASSERT( RenderPassPack_Name != PipelinePack_Name );
-    STATIC_ASSERT( RenderPassPack_Name != ShaderPack_Name );
+    StaticAssert( RenderPassPack_Name != SamplerPack_Name );
+    StaticAssert( RenderPassPack_Name != PipelinePack_Name );
+    StaticAssert( RenderPassPack_Name != ShaderPack_Name );
 
-    STATIC_ASSERT( SamplerPack_Name != PipelinePack_Name );
-    STATIC_ASSERT( SamplerPack_Name != ShaderPack_Name );
+    StaticAssert( SamplerPack_Name != PipelinePack_Name );
+    StaticAssert( SamplerPack_Name != ShaderPack_Name );
 
-    STATIC_ASSERT( PipelinePack_Name != ShaderPack_Name );
+    StaticAssert( PipelinePack_Name != ShaderPack_Name );
 
 
     //
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelineCompiler.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelineCompiler.cpp
index 279c7bca..822f47ec 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelineCompiler.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelineCompiler.cpp
@@ -8,7 +8,7 @@
 #include "base/Algorithms/StringUtils.h"
 #include "base/Algorithms/Parser.h"
 
-#include "serializing/Serializer.h"
+#include "serializing/Basic/Serializer.h"
 
 #include "scripting/Impl/EnumBinder.h"
 #include "scripting/Impl/ScriptFn.h"
@@ -22,7 +22,7 @@
 
 namespace AE::PipelineCompiler
 {
-namespace 
+namespace
 {
     using namespace AE::Scripting;
 
@@ -31,7 +31,7 @@ namespace
     BuildPipelineList
 =================================================
 */
-    ND_ static bool  BuildPipelineList (const PipelinesInfo *info,
+    ND_ static bool  BuildPipelineList (const PipelinesInfo* info,
                                         OUT Array<Path> &outPipelines, OUT Array<Path> &outPipelineIncludeDirs,
                                         OUT Array<Path> &outShaderIncludeDirs, OUT Array<Path> &outShaderDirs)
     {
@@ -163,8 +163,7 @@ namespace
     {
         for (auto& path : pipelines)
         {
-            if ( not storage.CompilePipeline( scriptEngine, path, includeDirs ))
-                continue;
+            CHECK_ERR( storage.CompilePipeline( scriptEngine, path, includeDirs ));
         }
 
         CHECK_ERR( storage.BuildRenderTechniques() );
@@ -176,7 +175,7 @@ namespace
     CompilePipelinesImpl
 =================================================
 */
-    ND_ bool  CompilePipelinesImpl (const PipelinesInfo *info)
+    ND_ bool  CompilePipelinesImpl (const PipelinesInfo* info)
     {
         CHECK_ERR( info != null );
         CHECK_ERR( (info->shaderIncludeDirCount > 0) == (info->shaderIncludeDirs != null) );
@@ -216,7 +215,7 @@ namespace
         const Path  cpp_structs_fname   = info->outputCppStructsFile != null ? FileSystem::ToAbsolute( info->outputCppStructsFile ) : Default;
         const Path  cpp_names_fname     = info->outputCppNamesFile   != null ? FileSystem::ToAbsolute( info->outputCppNamesFile   ) : Default;
 
-        CATCH_ERR( ObjectStorage::Bind( script_engine ));
+        NOTHROW_ERR( ObjectStorage::Bind( script_engine ));
 
         CHECK_ERR( LoadPipelines( obj_storage, script_engine, pipelines, ppln_include_dirs ));
 
@@ -247,7 +246,7 @@ namespace
     CompilePipelines
 =================================================
 */
-    extern "C" bool AE_PC_API  CompilePipelines (const PipelinesInfo *info)
+    extern "C" bool AE_PC_API  CompilePipelines (const PipelinesInfo* info)
     {
         AE::Base::StaticLogger::LoggerScope log{};
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.cpp
index 17227e22..15ce68e0 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "PipelinePack.h"
-#include "serializing/Serializer.h"
-#include "serializing/ObjectFactory.h"
 #include "base/Algorithms/StringUtils.h"
 #include "base/DataSource/MemStream.h"
+#include "serializing/Basic/Serializer.h"
+#include "serializing/Basic/ObjectFactory.h"
 #include "graphics/Private/EnumUtils.h"
 
 #ifdef AE_ENABLE_GLSL_TRACE
@@ -876,7 +876,7 @@ namespace {
 =================================================
     BasePipelineDesc_Hash
 =================================================
-*/  
+*/
     ND_ static HashVal  BasePipelineDesc_Hash (const BasePipelineDesc &desc)
     {
         return HashOf(desc.specialization) + HashOf(desc.dynamicState) + HashOf(desc.options);
@@ -886,7 +886,7 @@ namespace {
 =================================================
     BasePipelineDesc_Compare
 =================================================
-*/  
+*/
     ND_ static bool  BasePipelineDesc_Compare (const BasePipelineDesc &lhs, const BasePipelineDesc &rhs)
     {
         return  (lhs.specialization == rhs.specialization)  &
@@ -927,7 +927,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableGraphicsPipeline::CalcHash () const
+    HashVal  SerializableGraphicsPipeline::CalcHash () C_NE___
     {
         HashVal res;
         res << HashOf( features );
@@ -945,7 +945,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableGraphicsPipeline::operator == (const SerializableGraphicsPipeline &rhs) const
+    bool  SerializableGraphicsPipeline::operator == (const SerializableGraphicsPipeline &rhs) C_NE___
     {
         return  features            == rhs.features             and
                 layout              == rhs.layout               and
@@ -977,7 +977,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableMeshPipeline::CalcHash () const
+    HashVal  SerializableMeshPipeline::CalcHash () C_NE___
     {
         HashVal res;
         res << HashOf( features );
@@ -999,7 +999,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableMeshPipeline::operator == (const SerializableMeshPipeline &rhs) const
+    bool  SerializableMeshPipeline::operator == (const SerializableMeshPipeline &rhs) C_NE___
     {
         return  features                    == rhs.features                 and
                 layout                      == rhs.layout                   and
@@ -1032,7 +1032,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableComputePipeline::CalcHash () const
+    HashVal  SerializableComputePipeline::CalcHash () C_NE___
     {
         HashVal res;
         res << HashOf( features );
@@ -1048,7 +1048,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableComputePipeline::operator == (const SerializableComputePipeline &rhs) const
+    bool  SerializableComputePipeline::operator == (const SerializableComputePipeline &rhs) C_NE___
     {
         return  features                == rhs.features             and
                 layout                  == rhs.layout               and
@@ -1075,7 +1075,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableTilePipeline::CalcHash () const
+    HashVal  SerializableTilePipeline::CalcHash () C_NE___
     {
         HashVal res;
         res << HashOf( features );
@@ -1091,7 +1091,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableTilePipeline::operator == (const SerializableTilePipeline &rhs) const
+    bool  SerializableTilePipeline::operator == (const SerializableTilePipeline &rhs) C_NE___
     {
         return  features                == rhs.features             and
                 layout                  == rhs.layout               and
@@ -1124,7 +1124,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableRayTracingPipeline::CalcHash () const
+    HashVal  SerializableRayTracingPipeline::CalcHash () C_NE___
     {
         HashVal res;
         res << HashOf( features );
@@ -1141,7 +1141,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableRayTracingPipeline::operator == (const SerializableRayTracingPipeline &rhs) const
+    bool  SerializableRayTracingPipeline::operator == (const SerializableRayTracingPipeline &rhs) C_NE___
     {
         return  features            == rhs.features         and
                 layout              == rhs.layout           and
@@ -1178,7 +1178,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableGraphicsPipelineSpec::CalcHash () const
+    HashVal  SerializableGraphicsPipelineSpec::CalcHash () C_NE___
     {
         HashVal res;
         res << HashOf( uint(templUID) );
@@ -1198,7 +1198,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableGraphicsPipelineSpec::operator == (const SerializableGraphicsPipelineSpec &rhs) const
+    bool  SerializableGraphicsPipelineSpec::operator == (const SerializableGraphicsPipelineSpec &rhs) C_NE___
     {
         return  templUID            == rhs.templUID             and
                 rStateUID           == rhs.rStateUID            and
@@ -1238,7 +1238,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableMeshPipelineSpec::CalcHash () const
+    HashVal  SerializableMeshPipelineSpec::CalcHash () C_NE___
     {
         return  HashOf( uint(templUID) ) + HashOf( uint(rStateUID) ) + HashOf( uint(dsStateUID) ) +
                 BasePipelineDesc_Hash( desc ) + HashOf( desc.renderPass ) + HashOf( desc.subpass ) + HashOf( desc.viewportCount ) +
@@ -1250,7 +1250,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableMeshPipelineSpec::operator == (const SerializableMeshPipelineSpec &rhs) const
+    bool  SerializableMeshPipelineSpec::operator == (const SerializableMeshPipelineSpec &rhs) C_NE___
     {
         return  templUID                == rhs.templUID             and
                 rStateUID               == rhs.rStateUID            and
@@ -1285,7 +1285,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableComputePipelineSpec::CalcHash () const
+    HashVal  SerializableComputePipelineSpec::CalcHash () C_NE___
     {
         return HashOf( uint(templUID) ) + BasePipelineDesc_Hash( desc ) + HashOf( desc.localSize );
     }
@@ -1295,7 +1295,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableComputePipelineSpec::operator == (const SerializableComputePipelineSpec &rhs) const
+    bool  SerializableComputePipelineSpec::operator == (const SerializableComputePipelineSpec &rhs) C_NE___
     {
         return  templUID            == rhs.templUID         and
                 BasePipelineDesc_Compare( desc, rhs.desc )  and
@@ -1324,7 +1324,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableTilePipelineSpec::CalcHash () const
+    HashVal  SerializableTilePipelineSpec::CalcHash () C_NE___
     {
         return  HashOf( uint(templUID) ) +
                 BasePipelineDesc_Hash( desc ) + HashOf( desc.renderPass ) + HashOf( desc.subpass ) + HashOf( desc.localSize );
@@ -1335,7 +1335,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableTilePipelineSpec::operator == (const SerializableTilePipelineSpec &rhs) const
+    bool  SerializableTilePipelineSpec::operator == (const SerializableTilePipelineSpec &rhs) C_NE___
     {
         return  templUID            == rhs.templUID         and
                 BasePipelineDesc_Compare( desc, rhs.desc )  and
@@ -1366,7 +1366,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableRayTracingPipelineSpec::CalcHash () const
+    HashVal  SerializableRayTracingPipelineSpec::CalcHash () C_NE___
     {
         return  HashOf( uint(templUID) ) + BasePipelineDesc_Hash( desc ) +
                 HashOf( desc.maxRecursionDepth ) + HashOf( desc.maxPipelineRayPayloadSize ) +
@@ -1378,7 +1378,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableRayTracingPipelineSpec::operator == (const SerializableRayTracingPipelineSpec &rhs) const
+    bool  SerializableRayTracingPipelineSpec::operator == (const SerializableRayTracingPipelineSpec &rhs) C_NE___
     {
         return  templUID                            == rhs.templUID                             and
                 BasePipelineDesc_Compare( desc, rhs.desc )                                      and
@@ -1422,7 +1422,7 @@ namespace {
     operator ==
 =================================================
 */
-    bool  SerializableRTShaderBindingTable::operator == (const SerializableRTShaderBindingTable &rhs) const
+    bool  SerializableRTShaderBindingTable::operator == (const SerializableRTShaderBindingTable &rhs) C_NE___
     {
         return  pplnName        == rhs.pplnName     and
                 raygen          == rhs.raygen       and
@@ -1437,7 +1437,7 @@ namespace {
     CalcHash
 =================================================
 */
-    HashVal  SerializableRTShaderBindingTable::CalcHash () const
+    HashVal  SerializableRTShaderBindingTable::CalcHash () C_NE___
     {
         return HashOf(pplnName) + HashOf(raygen) + HashOf(miss) + HashOf(hit) + HashOf(callable) + HashOf(numRayTypes);
     }
@@ -1946,7 +1946,7 @@ namespace {
     template <typename ArrType, typename MapType>
     ShaderUID  PipelineStorage::_AddMslShader (MetalBytecode_t msl, const SpecConstants_t &spec, ShaderUID mask, ArrType &arr, MapType &mapType)
     {
-        CHECK_ERR(  AllBits( mask, ShaderUID::Metal_iOS, ShaderUID::_Mask ) or 
+        CHECK_ERR(  AllBits( mask, ShaderUID::Metal_iOS, ShaderUID::_Mask ) or
                     AllBits( mask, ShaderUID::Metal_Mac, ShaderUID::_Mask ));
 
         ShaderBytecode  code    { RVRef(msl), spec };
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.h b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.h
index f8437c5f..ad666765 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePack.h
@@ -129,9 +129,9 @@ namespace AE::PipelineCompiler
     };
     AE_BIT_OPERATORS( EImageType );
 
-    STATIC_ASSERT( EImageType::_TexCount < EImageType::_TexMask );
-    STATIC_ASSERT( EImageType::_LastVal  < EImageType::_ValMask );
-    STATIC_ASSERT( EImageType::_LastQual < EImageType::_QualMask );
+    StaticAssert( EImageType::_TexCount < EImageType::_TexMask );
+    StaticAssert( EImageType::_LastVal  < EImageType::_ValMask );
+    StaticAssert( EImageType::_LastQual < EImageType::_QualMask );
 
     ND_ bool        EImageType_IsCompatible (EImageType lhs, EImageType rhs)    __NE___;
     ND_ EImageType  EImageType_FromPixelFormat (EPixelFormat fmt)               __NE___;
@@ -168,7 +168,7 @@ namespace AE::PipelineCompiler
             ND_ bool  operator == (const Binding &rhs) const    { return (vkIndex == rhs.vkIndex) & All( mtlIndex == rhs.mtlIndex ); }
             ND_ bool  operator != (const Binding &rhs) const    { return not (*this == rhs); }
         };
-        STATIC_ASSERT( sizeof(Binding) == 8 );
+        StaticAssert( sizeof(Binding) == 8 );
 
         using BindingIndex_t        = decltype(Binding::vkIndex);
         using ArraySize_t           = uint;
@@ -182,8 +182,8 @@ namespace AE::PipelineCompiler
         {
             EResourceState      state                   = Default;
             DynamicOffsetIdx_t  dynamicOffsetIndex      = UMax;
-            Bytes32u            staticSize;
-            Bytes32u            arrayStride;
+            Byte32u             staticSize;
+            Byte32u             arrayStride;
             ShaderStructName    typeName;
 
             ND_ bool  HasDynamicOffset ()   const   { return dynamicOffsetIndex != UMax; }
@@ -235,7 +235,7 @@ namespace AE::PipelineCompiler
                 RayTracingScene     rtScene;
             };
 
-            Uniform () {}
+            Uniform () __NE___ {}
         };
 
         using Uniforms_t    = Array<Pair< UniformName, Uniform >>;
@@ -295,11 +295,11 @@ namespace AE::PipelineCompiler
             ShaderStructName    typeName;
             EShader             stage           = Default;
             ubyte               metalBufferId   = UMax;
-            Bytes16u            vulkanOffset;
-            Bytes16u            size;
+            Byte16u             vulkanOffset;
+            Byte16u             size;
 
             PushConst () {}
-            PushConst (EShader stage, uint bufferId, Bytes32u offset, Bytes32u size, const ShaderStructName &typeName) :
+            PushConst (EShader stage, uint bufferId, Byte32u offset, Byte32u size, const ShaderStructName &typeName) :
                 typeName{typeName}, stage{stage}, metalBufferId{ubyte(bufferId)}, vulkanOffset{offset}, size{size} {}
 
             ND_ bool    operator == (const PushConst &rhs) const;
@@ -465,10 +465,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableGraphicsPipeline () {}
+        SerializableGraphicsPipeline ()                 __NE___ {}
 
-        ND_ bool    operator == (const SerializableGraphicsPipeline &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableGraphicsPipeline &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -496,10 +496,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableGraphicsPipelineSpec () {}
+        SerializableGraphicsPipelineSpec ()             __NE___ {}
 
-        ND_ bool    operator == (const SerializableGraphicsPipelineSpec &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableGraphicsPipelineSpec &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -528,10 +528,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableComputePipeline () {}
+        SerializableComputePipeline ()                  __NE___ {}
 
-        ND_ bool    operator == (const SerializableComputePipeline &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableComputePipeline &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -557,10 +557,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableComputePipelineSpec () {}
+        SerializableComputePipelineSpec ()              __NE___ {}
 
-        ND_ bool    operator == (const SerializableComputePipelineSpec &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableComputePipelineSpec &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -600,10 +600,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableMeshPipeline () {}
+        SerializableMeshPipeline ()                     __NE___ {}
 
-        ND_ bool    operator == (const SerializableMeshPipeline &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableMeshPipeline &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -631,10 +631,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableMeshPipelineSpec () {}
+        SerializableMeshPipelineSpec ()                 __NE___ {}
 
-        ND_ bool    operator == (const SerializableMeshPipelineSpec &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableMeshPipelineSpec &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -707,10 +707,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableRayTracingPipeline () {}
+        SerializableRayTracingPipeline ()               __NE___ {}
 
-        ND_ bool    operator == (const SerializableRayTracingPipeline &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableRayTracingPipeline &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -736,10 +736,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableRayTracingPipelineSpec () {}
+        SerializableRayTracingPipelineSpec ()           __NE___ {}
 
-        ND_ bool    operator == (const SerializableRayTracingPipelineSpec &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableRayTracingPipelineSpec &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -768,10 +768,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableTilePipeline () {}
+        SerializableTilePipeline ()                     __NE___ {}
 
-        ND_ bool    operator == (const SerializableTilePipeline &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableTilePipeline &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -797,10 +797,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableTilePipelineSpec () {}
+        SerializableTilePipelineSpec ()                 __NE___ {}
 
-        ND_ bool    operator == (const SerializableTilePipelineSpec &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableTilePipelineSpec &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
@@ -845,10 +845,10 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        SerializableRTShaderBindingTable () {}
+        SerializableRTShaderBindingTable ()             __NE___ {}
 
-        ND_ bool    operator == (const SerializableRTShaderBindingTable &rhs) const;
-        ND_ HashVal CalcHash () const;
+        ND_ bool    operator == (const SerializableRTShaderBindingTable &rhs) C_NE___;
+        ND_ HashVal CalcHash ()                         C_NE___;
 
         #ifdef AE_TEST_PIPELINE_COMPILER
         ND_ String  ToString (const HashToName &) const;
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePackDeserializer.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePackDeserializer.cpp
index 459bccfd..41ec8cc8 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePackDeserializer.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/PipelinePackDeserializer.cpp
@@ -29,7 +29,7 @@ namespace AE::PipelineCompiler
 */
     SpirvWithTrace::SpirvWithTrace () __NE___ {}
 
-    SpirvWithTrace::SpirvWithTrace (SpirvWithTrace && other) __NE___ :
+    SpirvWithTrace::SpirvWithTrace (SpirvWithTrace &&other) __NE___ :
         bytecode{ RVRef(other.bytecode) },
         trace{ RVRef(other.trace) }
     {}
@@ -41,7 +41,7 @@ namespace AE::PipelineCompiler
         trace{other.trace ? other.trace->Clone() : Default}
     {}
 
-    SpirvWithTrace&  SpirvWithTrace::operator = (SpirvWithTrace && rhs) __NE___
+    SpirvWithTrace&  SpirvWithTrace::operator = (SpirvWithTrace &&rhs) __NE___
     {
         this->bytecode  = RVRef(rhs.bytecode);
         this->trace     = RVRef(rhs.trace);
@@ -506,7 +506,7 @@ namespace {
 */
     bool  SerializableGraphicsPipelineSpec::Deserialize (Serializing::Deserializer &des) __NE___
     {
-        STATIC_ASSERT_64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 8+4+4+16+16+1, 8 ));
+        StaticAssert64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 8+4+4+16+16+1, 8 ));
 
         bool    result = true;
         result &= des( OUT templUID, OUT rStateUID, OUT dsStateUID );
@@ -540,7 +540,7 @@ namespace {
 */
     bool  SerializableComputePipelineSpec::Deserialize (Serializing::Deserializer &des) __NE___
     {
-        STATIC_ASSERT_64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 8, 8 ));
+        StaticAssert64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 8, 8 ));
 
         bool    result = true;
         result &= des( OUT templUID );
@@ -572,7 +572,7 @@ namespace {
 */
     bool  SerializableTilePipelineSpec::Deserialize (Serializing::Deserializer &des) __NE___
     {
-        STATIC_ASSERT_64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 4+4+4, 8 ));
+        StaticAssert64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 4+4+4, 8 ));
 
         bool    result = true;
         result &= des( OUT templUID );
@@ -606,7 +606,7 @@ namespace {
 */
     bool  SerializableMeshPipelineSpec::Deserialize (Serializing::Deserializer &des) __NE___
     {
-        STATIC_ASSERT_64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 8+4+4+2+6+6, 8 ));
+        StaticAssert64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 8+4+4+2+6+6, 8 ));
 
         bool    result = true;
         result &= des( OUT templUID, OUT rStateUID, OUT dsStateUID );
@@ -643,7 +643,7 @@ namespace {
 */
     bool  SerializableRayTracingPipelineSpec::Deserialize (Serializing::Deserializer &des) __NE___
     {
-        STATIC_ASSERT_64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 4+4+4, 8 ));
+        StaticAssert64( (sizeof(desc) - sizeof(BasePipelineDesc)) == AlignUp( 4+4+4, 8 ));
 
         bool    result = true;
         result &= des( OUT templUID );
@@ -766,7 +766,7 @@ namespace {
             spec.emplace( SpecializationName{HashVal32{ptr[0]}}, ptr[1] );
         }
 
-        CATCH_ERR( outCode.resize( outCode.size() - spec_count*2 - 1 ));
+        NOTHROW_ERR( outCode.resize( outCode.size() - spec_count*2 - 1 ));
         return true;
     }
 
@@ -780,10 +780,10 @@ namespace {
     #ifdef AE_ENABLE_GLSL_TRACE
         try{
             const Bytes start       = stream.Position();
-            auto        buf_stream  = MakeRC<BufferedRStream>( stream.GetRC() );    // throw
+            auto        buf_stream  = MakeRC<BufferedRStream>( stream.GetRC<RStream>() );
             {
                 Serializing::Deserializer   des{ buf_stream };
-                outCode.trace = MakeUnique<ShaderTrace>();          // throw
+                outCode.trace = MakeUnique<ShaderTrace>();
 
                 CHECK_ERR( outCode.trace->Deserialize( des ));
                 CHECK_ERR( stream.SeekSet( buf_stream->Position() - des.stream.RemainingSize() ));
@@ -828,7 +828,7 @@ namespace {
             spec.emplace( SpecializationName{HashVal32{ptr[0]}}, ptr[1] );
         }
 
-        CATCH_ERR( outCode.resize( outCode.size() - spec_size ));
+        NOTHROW_ERR( outCode.resize( outCode.size() - spec_size ));
         return true;
     }
 //-----------------------------------------------------------------------------
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.cpp
index 88ae4278..d2fb66f2 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.cpp
@@ -1779,7 +1779,7 @@ namespace
                     CHECK_ERR( ser( RenderPassPack_VkRpBlock, uint(compat->_specializations.size()) ));
 
                     Array<SerializableVkRenderPass> vk_rpasses;
-                    CATCH_ERR( vk_rpasses.reserve( compat->_specializations.size() + 1 ));
+                    NOTHROW_ERR( vk_rpasses.reserve( compat->_specializations.size() + 1 ));
 
                     {
                         SerializableVkRenderPass&   vk_rp = vk_rpasses.emplace_back();
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.h b/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.h
index 0839b97f..3c5358c1 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/RenderPassPack.h
@@ -209,7 +209,7 @@ namespace AE::PipelineCompiler
         bool  Serialize (Serializing::Serializer &)         C_NE_OV;
         bool  Deserialize (Serializing::Deserializer &)     __NE_OV;
     };
-    STATIC_ASSERT( sizeof(SubpassShaderIO::ShaderIOArr_t) == 44 );
+    StaticAssert( sizeof(SubpassShaderIO::ShaderIOArr_t) == 44 );
 
 
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/Packer/SamplerPack.cpp b/AE/engine/tools/res_pack/pipeline_compiler/Packer/SamplerPack.cpp
index 5c3d0661..ee16add5 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/Packer/SamplerPack.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/Packer/SamplerPack.cpp
@@ -23,11 +23,11 @@ namespace AE::Graphics
                 this->minFilter             ==  rhs.minFilter           and
                 this->mipmapMode            ==  rhs.mipmapMode          and
                 All( this->addressMode      ==  rhs.addressMode )       and
-                Equals( this->mipLodBias,       rhs.mipLodBias )        and
-                Equals( this->minLod,           rhs.minLod )            and
-                Equals( this->maxLod,           rhs.maxLod )            and
-                Equals( this->maxAnisotropy,    rhs.maxAnisotropy )     and
-                Equals( this->compareOp,        rhs.compareOp )         and
+                Equal( this->mipLodBias,        rhs.mipLodBias )        and
+                Equal( this->minLod,            rhs.minLod )            and
+                Equal( this->maxLod,            rhs.maxLod )            and
+                Equal( this->maxAnisotropy, rhs.maxAnisotropy )     and
+                Equal( this->compareOp,     rhs.compareOp )         and
                 this->borderColor           ==  rhs.borderColor         and
                 this->reductionMode         ==  rhs.reductionMode       and
                 this->unnormalizedCoordinates == rhs.unnormalizedCoordinates;
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/PipelineCompiler.h b/AE/engine/tools/res_pack/pipeline_compiler/PipelineCompiler.h
index 97f37547..2a1b15db 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/PipelineCompiler.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/PipelineCompiler.h
@@ -85,7 +85,7 @@ namespace AE::PipelineCompiler
     };
 
 
-    extern "C" bool AE_PC_API CompilePipelines (const PipelinesInfo *info);
+    extern "C" bool AE_PC_API CompilePipelines (const PipelinesInfo* info);
 
 
 } // AE::PipelineCompiler
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.cpp
index 0499b143..45f487ad 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.cpp
@@ -31,7 +31,7 @@ namespace
             case EShader::Compute :     str << (has_attribs ? "[[kernel]"    : "kernel");       break;
             case EShader::Tile :        str << (has_attribs ? "[[kernel]"    : "kernel");       break;
             case EShader::MeshTask :    str << "[[object]]";                                    break;
-            case EShader::Mesh :        str << "[[mesh]]";                                      break;      
+            case EShader::Mesh :        str << "[[mesh]]";                                      break;
 
             case EShader::TessControl :
             case EShader::TessEvaluation :
@@ -766,7 +766,7 @@ namespace
     constructor
 =================================================
 */
-    BasePipelineSpec::BasePipelineSpec (const BasePipelineTmpl *tmpl, const String &name) __Th___ :
+    BasePipelineSpec::BasePipelineSpec (const BasePipelineTmpl* tmpl, const String &name) __Th___ :
         _name{ PipelineName{name} },
         _tmpl{ tmpl },
         _options{ ObjectStorage::Instance()->defaultPipelineOpt }
@@ -856,6 +856,11 @@ namespace
                         ToString(opt) << " requires any RayTracing stage" );
                     break;
 
+                case EPipelineOpt::DontCompile :
+                case EPipelineOpt::CaptureStatistics :
+                case EPipelineOpt::CaptureInternalRepresentation :
+                    break;
+
                 case EPipelineOpt::_Last :
                 case EPipelineOpt::All :
                 case EPipelineOpt::Unknown :
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.h
index 97275de3..394a4e04 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/BasePipeline.h
@@ -120,7 +120,7 @@ namespace AE::PipelineCompiler
     // methods
     public:
         BasePipelineSpec () {}
-        BasePipelineSpec (const BasePipelineTmpl *tmpl, const String &name) __Th___;
+        BasePipelineSpec (const BasePipelineTmpl* tmpl, const String &name) __Th___;
 
         ND_ const BasePipelineTmpl*         GetBase ()      const   { return _tmpl; }
         ND_ PipelineName const&             Name ()         const   { return _name; }
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/Common.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/Common.h
index fb0ea172..78be6098 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/Common.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/Common.h
@@ -62,29 +62,32 @@ namespace AE::PipelineCompiler
         SPIRV_1_6       = 0x16 | _SPIRV,        // Vulkan 1.3
         _SPIRV_Last     = SPIRV_1_6,
 
-        Metal_2_0       = 0x20 | _Metal,        // Metal 2.0 for iOS/iPad/Mac
+        Metal_2_0       = 0x20 | _Metal,        // Metal 2.x for iOS/iPad/Mac
         Metal_2_1       = 0x21 | _Metal,
         Metal_2_2       = 0x22 | _Metal,
         Metal_2_3       = 0x23 | _Metal,        // ray tracing
         Metal_2_4       = 0x24 | _Metal,        // ray tracing motion blur
         Metal_3_0       = 0x30 | _Metal,        // mesh shader
-        _Metal_Last     = Metal_3_0,
+        Metal_3_1       = 0x31 | _Metal,        //
+        _Metal_Last     = Metal_3_1,
 
-        Metal_iOS_2_0   = 0x20 | _Metal_iOS,    // Metal 2.0 for iOS/iPad   // iOS 11.0
+        Metal_iOS_2_0   = 0x20 | _Metal_iOS,    // Metal 2.x for iOS/iPad   // iOS 11.0
         Metal_iOS_2_1   = 0x21 | _Metal_iOS,                                // iOS 12.0
         Metal_iOS_2_2   = 0x22 | _Metal_iOS,                                // iOS 13.0
         Metal_iOS_2_3   = 0x23 | _Metal_iOS,                                // iOS 14.0
         Metal_iOS_2_4   = 0x24 | _Metal_iOS,                                // iOS 15.0
-        Metal_iOS_3_0   = 0x30 | _Metal_iOS,                                // iOS 16.0
-        _Metal_iOS_Last = Metal_iOS_3_0,
+        Metal_iOS_3_0   = 0x30 | _Metal_iOS,    // Metal 3.x for iOS/iPad   // iOS 16.0
+        Metal_iOS_3_1   = 0x31 | _Metal_iOS,                                // iOS 17.0
+        _Metal_iOS_Last = Metal_iOS_3_1,
 
-        Metal_Mac_2_0   = 0x20 | _Metal_Mac,    // Metal 2.0 for MacOS      // MacOS 10.13
+        Metal_Mac_2_0   = 0x20 | _Metal_Mac,    // Metal 2.x for MacOS      // MacOS 10.13
         Metal_Mac_2_1   = 0x21 | _Metal_Mac,                                // MacOS 10.14
         Metal_Mac_2_2   = 0x22 | _Metal_Mac,                                // MacOS 10.15
         Metal_Mac_2_3   = 0x23 | _Metal_Mac,                                // MacOS 11.0
         Metal_Mac_2_4   = 0x24 | _Metal_Mac,                                // MacOS 12.0
-        Metal_Mac_3_0   = 0x30 | _Metal_Mac,                                // MacOS 13.0
-        _Metal_Mac_Last = Metal_Mac_3_0,
+        Metal_Mac_3_0   = 0x30 | _Metal_Mac,    // Metal 3.x for MacOS      // MacOS 13.0
+        Metal_Mac_3_1   = 0x31 | _Metal_Mac,                                // MacOS 14.0
+        _Metal_Mac_Last = Metal_Mac_3_1,
 
         Unknown         = 0,
     };
@@ -156,8 +159,7 @@ namespace AE::PipelineCompiler
         Metal,              // as in MSL
         Std140,             // as in GLSL, uniform/storage buffer
         Std430,             // as in GLSL, storage buffer, uniform buffer requires 'scalarLayout' feature
-        InternalIO,         // for vertex input and internal shader input/output, GLSL can use precision instead of 8/16 bit types,
-                            // C++ reflection is not allowed, 
+        InternalIO,         // for vertex input and internal shader input/output, GLSL can use precision instead of 8/16 bit types
         //Scalar,           // TODO: GL_EXT_scalar_block_layout
         _Count,
         Unknown = 0xFF,
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/DescriptorSetLayout.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/DescriptorSetLayout.cpp
index 9b14b69f..86263982 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/DescriptorSetLayout.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/DescriptorSetLayout.cpp
@@ -464,7 +464,7 @@ namespace
                     str << "  layout(set=" << ds_idx << ", binding=" << idx_str << ") uniform accelerationStructureEXT "
                         << name_str << ArraySizeToStr( un.arraySize ) << ";\n";
                     break;
-                }   
+                }
                 case EDescriptorType::Unknown :
                 case EDescriptorType::_Count :
                 default :
@@ -616,7 +616,7 @@ namespace
                     {
                         aux_info->type->AddUsage( ShaderStructType::EUsage::BufferLayout );
                         CHECK_THROW_MSG( aux_info->type->ToMSL( INOUT outTypes, INOUT uniqueTypes ));
-                    }               
+                    }
                     s_decl  << "  /* state: " << ToString( un.buffer.state ) << " */\n"
                             << "  /* static size: " << ToString( un.buffer.staticSize )
                             << ", array stride: " << ToString( un.buffer.arrayStride );
@@ -1459,8 +1459,8 @@ namespace
         un.buffer                       = Default;
         un.buffer.state                 = EResourceState::ShaderStorage_RW | EResourceState_FromShaders( stages );
         un.buffer.dynamicOffsetIndex    = UMax;
-        un.buffer.staticSize            = Bytes32u{staticSize};
-        un.buffer.arrayStride           = Bytes32u{arraySize};
+        un.buffer.staticSize            = Byte32u{staticSize};
+        un.buffer.arrayStride           = Byte32u{arraySize};
         un.buffer.typeName              = ShaderStructName{"dbg_ShaderTraceStorage"};
 
         _dsLayout.uniforms.emplace_back( UniformName{name}, un );
@@ -2042,8 +2042,8 @@ namespace
         un.buffer                       = Default;
         un.buffer.state                 = state;
         un.buffer.dynamicOffsetIndex    = DescriptorSetLayoutDesc::DynamicOffsetIdx_t(dynamic ? 0u : UMax);
-        un.buffer.staticSize            = Bytes32u{ aux_info.type->StaticSize() };
-        un.buffer.arrayStride           = Bytes32u{0u};
+        un.buffer.staticSize            = Byte32u{ aux_info.type->StaticSize() };
+        un.buffer.arrayStride           = Byte32u{0u};
         un.buffer.typeName              = ShaderStructName{st_it->second->Typename()};
 
         _dsLayout.uniforms.emplace_back( UniformName{name}, un );
@@ -2086,8 +2086,8 @@ namespace
         un.buffer                       = Default;
         un.buffer.state                 = state;
         un.buffer.dynamicOffsetIndex    = DescriptorSetLayoutDesc::DynamicOffsetIdx_t(dynamic ? 0u : UMax);
-        un.buffer.staticSize            = Bytes32u{ aux_info.type->StaticSize()  };
-        un.buffer.arrayStride           = Bytes32u{ aux_info.type->ArrayStride() };
+        un.buffer.staticSize            = Byte32u{ aux_info.type->StaticSize()  };
+        un.buffer.arrayStride           = Byte32u{ aux_info.type->ArrayStride() };
         un.buffer.typeName              = ShaderStructName{st_it->second->Typename()};
 
         _dsLayout.uniforms.emplace_back( UniformName{name}, un );
@@ -2307,6 +2307,8 @@ namespace
             _CheckSamplerName( samp );
             _dsLayout.samplerStorage.push_back( SamplerName{samp} );
         }
+
+        // TODO: cubemap supports only CLAMP sampler
     }
 
 /*
@@ -2429,7 +2431,7 @@ namespace
             }
             END_ENUM_CHECKS();
 
-            EResourceState  state = 
+            EResourceState  state =
                 (usage.type == EAttachment::ReadWrite ? EResourceState::InputColorAttachment_RW : EResourceState::InputColorAttachment);
 
             if ( (img_type & EImageType::_ValMask) >= EImageType::Depth )
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage.cpp
index 736c04d5..f48095cf 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage.cpp
@@ -23,7 +23,7 @@ namespace AE::PipelineCompiler
 
     CompiledShader::~CompiledShader () __NE___ {}
 
-    CompiledShader::CompiledShader (CompiledShader && other) __NE___ :
+    CompiledShader::CompiledShader (CompiledShader &&other) __NE___ :
         uid{ other.uid },
         version{ other.version },
         type{ other.type },
@@ -578,7 +578,7 @@ namespace AE::PipelineCompiler
 
             CHECK_ERR( st->ToCPP( INOUT types, INOUT unique ));
         }
-        
+
       #if not AE_PRIVATE_USE_TABS
         types = Parser::TabsToSpaces( types );
       #endif
@@ -938,7 +938,7 @@ namespace {
         binder.AddValue( "SPIRV_1_5",       EShaderVersion::SPIRV_1_5 );
         binder.Comment( "Vulkan 1.3" );
         binder.AddValue( "SPIRV_1_6",       EShaderVersion::SPIRV_1_6 );
-        STATIC_ASSERT( EShaderVersion::_SPIRV_Last == EShaderVersion::SPIRV_1_6 );
+        StaticAssert( EShaderVersion::_SPIRV_Last == EShaderVersion::SPIRV_1_6 );
 
         binder.AddValue( "Metal_2_0",       EShaderVersion::Metal_2_0 );
         binder.AddValue( "Metal_2_1",       EShaderVersion::Metal_2_1 );
@@ -948,7 +948,8 @@ namespace {
         binder.AddValue( "Metal_2_4",       EShaderVersion::Metal_2_4 );
         binder.Comment( "Added mesh shading." );
         binder.AddValue( "Metal_3_0",       EShaderVersion::Metal_3_0 );
-        STATIC_ASSERT( EShaderVersion::_Metal_Last == EShaderVersion::Metal_3_0 );
+        binder.AddValue( "Metal_3_1",       EShaderVersion::Metal_3_1 );
+        StaticAssert( EShaderVersion::_Metal_Last == EShaderVersion::Metal_3_1 );
 
         binder.Comment( "Compile for iOS." );
         binder.AddValue( "Metal_iOS_2_0",   EShaderVersion::Metal_iOS_2_0 );
@@ -957,7 +958,8 @@ namespace {
         binder.AddValue( "Metal_iOS_2_3",   EShaderVersion::Metal_iOS_2_3 );
         binder.AddValue( "Metal_iOS_2_4",   EShaderVersion::Metal_iOS_2_4 );
         binder.AddValue( "Metal_iOS_3_0",   EShaderVersion::Metal_iOS_3_0 );
-        STATIC_ASSERT( EShaderVersion::_Metal_iOS_Last == EShaderVersion::Metal_iOS_3_0 );
+        binder.AddValue( "Metal_iOS_3_1",   EShaderVersion::Metal_iOS_3_1 );
+        StaticAssert( EShaderVersion::_Metal_iOS_Last == EShaderVersion::Metal_iOS_3_1 );
 
         binder.Comment( "Compile for MacOS." );
         binder.AddValue( "Metal_Mac_2_0",   EShaderVersion::Metal_Mac_2_0 );
@@ -966,7 +968,8 @@ namespace {
         binder.AddValue( "Metal_Mac_2_3",   EShaderVersion::Metal_Mac_2_3 );
         binder.AddValue( "Metal_Mac_2_4",   EShaderVersion::Metal_Mac_2_4 );
         binder.AddValue( "Metal_Mac_3_0",   EShaderVersion::Metal_Mac_3_0 );
-        STATIC_ASSERT( EShaderVersion::_Metal_Mac_Last == EShaderVersion::Metal_Mac_3_0 );
+        binder.AddValue( "Metal_Mac_3_1",   EShaderVersion::Metal_Mac_3_1 );
+        StaticAssert( EShaderVersion::_Metal_Mac_Last == EShaderVersion::Metal_Mac_3_1 );
     }
 
     void  ObjectStorage::Bind_EShaderOpt (const ScriptEnginePtr &se)
@@ -991,7 +994,7 @@ namespace {
         binder.AddValue( "StrongOptimization",  EShaderOpt::StrongOptimization );
         // options
         binder.AddValue( "WarnAsError",         EShaderOpt::WarnAsError );
-        STATIC_ASSERT( uint(EShaderOpt::All) == 0x7FF );
+        StaticAssert( uint(EShaderOpt::All) == 0x7FF );
     }
 
     void  ObjectStorage::Bind_EAccessType (const ScriptEnginePtr &se)
@@ -1008,7 +1011,7 @@ namespace {
         binder.AddValue( "WorkgroupCoherent",   EAccessType::WorkgroupCoherent );
         binder.AddValue( "SubgroupCoherent",    EAccessType::SubgroupCoherent );
         binder.AddValue( "NonPrivate",          EAccessType::NonPrivate );
-        STATIC_ASSERT( uint(EAccessType::_Count) == 10 );
+        StaticAssert( uint(EAccessType::_Count) == 10 );
     }
 
     void  ObjectStorage::Bind_EImageType (const ScriptEnginePtr &se)
@@ -1092,9 +1095,9 @@ namespace {
         binder.AddValue( "UImage2DMSArray",     EImageType::Img2DMSArray    | EImageType::UInt );
         binder.AddValue( "UImageBuffer",        EImageType::Buffer          | EImageType::UInt );
 
-        STATIC_ASSERT( uint(EImageType::_TexCount)   == 11 );
-        STATIC_ASSERT( uint(EImageType::_LastVal)-1  == 0xA0 );
-        STATIC_ASSERT( uint(EImageType::_LastQual)-1 == 0x100 );
+        StaticAssert( uint(EImageType::_TexCount)   == 11 );
+        StaticAssert( uint(EImageType::_LastVal)-1  == 0xA0 );
+        StaticAssert( uint(EImageType::_LastQual)-1 == 0x100 );
     }
 
     void  ObjectStorage::Bind_ECompilationTarget (const ScriptEnginePtr &se)
@@ -1104,7 +1107,7 @@ namespace {
         binder.AddValue( "Vulkan",      ECompilationTarget::Vulkan );
         binder.AddValue( "Metal_iOS",   ECompilationTarget::Metal_iOS );
         binder.AddValue( "Metal_Mac",   ECompilationTarget::Metal_Mac );
-        STATIC_ASSERT( uint(ECompilationTarget::_Count) == 4 );
+        StaticAssert( uint(ECompilationTarget::_Count) == 4 );
     }
 
     void  ObjectStorage::Bind_EStructLayout (const ScriptEnginePtr &se)
@@ -1123,7 +1126,7 @@ namespace {
         binder.AddValue( "Std430",              EStructLayout::Std430 );
         binder.Comment( "Platform depended layout." );
         binder.AddValue( "InternalIO",          EStructLayout::InternalIO );
-        STATIC_ASSERT( uint(EStructLayout::_Count) == 6 );
+        StaticAssert( uint(EStructLayout::_Count) == 6 );
     }
 
     void  ObjectStorage::Bind_EValueType (const ScriptEnginePtr &se)
@@ -1148,7 +1151,7 @@ namespace {
         binder.AddValue( "UInt8_Norm",      EValueType::UInt8_Norm );
         binder.AddValue( "UInt16_Norm",     EValueType::UInt16_Norm );
         binder.AddValue( "DeviceAddress",   EValueType::DeviceAddress );
-        STATIC_ASSERT( uint(EValueType::_Count) == 19 );
+        StaticAssert( uint(EValueType::_Count) == 19 );
     }
 
     void  ObjectStorage::Bind_EShaderPreprocessor (const ScriptEnginePtr &se)
@@ -1158,7 +1161,7 @@ namespace {
         binder.AddValue( "None",    EShaderPreprocessor::None );
         binder.Comment( "Use <aestyle.glsl.h> for auto-complete in IDE." );
         binder.AddValue( "AEStyle", EShaderPreprocessor::AEStyle );
-        STATIC_ASSERT( uint(EShaderPreprocessor::_Count) == 2 );
+        StaticAssert( uint(EShaderPreprocessor::_Count) == 2 );
     }
 
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage_GLSL.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage_GLSL.cpp
index 7aff045b..84f2384f 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage_GLSL.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ObjectStorage_GLSL.cpp
@@ -16,18 +16,35 @@ namespace
     HasShaderClock
 =================================================
 */
-    ND_ static Tuple<bool,bool>  HasShaderClock (ArrayView<ScriptFeatureSetPtr> features)
+    struct ShaderDebuggerFeatures
     {
-        FeatureSetCounter   device;
-        FeatureSetCounter   subgroup;
+        bool    shaderDeviceClock               = false;
+        bool    shaderSubgroupClock             = false;
+        bool    fragmentStoresAndAtomics        = false;
+        bool    vertexPipelineStoresAndAtomics  = false;
+    };
+    ND_ static ShaderDebuggerFeatures  GetShaderDebuggerFeatures (ArrayView<ScriptFeatureSetPtr> features)
+    {
+        FeatureSetCounter       device;
+        FeatureSetCounter       subgroup;
+        FeatureSetCounter       vertex_atomic;
+        FeatureSetCounter       frag_atomic;
+        ShaderDebuggerFeatures  result;
 
         for (auto& ptr : features)
         {
-            device  .Add( ptr->fs.shaderDeviceClock );
-            subgroup.Add( ptr->fs.shaderSubgroupClock );
+            device          .Add( ptr->fs.shaderDeviceClock );
+            subgroup        .Add( ptr->fs.shaderSubgroupClock );
+            vertex_atomic   .Add( ptr->fs.vertexPipelineStoresAndAtomics );
+            frag_atomic     .Add( ptr->fs.fragmentStoresAndAtomics );
         }
 
-        return Tuple{ device.IsEnable(), subgroup.IsEnable() };
+        result.shaderDeviceClock                = device.IsTrue();
+        result.shaderSubgroupClock              = subgroup.IsTrue();
+        result.fragmentStoresAndAtomics         = frag_atomic.IsTrue();
+        result.vertexPipelineStoresAndAtomics   = vertex_atomic.IsTrue();
+
+        return result;
     }
 }
 
@@ -36,7 +53,7 @@ namespace
     _CompileShaderGLSL
 =================================================
 */
-    void  ObjectStorage::_CompileShaderGLSL (const ShaderSrcKey &info, ArrayView<ScriptFeatureSetPtr> features, uint debugDSIndex, const PathAndLine &shaderPath,
+    void  ObjectStorage::_CompileShaderGLSL (const ShaderSrcKey &info, ArrayView<ScriptFeatureSetPtr> features, const uint debugDSIndex, const PathAndLine &shaderPath,
                                              const String &entry, OUT CompiledShader &compiled) __Th___
     {
         CHECK_THROW_MSG( spirvCompiler );
@@ -71,18 +88,38 @@ namespace
             TestFeature_Min( features, &FeatureSet::maxDescriptorSets, ushort(debugDSIndex), "maxDescriptorSets", "Debug descriptor set index" );
         }
 
+        const auto  dbg_feats = GetShaderDebuggerFeatures( features );
+        if ( AnyBits( info.options, EShaderOpt::_ShaderTrace_Mask ))
+        {
+            switch ( info.type )
+            {
+                case EShader::Vertex :
+                case EShader::TessControl :
+                case EShader::TessEvaluation :
+                case EShader::Geometry :
+                    CHECK_THROW_MSG( dbg_feats.vertexPipelineStoresAndAtomics,
+                        "Shader debugger requires 'vertexPipelineStoresAndAtomics' feature for "s << ToString(info.type) << " shader." );
+                    break;
+
+                case EShader::Fragment :
+                    CHECK_THROW_MSG( dbg_feats.fragmentStoresAndAtomics,
+                        "Shader debugger requires 'fragmentStoresAndAtomics' features for "s << ToString(info.type) << " shader." );
+                    break;
+            }
+        }
+
         SpirvCompiler::Output   out;
         SpirvCompiler::Input    in;
-        in.shaderType   = info.type;
-        in.spirvVersion = EShaderVersion_Ver2( info.version );
-        in.entry        = entry.c_str();
-        in.header       = header;
-        in.source       = info.source;
-        in.options      = info.options;
-        in.dbgDescSetIdx= debugDSIndex;
-        in.fileLoc      = shaderPath;
-
-        StructSet( in.shaderDeviceClock, in.shaderSubgroupClock ) = HasShaderClock( features );
+        in.shaderType           = info.type;
+        in.spirvVersion         = EShaderVersion_Ver2( info.version );
+        in.entry                = entry.c_str();
+        in.header               = header;
+        in.source               = info.source;
+        in.options              = info.options;
+        in.dbgDescSetIdx        = debugDSIndex;
+        in.fileLoc              = shaderPath;
+        in.shaderDeviceClock    = dbg_feats.shaderDeviceClock;
+        in.shaderSubgroupClock  = dbg_feats.shaderSubgroupClock;
 
         if_unlikely( not spirvCompiler->Compile( in, OUT out ))
         {
@@ -210,17 +247,18 @@ namespace
                     case ESubgroupTypes::Unknown :
                     case ESubgroupTypes::_Last :
                     case ESubgroupTypes::All :
-                    default :                           CHECK( !"unknown type" );
+                    default :                           CHECK_MSG( false, "unknown type" );
                 }
                 END_ENUM_CHECKS();
             }
 
-            if ( dynamic_id.IsEnable() )
-                ext << "#extension GL_ARB_shader_ballot                            : " << (dynamic_id.IsTrue() ? "require" : "enable") << "\n";
+            if ( dynamic_id.IsTrue() )
+                ext << "#extension GL_ARB_shader_ballot                            : require\n";
 
-            // TODO: not supported by glslang?
-            //if ( un_control_flow.IsEnable() and spirvVer >= Version2{1,5} )
-            //  ext << "#extension GL_EXT_subgroupuniform_qualifier                : " << (un_control_flow.IsTrue() ? "require" : "enable") << "\n";
+            if ( un_control_flow.IsTrue() and spirvVer >= Version2{1,3} )
+                ext << "#ifdef GL_EXT_subgroupuniform_qualifier\n"
+                    << "# extension GL_EXT_subgroupuniform_qualifier               : require\n"
+                    << "#endif\n";
 
             //def << "#define AE_MIN_SUBGROUP_SIZE " << ToString( min_size ) << "\n"
             //  << "#define AE_MAX_SUBGROUP_SIZE " << ToString( max_size ) << "\n";
@@ -248,35 +286,40 @@ namespace
                 // TODO: storageBuffer16BitAccess, ...
             }
 
-            if ( shader_int8.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_8bit_storage                      : " << (shader_int8.IsTrue() ? "require" : "enable") << "\n"
-                    << "#extension GL_EXT_shader_explicit_arithmetic_types_int8    : " << (shader_int8.IsTrue() ? "require" : "enable") << "\n";
+            if ( shader_int8.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_8bit_storage                      : require\n"
+                    << "#extension GL_EXT_shader_explicit_arithmetic_types_int8    : require\n"
+                    << "#define AE_ENABLE_BYTE_TYPE 1\n";
             }
-            if ( shader_int16.IsEnable() or shader_float16.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_16bit_storage                     : " << ((shader_int16.IsTrue() or shader_float16.IsTrue()) ? "require" : "enable") << "\n";
+            if ( shader_int16.IsTrue() or shader_float16.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_16bit_storage                     : require\n";
             }
-            if ( shader_int16.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_explicit_arithmetic_types_int16   : " << (shader_int16.IsTrue() ? "require" : "enable") << "\n";
+            if ( shader_int16.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_explicit_arithmetic_types_int16   : require\n"
+                    << "#define AE_ENABLE_SHORT_TYPE 1\n";
             }
-            if ( shader_float16.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_explicit_arithmetic_types_float16 : " << (shader_float16.IsTrue() ? "require" : "enable") << "\n";
+            if ( shader_float16.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_explicit_arithmetic_types_float16 : require\n"
+                    << "#define AE_ENABLE_HALF_TYPE 1\n";
             }
-            if ( shader_int64.IsEnable() ) {
-                ext << "#extension GL_ARB_gpu_shader_int64                         : " << (shader_int64.IsTrue() ? "require" : "enable") << "\n"
-                    << "#extension GL_EXT_shader_explicit_arithmetic_types_int64   : " << (shader_int64.IsTrue() ? "require" : "enable") << "\n";
+            if ( shader_int64.IsTrue() ) {
+                ext << "#extension GL_ARB_gpu_shader_int64                         : require\n"
+                    << "#extension GL_EXT_shader_explicit_arithmetic_types_int64   : require\n"
+                    << "#define AE_ENABLE_LONG_TYPE 1\n";
             }
-            if ( shader_float64.IsEnable() ) {
-                ext << "#extension GL_ARB_gpu_shader_fp64                          : " << (shader_float64.IsTrue() ? "require" : "enable") << "\n"
-                    << "#extension GL_EXT_shader_explicit_arithmetic_types_float64 : " << (shader_float64.IsTrue() ? "require" : "enable") << "\n";
+            if ( shader_float64.IsTrue() ) {
+                ext << "#extension GL_ARB_gpu_shader_fp64                          : require\n"
+                    << "#extension GL_EXT_shader_explicit_arithmetic_types_float64 : require\n"
+                    << "#define AE_ENABLE_DOUBLE_TYPE 1\n";
             }
-            if ( scalar_layout.IsEnable() ) {
-                ext << "#extension GL_EXT_scalar_block_layout                      : " << (scalar_layout.IsTrue() ? "require" : "enable") << "\n";
+            if ( scalar_layout.IsTrue() ) {
+                ext << "#extension GL_EXT_scalar_block_layout                      : require\n";
             }
-            if ( dev_addr_supported.IsEnable() )
+            if ( dev_addr_supported.IsTrue() )
             {
-                ext << "#extension GL_EXT_buffer_reference                         : " << (dev_addr_supported.IsTrue() ? "require" : "enable") << "\n";
-                ext << "#extension GL_EXT_buffer_reference2                        : " << (dev_addr_supported.IsTrue() ? "require" : "enable") << "\n";
-                ext << "#extension GL_EXT_buffer_reference_uvec2                   : " << (dev_addr_supported.IsTrue() ? "require" : "enable") << "\n";
+                ext << "#extension GL_EXT_buffer_reference                         : require\n";
+                ext << "#extension GL_EXT_buffer_reference2                        : require\n";
+                ext << "#extension GL_EXT_buffer_reference_uvec2                   : require\n";
             }
             ext << "#extension GL_EXT_shader_explicit_arithmetic_types_int32   : enable\n"
                 << "#extension GL_EXT_shader_explicit_arithmetic_types_float32 : enable\n";
@@ -328,20 +371,20 @@ namespace
                 atomic_float2.Add( ptr->fs.sparseImageFloat32AtomicMinMax );
             }
 
-            if ( has_atomics.IsEnable() ) {
+            if ( has_atomics.IsTrue() ) {
                 def << "#define AE_HAS_ATOMICS 1\n";
             }
-            if ( storage_i64.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_atomic_int64                      : " << (storage_i64.IsTrue() ? "require" : "enable") << "\n";
+            if ( storage_i64.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_atomic_int64                      : require\n";
             }
-            if ( image_i64.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_image_int64                       : " << (image_i64.IsTrue() ? "require" : "enable") << "\n";
+            if ( image_i64.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_image_int64                       : require\n";
             }
-            if ( atomic_float.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_atomic_float                      : " << (atomic_float.IsTrue() ? "require" : "enable") << "\n";
+            if ( atomic_float.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_atomic_float                      : require\n";
             }
-            if ( atomic_float2.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_atomic_float2                     : " << (atomic_float2.IsTrue() ? "require" : "enable") << "\n";
+            if ( atomic_float2.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_atomic_float2                     : require\n";
             }
         }
 
@@ -356,11 +399,11 @@ namespace
                 subgroup.Add( ptr->fs.shaderSubgroupClock );
             }
 
-            if ( device.IsEnable() ) {
-                ext << "#extension GL_EXT_shader_realtime_clock                    : " << (device.IsTrue() ? "require" : "enable") << "\n";
+            if ( device.IsTrue() ) {
+                ext << "#extension GL_EXT_shader_realtime_clock                    : require\n";
             }
-            if ( subgroup.IsEnable() ) {
-                ext << "#extension GL_ARB_shader_clock                             : " << (subgroup.IsTrue() ? "require" : "enable") << "\n";
+            if ( subgroup.IsTrue() ) {
+                ext << "#extension GL_ARB_shader_clock                             : require\n";
             }
         }
 
@@ -372,8 +415,8 @@ namespace
                 ts_supported.Add( ptr->fs.taskShader );
                 ms_supported.Add( ptr->fs.meshShader );
             }
-            if ( (stage == EShaderStages::MeshTask  and ts_supported.IsEnable()) or
-                 (stage == EShaderStages::Mesh      and ms_supported.IsEnable()) )
+            if ( (stage == EShaderStages::MeshTask  and ts_supported.IsTrue()) or
+                 (stage == EShaderStages::Mesh      and ms_supported.IsTrue()) )
             {
                 CHECK_THROW_MSG(( spirvVer >= Version2{1,4} ));
                 ext << "#extension GL_EXT_mesh_shader                              : require\n";
@@ -388,12 +431,12 @@ namespace
                 rt_supported        .Add( ptr->fs.rayTracingPipeline );
                 prim_cull_supported .Add( ptr->fs.rayTraversalPrimitiveCulling );
             }
-            if ( AnyBits( stage, EShaderStages::AllRayTracing ) and rt_supported.IsEnable() )
+            if ( AnyBits( stage, EShaderStages::AllRayTracing ) and rt_supported.IsTrue() )
             {
                 CHECK_THROW_MSG(( spirvVer >= Version2{1,4} ));
                 ext << "#extension GL_EXT_ray_tracing                              : require\n";
-                if ( prim_cull_supported.IsEnable() )
-                    ext << "#extension GL_EXT_ray_flags_primitive_culling              : " << (prim_cull_supported.IsTrue() ? "require" : "enable") << "\n";
+                if ( prim_cull_supported.IsTrue() )
+                    ext << "#extension GL_EXT_ray_flags_primitive_culling              : require\n";
             }
         }
 
@@ -409,8 +452,8 @@ namespace
                 rq_stages |= ptr->fs.rayQueryStages;
             }
 
-            if ( rq_supported.IsEnable() and AnyBits( rq_stages, stage )) {
-                ext << "#extension GL_EXT_ray_query                                : " << (rq_supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( rq_supported.IsTrue() and AnyBits( rq_stages, stage )) {
+                ext << "#extension GL_EXT_ray_query                                : require\n";
                 def << "#define AE_RAY_QUERY 1\n";
             }
         }
@@ -421,7 +464,7 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.tileShader );
             }
-            if ( stage == EShaderStages::Tile and supported.IsEnable() ) {
+            if ( stage == EShaderStages::Tile and supported.IsTrue() ) {
                 ext << "#extension GL_HUAWEI_subpass_shading                       : require\n";
             }
         }
@@ -433,8 +476,8 @@ namespace
                 supported.Add( ptr->fs.shaderOutputViewportIndex );
                 supported.Add( ptr->fs.shaderOutputLayer );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_ARB_shader_viewport_layer_array              : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_ARB_shader_viewport_layer_array              : require\n";
             }
         }
 
@@ -444,8 +487,8 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.shaderResourceMinLod );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_ARB_sparse_texture_clamp                     : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_ARB_sparse_texture_clamp                     : require\n";
             }
         }
 
@@ -455,8 +498,8 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.shaderSMBuiltinsNV );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_NV_shader_sm_builtins                        : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_NV_shader_sm_builtins                        : require\n";
             }
         }
 
@@ -466,8 +509,8 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.shaderCoreBuiltinsARM );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_ARM_shader_core_builtins                     : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_ARM_shader_core_builtins                     : require\n";
             }
         }
 
@@ -483,8 +526,8 @@ namespace
                 supported.Add( ptr->fs.shaderUniformTexelBufferArrayNonUniformIndexing );
                 supported.Add( ptr->fs.shaderStorageTexelBufferArrayNonUniformIndexing );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_EXT_nonuniform_qualifier                     : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_EXT_nonuniform_qualifier                     : require\n";
             }
         }
 
@@ -496,8 +539,8 @@ namespace
                 supported.Add( ptr->fs.vulkanMemoryModelDeviceScope );
                 supported.Add( ptr->fs.vulkanMemoryModelAvailabilityVisibilityChains );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_KHR_memory_scope_semantics                   : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_KHR_memory_scope_semantics                   : require\n";
                 def << "#define AE_MEM_SCOPE 1\n";
             }
         }
@@ -508,8 +551,8 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.shaderDemoteToHelperInvocation );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_EXT_demote_to_helper_invocation              : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_EXT_demote_to_helper_invocation              : require\n";
             }
         }
 
@@ -521,8 +564,8 @@ namespace
                 supported.Add( ptr->fs.fragmentShaderPixelInterlock );
                 supported.Add( ptr->fs.fragmentShaderShadingRateInterlock );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_ARB_fragment_shader_interlock                : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_ARB_fragment_shader_interlock                : require\n";
             }
         }
 
@@ -534,8 +577,8 @@ namespace
                 supported.Add( ptr->fs.primitiveFragmentShadingRate );
                 supported.Add( ptr->fs.attachmentFragmentShadingRate );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_EXT_fragment_shading_rate                    : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_EXT_fragment_shading_rate                    : require\n";
             }
         }
 
@@ -545,8 +588,8 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.fragmentShaderBarycentric );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_EXT_fragment_shader_barycentric              : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_EXT_fragment_shader_barycentric              : require\n";
             }
         }
 
@@ -556,8 +599,8 @@ namespace
             for (auto& ptr : features) {
                 supported.Add( ptr->fs.multiview );
             }
-            if ( supported.IsEnable() ) {
-                ext << "#extension GL_EXT_multiview                                : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                ext << "#extension GL_EXT_multiview                                : require\n";
             }
         }
 
@@ -566,12 +609,13 @@ namespace
             FeatureSetCounter   supported;
             FeatureSetCounter   supported2;
             for (auto& ptr : features) {
-                supported .Add( ptr->fs.cooperativeMatrix );
+                if ( AllBits( ptr->fs.cooperativeMatrixStages, stage ))
+                    supported .Add( ptr->fs.cooperativeMatrix );
                 supported2.Add( ptr->fs.vulkanMemoryModel );
             }
-            if ( supported.IsEnable() ) {
-                CHECK_THROW_MSG( supported2.IsEnable() );   // required
-                ext << "#extension GL_KHR_cooperative_matrix                       : " << (supported.IsTrue() ? "require" : "enable") << "\n";
+            if ( supported.IsTrue() ) {
+                CHECK_THROW_MSG( supported2.IsTrue() ); // required
+                ext << "#extension GL_KHR_cooperative_matrix                       : require\n";
                 def << "#define AE_COOP_MATRIX 1\n";
             }
         }
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RayTracingShaderBinding.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RayTracingShaderBinding.h
index 13dceef4..dcb38969 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RayTracingShaderBinding.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RayTracingShaderBinding.h
@@ -10,24 +10,24 @@ namespace AE::PipelineCompiler
     {
         uint        value   = 0;
 
-        InstanceIndex () {}
-        explicit InstanceIndex (uint v) : value{v} {}
+        InstanceIndex ()                __NE___ {}
+        explicit InstanceIndex (uint v) __NE___ : value{v} {}
     };
 
     struct RayIndex
     {
         uint        value   = 0;
 
-        RayIndex () {}
-        explicit RayIndex (uint v) : value{v} {}
+        RayIndex ()                     __NE___ {}
+        explicit RayIndex (uint v)      __NE___ : value{v} {}
     };
 
     struct CallableIndex
     {
         uint        value   = 0;
 
-        CallableIndex () {}
-        explicit CallableIndex (uint v) : value{v} {}
+        CallableIndex ()                __NE___ {}
+        explicit CallableIndex (uint v) __NE___ : value{v} {}
     };
 
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.cpp
index f518200a..38dff696 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.cpp
@@ -21,7 +21,7 @@ namespace
     constructor
 =================================================
 */
-    RTBasePass::RTBasePass (RenderTechnique *rtech, const String &name, usize passIdx) __Th___ :
+    RTBasePass::RTBasePass (RenderTechnique* rtech, const String &name, usize passIdx) __Th___ :
         _name{name},
         _passIndex{passIdx},
         _rtech{rtech}
@@ -566,7 +566,7 @@ namespace
                     if ( last_rp.IsDefined() )
                     {
                         CompatibleRenderPassDescPtr compat_rp;
-                        CATCH_ERR( compat_rp = storage.RenderPassExists( last_rp, last_sp ));
+                        NOTHROW_ERR( compat_rp = storage.RenderPassExists( last_rp, last_sp ));
 
                         auto    sp_it = compat_rp->_subpassMap.find( last_sp );
                         CHECK_ERR( sp_it != compat_rp->_subpassMap.end() );
@@ -589,7 +589,7 @@ namespace
                     if ( last_rp.IsDefined() )
                     {
                         CompatibleRenderPassDescPtr compat_rp;
-                        CATCH_ERR( compat_rp = storage.RenderPassExists( last_rp, last_sp ));
+                        NOTHROW_ERR( compat_rp = storage.RenderPassExists( last_rp, last_sp ));
 
                         auto    sp_it = compat_rp->_subpassMap.find( last_sp );
                         CHECK_ERR( sp_it != compat_rp->_subpassMap.end() );
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.h
index 7b192ccf..85e1c999 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/RenderTechnique.h
@@ -45,7 +45,7 @@ namespace AE::PipelineCompiler
     // methods
     public:
         RTBasePass () {}
-        RTBasePass (RenderTechnique *rtech, const String &name, usize passIdx)  __Th___;
+        RTBasePass (RenderTechnique* rtech, const String &name, usize passIdx)  __Th___;
 
         ND_ StringView              Name ()                                     const   { return _name; }
         ND_ usize                   PassIndex ()                                const   { return _passIndex; }
@@ -80,7 +80,7 @@ namespace AE::PipelineCompiler
     // methods
     public:
         RTGraphicsPass () {}
-        RTGraphicsPass (RenderTechnique *rtech, const String &name, usize passIdx) __Th___ : RTBasePass{ rtech, name, passIdx } {}
+        RTGraphicsPass (RenderTechnique* rtech, const String &name, usize passIdx) __Th___ : RTBasePass{ rtech, name, passIdx } {}
 
         void  SetRenderPass (const String &rp, const String &subpass)   __Th___;
 
@@ -118,7 +118,7 @@ namespace AE::PipelineCompiler
     // methods
     public:
         RTComputePass () {}
-        RTComputePass (RenderTechnique *rtech, const String &name, usize passIdx) __Th___ : RTBasePass{ rtech, name, passIdx } {}
+        RTComputePass (RenderTechnique* rtech, const String &name, usize passIdx) __Th___ : RTBasePass{ rtech, name, passIdx } {}
 
         void  SetDSLayout (const String &typeName)              __Th___ { return _SetDSLayout( typeName ); }
 
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptFeatureSet.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptFeatureSet.cpp
index b09eec72..b0ebad14 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptFeatureSet.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptFeatureSet.cpp
@@ -57,7 +57,7 @@ namespace
     template <>             struct FS_ReplaceType< ESubgroupTypes > { using dst = uint; using src = ESubgroupTypes; };
 
     #define AE_FEATURE_SET_VISIT( _type_, _name_, _bits_ ) \
-        static void  Set_FS_ ## _name_ (ScriptFeatureSet *ptr, const typename FS_ReplaceType<_type_>::dst val) {\
+        static void  Set_FS_ ## _name_ (ScriptFeatureSet* ptr, const typename FS_ReplaceType<_type_>::dst val) {\
             ptr->fs._name_ = typename FS_ReplaceType<_type_>::src( val );\
         }
     AE_FEATURE_SET_FIELDS( AE_FEATURE_SET_VISIT )
@@ -73,31 +73,31 @@ namespace
         _visitor_( uint,    maxAccelStructures  );\
         _visitor_( uint,    maxTotalResources   );\
 
-    #define AE_FEATURE_SET_PER_DS_VISIT( _type_, _name_ )   static void  Set_FS_perDescrSet_ ## _name_ (ScriptFeatureSet *ptr, const _type_ val) { ptr->fs.perDescrSet._name_ = val; }
+    #define AE_FEATURE_SET_PER_DS_VISIT( _type_, _name_ )   static void  Set_FS_perDescrSet_ ## _name_ (ScriptFeatureSet* ptr, const _type_ val) { ptr->fs.perDescrSet._name_ = val; }
     AE_FEATURE_SET_PER_DS( AE_FEATURE_SET_PER_DS_VISIT )
     #undef AE_FEATURE_SET_PER_DS_VISIT
 
-    #define AE_FEATURE_SET_PER_DS_VISIT( _type_, _name_ )   static void  Set_FS_perStage_ ## _name_ (ScriptFeatureSet *ptr, const _type_ val) { ptr->fs.perStage._name_ = val; }
+    #define AE_FEATURE_SET_PER_DS_VISIT( _type_, _name_ )   static void  Set_FS_perStage_ ## _name_ (ScriptFeatureSet* ptr, const _type_ val) { ptr->fs.perStage._name_ = val; }
     AE_FEATURE_SET_PER_DS( AE_FEATURE_SET_PER_DS_VISIT )
     #undef AE_FEATURE_SET_PER_DS_VISIT
 
-    static void  FS_AddSubgroupOperation (ScriptFeatureSet *ptr, ESubgroupOperation val) {
+    static void  FS_AddSubgroupOperation (ScriptFeatureSet* ptr, ESubgroupOperation val) {
         ptr->fs.subgroupOperations.insert( val );
     }
 
-    static void  FS_AddSubgroupOperations (ScriptFeatureSet *ptr, const ScriptArray<ESubgroupOperation> &arr)
+    static void  FS_AddSubgroupOperations (ScriptFeatureSet* ptr, const ScriptArray<ESubgroupOperation> &arr)
     {
         for (auto val : arr) {
             ptr->fs.subgroupOperations.insert( val );
         }
     }
 
-    static void  FS_AddSubgroupOperationRange (ScriptFeatureSet *ptr, ESubgroupOperation first, ESubgroupOperation last) {
+    static void  FS_AddSubgroupOperationRange (ScriptFeatureSet* ptr, ESubgroupOperation first, ESubgroupOperation last) {
         CHECK_THROW_MSG( first <= last );
         ptr->fs.subgroupOperations.InsertRange( first, last );
     }
 
-    static void  FS_AddTexelFormats (ScriptFeatureSet *ptr, EFormatFeature features, const ScriptArray<EPixelFormat> &arr) __Th___
+    static void  FS_AddTexelFormats (ScriptFeatureSet* ptr, EFormatFeature features, const ScriptArray<EPixelFormat> &arr) __Th___
     {
         PixelFormatSet_t    set;
         for (auto fmt : arr) {
@@ -130,7 +130,7 @@ namespace
         ptr->fs.attachmentFormats       |= ptr->fs.lossyCompressedAttachmentFormats;
     }
 
-    static void  FS_AddSurfaceFormats (ScriptFeatureSet *ptr, const ScriptArray<ESurfaceFormat> &arr) __Th___
+    static void  FS_AddSurfaceFormats (ScriptFeatureSet* ptr, const ScriptArray<ESurfaceFormat> &arr) __Th___
     {
         for (auto sf : arr)
         {
@@ -139,81 +139,81 @@ namespace
         }
     }
 
-    static void  FS_AddVertexFormats (ScriptFeatureSet *ptr, const ScriptArray<EVertexType> &arr) {
+    static void  FS_AddVertexFormats (ScriptFeatureSet* ptr, const ScriptArray<EVertexType> &arr) {
         for (auto vt : arr) {
             ptr->fs.vertexFormats.insert( vt );
         }
     }
 
-    static void  FS_AddAccelStructVertexFormats (ScriptFeatureSet *ptr, const ScriptArray<EVertexType> &arr) {
+    static void  FS_AddAccelStructVertexFormats (ScriptFeatureSet* ptr, const ScriptArray<EVertexType> &arr) {
         for (auto vt : arr) {
             ptr->fs.accelStructVertexFormats.insert( vt );
         }
     }
 
-    static void  FS_framebufferColorSampleCounts (ScriptFeatureSet *ptr, const ScriptArray<uint> &arr) __Th___
+    static void  FS_framebufferColorSampleCounts (ScriptFeatureSet* ptr, const ScriptArray<uint> &arr) __Th___
     {
-        for (auto val : arr)
+        for (uint val : arr)
         {
             CHECK_THROW_MSG( val > 0 and IsPowerOfTwo( val ));
-            ptr->fs.framebufferColorSampleCounts = SampleCountBits( uint(ptr->fs.framebufferColorSampleCounts) | IntLog2( val ));
+            ptr->fs.framebufferColorSampleCounts = SampleCountBits( uint(ptr->fs.framebufferColorSampleCounts) | val );
         }
     }
 
-    static void  FS_framebufferDepthSampleCounts (ScriptFeatureSet *ptr, const ScriptArray<uint> &arr) __Th___
+    static void  FS_framebufferDepthSampleCounts (ScriptFeatureSet* ptr, const ScriptArray<uint> &arr) __Th___
     {
-        for (auto val : arr)
+        for (uint val : arr)
         {
             CHECK_THROW_MSG( val > 0 and IsPowerOfTwo( val ));
-            ptr->fs.framebufferDepthSampleCounts = SampleCountBits( uint(ptr->fs.framebufferDepthSampleCounts) | IntLog2( val ));
+            ptr->fs.framebufferDepthSampleCounts = SampleCountBits( uint(ptr->fs.framebufferDepthSampleCounts) | val );
         }
     }
 
-    static void  FS_IncludeVendorId (ScriptFeatureSet *ptr, EVendorID val) {
+    static void  FS_IncludeVendorId (ScriptFeatureSet* ptr, EVendorID val) {
         ptr->fs.vendorIds.include.insert( val );
     }
 
-    static void  FS_ExcludeVendorId (ScriptFeatureSet *ptr, EVendorID val) {
+    static void  FS_ExcludeVendorId (ScriptFeatureSet* ptr, EVendorID val) {
         ptr->fs.vendorIds.exclude.insert( val );
     }
 
-    static void  FS_IncludeVendorIds (ScriptFeatureSet *ptr, const ScriptArray<EVendorID> &arr) {
+    static void  FS_IncludeVendorIds (ScriptFeatureSet* ptr, const ScriptArray<EVendorID> &arr) {
         for (auto val : arr) {
             ptr->fs.vendorIds.include.insert( val );
         }
     }
 
-    static void  FS_ExcludeVendorIds (ScriptFeatureSet *ptr, const ScriptArray<EVendorID> &arr) {
+    static void  FS_ExcludeVendorIds (ScriptFeatureSet* ptr, const ScriptArray<EVendorID> &arr) {
         for (auto val : arr) {
             ptr->fs.vendorIds.exclude.insert( val );
         }
     }
 
-    static void  FS_IncludeGraphicsDevice (ScriptFeatureSet *ptr, EGraphicsDeviceID val) {
+    static void  FS_IncludeGraphicsDevice (ScriptFeatureSet* ptr, EGraphicsDeviceID val) {
         ptr->fs.devicesIds.include.insert( val );
     }
 
-    static void  FS_ExcludeGraphicsDevice (ScriptFeatureSet *ptr, EGraphicsDeviceID val) {
+    static void  FS_ExcludeGraphicsDevice (ScriptFeatureSet* ptr, EGraphicsDeviceID val) {
         ptr->fs.devicesIds.exclude.insert( val );
     }
 
-    static void  FS_minSpirvVersion (ScriptFeatureSet *ptr, uint val) {
+    static void  FS_minSpirvVersion (ScriptFeatureSet* ptr, uint val) {
         ptr->fs.maxShaderVersion.spirv = CheckCast<ushort>(val);
     }
 
-    static void  FS_minMetalVersion (ScriptFeatureSet *ptr, uint val) {
+    static void  FS_minMetalVersion (ScriptFeatureSet* ptr, uint val) {
         ptr->fs.maxShaderVersion.metal = CheckCast<ushort>(val);
     }
 
-    static void  FS_supportedQueues (ScriptFeatureSet *ptr, EQueueMask val) {
+    static void  FS_supportedQueues (ScriptFeatureSet* ptr, EQueueMask val) {
         ptr->fs.queues.supported = val;
     }
 
-    static void  FS_requiredQueues (ScriptFeatureSet *ptr, EQueueMask val) {
+    static void  FS_requiredQueues (ScriptFeatureSet* ptr, EQueueMask val) {
         ptr->fs.queues.required = val;
     }
 
-    static void  FS_AddShadingRate (ScriptFeatureSet *ptr, const ScriptArray<uint> &fragSize, const ScriptArray<uint> &samples) __Th___
+    static void  FS_AddShadingRate (ScriptFeatureSet* ptr, const ScriptArray<uint> &fragSize, const ScriptArray<uint> &samples) __Th___
     {
         CHECK_THROW_MSG( fragSize.size() == 2 );
         CHECK_THROW_MSG( fragSize[0] > 0 and fragSize[1] > 0 );
@@ -233,7 +233,7 @@ namespace
     }
 
 
-    static void  FS_fragmentShadingRateTexelSize (ScriptFeatureSet *ptr, const ScriptArray<uint> &minTexelSize, const ScriptArray<uint> &maxTexelSize, uint aspect)
+    static void  FS_fragmentShadingRateTexelSize (ScriptFeatureSet* ptr, const ScriptArray<uint> &minTexelSize, const ScriptArray<uint> &maxTexelSize, uint aspect)
     {
         CHECK_THROW_MSG( minTexelSize.size() == 2 );
         CHECK_THROW_MSG( maxTexelSize.size() == 2 );
@@ -255,19 +255,19 @@ namespace
         ptr->fs.fragmentShadingRateTexelSize.aspect = POTValue{ aspect }.GetPOT();
     }
 
-    static void  FS_MergeMin (ScriptFeatureSet *ptr, ScriptFeatureSet* from) __Th___
+    static void  FS_MergeMin (ScriptFeatureSet* ptr, ScriptFeatureSet* from) __Th___
     {
         CHECK_THROW_MSG( from != null );
         ptr->fs.MergeMin( from->fs );
     }
 
-    static void  FS_MergeMax (ScriptFeatureSet *ptr, ScriptFeatureSet* from) __Th___
+    static void  FS_MergeMax (ScriptFeatureSet* ptr, ScriptFeatureSet* from) __Th___
     {
         CHECK_THROW_MSG( from != null );
         ptr->fs.MergeMax( from->fs );
     }
 
-    static void  FS_Copy (ScriptFeatureSet *ptr, ScriptFeatureSet* from) __Th___
+    static void  FS_Copy (ScriptFeatureSet* ptr, ScriptFeatureSet* from) __Th___
     {
         CHECK_THROW_MSG( from != null );
         ptr->fs = from->fs;
@@ -348,7 +348,7 @@ namespace
             binder.AddValue( "StorageTexelBufferAtomic",    EFormatFeature::StorageTexelBufferAtomic );
             binder.AddValue( "HWCompressedAttachment",      EFormatFeature::HWCompressedAttachment );
             binder.AddValue( "LossyCompressedAttachment",   EFormatFeature::LossyCompressedAttachment );
-            STATIC_ASSERT( uint(EFormatFeature::_Count) == 11 );
+            StaticAssert( uint(EFormatFeature::_Count) == 11 );
         }
         {
             ClassBinder<ScriptFeatureSet>   binder{ se };
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.cpp
index 63b4d14c..d71cf820 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.cpp
@@ -92,9 +92,9 @@ namespace
     static constexpr char   c_Subpass_ExternalIn[]  = "ExternalIn";
     static constexpr char   c_Subpass_ExternalOut[] = "ExternalOut";
 
-    STATIC_ASSERT( SubpassName{c_Subpass_ExternalIn} == Subpass_ExternalIn );
-    STATIC_ASSERT( SubpassName{c_Subpass_ExternalOut} == Subpass_ExternalOut );
-    STATIC_ASSERT( alignof(RPAttachment::ShaderIO) == 4 );
+    StaticAssert( SubpassName{c_Subpass_ExternalIn} == Subpass_ExternalIn );
+    StaticAssert( SubpassName{c_Subpass_ExternalOut} == Subpass_ExternalOut );
+    StaticAssert( alignof(RPAttachment::ShaderIO) == 4 );
 
 } // namespace
 //-----------------------------------------------------------------------------
@@ -1201,7 +1201,7 @@ namespace
                                     " must be <= maxTexelSize" << Base::ToString(min_texel_size) << " in feature sets" );
                                 CHECK_THROW_MSG( ((texel_size.x / texel_size.y) <= aspect) or ((texel_size.y / texel_size.x) <= aspect),
                                     "ShadingRateAttachment '"s << storage.GetName( att_name ) << "' texelSize" << Base::ToString(texel_size) <<
-                                    " aspect must be <= maxAspectRatio(" << Base::ToString(aspect) << ") in feature sets" ); 
+                                    " aspect must be <= maxAspectRatio(" << Base::ToString(aspect) << ") in feature sets" );
                             }
                         }
                         break;
@@ -1391,7 +1391,7 @@ namespace
             binder.Comment( "Fragment shading rate attachment." );
             binder.AddValue( "ShadingRate",     EAttachment::ShadingRate    );
 
-            STATIC_ASSERT( uint(EAttachment::_Count) == 8 );
+            StaticAssert( uint(EAttachment::_Count) == 8 );
         }
 
         // shader IO
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.h
index ed3b9391..c8137462 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptRenderPass.h
@@ -82,7 +82,7 @@ namespace AE::PipelineCompiler
 
     // methods
         RPAttachment () {}
-        RPAttachment (const AttachmentName &name, const CompatibleRenderPassDesc *compat, uint idx) :
+        RPAttachment (const AttachmentName &name, const CompatibleRenderPassDesc* compat, uint idx) :
             index{idx}, _name{name}, _compat{compat} {}
 
         void  AddUsage (const String &subpassName, EAttachment type)                                                __Th___;
@@ -170,7 +170,7 @@ namespace AE::PipelineCompiler
 
     // methods
         RenderPassSpec () {}
-        RenderPassSpec (const RenderPassName &name, const CompatibleRenderPassDesc *compat) : _name{name}, _compat{compat} {}
+        RenderPassSpec (const RenderPassName &name, const CompatibleRenderPassDesc* compat) : _name{name}, _compat{compat} {}
 
         ND_ RPAttachmentSpec*   AddAttachment (const String &attachmentName)    __Th___;
         ND_ RPAttachmentSpecPtr AddAttachment2 (const String &attachmentName)   __Th___;
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptSampler.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptSampler.cpp
index 5ea96da0..a9b9b534 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptSampler.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptSampler.cpp
@@ -36,7 +36,7 @@ namespace
         storage.samplerRefs.push_back( ScriptSamplerPtr{this} );
     }
 
-    ScriptSampler::ScriptSampler (ScriptSampler && other) __NE___ :
+    ScriptSampler::ScriptSampler (ScriptSampler &&other) __NE___ :
         _name{ other._name },
         _desc{ other._desc },
         _features{ RVRef(other._features) }
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptShader.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptShader.cpp
index 5efef456..9a46bcfc 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptShader.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptShader.cpp
@@ -314,7 +314,7 @@ namespace
     Define
 =================================================
 */
-    void  ScriptShader::Define (const String &value) __Th___ 
+    void  ScriptShader::Define (const String &value) __Th___
     {
         _defines << '\n' << value;
     }
@@ -609,7 +609,7 @@ namespace
 
         if ( type == EShader::TessEvaluation ) {
             str << "layout(" << ETessPatch_ToString( _tesPatchMode ) << ", "
-                << ETessSpacing_ToString( _tesPatchSpacing ) << ", " 
+                << ETessSpacing_ToString( _tesPatchSpacing ) << ", "
                 << (_tesFrontFaceCCW ? "ccw" : "cw") << ") in;\n";
         }
 
@@ -805,14 +805,14 @@ namespace
             binder.AddValue( "Isolines",    ETessPatch::Isolines );
             binder.AddValue( "Triangles",   ETessPatch::Triangles );
             binder.AddValue( "Quads",       ETessPatch::Quads );
-            STATIC_ASSERT( uint(ETessPatch::_Count) == 5 );
+            StaticAssert( uint(ETessPatch::_Count) == 5 );
         }{
             EnumBinder<ETessSpacing>    binder{ se };
             binder.Create();
             binder.AddValue( "Equal",           ETessSpacing::Equal );
             binder.AddValue( "FractionalEven",  ETessSpacing::FractionalEven );
             binder.AddValue( "FractionalOdd",   ETessSpacing::FractionalOdd );
-            STATIC_ASSERT( uint(ETessSpacing::_Count) == 4 );
+            StaticAssert( uint(ETessSpacing::_Count) == 4 );
         }
 
         ClassBinder<ScriptShader>   binder{ se };
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.cpp
index 7a8b947a..8e49df5b 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.cpp
@@ -174,7 +174,7 @@ namespace
 
         CHECK_THROW_MSG( ptr );
         CHECK_THROW_MSG( not ptr->HasDynamicArray() );
-        CHECK_THROW_MSG( _buffers.size() < _buffers.capacity(), "vertex buffer overflow" );
+        CHECK_THROW_MSG( _buffers.size() < GraphicsConfig::MaxVertexBuffers, "vertex buffer overflow" );
         CHECK_THROW_MSG( stride == 0 or ptr->StaticSize() <= stride );
 
         Buffer  buf;
@@ -291,7 +291,7 @@ namespace
     {
         Array<VertexInput>  temp_vi;
 
-        for (auto [name, vb] : _buffers)
+        for (auto& [name, vb] : _buffers)
         {
             uint    loc = vb.glslLoc;
             vb.ptr->GetVertexInput( loc, INOUT temp_vi );
@@ -333,7 +333,7 @@ namespace
 
         temp_vb.resize( _buffers.size() );
 
-        for (auto [name, vb] : _buffers)
+        for (auto& [name, vb] : _buffers)
         {
             uint    loc = vb.glslLoc;
             vb.ptr->GetVertexInput( loc, INOUT temp_vi );
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.h
index 84ee654b..9f9e5af1 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ScriptVertexBufferInput.h
@@ -19,10 +19,10 @@ namespace AE::PipelineCompiler
         uint        value   = 0;
 
     // methods
-        VertexDivisor () {}
-        explicit VertexDivisor (uint v) : value{v} {}
+        VertexDivisor ()                                __NE___ {}
+        explicit VertexDivisor (uint v)                 __NE___ : value{v} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
@@ -41,12 +41,12 @@ namespace AE::PipelineCompiler
             uint                    glslLoc     = UMax;
             uint                    mslIndex    = UMax;
             ubyte                   index       = UMax;
-            Bytes16u                stride;
+            Byte16u                 stride;
             EVertexInputRate        rate        = EVertexInputRate::Vertex;
             uint                    divisor     = 0;
         };
 
-        using VB_t          = FixedMap< String, Buffer, GraphicsConfig::MaxVertexBuffers >;
+        using VB_t          = FlatHashMap< String, Buffer >;
         using VertexAttrib  = SerializableGraphicsPipeline::VertexAttrib;
         using VertexInput   = GraphicsPipelineDesc::VertexInput;
         using VertexBuffer  = GraphicsPipelineDesc::VertexBuffer;
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.cpp b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.cpp
index 823180bd..e0fcb3ac 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.cpp
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.cpp
@@ -1378,7 +1378,7 @@ namespace
 
             header  << storage.GetShaderExtensionsGLSL( INOUT spv_ver, EShaderStages::Fragment, _features )
                     << dsl_hdr
-                    << "layout(set=0, binding=0, " 
+                    << "layout(set=0, binding=0, "
                     << (IsStd430( _layout ) ? "std430" : "std140")
                     << ") buffer BufType {\n"
                     << dsl_src
@@ -1482,7 +1482,7 @@ namespace
         if ( field.IsVec() )
         {
             for (ubyte r = 0; r < field.rows; ++r) {
-                str << (r ? ", " : "") << "(_fieldName_ ## _" << vec_field_names[r] << ")"; 
+                str << (r ? ", " : "") << "(_fieldName_ ## _" << vec_field_names[r] << ")";
             }
         }else
         if ( field.IsMat() )
@@ -1499,7 +1499,7 @@ namespace
         if ( field.IsVec() )
         {
             for (ubyte r = 0; r < field.rows; ++r) {
-                str << (r ? ", " : "") << "(_fieldName_ ## _" << vec_field_names[r] << " = (_src_)." << vec_field_names[r] << ")"; 
+                str << (r ? ", " : "") << "(_fieldName_ ## _" << vec_field_names[r] << " = (_src_)." << vec_field_names[r] << ")";
             }
         }else
         if ( field.IsMat() )
@@ -1546,7 +1546,7 @@ namespace
         if ( field.IsVec() )
         {
             for (ubyte r = 0; r < field.rows; ++r) {
-                str << (r ? ", " : "") << "src." << vec_field_names[r]; 
+                str << (r ? ", " : "") << "src." << vec_field_names[r];
             }
         }else
         if ( field.IsMat() )
@@ -1562,7 +1562,7 @@ namespace
         if ( field.IsVec() )
         {
             for (ubyte r = 0; r < field.rows; ++r) {
-                str << (r ? ", " : "") << "src." << vec_field_names[r]; 
+                str << (r ? ", " : "") << "src." << vec_field_names[r];
             }
         }else
         if ( field.IsMat() )
@@ -2304,14 +2304,14 @@ namespace {
             src << ";\n";
 
             if ( not field.IsDynamicArray() )
-                test << "\tSTATIC_ASSERT( offsetof(" << Typename() << ", " << field.name << ") == " << ToString(usize( field.offset )) << " );\n";
+                test << "\tStaticAssert( offsetof(" << Typename() << ", " << field.name << ") == " << ToString(usize( field.offset )) << " );\n";
         }
         src << "\t};\n"
             << "#endif\n"
             << test;
 
         if ( _size > 0 ) {
-            src << "\tSTATIC_ASSERT( sizeof(" << Typename() << ") == " << ToString(usize( AlignUp( _size, _align ))) << " );\n";
+            src << "\tStaticAssert( sizeof(" << Typename() << ") == " << ToString(usize( AlignUp( _size, _align ))) << " );\n";
         }
         src << "\n";
 
@@ -2490,7 +2490,7 @@ namespace {
                 auto&   dst = arr.emplace_back();
                 dst.type    = type;
                 dst.index   = CheckCast<ubyte>(loc++);
-                dst.offset  = Bytes16u{field.offset};
+                dst.offset  = Byte16u{field.offset};
 
                 TestFeature_VertexType( _features, &FeatureSet::vertexFormats, type, "vertexFormats" );  // throw
             }
@@ -2724,7 +2724,7 @@ namespace {
             binder.Comment( "Used as buffer reference in shader. Layout must be same between shaders in single platform.\n"
                             "Reflection to C++ is not enabled, use 'BufferLayout' to enable it." );
             binder.AddValue( "BufferReference", EUsage::BufferReference );
-            STATIC_ASSERT( uint(EUsage::All) == 31 );
+            StaticAssert( uint(EUsage::All) == 31 );
         }
         {
             ClassBinder<ShaderStructType>   binder{ se };
diff --git a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.h b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.h
index d0352202..48a3aa03 100644
--- a/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.h
+++ b/AE/engine/tools/res_pack/pipeline_compiler/ScriptObjects/ShaderStructType.h
@@ -14,10 +14,10 @@ namespace AE::PipelineCompiler
         uint        value   = 0;
 
     // methods
-        ArraySize () {}
-        explicit ArraySize (uint v) : value{v} {}
+        ArraySize ()                                    __NE___ {}
+        explicit ArraySize (uint v)                     __NE___ : value{v} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
@@ -31,10 +31,10 @@ namespace AE::PipelineCompiler
         uint        value   = 0;
 
     // methods
-        Align () {}
-        explicit Align (uint v) : value{v} {}
+        Align ()                                        __NE___ {}
+        explicit Align (uint v)                         __NE___ : value{v} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
diff --git a/AE/engine/tools/res_pack/shader_trace/Impl/Common.h b/AE/engine/tools/res_pack/shader_trace/Impl/Common.h
index b228c425..6002bb19 100644
--- a/AE/engine/tools/res_pack/shader_trace/Impl/Common.h
+++ b/AE/engine/tools/res_pack/shader_trace/Impl/Common.h
@@ -48,7 +48,7 @@ namespace AE::PipelineCompiler
 
 # ifdef AE_ENABLE_GLSLANG
 
-    ND_ String  GetFunctionName (glslang::TIntermOperator *op);
+    ND_ String  GetFunctionName (glslang::TIntermOperator* op);
 
     ND_ bool  ValidateInterm (glslang::TIntermediate &intermediate);
 
@@ -100,7 +100,7 @@ namespace AE::PipelineCompiler
     SourcePoint
 =================================================
 */
-    inline ShaderTrace::SourcePoint::SourcePoint (const glslang::TSourceLoc &loc) :
+    inline ShaderTrace::SourcePoint::SourcePoint (const glslang::TSourceLoc &loc) __NE___ :
         SourcePoint{ uint(loc.line), uint(loc.column) }
     {}
 
diff --git a/AE/engine/tools/res_pack/shader_trace/Impl/InsertFunctionProfiler.cpp b/AE/engine/tools/res_pack/shader_trace/Impl/InsertFunctionProfiler.cpp
index a7067903..838f657b 100644
--- a/AE/engine/tools/res_pack/shader_trace/Impl/InsertFunctionProfiler.cpp
+++ b/AE/engine/tools/res_pack/shader_trace/Impl/InsertFunctionProfiler.cpp
@@ -536,7 +536,7 @@ ND_ static uint  GetVectorSwizzleMask (TIntermBinary* binary)
 
     binary = swizzle_op.back();
 
-    const auto ProcessUnion = [&sw_mask] (TIntermConstantUnion *cu, const Array<uint> &mask) -> bool
+    const auto ProcessUnion = [&sw_mask] (TIntermConstantUnion* cu, const Array<uint> &mask) -> bool
     {
         TConstUnionArray const& cu_arr = cu->getConstArray();
         CHECK_ERR( cu_arr.size() == 1 and cu->getType().getBasicType() == EbtInt );
@@ -3412,7 +3412,7 @@ ND_ static TIntermOperator*  CreateComputeShaderIsDebugInvocation (DebugInfo &db
 =================================================
 */
 ND_ static TIntermOperator*  CreateRayTracingShaderIsDebugInvocation (DebugInfo &dbgInfo)
-{   
+{
     TPublicType     bool_type;  bool_type.init( Default );
     bool_type.basicType         = TBasicType::EbtBool;
     bool_type.qualifier.storage = TStorageQualifier::EvqTemporary;
diff --git a/AE/engine/tools/res_pack/shader_trace/Impl/InsertTraceRecording.cpp b/AE/engine/tools/res_pack/shader_trace/Impl/InsertTraceRecording.cpp
index 445a3c17..3ccee759 100644
--- a/AE/engine/tools/res_pack/shader_trace/Impl/InsertTraceRecording.cpp
+++ b/AE/engine/tools/res_pack/shader_trace/Impl/InsertTraceRecording.cpp
@@ -106,7 +106,7 @@ namespace
         ND_ TIntermAggregate*   GetCurrentFunction ();
 
         ND_ TIntermTyped*       GetInjection ();
-            void                InjectNode (TIntermTyped *node);
+            void                InjectNode (TIntermTyped* node);
 
         ND_ uint                GetSourceLocation (TIntermNode* node, const TSourceLoc &curr, bool setColumnToZero = false);
         ND_ uint                GetCustomSourceLocation (TIntermNode* node, const TSourceLoc &curr);
@@ -224,7 +224,7 @@ TIntermTyped*  DebugInfo::GetInjection ()
     InjectNode
 =================================================
 */
-void  DebugInfo::InjectNode (TIntermTyped *node)
+void  DebugInfo::InjectNode (TIntermTyped* node)
 {
     if ( node == null )
         return;
@@ -472,7 +472,7 @@ ND_ static uint  GetVectorSwizzleMask (TIntermBinary* binary)
 
     binary = swizzle_op.back();
 
-    const auto ProcessUnion = [&sw_mask] (TIntermConstantUnion *cu, const Array<uint> &mask) -> bool
+    const auto ProcessUnion = [&sw_mask] (TIntermConstantUnion* cu, const Array<uint> &mask) -> bool
     {
         TConstUnionArray const& cu_arr = cu->getConstArray();
         CHECK_ERR( cu_arr.size() == 1 and cu->getType().getBasicType() == EbtInt );
@@ -529,9 +529,9 @@ ND_ static uint  GetVectorSwizzleMask (TIntermBinary* binary)
 */
 void  DebugInfo::_GetVariableID (TIntermNode* node, OUT VariableID &id, OUT uint &swizzle)
 {
-    if ( not node )
+    if ( node == null )
     {
-        CHECK( node );
+        CHECK( false );
         return;
     }
 
@@ -1010,7 +1010,7 @@ static void  CreateShaderBuiltinSymbols (TIntermNode*, DebugInfo &dbgInfo)
     const auto  shader              = dbgInfo.GetShaderType();
     const bool  is_compute          = (shader == EShLangCompute or shader == EShLangTask or shader == EShLangMesh);
     const bool  need_invocation_id  = (shader == EShLangGeometry or shader == EShLangTessControl);
-    const bool  need_primitive_id   = (shader == EShLangFragment or shader == EShLangTessControl or shader == EShLangTessEvaluation);
+    const bool  need_primitive_id   = (shader == EShLangTessControl or shader == EShLangTessEvaluation);
     const bool  need_launch_id      = (shader == EShLangRayGen or shader == EShLangIntersect or shader == EShLangAnyHit or
                                        shader == EShLangClosestHit or shader == EShLangMiss or shader == EShLangCallable);
     TSourceLoc  loc     {};
@@ -1847,17 +1847,17 @@ ND_ static TIntermAggregate*  RecordVertexShaderInfo (const TSourceLoc &loc, Deb
     body->setType( TType{EbtVoid} );
 
     // "dbg_AppendToTrace( gl_VertexIndex, location )"
+    if ( auto* vert_index = dbgInfo.GetCachedSymbolNode( "gl_VertexIndex" ))
     {
-        TIntermSymbol*  vert_index  = dbgInfo.GetCachedSymbolNode( "gl_VertexIndex" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( vert_index, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( vert_index, loc );
         if ( auto* fncall = CreateAppendToTrace( vert_index, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_InstanceIndex, location )"
+    if ( auto* instance = dbgInfo.GetCachedSymbolNode( "gl_InstanceIndex" ))
     {
-        TIntermSymbol*  instance    = dbgInfo.GetCachedSymbolNode( "gl_InstanceIndex" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( instance, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( instance, loc );
         if ( auto* fncall = CreateAppendToTrace( instance, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -1884,17 +1884,17 @@ ND_ static TIntermAggregate*  RecordTessControlShaderInfo (const TSourceLoc &loc
     body->setType( TType{EbtVoid} );
 
     // "dbg_AppendToTrace( gl_InvocationID, location )"
+    if ( auto* invocation = dbgInfo.GetCachedSymbolNode( "gl_InvocationID" ))
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_InvocationID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_PrimitiveID, location )"
+    if ( auto* primitive = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveID" ))
     {
-        TIntermSymbol*  primitive   = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( primitive, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( primitive, loc );
         if ( auto* fncall = CreateAppendToTrace( primitive, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -1913,17 +1913,17 @@ ND_ static TIntermAggregate*  RecordTessEvaluationShaderInfo (const TSourceLoc &
     body->setType( TType{EbtVoid} );
 
     // "dbg_AppendToTrace( gl_PrimitiveID, location )"
+    if ( auto* primitive = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveID" ))
     {
-        TIntermSymbol*  primitive   = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( primitive, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( primitive, loc );
         if ( auto* fncall = CreateAppendToTrace( primitive, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_TessCoord, location )"
+    if ( auto* tess_coord = dbgInfo.GetCachedSymbolNode( "gl_TessCoord" ))
     {
-        TIntermSymbol*  tess_coord  = dbgInfo.GetCachedSymbolNode( "gl_TessCoord" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( tess_coord, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( tess_coord, loc );
         if ( auto* fncall = CreateAppendToTrace( tess_coord, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2011,17 +2011,17 @@ ND_ static TIntermAggregate*  RecordGeometryShaderInfo (const TSourceLoc &loc, D
     body->setType( TType{EbtVoid} );
 
     // "dbg_AppendToTrace( gl_InvocationID, location )"
+    if ( auto* invocation = dbgInfo.GetCachedSymbolNode( "gl_InvocationID" ))
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_InvocationID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_PrimitiveIDIn, location )"
+    if ( auto* primitive = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveIDIn" ))
     {
-        TIntermSymbol*  primitive   = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveIDIn" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( primitive, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( primitive, loc );
         if ( auto* fncall = CreateAppendToTrace( primitive, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2041,14 +2041,16 @@ ND_ static TIntermAggregate*  RecordFragmentShaderInfo (const TSourceLoc &loc, D
 
     // "dbg_AppendToTrace( gl_FragCoord, location )"
     {
-        TIntermSymbol*  fragcoord   = dbgInfo.GetCachedSymbolNode( "gl_FragCoord" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( fragcoord, loc );
+        TIntermSymbol*  fragcoord = dbgInfo.GetCachedSymbolNode( "gl_FragCoord" );
+        CHECK_ERR( fragcoord != null );
+
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( fragcoord, loc );
         if ( auto* fncall = CreateAppendToTrace( fragcoord, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_SampleID, location )"
-    if ( TIntermSymbol*  sample_id = dbgInfo.GetCachedSymbolNode( "gl_SampleID" ))
+    if ( auto* sample_id = dbgInfo.GetCachedSymbolNode( "gl_SampleID" ))
     {
         const uint  loc_id = dbgInfo.GetCustomSourceLocation( sample_id, loc );
         if ( auto* fncall = CreateAppendToTrace( sample_id, loc_id, dbgInfo ))
@@ -2056,7 +2058,7 @@ ND_ static TIntermAggregate*  RecordFragmentShaderInfo (const TSourceLoc &loc, D
     }
 
     // "dbg_AppendToTrace( gl_SamplePosition, location )"
-    if ( TIntermSymbol*  sample_pos = dbgInfo.GetCachedSymbolNode( "gl_SamplePosition" ))
+    if ( auto* sample_pos = dbgInfo.GetCachedSymbolNode( "gl_SamplePosition" ))
     {
         const uint  loc_id = dbgInfo.GetCustomSourceLocation( sample_pos, loc );
         if ( auto* fncall = CreateAppendToTrace( sample_pos, loc_id, dbgInfo ))
@@ -2064,15 +2066,15 @@ ND_ static TIntermAggregate*  RecordFragmentShaderInfo (const TSourceLoc &loc, D
     }
 
     // "dbg_AppendToTrace( gl_PrimitiveID, location )"
+    if ( auto* primitive_id = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveID" ))
     {
-        TIntermSymbol*  primitive_id    = dbgInfo.GetCachedSymbolNode( "gl_PrimitiveID" );
-        const uint      loc_id          = dbgInfo.GetCustomSourceLocation( primitive_id, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( primitive_id, loc );
         if ( auto* fncall = CreateAppendToTrace( primitive_id, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_SamplePosition, location )"
-    if ( TIntermSymbol*  layer = dbgInfo.GetCachedSymbolNode( "gl_Layer" ))
+    if ( auto* layer = dbgInfo.GetCachedSymbolNode( "gl_Layer" ))
     {
         const uint  loc_id = dbgInfo.GetCustomSourceLocation( layer, loc );
         if ( auto* fncall = CreateAppendToTrace( layer, loc_id, dbgInfo ))
@@ -2080,7 +2082,7 @@ ND_ static TIntermAggregate*  RecordFragmentShaderInfo (const TSourceLoc &loc, D
     }
 
     // "dbg_AppendToTrace( gl_ViewportIndex, location )"
-    if ( TIntermSymbol*  viewport_idx = dbgInfo.GetCachedSymbolNode( "gl_ViewportIndex" ))
+    if ( auto* viewport_idx = dbgInfo.GetCachedSymbolNode( "gl_ViewportIndex" ))
     {
         const uint  loc_id = dbgInfo.GetCustomSourceLocation( viewport_idx, loc );
         if ( auto* fncall = CreateAppendToTrace( viewport_idx, loc_id, dbgInfo ))
@@ -2111,25 +2113,25 @@ ND_ static TIntermAggregate*  RecordComputeShaderInfo (const TSourceLoc &loc, De
     body->setType( TType{EbtVoid} );
 
     // "dbg_AppendToTrace( gl_GlobalInvocationID, location )"
+    if ( auto* invocation = dbgInfo.GetCachedSymbolNode( "gl_GlobalInvocationID" ))
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_GlobalInvocationID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_LocalInvocationID, location )"
+    if ( auto* invocation = dbgInfo.GetCachedSymbolNode( "gl_LocalInvocationID" ))
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_LocalInvocationID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
 
     // "dbg_AppendToTrace( gl_WorkGroupID, location )"
+    if ( auto* invocation = dbgInfo.GetCachedSymbolNode( "gl_WorkGroupID" ))
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_WorkGroupID" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2165,8 +2167,10 @@ ND_ static TIntermAggregate*  RecordRayGenShaderInfo (const TSourceLoc &loc, Deb
 
     // "dbg_AppendToTrace( gl_LaunchID, location )"
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        TIntermSymbol*  invocation = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
+        CHECK_ERR( invocation != null );
+
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2185,8 +2189,10 @@ ND_ static TIntermAggregate*  RecordHitShaderInfo (const TSourceLoc &loc, DebugI
 
     // "dbg_AppendToTrace( gl_LaunchID, location )"
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        TIntermSymbol*  invocation = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
+        CHECK_ERR( invocation != null );
+
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2321,8 +2327,10 @@ ND_ static TIntermAggregate*  RecordIntersectionShaderInfo (const TSourceLoc &lo
 
     // "dbg_AppendToTrace( gl_LaunchID, location )"
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        TIntermSymbol*  invocation = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
+        CHECK_ERR( invocation != null );
+
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2437,8 +2445,10 @@ ND_ static TIntermAggregate*  RecordMissShaderInfo (const TSourceLoc &loc, Debug
 
     // "dbg_AppendToTrace( gl_LaunchID, location )"
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        TIntermSymbol*  invocation = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
+        CHECK_ERR( invocation != null );
+
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2489,8 +2499,10 @@ ND_ static TIntermAggregate*  RecordCallableShaderInfo (const TSourceLoc &loc, D
 
     // "dbg_AppendToTrace( gl_LaunchID, location )"
     {
-        TIntermSymbol*  invocation  = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
-        const uint      loc_id      = dbgInfo.GetCustomSourceLocation( invocation, loc );
+        TIntermSymbol*  invocation = dbgInfo.GetCachedSymbolNode( "gl_LaunchIDEXT" );
+        CHECK_ERR( invocation != null );
+
+        const uint  loc_id = dbgInfo.GetCustomSourceLocation( invocation, loc );
         if ( auto* fncall = CreateAppendToTrace( invocation, loc_id, dbgInfo ))
             body->getSequence().push_back( fncall );
     }
@@ -2723,7 +2735,7 @@ ND_ static TIntermOperator*  CreateComputeShaderIsDebugInvocation (DebugInfo &db
 =================================================
 */
 ND_ static TIntermOperator*  CreateRayTracingShaderIsDebugInvocation (DebugInfo &dbgInfo)
-{   
+{
     TPublicType     bool_type;  bool_type.init( Default );
     bool_type.basicType         = TBasicType::EbtBool;
     bool_type.qualifier.storage = TStorageQualifier::EvqTemporary;
diff --git a/AE/engine/tools/res_pack/shader_trace/Impl/ParseShaderTrace.cpp b/AE/engine/tools/res_pack/shader_trace/Impl/ParseShaderTrace.cpp
index af7878dc..3fe92ccb 100644
--- a/AE/engine/tools/res_pack/shader_trace/Impl/ParseShaderTrace.cpp
+++ b/AE/engine/tools/res_pack/shader_trace/Impl/ParseShaderTrace.cpp
@@ -43,7 +43,7 @@ namespace
         EbtNumTypes
     };
 #endif
-    STATIC_ASSERT( uint(TBasicType::EbtNumTypes) == 24 );
+    StaticAssert( uint(TBasicType::EbtNumTypes) == 24 );
 
 
     //
@@ -100,10 +100,10 @@ namespace
 
 
     public:
-        ND_ bool  AddState (const ExprInfo &expr, TBasicType type, uint rows, uint cols, const uint *data,
+        ND_ bool  AddState (const ExprInfo &expr, TBasicType type, uint rows, uint cols, const uint* data,
                             const VarNames_t &varNames, const Sources_t &src, ELogFormat format, INOUT String &result);
 
-        ND_ bool  AddTime (const ExprInfo &expr, uint rows, uint cols, const uint *data);
+        ND_ bool  AddTime (const ExprInfo &expr, uint rows, uint cols, const uint* data);
 
         ND_ bool  Flush (const VarNames_t &varNames, const Sources_t &src, ELogFormat format, INOUT String &result);
 
@@ -121,7 +121,7 @@ namespace
     CopyValue
 =================================================
 */
-    inline void  CopyValue (TBasicType type, INOUT Trace::Value &value, uint valueIndex, const uint *data, INOUT uint &dataIndex)
+    inline void  CopyValue (TBasicType type, INOUT Trace::Value &value, uint valueIndex, const uint* data, INOUT uint &dataIndex)
     {
         switch ( type )
         {
@@ -167,7 +167,7 @@ namespace
     Trace::AddState
 =================================================
 */
-    bool  Trace::AddState (const ExprInfo &expr, TBasicType type, uint rows, uint cols, const uint *data,
+    bool  Trace::AddState (const ExprInfo &expr, TBasicType type, uint rows, uint cols, const uint* data,
                            const VarNames_t &varNames, const Sources_t &sources, ELogFormat format,
                            INOUT String &result)
     {
@@ -248,7 +248,7 @@ namespace
     AddTime
 =================================================
 */
-    bool  Trace::AddTime (const ExprInfo &expr, uint, uint, const uint *data)
+    bool  Trace::AddTime (const ExprInfo &expr, uint, uint, const uint* data)
     {
         auto&   fn = _profiling[ &expr ];
 
@@ -604,7 +604,7 @@ namespace
     ParseShaderTrace
 =================================================
 */
-    bool  ShaderTrace::ParseShaderTrace (const void *ptr, const Bytes inMaxSize, ELogFormat format, OUT Array<String> &result) const
+    bool  ShaderTrace::ParseShaderTrace (const void* ptr, const Bytes inMaxSize, ELogFormat format, OUT Array<String> &result) const
     {
         if ( format == Default )
             format = ELogFormat::Text;
diff --git a/AE/engine/tools/res_pack/shader_trace/Impl/ShaderTrace.cpp b/AE/engine/tools/res_pack/shader_trace/Impl/ShaderTrace.cpp
index 35133ca2..55cfb237 100644
--- a/AE/engine/tools/res_pack/shader_trace/Impl/ShaderTrace.cpp
+++ b/AE/engine/tools/res_pack/shader_trace/Impl/ShaderTrace.cpp
@@ -1,7 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "Common.h"
-#include "serializing/ObjectFactory.h"
+#include "serializing/Basic/ObjectFactory.h"
 
 namespace AE::PipelineCompiler
 {
@@ -11,7 +11,7 @@ namespace AE::PipelineCompiler
     ExprInfo
 =================================================
 */
-    bool  ShaderTrace::ExprInfo::operator == (const ExprInfo &rhs) const
+    bool  ShaderTrace::ExprInfo::operator == (const ExprInfo &rhs) C_NE___
     {
         return  (varID      == rhs.varID)   &
                 (swizzle    == rhs.swizzle) &
@@ -27,7 +27,7 @@ namespace AE::PipelineCompiler
     SourceInfo
 =================================================
 */
-    bool  ShaderTrace::SourceInfo::operator == (const SourceInfo &rhs) const
+    bool  ShaderTrace::SourceInfo::operator == (const SourceInfo &rhs) C_NE___
     {
         return  (code       == rhs.code)        &
                 (filename   == rhs.filename)    &
@@ -43,20 +43,20 @@ namespace AE::PipelineCompiler
     SourceLocation
 =================================================
 */
-    ShaderTrace::SourceLocation::SourceLocation (uint sourceId, uint line, uint column) :
+    ShaderTrace::SourceLocation::SourceLocation (uint sourceId, uint line, uint column) __NE___ :
         sourceId{sourceId},
         begin{line, column},
         end{line, column}
     {}
 
-    bool  ShaderTrace::SourceLocation::operator == (const SourceLocation &rhs) const
+    bool  ShaderTrace::SourceLocation::operator == (const SourceLocation &rhs) C_NE___
     {
         return  (sourceId   == rhs.sourceId)    &
                 (begin      == rhs.begin)       &
                 (end        == rhs.end);
     }
 
-    bool  ShaderTrace::SourceLocation::IsNotDefined () const
+    bool  ShaderTrace::SourceLocation::IsNotDefined () C_NE___
     {
         return  (sourceId   == 0)   &
                 (begin._ul  == 0)   &
diff --git a/AE/engine/tools/res_pack/shader_trace/Impl/Utils.cpp b/AE/engine/tools/res_pack/shader_trace/Impl/Utils.cpp
index de10d809..7bf04811 100644
--- a/AE/engine/tools/res_pack/shader_trace/Impl/Utils.cpp
+++ b/AE/engine/tools/res_pack/shader_trace/Impl/Utils.cpp
@@ -11,7 +11,7 @@ namespace AE::PipelineCompiler
     GetFunctionName
 =================================================
 */
-    String  GetFunctionName (TIntermOperator *op)
+    String  GetFunctionName (TIntermOperator* op)
     {
         if ( TIntermAggregate* aggr = op->getAsAggregate(); aggr and aggr->getOp() == TOperator::EOpFunctionCall )
         {
diff --git a/AE/engine/tools/res_pack/shader_trace/Public/ShaderTrace.h b/AE/engine/tools/res_pack/shader_trace/Public/ShaderTrace.h
index e57e45be..ce42ce26 100644
--- a/AE/engine/tools/res_pack/shader_trace/Public/ShaderTrace.h
+++ b/AE/engine/tools/res_pack/shader_trace/Public/ShaderTrace.h
@@ -2,18 +2,16 @@
 /*
     GLSL Trace project.
 
-    old project:
-        https://github.com/azhirnov/glsl_trace
-    new project:
-        https://gitflic.ru/project/azhirnov/as-en/file?file=engine%2Ftools%2Fres_pack%2Fshader_trace
-        https://github.com/azhirnov/as-en/tree/preview/engine/tools/res_pack/shader_trace
-        https://github.com/azhirnov/glsl_trace/tree/v2023
+    [old standalone project](https://github.com/azhirnov/glsl_trace)
+    [new project as part of AsEn](https://github.com/azhirnov/as-en/tree/preview/engine/tools/res_pack/shader_trace)
+    [new project as part of AsEn - mirror](https://gitflic.ru/project/azhirnov/as-en/file?file=engine%2Ftools%2Fres_pack%2Fshader_trace)
+    [new standalone project](https://github.com/azhirnov/glsl_trace/tree/v2023)
 */
 
 #pragma once
 
 #include "base/Utils/FileSystem.h"
-#include "serializing/ISerializable.h"
+#include "serializing/Basic/ISerializable.h"
 
 namespace glslang {
     class TIntermediate;
@@ -30,15 +28,17 @@ namespace AE::PipelineCompiler
     // Shader Trace
     //
 
-    struct ShaderTrace final : public Serializing::ISerializable
+    struct ShaderTrace final :
+        public Serializing::ISerializable,
+        public NothrowAllocatable
     {
     // types
     public:
         enum class ELogFormat : uint
         {
             Unknown,
-            Text,           // as plane text with part of source code 
-            VS_Console,     // compatible with VS outpit, allow navigation to code by click
+            Text,           // as plane text with part of source code
+            VS_Console,     // compatible with VS output, allow navigation to code by click
             VS,             // click to file path will open shader source file
             VSCode,         // click to file path will open shader source file in specified line
             _Count
@@ -54,18 +54,18 @@ namespace AE::PipelineCompiler
             }       _packed;
             ulong   _ul         = UMax;
 
-            SourcePoint () {}
-            SourcePoint (uint line, uint column) : _ul{(ulong(line) << 32) | column } {}
-            explicit SourcePoint (const glslang::TSourceLoc &);
+            SourcePoint ()                                          __NE___ {}
+            SourcePoint (uint line, uint column)                    __NE___ : _ul{(ulong(line) << 32) | column } {}
+            explicit SourcePoint (const glslang::TSourceLoc &)      __NE___;
 
-            ND_ bool  operator == (const SourcePoint &rhs)  const   { return _ul == rhs._ul; }
-            ND_ bool  operator >  (const SourcePoint &rhs)  const   { return _ul >  rhs._ul; }
+            ND_ bool  operator == (const SourcePoint &rhs)          C_NE___ { return _ul == rhs._ul; }
+            ND_ bool  operator >  (const SourcePoint &rhs)          C_NE___ { return _ul >  rhs._ul; }
 
-                void  SetMin (const SourcePoint &rhs)               { _ul = Min( _ul, rhs._ul ); }
-                void  SetMax (const SourcePoint &rhs)               { _ul = Max( _ul, rhs._ul ); }
+                void  SetMin (const SourcePoint &rhs)               __NE___ { _ul = Min( _ul, rhs._ul ); }
+                void  SetMax (const SourcePoint &rhs)               __NE___ { _ul = Max( _ul, rhs._ul ); }
 
-            ND_ uint  Line ()                               const   { return uint(_ul >> 32); }
-            ND_ uint  Column ()                             const   { return uint(_ul & 0xFFFFFFFF); }
+            ND_ uint  Line ()                                       C_NE___ { return uint(_ul >> 32); }
+            ND_ uint  Column ()                                     C_NE___ { return uint(_ul & 0xFFFFFFFF); }
         };
 
         struct SourceLocation
@@ -74,11 +74,11 @@ namespace AE::PipelineCompiler
             SourcePoint     begin;
             SourcePoint     end;
 
-            SourceLocation () {}
-            SourceLocation (uint sourceId, uint line, uint column);
+            SourceLocation ()                                       __NE___ {}
+            SourceLocation (uint sourceId, uint line, uint column)  __NE___;
 
-            ND_ bool  operator == (const SourceLocation &rhs)   const;
-            ND_ bool  IsNotDefined ()                           const;
+            ND_ bool  operator == (const SourceLocation &rhs)       C_NE___;
+            ND_ bool  IsNotDefined ()                               C_NE___;
         };
 
         struct ExprInfo
@@ -89,10 +89,10 @@ namespace AE::PipelineCompiler
             SourcePoint         point;              // location of operator
             Array<VariableID>   vars;               // all variables IDs in this expression
 
-            ExprInfo () = default;
-            ExprInfo (VariableID id, uint sw, const SourceLocation &range, const SourcePoint &pt) : varID{id}, swizzle{sw}, range{range}, point{pt} {} 
+            ExprInfo ()                                             __NE___ = default;
+            ExprInfo (VariableID id, uint sw, const SourceLocation &range, const SourcePoint &pt) __NE___ : varID{id}, swizzle{sw}, range{range}, point{pt} {}
 
-            ND_ bool  operator == (const ExprInfo &rhs) const;
+            ND_ bool  operator == (const ExprInfo &rhs)             C_NE___;
         };
 
         struct SourceInfo
@@ -104,7 +104,7 @@ namespace AE::PipelineCompiler
             uint                firstLine   = 0;
             Array<LineRange>    lines;              // offset in bytes for each line in 'code'
 
-            ND_ bool  operator == (const SourceInfo &rhs) const;
+            ND_ bool  operator == (const SourceInfo &rhs)           C_NE___;
         };
 
         using VarNames_t    = HashMap< VariableID, String >;
@@ -132,12 +132,12 @@ namespace AE::PipelineCompiler
 
     // methods
     public:
-        ShaderTrace () {}
+        ShaderTrace ()                                  __NE___ {}
 
-        ShaderTrace (ShaderTrace &&) = delete;
-        ShaderTrace (const ShaderTrace &) = delete;
-        ShaderTrace& operator = (ShaderTrace &&) = delete;
-        ShaderTrace& operator = (const ShaderTrace &) = delete;
+        ShaderTrace (ShaderTrace &&)                    = delete;
+        ShaderTrace (const ShaderTrace &)               = delete;
+        ShaderTrace& operator = (ShaderTrace &&)        = delete;
+        ShaderTrace& operator = (const ShaderTrace &)   = delete;
 
         // Log all function results, log all function calls, log some operator results.
         // Use 'ParseShaderTrace' to get trace as string.
@@ -151,7 +151,7 @@ namespace AE::PipelineCompiler
         ND_ bool  InsertShaderClockHeatmap (glslang::TIntermediate &, uint descSetIndex);
 
         // Converts binary trace into string.
-        ND_ bool  ParseShaderTrace (const void *ptr, Bytes maxSize, ELogFormat format, OUT Array<String> &result) const;
+        ND_ bool  ParseShaderTrace (const void* ptr, Bytes maxSize, ELogFormat format, OUT Array<String> &result) const;
 
         // Source code required for 'ParseShaderTrace' function.
         void  AddSource (StringView source);
diff --git a/AE/engine/tools/res_pack/shader_trace/Readme.md b/AE/engine/tools/res_pack/shader_trace/Readme.md
index 45fff96c..ca348d96 100644
--- a/AE/engine/tools/res_pack/shader_trace/Readme.md
+++ b/AE/engine/tools/res_pack/shader_trace/Readme.md
@@ -14,7 +14,7 @@ Standalone library for shader trace recording.
 
 ```cpp
 // use glslang to compile shader from source
-// for full source code see 'Device::_Compile()' in 'tests/Vulkan/Device.cpp' 
+// for full source code see 'Device::_Compile()' in 'tests/Vulkan/Device.cpp'
 glslang::TProgram  program;
 ...
 
@@ -166,7 +166,7 @@ VkPhysicalDeviceShaderClockFeaturesKHR  shaderClockFeat;
 ...
 
 // use glslang to compile shader from source
-// for full source code see 'Device::_Compile()' in 'tests/Vulkan/Device.cpp'  
+// for full source code see 'Device::_Compile()' in 'tests/Vulkan/Device.cpp'
 glslang::TProgram  program;
 ...
 
@@ -290,7 +290,7 @@ if ( !shaderClockFeat.shaderDeviceClock )
     return; // not supported
 
 // use glslang to compile shader from source
-// for full source code see 'Device::_Compile()' in 'tests/Vulkan/Device.cpp'  
+// for full source code see 'Device::_Compile()' in 'tests/Vulkan/Device.cpp'
 glslang::TProgram  program;
 ...
 
@@ -355,7 +355,7 @@ Library is already integrated into AsEn Graphics module. See graphics tests as a
 
 To integrate glsl-trace into another program, follow these steps:
 
-**Setup:**</br> 
+**Setup:**</br>
  * Use [glslang](https://github.com/KhronosGroup/glslang) to parse GLSL or HLSL source code and build AST
  * Convert glslang AST to SPIRV and create pipeline for reqular rendering.
  * Create `ShaderTrace` object to store debug information
@@ -367,7 +367,7 @@ To integrate glsl-trace into another program, follow these steps:
  * Convert AST with trace recording to SPIRV and create pipeline for debugging.
 
 
-**To debug draw or compute or ray tracing invocation:**</br> 
+**To debug draw or compute or ray tracing invocation:**</br>
 
  * Bind pipeline that contains shader with inserted trace recording.
  * Bind descriptor set with storage buffer to index `descSetIndex`.
diff --git a/AE/engine/tools/vulkan_ext_emulator/DebugClear.h b/AE/engine/tools/vulkan_ext_emulator/DebugClear.h
index 6d2b1a46..7e7f8826 100644
--- a/AE/engine/tools/vulkan_ext_emulator/DebugClear.h
+++ b/AE/engine/tools/vulkan_ext_emulator/DebugClear.h
@@ -170,7 +170,7 @@
                         VkClearColorValue   color;
 
                         MemCopy( OUT color.float32, &rgba, Sizeof(color.float32) );
-                        STATIC_ASSERT( sizeof(color.float32) == sizeof(rgba) );
+                        StaticAssert( sizeof(color.float32) == sizeof(rgba) );
 
                         emulator.origin_vkCmdClearColorImage( commandBuffer, bar.image, bar.newLayout, &color, 1, &bar.subresourceRange );
                     }
@@ -300,7 +300,7 @@
                         VkClearColorValue   color;
 
                         MemCopy( OUT color.float32, &rgba, Sizeof(color.float32) );
-                        STATIC_ASSERT( sizeof(color.float32) == sizeof(rgba) );
+                        StaticAssert( sizeof(color.float32) == sizeof(rgba) );
 
                         emulator.origin_vkCmdClearColorImage( commandBuffer, bar.image, bar.newLayout, &color, 1, &bar.subresourceRange );
                     }
@@ -654,7 +654,7 @@
             {
                 const RGBA32f   rgba = self.rnd.UniformColor();
                 MemCopy( OUT color.float32, &rgba, Sizeof(color.float32) );
-                STATIC_ASSERT( sizeof(color.float32) == sizeof(rgba) );
+                StaticAssert( sizeof(color.float32) == sizeof(rgba) );
             }
             else
             {
@@ -734,7 +734,7 @@
             const RGBA32f       rgba        = self.rnd.UniformColor();
 
             MemCopy( OUT clear_att.clearValue.color.float32, &rgba, Sizeof(rgba) );
-            STATIC_ASSERT( sizeof(clear_att.clearValue.color.float32) == sizeof(rgba) );
+            StaticAssert( sizeof(clear_att.clearValue.color.float32) == sizeof(rgba) );
 
             clear_att.aspectMask        = VK_IMAGE_ASPECT_COLOR_BIT;
             clear_att.colorAttachment   = idx;
@@ -862,7 +862,7 @@
                 VkClearColorValue   color;
 
                 MemCopy( OUT color.float32, &rgba, Sizeof(color.float32) );
-                STATIC_ASSERT( sizeof(color.float32) == sizeof(rgba) );
+                StaticAssert( sizeof(color.float32) == sizeof(rgba) );
 
                 emulator.origin_vkCmdClearColorImage( commandBuffer, barrier.image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &color, 1, &barrier.subresourceRange );
             }
diff --git a/AE/engine/tools/vulkan_ext_emulator/Synchronization2.h b/AE/engine/tools/vulkan_ext_emulator/Synchronization2.h
index 36042ec3..0dfdae4b 100644
--- a/AE/engine/tools/vulkan_ext_emulator/Synchronization2.h
+++ b/AE/engine/tools/vulkan_ext_emulator/Synchronization2.h
@@ -62,7 +62,7 @@
             VK_PIPELINE_STAGE_2_TASK_SHADER_BIT_EXT | VK_PIPELINE_STAGE_2_MESH_SHADER_BIT_EXT |
             VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR;
 
-        constexpr VkPipelineStageFlags2     copy_stages = 
+        constexpr VkPipelineStageFlags2     copy_stages =
             VK_PIPELINE_STAGE_2_COPY_BIT | VK_PIPELINE_STAGE_2_RESOLVE_BIT | VK_PIPELINE_STAGE_2_CLEAR_BIT |
             VK_PIPELINE_STAGE_2_BLIT_BIT | VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT;
 
@@ -263,7 +263,7 @@
             dst_stages = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
 
         emulator.origin_vkCmdPipelineBarrier(
-            commandBuffer, src_stages, dst_stages, deps_flags, 
+            commandBuffer, src_stages, dst_stages, deps_flags,
             ((mem_barrier.srcAccessMask != 0) or (mem_barrier.dstAccessMask != 0) ? 1 : 0), &mem_barrier,
             uint(buffer_barriers.size()), buffer_barriers.data(),
             uint(image_barriers.size()), image_barriers.data() );
diff --git a/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.cpp b/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.cpp
index 6fe0f04d..2f164f0d 100644
--- a/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.cpp
+++ b/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.cpp
@@ -62,7 +62,7 @@ namespace
     AE_BIT_OPERATORS( EFeatures );
 
     using SemaphoreID   = HandleTmpl< 32, 32, 0x654145 >;
-    STATIC_ASSERT( sizeof(SemaphoreID) == sizeof(VkSemaphore) );
+    StaticAssert( sizeof(SemaphoreID) == sizeof(VkSemaphore) );
 
 
 
@@ -140,7 +140,7 @@ namespace
 
     // methods
     public:
-        explicit VulkanEmulation (VulkanDeviceFnTable *fnTable)                             __NE___ : VulkanDeviceFn{fnTable} {}
+        explicit VulkanEmulation (VulkanDeviceFnTable* fnTable)                             __NE___ : VulkanDeviceFn{fnTable} {}
 
         void  InitDeviceInfo (VkPhysicalDevice physicalDevice, INOUT PhysDevInfo& info)     __NE___;
 
@@ -181,7 +181,7 @@ namespace
         if ( origin_vkEnumerateDeviceExtensionProperties( physicalDevice, null, OUT &prop_count, null ) == VK_SUCCESS )
         {
             Array< VkExtensionProperties >  ext_props;
-            CATCH_ERRV( ext_props.resize( prop_count ));
+            NOTHROW_ERRV( ext_props.resize( prop_count ));
 
             VK_CHECK( origin_vkEnumerateDeviceExtensionProperties( physicalDevice, null, OUT &prop_count, OUT ext_props.data() ));
 
@@ -429,7 +429,7 @@ namespace
         Array< const char* >    extensions;
         if ( dev_ci.ppEnabledExtensionNames != null and dev_ci.enabledExtensionCount > 0 )
         {
-            CATCH_ERR( extensions.assign( dev_ci.ppEnabledExtensionNames, dev_ci.ppEnabledExtensionNames + dev_ci.enabledExtensionCount ),
+            NOTHROW_ERR( extensions.assign( dev_ci.ppEnabledExtensionNames, dev_ci.ppEnabledExtensionNames + dev_ci.enabledExtensionCount ),
                        VK_RESULT_MAX_ENUM );
 
             for (usize i = 0; i < extensions.size(); ++i)
@@ -752,7 +752,7 @@ namespace
     Wrap_vkGetDeviceProcAddr
 =================================================
 */
-    VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL Wrap_vkGetDeviceProcAddr (VkDevice device, const char *pName)
+    VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL Wrap_vkGetDeviceProcAddr (VkDevice device, const char* pName)
     {
         CHECK_ERR( pName != null );
 
@@ -776,7 +776,7 @@ namespace
     constructor
 =================================================
 */
-    VulkanExtEmulation::VulkanExtEmulation (VulkanDeviceFnTable *fnTable) __NE___
+    VulkanExtEmulation::VulkanExtEmulation (VulkanDeviceFnTable* fnTable) __NE___
     {
         auto&   emulator = VulkanEmulation::Get();
         PlacementNew<VulkanEmulation>( OUT &emulator, fnTable );
diff --git a/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.h b/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.h
index 341d1fcf..78a1efd0 100644
--- a/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.h
+++ b/AE/engine/tools/vulkan_ext_emulator/VulkanExtEmulation.h
@@ -17,7 +17,7 @@ namespace AE::Graphics
     class VulkanExtEmulation
     {
     public:
-        explicit VulkanExtEmulation (VulkanDeviceFnTable *fnTable)      __NE___;
+        explicit VulkanExtEmulation (VulkanDeviceFnTable* fnTable)      __NE___;
         ~VulkanExtEmulation ()                                          __NE___;
 
         void  OnInitialize ()                                           __NE___;    // after  VulkanLoader::Initialize()
diff --git a/AE/engine/tools/vulkan_header_gen/EnumToString.cpp b/AE/engine/tools/vulkan_header_gen/EnumToString.cpp
index 69319984..0ae2b910 100644
--- a/AE/engine/tools/vulkan_header_gen/EnumToString.cpp
+++ b/AE/engine/tools/vulkan_header_gen/EnumToString.cpp
@@ -71,7 +71,7 @@ namespace
             HashSet<StringView>     values;
 
             for (auto it = fields.begin(); it != fields.end();)
-            {   
+            {
                 if ( not values.insert( it->value ).second )
                 {
                     AE_LOGI( "Removed duplicated enum: "s << it->name << " = " << it->value );
@@ -144,7 +144,7 @@ namespace
         };
 
         const char*     req_const_set[] = { "VkPipelineStageFlagBits2", "VkAccessFlagBits2" };
-        const char*     ext_names[]     = { "_EXT", "_KHR", "_AMD", "_NV", "_NVX", "_HUAWEI", "_QCOM", 
+        const char*     ext_names[]     = { "_EXT", "_KHR", "_AMD", "_NV", "_NVX", "_HUAWEI", "_QCOM",
                                             "_BIT" };
         const char*     except_str[]    = { "_MAX_ENUM" };
         usize           prefix_size     = 0;
diff --git a/AE/engine/tools/vulkan_header_gen/GenVulkanLoaders.cpp b/AE/engine/tools/vulkan_header_gen/GenVulkanLoaders.cpp
index 91290c5f..c78c9b4a 100644
--- a/AE/engine/tools/vulkan_header_gen/GenVulkanLoaders.cpp
+++ b/AE/engine/tools/vulkan_header_gen/GenVulkanLoaders.cpp
@@ -441,6 +441,9 @@ namespace AE::Vulkan
 
             { "deviceGroupCreation",            VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME,                {1,1},  {1,0},  {} },
             { "deviceProps2",                   VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,     {1,1},  {1,0},  {} },
+
+        // extensions //
+            { "portabilityEnum",                VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME,              NoVer,  {1,0},  {} },
         };
 
         const FeatureInfo   deviceFeatures[] =
@@ -525,6 +528,7 @@ namespace AE::Vulkan
             { "rasterOrderAttachment",          VK_EXT_RASTERIZATION_ORDER_ATTACHMENT_ACCESS_EXTENSION_NAME,NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
         //  { "maintenance5",                   VK_KHR_MAINTENANCE_5_EXTENSION_NAME,                        NoVer,  {1,1},  {VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME} },
             { "cooperativeMatrix",              VK_KHR_COOPERATIVE_MATRIX_EXTENSION_NAME,                   NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
+            { "nonSeamlessCubeMap",             VK_EXT_NON_SEAMLESS_CUBE_MAP_EXTENSION_NAME,                NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
 
         // shaders //
             { "fragShaderInterlock",            VK_EXT_FRAGMENT_SHADER_INTERLOCK_EXTENSION_NAME,            NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
@@ -534,6 +538,7 @@ namespace AE::Vulkan
             { "shaderSubgroupUniformControlFlow",VK_KHR_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_EXTENSION_NAME,NoVer,  {1,1},  {} },
             { "workgroupMemExplicitLayout",     VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME,     NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
             { "shaderImageAtomicInt64",         VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME,            NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
+            { "pplnExecProps",                  VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_EXTENSION_NAME,       NoVer,  {1,0},  {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME} },
 
         // queue priority //
             { "queueGlobalPriority",            VK_KHR_GLOBAL_PRIORITY_EXTENSION_NAME,                      NoVer,  {1,0},  {} },
@@ -1082,7 +1087,7 @@ namespace AE::Vulkan
                 continue;
 
             str << "\t\t_extensions." << feat.shortName;
-            AppendToString( INOUT str, feats.maxNameLen - feat.shortName.size() ); 
+            AppendToString( INOUT str, feats.maxNameLen - feat.shortName.size() );
             str << " = ";
 
             bool    has_ver_check = false;
diff --git a/AE/engine/tools/vulkan_image_zcurve/VulkanImageZCurve.cpp b/AE/engine/tools/vulkan_image_zcurve/VulkanImageZCurve.cpp
index 46acf4ad..b3c56b39 100644
--- a/AE/engine/tools/vulkan_image_zcurve/VulkanImageZCurve.cpp
+++ b/AE/engine/tools/vulkan_image_zcurve/VulkanImageZCurve.cpp
@@ -37,8 +37,8 @@ static void  PrintImageZCurve (const VDevice &dev, EPixelFormat fmt, bool printS
     const auto&     fmt_info        = EPixelFormat_GetInfo( fmt );
     CHECK_ERRV( not fmt_info.IsCompressed() );
     CHECK_ERRV( fmt_info.BytesPerPixel() == SizeOf<T> );
-    STATIC_ASSERT( IsUnsignedInteger<T> );
-    STATIC_ASSERT( sizeof(T) >= sizeof(ushort) );
+    StaticAssert( IsUnsignedInteger<T> );
+    StaticAssert( sizeof(T) >= sizeof(ushort) );
 
     // create staging buffer
     VkBuffer        staging_buffer  = VK_NULL_HANDLE;
diff --git a/AE/engine/tools/vulkan_sync_log/VulkanSyncLog.cpp b/AE/engine/tools/vulkan_sync_log/VulkanSyncLog.cpp
index e6aa6c13..d78b5e29 100644
--- a/AE/engine/tools/vulkan_sync_log/VulkanSyncLog.cpp
+++ b/AE/engine/tools/vulkan_sync_log/VulkanSyncLog.cpp
@@ -29,7 +29,7 @@ namespace
 #        include "vulkan_loader/fn_vulkan_dev.h"
 #       undef  VKLOADER_STAGE_FNPOINTER
     };
-    STATIC_ASSERT( sizeof(DeviceFnTable) == sizeof(VulkanDeviceFnTable) );
+    StaticAssert( sizeof(DeviceFnTable) == sizeof(VulkanDeviceFnTable) );
 
 
 
@@ -168,14 +168,20 @@ namespace
                 RayTracing,
             };
 
-            VkPipeline  pipeline    = Default;
-            EType       type        = EType::Unknown;
-            String      name;
+            VkPipeline          pipeline    = Default;
+            VkPipelineLayout    layout      = Default;
+            EType               type        = EType::Unknown;
+            String              name;
         };
         using PipelineMap_t = FlatHashMap< VkPipeline, PipelineData >;
 
 
-        using DescrSetArray_t = Array< VkDescriptorSet >;
+        struct DescSetAndPplnLayout
+        {
+            VkDescriptorSet     descSet;
+            VkPipelineLayout    layout;
+        };
+        using DescrSetArray_t = Array< DescSetAndPplnLayout >;
 
         struct CommandBufferData
         {
@@ -212,9 +218,10 @@ namespace
         using CommandPoolMap_t = FlatHashMap< VkCommandPool, CommandPoolData >;
 
 
-        using SemaphoreNameMap_t    = FlatHashMap< VkSemaphore, String >;
-        using FenceNameMap_t        = FlatHashMap< VkFence,     String >;
-        using QueueNameMap_t        = FlatHashMap< VkQueue,     String >;
+        using SemaphoreNameMap_t        = FlatHashMap< VkSemaphore, String >;
+        using FenceNameMap_t            = FlatHashMap< VkFence,     String >;
+        using QueueNameMap_t            = FlatHashMap< VkQueue,     String >;
+        using PipelineLayoutNameMap_t   = FlatHashMap< VkPipelineLayout, String >;
 
 
         struct ResourceStatistic
@@ -245,6 +252,7 @@ namespace
         QueueNameMap_t          queueMap;
         SemaphoreNameMap_t      semaphoreMap;
         FenceNameMap_t          fenceMap;
+        PipelineLayoutNameMap_t pplnLayoutMap;
         CommandPoolMap_t        commandPool;
         CommandBufferMap_t      commandBuffers;
         ImageMap_t              imageMap;
@@ -268,6 +276,8 @@ namespace
 
     // methods
     public:
+        VulkanLogger () __NE___ {}
+
         void  Initialize (INOUT VulkanDeviceFnTable& fnTable, FlatHashMap<VkQueue, String> queueNames);
         void  Deinitialize (OUT VulkanDeviceFnTable& fnTable);
 
@@ -718,6 +728,7 @@ namespace
         {
             auto& ppln      = logger.pipelineMap.insert_or_assign( pPipelines[i], VulkanLogger::PipelineData{} ).first->second;
             ppln.pipeline   = pPipelines[i];
+            ppln.layout     = pCreateInfos[i].layout;
             ppln.type       = VulkanLogger::PipelineData::EType::Graphics;
             ppln.name       = "graphics-ppln-" + ToString( logger.resourceStat.pipelineCount );
             ++logger.resourceStat.pipelineCount;
@@ -745,6 +756,7 @@ namespace
         {
             auto& ppln      = logger.pipelineMap.insert_or_assign( pPipelines[i], VulkanLogger::PipelineData{} ).first->second;
             ppln.pipeline   = pPipelines[i];
+            ppln.layout     = pCreateInfos[i].layout;
             ppln.type       = VulkanLogger::PipelineData::EType::Compute;
             ppln.name       = "compute-ppln-" + ToString( logger.resourceStat.pipelineCount );
             ++logger.resourceStat.pipelineCount;
@@ -772,7 +784,8 @@ namespace
         {
             auto& ppln      = logger.pipelineMap.insert_or_assign( pPipelines[i], VulkanLogger::PipelineData{} ).first->second;
             ppln.pipeline   = pPipelines[i];
-            ppln.type       = VulkanLogger::PipelineData::EType::Compute;
+            ppln.layout     = pCreateInfos[i].layout;
+            ppln.type       = VulkanLogger::PipelineData::EType::RayTracing;
             ppln.name       = "ray-tracing-ppln-" + ToString( logger.resourceStat.pipelineCount );
             ++logger.resourceStat.pipelineCount;
         }
@@ -1607,21 +1620,25 @@ namespace
                 break;
             }
 
-            case VK_OBJECT_TYPE_SEMAPHORE :
-            {
+            case VK_OBJECT_TYPE_SEMAPHORE : {
                 logger.semaphoreMap[ VBitCast<VkSemaphore>(pNameInfo->objectHandle) ] = pNameInfo->pObjectName;
                 break;
             }
-
-            case VK_OBJECT_TYPE_FENCE :
-            {
+            case VK_OBJECT_TYPE_FENCE : {
                 logger.fenceMap[ VBitCast<VkFence>(pNameInfo->objectHandle) ] = pNameInfo->pObjectName;
                 break;
             }
+            case VK_OBJECT_TYPE_QUEUE : {
+                logger.queueMap[ VBitCast<VkQueue>(pNameInfo->objectHandle) ] = pNameInfo->pObjectName;
+                break;
+            }
+            case VK_OBJECT_TYPE_PIPELINE_LAYOUT : {
+                logger.pplnLayoutMap[ VBitCast<VkPipelineLayout>(pNameInfo->objectHandle) ] = pNameInfo->pObjectName;
+                break;
+            }
 
             case VK_OBJECT_TYPE_UNKNOWN :
             case VK_OBJECT_TYPE_DEVICE :
-            case VK_OBJECT_TYPE_QUEUE :
             case VK_OBJECT_TYPE_INSTANCE :
             case VK_OBJECT_TYPE_PHYSICAL_DEVICE :
             case VK_OBJECT_TYPE_DEVICE_MEMORY :
@@ -1632,7 +1649,6 @@ namespace
             case VK_OBJECT_TYPE_DESCRIPTOR_SET :
             case VK_OBJECT_TYPE_SHADER_MODULE :
             case VK_OBJECT_TYPE_PIPELINE_CACHE :
-            case VK_OBJECT_TYPE_PIPELINE_LAYOUT :
             case VK_OBJECT_TYPE_COMMAND_POOL :
             case VK_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION :
             case VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE :
@@ -1664,6 +1680,55 @@ namespace
         return logger.vkSetDebugUtilsObjectNameEXT( device, pNameInfo );
     }
 
+/*
+=================================================
+    MipmapsToString / ArrayLayersToString
+=================================================
+*/
+    static void  MipmapsToString (INOUT String &log, StringView prefix, uint baseMipLevel, uint levelCount, uint maxMipmaps, bool packed = false)
+    {
+        if ( (baseMipLevel == 0 and levelCount == VK_REMAINING_MIP_LEVELS) or maxMipmaps == 1 )
+            return;
+
+        if ( levelCount == 1 or
+             (levelCount == VK_REMAINING_MIP_LEVELS and baseMipLevel+1 == maxMipmaps) )
+        {
+            log << prefix << "mipmap:" << (packed ? "" : "  ") << ToString( baseMipLevel );
+        }else{
+            log << prefix << "mipmaps:" << (packed ? "" : " ") << '[' << ToString( baseMipLevel ) << ", "
+                << (levelCount == VK_REMAINING_MIP_LEVELS ? "Remaining"s : ToString( baseMipLevel + levelCount )) << ')';
+        }
+    }
+
+    ND_ static String  MipmapsToString (StringView prefix, uint baseMipLevel, uint levelCount, uint maxMipmaps, bool packed)
+    {
+        String  str;
+        MipmapsToString( str, prefix, baseMipLevel, levelCount, maxMipmaps, packed );
+        return str;
+    }
+
+    static void  ArrayLayersToString (INOUT String &log, StringView prefix, uint baseArrayLayer, uint layerCount, uint maxLayers, bool packed = false)
+    {
+        if ( (baseArrayLayer == 0 and layerCount == VK_REMAINING_ARRAY_LAYERS) or maxLayers == 1 )
+            return;
+
+        if ( layerCount == 1 or
+             (layerCount == VK_REMAINING_MIP_LEVELS and baseArrayLayer+1 == maxLayers) )
+        {
+            log << prefix << "layer:" << (packed ? "" : "   ") << ToString( baseArrayLayer );
+        }else{
+            log << prefix << "layers:" << (packed ? "" : "  ") << '[' << ToString( baseArrayLayer ) << ", "
+                << (layerCount == VK_REMAINING_ARRAY_LAYERS ? "Remaining"s : ToString( baseArrayLayer + layerCount )) << ')';
+        }
+    }
+
+    ND_ static String  ArrayLayersToString (StringView prefix, uint baseArrayLayer, uint layerCount, uint maxLayers, bool packed)
+    {
+        String  str;
+        ArrayLayersToString( str, prefix, baseArrayLayer, layerCount, maxLayers, packed );
+        return str;
+    }
+
 /*
 =================================================
     Wrap_vkCmdPipelineBarrier
@@ -1691,83 +1756,78 @@ namespace
         if ( not EndsWith( log, "\n\n" ))
             log << '\n';
 
-        log << "  PipelineBarrier\n";
-        log << "    stage:           " << VkPipelineStageToString( srcStageMask ) << " ---> " << VkPipelineStageToString( dstStageMask ) << '\n';
-        log << "    dependencyFlags: " << VkDependencyFlagsToString( dependencyFlags ) << "\n";
+        log << "  PipelineBarrier";
+        log << "\n    stage:           " << VkPipelineStageToString( srcStageMask ) << " ---> " << VkPipelineStageToString( dstStageMask );
+        log << "\n    dependencyFlags: " << VkDependencyFlagsToString( dependencyFlags );
 
         for (uint i = 0; i < memoryBarrierCount; ++i)
         {
             auto&   barrier = pMemoryBarriers[i];
             ASSERT( barrier.pNext == null );
-            log << "    MemoryBarrier:\n";
-            log << "      access: " << VkAccessFlagsToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlagsToString( barrier.dstAccessMask ) << '\n';
+            log << "\n    MemoryBarrier:";
+            log << "\n      access: " << VkAccessFlagsToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlagsToString( barrier.dstAccessMask );
         }
 
         for (uint i = 0; i < bufferMemoryBarrierCount; ++i)
         {
             auto&   barrier = pBufferMemoryBarriers[i];
             ASSERT( barrier.pNext == null );
-            log << "    BufferBarrier:\n";
+            log << "\n    BufferBarrier:";
 
             auto    buf = logger.bufferMap.find( barrier.buffer );
 
             if ( buf != logger.bufferMap.end() )
-                log << "      name:   '" << buf->second.name << "'\n";
+                log << "\n      name:   '" << buf->second.name << "'";
 
-            log << "      access: " << VkAccessFlagsToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlagsToString( barrier.dstAccessMask ) << '\n';
+            log << "\n      access: " << VkAccessFlagsToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlagsToString( barrier.dstAccessMask );
 
             if ( not (barrier.offset == 0 and barrier.size == VK_WHOLE_SIZE) )
-                log << "      range:  [" << ToString( Bytes{barrier.offset} ) << ", " << (barrier.size == VK_WHOLE_SIZE ? "whole" : ToString( Bytes{barrier.offset + barrier.size} )) << ")\n";
+                log << "\n      range:  [" << ToString( Bytes{barrier.offset} ) << ", " << (barrier.size == VK_WHOLE_SIZE ? "whole" : ToString( Bytes{barrier.offset + barrier.size} )) << ')';
 
             if ( barrier.srcQueueFamilyIndex != barrier.dstQueueFamilyIndex )
             {
-                log << "      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
+                log << "\n      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
                     << (cmdbuf->queueFamilyIndex == barrier.srcQueueFamilyIndex ? "  (release)" :
-                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "") << '\n';
+                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "");
             }
         }
 
         for (uint i = 0; i < imageMemoryBarrierCount; ++i)
         {
             auto&   barrier = pImageMemoryBarriers[i];
+            auto&   subres  = barrier.subresourceRange;
             ASSERT( barrier.pNext == null );
-            log << "    ImageBarrier:\n";
+            log << "\n    ImageBarrier:";
 
-            auto    img = logger.imageMap.find( barrier.image );
+            auto                img     = logger.imageMap.find( barrier.image );
+            VkImageCreateInfo   img_ci  = {};
             if ( img != logger.imageMap.end() )
-                log << "      name:    '" << img->second.name << "'\n";
-
-            log << "      layout:  " << VkImageLayoutToString( barrier.oldLayout );
+            {
+                img_ci = img->second.info;
+                log << "\n      name:    '" << img->second.name << "'";
+            }
+            log << "\n      layout:  " << VkImageLayoutToString( barrier.oldLayout );
 
             if ( barrier.oldLayout != barrier.newLayout )
                 log << " ---> " << VkImageLayoutToString( barrier.newLayout );
 
-            log << '\n';
-            log << "      access:  " << VkAccessFlagsToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlagsToString( barrier.dstAccessMask ) << '\n';
-            log << "      aspect:  " << VkImageAspectFlagsToString( barrier.subresourceRange.aspectMask ) << '\n';
+            log << "\n      access:  " << VkAccessFlagsToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlagsToString( barrier.dstAccessMask );
+            log << "\n      aspect:  " << VkImageAspectFlagsToString( subres.aspectMask );
 
-            if ( not (barrier.subresourceRange.baseMipLevel == 0 and barrier.subresourceRange.levelCount == VK_REMAINING_MIP_LEVELS) )
-            {
-                log << "      mipmaps: [" << ToString( barrier.subresourceRange.baseMipLevel ) << ", " 
-                    << (barrier.subresourceRange.levelCount == VK_REMAINING_MIP_LEVELS ? "whole" : ToString( barrier.subresourceRange.baseMipLevel + barrier.subresourceRange.levelCount )) << ")\n";
-            }
-            if ( not (barrier.subresourceRange.baseArrayLayer == 0 and barrier.subresourceRange.layerCount == VK_REMAINING_ARRAY_LAYERS) )
-            {
-                log << "      layers:  [" << ToString( barrier.subresourceRange.baseArrayLayer ) << ", "
-                    << (barrier.subresourceRange.layerCount == VK_REMAINING_ARRAY_LAYERS ? "whole" : ToString( barrier.subresourceRange.baseArrayLayer + barrier.subresourceRange.layerCount )) << ")\n";
-            }
+            MipmapsToString( INOUT log, "\n      ", subres.baseMipLevel, subres.levelCount, img_ci.mipLevels );
+            ArrayLayersToString( INOUT log, "\n      ", subres.baseArrayLayer, subres.layerCount, img_ci.arrayLayers );
 
             if ( barrier.srcQueueFamilyIndex != barrier.dstQueueFamilyIndex )
             {
-                log << "      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
+                log << "\n      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
                     << (cmdbuf->queueFamilyIndex == barrier.srcQueueFamilyIndex ? "  (release)" :
-                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "") << '\n';
+                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "");
             }
         }
         #if ENABLE_SEQNO
-        log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
+        log << "\n    seq_no: " << ToString( cmdbuf->cmdIndex );
         #endif
-        log << "  ----------\n\n";
+        log << "\n  ----------\n\n";
     }
 
 /*
@@ -1793,87 +1853,81 @@ namespace
         if ( not EndsWith( log, "\n\n" ))
             log << '\n';
 
-        log << "  PipelineBarrier2\n";
+        log << "  PipelineBarrier2";
 
         if ( pInfo == null )
             return;
 
-        log << "    dependencyFlags: " << VkDependencyFlagsToString( pInfo->dependencyFlags ) << "\n";
+        log << "\n    dependencyFlags: " << VkDependencyFlagsToString( pInfo->dependencyFlags );
 
         for (uint i = 0; i < pInfo->memoryBarrierCount; ++i)
         {
             auto&   barrier = pInfo->pMemoryBarriers[i];
             ASSERT( barrier.pNext == null );
-            log << "    MemoryBarrier:\n";
-            log << "      stage:  " << VkPipelineStage2ToString( barrier.srcStageMask ) << " ---> " << VkPipelineStage2ToString( barrier.dstStageMask ) << '\n';
-            log << "      access: " << VkAccessFlags2ToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlags2ToString( barrier.dstAccessMask ) << '\n';
+            log << "\n    MemoryBarrier:";
+            log << "\n      stage:  " << VkPipelineStage2ToString( barrier.srcStageMask ) << " ---> " << VkPipelineStage2ToString( barrier.dstStageMask );
+            log << "\n      access: " << VkAccessFlags2ToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlags2ToString( barrier.dstAccessMask );
         }
 
         for (uint i = 0; i < pInfo->bufferMemoryBarrierCount; ++i)
         {
             auto&   barrier = pInfo->pBufferMemoryBarriers[i];
             ASSERT( barrier.pNext == null );
-            log << "    BufferBarrier:\n";
+            log << "\n    BufferBarrier:";
 
             auto    buf = logger.bufferMap.find( barrier.buffer );
             if ( buf != logger.bufferMap.end() )
-                log << "      name:   '" << buf->second.name << "'\n";
+                log << "\n      name:   '" << buf->second.name << "'";
 
-            log << "      stage:  " << VkPipelineStage2ToString( barrier.srcStageMask ) << " ---> " << VkPipelineStage2ToString( barrier.dstStageMask ) << '\n';
-            log << "      access: " << VkAccessFlags2ToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlags2ToString( barrier.dstAccessMask ) << '\n';
+            log << "\n      stage:  " << VkPipelineStage2ToString( barrier.srcStageMask ) << " ---> " << VkPipelineStage2ToString( barrier.dstStageMask );
+            log << "\n      access: " << VkAccessFlags2ToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlags2ToString( barrier.dstAccessMask );
 
             if ( not (barrier.offset == 0 and barrier.size == VK_WHOLE_SIZE) )
-                log << "      range:  [" << ToString( Bytes{barrier.offset} ) << ", " << (barrier.size == VK_WHOLE_SIZE ? "whole" : ToString( Bytes{barrier.offset + barrier.size} )) << ")\n";
+                log << "\n      range:  [" << ToString( Bytes{barrier.offset} ) << ", " << (barrier.size == VK_WHOLE_SIZE ? "whole" : ToString( Bytes{barrier.offset + barrier.size} )) << ')';
 
             if ( barrier.srcQueueFamilyIndex != barrier.dstQueueFamilyIndex )
             {
-                log << "      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
+                log << "\n      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
                     << (cmdbuf->queueFamilyIndex == barrier.srcQueueFamilyIndex ? "  (release)" :
-                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "") << '\n';
+                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "");
             }
         }
 
         for (uint i = 0; i < pInfo->imageMemoryBarrierCount; ++i)
         {
             auto&   barrier = pInfo->pImageMemoryBarriers[i];
+            auto&   subres  = barrier.subresourceRange;
             ASSERT( barrier.pNext == null );
-            log << "    ImageBarrier:\n";
+            log << "\n    ImageBarrier:";
 
-            auto    img = logger.imageMap.find( barrier.image );
+            auto                img     = logger.imageMap.find( barrier.image );
+            VkImageCreateInfo   img_ci  = {};
             if ( img != logger.imageMap.end() )
-                log << "      name:    '" << img->second.name << "'\n";
-
-            log << "      stage:   " << VkPipelineStage2ToString( barrier.srcStageMask ) << " ---> " << VkPipelineStage2ToString( barrier.dstStageMask ) << '\n';
-            log << "      access:  " << VkAccessFlags2ToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlags2ToString( barrier.dstAccessMask ) << '\n';
-
-            log << "      layout:  " << VkImageLayoutToString( barrier.oldLayout );
+            {
+                img_ci = img->second.info;
+                log << "\n      name:    '" << img->second.name << "'";
+            }
+            log << "\n      stage:   " << VkPipelineStage2ToString( barrier.srcStageMask ) << " ---> " << VkPipelineStage2ToString( barrier.dstStageMask );
+            log << "\n      access:  " << VkAccessFlags2ToString( barrier.srcAccessMask ) << " ---> " << VkAccessFlags2ToString( barrier.dstAccessMask );
 
+            log << "\n      layout:  " << VkImageLayoutToString( barrier.oldLayout );
             if ( barrier.oldLayout != barrier.newLayout )
                 log << " ---> " << VkImageLayoutToString( barrier.newLayout );
-            log << '\n';
 
-            if ( not (barrier.subresourceRange.baseMipLevel == 0 and barrier.subresourceRange.levelCount == VK_REMAINING_MIP_LEVELS) )
-            {
-                log << "      mipmaps: [" << ToString( barrier.subresourceRange.baseMipLevel ) << ", " 
-                    << (barrier.subresourceRange.levelCount == VK_REMAINING_MIP_LEVELS ? "whole" : ToString( barrier.subresourceRange.baseMipLevel + barrier.subresourceRange.levelCount )) << ")\n";
-            }
-            if ( not (barrier.subresourceRange.baseArrayLayer == 0 and barrier.subresourceRange.layerCount == VK_REMAINING_ARRAY_LAYERS) )
-            {
-                log << "      layers:  [" << ToString( barrier.subresourceRange.baseArrayLayer ) << ", "
-                    << (barrier.subresourceRange.layerCount == VK_REMAINING_ARRAY_LAYERS ? "whole" : ToString( barrier.subresourceRange.baseArrayLayer + barrier.subresourceRange.layerCount )) << ")\n";
-            }
+            MipmapsToString( INOUT log, "\n      ", subres.baseMipLevel, subres.levelCount, img_ci.mipLevels );
+            ArrayLayersToString( INOUT log, "\n      ", subres.baseArrayLayer, subres.layerCount, img_ci.arrayLayers );
 
             if ( barrier.srcQueueFamilyIndex != barrier.dstQueueFamilyIndex )
             {
-                log << "      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
+                log << "\n      queue:   " << ToString( barrier.srcQueueFamilyIndex ) << " ---> " << ToString( barrier.dstQueueFamilyIndex )
                     << (cmdbuf->queueFamilyIndex == barrier.srcQueueFamilyIndex ? "  (release)" :
-                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "") << '\n';
+                        cmdbuf->queueFamilyIndex == barrier.dstQueueFamilyIndex ? "  (acquire)" : "");
             }
         }
         #if ENABLE_SEQNO
-        log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
+        log << "\n    seq_no: " << ToString( cmdbuf->cmdIndex );
         #endif
-        log << "  ----------\n\n";
+        log << "\n  ----------\n\n";
     }
 
 /*
@@ -1882,7 +1936,7 @@ namespace
 =================================================
 */
     static VkImageLayout  GetPreviousLayout (const VulkanLogger::FramebufferData& framebuffer, const VulkanLogger::RenderPassData& renderPass,
-                                             uint subpassIndex, uint attachmentIndex, VkImageLayout currentLasyout)
+                                             uint subpassIndex, uint attachmentIndex, VkImageLayout currentLayout)
     {
         Unused( framebuffer );
 
@@ -1910,7 +1964,7 @@ namespace
                     auto&   sp      = renderPass.subpasses[ dep.srcSubpass ];
                     bool    found   = false;
 
-                    for (uint i = 0; !found && i < sp.colorAttachmentCount; ++i)
+                    for (uint i = 0; (not found) and (i < sp.colorAttachmentCount); ++i)
                     {
                         if ( sp.pColorAttachments[i].attachment == attachmentIndex )
                         {
@@ -1918,7 +1972,7 @@ namespace
                             found = true;
                         }
                     }
-                    for (uint i = 0; sp.pResolveAttachments && !found && i < sp.colorAttachmentCount; ++i)
+                    for (uint i = 0; sp.pResolveAttachments and (not found) and (i < sp.colorAttachmentCount); ++i)
                     {
                         if ( sp.pResolveAttachments[i].attachment == attachmentIndex )
                         {
@@ -1926,12 +1980,12 @@ namespace
                             found = true;
                         }
                     }
-                    if ( sp.pDepthStencilAttachment && !found && sp.pDepthStencilAttachment->attachment == attachmentIndex )
+                    if ( sp.pDepthStencilAttachment and (not found) and (sp.pDepthStencilAttachment->attachment == attachmentIndex) )
                     {
                         stack[stack_size].layout = sp.pDepthStencilAttachment->layout;
                         found = true;
                     }
-                    for (uint i = 0; !found && sp.inputAttachmentCount; ++i)
+                    for (uint i = 0; (not found) and sp.inputAttachmentCount; ++i)
                     {
                         if ( sp.pInputAttachments[i].attachment == attachmentIndex )
                         {
@@ -1947,13 +2001,13 @@ namespace
         }
 
         if ( stack_size == 0 )
-            return currentLasyout;
+            return currentLayout;
 
         if ( stack_size == 1 )
             return stack[0].layout;
 
         DBG_WARNING( "TODO" );
-        return currentLasyout;
+        return currentLayout;
     }
 
 /*
@@ -1973,8 +2027,16 @@ namespace
         if ( img_it == logger.imageMap.end() )
             return false;
 
-        log << "      view:    '" << view_it->second.name << "'\n";
-        log << "      image:   '" << img_it->second.name << "'\n";
+        auto&   subres = view_it->second.info.subresourceRange;
+
+        log << "\n      view:    '" << view_it->second.name << "'";
+        log << "\n      image:   '" << img_it->second.name << "'";
+
+        if ( subres.baseMipLevel+1 != img_it->second.info.mipLevels )
+            log << "\n      mipmap:   " << ToString(subres.baseMipLevel);
+
+        ArrayLayersToString( INOUT log, "\n      ", subres.baseArrayLayer, subres.layerCount, img_it->second.info.arrayLayers );
+
         return true;
     }
 
@@ -2012,29 +2074,28 @@ namespace
             auto&   ref = pass.pColorAttachments[i];
             auto&   at  = rp.info.pAttachments[ref.attachment];
 
-            log << "    color attachment:\n";
+            log << "    color attachment:";
 
             if ( not PrintRPImageViewName( log, fb.attachments[ref.attachment] ))
                 return;
 
             if ( subpassIndex == 0 )
             {
-                log << "      layout:  " << VkImageLayoutToString( at.initialLayout );
-
+                log << "\n      layout:  " << VkImageLayoutToString( at.initialLayout );
                 if ( at.initialLayout != ref.layout )
                     log << " ---> " << VkImageLayoutToString( ref.layout );
 
-                log << "\n      loadOp:  " << VkAttachmentLoadOpToString( at.loadOp ) << "\n";
+                log << "\n      loadOp:  " << VkAttachmentLoadOpToString( at.loadOp );
             }
             else
             {
                 auto    prev = GetPreviousLayout( fb, rp, subpassIndex, ref.attachment, ref.layout );
-                log << "      layout:  " << VkImageLayoutToString( prev );
+                log << "\n      layout:  " << VkImageLayoutToString( prev );
 
                 if ( prev != ref.layout )
                     log << " ---> " << VkImageLayoutToString( ref.layout );
-                log << '\n';
             }
+            log << '\n';
         }
 
         if ( pass.pDepthStencilAttachment != null )
@@ -2042,30 +2103,30 @@ namespace
             auto&   ref = *pass.pDepthStencilAttachment;
             auto&   at  = rp.info.pAttachments[ref.attachment];
 
-            log << "    depth-stencil attachment:\n";
+            log << "    depth-stencil attachment:";
 
             if ( not PrintRPImageViewName( log, fb.attachments[ref.attachment] ))
                 return;
 
-            log << "      layout:        " << VkImageLayoutToString( at.initialLayout );
+            log << "\n      layout:        " << VkImageLayoutToString( at.initialLayout );
 
             if ( subpassIndex == 0 )
             {
                 if ( at.initialLayout != ref.layout )
                     log << " ---> " << VkImageLayoutToString( ref.layout );
-                log << '\n';
-                log << "      depthLoadOp:   " << VkAttachmentLoadOpToString( at.loadOp ) << '\n';
-                log << "      stencilLoadOp: " << VkAttachmentLoadOpToString( at.stencilLoadOp ) << '\n';
+
+                log << "\n      depthLoadOp:   " << VkAttachmentLoadOpToString( at.loadOp );
+                log << "\n      stencilLoadOp: " << VkAttachmentLoadOpToString( at.stencilLoadOp );
             }
             else
             {
                 auto    prev = GetPreviousLayout( fb, rp, subpassIndex, ref.attachment, ref.layout );
-                log << "      layout:        " << VkImageLayoutToString( prev );
+                log << "\n      layout:        " << VkImageLayoutToString( prev );
 
                 if ( prev != ref.layout )
                     log << " ---> " << VkImageLayoutToString( ref.layout );
-                log << '\n';
             }
+            log << '\n';
         }
 
         if ( subpassIndex != 0 and subpassIndex != VK_SUBPASS_EXTERNAL )
@@ -2077,12 +2138,12 @@ namespace
                     auto&   ref  = pass.pResolveAttachments[i];
                     auto    prev = GetPreviousLayout( fb, rp, subpassIndex, ref.attachment, ref.layout );
 
-                    log << "    resolve attachment:\n";
+                    log << "    resolve attachment:";
 
                     if ( not PrintRPImageViewName( log, fb.attachments[ref.attachment] ))
                         return;
 
-                    log << "      layout:  " << VkImageLayoutToString( prev );
+                    log << "\n      layout:  " << VkImageLayoutToString( prev );
 
                     if ( prev != ref.layout )
                         log << " ---> " << VkImageLayoutToString( ref.layout );
@@ -2096,12 +2157,12 @@ namespace
                 auto&   ref  = pass.pInputAttachments[i];
                 auto    prev = GetPreviousLayout( fb, rp, subpassIndex, ref.attachment, ref.layout );
 
-                log << "    input attachment:\n";
+                log << "    input attachment:";
 
                 if ( not PrintRPImageViewName( log, fb.attachments[ref.attachment] ))
                     return;
 
-                log << "      layout:  " << VkImageLayoutToString( prev );
+                log << "\n      layout:  " << VkImageLayoutToString( prev );
 
                 if ( prev != ref.layout )
                     log << " ---> " << VkImageLayoutToString( ref.layout );
@@ -2365,12 +2426,12 @@ namespace
             auto&   at   = rp.info.pAttachments[i];
             auto    prev = GetPreviousLayout( fb, rp, VK_SUBPASS_EXTERNAL, uint(i), at.finalLayout );
 
-            log << "    attachment:\n";
+            log << "    attachment:";
 
             if ( not PrintRPImageViewName( log, fb.attachments[i] ))
                 return;
 
-            log << "      layout:  " << VkImageLayoutToString( prev );
+            log << "\n      layout:  " << VkImageLayoutToString( prev );
 
             if ( prev != at.finalLayout )
                 log << " ---> " << VkImageLayoutToString( at.finalLayout );
@@ -2457,13 +2518,13 @@ namespace
     SubresourceLayerToString
 =================================================
 */
-    ND_ static String  SubresourceLayerToString (const VkOffset3D &offset, const VkExtent3D &extent, const VkImageSubresourceLayers &subres)
+    ND_ static String  SubresourceLayerToString (const VkOffset3D &offset, const VkExtent3D &extent,
+                                                 const VkImageSubresourceLayers &subres, const VkImageCreateInfo &imgCI)
     {
         return  "{ off:("s << ToString( offset.x ) << ", " << ToString( offset.y ) << ", " << ToString( offset.z )
                 << "), ext:(" << ToString( offset.x + extent.width ) << ", " << ToString( offset.y + extent.height ) << ", " << ToString( offset.z + extent.depth )
-                << "), mip:" << ToString( subres.mipLevel )
-                << ", layers:[" << ToString( subres.baseArrayLayer )
-                << ", " << (subres.layerCount == VK_REMAINING_ARRAY_LAYERS ? "Remaining"s : ToString( subres.baseArrayLayer + subres.layerCount )) << "), "
+                << ')' << MipmapsToString( ", ", subres.mipLevel, 1, imgCI.mipLevels, true )
+                << ArrayLayersToString( ", ", subres.baseArrayLayer, subres.layerCount, imgCI.arrayLayers, true ) << ", "
                 << VkImageAspectFlagsToString( subres.aspectMask ) << " }";
     }
 
@@ -2472,13 +2533,12 @@ namespace
     SubresourceRangeToString
 =================================================
 */
-    ND_ static String  SubresourceRangeToString (const VkImageSubresourceRange &subres)
+    ND_ static String  SubresourceRangeToString (const VkImageSubresourceRange &subres, const VkImageCreateInfo &imgCI)
     {
-        return  "{ mips:["s << ToString( subres.baseMipLevel ) << ", "
-                << (subres.levelCount == VK_REMAINING_MIP_LEVELS ? "Remaining"s : ToString( subres.baseMipLevel + subres.levelCount ))
-                << "), layers:[" << ToString( subres.baseArrayLayer ) << ", "
-                << (subres.layerCount == VK_REMAINING_ARRAY_LAYERS ? "Remaining"s : ToString( subres.baseArrayLayer + subres.layerCount )) << "), "
-                << VkImageAspectFlagsToString( subres.aspectMask ) << " }";
+        return  "{ "s << VkImageAspectFlagsToString( subres.aspectMask )
+                << MipmapsToString( ", ", subres.baseMipLevel, subres.levelCount, imgCI.mipLevels, true )
+                << ArrayLayersToString( ", ", subres.baseArrayLayer, subres.layerCount, imgCI.arrayLayers, true )
+                << " }";
     }
 
 /*
@@ -2753,11 +2813,8 @@ namespace
         log << "  CopyImage\n";
 
         auto    src_it = logger.imageMap.find( srcImage );
-        if ( src_it == logger.imageMap.end() )
-            return;
-
         auto    dst_it = logger.imageMap.find( dstImage );
-        if ( dst_it == logger.imageMap.end() )
+        if ( src_it == logger.imageMap.end() or  dst_it == logger.imageMap.end() )
             return;
 
         log << "    src:       '" << src_it->second.name << "'\n";
@@ -2768,8 +2825,9 @@ namespace
         for (uint i = 0; i < regionCount; ++i)
         {
             auto&   reg = pRegions[i];
-            log << "      copy " << SubresourceLayerToString( reg.srcOffset, reg.extent, reg.srcSubresource ) << " ---> "
-                << SubresourceLayerToString( reg.dstOffset, reg.extent, reg.dstSubresource ) << '\n';
+            log << "      copy "
+                << SubresourceLayerToString( reg.srcOffset, reg.extent, reg.srcSubresource, src_it->second.info ) << " ---> "
+                << SubresourceLayerToString( reg.dstOffset, reg.extent, reg.dstSubresource, dst_it->second.info ) << '\n';
         }
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -2800,11 +2858,8 @@ namespace
         log << "  BlitImage\n";
 
         auto    src_it = logger.imageMap.find( srcImage );
-        if ( src_it == logger.imageMap.end() )
-            return;
-
         auto    dst_it = logger.imageMap.find( dstImage );
-        if ( dst_it == logger.imageMap.end( ))
+        if ( src_it == logger.imageMap.end() or dst_it == logger.imageMap.end( ))
             return;
 
         log << "    src:       '" << src_it->second.name << "'\n";
@@ -2818,8 +2873,9 @@ namespace
             VkExtent3D  src_ext { uint(reg.srcOffsets[1].x - reg.srcOffsets[0].x), uint(reg.srcOffsets[1].y - reg.srcOffsets[0].y), uint(reg.srcOffsets[1].z - reg.srcOffsets[0].z) };
             VkExtent3D  dst_ext { uint(reg.dstOffsets[1].x - reg.dstOffsets[0].x), uint(reg.dstOffsets[1].y - reg.dstOffsets[0].y), uint(reg.dstOffsets[1].z - reg.dstOffsets[0].z) };
 
-            log << "      blit " << SubresourceLayerToString( reg.srcOffsets[0], src_ext, reg.srcSubresource ) << " ---> "
-                << SubresourceLayerToString( reg.dstOffsets[0], dst_ext, reg.dstSubresource ) << '\n';
+            log << "      blit "
+                << SubresourceLayerToString( reg.srcOffsets[0], src_ext, reg.srcSubresource, src_it->second.info ) << " ---> "
+                << SubresourceLayerToString( reg.dstOffsets[0], dst_ext, reg.dstSubresource, dst_it->second.info ) << '\n';
         }
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -2850,11 +2906,8 @@ namespace
         log << "  CopyBufferToImage\n";
 
         auto    src_it = logger.bufferMap.find( srcBuffer );
-        if ( src_it == logger.bufferMap.end() )
-            return;
-
         auto    dst_it = logger.imageMap.find( dstImage );
-        if ( dst_it == logger.imageMap.end() )
+        if ( src_it == logger.bufferMap.end() or dst_it == logger.imageMap.end() )
             return;
 
         log << "    src:       '" << src_it->second.name << "'\n";
@@ -2865,7 +2918,7 @@ namespace
         {
             auto&   reg = pRegions[i];
             log << "      copy { [" << ToString( reg.bufferOffset ) << ", " << ToString( reg.bufferOffset + CalcMemorySize( reg, dst_it->second.info )) << ") } ---> "
-                << SubresourceLayerToString( reg.imageOffset, reg.imageExtent, reg.imageSubresource ) << '\n';
+                << SubresourceLayerToString( reg.imageOffset, reg.imageExtent, reg.imageSubresource, dst_it->second.info ) << '\n';
         }
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -2896,11 +2949,8 @@ namespace
         log << "  CopyImageToBuffer\n";
 
         auto    src_it = logger.imageMap.find( srcImage );
-        if ( src_it == logger.imageMap.end() )
-            return;
-
         auto    dst_it = logger.bufferMap.find( dstBuffer );
-        if ( dst_it == logger.bufferMap.end() )
+        if ( src_it == logger.imageMap.end() or dst_it == logger.bufferMap.end() )
             return;
 
         log << "    src:       '" << src_it->second.name << "'\n";
@@ -2910,7 +2960,7 @@ namespace
         for (uint i = 0; i < regionCount; ++i)
         {
             auto&   reg = pRegions[i];
-            log << "      copy " << SubresourceLayerToString( reg.imageOffset, reg.imageExtent, reg.imageSubresource )
+            log << "      copy " << SubresourceLayerToString( reg.imageOffset, reg.imageExtent, reg.imageSubresource, src_it->second.info )
                 << " ---> { [" << ToString( reg.bufferOffset ) << ", " << ToString( reg.bufferOffset + CalcMemorySize( reg, src_it->second.info )) << ") }\n";
         }
         #if ENABLE_SEQNO
@@ -3017,7 +3067,7 @@ namespace
         log << "    layout: " << VkImageLayoutToString( imageLayout ) << '\n';
 
         for (uint i = 0; i < rangeCount; ++i) {
-            log << "      " << SubresourceRangeToString( pRanges[i] ) << '\n';
+            log << "      " << SubresourceRangeToString( pRanges[i], dst_it->second.info ) << '\n';
         }
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -3055,7 +3105,7 @@ namespace
         log << "    layout: " << VkImageLayoutToString( imageLayout ) << '\n';
 
         for (uint i = 0; i < rangeCount; ++i) {
-            log << "      " << SubresourceRangeToString( pRanges[i] ) << '\n';
+            log << "      " << SubresourceRangeToString( pRanges[i], dst_it->second.info ) << '\n';
         }
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -3112,11 +3162,8 @@ namespace
         log << "  ResolveImage\n";
 
         auto    src_it = logger.imageMap.find( srcImage );
-        if ( src_it == logger.imageMap.end() )
-            return;
-
         auto    dst_it = logger.imageMap.find( dstImage );
-        if ( dst_it == logger.imageMap.end() )
+        if ( src_it == logger.imageMap.end() or dst_it == logger.imageMap.end() )
             return;
 
         log << "    src:       '" << src_it->second.name << "'\n";
@@ -3127,8 +3174,9 @@ namespace
         for (uint i = 0; i < regionCount; ++i)
         {
             auto&   reg = pRegions[i];
-            log << "      resolve " << SubresourceLayerToString( reg.srcOffset, reg.extent, reg.srcSubresource )
-                << " ---> " << SubresourceLayerToString( reg.dstOffset, reg.extent, reg.dstSubresource ) << '\n';
+            log << "      resolve "
+                << SubresourceLayerToString( reg.srcOffset, reg.extent, reg.srcSubresource, src_it->second.info ) << " ---> "
+                << SubresourceLayerToString( reg.dstOffset, reg.extent, reg.dstSubresource, dst_it->second.info ) << '\n';
         }
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -3560,7 +3608,9 @@ namespace
 
         for (uint i = 0; i < descriptorSetCount; ++i)
         {
-            (*ds_array)[firstSet + i] = pDescriptorSets[i];
+            auto&   dst = (*ds_array)[firstSet + i];
+            dst.descSet = pDescriptorSets[i];
+            dst.layout  = layout;
 
             ASSERT( logger.descSetMap.contains( pDescriptorSets[i] ));
         }
@@ -4196,9 +4246,14 @@ namespace
         if ( ppln_it == logger.pipelineMap.end() )
             return;
 
+        auto    layout_it = logger.pplnLayoutMap.find( ppln_it->second.layout );
+        if ( layout_it == logger.pplnLayoutMap.end() )
+            return;
+
         auto&   log = cmdbuf->log;
         log << "  BindPipeline\n";
         log << "    pipeline:  '" << ppln_it->second.name << "'\n";
+        log << "    layout:    '" << layout_it->second << "'\n";
         log << "    bindPoint: " << VkPipelineBindPointToString( pipelineBindPoint ) << '\n';
         #if ENABLE_SEQNO
         log << "    seq_no: " << ToString( cmdbuf->cmdIndex ) << '\n';
@@ -4298,12 +4353,15 @@ namespace
 
         for (usize i = 0; i < ds_array->size(); ++i)
         {
-            auto&   ds      = (*ds_array)[i];
-            auto    ds_it   = descSetMap.find( ds );
+            auto&   ds_pl   = (*ds_array)[i];
+            auto    ds_it   = descSetMap.find( ds_pl.descSet );
+            auto    pl_it   = pplnLayoutMap.find( ds_pl.layout );
 
-            if ( ds_it == descSetMap.end() )
+            if ( ds_it == descSetMap.end() or pl_it == pplnLayoutMap.end() )
                 continue;
 
+            tmp_log << "    [" << ToString(i) << "] pl: '" << pl_it->second << "'\n";
+
             auto&   bindings = ds_it->second.bindings;
             for (usize j = 0; j < bindings.size(); ++j)
             {
@@ -4362,7 +4420,7 @@ namespace
                                 continue;
 
                             auto&   buf = buffer_it->second;
-                            tmp_log << "      buffer: '" << buf.name << "'\n"; 
+                            tmp_log << "      buffer: '" << buf.name << "'\n";
                         }
                         break;
                     }
@@ -4558,15 +4616,15 @@ namespace
         //  vkCmdCopyBuffer, vkCmdCopyBuffer2,
         //  vkCmdCopyImage, vkCmdCopyImage2,
         //  vkCmdPipelineBarrier, vkCmdPipelineBarrier2,
-        //  vkCmdCopyBufferToImage, vkCmdCopyBufferToImage2, 
+        //  vkCmdCopyBufferToImage, vkCmdCopyBufferToImage2,
         //  vkCmdCopyImageToBuffer, vkCmdCopyImageToBuffer2,
         //  vkCmdBlitImage, vkCmdBlitImage2,
         //  vkCmdDispatch, vkCmdDispatchIndirect,
-        //  vkCmdDraw, vkCmdDrawIndexed, vkCmdDrawIndirect, vkCmdDrawIndexedIndirect, vkCmdDrawIndirectCount, vkCmdDrawIndexedIndirectCount, 
-        //  vkCmdClearColorImage, vkCmdClearDepthStencilImage, vkCmdClearAttachments, 
+        //  vkCmdDraw, vkCmdDrawIndexed, vkCmdDrawIndirect, vkCmdDrawIndexedIndirect, vkCmdDrawIndirectCount, vkCmdDrawIndexedIndirectCount,
+        //  vkCmdClearColorImage, vkCmdClearDepthStencilImage, vkCmdClearAttachments,
         //  vkCmdCopyQueryPoolResults, vkCmdFillBuffer, vkCmdResolveImage, vkCmdResolveImage2,
         //  vkCmdUpdateBuffer,
-        //  vkCmdExecuteCommands, 
+        //  vkCmdExecuteCommands,
         //  RecordBeginRenderPass, RecordNextSubpass, RecordEndRenderPass
         /*
         table._var_vkCmdSetStencilReference                 = &Wrap_vkCmdSetStencilReference;
diff --git a/AE/samples/demo/CMakeLists.txt b/AE/samples/demo/CMakeLists.txt
index 03a72bd7..662be239 100644
--- a/AE/samples/demo/CMakeLists.txt
+++ b/AE/samples/demo/CMakeLists.txt
@@ -1,38 +1,51 @@
 # Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
-file( GLOB_RECURSE SOURCES "*.h" "*.cpp" "*.as" "*.glsl" "*.msl" "*.md" )
-
-if (DEFINED ANDROID)
-    set( APP_NAME "SampleDemo" )
-    add_library( ${APP_NAME} SHARED ${SOURCES} )
-else()
-    set( APP_NAME "Sample.Demo" )
-    add_executable( ${APP_NAME} ${SOURCES} )
-endif()
+if (TARGET "GraphicsHL")
+    file( GLOB_RECURSE CPP_SOURCES "*.h" "*.cpp" "*.as" "*.glsl" "*.msl" "*.md" )
 
-if (TARGET "OfflinePacker")
-    add_custom_target( "${APP_NAME}.PackRes"
-        DEPENDS  "OfflinePacker"
-        COMMAND  "${MAIN_BINARY_DIR}/$<CONFIG>/OfflinePacker${CMAKE_EXECUTABLE_SUFFIX}"  "${CMAKE_CURRENT_SOURCE_DIR}/_data/main.as" "${AE_TEMP_FOLDER}/samples/demo"
-        COMMENT  "pack resources for '${APP_NAME}' ..."
-        VERBATIM
-    )
-    set_property( TARGET "${APP_NAME}.PackRes" PROPERTY FOLDER "Samples" )
-    #add_dependencies( ${APP_NAME} "${APP_NAME}.PackRes" )
-    add_dependencies( "PACK_RES" "${APP_NAME}.PackRes" )
-endif()
-target_compile_definitions( ${APP_NAME} PUBLIC AE_RES_FOLDER="${AE_TEMP_FOLDER}/samples/demo" )
+    if (DEFINED ANDROID)
+        set( APP_NAME "SampleDemo" )
+        add_library( ${APP_NAME} SHARED ${CPP_SOURCES} )
 
-if (TARGET "GraphicsHL")
-    source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES} )
+    else()
+        set( ANDROID_SRC_PATH "${MAIN_SOURCE_DIR}/android/demo/src/main" )
+        if (NOT EXISTS "${ANDROID_SRC_PATH}")
+            message( FATAL_ERROR "Android source is not exists in ${ANDROID_SRC_PATH}" )
+        endif()
+        file( GLOB_RECURSE JAVA_SOURCES "${ANDROID_SRC_PATH}/*.*" )
+
+        set( APP_NAME "Sample.Demo" )
+        add_executable( ${APP_NAME} ${CPP_SOURCES} ${JAVA_SOURCES} )
+
+        source_group( "Android" FILES ${JAVA_SOURCES} )
+        set_source_files_properties( ${JAVA_SOURCES} PROPERTIES HEADER_FILE_ONLY TRUE )
+    endif()
+
+    source_group( TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${CPP_SOURCES} )
     set_property( TARGET ${APP_NAME} PROPERTY FOLDER "Samples" )
     target_link_libraries( ${APP_NAME} PUBLIC "Platform" "GraphicsHL" "Profiler" "GeometryTools" )
     target_include_directories( ${APP_NAME} PUBLIC ".." )
     target_include_directories( ${APP_NAME} PUBLIC "${AE_ENGINE_SHARED_DATA}/scripts" "${AE_ENGINE_SHARED_DATA}/shaders" )
 
+    set( AE_TEMP_FOLDER_DEMO "${AE_TEMP_FOLDER}/samples/demo" )
+    target_compile_definitions( ${APP_NAME} PUBLIC AE_RES_FOLDER="${AE_TEMP_FOLDER_DEMO}" )
+
     if (TARGET "ImGUI-lib")
         target_link_libraries( ${APP_NAME} PUBLIC "ImGUI-lib" )
     endif()
 
     EnablePCH2( ${APP_NAME} "Demo" )
+    #----------------------------------------------------------
+
+    if (TARGET "OfflinePacker")
+        add_custom_target( "${APP_NAME}.PackRes"
+            DEPENDS  "OfflinePacker"
+            COMMAND  "${MAIN_BINARY_DIR}/$<CONFIG>/OfflinePacker${CMAKE_EXECUTABLE_SUFFIX}"  "${CMAKE_CURRENT_SOURCE_DIR}/_data/main.as" "${AE_TEMP_FOLDER_DEMO}"
+            COMMENT  "pack resources for '${APP_NAME}' ..."
+            VERBATIM
+        )
+        set_property( TARGET "${APP_NAME}.PackRes" PROPERTY FOLDER "Samples" )
+        #add_dependencies( ${APP_NAME} "${APP_NAME}.PackRes" )
+        add_dependencies( "PACK_RES" "${APP_NAME}.PackRes" )
+    endif()
 endif()
diff --git a/AE/samples/demo/Common.h b/AE/samples/demo/Common.h
index 068ed15c..27391b1a 100644
--- a/AE/samples/demo/Common.h
+++ b/AE/samples/demo/Common.h
@@ -8,8 +8,8 @@
 #include "platform/Public/InputSurface.h"
 #include "platform/Public/OutputSurface.h"
 
-#include "platform/DefaultV1/AppConfig.h"
-#include "platform/DefaultV1/DefaultAppV1.h"
+#include "platform/BaseAppV1/AppConfig.h"
+#include "platform/BaseAppV1/DefaultAppV1.h"
 
 #include "graphics/Public/GraphicsImpl.h"
 
diff --git a/AE/samples/demo/Core/ISample.h b/AE/samples/demo/Core/ISample.h
index 734e9933..fd86ffd5 100644
--- a/AE/samples/demo/Core/ISample.h
+++ b/AE/samples/demo/Core/ISample.h
@@ -35,17 +35,17 @@ namespace AE::Samples::Demo
 
     // interface
     public:
-        virtual ~ISample () {}
+        virtual ~ISample ()                                                                         __NE___ {}
 
-        ND_ virtual bool            Init (PipelinePackID pack)                                      = 0;
+        ND_ virtual bool            Init (PipelinePackID pack)                                      __NE___ = 0;
 
-        ND_ virtual AsyncTask       Update (const ActionQueueReader &, ArrayView<AsyncTask> deps)   { Unused( deps );  return null; }
+        ND_ virtual AsyncTask       Update (const ActionQueueReader &, ArrayView<AsyncTask> deps)   __NE___ { Unused( deps );  return null; }
 
         // deps - must contains task which returned by 'Update()' or task which depends on it.
         //
-        ND_ virtual AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)               = 0;
+        ND_ virtual AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)               __NE___ = 0;
 
-        ND_ virtual InputModeName   GetInputMode ()                                                 const = 0;
+        ND_ virtual InputModeName   GetInputMode ()                                                 C_NE___ = 0;
     };
 
 
diff --git a/AE/samples/demo/Core/ImGuiRenderer.cpp b/AE/samples/demo/Core/ImGuiRenderer.cpp
index 2aeb912c..ad557994 100644
--- a/AE/samples/demo/Core/ImGuiRenderer.cpp
+++ b/AE/samples/demo/Core/ImGuiRenderer.cpp
@@ -21,7 +21,7 @@ namespace AE::Samples::Demo
         CHECK_ERR( rtech );
         _rtech = rtech;
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         // init ImGUI context
         if ( _imguiCtx == null )
@@ -125,7 +125,7 @@ namespace AE::Samples::Demo
     Draw
 =================================================
 */
-    bool  ImGuiRenderer::Draw (RenderTask &rtask, DirectCtx::CommandBuffer cmdbuf, const RenderTechPassName &passName, 
+    bool  ImGuiRenderer::Draw (RenderTask &rtask, DirectCtx::CommandBuffer cmdbuf, const RenderTechPassName &passName,
                                const IOutputSurface::RenderTarget &rt, const Function<void()> &ui, const Function<void(DirectCtx::Draw &)> &draw)
     {
         return Draw( rtask, RVRef(cmdbuf), passName, rt, RGBA32f{ 0.45f, 0.55f, 0.60f, 1.00f }, ui, draw );
@@ -198,7 +198,7 @@ namespace AE::Samples::Demo
 
         ImGui::SetCurrentContext( _imguiCtx );
 
-        const float     dt      = RenderTaskScheduler().GetFrameTimeDelta().count();
+        const float     dt      = GraphicsScheduler().GetFrameTimeDelta().count();
         ImGuiIO &       io      = ImGui::GetIO();
         const float2    size    = rt.RegionSizePxf() * _pixToUI;
         const float2    pos     = mousePos * _pixToUI;
@@ -387,7 +387,7 @@ namespace AE::Samples::Demo
 */
     ImGuiRenderer::~ImGuiRenderer ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.DelayedReleaseResources( _descSet, _font.image, _font.view );
 
diff --git a/AE/samples/demo/Core/RenderGraph.h b/AE/samples/demo/Core/RenderGraph.h
index a86fc4c6..fdecbaa8 100644
--- a/AE/samples/demo/Core/RenderGraph.h
+++ b/AE/samples/demo/Core/RenderGraph.h
@@ -17,7 +17,7 @@ namespace AE::Samples::Demo
     private:
         Atomic<uint>                _submitIdx  {};
 
-        GRenderTaskScheduler&       _rts;
+        RenderTaskScheduler&        _rts;
         const FrameUID              _prevFrameId;
 
         Ptr<IOutputSurface>         _surface;
@@ -32,7 +32,7 @@ namespace AE::Samples::Demo
         static constexpr uint       _RenderBatch_First  = 1;
         static constexpr uint       _RenderBatch_Last   = _UIBatch-1;
 
-        STATIC_ASSERT( _RenderBatch_First < _RenderBatch_Last );
+        StaticAssert( _RenderBatch_First < _RenderBatch_Last );
 
 
     // methods
@@ -41,10 +41,8 @@ namespace AE::Samples::Demo
 
 
         // single threaded
-        template <typename ...Deps>
-        ND_ AsyncTask   BeginFrame (Ptr<IOutputSurface>     surface,
-                                    const BeginFrameConfig  &cfg    = Default,
-                                    const Tuple<Deps...>    &deps   = Default);
+        ND_ bool        BeginFrame (Ptr<IOutputSurface>     surface,
+                                    const BeginFrameConfig  &cfg    = Default);
 
         template <typename ...Deps>
         ND_ AsyncTask   EndFrame (ArrayView<AsyncTask>  presentDeps,
@@ -74,7 +72,7 @@ namespace AE::Samples::Demo
 =================================================
 */
     inline RenderGraph::RenderGraph () :
-        _rts{ RenderTaskScheduler() },
+        _rts{ GraphicsScheduler() },
         _prevFrameId{ _rts.GetFrameId() }
     {}
 
@@ -83,8 +81,7 @@ namespace AE::Samples::Demo
     BeginFrame
 =================================================
 */
-    template <typename ...Deps>
-    AsyncTask  RenderGraph::BeginFrame (Ptr<IOutputSurface> surface, const BeginFrameConfig &cfg, const Tuple<Deps...> &deps)
+    inline bool  RenderGraph::BeginFrame (Ptr<IOutputSurface> surface, const BeginFrameConfig &cfg)
     {
         DRC_EXLOCK( _drCheck );
         CHECK_ERR( _prevFrameId == _rts.GetFrameId() );
@@ -92,7 +89,7 @@ namespace AE::Samples::Demo
         _surface        = surface;
         _submitIdx.store( _RenderBatch_First );
 
-        return _rts.BeginFrame( cfg, deps );
+        return _rts.BeginFrame( cfg );
     }
 
 /*
@@ -172,7 +169,7 @@ namespace AE::Samples::Demo
         uint    idx = _RenderBatch_First;
         for (;;)
         {
-            if ( _submitIdx.CAS( INOUT idx, idx+1 ))
+            if_likely( _submitIdx.CAS( INOUT idx, idx+1 ))
                 break;
 
             ASSERT( idx >= _RenderBatch_First );
@@ -180,6 +177,8 @@ namespace AE::Samples::Demo
 
             if ( idx < _RenderBatch_First or idx > _RenderBatch_Last )
                 return null;    // overflow
+
+            ThreadUtils::Pause();
         }
 
         return  _rts.BeginCmdBatch( EQueueType::Graphics, idx, {name} );
diff --git a/AE/samples/demo/Core/SampleCore.cpp b/AE/samples/demo/Core/SampleCore.cpp
index 19c3af6e..3d46d1fa 100644
--- a/AE/samples/demo/Core/SampleCore.cpp
+++ b/AE/samples/demo/Core/SampleCore.cpp
@@ -1,9 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 
 #include "demo/Core/SampleCore.h"
-#include "base/DataSource/MemStream.h"
-#include "base/Utils/Helpers.h"
-
 #include "graphics/Private/EnumToString.h"
 #include "vfs/Archive/ArchiveStaticStorage.h"
 
@@ -22,11 +19,11 @@ namespace AE::Samples::Demo
     SampleCore ctor
 =================================================
 */
-    SampleCore::SampleCore ()
+    SampleCore::SampleCore () __NE___
     {
         //_sample = MakeRC< ImGuiSample >();
-        _sample = MakeRC< Canvas2DSample >();
-        //_sample = MakeRC< Camera3DSample >();
+        //_sample = MakeRC< Canvas2DSample >();
+        _sample = MakeRC< Camera3DSample >();
     }
 //-----------------------------------------------------------------------------
 
@@ -60,14 +57,14 @@ namespace
             cfg.graphics.staging.dynamicBlockSize       = 16_Mb;
             cfg.graphics.staging.vstreamSize            = 4_Mb;
 
-            cfg.graphics.device.appName         = "Demo";
+            cfg.graphics.device.appName         = "Demo 2";
             cfg.graphics.device.requiredQueues  = EQueueMask::Graphics;
             cfg.graphics.device.optionalQueues  = Default; //EQueueMask::AsyncCompute | EQueueMask::AsyncTransfer;
             cfg.graphics.device.validation      = EDeviceValidation::Enabled;
         //  cfg.graphics.device.devFlags        = EDeviceFlags::SetStableClock;
 
           #if 0
-            cfg.graphics.swapchain.format       = EPixelFormat::RGBA16F;
+            cfg.graphics.swapchain.colorFormat  = EPixelFormat::RGBA16F;
             cfg.graphics.swapchain.colorSpace   = EColorSpace::Extended_sRGB_linear;
           #else
             cfg.graphics.swapchain.colorFormat  = EPixelFormat::RGBA8_UNorm;
@@ -75,12 +72,12 @@ namespace
             cfg.graphics.swapchain.usage        = EImageUsage::ColorAttachment | EImageUsage::Sampled | EImageUsage::TransferDst;
             cfg.graphics.swapchain.options      = EImageOpt::BlitDst;
             cfg.graphics.swapchain.presentMode  = EPresentMode::FIFO;
-            cfg.graphics.swapchain.minImageCount= 3;
+            cfg.graphics.swapchain.minImageCount= 2;
         }
 
         // window
         {
-            cfg.window.title    = "Demo";
+            cfg.window.title    = "Demo 2";
             cfg.window.size     = {1024, 768};
             cfg.window.mode     = EWindowMode::Resizable;
         }
@@ -110,8 +107,8 @@ namespace
     constructor
 =================================================
 */
-    SampleApplication::SampleApplication () :
-        DefaultAppListener{ GetAppConfig(), MakeRC<SampleCore>() }
+    SampleApplication::SampleApplication () __NE___ :
+        AppCoreV1{ GetAppConfig(), MakeRC<SampleCore>() }
     {
         if ( not FileSystem::SetCurrentPath( AE_RES_FOLDER ))
             FileSystem::FindAndSetCurrent( "samples/demo", 5 );
@@ -125,11 +122,11 @@ namespace
     bool  SampleApplication::_InitVFS (IApplication &app)
     {
     #ifdef AE_PLATFORM_ANDROID
-        auto    assets = app.OpenBuiltinStorage();
+        auto    assets = app.OpenStorage( EAppStorage::Builtin );
         CHECK_ERR( assets );
 
         RC<RDataSource> ds;
-        CHECK_ERR( assets->Open( OUT ds, VFS::FileName{"resources.bin"} )); 
+        CHECK_ERR( assets->Open( OUT ds, VFS::FileName{"resources.bin"} ));
 
         auto    storage = VFS::VirtualFileStorageFactory::CreateStaticArchive( RVRef(ds) );
     #else
@@ -139,6 +136,8 @@ namespace
 
         CHECK_ERR( storage );
         CHECK_ERR( GetVFS().AddStorage( storage ));
+
+        GetVFS().MakeImmutable();
         return true;
     }
 
@@ -152,7 +151,7 @@ namespace
         CHECK_FATAL( _InitVFS( app ));
         CHECK_FATAL( Cast<SampleCore>(&GetBaseApp())->LoadInputActions() );
 
-        DefaultAppListener::OnStart( app );
+        AppCoreV1::OnStart( app );
 
         CHECK_FATAL( _OnStartImpl( app ));
     }
@@ -170,7 +169,7 @@ namespace
         _mainLoop.Write( Default );
         _sample = null;
 
-        RenderTaskScheduler().GetResourceManager().ReleaseResource( _pplnPack );
+        GraphicsScheduler().GetResourceManager().ReleaseResource( _pplnPack );
     }
 
 /*
@@ -235,16 +234,18 @@ namespace
     {
         CHECK_ERR( output.IsInitialized() );
 
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         auto    rp_info = output.GetRenderPassInfo();
         CHECK_ERR( rp_info.attachments.size() == 1 );
         CHECK_ERR( rp_info.attachments[0].samples == 1_samples );
 
-        #ifdef AE_PLATFORM_APPLE
+        #ifdef AE_ENABLE_VULKAN
+            constexpr auto  fname = VFS::FileName{"vk/render_passes"};
+        #elif defined(AE_ENABLE_METAL)
             constexpr auto  fname = VFS::FileName{"mac/render_passes"};
         #else
-            constexpr auto  fname = VFS::FileName{"vk/render_passes"};
+        #   error unsupported platform!
         #endif
 
         auto    file = GetVFS().Open<RStream>( fname );
@@ -269,17 +270,19 @@ namespace
 */
     bool  SampleCore::_CompileResources (IOutputSurface &output)
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResource( _pplnPack );
 
         auto    rp_info = output.GetRenderPassInfo();
         CHECK_ERR( rp_info.attachments.size() == 1 );
         CHECK_ERR( rp_info.attachments[0].samples == 1_samples );
 
-        #ifdef AE_PLATFORM_APPLE
+        #ifdef AE_ENABLE_VULKAN
+            constexpr auto  fname = VFS::FileName{"vk/pipelines"};
+        #elif defined(AE_ENABLE_METAL)
             constexpr auto  fname = VFS::FileName{"mac/pipelines"};
         #else
-            constexpr auto  fname = VFS::FileName{"vk/pipelines"};
+        #   error unsupported platform!
         #endif
 
         auto    file = GetVFS().Open<RStream>( fname );
@@ -351,18 +354,7 @@ namespace
                                  Ptr<IWindow>                   ,
                                  Ptr<IVRDevice>                 ) __NE___
     {
-        AsyncTask   task;
-        std::swap( task, _mainLoop->endFrame );
-
-        for (;;)
-        {
-            if ( task == null or task->IsFinished() )
-                break;
-
-            Scheduler().ProcessTasks( threadMask, 0 );
-
-            Scheduler().DbgDetectDeadlock();
-        }
+        CHECK( GraphicsScheduler().WaitNextFrame( threadMask, AE::DefaultTimeout ));
     }
 
 /*
@@ -372,8 +364,6 @@ namespace
 */
     void  SampleCore::RenderFrame () __NE___
     {
-        _mainLoop->endFrame = null;
-
         Ptr<IInputActions>      input;
         Ptr<IOutputSurface>     output;
         RenderGraph             rg;
@@ -391,22 +381,18 @@ namespace
             output  = main_loop->output;
         }
 
+        if ( not rg.BeginFrame( output ))
+            return;
 
         AsyncTask   proc_input  = _sample->Update( input->ReadInput( rg.GetPrevFrameId() ), Default );
         // 'proc_input' can be null
 
-        AsyncTask   begin_frame = rg.BeginFrame( output );
-        if ( begin_frame->IsInterrupted() )
-            return;
-
-        AsyncTask   draw_task   = _sample->Draw( rg, { begin_frame, proc_input });
+        AsyncTask   draw_task   = _sample->Draw( rg, {proc_input} );
         CHECK_ERRV( draw_task );
 
-        AsyncTask   end_frame   = rg.EndFrame( Default, Tuple{ draw_task });
+        Unused( rg.EndFrame( Default, Tuple{ draw_task }));
 
         input->NextFrame( rg.GetNextFrameId() );
-
-        _mainLoop->endFrame = end_frame;
     }
 
 } // AE::Samples::Demo
@@ -446,7 +432,7 @@ void  AE_OnAppDestroyed ()
         return ApplicationAndroid::OnJniLoad( vm );
     }
 
-    extern "C" void JNI_OnUnload (JavaVM *vm, void *)
+    extern "C" void JNI_OnUnload (JavaVM* vm, void *)
     {
         return ApplicationAndroid::OnJniUnload( vm );
     }
diff --git a/AE/samples/demo/Core/SampleCore.h b/AE/samples/demo/Core/SampleCore.h
index 99caf5dd..05d49ae1 100644
--- a/AE/samples/demo/Core/SampleCore.h
+++ b/AE/samples/demo/Core/SampleCore.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include "demo/Common.h"
-#include "base/DataSource/MemStream.h"
 #include "demo/Core/ISample.h"
 #include "demo/Core/ImGuiRenderer.h"
 
@@ -14,11 +13,11 @@ namespace AE::Samples::Demo
     // Sample Application
     //
 
-    class SampleApplication final : public AppV1::DefaultAppListener
+    class SampleApplication final : public AppV1::AppCoreV1
     {
     // methods
     public:
-        SampleApplication ();
+        SampleApplication ()                __NE___;
 
         void  OnStart (IApplication &)      __NE_OV;
 
@@ -34,15 +33,12 @@ namespace AE::Samples::Demo
 
     class SampleCore final : public AppV1::IBaseApp
     {
-        friend class SampleVRListener;
-
     // types
     private:
         struct MainLoopData
         {
             Ptr<IInputActions>      input;      // lifetime is same as Window/VRDevice lifetime
             Ptr<IOutputSurface>     output;     // lifetime is same as Window/VRDevice lifetime
-            AsyncTask               endFrame;
         };
         using MainLoopSync_t    = Threading::DRCSynchronized< MainLoopData >;
 
@@ -60,7 +56,7 @@ namespace AE::Samples::Demo
 
     // methods
     public:
-        SampleCore ();
+        SampleCore ()                                                               __NE___;
         ~SampleCore ();
 
         ND_ bool  LoadInputActions ();
diff --git a/AE/samples/demo/Examples/Camera3D.cpp b/AE/samples/demo/Examples/Camera3D.cpp
index 5e4ee223..2c36997a 100644
--- a/AE/samples/demo/Examples/Camera3D.cpp
+++ b/AE/samples/demo/Examples/Camera3D.cpp
@@ -4,8 +4,8 @@
 
 namespace AE::Samples::Demo
 {
-    STATIC_ASSERT( sizeof(ShaderTypes::CubeVertex) == sizeof(GeometryTools::CubeRenderer::Vertex) );
-    STATIC_ASSERT( sizeof(ShaderTypes::SphericalCubeVertex) == sizeof(GeometryTools::SphericalCubeRenderer::Vertex) );
+    StaticAssert( sizeof(ShaderTypes::CubeVertex) == sizeof(GeometryTools::CubeRenderer::Vertex) );
+    StaticAssert( sizeof(ShaderTypes::SphericalCubeVertex) == sizeof(GeometryTools::SphericalCubeRenderer::Vertex) );
 
     INTERNAL_LINKAGE( constexpr auto&   RTech   = RenderTechs::Scene3D_RTech );
     INTERNAL_LINKAGE( constexpr auto&   IA      = InputActions::Camera3D );
@@ -19,7 +19,7 @@ namespace AE::Samples::Demo
     public:
         RC<Camera3DSample>  t;
 
-        UploadTextureTask (Camera3DSample* p, CommandBatchPtr batch, DebugLabel) :
+        UploadTextureTask (Camera3DSample* p, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"Camera3D::UploadTexture"} },
             t{ p }
         {}
@@ -53,7 +53,7 @@ namespace AE::Samples::Demo
 
         // create cube
         {
-            auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+            auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
             CHECK_TE( t->cube1.Create( res_mngr, ctx, True{"cubeMap"}, t->gfxAlloc ));
             CHECK_TE( t->cube2.Create( res_mngr, ctx, t->lod, t->lod, False{"tris"}, True{"cubeMap"}, Default, t->gfxAlloc ));
@@ -86,7 +86,7 @@ namespace AE::Samples::Demo
         RC<Camera3DSample>  t;
         ActionQueueReader   reader;
 
-        ProcessInputTask (Camera3DSample* p, ActionQueueReader reader) :
+        ProcessInputTask (Camera3DSample* p, ActionQueueReader reader) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ p }, reader{ RVRef(reader) }
         {}
@@ -99,8 +99,8 @@ namespace AE::Samples::Demo
             ActionQueueReader::Header   hdr;
             for (; reader.ReadHeader( OUT hdr );)
             {
-                STATIC_ASSERT( IA.actionCount == 1 );
-                STATIC_ASSERT( IA.Desktop.actionCount == 1 );
+                StaticAssert( IA.actionCount == 1 );
+                StaticAssert( IA.Desktop.actionCount == 1 );
 
                 switch ( uint{hdr.name} )
                 {
@@ -131,7 +131,7 @@ namespace AE::Samples::Demo
         RC<Camera3DSample>  t;
         IOutputSurface &    surface;
 
-        DrawTask (Camera3DSample* p, IOutputSurface &surf, CommandBatchPtr batch, DebugLabel) :
+        DrawTask (Camera3DSample* p, IOutputSurface &surf, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"Camera3D::Draw"} },
             t{ p }, surface{ surf }
         {}
@@ -153,7 +153,7 @@ namespace AE::Samples::Demo
 
         // resize depth buffer
         {
-            auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+            auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
             if_unlikely( not t->depthBuf.image or Any( uint2{res_mngr.GetDescription( t->depthBuf.image ).dimension} != view_size ))
             {
@@ -207,7 +207,7 @@ namespace AE::Samples::Demo
             const uint      off = uint(AlignUp( SizeOf<ShaderTypes::camera3d_ub>, DeviceLimits.res.minUniformBufferOffsetAlign ) * i);
 
             constexpr auto& rtech_pass = RTech.Main;
-            STATIC_ASSERT( rtech_pass.attachmentsCount == 2 );
+            StaticAssert( rtech_pass.attachmentsCount == 2 );
 
             const auto      rp_desc =
                 RenderPassDesc{ t->rtech, rtech_pass, view_size }
@@ -239,9 +239,9 @@ namespace AE::Samples::Demo
     Init
 =================================================
 */
-    bool  Camera3DSample::Init (PipelinePackID pack)
+    bool  Camera3DSample::Init (PipelinePackID pack) __NE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
                 gfxAlloc = res_mngr.CreateLinearGfxMemAllocator();
 
         rtech = res_mngr.LoadRenderTech( pack, RTech, Default );
@@ -277,7 +277,7 @@ namespace AE::Samples::Demo
     Update
 =================================================
 */
-    AsyncTask  Camera3DSample::Update (const IInputActions::ActionQueueReader &reader, ArrayView<AsyncTask> deps)
+    AsyncTask  Camera3DSample::Update (const IInputActions::ActionQueueReader &reader, ArrayView<AsyncTask> deps) __NE___
     {
         return Scheduler().Run< ProcessInputTask >( Tuple{ this, RVRef(reader) }, Tuple{deps} );
     }
@@ -287,7 +287,7 @@ namespace AE::Samples::Demo
     GetInputMode
 =================================================
 */
-    InputModeName  Camera3DSample::GetInputMode () const
+    InputModeName  Camera3DSample::GetInputMode () C_NE___
     {
         return IA;
     }
@@ -297,7 +297,7 @@ namespace AE::Samples::Demo
     Draw
 =================================================
 */
-    AsyncTask  Camera3DSample::Draw (RenderGraph &rg, ArrayView<AsyncTask> inDeps)
+    AsyncTask  Camera3DSample::Draw (RenderGraph &rg, ArrayView<AsyncTask> inDeps) __NE___
     {
         auto    batch = rg.Render( "3D pass" );
         CHECK_ERR( batch );
@@ -323,9 +323,9 @@ namespace AE::Samples::Demo
     destructor
 =================================================
 */
-    Camera3DSample::~Camera3DSample ()
+    Camera3DSample::~Camera3DSample () __NE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         cube1.Destroy( res_mngr );
         cube2.Destroy( res_mngr );
diff --git a/AE/samples/demo/Examples/Camera3D.h b/AE/samples/demo/Examples/Camera3D.h
index d7e8a180..e3fcc2a7 100644
--- a/AE/samples/demo/Examples/Camera3D.h
+++ b/AE/samples/demo/Examples/Camera3D.h
@@ -48,14 +48,14 @@ namespace AE::Samples::Demo
 
     // methods
     public:
-        Camera3DSample () {}
-        ~Camera3DSample () override;
+        Camera3DSample ()                                                                   __NE___ {}
+        ~Camera3DSample ()                                                                  __NE_OV;
 
         // ISample //
-        bool            Init (PipelinePackID pack)                                          override;
-        AsyncTask       Update (const ActionQueueReader &reader, ArrayView<AsyncTask> deps) override;
-        AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)                   override;
-        InputModeName   GetInputMode ()                                                     const override;
+        bool            Init (PipelinePackID pack)                                          __NE_OV;
+        AsyncTask       Update (const ActionQueueReader &reader, ArrayView<AsyncTask> deps) __NE_OV;
+        AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)                   __NE_OV;
+        InputModeName   GetInputMode ()                                                     C_NE_OV;
     };
 
 
diff --git a/AE/samples/demo/Examples/Canvas2D.cpp b/AE/samples/demo/Examples/Canvas2D.cpp
index 03e99008..44534a11 100644
--- a/AE/samples/demo/Examples/Canvas2D.cpp
+++ b/AE/samples/demo/Examples/Canvas2D.cpp
@@ -16,7 +16,7 @@ namespace AE::Samples::Demo
     public:
         RC<Canvas2DSample>  t;
 
-        UploadTextureTask (Canvas2DSample* p, CommandBatchPtr batch, DebugLabel) :
+        UploadTextureTask (Canvas2DSample* p, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"Canvas2D::UploadTexture"} },
             t{ p }
         {}
@@ -69,7 +69,7 @@ namespace AE::Samples::Demo
     public:
         RC<Canvas2DSample>  t;
 
-        UploadAtlasTask (Canvas2DSample* p, CommandBatchPtr batch, DebugLabel) :
+        UploadAtlasTask (Canvas2DSample* p, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"Canvas2D::UploadAtlas"} },
             t{ p }
         {}
@@ -101,7 +101,7 @@ namespace AE::Samples::Demo
         }
 
         // create DS
-        {       
+        {
             DescriptorUpdater   updater;
             CHECK_TE( updater.Set( t->ppln3_ds2, EDescUpdateMode::Partialy ));
             updater.BindImage( UniformName{"un_Texture"}, t->atlas->GetViewID() );
@@ -122,7 +122,7 @@ namespace AE::Samples::Demo
         DescriptorSetID     ds;
         VFS::FileName       fname;
 
-        UploadRasterFontTask (RC<RasterFont> *f, DescriptorSetID ds, const VFS::FileName &name, CommandBatchPtr batch, DebugLabel) :
+        UploadRasterFontTask (RC<RasterFont> *f, DescriptorSetID ds, const VFS::FileName &name, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"Canvas2D::UploadRasterFont"} },
             font{ *f }, ds{ds}, fname{name}
         {}
@@ -176,7 +176,7 @@ namespace AE::Samples::Demo
         RC<Canvas2DSample>  t;
         ActionQueueReader   reader;
 
-        ProcessInputTask (Canvas2DSample* p, ActionQueueReader reader) :
+        ProcessInputTask (Canvas2DSample* p, ActionQueueReader reader) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ p },
             reader{ RVRef(reader) }
@@ -199,7 +199,7 @@ namespace AE::Samples::Demo
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( IA.actionCount == 2 );
+            StaticAssert( IA.actionCount == 2 );
             switch ( uint{hdr.name} )
             {
                 case IA.Cursor :
@@ -223,7 +223,7 @@ namespace AE::Samples::Demo
         RC<Canvas2DSample>  t;
         IOutputSurface &    surface;
 
-        DrawTask (Canvas2DSample* p, IOutputSurface &surf, CommandBatchPtr batch, DebugLabel) :
+        DrawTask (Canvas2DSample* p, IOutputSurface &surf, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"Canvas2D::Draw"} },
             t{ p }, surface{ surf }
         {}
@@ -282,7 +282,7 @@ namespace AE::Samples::Demo
         // draw
         {
             constexpr auto& rtech_pass = RTech.Main;
-            STATIC_ASSERT( rtech_pass.attachmentsCount == 1 );
+            StaticAssert( rtech_pass.attachmentsCount == 1 );
 
             const auto  rp_desc = RenderPassDesc{ t->rtech, rtech_pass, rt.RegionSize() }
                                     .AddViewport( rt.RegionSize() )
@@ -406,9 +406,9 @@ namespace AE::Samples::Demo
     Init
 =================================================
 */
-    bool  Canvas2DSample::Init (PipelinePackID pack)
+    bool  Canvas2DSample::Init (PipelinePackID pack) __NE___
     {
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
                 gfxAlloc    = res_mngr.CreateLinearGfxMemAllocator();
 
         rtech = res_mngr.LoadRenderTech( pack, RTech, Default );
@@ -468,7 +468,7 @@ namespace AE::Samples::Demo
     Update
 =================================================
 */
-    AsyncTask  Canvas2DSample::Update (const IInputActions::ActionQueueReader &reader, ArrayView<AsyncTask> deps)
+    AsyncTask  Canvas2DSample::Update (const IInputActions::ActionQueueReader &reader, ArrayView<AsyncTask> deps) __NE___
     {
         return Scheduler().Run< ProcessInputTask >( Tuple{ this, RVRef(reader) }, Tuple{ deps });
     }
@@ -478,7 +478,7 @@ namespace AE::Samples::Demo
     Draw
 =================================================
 */
-    AsyncTask  Canvas2DSample::Draw (RenderGraph &rg, ArrayView<AsyncTask> inDeps)
+    AsyncTask  Canvas2DSample::Draw (RenderGraph &rg, ArrayView<AsyncTask> inDeps) __NE___
     {
         auto    batch = rg.Render( "Canvas2D pass" );
         CHECK_ERR( batch );
@@ -509,7 +509,7 @@ namespace AE::Samples::Demo
     GetInputMode
 =================================================
 */
-    InputModeName  Canvas2DSample::GetInputMode () const
+    InputModeName  Canvas2DSample::GetInputMode () C_NE___
     {
         return IA;
     }
@@ -519,9 +519,9 @@ namespace AE::Samples::Demo
     destructor
 =================================================
 */
-    Canvas2DSample::~Canvas2DSample ()
+    Canvas2DSample::~Canvas2DSample () __NE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.DelayedReleaseResources( tex.image, tex.view, ppln3_ds1, ppln3_ds2, ppln4_ds, ppln5_ds, ublock );
         profiler.Deinitialize();
diff --git a/AE/samples/demo/Examples/Canvas2D.h b/AE/samples/demo/Examples/Canvas2D.h
index caea0a8e..753e4dfb 100644
--- a/AE/samples/demo/Examples/Canvas2D.h
+++ b/AE/samples/demo/Examples/Canvas2D.h
@@ -57,14 +57,14 @@ namespace AE::Samples::Demo
 
     // methods
     public:
-        Canvas2DSample () {}
-        ~Canvas2DSample () override;
+        Canvas2DSample ()                                                                   __NE___ {}
+        ~Canvas2DSample ()                                                                  __NE_OV;
 
         // ISample //
-        bool            Init (PipelinePackID pack)                                          override;
-        AsyncTask       Update (const ActionQueueReader &reader, ArrayView<AsyncTask> deps) override;
-        AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)                   override;
-        InputModeName   GetInputMode ()                                                     const override;
+        bool            Init (PipelinePackID pack)                                          __NE_OV;
+        AsyncTask       Update (const ActionQueueReader &reader, ArrayView<AsyncTask> deps) __NE_OV;
+        AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)                   __NE_OV;
+        InputModeName   GetInputMode ()                                                     C_NE_OV;
     };
 
 } // AE::Samples::Demo
diff --git a/AE/samples/demo/Examples/ImGuiSample.cpp b/AE/samples/demo/Examples/ImGuiSample.cpp
index c9286a54..55d7f861 100644
--- a/AE/samples/demo/Examples/ImGuiSample.cpp
+++ b/AE/samples/demo/Examples/ImGuiSample.cpp
@@ -20,7 +20,7 @@ namespace AE::Samples::Demo
         RC<ImGuiSample>     t;
         ActionQueueReader   reader;
 
-        ProcessInputTask (ImGuiSample* p, ActionQueueReader reader) :
+        ProcessInputTask (ImGuiSample* p, ActionQueueReader reader) __NE___ :
             IAsyncTask{ ETaskQueue::PerFrame },
             t{ p }, reader{ RVRef(reader) }
         {}
@@ -33,8 +33,8 @@ namespace AE::Samples::Demo
             ActionQueueReader::Header   hdr;
             for (; reader.ReadHeader( OUT hdr );)
             {
-                STATIC_ASSERT( IA.actionCount == 6 );
-                STATIC_ASSERT( IA.Desktop.actionCount == 5 );
+                StaticAssert( IA.actionCount == 6 );
+                StaticAssert( IA.Desktop.actionCount == 5 );
 
                 switch ( uint{hdr.name} )
                 {
@@ -77,7 +77,7 @@ namespace AE::Samples::Demo
 
     // methods
     public:
-        DrawTask (ImGuiSample* p, IOutputSurface &surf, CommandBatchPtr batch, DebugLabel) :
+        DrawTask (ImGuiSample* p, IOutputSurface &surf, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"ImGui::Draw"} },
             t{ p }, surface{ surf }
         {}
@@ -150,11 +150,11 @@ namespace AE::Samples::Demo
     Init
 =================================================
 */
-    bool  ImGuiSample::Init (PipelinePackID pack)
+    bool  ImGuiSample::Init (PipelinePackID pack) __NE___
     {
         CHECK( profiler.Initialize() );
 
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
         auto    gfx_alloc   = res_mngr.CreateLinearGfxMemAllocator();
         auto    rtech       = res_mngr.LoadRenderTech( pack, RTech, Default );
 
@@ -171,7 +171,7 @@ namespace AE::Samples::Demo
     Update
 =================================================
 */
-    AsyncTask  ImGuiSample::Update (const IInputActions::ActionQueueReader &reader, ArrayView<AsyncTask> deps)
+    AsyncTask  ImGuiSample::Update (const IInputActions::ActionQueueReader &reader, ArrayView<AsyncTask> deps) __NE___
     {
         return Scheduler().Run< ProcessInputTask >( Tuple{ this, reader }, Tuple{deps} );
     }
@@ -181,7 +181,7 @@ namespace AE::Samples::Demo
     GetInputMode
 =================================================
 */
-    InputModeName  ImGuiSample::GetInputMode () const
+    InputModeName  ImGuiSample::GetInputMode () C_NE___
     {
         return IA;
     }
@@ -191,7 +191,7 @@ namespace AE::Samples::Demo
     Draw
 =================================================
 */
-    AsyncTask  ImGuiSample::Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)
+    AsyncTask  ImGuiSample::Draw (RenderGraph &rg, ArrayView<AsyncTask> deps) __NE___
     {
         auto    batch = rg.Render( "ImGui pass" );
         CHECK_ERR( batch );
diff --git a/AE/samples/demo/Examples/ImGuiSample.h b/AE/samples/demo/Examples/ImGuiSample.h
index 073ef4c7..dc2b852a 100644
--- a/AE/samples/demo/Examples/ImGuiSample.h
+++ b/AE/samples/demo/Examples/ImGuiSample.h
@@ -26,14 +26,14 @@ namespace AE::Samples::Demo
 
     // methods
     public:
-        ImGuiSample () : imgui{null} {}
-        explicit ImGuiSample (ImGuiContext* ctx) : imgui{ctx} {}
+        ImGuiSample ()                                                                      __NE___ : imgui{null} {}
+        explicit ImGuiSample (ImGuiContext* ctx)                                            __NE___ : imgui{ctx} {}
 
         // ISample //
-        bool            Init (PipelinePackID pack)                                          override;
-        AsyncTask       Update (const ActionQueueReader &reader, ArrayView<AsyncTask> deps) override;
-        AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)                   override;
-        InputModeName   GetInputMode ()                                                     const override;
+        bool            Init (PipelinePackID pack)                                          __NE_OV;
+        AsyncTask       Update (const ActionQueueReader &reader, ArrayView<AsyncTask> deps) __NE_OV;
+        AsyncTask       Draw (RenderGraph &rg, ArrayView<AsyncTask> deps)                   __NE_OV;
+        InputModeName   GetInputMode ()                                                     C_NE_OV;
     };
 
 
diff --git a/AE/samples/demo/_data/cpp/mac_names.h b/AE/samples/demo/_data/cpp/mac_names.h
new file mode 100644
index 00000000..8cacb08d
--- /dev/null
+++ b/AE/samples/demo/_data/cpp/mac_names.h
@@ -0,0 +1,90 @@
+namespace RenderTechs
+{
+    using Hash_t                = AE::Base::HashVal32;
+    using RenderTechName_t      = AE::Graphics::RenderTechName;
+    using RenderTechPassName_t  = AE::Graphics::RenderTechPassName;
+    using AttachmentName_t      = AE::Graphics::AttachmentName;
+    using PipelineName_t        = AE::Graphics::PipelineName;
+    using RTShaderBindingName_t = AE::Graphics::RTShaderBindingName;
+    using DescriptorSetName_t   = AE::Graphics::DescriptorSetName;
+
+    static constexpr struct _Canvas_RTech
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0x589bb645u}};}  // 'Canvas.RTech'
+
+        // graphics (0)
+        static constexpr struct _Main
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1f1a625au}};}  // 'Main'
+
+            // RenderPass 'UIPass' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  canvas2d_draw1 {Hash_t{0x821bc820u}};  // 'canvas2d.draw1'
+            static constexpr PipelineName_t  canvas2d_draw2 {Hash_t{0x1b12999au}};  // 'canvas2d.draw2'
+            static constexpr PipelineName_t  canvas2d_draw3 {Hash_t{0x6c15a90cu}};  // 'canvas2d.draw3'
+            static constexpr PipelineName_t  font_draw {Hash_t{0xa4c6d58eu}};  // 'font.draw'
+            static constexpr PipelineName_t  sdf_font_draw {Hash_t{0x91af4121u}};  // 'sdf_font.draw'
+        } Main;
+    } Canvas_RTech;
+
+    static constexpr struct _ImGui_RTech
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0xda495997u}};}  // 'ImGui.RTech'
+
+        // graphics (0)
+        static constexpr struct _Main
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1f1a625au}};}  // 'Main'
+
+            // RenderPass 'UIPass' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  imgui {Hash_t{0xb0f24415u}};  // 'imgui'
+        } Main;
+    } ImGui_RTech;
+
+    static constexpr struct _Scene3D_RTech
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0xdf18d4beu}};}  // 'Scene3D.RTech'
+
+        // graphics (0)
+        static constexpr struct _Main
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1f1a625au}};}  // 'Main'
+
+            // RenderPass 'SceneRPass' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 2;
+            static constexpr AttachmentName_t  att_Depth {Hash_t{0x3b62336du}};  // 'Depth'
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+
+            // pipelines
+            static constexpr PipelineName_t  camera3d_draw1 {Hash_t{0x4094e898u}};  // 'camera3d.draw1'
+            static constexpr PipelineName_t  camera3d_draw2 {Hash_t{0xd99db922u}};  // 'camera3d.draw2'
+        } Main;
+    } Scene3D_RTech;
+
+    static constexpr struct _UI_RTech
+    {
+        constexpr operator RenderTechName_t () const { return RenderTechName_t{Hash_t{0xd1c8aabcu}};}  // 'UI.RTech'
+
+        // graphics (0)
+        static constexpr struct _Main
+        {
+            constexpr operator RenderTechPassName_t () const { return RenderTechPassName_t{Hash_t{0x1f1a625au}};}  // 'Main'
+            static constexpr DescriptorSetName_t  dsLayout {Hash_t{0x53f78985u}};  // 'ui.ds0'
+
+            // RenderPass 'UIPass' subpass 'Main'
+
+            static constexpr uint  attachmentsCount = 1;
+            static constexpr AttachmentName_t  att_Color {Hash_t{0xa79767edu}};  // 'Color'
+        } Main;
+    } UI_RTech;
+}
diff --git a/AE/samples/demo/_data/cpp/mac_types.h b/AE/samples/demo/_data/cpp/mac_types.h
new file mode 100644
index 00000000..626418f1
--- /dev/null
+++ b/AE/samples/demo/_data/cpp/mac_types.h
@@ -0,0 +1,151 @@
+#ifndef VB_UVs2_SCs1_Col8_DEFINED
+#   define VB_UVs2_SCs1_Col8_DEFINED
+    // size: 12, align: 2
+    struct VB_UVs2_SCs1_Col8
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x594166a8u}};  // 'VB_UVs2_SCs1_Col8'
+
+        packed_ushort4  UV_Scale;
+        packed_ubyte4  Color;
+    };
+#endif
+    StaticAssert( offsetof(VB_UVs2_SCs1_Col8, UV_Scale) == 0 );
+    StaticAssert( offsetof(VB_UVs2_SCs1_Col8, Color) == 8 );
+    StaticAssert( sizeof(VB_UVs2_SCs1_Col8) == 12 );
+
+#ifndef VB_Position_f2_DEFINED
+#   define VB_Position_f2_DEFINED
+    // size: 8, align: 4
+    struct VB_Position_f2
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xa843e002u}};  // 'VB_Position_f2'
+
+        packed_float2  Position;
+    };
+#endif
+    StaticAssert( offsetof(VB_Position_f2, Position) == 0 );
+    StaticAssert( sizeof(VB_Position_f2) == 8 );
+
+#ifndef VB_UVf2_Col8_DEFINED
+#   define VB_UVf2_Col8_DEFINED
+    // size: 12, align: 4
+    struct VB_UVf2_Col8
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xf5d3da88u}};  // 'VB_UVf2_Col8'
+
+        packed_float2  UV;
+        packed_ubyte4  Color;
+    };
+#endif
+    StaticAssert( offsetof(VB_UVf2_Col8, UV) == 0 );
+    StaticAssert( offsetof(VB_UVf2_Col8, Color) == 8 );
+    StaticAssert( sizeof(VB_UVf2_Col8) == 12 );
+
+#ifndef CubeVertex_DEFINED
+#   define CubeVertex_DEFINED
+    // size: 40, align: 2
+    struct CubeVertex
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x38ec4b6bu}};  // 'CubeVertex'
+
+        packed_short4  Position;
+        packed_short4  Texcoord;
+        packed_short4  Normal;
+        packed_short4  Tangent;
+        packed_short4  BiTangent;
+    };
+#endif
+    StaticAssert( offsetof(CubeVertex, Position) == 0 );
+    StaticAssert( offsetof(CubeVertex, Texcoord) == 8 );
+    StaticAssert( offsetof(CubeVertex, Normal) == 16 );
+    StaticAssert( offsetof(CubeVertex, Tangent) == 24 );
+    StaticAssert( offsetof(CubeVertex, BiTangent) == 32 );
+    StaticAssert( sizeof(CubeVertex) == 40 );
+
+#ifndef sdf_font_ublock_DEFINED
+#   define sdf_font_ublock_DEFINED
+    // size: 48, align: 16
+    struct sdf_font_ublock
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x5a07d037u}};  // 'sdf_font_ublock'
+
+        float2  rotation0;
+        float2  rotation1;
+        float  sdfScale;
+        float  sdfBias;
+        float  pxRange;
+        float4  bgColor;
+    };
+#endif
+    StaticAssert( offsetof(sdf_font_ublock, rotation0) == 0 );
+    StaticAssert( offsetof(sdf_font_ublock, rotation1) == 8 );
+    StaticAssert( offsetof(sdf_font_ublock, sdfScale) == 16 );
+    StaticAssert( offsetof(sdf_font_ublock, sdfBias) == 20 );
+    StaticAssert( offsetof(sdf_font_ublock, pxRange) == 24 );
+    StaticAssert( offsetof(sdf_font_ublock, bgColor) == 32 );
+    StaticAssert( sizeof(sdf_font_ublock) == 48 );
+
+#ifndef camera3d_ub_DEFINED
+#   define camera3d_ub_DEFINED
+    // size: 64, align: 16
+    struct camera3d_ub
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xd53dbd02u}};  // 'camera3d_ub'
+
+        float4x4_storage  mvp;
+    };
+#endif
+    StaticAssert( offsetof(camera3d_ub, mvp) == 0 );
+    StaticAssert( sizeof(camera3d_ub) == 64 );
+
+#ifndef SphericalCubeVertex_DEFINED
+#   define SphericalCubeVertex_DEFINED
+    // size: 32, align: 2
+    struct SphericalCubeVertex
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x35a6eeecu}};  // 'SphericalCubeVertex'
+
+        packed_short4  Position;
+        packed_short4  Texcoord;
+        packed_short4  Tangent;
+        packed_short4  BiTangent;
+    };
+#endif
+    StaticAssert( offsetof(SphericalCubeVertex, Position) == 0 );
+    StaticAssert( offsetof(SphericalCubeVertex, Texcoord) == 8 );
+    StaticAssert( offsetof(SphericalCubeVertex, Tangent) == 16 );
+    StaticAssert( offsetof(SphericalCubeVertex, BiTangent) == 24 );
+    StaticAssert( sizeof(SphericalCubeVertex) == 32 );
+
+#ifndef imgui_ub_DEFINED
+#   define imgui_ub_DEFINED
+    // size: 16, align: 8 (16)
+    struct imgui_ub
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xb41e4542u}};  // 'imgui_ub'
+
+        float2  scale;
+        float2  translate;
+    };
+#endif
+    StaticAssert( offsetof(imgui_ub, scale) == 0 );
+    StaticAssert( offsetof(imgui_ub, translate) == 8 );
+    StaticAssert( sizeof(imgui_ub) == 16 );
+
+#ifndef imgui_vertex_DEFINED
+#   define imgui_vertex_DEFINED
+    // size: 20, align: 4
+    struct imgui_vertex
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x9e6b2802u}};  // 'imgui_vertex'
+
+        packed_float2  Position;
+        packed_float2  UV;
+        packed_ubyte4  Color;
+    };
+#endif
+    StaticAssert( offsetof(imgui_vertex, Position) == 0 );
+    StaticAssert( offsetof(imgui_vertex, UV) == 8 );
+    StaticAssert( offsetof(imgui_vertex, Color) == 16 );
+    StaticAssert( sizeof(imgui_vertex) == 20 );
+
diff --git a/AE/samples/demo/_data/cpp/vk_types.h b/AE/samples/demo/_data/cpp/vk_types.h
index ba8f774a..626418f1 100644
--- a/AE/samples/demo/_data/cpp/vk_types.h
+++ b/AE/samples/demo/_data/cpp/vk_types.h
@@ -1,6 +1,6 @@
 #ifndef VB_UVs2_SCs1_Col8_DEFINED
 #   define VB_UVs2_SCs1_Col8_DEFINED
-    // size: 12, align: 2 (16)
+    // size: 12, align: 2
     struct VB_UVs2_SCs1_Col8
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x594166a8u}};  // 'VB_UVs2_SCs1_Col8'
@@ -9,13 +9,13 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_UVs2_SCs1_Col8, UV_Scale) == 0 );
-    STATIC_ASSERT( offsetof(VB_UVs2_SCs1_Col8, Color) == 8 );
-    STATIC_ASSERT( sizeof(VB_UVs2_SCs1_Col8) == 12 );
+    StaticAssert( offsetof(VB_UVs2_SCs1_Col8, UV_Scale) == 0 );
+    StaticAssert( offsetof(VB_UVs2_SCs1_Col8, Color) == 8 );
+    StaticAssert( sizeof(VB_UVs2_SCs1_Col8) == 12 );
 
 #ifndef VB_Position_f2_DEFINED
 #   define VB_Position_f2_DEFINED
-    // size: 8, align: 4 (16)
+    // size: 8, align: 4
     struct VB_Position_f2
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0xa843e002u}};  // 'VB_Position_f2'
@@ -23,12 +23,12 @@
         packed_float2  Position;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_Position_f2, Position) == 0 );
-    STATIC_ASSERT( sizeof(VB_Position_f2) == 8 );
+    StaticAssert( offsetof(VB_Position_f2, Position) == 0 );
+    StaticAssert( sizeof(VB_Position_f2) == 8 );
 
 #ifndef VB_UVf2_Col8_DEFINED
 #   define VB_UVf2_Col8_DEFINED
-    // size: 12, align: 4 (16)
+    // size: 12, align: 4
     struct VB_UVf2_Col8
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0xf5d3da88u}};  // 'VB_UVf2_Col8'
@@ -37,13 +37,13 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(VB_UVf2_Col8, UV) == 0 );
-    STATIC_ASSERT( offsetof(VB_UVf2_Col8, Color) == 8 );
-    STATIC_ASSERT( sizeof(VB_UVf2_Col8) == 12 );
+    StaticAssert( offsetof(VB_UVf2_Col8, UV) == 0 );
+    StaticAssert( offsetof(VB_UVf2_Col8, Color) == 8 );
+    StaticAssert( sizeof(VB_UVf2_Col8) == 12 );
 
 #ifndef CubeVertex_DEFINED
 #   define CubeVertex_DEFINED
-    // size: 40, align: 2 (16)
+    // size: 40, align: 2
     struct CubeVertex
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x38ec4b6bu}};  // 'CubeVertex'
@@ -55,12 +55,12 @@
         packed_short4  BiTangent;
     };
 #endif
-    STATIC_ASSERT( offsetof(CubeVertex, Position) == 0 );
-    STATIC_ASSERT( offsetof(CubeVertex, Texcoord) == 8 );
-    STATIC_ASSERT( offsetof(CubeVertex, Normal) == 16 );
-    STATIC_ASSERT( offsetof(CubeVertex, Tangent) == 24 );
-    STATIC_ASSERT( offsetof(CubeVertex, BiTangent) == 32 );
-    STATIC_ASSERT( sizeof(CubeVertex) == 40 );
+    StaticAssert( offsetof(CubeVertex, Position) == 0 );
+    StaticAssert( offsetof(CubeVertex, Texcoord) == 8 );
+    StaticAssert( offsetof(CubeVertex, Normal) == 16 );
+    StaticAssert( offsetof(CubeVertex, Tangent) == 24 );
+    StaticAssert( offsetof(CubeVertex, BiTangent) == 32 );
+    StaticAssert( sizeof(CubeVertex) == 40 );
 
 #ifndef sdf_font_ublock_DEFINED
 #   define sdf_font_ublock_DEFINED
@@ -77,13 +77,13 @@
         float4  bgColor;
     };
 #endif
-    STATIC_ASSERT( offsetof(sdf_font_ublock, rotation0) == 0 );
-    STATIC_ASSERT( offsetof(sdf_font_ublock, rotation1) == 8 );
-    STATIC_ASSERT( offsetof(sdf_font_ublock, sdfScale) == 16 );
-    STATIC_ASSERT( offsetof(sdf_font_ublock, sdfBias) == 20 );
-    STATIC_ASSERT( offsetof(sdf_font_ublock, pxRange) == 24 );
-    STATIC_ASSERT( offsetof(sdf_font_ublock, bgColor) == 32 );
-    STATIC_ASSERT( sizeof(sdf_font_ublock) == 48 );
+    StaticAssert( offsetof(sdf_font_ublock, rotation0) == 0 );
+    StaticAssert( offsetof(sdf_font_ublock, rotation1) == 8 );
+    StaticAssert( offsetof(sdf_font_ublock, sdfScale) == 16 );
+    StaticAssert( offsetof(sdf_font_ublock, sdfBias) == 20 );
+    StaticAssert( offsetof(sdf_font_ublock, pxRange) == 24 );
+    StaticAssert( offsetof(sdf_font_ublock, bgColor) == 32 );
+    StaticAssert( sizeof(sdf_font_ublock) == 48 );
 
 #ifndef camera3d_ub_DEFINED
 #   define camera3d_ub_DEFINED
@@ -95,12 +95,12 @@
         float4x4_storage  mvp;
     };
 #endif
-    STATIC_ASSERT( offsetof(camera3d_ub, mvp) == 0 );
-    STATIC_ASSERT( sizeof(camera3d_ub) == 64 );
+    StaticAssert( offsetof(camera3d_ub, mvp) == 0 );
+    StaticAssert( sizeof(camera3d_ub) == 64 );
 
 #ifndef SphericalCubeVertex_DEFINED
 #   define SphericalCubeVertex_DEFINED
-    // size: 32, align: 2 (16)
+    // size: 32, align: 2
     struct SphericalCubeVertex
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x35a6eeecu}};  // 'SphericalCubeVertex'
@@ -111,11 +111,11 @@
         packed_short4  BiTangent;
     };
 #endif
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, Position) == 0 );
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, Texcoord) == 8 );
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, Tangent) == 16 );
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, BiTangent) == 24 );
-    STATIC_ASSERT( sizeof(SphericalCubeVertex) == 32 );
+    StaticAssert( offsetof(SphericalCubeVertex, Position) == 0 );
+    StaticAssert( offsetof(SphericalCubeVertex, Texcoord) == 8 );
+    StaticAssert( offsetof(SphericalCubeVertex, Tangent) == 16 );
+    StaticAssert( offsetof(SphericalCubeVertex, BiTangent) == 24 );
+    StaticAssert( sizeof(SphericalCubeVertex) == 32 );
 
 #ifndef imgui_ub_DEFINED
 #   define imgui_ub_DEFINED
@@ -128,13 +128,13 @@
         float2  translate;
     };
 #endif
-    STATIC_ASSERT( offsetof(imgui_ub, scale) == 0 );
-    STATIC_ASSERT( offsetof(imgui_ub, translate) == 8 );
-    STATIC_ASSERT( sizeof(imgui_ub) == 16 );
+    StaticAssert( offsetof(imgui_ub, scale) == 0 );
+    StaticAssert( offsetof(imgui_ub, translate) == 8 );
+    StaticAssert( sizeof(imgui_ub) == 16 );
 
 #ifndef imgui_vertex_DEFINED
 #   define imgui_vertex_DEFINED
-    // size: 20, align: 4 (16)
+    // size: 20, align: 4
     struct imgui_vertex
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x9e6b2802u}};  // 'imgui_vertex'
@@ -144,8 +144,8 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(imgui_vertex, Position) == 0 );
-    STATIC_ASSERT( offsetof(imgui_vertex, UV) == 8 );
-    STATIC_ASSERT( offsetof(imgui_vertex, Color) == 16 );
-    STATIC_ASSERT( sizeof(imgui_vertex) == 20 );
+    StaticAssert( offsetof(imgui_vertex, Position) == 0 );
+    StaticAssert( offsetof(imgui_vertex, UV) == 8 );
+    StaticAssert( offsetof(imgui_vertex, Color) == 16 );
+    StaticAssert( sizeof(imgui_vertex) == 20 );
 
diff --git a/AE/samples/demo/_data/images/textures.as b/AE/samples/demo/_data/images/textures.as
index 27023b79..13e937eb 100644
--- a/AE/samples/demo/_data/images/textures.as
+++ b/AE/samples/demo/_data/images/textures.as
@@ -21,6 +21,6 @@ void ASmain ()
         tex.AddLayer( "cubemap.png", RectU(128, 128) + uint2(130,   1), ECubeFace::YPos );
         tex.AddLayer( "cubemap.png", RectU(128, 128) + uint2(388, 130), ECubeFace::ZNeg );
 
-        tex.Store( "simple3d.cube" );
+        tex.Store( "camera3d.cube" );
     }
 }
diff --git a/AE/samples/demo/_data/pipelines/camera3d.as b/AE/samples/demo/_data/pipelines/camera3d.as
index fc949ded..e4c537a3 100644
--- a/AE/samples/demo/_data/pipelines/camera3d.as
+++ b/AE/samples/demo/_data/pipelines/camera3d.as
@@ -21,7 +21,8 @@ void ASmain ()
         pl.DSLayout( 0, "camera3d.ds0" );
     }{
         RC<ShaderStructType>    st = ShaderStructType( "CubeVertex" );
-        st.Set( "packed_short_norm4     Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_short_norm4     Position;" +
                 "packed_short_norm4     Texcoord;" +
                 "packed_short_norm4     Normal;" +
                 "packed_short_norm4     Tangent;" +
@@ -31,7 +32,8 @@ void ASmain ()
         vb.Add( "Position", st );
     }{
         RC<ShaderStructType>    st = ShaderStructType( "SphericalCubeVertex" );
-        st.Set( "packed_short_norm4     Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_short_norm4     Position;" +
                 "packed_short_norm4     Texcoord;" +
                 "packed_short_norm4     Tangent;" +
                 "packed_short_norm4     BiTangent;" );
@@ -74,7 +76,7 @@ void ASmain ()
             rs.inputAssembly.topology       = EPrimitive::TriangleList;
 
             rs.rasterization.frontFaceCCW   = true;
-            rs.rasterization.cullMode       = ECullMode::Front;
+            rs.rasterization.cullMode       = ECullMode::Back;
 
             spec.SetRenderState( rs );
         }
@@ -111,8 +113,8 @@ void ASmain ()
 
             rs.inputAssembly.topology       = EPrimitive::TriangleList;
 
-            rs.rasterization.frontFaceCCW   = true;
-            rs.rasterization.cullMode       = ECullMode::Front;
+            rs.rasterization.frontFaceCCW   = false;
+            rs.rasterization.cullMode       = ECullMode::Back;
 
             spec.SetRenderState( rs );
         }
diff --git a/AE/samples/demo/_data/pipelines/imgui.as b/AE/samples/demo/_data/pipelines/imgui.as
index dea2e759..0de9b300 100644
--- a/AE/samples/demo/_data/pipelines/imgui.as
+++ b/AE/samples/demo/_data/pipelines/imgui.as
@@ -23,7 +23,8 @@ void ASmain ()
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "imgui.vertex" );
-        st.Set( "packed_float2      Position;"  +
+        st.Set( EStructLayout::InternalIO,
+                "packed_float2      Position;"  +
                 "packed_float2      UV;"        +
                 "packed_ubyte_norm4 Color;"     );
 
diff --git a/AE/samples/demo/_data/samplers/default.as b/AE/samples/demo/_data/samplers/default.as
index c3fa6825..aa8eac74 100644
--- a/AE/samples/demo/_data/samplers/default.as
+++ b/AE/samples/demo/_data/samplers/default.as
@@ -34,7 +34,7 @@ void ASmain ()
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
     }
     {
-        RC<Sampler>     samp = Sampler( "AnisotrophyRepeat" );
+        RC<Sampler>     samp = Sampler( "AnisotropyRepeat" );
         samp.AddFeatureSet( "MinDesktop" );
         samp.Filter( EFilter::Linear, EFilter::Linear, EMipmapFilter::Linear );
         samp.AddressMode( EAddressMode::Repeat, EAddressMode::Repeat, EAddressMode::Repeat );
diff --git a/AE/samples/demo/_data/shaders/camera3d.glsl b/AE/samples/demo/_data/shaders/camera3d.glsl
index 1fe067a1..9c90f480 100644
--- a/AE/samples/demo/_data/shaders/camera3d.glsl
+++ b/AE/samples/demo/_data/shaders/camera3d.glsl
@@ -3,8 +3,8 @@
 #   include <aestyle.glsl.h>
 #endif
 //-----------------------------------------------------------------------------
-
 #ifdef SH_VERT
+
     void Main ()
     {
         gl.Position     = drawUB.mvp * float4(in_Position.xyz, 1.0);
@@ -16,21 +16,20 @@
 
         #ifdef SPHERICAL_CUBE
         Out.texcoord    = in_Texcoord.xyz;
-        Out.normal      = in_BiTangent.xyz;
+        Out.texcoord.y  = -Out.texcoord.y;
+        Out.normal      = in_Position.xyz;
         #endif
     }
+
 #endif
 //-----------------------------------------------------------------------------
-
 #ifdef SH_FRAG
     #include "Math.glsl"
 
     void Main ()
     {
-    #if 0
-        out_Color = float4( ToUNorm(Normalize(In.texcoord)), 1.0 );
-    #else
         out_Color = gl.texture.Sample( gl::CombinedTexCube<float>( un_ColorTexture, un_ColorTexture_sampler ), In.texcoord );
-    #endif
     }
+
 #endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/Changelog.md b/AE/samples/res_editor/Changelog.md
index 4be3257b..686b5b0e 100644
--- a/AE/samples/res_editor/Changelog.md
+++ b/AE/samples/res_editor/Changelog.md
@@ -1,3 +1,13 @@
+## 12.2023
+
+
+## 11.2023
+- VR Video projection sample.
+- VR Video player sample (VR to 2D).
+- Curved screen support.
+- Spherical cube tests.
+- Use dynamic variable as per-pass constant, allow to use global slider in multiple passes.
+
 
 ## 10.2023
 - Dispersion sample.
diff --git a/AE/samples/res_editor/Controllers/FPSCamera.cpp b/AE/samples/res_editor/Controllers/FPSCamera.cpp
index 351ff281..7153fdef 100644
--- a/AE/samples/res_editor/Controllers/FPSCamera.cpp
+++ b/AE/samples/res_editor/Controllers/FPSCamera.cpp
@@ -39,7 +39,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( (IA.actionCount - BaseIA.actionCount) == 4 );
+            StaticAssert( (IA.actionCount - BaseIA.actionCount) == 4 );
             switch ( uint{hdr.name} )
             {
                 case IA.Camera_Rotate :
@@ -69,7 +69,7 @@ namespace AE::ResEditor
         _camera.Rotate( Rad{rotation.x}, Rad{rotation.y} );
         _camera.Move( move );
 
-        if ( IsNotZero( zoom ) or _dynDim->IsChanged( INOUT _dimAspect ))
+        if_unlikely( IsNotZero( zoom ) or _dynDim->IsChanged( INOUT _dimAspect ))
         {
             zoom  = Clamp( zoom, -2.f, 2.f );
             zoom  = zoom * _zoomSpeed * timeDelta.count();
@@ -88,7 +88,7 @@ namespace AE::ResEditor
     void  FPSCamera::_Reset ()
     {
         _camera.SetPosition( _initialPos );
-        _camera.SetRotation( Quat::Identity() );
+        _camera.ResetRotation();
         _zoom       = 1.0f;
         _dimAspect  = _dynDim->Aspect();
 
diff --git a/AE/samples/res_editor/Controllers/FPVCamera.cpp b/AE/samples/res_editor/Controllers/FPVCamera.cpp
index 241af478..b0cfb336 100644
--- a/AE/samples/res_editor/Controllers/FPVCamera.cpp
+++ b/AE/samples/res_editor/Controllers/FPVCamera.cpp
@@ -39,7 +39,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( (IA.actionCount - BaseIA.actionCount) == 4 );
+            StaticAssert( (IA.actionCount - BaseIA.actionCount) == 4 );
             switch ( uint{hdr.name} )
             {
                 case IA.Camera_Rotate :
@@ -69,7 +69,7 @@ namespace AE::ResEditor
         _camera.Rotate( Rad{rotation.x}, Rad{rotation.y} );
         _camera.Move3D( move );
 
-        if ( IsNotZero( zoom ) or _dynDim->IsChanged( INOUT _dimAspect ))
+        if_unlikely( IsNotZero( zoom ) or _dynDim->IsChanged( INOUT _dimAspect ))
         {
             zoom  = Clamp( zoom, -2.f, 2.f );
             zoom  = zoom * _zoomSpeed * timeDelta.count();
@@ -88,7 +88,7 @@ namespace AE::ResEditor
     void  FPVCamera::_Reset ()
     {
         _camera.SetPosition( _initialPos );
-        _camera.SetRotation( Quat::Identity() );
+        _camera.ResetRotation();
         _zoom       = 1.0f;
         _dimAspect  = _dynDim->Aspect();
 
diff --git a/AE/samples/res_editor/Controllers/FlightCamera.cpp b/AE/samples/res_editor/Controllers/FlightCamera.cpp
index e2b8cec1..56c05a9b 100644
--- a/AE/samples/res_editor/Controllers/FlightCamera.cpp
+++ b/AE/samples/res_editor/Controllers/FlightCamera.cpp
@@ -42,7 +42,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( (IA.actionCount - BaseIA.actionCount) == 5 );
+            StaticAssert( (IA.actionCount - BaseIA.actionCount) == 5 );
             switch ( uint{hdr.name} )
             {
                 case IA.FlightCamera_Rotate :
@@ -76,7 +76,7 @@ namespace AE::ResEditor
                         Rad{yaw_pitch_roll.z * _rotationScale.z} );
         _camera.Move( move );
 
-        if ( IsNotZero( zoom ) or _dynDim->IsChanged( INOUT _dimAspect ))
+        if_unlikely( IsNotZero( zoom ) or _dynDim->IsChanged( INOUT _dimAspect ))
         {
             _zoom = Clamp( _zoom - zoom * _zoomStep, _3d_minZoom, _3d_maxZoom );
             _camera.SetPerspective( _fovY * _zoom, _dimAspect, _clipPlanes.x, _clipPlanes.y, Bool{_reverseZ} );
diff --git a/AE/samples/res_editor/Controllers/OrbitalCamera.cpp b/AE/samples/res_editor/Controllers/OrbitalCamera.cpp
index f2d16f23..66ee7c98 100644
--- a/AE/samples/res_editor/Controllers/OrbitalCamera.cpp
+++ b/AE/samples/res_editor/Controllers/OrbitalCamera.cpp
@@ -42,7 +42,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( (IA.actionCount - BaseIA.actionCount) == 4 );
+            StaticAssert( (IA.actionCount - BaseIA.actionCount) == 4 );
             switch ( uint{hdr.name} )
             {
                 case IA.Camera_Rotate :
@@ -68,6 +68,11 @@ namespace AE::ResEditor
         _camera.Rotate( Rad{rotation.x * _rotationScale.x}, Rad{rotation.y * _rotationScale.y} );
         _camera.AddOffset( offset * _offsetScale * timeDelta.count() );
 
+        if_unlikely( _dynDim->IsChanged( INOUT _dimAspect ))
+        {
+            _camera.SetPerspective( _fovY, _dimAspect, _clipPlanes.x, _clipPlanes.y, Bool{_reverseZ} );
+        }
+
         _UpdateMatrix();
     }
 
diff --git a/AE/samples/res_editor/Controllers/ScaleBiasCamera.cpp b/AE/samples/res_editor/Controllers/ScaleBiasCamera.cpp
index f6844fbf..bc5e6b48 100644
--- a/AE/samples/res_editor/Controllers/ScaleBiasCamera.cpp
+++ b/AE/samples/res_editor/Controllers/ScaleBiasCamera.cpp
@@ -36,7 +36,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( (IA.actionCount - BaseIA.actionCount) == 3 );
+            StaticAssert( (IA.actionCount - BaseIA.actionCount) == 3 );
             switch ( uint{hdr.name} )
             {
                 case IA.Camera_Bias :
diff --git a/AE/samples/res_editor/Controllers/TopDownCamera.cpp b/AE/samples/res_editor/Controllers/TopDownCamera.cpp
index 02e7ce61..f1517836 100644
--- a/AE/samples/res_editor/Controllers/TopDownCamera.cpp
+++ b/AE/samples/res_editor/Controllers/TopDownCamera.cpp
@@ -37,7 +37,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( (IA.actionCount - BaseIA.actionCount) == 5 );
+            StaticAssert( (IA.actionCount - BaseIA.actionCount) == 5 );
             switch ( uint{hdr.name} )
             {
                 case IA.Camera_Move :
diff --git a/AE/samples/res_editor/Core/EditorCore.cpp b/AE/samples/res_editor/Core/EditorCore.cpp
index 6b563fb8..a0a91d26 100644
--- a/AE/samples/res_editor/Core/EditorCore.cpp
+++ b/AE/samples/res_editor/Core/EditorCore.cpp
@@ -32,7 +32,7 @@ namespace
 
         // threading
         {
-            cfg.threading.maxThreads    = 1;
+            cfg.threading.maxThreads    = 2;
             cfg.threading.maxIOThreads  = 1;
             cfg.threading.mask          = { EThread::PerFrame, EThread::Renderer, EThread::Background, EThread::FileIO };
         }
@@ -46,7 +46,7 @@ namespace
             cfg.graphics.staging.maxReadDynamicSize     = 64_Mb;
             cfg.graphics.staging.maxWriteDynamicSize    = 64_Mb;
             cfg.graphics.staging.dynamicBlockSize       = 32_Mb;
-            cfg.graphics.staging.vstreamSize            = 16_Mb;
+            cfg.graphics.staging.vstreamSize            = 4_Mb;
 
             cfg.graphics.device.appName         = "ResourceEditor";
             cfg.graphics.device.requiredQueues  = EQueueMask::Graphics;
@@ -96,11 +96,8 @@ namespace
 */
     static void  ResEditorAppConfig_VFSPath (ResEditorAppConfig &self, const String &path, const String &prefix)
     {
-        if ( not FileSystem::IsDirectory( path ))
-        {
-            CHECK_THROW_MSG( FileSystem::CreateDirectories( path ),
-                "Failed to create folder '"s << ToString(path) << "'" );
-        }
+        CHECK_THROW_MSG( FileSystem::IsDirectory( path ),
+            "VFSPath '"s << ToString(path) << "' must be existed folder" );
 
         self.vfsPaths.push_back( FileSystem::ToAbsolute( Path{path} ));
         self.vfsPathPrefixes.push_back( prefix );
@@ -496,7 +493,7 @@ void main (Config &out cfg)
 =================================================
 */
     ResEditorApplication::ResEditorApplication () __NE___ :
-        DefaultAppListener{ GetAppConfig(), MakeRC<ResEditorCore>() }
+        AppCoreV1{ GetAppConfig(), MakeRCTh<ResEditorCore>() }
     {
         // for imgui
         {
@@ -541,6 +538,8 @@ void main (Config &out cfg)
             CHECK_ERR( GetVFS().AddStorage( VFS::StorageName{"export"},
                                             VFS::VirtualFileStorageFactory::CreateDynamicFolder( s_REConfig.exportFolder, "export/" )));
         }
+
+        GetVFS().MakeImmutable();
         return true;
     }
 
@@ -552,7 +551,7 @@ void main (Config &out cfg)
     void  ResEditorApplication::OnStart (IApplication &app) __NE___
     {
         _app = &app;
-        DefaultAppListener::OnStart( app );
+        AppCoreV1::OnStart( app );
 
         CHECK_FATAL( Cast<ResEditorCore>(&GetBaseApp())->OnStart() );
 
@@ -566,7 +565,7 @@ void main (Config &out cfg)
 */
     void  ResEditorApplication::OnStop (IApplication &app) __NE___
     {
-        DefaultAppListener::OnStop( app );
+        AppCoreV1::OnStop( app );
         _app = null;
     }
 //-----------------------------------------------------------------------------
@@ -590,7 +589,7 @@ void main (Config &out cfg)
     ResEditorCore::~ResEditorCore ()
     {
       #ifdef AE_ENABLE_VULKAN
-        RenderTaskScheduler().GetDevice().GetRenderDocApi().PrintCaptures();
+        GraphicsScheduler().GetDevice().GetRenderDocApi().PrintCaptures();
       #endif
 
         _mainLoop.Write( Default );
@@ -603,7 +602,7 @@ void main (Config &out cfg)
 */
     bool  ResEditorCore::OnStart ()
     {
-        CATCH_ERR(
+        NOTHROW_ERR(
             _rg.reset( new RenderGraphImpl{} );
 
             ScriptExe::Config   cfg;
@@ -642,6 +641,7 @@ void main (Config &out cfg)
 */
     bool  ResEditorCore::OnSurfaceCreated (IWindow &wnd) __NE___
     {
+        _window = &wnd;
         return _ui.Init( wnd.GetSurface(), c_WindowMode );
     }
 
@@ -717,13 +717,14 @@ void main (Config &out cfg)
         cfg.includeDirs     = s_REConfig.shaderIncludeDirs;
         cfg.pipelineDirs    = s_REConfig.pipelineSearchDirs;
         cfg.scriptDir       = s_REConfig.scriptCallableFolder;
+        cfg.monitor         = _monitor.Read();
 
         auto    output  = _mainLoop.ConstPtr()->output;
         if ( output )
         {
-            auto    sizes = output->GetTargetSizes();
-            CHECK_ERR( sizes.size() == 1 );
-            cfg.dynSize->Resize( sizes[0] );
+            auto    infos = output->GetTargetInfo();
+            CHECK_ERR( infos.size() == 1 );
+            cfg.dynSize->Resize( infos[0].dimension );
         }
 
         auto    renderer = _script->Run( scriptPath, cfg );
@@ -791,11 +792,22 @@ void main (Config &out cfg)
 
 /*
 =================================================
-    _DrawFrame
+    RenderFrame
 =================================================
 */
-    AsyncTask  ResEditorCore::_DrawFrame ()
+    void  ResEditorCore::RenderFrame () __NE___
     {
+        #ifdef AE_ENABLE_VULKAN
+        if ( _ui.IsCaptureRequested() )
+        {
+            auto&   dev = GraphicsScheduler().GetDevice();
+            if ( dev.HasRenderDocApi() )
+            {
+                CHECK( dev.GetRenderDocApi().TriggerFrameCapture() );
+            }
+        }
+        #endif
+
         Ptr<IInputActions>      input;
         Ptr<IOutputSurface>     output;
         RC<Renderer>            renderer;
@@ -827,41 +839,21 @@ void main (Config &out cfg)
         // rendering depends on input processing
         if ( renderer or ui )
         {
-            AsyncTask   begin_frame = rg.BeginFrame( output );
+            if ( not rg.BeginFrame( output ))
+                return;
 
-            AsyncTask   draw_task   = renderer  ? renderer->Execute({ proc_input, begin_frame })    : null;
-            AsyncTask   ui_task     = ui        ? ui->Draw({ proc_input, begin_frame })             : null;
+            AsyncTask   draw_task   = renderer  ? renderer->Execute({ proc_input }) : null;
+            AsyncTask   ui_task     = ui        ? ui->Draw({ proc_input })          : null;
 
             AsyncTask   end_frame   = rg.EndFrame( Tuple{ draw_task, ui_task });
 
             if ( input )
                 input->NextFrame( rg.GetNextFrameId() );
-
-            return end_frame;
         }
         else
-            return proc_input;
-    }
-
-/*
-=================================================
-    RenderFrame
-=================================================
-*/
-    void  ResEditorCore::RenderFrame () __NE___
-    {
-        #ifdef AE_ENABLE_VULKAN
-        if ( _ui.IsCaptureRequested() )
         {
-            auto&   dev = RenderTaskScheduler().GetDevice();
-            if ( dev.HasRenderDocApi() )
-            {
-                CHECK( dev.GetRenderDocApi().TriggerFrameCapture() );
-            }
+            ThreadUtils::Sleep_15ms();
         }
-        #endif
-
-        _mainLoop->endFrame = _DrawFrame();
     }
 
 /*
@@ -873,21 +865,16 @@ void main (Config &out cfg)
                                     Ptr<IWindow>                    window,
                                     Ptr<IVRDevice>                  ) __NE___
     {
-        AsyncTask   task;
-        std::swap( task, _mainLoop->endFrame );
-
-        for (;;)
-        {
-            if ( task == null or task->IsFinished() )
-                break;
-
-            Scheduler().ProcessTasks( threadMask, 0 );
-
-            Scheduler().DbgDetectDeadlock();
-        }
+        CHECK( GraphicsScheduler().WaitNextFrame( threadMask, AE::DefaultTimeout ));
 
         if ( window )
         {
+            if ( _window != window )
+            {
+                _window = window;
+                _monitor.Write( window->GetMonitor() );
+            }
+
             if ( auto new_mode = _ui.GetNewWindowMode();  new_mode.has_value() )
                 Unused( window->SetMode( *new_mode ));
         }
diff --git a/AE/samples/res_editor/Core/EditorCore.h b/AE/samples/res_editor/Core/EditorCore.h
index 0b818356..2f289bc1 100644
--- a/AE/samples/res_editor/Core/EditorCore.h
+++ b/AE/samples/res_editor/Core/EditorCore.h
@@ -57,7 +57,7 @@ namespace AE::ResEditor
     // Resource Editor Application
     //
 
-    class ResEditorApplication final : public AppV1::DefaultAppListener
+    class ResEditorApplication final : public AppV1::AppCoreV1
     {
     // variables
     private:
@@ -99,10 +99,11 @@ namespace AE::ResEditor
             Ptr<IInputActions>      input;      // lifetime is same as Window/VRDevice lifetime
             Ptr<IOutputSurface>     output;     // lifetime is same as Window/VRDevice lifetime
             RC<Renderer>            renderer;
-            AsyncTask               endFrame;
         };
         using MainLoopDataSync  = Synchronized< SharedMutex, MainLoopData >;
 
+        using MonitorSync       = Synchronized< SharedMutex, App::Monitor >;
+
 
     // variables
     private:
@@ -111,6 +112,9 @@ namespace AE::ResEditor
         EditorUI                    _ui;
         Unique<ScriptExe>           _script;
 
+        Ptr<IWindow>                _window;
+        MonitorSync                 _monitor;
+
         RC<MemRStream>              _inputActionsData;
 
         Unique<RenderGraphImpl>     _rg;
@@ -136,9 +140,8 @@ namespace AE::ResEditor
 
     // main loop
     private:
-        ND_ static CoroTask     _ProcessInput (TsInputActions input, RC<Renderer> renderer, Ptr<EditorUI> ui, ActionQueueReader reader);
-        ND_ static CoroTask     _SetInputMode (Ptr<IInputActions> input, InputModeName mode);
-        ND_ AsyncTask           _DrawFrame ();
+        ND_ static CoroTask  _ProcessInput (TsInputActions input, RC<Renderer> renderer, Ptr<EditorUI> ui, ActionQueueReader reader);
+        ND_ static CoroTask  _SetInputMode (Ptr<IInputActions> input, InputModeName mode);
 
 
     // IBaseApp //
diff --git a/AE/samples/res_editor/Core/EditorUI.cpp b/AE/samples/res_editor/Core/EditorUI.cpp
index 00b02191..29fbaae3 100644
--- a/AE/samples/res_editor/Core/EditorUI.cpp
+++ b/AE/samples/res_editor/Core/EditorUI.cpp
@@ -351,7 +351,7 @@ namespace
 
     // methods
     public:
-        DrawTask (EditorUI* t, IOutputSurface &surf, bool isFirst, CommandBatchPtr batch, DebugLabel) :
+        DrawTask (EditorUI* t, IOutputSurface &surf, bool isFirst, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"UI::Draw", HtmlColor::Aqua} },
             t{ *t }, surface{ surf },
             imgui{ this->t._imgui.WriteNoLock() },
@@ -460,7 +460,7 @@ namespace
     {
         ImGui::SetCurrentContext( imgui->ctx );
 
-        const float dt = RenderTaskScheduler().GetFrameTimeDelta().count();
+        const float dt = GraphicsScheduler().GetFrameTimeDelta().count();
         ImGuiIO &   io = ImGui::GetIO();
 
         io.DisplaySize  = ImVec2{float(rtSize.x), float(rtSize.y)};
@@ -1172,7 +1172,7 @@ namespace
                 pauseRendering.store( false );
                 co_return;
             }
-            ( t._core.GetRC(), path, t._compiling, t._pauseRendering ),
+            ( t._core.GetRC<ResEditorCore>(), path, t._compiling, t._pauseRendering ),
             Tuple{},
             "UI::LoadScript"
         );
@@ -1197,7 +1197,7 @@ namespace
             idx_size += cmd_list.IdxBuffer.Size * SizeOf<ImDrawIdx>;
         }
 
-        auto&       staging_mngr    = RenderTaskScheduler().GetResourceManager().GetStagingManager();
+        auto&       staging_mngr    = GraphicsScheduler().GetResourceManager().GetStagingManager();
         const auto  frame_id        = GetFrameId();
 
         VertexStream    vstream;
@@ -1351,7 +1351,7 @@ namespace
     public:
         EditorUI&   t;
 
-        UploadTask (EditorUI* t, CommandBatchPtr batch, DebugLabel) :
+        UploadTask (EditorUI* t, CommandBatchPtr batch, DebugLabel) __NE___ :
             RenderTask{ batch, {"UI::Upload"} },
             t{ *t }
         {}
@@ -1404,7 +1404,7 @@ namespace
 */
     EditorUI::~EditorUI ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.ImmediatelyReleaseResources( _res.fontImg, _res.fontView );
         res_mngr.ReleaseResourceArray( _res.descSets );
@@ -1478,12 +1478,14 @@ namespace
 */
     bool  EditorUI::_LoadPipelinePack ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
-        #ifdef AE_PLATFORM_APPLE
-            const char  fname[] = "mac/ui_pipelines.bin";
+        #ifdef AE_ENABLE_VULKAN
+            constexpr char  fname[] = "vk/ui_pipelines.bin";
+        #elif defined(AE_ENABLE_METAL)
+            constexpr char  fname[] ="mac/ui_pipelines.bin";
         #else
-            const char  fname[] = "vk/ui_pipelines.bin";
+        #   error unsupported platform!
         #endif
 
         auto    file = MakeRC<FileRStream>( fname );
@@ -1525,8 +1527,8 @@ namespace
         }
 
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
         auto&       rg          = RenderGraph();
 
         // initialize font atlas
@@ -1648,7 +1650,7 @@ namespace
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( IA.actionCount == 15 );
+            StaticAssert( IA.actionCount == 15 );
             switch ( uint{hdr.name} )
             {
                 case IA.UI_MousePos :
diff --git a/AE/samples/res_editor/Core/RenderGraph.cpp b/AE/samples/res_editor/Core/RenderGraph.cpp
index 019dd2ec..50f736c3 100644
--- a/AE/samples/res_editor/Core/RenderGraph.cpp
+++ b/AE/samples/res_editor/Core/RenderGraph.cpp
@@ -14,7 +14,7 @@ namespace {
 =================================================
 */
     RenderGraphImpl::RenderGraphImpl () __Th___ :
-        _rg{ RenderTaskScheduler().GetRenderGraph() }
+        _rg{ GraphicsScheduler().GetRenderGraph() }
     {
         CHECK_THROW( _rgInstance == null );
         _rgInstance = this;
@@ -27,7 +27,7 @@ namespace {
 */
     RenderGraphImpl::~RenderGraphImpl ()
     {
-        CHECK( _rg.WaitAll() );
+        CHECK( _rg.WaitAll( AE::DefaultTimeout ));
 
         CHECK( _rgInstance == this );
         _rgInstance = null;
diff --git a/AE/samples/res_editor/Core/RenderGraph.h b/AE/samples/res_editor/Core/RenderGraph.h
index 07749118..f029a861 100644
--- a/AE/samples/res_editor/Core/RenderGraph.h
+++ b/AE/samples/res_editor/Core/RenderGraph.h
@@ -28,10 +28,8 @@ namespace AE::ResEditor
         ~RenderGraphImpl ();
 
         // single threaded
-        template <typename ...Deps>
-        ND_ AsyncTask   BeginFrame (Ptr<IOutputSurface>     surface,
-                                    const BeginFrameConfig  &cfg    = Default,
-                                    const Tuple<Deps...>    &deps   = Default);
+        ND_ bool        BeginFrame (Ptr<IOutputSurface>     surface,
+                                    const BeginFrameConfig  &cfg    = Default);
 
         template <typename ...Deps>
         ND_ AsyncTask   EndFrame (const Tuple<Deps...>  &deps);
@@ -66,14 +64,13 @@ namespace AE::ResEditor
     BeginFrame
 =================================================
 */
-    template <typename ...Deps>
-    AsyncTask  RenderGraphImpl::BeginFrame (Ptr<IOutputSurface> surface, const BeginFrameConfig &cfg, const Tuple<Deps...> &deps)
+    inline bool  RenderGraphImpl::BeginFrame (Ptr<IOutputSurface> surface, const BeginFrameConfig &cfg)
     {
         DRC_EXLOCK( _drCheck );
 
         _surface = surface;
 
-        return _rg.BeginFrame( cfg, deps );
+        return _rg.BeginFrame( cfg );
     }
 
 /*
diff --git a/AE/samples/res_editor/Dynamic/DynamicDimension.h b/AE/samples/res_editor/Dynamic/DynamicDimension.h
index a178be23..8b75d4c5 100644
--- a/AE/samples/res_editor/Dynamic/DynamicDimension.h
+++ b/AE/samples/res_editor/Dynamic/DynamicDimension.h
@@ -230,7 +230,7 @@ namespace AE::ResEditor
     {
         const float new_aspect = Aspect();
 
-        if ( not Equals( new_aspect, oldAspect ))
+        if ( not Equal( new_aspect, oldAspect ))
         {
             oldAspect = new_aspect;
             return true;
diff --git a/AE/samples/res_editor/GeomSource/IGeomSource.h b/AE/samples/res_editor/GeomSource/IGeomSource.h
index 5f3a9ee6..a8b4c194 100644
--- a/AE/samples/res_editor/GeomSource/IGeomSource.h
+++ b/AE/samples/res_editor/GeomSource/IGeomSource.h
@@ -17,10 +17,13 @@ namespace AE::ResEditor
     // types
     protected:
         using PerFrameDescSet_t = StaticArray< Strong<DescriptorSetID>, GraphicsConfig::MaxFrames >;
+        using EDebugMode        = IPass::EDebugMode;
+        using DebugModeBits     = EnumBitSet<EDebugMode>;
 
 
     // methods
     public:
+        ND_ virtual DebugModeBits  GetDebugModeBits ()  C_NE___ { return Default; }
     };
 
 
@@ -33,6 +36,8 @@ namespace AE::ResEditor
     // types
     public:
         using UpdatePassData    = IPass::UpdatePassData;
+        using EDebugMode        = IPass::EDebugMode;
+        using Debugger          = IPass::Debugger;
 
         struct UpdateData
         {
@@ -52,6 +57,11 @@ namespace AE::ResEditor
             IGSMaterials &          mtr;
             DirectCtx::Draw &       ctx;
             DescriptorSetID         passDS;
+
+            ShaderDebugger::Result* dbgStorage  = null;
+            EDebugMode              dbgMode     = Default;
+
+            ND_ bool  IsDebuggerEnabled ()  const { return dbgStorage != null and *dbgStorage and dbgMode != Default; }
         };
 
         enum class ERTGeometryType
@@ -74,17 +84,20 @@ namespace AE::ResEditor
         explicit IGeomSource (Renderer &r) : _renderer{r} {}
 
     public:
-            virtual void  StateTransition (IGSMaterials &, DirectCtx::Graphics &)   __Th___ = 0;
-            virtual void  StateTransition (DirectCtx::RayTracing &)                 __Th___ {}
+            virtual void  PrepareForDebugging (IGSMaterials &, DirectCtx::Transfer &,
+                                               const Debugger &, OUT ShaderDebugger::Result &)  __Th___ {}
+
+            virtual void  StateTransition (IGSMaterials &, DirectCtx::Graphics &)               __Th___ = 0;
+            virtual void  StateTransition (DirectCtx::RayTracing &)                             __Th___ {}
 
-        ND_ virtual bool  Draw (const DrawData &)                                   __Th___ = 0;
-        ND_ virtual bool  PostProcess (const DrawData &)                            __Th___ { return false; }
-        ND_ virtual bool  Update (const UpdateData &)                               __Th___ = 0;
-        ND_ virtual bool  RTUpdate (const UpdateRTData &)                           __Th___ { return false; }
+        ND_ virtual bool  Draw (const DrawData &)                                               __Th___ = 0;
+        ND_ virtual bool  PostProcess (const DrawData &)                                        __Th___ { return false; }
+        ND_ virtual bool  Update (const UpdateData &)                                           __Th___ = 0;
+        ND_ virtual bool  RTUpdate (const UpdateRTData &)                                       __Th___ { return false; }
 
-        ND_ Renderer&           _Renderer ()                                        const   { return _renderer; }
-        ND_ DataTransferQueue&  _DtTrQueue ()                                       const;
-        ND_ GfxMemAllocatorPtr  _GfxAllocator ()                                    const;
+        ND_ Renderer&           _Renderer ()                                                    const   { return _renderer; }
+        ND_ DataTransferQueue&  _DtTrQueue ()                                                   const;
+        ND_ GfxMemAllocatorPtr  _GfxAllocator ()                                                const;
     };
 
 
diff --git a/AE/samples/res_editor/GeomSource/ModelGeomSource.cpp b/AE/samples/res_editor/GeomSource/ModelGeomSource.cpp
index 872ebb5f..4a6709a0 100644
--- a/AE/samples/res_editor/GeomSource/ModelGeomSource.cpp
+++ b/AE/samples/res_editor/GeomSource/ModelGeomSource.cpp
@@ -20,7 +20,7 @@ namespace AE::ResEditor
 */
     ModelGeomSource::Material::~Material ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT descSets );
     }
 //-----------------------------------------------------------------------------
@@ -110,7 +110,7 @@ namespace AE::ResEditor
 */
     ModelGeomSource::Mesh::~Mesh ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResources( _meshData, _nodeBuffer, _materials, _rtInstances, _lights );
     }
 
@@ -277,7 +277,7 @@ namespace AE::ResEditor
         DEBUG_ONLY(
             float4  c2 = UIntToUNorm8x4( res );
             c2 = c2 * (c2.w * _RGBM_MaxRange);
-            ASSERT( All(Equals( col, float3{c2}, 0.002f )));
+            ASSERT( All(Equal( col, float3{c2}, 0.002f )));
         )
         return res;
     }
@@ -535,12 +535,12 @@ namespace AE::ResEditor
         StaticArray< Array<uint>, uint(ERTGeometryType::_Count) >                       rt_materials;
         StaticArray< Array<float3x3>, uint(ERTGeometryType::_Count) >                   rt_norm_mats;
 
-        STATIC_ASSERT( inst_to_mesh.meshesPerInstance.size() == rt_meshes.size() );
-        STATIC_ASSERT( inst_to_mesh.materialsPerInstance.size() == rt_materials.size() );
-        STATIC_ASSERT( inst_to_mesh.normalMatPerInstance.size() == rt_norm_mats.size() );
+        StaticAssert( inst_to_mesh.meshesPerInstance.size() == rt_meshes.size() );
+        StaticAssert( inst_to_mesh.materialsPerInstance.size() == rt_materials.size() );
+        StaticAssert( inst_to_mesh.normalMatPerInstance.size() == rt_norm_mats.size() );
 
-        const DeviceAddress     mesh_addr = RenderTaskScheduler().GetResourceManager().GetDeviceAddress( _meshData );
-        const DeviceAddress     inst_addr = RenderTaskScheduler().GetResourceManager().GetDeviceAddress( _rtInstances );
+        const DeviceAddress     mesh_addr = GraphicsScheduler().GetResourceManager().GetDeviceAddress( _meshData );
+        const DeviceAddress     inst_addr = GraphicsScheduler().GetResourceManager().GetDeviceAddress( _rtInstances );
         CHECK_ERR( mesh_addr != Default and inst_addr != Default );
 
         _intermScene->ForEachNode(
diff --git a/AE/samples/res_editor/GeomSource/ModelGeomSource.h b/AE/samples/res_editor/GeomSource/ModelGeomSource.h
index f9c72e9d..f9fa7f33 100644
--- a/AE/samples/res_editor/GeomSource/ModelGeomSource.h
+++ b/AE/samples/res_editor/GeomSource/ModelGeomSource.h
@@ -51,7 +51,7 @@ namespace AE::ResEditor
 
         // methods
         public:
-            Material () {}
+            Material ()     __NE___ {}
             ~Material ();
         };
 
diff --git a/AE/samples/res_editor/GeomSource/SphericalCube.cpp b/AE/samples/res_editor/GeomSource/SphericalCube.cpp
index 619f4db0..dc035775 100644
--- a/AE/samples/res_editor/GeomSource/SphericalCube.cpp
+++ b/AE/samples/res_editor/GeomSource/SphericalCube.cpp
@@ -8,7 +8,7 @@
 
 namespace AE::ResEditor
 {
-    STATIC_ASSERT( sizeof(GeometryTools::SphericalCubeRenderer::Vertex) == sizeof(ShaderTypes::SphericalCubeVertex) );
+    StaticAssert( sizeof(GeometryTools::SphericalCubeRenderer::Vertex) == sizeof(ShaderTypes::SphericalCubeVertex) );
 
 /*
 =================================================
@@ -17,10 +17,24 @@ namespace AE::ResEditor
 */
     SphericalCube::Material::~Material ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT descSets );
         res_mngr.ReleaseResource( INOUT ubuffer );
     }
+
+/*
+=================================================
+    GetDebugModeBits
+=================================================
+*/
+    IGSMaterials::DebugModeBits  SphericalCube::Material::GetDebugModeBits () C_NE___
+    {
+        DebugModeBits   result;
+        for (auto [mode, ppln] : pplnMap) {
+            result.insert( mode );
+        }
+        return result;
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -30,9 +44,8 @@ namespace AE::ResEditor
     constructor
 =================================================
 */
-    SphericalCube::SphericalCube (Renderer &r, uint minLod, uint maxLod, RC<DynamicFloat> tessLevel) __Th___ :
+    SphericalCube::SphericalCube (Renderer &r, uint minLod, uint maxLod) __NE___ :
         IGeomSource{ r },
-        _tessLevel{ RVRef(tessLevel) },
         _minLod{minLod}, _maxLod{maxLod}
     {}
 
@@ -43,10 +56,33 @@ namespace AE::ResEditor
 */
     SphericalCube::~SphericalCube ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         _cube.Destroy( res_mngr );
     }
 
+/*
+=================================================
+    PrepareForDebugging
+=================================================
+*/
+    void  SphericalCube::PrepareForDebugging (IGSMaterials &inMtr, DirectCtx::Transfer &ctx,
+                                              const Debugger &dbg, OUT ShaderDebugger::Result &dbgStorage) __Th___
+    {
+        ASSERT( dbg.IsEnabled() );
+
+        auto&   mtr = RefCast<Material>(inMtr);
+        auto    it  = mtr.pplnMap.find( dbg.mode );
+
+        if ( it == mtr.pplnMap.end() )
+            return;
+
+        Visit( it->second,
+            [&] (GraphicsPipelineID ppln)   { CHECK( dbg.debugger->AllocForGraphics( OUT dbgStorage, ctx, ppln )); },
+            [&] (MeshPipelineID ppln)       { CHECK( dbg.debugger->AllocForGraphics( OUT dbgStorage, ctx, ppln )); },
+            [] (NullUnion)                  { CHECK_MSG( false, "pipeline is not defined" ); }
+        );
+    }
+
 /*
 =================================================
     StateTransition
@@ -54,6 +90,8 @@ namespace AE::ResEditor
 */
     void  SphericalCube::StateTransition (IGSMaterials &, DirectCtx::Graphics &ctx) __Th___
     {
+        ctx.MemoryBarrier( EResourceState::CopyDst, EResourceState::UniformRead | EResourceState::AllGraphicsShaders );
+
         _resources.SetStates( ctx, EResourceState::AllGraphicsShaders );
     }
 
@@ -67,6 +105,8 @@ namespace AE::ResEditor
         auto&           ctx     = in.ctx;
         auto&           mtr     = RefCast<Material>(in.mtr);
         DescriptorSetID mtr_ds  = mtr.descSets[ ctx.GetFrameId().Index() ];
+        PplnID_t        ppln;
+        bool            use_debugger = false;
 
         const auto      BindPipeline = [&ctx] (const auto &pplnId)
         {{
@@ -77,9 +117,22 @@ namespace AE::ResEditor
             );
         }};
 
-        BindPipeline( mtr.ppln );
+        if ( in.IsDebuggerEnabled() )
+        {
+            auto    it = mtr.pplnMap.find( in.dbgMode );
+            if ( it != mtr.pplnMap.end() )
+            {
+                use_debugger = true;
+                ppln = it->second;
+            }
+        }
+        if ( IsNullUnion( ppln ))
+            ppln = mtr.pplnMap.find( IPass::EDebugMode::Unknown )->second;
+
+        BindPipeline( ppln );
         ctx.BindDescriptorSet( mtr.passDSIndex, in.passDS );
         ctx.BindDescriptorSet( mtr.mtrDSIndex,  mtr_ds );
+        if ( use_debugger ) ctx.BindDescriptorSet( in.dbgStorage->DSIndex(), in.dbgStorage->DescSet() );
 
         CHECK_ERR( _cube.Draw( ctx, _maxLod ));
         return true;
@@ -111,7 +164,7 @@ namespace AE::ResEditor
         {
             ShaderTypes::SphericalCubeMaterialUB    ub_data;
             ub_data.transform   = in.transform;
-            ub_data.tessLevel   = _tessLevel ? _tessLevel->Get() : 1.f;
+            ub_data.normalMat   = float3x3{in.transform}.Inverse();
 
             CHECK_ERR( ctx.UploadBuffer( mtr.ubuffer, 0_b, Sizeof(ub_data), &ub_data ));
         }
diff --git a/AE/samples/res_editor/GeomSource/SphericalCube.h b/AE/samples/res_editor/GeomSource/SphericalCube.h
index 5be9dbb2..ff755cc1 100644
--- a/AE/samples/res_editor/GeomSource/SphericalCube.h
+++ b/AE/samples/res_editor/GeomSource/SphericalCube.h
@@ -18,7 +18,8 @@ namespace AE::ResEditor
 
     // types
     private:
-        using PplnID_t  = Union< NullUnion, GraphicsPipelineID, MeshPipelineID >;
+        using PplnID_t      = Union< NullUnion, GraphicsPipelineID, MeshPipelineID >;
+        using PipelineMap_t = FixedMap< EDebugMode, PplnID_t, uint(EDebugMode::_Count) >;
 
         class Material final : public IGSMaterials
         {
@@ -26,7 +27,7 @@ namespace AE::ResEditor
         public:
             RenderTechPipelinesPtr      rtech;
 
-            PplnID_t                    ppln;
+            PipelineMap_t               pplnMap;
             PerFrameDescSet_t           descSets;
 
             DescSetBinding              passDSIndex;
@@ -37,8 +38,10 @@ namespace AE::ResEditor
 
         // methods
         public:
-            Material () {}
+            Material ()     __NE___ {}
             ~Material ();
+
+            DebugModeBits  GetDebugModeBits ()  C_NE_OV;
         };
 
 
@@ -47,24 +50,24 @@ namespace AE::ResEditor
         GeometryTools::SphericalCubeRenderer    _cube;
         ResourceArray                           _resources;
 
-        RC<DynamicFloat>                        _tessLevel;
-
         const uint                              _minLod     = 0;
         const uint                              _maxLod     = 0;
 
 
     // methods
     public:
-        SphericalCube (Renderer &r, uint minLod, uint maxLod, RC<DynamicFloat> tessLevel) __Th___;
+        SphericalCube (Renderer &r, uint minLod, uint maxLod)                       __NE___;
         ~SphericalCube ();
 
 
     // IGeomSource //
-        void  StateTransition (IGSMaterials &, DirectCtx::Graphics &)   __Th_OV;
+        void  PrepareForDebugging (IGSMaterials &, DirectCtx::Transfer &,
+                                   const Debugger &, OUT ShaderDebugger::Result &)  __Th_OV;
+        void  StateTransition (IGSMaterials &, DirectCtx::Graphics &)               __Th_OV;
         using IGeomSource::StateTransition;
 
-        bool  Draw (const DrawData &)                                   __Th_OV;
-        bool  Update (const UpdateData &)                               __Th_OV;
+        bool  Draw (const DrawData &)                                               __Th_OV;
+        bool  Update (const UpdateData &)                                           __Th_OV;
     };
 
 
diff --git a/AE/samples/res_editor/GeomSource/UnifiedGeometry.cpp b/AE/samples/res_editor/GeomSource/UnifiedGeometry.cpp
index 9575cbde..dbf70a3b 100644
--- a/AE/samples/res_editor/GeomSource/UnifiedGeometry.cpp
+++ b/AE/samples/res_editor/GeomSource/UnifiedGeometry.cpp
@@ -15,10 +15,24 @@ namespace AE::ResEditor
 */
     UnifiedGeometry::Material::~Material ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT descSets );
         res_mngr.ReleaseResource( INOUT ubuffer );
     }
+
+/*
+=================================================
+    GetDebugModeBits
+=================================================
+*/
+    IGSMaterials::DebugModeBits  UnifiedGeometry::Material::GetDebugModeBits () C_NE___
+    {
+        DebugModeBits   result;
+        for (auto& [key, ppln] : pipelineMap) {
+            result.insert( key.second );
+        }
+        return result;
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -28,7 +42,7 @@ namespace AE::ResEditor
     constructor
 =================================================
 */
-    UnifiedGeometry::UnifiedGeometry (Renderer &r) __Th___ :
+    UnifiedGeometry::UnifiedGeometry (Renderer &r) __NE___ :
         IGeomSource{ r }
     {
     }
@@ -36,6 +50,33 @@ namespace AE::ResEditor
     UnifiedGeometry::~UnifiedGeometry ()
     {}
 
+/*
+=================================================
+    PrepareForDebugging
+=================================================
+*/
+    void  UnifiedGeometry::PrepareForDebugging (IGSMaterials &inMtr, DirectCtx::Transfer &ctx,
+                                                const Debugger &dbg, OUT ShaderDebugger::Result &dbgStorage) __Th___
+    {
+        // TODO: array of dbgStorage
+        /*ASSERT( dbg.IsEnabled() );
+
+        auto&   mtr = RefCast<Material>(inMtr);
+
+        for (usize i = 0; i < _drawCommands.size(); ++i)
+        {
+            auto    it = mtr.pipelineMap.find( Pair{ i, dbg.mode });
+            if ( it != mtr.pipelineMap.end() )
+            {
+                Visit( it->second,
+                    [&] (GraphicsPipelineID ppln)   { CHECK( dbg.debugger->AllocForGraphics( OUT dbgStorage, ctx, ppln )); },
+                    [&] (MeshPipelineID ppln)       { CHECK( dbg.debugger->AllocForGraphics( OUT dbgStorage, ctx, ppln )); },
+                    [] (NullUnion)                  { CHECK_MSG( false, "pipeline is not defined" ); }
+                );
+            }
+        }*/
+    }
+
 /*
 =================================================
     StateTransition
@@ -43,6 +84,8 @@ namespace AE::ResEditor
 */
     void  UnifiedGeometry::StateTransition (IGSMaterials &, DirectCtx::Graphics &ctx) __Th___
     {
+        ctx.MemoryBarrier( EResourceState::CopyDst, EResourceState::UniformRead | EResourceState::AllGraphicsShaders );
+
         _resources.SetStates( ctx, EResourceState::AllGraphicsShaders );
 
         for (usize i = 0; i < _drawCommands.size(); ++i)
@@ -92,9 +135,9 @@ namespace AE::ResEditor
         DescriptorSetID     mtr_ds      = mtr.descSets[ ctx.GetFrameId().Index() ];
         Material::PplnID_t  prev_ppln;
 
-        CHECK( _drawCommands.size() == mtr.pplns.size() );
+        CHECK( _drawCommands.size() <= mtr.pipelineMap.size() );
 
-        const auto      BindPipeline = [&ctx, &prev_ppln] (const auto &pplnId)
+        auto    BindPipeline = [&, first = true] (const auto &pplnId) M_Th___
         {{
             if ( prev_ppln == pplnId )
                 return;
@@ -105,15 +148,25 @@ namespace AE::ResEditor
                 [&ctx] (MeshPipelineID ppln)        { ctx.BindPipeline( ppln ); },
                 [] (NullUnion)                      { CHECK_MSG( false, "pipeline is not defined" ); }
             );
-        }};
 
-        BindPipeline( mtr.pplns.front() );
-        ctx.BindDescriptorSet( mtr.passDSIndex, in.passDS );
-        ctx.BindDescriptorSet( mtr.mtrDSIndex,  mtr_ds );
+            if_unlikely( first )
+            {
+                first = false;
+                ctx.BindDescriptorSet( mtr.passDSIndex, in.passDS );
+                ctx.BindDescriptorSet( mtr.mtrDSIndex,  mtr_ds );
+            }
+
+            if ( in.IsDebuggerEnabled() )
+                ctx.BindDescriptorSet( in.dbgStorage->DSIndex(), in.dbgStorage->DescSet() );
+        }};
 
         for (usize i = 0; i < _drawCommands.size(); ++i)
         {
-            BindPipeline( mtr.pplns[i] );
+            auto    ppln_it = mtr.pipelineMap.find( Pair{ i, in.dbgMode });
+            if ( ppln_it == mtr.pipelineMap.end() )
+                continue;
+
+            BindPipeline( ppln_it->second );
 
             Visit( _drawCommands[i],
 
@@ -214,6 +267,7 @@ namespace AE::ResEditor
         {
             ShaderTypes::UnifiedGeometryMaterialUB  ub_data;
             ub_data.transform   = in.transform;
+            ub_data.normalMat   = float3x3{in.transform}.Inverse();
 
             CHECK_ERR( ctx.UploadBuffer( mtr.ubuffer, 0_b, Sizeof(ub_data), &ub_data ));
         }
diff --git a/AE/samples/res_editor/GeomSource/UnifiedGeometry.h b/AE/samples/res_editor/GeomSource/UnifiedGeometry.h
index 499a24e3..3db5990f 100644
--- a/AE/samples/res_editor/GeomSource/UnifiedGeometry.h
+++ b/AE/samples/res_editor/GeomSource/UnifiedGeometry.h
@@ -24,14 +24,14 @@ namespace AE::ResEditor
         // types
         public:
             using PplnID_t      = Union< NullUnion, GraphicsPipelineID, MeshPipelineID >;
-            using PplnPerDraw_t = Array< PplnID_t >;
+            using PipelineMap_t = FlatHashMap< Pair<usize, EDebugMode>, PplnID_t >;
 
 
         // variables
         public:
             RenderTechPipelinesPtr      rtech;
 
-            PplnPerDraw_t               pplns;
+            PipelineMap_t               pipelineMap;
             PerFrameDescSet_t           descSets;
 
             DescSetBinding              passDSIndex;
@@ -42,8 +42,10 @@ namespace AE::ResEditor
 
         // methods
         public:
-            Material () {}
+            Material ()     __NE___ {}
             ~Material ();
+
+            DebugModeBits  GetDebugModeBits ()  C_NE_OV;
         };
 
 
@@ -129,16 +131,18 @@ namespace AE::ResEditor
 
     // methods
     public:
-        UnifiedGeometry (Renderer &r)                                       __Th___;
+        UnifiedGeometry (Renderer &r)                                               __NE___;
         ~UnifiedGeometry ();
 
 
     // IGeomSource //
-        void  StateTransition (IGSMaterials &, DirectCtx::Graphics &)       __Th_OV;
+        void  PrepareForDebugging (IGSMaterials &, DirectCtx::Transfer &,
+                                   const Debugger &, OUT ShaderDebugger::Result &)  __Th_OV;
+        void  StateTransition (IGSMaterials &, DirectCtx::Graphics &)               __Th_OV;
         using IGeomSource::StateTransition;
 
-        bool  Draw (const DrawData &)                                       __Th_OV;
-        bool  Update (const UpdateData &)                                   __Th_OV;
+        bool  Draw (const DrawData &)                                               __Th_OV;
+        bool  Update (const UpdateData &)                                           __Th_OV;
     };
 
 
diff --git a/AE/samples/res_editor/Passes/BuildRTAS.cpp b/AE/samples/res_editor/Passes/BuildRTAS.cpp
index 7230a03f..f91b03aa 100644
--- a/AE/samples/res_editor/Passes/BuildRTAS.cpp
+++ b/AE/samples/res_editor/Passes/BuildRTAS.cpp
@@ -20,7 +20,7 @@ namespace AE::ResEditor
     {
         CHECK_THROW( _dstGeometry );
 
-        auto&   fs = RenderTaskScheduler().GetFeatureSet();
+        auto&   fs = GraphicsScheduler().GetFeatureSet();
         CHECK_THROW_MSG( fs.accelerationStructure() == EFeature::RequireTrue,
             "AS build is not supported" );
 
@@ -80,7 +80,7 @@ namespace AE::ResEditor
     {
         CHECK_THROW( _dstScene );
 
-        auto&   fs = RenderTaskScheduler().GetFeatureSet();
+        auto&   fs = GraphicsScheduler().GetFeatureSet();
         CHECK_THROW_MSG( fs.accelerationStructure() == EFeature::RequireTrue,
             "AS build is not supported" );
 
diff --git a/AE/samples/res_editor/Passes/ComputePass.cpp b/AE/samples/res_editor/Passes/ComputePass.cpp
index c6a08315..c1a276d1 100644
--- a/AE/samples/res_editor/Passes/ComputePass.cpp
+++ b/AE/samples/res_editor/Passes/ComputePass.cpp
@@ -95,7 +95,7 @@ namespace AE::ResEditor
 
                 ppln = it->second;
 
-                RG::DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
+                DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
                 CHECK( pd.dbg.debugger->AllocForCompute( OUT dbg, tctx, ppln, uint3{uint2{pd.dbg.coord * float2{dim} + 0.5f}, 0u }));
                 pd.cmdbuf = tctx.ReleaseCommandBuffer();
             }
@@ -195,7 +195,7 @@ namespace AE::ResEditor
 */
     ComputePass::~ComputePass ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT _descSets );
         res_mngr.ReleaseResource( _ubuffer );
     }
diff --git a/AE/samples/res_editor/Passes/ComputePass.h b/AE/samples/res_editor/Passes/ComputePass.h
index 35615f2b..960cf5d8 100644
--- a/AE/samples/res_editor/Passes/ComputePass.h
+++ b/AE/samples/res_editor/Passes/ComputePass.h
@@ -61,7 +61,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ComputePass () {}
+        ComputePass ()                                                  __NE___ {}
         ~ComputePass ();
 
     // IPass //
diff --git a/AE/samples/res_editor/Passes/Export.cpp b/AE/samples/res_editor/Passes/Export.cpp
index 4f986a1c..609c1eed 100644
--- a/AE/samples/res_editor/Passes/Export.cpp
+++ b/AE/samples/res_editor/Passes/Export.cpp
@@ -9,27 +9,40 @@ namespace AE::ResEditor
 
 /*
 =================================================
-    Update
+    _BeginExport
 =================================================
 */
-    bool  ExportImage::Update (TransferCtx_t &, const UpdatePassData &pd) __Th___
+    bool  ExportImage::_BeginExport (uint frameId)
     {
-        if_unlikely( _frameId != pd.frameId )
+        if_unlikely( _frameId != frameId )
         {
             // restart
-            _frameId = pd.frameId;
+            _frameId = frameId;
 
             VFS::FileName   fname;
             _currPath = _filePath;
 
-            CHECK_THROW( GetVFS().CreateUniqueFile( VFS::StorageName{"export"}, OUT fname, INOUT _currPath ));
+            CHECK_ERR( GetVFS().CreateUniqueFile( OUT fname, INOUT _currPath, VFS::StorageName{"export"} ));
 
             Image::StoreOp  store_op;
             store_op.file = GetVFS().Open<AsyncWDataSource>( fname );
+            CHECK_ERR( store_op.file );
 
             _temp = Image::CreateAndStore( *_src, {store_op}, "" );
-            CHECK_THROW( _temp );
+            CHECK_ERR( _temp );
         }
+        return true;
+    }
+
+/*
+=================================================
+    Update
+=================================================
+*/
+    bool  ExportImage::Update (TransferCtx_t &, const UpdatePassData &pd) __Th___
+    {
+        if ( not _BeginExport( pd.frameId ))
+            return true;  // complete (failed)
 
         if ( not _temp or _temp->GetStatus() != IResource::EUploadStatus::InProgress )
         {
@@ -47,38 +60,51 @@ namespace AE::ResEditor
 
 /*
 =================================================
-    Update
+    _BeginExport
 =================================================
 */
-    bool  ExportBuffer::Update (TransferCtx_t &ctx, const UpdatePassData &pd) __Th___
+    bool  ExportBuffer::_BeginExport (TransferCtx_t &ctx, uint frameId)
     {
-        if_unlikely( _frameId != pd.frameId )
+        if_unlikely( _frameId != frameId )
         {
             // restart
-            _frameId = pd.frameId;
+            _frameId = frameId;
 
             VFS::FileName   fname;
             Path            path = _filePath;
 
-            CHECK_THROW( GetVFS().CreateUniqueFile( VFS::StorageName{"export"}, OUT fname, INOUT path ));
+            CHECK_ERR( GetVFS().CreateUniqueFile( OUT fname, INOUT path, VFS::StorageName{"export"} ));
 
             auto    stream  = GetVFS().Open<WStream>( fname );
-            CHECK_THROW( stream );
+            CHECK_ERR( stream );
 
             auto    read_op = ctx.ReadbackBuffer( _src->GetBufferId( ctx.GetFrameId() ), ReadbackBufferDesc{}.DynamicHeap() );
-            CHECK_THROW( read_op );
+            CHECK_ERR( read_op );
 
-            read_op.Then(   [stream, self = GetRC<ExportBuffer>(), path] (const BufferMemView &memView)
-                            {
-                                self->_parser( memView, *stream );
+            read_op.Then(
+                [stream, self = GetRC<ExportBuffer>(), path] (const BufferMemView &memView)
+                {
+                    self->_parser( memView, *stream );
 
-                                AE_LOGI( "Buffer exported to '"s << ToString(path) << "'" );
+                    AE_LOGI( "Buffer exported to '"s << ToString(path) << "'" );
 
-                                self->_complete.store( true );
-                            });
+                    self->_complete.store( true );
+                });
 
             read_op.Except( [self = GetRC<ExportBuffer>()] () { self->_complete.store( true ); });
         }
+        return true;
+    }
+
+/*
+=================================================
+    Update
+=================================================
+*/
+    bool  ExportBuffer::Update (TransferCtx_t &ctx, const UpdatePassData &pd) __Th___
+    {
+        if ( not _BeginExport( ctx, pd.frameId ))
+            return true;  // complete (failed)
 
         return _complete.load();    // 'true'  - complete
                                     // 'false' - in progress
diff --git a/AE/samples/res_editor/Passes/Export.h b/AE/samples/res_editor/Passes/Export.h
index eaf86e92..92834a09 100644
--- a/AE/samples/res_editor/Passes/Export.h
+++ b/AE/samples/res_editor/Passes/Export.h
@@ -24,12 +24,15 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ExportImage (RC<Image> src, const Path &path) : _src{RVRef(src)}, _filePath{path} {}
+        ExportImage (RC<Image> src, const Path &path)                   __NE___ : _src{RVRef(src)}, _filePath{path} {}
 
     // IPass //
         EPassType   GetType ()                                          C_NE_OV { return EPassType::Export; }
         bool        Update (TransferCtx_t &, const UpdatePassData &)    __Th_OV;
         void        GetResourcesToResize (INOUT Array<RC<IResource>> &) __NE_OV {}
+
+    private:
+        ND_ bool    _BeginExport (uint frameId);
     };
 
 
@@ -55,13 +58,16 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ExportBuffer (RC<Buffer> src, const Path &path, ParserFn_t parser) :
+        ExportBuffer (RC<Buffer> src, const Path &path, ParserFn_t parser)  __Th___ :
             _src{RVRef(src)}, _filePath{path}, _parser{RVRef(parser)} {}
 
     // IPass //
-        EPassType   GetType ()                                          C_NE_OV { return EPassType::Export; }
-        bool        Update (TransferCtx_t &, const UpdatePassData &)    __Th_OV;
-        void        GetResourcesToResize (INOUT Array<RC<IResource>> &) __NE_OV {}
+        EPassType   GetType ()                                              C_NE_OV { return EPassType::Export; }
+        bool        Update (TransferCtx_t &, const UpdatePassData &)        __Th_OV;
+        void        GetResourcesToResize (INOUT Array<RC<IResource>> &)     __NE_OV {}
+
+    private:
+        ND_ bool    _BeginExport (TransferCtx_t &, uint frameId);
     };
 
 
diff --git a/AE/samples/res_editor/Passes/IPass.cpp b/AE/samples/res_editor/Passes/IPass.cpp
index 29b0f2f2..f61b279f 100644
--- a/AE/samples/res_editor/Passes/IPass.cpp
+++ b/AE/samples/res_editor/Passes/IPass.cpp
@@ -6,6 +6,32 @@
 
 namespace AE::ResEditor
 {
+namespace
+{
+    template <typename B>
+    struct CopyConstant
+    {
+        B&      _dst;
+        RC<>    _rc;
+
+        CopyConstant (B& dst, RC<> rc) : _dst{dst}, _rc{RVRef(rc)}
+        {}
+
+        template <typename T, usize I>
+        void  operator () () __NE___
+        {
+            if ( auto* dyn_val = DynCast<T>( _rc.get() ))
+            {
+                auto    val = dyn_val->Get();
+                std::memcpy( OUT &_dst, &val, sizeof(val) );
+            }
+        }
+    };
+
+} // namespace
+//-----------------------------------------------------------------------------
+
+
 
 /*
 =================================================
@@ -56,9 +82,9 @@ namespace AE::ResEditor
             auto    sliders = p_sliders->ReadNoLock();
             SHAREDLOCK( sliders );
 
-            STATIC_ASSERT( sizeof(dstFloats)    == sizeof(sliders->floatSliders) );
-            STATIC_ASSERT( sizeof(dstInts)      == sizeof(sliders->intSliders) );
-            STATIC_ASSERT( sizeof(dstColors)    == sizeof(sliders->colors) );
+            StaticAssert( sizeof(dstFloats) == sizeof(sliders->floatSliders) );
+            StaticAssert( sizeof(dstInts)       == sizeof(sliders->intSliders) );
+            StaticAssert( sizeof(dstColors) == sizeof(sliders->colors) );
 
             std::memcpy( OUT dstFloats.data(),  sliders->floatSliders.data(),   sizeof(dstFloats) );
             std::memcpy( OUT dstInts.data(),    sliders->intSliders.data(),     sizeof(dstInts) );
@@ -75,14 +101,18 @@ namespace AE::ResEditor
                                  OUT StaticArray<float4, 4> &dstFloats,
                                  OUT StaticArray<int4, 4>   &dstInts) const
     {
-        STATIC_ASSERT( sizeof(dstFloats)    == sizeof(float4) * Constants::MaxCount );
-        STATIC_ASSERT( sizeof(dstInts)      == sizeof(int4) * Constants::MaxCount );
+        StaticAssert( sizeof(dstFloats) == sizeof(float4) * Constants::MaxCount );
+        StaticAssert( sizeof(dstInts)       == sizeof(int4) * Constants::MaxCount );
 
-        for (usize i = 0; i < c.f.size(); ++i) {
-            dstFloats[i] = (c.f[i] ? c.f[i]->Get() : float4{});
+        for (usize i = 0; i < c.f.size(); ++i)
+        {
+            if ( c.f[i] )
+                DynamicFloatTypes_t::Visit( CopyConstant{ OUT dstFloats[i], c.f[i] });
         }
-        for (usize i = 0; i < c.i.size(); ++i) {
-            dstInts[i] = (c.i[i] ? c.i[i]->Get() : int4{});
+        for (usize i = 0; i < c.i.size(); ++i)
+        {
+            if ( c.i[i] )
+                DynamicIntTypes_t::Visit( CopyConstant{ OUT dstInts[i], c.i[i] });
         }
     }
 
diff --git a/AE/samples/res_editor/Passes/IPass.h b/AE/samples/res_editor/Passes/IPass.h
index 9639aa9d..6acef866 100644
--- a/AE/samples/res_editor/Passes/IPass.h
+++ b/AE/samples/res_editor/Passes/IPass.h
@@ -21,7 +21,7 @@ namespace AE::ResEditor
 
     // types
     public:
-        using TransferCtx_t = RG::DirectCtx::Transfer;
+        using TransferCtx_t = DirectCtx::Transfer;
         using CustomKeys_t  = StaticArray< float, 1 >;
 
         enum class EPassType : uint
@@ -53,7 +53,7 @@ namespace AE::ResEditor
             Ptr<ShaderDebugger>         debugger;
 
             ND_ bool  IsEnabled ()                  const   { return debugger and mode != Default; }
-            ND_ bool  IsEnabled (const IPass *pass) const   { return IsEnabled() and (pass == target or usize(target) == 0x1); }
+            ND_ bool  IsEnabled (const IPass* pass) const   { return IsEnabled() and (pass == target or usize(target) == 0x1); }
         };
 
         struct SyncPassData
@@ -92,6 +92,7 @@ namespace AE::ResEditor
             uint            seed            = 0;
 
             float2          unormCursorPos;
+            float           pixToMm         = 1.f;      // for current screen
             bool            pressed         = false;    // mouse down or touch pressed
             CustomKeys_t    customKeys      = {};
         };
@@ -115,12 +116,16 @@ namespace AE::ResEditor
 
 
     public:
+        using DynamicFloatTypes_t   = TypeList< DynamicFloat, DynamicFloat2, DynamicFloat3, DynamicFloat4 >;
+        using DynamicIntTypes_t     = TypeList< DynamicInt, DynamicInt2, DynamicInt3, DynamicInt4,
+                                                DynamicUInt, DynamicUInt2, DynamicUInt3, DynamicUInt4 >;
+
         struct Constants
         {
             static constexpr uint   MaxCount = 4;
 
-            StaticArray< RC<DynamicFloat4>, MaxCount >  f;
-            StaticArray< RC<DynamicInt4>,   MaxCount >  i;
+            StaticArray< RC<>, MaxCount >   f;
+            StaticArray< RC<>, MaxCount >   i;
         };
 
 
diff --git a/AE/samples/res_editor/Passes/OtherPasses.cpp b/AE/samples/res_editor/Passes/OtherPasses.cpp
index 281341cf..157ba15c 100644
--- a/AE/samples/res_editor/Passes/OtherPasses.cpp
+++ b/AE/samples/res_editor/Passes/OtherPasses.cpp
@@ -19,10 +19,10 @@ namespace AE::ResEditor
 */
     AsyncTask  Present::PresentAsync (const PresentPassData &pd) __Th___
     {
-        const auto  sizes = pd.surface->GetTargetSizes();
+        const auto  infos = pd.surface->GetTargetInfo();
 
-        if ( _dynSize and not sizes.empty() )
-            _dynSize->Resize( sizes[0] );
+        if ( _dynSize and not infos.empty() )
+            _dynSize->Resize( infos[0].dimension );
 
         {
             auto&       ui      = UIInteraction::Instance();
@@ -97,7 +97,7 @@ namespace AE::ResEditor
                                         sp->pos     = uint2{view.Offset()};
                                         sp->color   = color;
                                     });
-            //RenderTaskScheduler().AddNextCycleDeps( AsyncTask{task} );
+            //GraphicsScheduler().AddNextCycleDeps( AsyncTask{task} );
         }
 
         // read image for screenshot / video
@@ -122,7 +122,7 @@ namespace AE::ResEditor
                                             if ( capture.video and encoder )
                                                 Unused( encoder->AddFrame( inView, True{"end encoding on error"} ));
                                         });
-                //RenderTaskScheduler().AddNextCycleDeps( AsyncTask{task} );
+                //GraphicsScheduler().AddNextCycleDeps( AsyncTask{task} );
             }
         }
 
@@ -175,13 +175,13 @@ namespace AE::ResEditor
         CHECK_ERR( _src.size() == 1 );
 
         const auto  desc    = _src[0]->GetImageDesc();
-        const auto& fs      = RenderTaskScheduler().GetFeatureSet();
+        const auto& fs      = GraphicsScheduler().GetFeatureSet();
 
         IVideoEncoder::Config   cfg;
         cfg.srcFormat       = desc.format;
         cfg.dstFormat       = videoFormat;
-        cfg.srcSize         = uint2{desc.dimension};
-        cfg.dstSize         = cfg.srcSize;
+        cfg.srcDim          = uint2{desc.dimension};
+        cfg.dstDim          = cfg.srcDim;
         cfg.codec           = videoCodec;
         cfg.colorPreset     = preset;
         cfg.filter          = Video::EFilter::Bilinear;
@@ -361,7 +361,7 @@ namespace AE::ResEditor
         {
             dbg_name << "-Copy";
 
-            auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+            auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
             auto    image_id    = res_mngr.CreateImage( img_desc, dbg_name, renderer->GetAllocator() );
             CHECK_THROW( image_id );
 
@@ -370,8 +370,8 @@ namespace AE::ResEditor
 
             renderer->GetDataTransferQueue().EnqueueImageTransition( image_id );
 
-            _copy = MakeRC<Image>( RVRef(image_id), RVRef(view_id), Default, *renderer, false,
-                                   img_desc, ImageViewDesc{img_desc}, null, null, dbg_name );
+            _copy = MakeRCTh<Image>( RVRef(image_id), RVRef(view_id), Default, *renderer, false,
+                                     img_desc, ImageViewDesc{img_desc}, null, null, dbg_name );
         }else{
             _copy = _src;
         }
@@ -441,8 +441,8 @@ namespace AE::ResEditor
         CHECK_THROW( &src != &copy );
         CHECK_THROW( copy.GetImageDesc().format == EPixelFormat::RGBA8_UNorm );
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
 
         _rtech = res_mngr.LoadRenderTech( Default, RTech, Default );
         CHECK_THROW( _rtech );
@@ -470,7 +470,7 @@ namespace AE::ResEditor
 */
     DebugView::Histogram::~Histogram ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.ReleaseResourceArray( _ppln1DS );
         res_mngr.ReleaseResourceArray( _ppln3DS );
@@ -545,7 +545,7 @@ namespace AE::ResEditor
             gfx_ctx.MemoryBarrier( EResourceState::CopyDst, EResourceState::ShaderStorage_Read | EResourceState::VertexProcessingShaders );
             gfx_ctx.MemoryBarrier( EResourceState::ShaderStorage_RW | EResourceState::ComputeShader, EResourceState::ShaderStorage_Read | EResourceState::VertexProcessingShaders );
 
-            STATIC_ASSERT( RTech.Graphics.attachmentsCount == 1 );
+            StaticAssert( RTech.Graphics.attachmentsCount == 1 );
 
             RenderPassDesc  rp_desc{ _rtech, RTech.Graphics, dst_dim };
             rp_desc.AddTarget( RTech.Graphics.att_Color, dstImage.GetViewId(), RGBA32f{0.f} );
@@ -579,8 +579,8 @@ namespace AE::ResEditor
         CHECK_THROW( &src != &copy );
         CHECK_THROW( copy.GetImageDesc().format == EPixelFormat::R32F );
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
 
         _rtech = res_mngr.LoadRenderTech( Default, RTech, Default );
         CHECK_THROW( _rtech );
@@ -601,7 +601,7 @@ namespace AE::ResEditor
 */
     DebugView::LinearDepth::~LinearDepth ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.ReleaseResourceArray( _pplnDS );
     }
@@ -631,7 +631,7 @@ namespace AE::ResEditor
         {
             ctx.ResourceState( srcImage.GetViewId(), EResourceState::ShaderSample | EResourceState::FragmentShader );
 
-            STATIC_ASSERT( RTech.Graphics.attachmentsCount == 1 );
+            StaticAssert( RTech.Graphics.attachmentsCount == 1 );
 
             RenderPassDesc  rp_desc{ _rtech, RTech.Graphics, dst_dim };
             rp_desc.AddTarget( RTech.Graphics.att_Color, dstImage.GetViewId() );
@@ -666,8 +666,8 @@ namespace AE::ResEditor
         CHECK_THROW( &src != &copy );
         CHECK_THROW( copy.GetImageDesc().format == EPixelFormat::RGBA8_UNorm );
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
 
         _rtech = res_mngr.LoadRenderTech( Default, RTech, Default );
         CHECK_THROW( _rtech );
@@ -685,7 +685,7 @@ namespace AE::ResEditor
 */
     DebugView::StencilView::~StencilView ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.ReleaseResourceArray( _pplnDS );
     }
@@ -715,7 +715,7 @@ namespace AE::ResEditor
         {
             ctx.ResourceState( srcImage.GetViewId(), EResourceState::ShaderSample | EResourceState::FragmentShader );
 
-            STATIC_ASSERT( RTech.Graphics.attachmentsCount == 2 );
+            StaticAssert( RTech.Graphics.attachmentsCount == 2 );
 
             RenderPassDesc  rp_desc{ _rtech, RTech.Graphics, dst_dim };
             rp_desc.AddTarget( RTech.Graphics.att_Color, dstImage.GetViewId() );
diff --git a/AE/samples/res_editor/Passes/OtherPasses.h b/AE/samples/res_editor/Passes/OtherPasses.h
index e7fd57f1..16dec65e 100644
--- a/AE/samples/res_editor/Passes/OtherPasses.h
+++ b/AE/samples/res_editor/Passes/OtherPasses.h
@@ -26,7 +26,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        explicit Present (Array<RC<Image>> src, StringView dbgName, RC<DynamicDim> dynSize, RC<DynamicUInt> filterMode) :
+        explicit Present (Array<RC<Image>> src, StringView dbgName, RC<DynamicDim> dynSize, RC<DynamicUInt> filterMode) __NE___ :
             IPass{dbgName}, _src{RVRef(src)}, _dynSize{dynSize}, _filterMode{filterMode} {}
 
     // IPass //
@@ -146,7 +146,7 @@ namespace AE::ResEditor
     private:
         RC<Image>               _src;
         RC<Image>               _copy;      // make a copy if '_src' will be changed
-        RC<Image>               _view;      // view of '_src' or '_copy' which will be displayed 
+        RC<Image>               _view;      // view of '_src' or '_copy' which will be displayed
 
         const uint              _index;
         const EFlags            _flags;
@@ -158,7 +158,7 @@ namespace AE::ResEditor
     public:
         explicit DebugView (RC<Image> src, uint idx, EFlags flags,
                             ImageLayer layer, MipmapLevel mipmap,
-                            Renderer* renderer, StringView dbgName) __Th___;
+                            Renderer* renderer, StringView dbgName)         __Th___;
         ~DebugView ();
 
         ND_ RC<Image>   GetImage ()                                         const   { return _copy; }
@@ -190,7 +190,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        explicit GenerateMipmapsPass (RC<Image> image, StringView dbgName) :
+        explicit GenerateMipmapsPass (RC<Image> image, StringView dbgName) __NE___ :
             IPass{dbgName}, _image{RVRef(image)} {}
 
     // IPass //
@@ -246,7 +246,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        explicit ClearImagePass (RC<Image> image, ClearValue_t value, StringView dbgName) :
+        explicit ClearImagePass (RC<Image> image, ClearValue_t value, StringView dbgName) __NE___ :
             IPass{dbgName}, _image{RVRef(image)}, _value{value} {}
 
     // IPass //
@@ -273,7 +273,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        explicit ClearBufferPass (RC<Buffer> buffer, Bytes offset, Bytes size, uint value, StringView dbgName) :
+        explicit ClearBufferPass (RC<Buffer> buffer, Bytes offset, Bytes size, uint value, StringView dbgName) __NE___ :
             IPass{dbgName}, _buffer{RVRef(buffer)}, _offset{offset}, _size{size}, _value{value} {}
 
     // IPass //
diff --git a/AE/samples/res_editor/Passes/PassGroup.h b/AE/samples/res_editor/Passes/PassGroup.h
index 8d98c96a..d848b661 100644
--- a/AE/samples/res_editor/Passes/PassGroup.h
+++ b/AE/samples/res_editor/Passes/PassGroup.h
@@ -39,7 +39,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        PassGroup (EFlags flags, DataTransferQueue &dtq)                : IPass{""}, _flags{flags}, _dtQueue{dtq} {}
+        PassGroup (EFlags flags, DataTransferQueue &dtq)                __NE___ : IPass{""}, _flags{flags}, _dtQueue{dtq} {}
         ~PassGroup ()                                                   {}
 
         void  AddPass (RC<IPass> pass)                                  __Th___;
diff --git a/AE/samples/res_editor/Passes/Postprocess.cpp b/AE/samples/res_editor/Passes/Postprocess.cpp
index 2350f1cf..cf4b9c95 100644
--- a/AE/samples/res_editor/Passes/Postprocess.cpp
+++ b/AE/samples/res_editor/Passes/Postprocess.cpp
@@ -33,7 +33,7 @@ namespace AE::ResEditor
             {
                 ppln = it->second;
 
-                RG::DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
+                DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
                 CHECK( pd.dbg.debugger->AllocForGraphics( OUT dbg, tctx, ppln, uint2{pd.dbg.coord * float2{dim} + 0.5f} ));
                 pd.cmdbuf = tctx.ReleaseCommandBuffer();
             }
@@ -108,6 +108,7 @@ namespace AE::ResEditor
             ub_data.seed        = pd.seed;
             ub_data.mouse       = pd.pressed ? float4{ pd.unormCursorPos.x, pd.unormCursorPos.y, 1.f, 0.f } : float4{-1.0e+20f};
             ub_data.customKeys  = pd.customKeys[0];
+            ub_data.pixToMm     = pd.pixToMm;
 
             if ( _controller )
                 _controller->CopyTo( OUT ub_data.camera );
@@ -155,7 +156,7 @@ namespace AE::ResEditor
 */
     Postprocess::~Postprocess ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT _descSets );
         res_mngr.ReleaseResource( _ubuffer );
     }
diff --git a/AE/samples/res_editor/Passes/Postprocess.h b/AE/samples/res_editor/Passes/Postprocess.h
index bc13ac63..15fffd82 100644
--- a/AE/samples/res_editor/Passes/Postprocess.h
+++ b/AE/samples/res_editor/Passes/Postprocess.h
@@ -46,7 +46,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        Postprocess () {}
+        Postprocess ()                                                  __NE___ {}
         ~Postprocess ();
 
     // IPass //
diff --git a/AE/samples/res_editor/Passes/RayTracingPass.cpp b/AE/samples/res_editor/Passes/RayTracingPass.cpp
index 3c82020c..2b608aca 100644
--- a/AE/samples/res_editor/Passes/RayTracingPass.cpp
+++ b/AE/samples/res_editor/Passes/RayTracingPass.cpp
@@ -79,7 +79,7 @@ namespace AE::ResEditor
                 ppln = it->second.Get<0>();
                 sbt  = it->second.Get<1>();
 
-                RG::DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
+                DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
                 CHECK( pd.dbg.debugger->AllocForRayTracing( OUT dbg, tctx, ppln, uint3{uint2{pd.dbg.coord * float2{dim} + 0.5f}, 0u }));
                 pd.cmdbuf = tctx.ReleaseCommandBuffer();
             }
@@ -198,7 +198,7 @@ namespace AE::ResEditor
 */
     RayTracingPass::~RayTracingPass ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT _descSets );
         res_mngr.ReleaseResource( _ubuffer );
     }
diff --git a/AE/samples/res_editor/Passes/RayTracingPass.h b/AE/samples/res_editor/Passes/RayTracingPass.h
index 94f06e37..50151e88 100644
--- a/AE/samples/res_editor/Passes/RayTracingPass.h
+++ b/AE/samples/res_editor/Passes/RayTracingPass.h
@@ -58,17 +58,17 @@ namespace AE::ResEditor
         RC<DynamicUInt>         _maxRayRecursion;
         RC<DynamicUInt>         _maxCallRecursion;
 
-        Bytes16u                _rayGenStackMax;
-        Bytes16u                _closestHitStackMax;
-        Bytes16u                _missStackMax;
-        Bytes16u                _intersectionStackMax;
-        Bytes16u                _anyHitStackMax;
-        Bytes16u                _callableStackMax;
+        Byte16u                 _rayGenStackMax;
+        Byte16u                 _closestHitStackMax;
+        Byte16u                 _missStackMax;
+        Byte16u                 _intersectionStackMax;
+        Byte16u                 _anyHitStackMax;
+        Byte16u                 _callableStackMax;
 
 
     // methods
     public:
-        RayTracingPass () {}
+        RayTracingPass ()                                               __NE___ {}
         ~RayTracingPass ();
 
     // IPass //
diff --git a/AE/samples/res_editor/Passes/Renderer.cpp b/AE/samples/res_editor/Passes/Renderer.cpp
index f84a57fe..000afccd 100644
--- a/AE/samples/res_editor/Passes/Renderer.cpp
+++ b/AE/samples/res_editor/Passes/Renderer.cpp
@@ -13,7 +13,7 @@ namespace AE::ResEditor
     constructor
 =================================================
 */
-    Renderer::Renderer (uint seed) :
+    Renderer::Renderer (uint seed) __Th___ :
         _lastUpdateTime{ TimePoint_t::clock::now() },
         _seed{ seed }
     {
@@ -60,7 +60,7 @@ namespace AE::ResEditor
         if ( _controller )
         {
             // validate time
-            const secondsf  dt = Min( RenderTaskScheduler().GetFrameTimeDelta(), secondsf{1.f/30.f} );
+            const secondsf  dt = Min( GraphicsScheduler().GetFrameTimeDelta(), secondsf{1.f/30.f} );
 
             _controller->ProcessInput( reader, dt );
         }
@@ -75,7 +75,7 @@ namespace AE::ResEditor
         ActionQueueReader::Header   hdr;
         for (; reader.ReadHeader( OUT hdr );)
         {
-            STATIC_ASSERT( IA.actionCount == 9 );
+            StaticAssert( IA.actionCount == 9 );
             switch ( uint{hdr.name} )
             {
                 // compatible with UI
@@ -158,9 +158,14 @@ namespace AE::ResEditor
             _lastUpdateTime  = time;
             _frameCounter    ++;
 
-            float2  surf_size {1.f};
-            if ( auto  surf = rg.GetSurface() )
-                surf_size = surf->GetTargetSizes()[0];
+            float2  surf_size   {1.f};
+            float   pix_to_mm   = 1.f;
+            if ( auto  surf = rg.GetSurface() ) {
+                if ( auto  infos = surf->GetTargetInfo();  not infos.empty() ) {
+                    surf_size   = infos[0].dimension;
+                    pix_to_mm   = infos[0].pixToMm;
+                }
+            }
 
             auto    input = _input.ReadNoLock();
             SHAREDLOCK( input );
@@ -168,6 +173,7 @@ namespace AE::ResEditor
             update_pd.unormCursorPos= input->cursorPos / surf_size;
             update_pd.pressed       = input->pressed;
             update_pd.customKeys    = input->customKeys;
+            update_pd.pixToMm       = pix_to_mm;
         }
 
         // setup shader debugger
@@ -385,7 +391,7 @@ namespace AE::ResEditor
         update_pd.frameId   = _frameCounter;
         update_pd.seed      = _seed;
 
-        return ui_batch.Task( _ExportPasses( RVRef(export_passes), GetRC(), update_pd ))
+        return ui_batch.Task( _ExportPasses( RVRef(export_passes), GetRC<Renderer>(), update_pd ))
                         .Run( Tuple{ inDeps, surf_acquire });
     }
 
diff --git a/AE/samples/res_editor/Passes/Renderer.h b/AE/samples/res_editor/Passes/Renderer.h
index 0d49a9e9..48b25bb8 100644
--- a/AE/samples/res_editor/Passes/Renderer.h
+++ b/AE/samples/res_editor/Passes/Renderer.h
@@ -88,7 +88,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        explicit Renderer (uint seed);
+        explicit Renderer (uint seed)                                           __Th___;
         ~Renderer ();
 
             void            ProcessInput (ActionQueueReader reader, OUT bool &switchMode);
diff --git a/AE/samples/res_editor/Passes/Scene.cpp b/AE/samples/res_editor/Passes/Scene.cpp
index 3244d105..5ed0224f 100644
--- a/AE/samples/res_editor/Passes/Scene.cpp
+++ b/AE/samples/res_editor/Passes/Scene.cpp
@@ -20,9 +20,24 @@ namespace AE::ResEditor
 
         CHECK_ERR( _scene );
 
-        const uint2             dim         {_renderTargets[0].image->GetImageDesc().dimension};
-        DirectCtx::Graphics     ctx         { pd.rtask, RVRef(pd.cmdbuf), DebugLabel{_dbgName, _dbgColor} };
-        const auto&             instances   = _scene->_geomInstances;
+        const auto&                     instances   = _scene->_geomInstances;
+        Array<ShaderDebugger::Result>   dbg_result;
+        EDebugMode                      dbg_mode    = Default;
+
+        if ( pd.dbg.IsEnabled( this ))
+        {
+            DirectCtx::Transfer     tctx{ pd.rtask, RVRef(pd.cmdbuf) };
+
+            dbg_result.resize( instances.size() );
+            for (usize i = 0; i < instances.size(); ++i) {
+                instances[i].geometry->PrepareForDebugging( *_materials[i], tctx, pd.dbg, OUT dbg_result[i] );
+            }
+            pd.cmdbuf   = tctx.ReleaseCommandBuffer();
+            dbg_mode    = pd.dbg.mode;
+        }
+
+        const uint2             dim {_renderTargets[0].image->GetImageDesc().dimension};
+        DirectCtx::Graphics     ctx { pd.rtask, RVRef(pd.cmdbuf), DebugLabel{_dbgName, _dbgColor} };
 
         // state transition
         {
@@ -56,14 +71,20 @@ namespace AE::ResEditor
                 case ERenderLayer::Translucent :
                     for (usize i = 0; i < instances.size(); ++i)
                     {
-                        CHECK_ERR( instances[i].geometry->Draw( IGeomSource::DrawData{ *_materials[i], dctx, ds }));
+                        CHECK_ERR( instances[i].geometry->Draw( IGeomSource::DrawData{
+                                        *_materials[i], dctx, ds,
+                                        (dbg_result.empty() ? null : &dbg_result[i]), dbg_mode
+                                    }));
                     }
                     break;
 
                 case ERenderLayer::PostProcess :
                     for (usize i = 0; i < instances.size(); ++i)
                     {
-                        CHECK_ERR( instances[i].geometry->PostProcess( IGeomSource::DrawData{ *_materials[i], dctx, ds }));
+                        CHECK_ERR( instances[i].geometry->PostProcess( IGeomSource::DrawData{
+                                        *_materials[i], dctx, ds,
+                                        (dbg_result.empty() ? null : &dbg_result[i]), dbg_mode
+                                    }));
                     }
                     break;
             }
@@ -167,7 +188,7 @@ namespace AE::ResEditor
 */
     SceneGraphicsPass::~SceneGraphicsPass ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT _descSets );
         res_mngr.ReleaseResource( INOUT _ubuffer );
     }
@@ -296,7 +317,7 @@ namespace AE::ResEditor
 */
     SceneRayTracingPass::~SceneRayTracingPass ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
         res_mngr.ReleaseResourceArray( INOUT _passDescSets );
         res_mngr.ReleaseResourceArray( INOUT _objDescSets );
         res_mngr.ReleaseResource( INOUT _ubuffer );
diff --git a/AE/samples/res_editor/Passes/Scene.h b/AE/samples/res_editor/Passes/Scene.h
index 83f98dc4..d115db5a 100644
--- a/AE/samples/res_editor/Passes/Scene.h
+++ b/AE/samples/res_editor/Passes/Scene.h
@@ -72,7 +72,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        SceneGraphicsPass () {}
+        SceneGraphicsPass ()                                            __NE___ {}
         ~SceneGraphicsPass ();
 
     // IPass //
@@ -121,7 +121,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        SceneRayTracingPass () {}
+        SceneRayTracingPass ()                                          __NE___ {}
         ~SceneRayTracingPass ();
 
     // IPass //
diff --git a/AE/samples/res_editor/Readme.md b/AE/samples/res_editor/Readme.md
index fb67b7e8..e2532818 100644
--- a/AE/samples/res_editor/Readme.md
+++ b/AE/samples/res_editor/Readme.md
@@ -51,4 +51,5 @@ Content:
 ## Release
 
 Precompiled editor with resources:<br/>
+[Win64 - v23.10.199](https://drive.google.com/file/d/1kicA14gnlIwC3ah1qPszUznnFa2WCt6s/view?usp=share_link)
 [Win64 - v23.09.187](https://drive.google.com/file/d/1e_TyVnyi61r8Fk0iXVc_vIxzYEuoPxZS/view?usp=drive_link)
diff --git a/AE/samples/res_editor/ResourceEditor.pch.h b/AE/samples/res_editor/ResourceEditor.pch.h
index 6665aeb1..61321fdc 100644
--- a/AE/samples/res_editor/ResourceEditor.pch.h
+++ b/AE/samples/res_editor/ResourceEditor.pch.h
@@ -13,3 +13,8 @@
 #include "res_loaders/AllImages/AllImageSavers.h"
 #include "res_loaders/Intermediate/IntermImage.h"
 
+#ifdef AE_ENABLE_VULKAN
+# define PIPELINE_STATISTICS    0   // 0 or 1
+#else
+# define PIPELINE_STATISTICS    0   // not supported
+#endif
diff --git a/AE/samples/res_editor/Resources/Buffer.cpp b/AE/samples/res_editor/Resources/Buffer.cpp
index b766f2f2..32c029ab 100644
--- a/AE/samples/res_editor/Resources/Buffer.cpp
+++ b/AE/samples/res_editor/Resources/Buffer.cpp
@@ -86,7 +86,7 @@ namespace
 
         if ( AnyBits( desc.usage, c_DevAddrUsage ))
         {
-            auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+            auto&   res_mngr = GraphicsScheduler().GetResourceManager();
             for (usize i = 0; i < _ids.size(); ++i) {
                 _address[i] = BitCast<ulong>(res_mngr.GetResource( _ids[i].Get() )->GetDeviceAddress());
             }
@@ -152,7 +152,7 @@ namespace
         BufferDesc  desc = _bufDesc.Read();
         desc.size = Max( count, 1u ) * _elemSize;
 
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
         auto&   rs_track    = RenderGraph().GetStateTracker();
 
         auto    buf = res_mngr.CreateBuffer( desc, _dbgName, _GfxDynamicAllocator() );
@@ -251,7 +251,7 @@ namespace
         {
             _loadOp.stream = BufferStream{ _ids[0].Get(), 0_b, _bufDesc->size, 0_b, EStagingHeapType::Dynamic };
         }
-        ASSERT( _loadOp.stream.Buffer() == _ids[0] );
+        ASSERT( _loadOp.stream.BufferId() == _ids[0] );
 
         BufferMemView   dst_mem;
         ctx.UploadBuffer( _loadOp.stream, OUT dst_mem );
diff --git a/AE/samples/res_editor/Resources/DataTransferQueue.cpp b/AE/samples/res_editor/Resources/DataTransferQueue.cpp
index 0ec23bf2..ca7dec2f 100644
--- a/AE/samples/res_editor/Resources/DataTransferQueue.cpp
+++ b/AE/samples/res_editor/Resources/DataTransferQueue.cpp
@@ -11,7 +11,7 @@ namespace AE::ResEditor
     constructor
 =================================================
 */
-    DataTransferQueue::DataTransferQueue () :
+    DataTransferQueue::DataTransferQueue () __NE___ :
         _destroy{0}
     {
         {
@@ -149,7 +149,7 @@ namespace AE::ResEditor
             // upload
             {
                 auto    status = EUploadStatus::Failed;
-                CATCH( status = res->Upload( ctx ));
+                NOTHROW( status = res->Upload( ctx ));
 
                 BEGIN_ENUM_CHECKS();
                 switch ( status )
@@ -259,7 +259,7 @@ namespace AE::ResEditor
             // upload
             {
                 auto    status = EUploadStatus::Failed;
-                CATCH( status = res->Readback( ctx ));
+                NOTHROW( status = res->Readback( ctx ));
 
                 BEGIN_ENUM_CHECKS();
                 switch ( status )
@@ -274,7 +274,7 @@ namespace AE::ResEditor
                         ASSERT( cnt >= 0 );
                         Unused( cnt );
                         break;
-                    }           
+                    }
                     case EUploadStatus::NoMemory :
                     {
                         ++low_mem;
diff --git a/AE/samples/res_editor/Resources/DataTransferQueue.h b/AE/samples/res_editor/Resources/DataTransferQueue.h
index 4d7a842e..aaabe824 100644
--- a/AE/samples/res_editor/Resources/DataTransferQueue.h
+++ b/AE/samples/res_editor/Resources/DataTransferQueue.h
@@ -46,7 +46,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        DataTransferQueue ();
+        DataTransferQueue ()                                                            __NE___;
         ~DataTransferQueue ();
 
         void  EnqueueForUpload (RC<IResource> res);
diff --git a/AE/samples/res_editor/Resources/DefaultResources.cpp b/AE/samples/res_editor/Resources/DefaultResources.cpp
index 3c8b83fb..3fc59685 100644
--- a/AE/samples/res_editor/Resources/DefaultResources.cpp
+++ b/AE/samples/res_editor/Resources/DefaultResources.cpp
@@ -12,14 +12,14 @@ namespace AE::ResEditor
 */
     DefaultResources::DefaultResources () :
         _dtQueue{ MakeRC<DataTransferQueue>() },
-        _gfxLinearAlloc{ RenderTaskScheduler().GetResourceManager().CreateLinearGfxMemAllocator( 256_Mb )},
+        _gfxLinearAlloc{ GraphicsScheduler().GetResourceManager().CreateLinearGfxMemAllocator( 256_Mb )},
         _gfxDynamicAlloc{}  // TODO
     {
         _CreateDummyImage2D( OUT _dummyRes.image2D, _gfxLinearAlloc );
         _CreateDummyImage3D( OUT _dummyRes.image3D, _gfxLinearAlloc );
         _CreateDummyImageCube( OUT _dummyRes.imageCube, _gfxLinearAlloc );
 
-        if ( RenderTaskScheduler().GetFeatureSet().accelerationStructure() == EFeature::RequireTrue )
+        if ( GraphicsScheduler().GetFeatureSet().accelerationStructure() == EFeature::RequireTrue )
         {
             _CreateDummyRTGeometry( OUT _dummyRes.rtGeometry, _gfxLinearAlloc );
             _CreateDummyRTScene( OUT _dummyRes.rtScene, _gfxLinearAlloc );
@@ -33,7 +33,7 @@ namespace AE::ResEditor
 */
     DefaultResources::~DefaultResources ()
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         res_mngr.ReleaseResources( _dummyRes.image2D.image,     _dummyRes.image2D.view );
         res_mngr.ReleaseResources( _dummyRes.image3D.image,     _dummyRes.image3D.view );
@@ -50,7 +50,7 @@ namespace AE::ResEditor
     {
         ASSERT( desc.imageDim != Default );
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         const bool  is_cube     = (desc.imageDim == EImageDim_2D and AllBits( desc.options, EImageOpt::CubeCompatible ));
         const bool  is_2darr    = (desc.imageDim == EImageDim_2D and desc.arrayLayers.Get() > 1);
         const bool  is_2d       = (desc.imageDim == EImageDim_2D and desc.arrayLayers.Get() == 1);
@@ -86,7 +86,7 @@ namespace AE::ResEditor
 */
     Strong<RTGeometryID>  DefaultResources::GetDummyRTGeometry () C_NE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         return res_mngr.AcquireResource( _dummyRes.rtGeometry.Get() );
     }
@@ -98,7 +98,7 @@ namespace AE::ResEditor
 */
     Strong<RTSceneID>  DefaultResources::GetDummyRTScene () C_NE___
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         return res_mngr.AcquireResource( _dummyRes.rtScene.Get() );
     }
@@ -110,7 +110,7 @@ namespace AE::ResEditor
 */
     void  DefaultResources::_CreateDummyImage2D (OUT StrongImageAndViewID &dst, GfxMemAllocatorPtr gfxAlloc) const
     {
-        auto&       res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr = GraphicsScheduler().GetResourceManager();
         ImageDesc   desc;
 
         desc.SetFormat( EPixelFormat::R8_UNorm );
@@ -137,7 +137,7 @@ namespace AE::ResEditor
 */
     void  DefaultResources::_CreateDummyImage3D (OUT StrongImageAndViewID &dst, GfxMemAllocatorPtr gfxAlloc) const
     {
-        auto&       res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr = GraphicsScheduler().GetResourceManager();
         ImageDesc   desc;
 
         desc.SetFormat( EPixelFormat::R8_UNorm );
@@ -164,7 +164,7 @@ namespace AE::ResEditor
 */
     void  DefaultResources::_CreateDummyImageCube (OUT StrongImageAndViewID &dst, GfxMemAllocatorPtr gfxAlloc) const
     {
-        auto&       res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr = GraphicsScheduler().GetResourceManager();
         ImageDesc   desc;
 
         desc.SetFormat( EPixelFormat::R8_UNorm );
@@ -193,7 +193,7 @@ namespace AE::ResEditor
 */
     void  DefaultResources::_CreateDummyRTGeometry (OUT Strong<RTGeometryID> &dst, GfxMemAllocatorPtr gfxAlloc) const
     {
-        auto&           res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&           res_mngr = GraphicsScheduler().GetResourceManager();
         RTGeometryDesc  desc;
 
         desc.options    = Default;
@@ -210,7 +210,7 @@ namespace AE::ResEditor
 */
     void  DefaultResources::_CreateDummyRTScene (OUT Strong<RTSceneID> &dst, GfxMemAllocatorPtr gfxAlloc) const
     {
-        auto&       res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr = GraphicsScheduler().GetResourceManager();
         RTSceneDesc desc;
 
         desc.options    = Default;
diff --git a/AE/samples/res_editor/Resources/IResource.h b/AE/samples/res_editor/Resources/IResource.h
index 5a2bfd63..ee056c47 100644
--- a/AE/samples/res_editor/Resources/IResource.h
+++ b/AE/samples/res_editor/Resources/IResource.h
@@ -88,7 +88,7 @@ namespace AE::ResEditor
             if ( AnyEqual( status, EUploadStatus::Completed, EUploadStatus::Canceled ))
                 break;
 
-            if ( _uploadStatus.CAS( INOUT status, EUploadStatus::Canceled ))
+            if_likely( _uploadStatus.CAS( INOUT status, EUploadStatus::Canceled ))
                 break;
 
             ThreadUtils::Pause();
@@ -107,7 +107,7 @@ namespace AE::ResEditor
             if ( AnyEqual( status, EUploadStatus::Completed, EUploadStatus::Canceled, newStatus ))
                 break;
 
-            if ( _uploadStatus.CAS( INOUT status, newStatus ))
+            if_likely( _uploadStatus.CAS( INOUT status, newStatus ))
                 break;
 
             ThreadUtils::Pause();
diff --git a/AE/samples/res_editor/Resources/Image.cpp b/AE/samples/res_editor/Resources/Image.cpp
index dbccfab8..86165177 100644
--- a/AE/samples/res_editor/Resources/Image.cpp
+++ b/AE/samples/res_editor/Resources/Image.cpp
@@ -118,7 +118,7 @@ namespace {
         auto        img_and_view = renderer.GetDummyImage( desc );
         CHECK_THROW( img_and_view );
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         RC<Image>   result      {new Image{ renderer, dbgName }};
 
         desc            = res_mngr.GetDescription( img_and_view.image );
@@ -258,7 +258,7 @@ namespace {
 */
     bool  Image::_ResizeImage (TransferCtx_t &ctx, const ImageDesc &imageDesc, const ImageViewDesc &viewDesc)
     {
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         {
             CHECK_ERR_MSG( res_mngr.IsSupported( imageDesc ),
@@ -297,7 +297,7 @@ namespace {
         SHAREDLOCK( derived );
 
         for (auto* img : *derived) {
-            CHECK( img->_OnResize( img->GetViewDesc() ));
+            CHECK( img->_UpdateView( img->GetViewDesc() ));
         }
 
         return true;
@@ -353,7 +353,7 @@ namespace {
                             op.stream           = ImageStream{ _id, upload };
                         }
 
-                        ASSERT( op.stream.Image() == _id );
+                        ASSERT( op.stream.ImageId() == _id );
 
                         ImageMemView    src_mem = imageData->ToView( op.curMipmap, op.curLayer );
                         ImageMemView    dst_mem;
@@ -411,7 +411,28 @@ namespace {
 */
     void  Image::_GenMipmaps (TransferCtx_t &ctx) const
     {
-        const auto  desc = GetImageDesc();
+        const auto  desc        = GetImageDesc();
+        uint        num_layers  = 0;
+        bool        gen_mipmaps = false;
+
+        for (auto& op : _loadOps) {
+            gen_mipmaps |= AllBits( op.flags, ELoadOpFlags::GenMipmaps );
+            num_layers  += uint(AllBits( op.flags, ELoadOpFlags::GenMipmaps ) and op.mipmap == 0_mipmap);
+        }
+
+        if ( not gen_mipmaps )
+            return;
+
+        if ( num_layers == desc.arrayLayers.Get() and
+             num_layers == _loadOps.size() )
+        {
+            ctx.GenerateMipmaps( _id );
+            return;
+        }
+
+        // RenderGraph doesn't tack specific image layers, so we need to put explicit barriers
+        ctx.ResourceState( _id, EResourceState::BlitSrc );
+        ctx.CommitBarriers();
 
         for (auto& op : _loadOps)
         {
@@ -424,10 +445,10 @@ namespace {
                 range.baseLayer     = op.layer;
                 range.layerCount    = 1;
                 range.baseMipLevel  = op.mipmap;
-                range.mipmapCount   = desc.maxLevel.Get() - op.mipmap.Get();
+                range.mipmapCount   = ushort(desc.maxLevel.Get() - op.mipmap.Get());
 
                 if ( range.mipmapCount > 1 )
-                    ctx.GenerateMipmaps( _id, {range} );
+                    ctx.GetBaseContext().GenerateMipmaps( _id, {range}, EResourceState::BlitSrc );
             }
         }
     }
@@ -444,7 +465,7 @@ namespace {
         CHECK_ERR( not src._isDummy.load() );
         CHECK_ERR( not storeOps.empty() );
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         RC<Image>   result      {new Image{ src._Renderer(), dbgName }};
 
         Unused( result->_id.Attach( res_mngr.AcquireResource( src._id.Get() )));
@@ -531,7 +552,7 @@ namespace {
                             const uint3     mip_dim     = ImageUtils::MipmapDimension( img_desc.dimension, mipmap.Get(), fmt_info.TexBlockDim() );
 
                             AssetPacker::ImagePacker::Header    header;
-                            header.dimension    = packed_ushort3{mip_dim};
+                            header.dimension    = packed_ushort3{img_desc.dimension};
                             header.arrayLayers  = ushort(img_desc.arrayLayers.Get());
                             header.mipmaps      = ushort(img_desc.maxLevel.Get());
                             header.viewType     = view_type;
@@ -563,11 +584,15 @@ namespace {
                 op.stream = Default;
 
                 if ( ++op.curLayer < img_desc.arrayLayers )
+                {
+                    all_complete    = false;
                     continue;
+                }
 
                 if ( ++op.curMipmap < img_desc.maxLevel )
                 {
-                    op.curLayer = ImageLayer{};
+                    all_complete    = false;
+                    op.curLayer     = ImageLayer{};
                     continue;
                 }
 
@@ -627,23 +652,23 @@ namespace {
         RC<Image>   result  {new Image{ _Renderer(), dbgName }};
 
         result->_inDynSize  = _inDynSize;
-        result->_base       = GetRC();
+        result->_base       = GetRC<Image>();
         result->_uploadStatus.store( EUploadStatus::Completed );
 
         _derived->insert( result.get() );
 
-        CHECK_ERR( result->_OnResize( viewDesc ));
+        CHECK_ERR( result->_UpdateView( viewDesc ));
         return result;
     }
 
 /*
 =================================================
-    _OnResize
+    _UpdateView
 =================================================
 */
-    bool  Image::_OnResize (const ImageViewDesc &viewDesc)
+    bool  Image::_UpdateView (const ImageViewDesc &viewDesc)
     {
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
         auto&   base        = *_base;
 
         auto    image       = res_mngr.AcquireResource( base._id.Get() );
@@ -686,7 +711,7 @@ namespace {
         ASSERT( _isDummy.load() );
         ASSERT( not intermImg.IsEmpty() );
 
-        auto&       res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr = GraphicsScheduler().GetResourceManager();
 
         const auto  Create   = [&] (auto& intermImg) -> bool
         {{
@@ -764,6 +789,14 @@ namespace {
             auto    id      = _id.Release();
             res_mngr.ImmediatelyReleaseResources( view, id );
         }
+
+        auto    derived = _derived.ReadNoLock();
+        SHAREDLOCK( derived );
+
+        for (auto* img : *derived) {
+            CHECK( img->_UpdateView( img->GetViewDesc() ));
+        }
+
         return res;
     }
 
diff --git a/AE/samples/res_editor/Resources/Image.h b/AE/samples/res_editor/Resources/Image.h
index ecffdf75..27eadb38 100644
--- a/AE/samples/res_editor/Resources/Image.h
+++ b/AE/samples/res_editor/Resources/Image.h
@@ -165,7 +165,7 @@ namespace AE::ResEditor
 
 
     private:
-        ND_ bool  _OnResize (const ImageViewDesc &);
+        ND_ bool  _UpdateView (const ImageViewDesc &);
 
         template <typename CtxType>
         ND_ bool  _CreateImage (const ResLoader::IntermImage &, MipmapLevel, ImageLayer,
diff --git a/AE/samples/res_editor/Resources/RTScene.cpp b/AE/samples/res_editor/Resources/RTScene.cpp
index ded16ead..f6e15ad9 100644
--- a/AE/samples/res_editor/Resources/RTScene.cpp
+++ b/AE/samples/res_editor/Resources/RTScene.cpp
@@ -362,7 +362,7 @@ namespace AE::ResEditor
         _isMutable{ allowUpdate or  [this]() {
                                         bool  is_mutable = false;
                                         for (auto& inst : _instances)  is_mutable |= inst.geometry->IsMutable();
-                                        return is_mutable; 
+                                        return is_mutable;
                                     }() },
         _dbgName{ dbgName }
     {
diff --git a/AE/samples/res_editor/Resources/RTScene.h b/AE/samples/res_editor/Resources/RTScene.h
index e6aa323d..cc106e73 100644
--- a/AE/samples/res_editor/Resources/RTScene.h
+++ b/AE/samples/res_editor/Resources/RTScene.h
@@ -30,7 +30,7 @@ namespace AE::ResEditor
         {
             RC<Buffer>      vbuffer;
             RC<Buffer>      ibuffer;
-            Bytes32u        vertexStride;
+            Byte32u         vertexStride;
             Bytes           vertexDataOffset;
             Bytes           indexDataOffset;
 
diff --git a/AE/samples/res_editor/Resources/VideoImage.cpp b/AE/samples/res_editor/Resources/VideoImage.cpp
index 5fe9b7de..ece3af48 100644
--- a/AE/samples/res_editor/Resources/VideoImage.cpp
+++ b/AE/samples/res_editor/Resources/VideoImage.cpp
@@ -24,6 +24,8 @@ namespace AE::ResEditor
         _outDynSize{ RVRef(outDynSize) },
         _dbgName{ dbgName }
     {
+        _states.store( States{} );
+
         _decoder = Video::VideoFactory::CreateFFmpegDecoder();
         CHECK_THROW( _decoder );
 
@@ -33,6 +35,7 @@ namespace AE::ResEditor
         Video::IVideoDecoder::Config    in_cfg;
         in_cfg.dstFormat    = inDesc.format;
         in_cfg.filter       = Video::EFilter::Bilinear;
+        in_cfg.threadCount  = 4;
 
         CHECK_THROW( _decoder->Begin( in_cfg, rstream ));
 
@@ -42,16 +45,16 @@ namespace AE::ResEditor
         CHECK_THROW( vstream != null );
 
         ImageDesc   desc    = inDesc;
-        desc.dimension  = uint3{ vstream->size, 1u };
-        _dimension      = vstream->size;
+        desc.dimension  = uint3{ vstream->dimension, 1u };
+        _dimension      = vstream->dimension;
 
-        auto&   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr    = GraphicsScheduler().GetResourceManager();
         auto&   rstate      = RenderGraph().GetStateTracker();
 
         CHECK_THROW_MSG( res_mngr.IsSupported( desc ),
             "VideoImage '"s << _dbgName << "' description is not supported by GPU device" );
 
-        for (uint i = 0; i < _MaxImages; ++i)
+        for (usize i = 0; i < _ids.size(); ++i)
         {
             _ids[i] = res_mngr.CreateImage( desc, _dbgName + ToString(i), _GfxAllocator() );
             CHECK_THROW( _ids[i] );
@@ -60,14 +63,24 @@ namespace AE::ResEditor
             CHECK_THROW( _views[i] );
 
             rstate.AddResource( _ids[i].Get(),
-                                EResourceState::Invalidate,                                 // current is not used
+                                EResourceState::Invalidate,                                 // current state is not used
                                 EResourceState::ShaderSample | EResourceState::AllShaders,  // default
                                 EQueueType::Graphics );
         }
+
+        auto&   fmt_info = EPixelFormat_GetInfo( desc.format );
+        _allocator.SetBlockSize( ImageUtils::ImageSize( desc.dimension, fmt_info.bitsPerBlock, fmt_info.TexBlockDim() ));
+
+        for (usize i = 0; i < _imageMemView.size(); ++i) {
+            CHECK_THROW( Video::IVideoDecoder::AllocMemView( config, OUT _imageMemView[i], _allocator ));
+        }
+
         _uploadStatus.store( EUploadStatus::InProgress );
 
         _DtTrQueue().EnqueueImageTransition( _ids[0] );
         _DtTrQueue().EnqueueForUpload( GetRC() );
+
+        _lastDecoding = Scheduler().Run( ETaskQueue::Background, _DecodeFrameTask( GetRC<VideoImage>() ), Tuple{}, "Video decoding" );
     }
 
 /*
@@ -77,9 +90,6 @@ namespace AE::ResEditor
 */
     VideoImage::~VideoImage ()
     {
-        if ( _decoder )
-            CHECK( _decoder->End() );
-
         auto&   rstate = RenderGraph().GetStateTracker();
         rstate.ReleaseResourceArray( _ids );
         rstate.ReleaseResourceArray( _views );
@@ -92,49 +102,192 @@ namespace AE::ResEditor
 */
     IResource::EUploadStatus  VideoImage::Upload (TransferCtx_t &ctx) __Th___
     {
-        using FrameInfo = Video::IVideoDecoder::FrameInfo;
-
         if ( auto stat = _uploadStatus.load();  stat != EUploadStatus::InProgress )
             return stat;
 
-        ImageMemView    src_mem;
-        FrameInfo       info;
-        const uint      idx     = (_imageIdx.load()+1) % _MaxImages;
+        // invalidate cache to load '_frameTimes'
+        States  states = _states.load( EMemoryOrder::Acquire );
+        _Validate( states );
+
+        if ( (states.emptyBits != 0) and (not _lastDecoding or not _lastDecoding->IsInQueue()) )
+            _lastDecoding = Scheduler().Run( ETaskQueue::Background, _DecodeFrameTask( GetRC<VideoImage>() ), Tuple{_lastDecoding}, "Video decoding" );
+
+
+        // variants:
+        //  - decoding in progress  -> skip
+        //  - frame ready           -> begin uploading
+        //  - uploading in progress -> continue uploading
+        const uint  mem_idx = states.pos;
+
+        if ( not HasBit( states.decodedBits, mem_idx ))
+            return _uploadStatus.load();  // decoding in progress
+
+        const auto  cur_time = Second_t{_curTime.Add( GraphicsScheduler().GetFrameTimeDelta().count() )};
+
+        if ( cur_time < _frameTimes[mem_idx] )
+            return _uploadStatus.load();  // skip
+
+        const uint  idx = (_imageIdx.load()+1) % _ids.size();
 
         // init image stream
+        if ( not _stream.IsInitialized() )
         {
             UploadImageDesc     upload;
             upload.imageSize    = uint3{ _dimension, 1u };
             upload.heapType     = EStagingHeapType::Dynamic;
             upload.aspectMask   = EImageAspect::Color;
             _stream             = ImageStream{ _ids[idx], upload };
+
+            ctx.ResourceState( _ids[idx], EResourceState::Invalidate );
         }
+        ASSERT( _stream.ImageId() == _ids[idx] );
+
 
-        // get video frame and upload it to GPU
-        if ( _decoder->GetFrame( OUT src_mem, OUT info ))
+        // upload
+        ImageMemView&   src_mem = _imageMemView[ mem_idx ];
+        ImageMemView    dst_mem;
+        ctx.UploadImage( _stream, OUT dst_mem );
+
+        if ( not dst_mem.Empty() )
         {
-            _frameTimes[ idx ] = info.timestamp;
+            CHECK( dst_mem.CopyFrom( uint3{}, dst_mem.Offset(), src_mem, dst_mem.Dimension() ));
+        }
 
-            ImageMemView    dst_mem;
-            ctx.ResourceState( _ids[idx], EResourceState::Invalidate );
-            ctx.UploadImage( _stream, OUT dst_mem );
+        if ( _stream.IsCompleted() )
+        {
+            _imageIdx.store( idx );
+            _stream = ImageStream{};
 
-            if ( not dst_mem.Empty() )
+            // update 'pos', 'decodedBits'
+            for (States exp = states;;)
             {
-                CHECK( dst_mem.CopyFrom( uint3{}, dst_mem.Offset(), src_mem, dst_mem.Dimension() ));
+                states.pos          = mem_idx+1;
+                states.emptyBits    |= ToBit<uint>( mem_idx );
+                states.decodedBits  &= ~ToBit<uint>( mem_idx );
+
+                if_likely( _states.CAS( INOUT exp, states ))
+                    break;
+
+                states = exp;
+                ThreadUtils::Pause();
             }
+        }
 
-            CHECK( _stream.IsCompleted() );
-            _imageIdx.store( idx );
+        return _uploadStatus.load();
+    }
+
+/*
+=================================================
+    Cancel
+=================================================
+*/
+    void  VideoImage::Cancel () __NE___
+    {
+        IResource::Cancel();
+
+        Unused( Scheduler().Wait( {_lastDecoding}, seconds{1} ));
+        _lastDecoding = null;
+    }
+
+/*
+=================================================
+    _DecodeFrameTask
+=================================================
+*/
+    CoroTask  VideoImage::_DecodeFrameTask (RC<VideoImage> self) __NE___
+    {
+        for (uint i = 0; i < _MaxCpuImages/2; ++i)
+        {
+            if ( self->_uploadStatus.load() != EUploadStatus::InProgress )
+                break;
+
+            uint    cnt = self->_DecodeFrame();
+            if ( cnt == 0 )
+                break;
+        }
+        co_return;
+    }
+
+/*
+=================================================
+    _DecodeFrame
+=================================================
+*/
+    uint  VideoImage::_DecodeFrame () __NE___
+    {
+        using FrameInfo = Video::IVideoDecoder::FrameInfo;
+
+        // find empty image
+        States      states  = _states.load();
+        uint        idx     = states.pos;
+
+        _Validate( states );
+
+        if_unlikely( states.emptyBits == 0 )
+            return 0;
+
+        for (uint i = 0; i < _MaxCpuImages; ++i)
+        {
+            if ( HasBit( states.emptyBits, idx ))
+                break;
+
+            idx = (idx+1) % _MaxCpuImages;
+        }
+        ASSERT( not HasBit( states.decodedBits, idx ));
+
+        if_unlikely( not _decoder )
+            return 0;
+
+        uint    result = 0;
+
+        // get next video frame
+        if ( FrameInfo info;  _decoder->GetNextFrame( INOUT _imageMemView[idx], OUT info ))
+        {
+            _frameTimes[idx] = info.timestamp;
+
+            for (States exp = states;;)
+            {
+                states.emptyBits    &= ~ToBit<uint>( idx );
+                states.decodedBits  |= ToBit<uint>( idx );
+
+                // flush cache to make '_frameTimes[idx]' visible
+                if_likely( _states.CAS( INOUT exp, states, EMemoryOrder::Release, EMemoryOrder::Relaxed ))
+                    break;
+
+                states = exp;
+                ThreadUtils::Pause();
+            }
+
+            result = uint(BitCount( states.emptyBits ));
         }
         else
+        // restart
         {
-            // restart
-            if ( not _decoder->SeekTo( 0 ))
+            _frameTimes.fill( Second_t{0.0} );
+            _states.store( States{}, EMemoryOrder::Release );
+            _curTime.store( 0.0 );
+
+            if ( _decoder->SeekTo( 0 )) {
+                result = UMax;
+            }else{
                 _SetUploadStatus( EUploadStatus::Canceled );
+            }
         }
 
-        return _uploadStatus.load();
+        return result;
+    }
+
+/*
+=================================================
+    _Validate
+=================================================
+*/
+    void  VideoImage::_Validate (const States s) __NE___
+    {
+        Unused( s );
+        ASSERT( not AnyBits( s.emptyBits, s.decodedBits ));
+        ASSERT( (s.emptyBits | s.decodedBits) == ToBitMask<uint>(_MaxCpuImages) );
+        ASSERT( s.decodedBits == 0 or HasBit( s.decodedBits, s.pos ));
     }
 
 
diff --git a/AE/samples/res_editor/Resources/VideoImage.h b/AE/samples/res_editor/Resources/VideoImage.h
index 9033a304..16727f6e 100644
--- a/AE/samples/res_editor/Resources/VideoImage.h
+++ b/AE/samples/res_editor/Resources/VideoImage.h
@@ -11,59 +11,87 @@ namespace AE::ResEditor
     // Video Image
     //
 
-    class VideoImage final : public IResource
+    class alignas(AE_CACHE_LINE) VideoImage final : public IResource
     {
     // types
-    public:
-        static constexpr uint   _MaxImages = 4;
+    private:
+        static constexpr uint   _MaxCpuImages   = 8;
+        static constexpr uint   _PosBits        = CT_IntLog2< _MaxCpuImages >;
+        static constexpr uint   _MaxGpuImages   = 4;
+
+        struct States
+        {
+            uint    emptyBits       : _MaxCpuImages;    // available for decoding
+            uint    decodedBits     : _MaxCpuImages;    // available for uploading
+            uint    pos             : _PosBits;         // current or next uploading
 
-        using ImageArr_t    = StaticArray< Strong<ImageID>,     _MaxImages >;
-        using ViewArr_t     = StaticArray< Strong<ImageViewID>, _MaxImages >;
+            States () : emptyBits{UMax}, decodedBits{0}, pos{0} {}
+        };
+
+        StaticAssert( sizeof(States) == sizeof(uint) );
+        StaticAssert( ToBit<uint>( _PosBits ) == _MaxCpuImages );
+
+        using ImageArr_t    = StaticArray< Strong<ImageID>,     _MaxGpuImages >;
+        using ViewArr_t     = StaticArray< Strong<ImageViewID>, _MaxGpuImages >;
         using Second_t      = Video::IVideoDecoder::Second_t;
-        using FrameTimes_t  = StaticArray< Second_t,            _MaxImages >;
+        using FrameTimes_t  = StaticArray< Second_t,            _MaxCpuImages >;
+        using MemArr_t      = StaticArray< ImageMemView,        _MaxCpuImages >;
+        using Allocator_t   = LinearAllocator< UntypedAllocator, _MaxCpuImages, false >;    // use as block allocator
 
 
     // variables
     private:
+        Atomic<uint>                _imageIdx   {0};    // used for '_ids', '_views'
+        BitAtomic<States>           _states;            // used for '_frameTimes', '_imageMemView'
+        FAtomic<double>             _curTime;           // Second_t
+
         ImageArr_t                  _ids;
         ViewArr_t                   _views;
+
         FrameTimes_t                _frameTimes;
-        Atomic<uint>                _imageIdx   {0};
+        MemArr_t                    _imageMemView;
+        Allocator_t                 _allocator;
 
-        RC<DynamicDim>              _outDynSize;    // triggered when current image has been resized
+        RC<DynamicDim>              _outDynSize;        // triggered when current image has been resized
         RC<Video::IVideoDecoder>    _decoder;
         uint2                       _dimension;
         ImageStream                 _stream;
 
+        AsyncTask                   _lastDecoding;
+
         const String                _dbgName;
 
 
     // methods
-    private:
-
     public:
         VideoImage (Renderer &          renderer,
                     const ImageDesc &   desc,
                     const VFS::FileName &filename,
                     RC<DynamicDim>      outDynSize,
-                    StringView          dbgName)            __Th___;
+                    StringView          dbgName)                __Th___;
 
         ~VideoImage () override;
 
-            bool  Resize (TransferCtx_t &)                  __Th_OV { return true; }
-            bool  RequireResize ()                          C_Th_OV { return false; }
+            bool  Resize (TransferCtx_t &)                      __Th_OV { return true; }
+            bool  RequireResize ()                              C_Th_OV { return false; }
 
-        ND_ ImageID         GetImageId ()                   C_NE___ { return _ids[ _CurrentIdx() ]; }
-        ND_ ImageViewID     GetViewId ()                    C_NE___ { return _views[ _CurrentIdx() ]; }
-        ND_ StringView      GetName ()                      C_NE___ { return _dbgName; }
+        ND_ ImageID         GetImageId ()                       C_NE___ { return _ids[ _CurrentIdx() ]; }
+        ND_ ImageViewID     GetViewId ()                        C_NE___ { return _views[ _CurrentIdx() ]; }
+        ND_ StringView      GetName ()                          C_NE___ { return _dbgName; }
 
 
     // IResource //
-        EUploadStatus       Upload (TransferCtx_t &)        __Th_OV;
-        EUploadStatus       Readback (TransferCtx_t &)      __Th_OV { return EUploadStatus::Canceled; }
+        EUploadStatus       Upload (TransferCtx_t &)            __Th_OV;
+        EUploadStatus       Readback (TransferCtx_t &)          __Th_OV { return EUploadStatus::Canceled; }
+        void                Cancel ()                           __NE_OV;
 
     private:
-        ND_ uint            _CurrentIdx ()                  C_NE___ { return _imageIdx.load() % _MaxImages; }
+        ND_ uint            _CurrentIdx ()                      C_NE___ { return _imageIdx.load() % _MaxGpuImages; }
+
+            static CoroTask _DecodeFrameTask (RC<VideoImage>)   __NE___;
+        ND_ uint            _DecodeFrame ()                     __NE___;
+
+        ND_ static void     _Validate (States)                  __NE___;
     };
 
 
diff --git a/AE/samples/res_editor/Scripting/PipelineCompiler.inl.h b/AE/samples/res_editor/Scripting/PipelineCompiler.inl.h
index 0529f6de..a7002845 100644
--- a/AE/samples/res_editor/Scripting/PipelineCompiler.inl.h
+++ b/AE/samples/res_editor/Scripting/PipelineCompiler.inl.h
@@ -52,15 +52,24 @@ namespace AE::ResEditor
                 PipelineCompiler::EImageType_FromImage( type, multisampling );
     }
 
-    ND_ inline PipelineCompiler::EImageType  GetDescriptorImageTypeRelaxed (const Graphics::ImageDesc &desc)
+    ND_ inline Tuple< PipelineCompiler::EImageType, PipelineCompiler::EImageType >  GetDescriptorImageTypeRelaxed (const Graphics::ImageDesc &desc)
     {
         CHECK_ERR( desc.imageDim != Default );
         CHECK_ERR( desc.format != Default );
 
-        Graphics::ImageViewDesc view{desc};
+        Graphics::ImageViewDesc view {desc};
         view.Validate( desc );
 
-        return GetDescriptorImageTypeRelaxed( desc.format, view.viewType, desc.samples.IsEnabled() );
+        auto    t0 = GetDescriptorImageTypeRelaxed( desc.format, view.viewType, desc.samples.IsEnabled() );
+        auto    t1 = t0;
+
+        if ( AllBits( desc.options, Graphics::EImageOpt::CubeCompatible ))
+        {
+            view.viewType = desc.arrayLayers.Get() > 6 ? Graphics::EImage::CubeArray : Graphics::EImage::Cube;
+
+            t1 = GetDescriptorImageTypeRelaxed( desc.format, view.viewType, desc.samples.IsEnabled() );
+        }
+        return Tuple{ t0, t1 };
     }
 
 
diff --git a/AE/samples/res_editor/Scripting/ScriptBasePass.cpp b/AE/samples/res_editor/Scripting/ScriptBasePass.cpp
index 5ec26031..612e9dcb 100644
--- a/AE/samples/res_editor/Scripting/ScriptBasePass.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptBasePass.cpp
@@ -23,7 +23,7 @@ namespace AE::ResEditor
         std::memcpy( OUT intRange, other.intRange, sizeof(intRange) );
     }
 
-    ScriptBasePass::Slider::Slider (Slider && other) :
+    ScriptBasePass::Slider::Slider (Slider &&other) :
         name{ RVRef(other.name) },
         index{ other.index },
         type{ other.type },
@@ -54,11 +54,11 @@ namespace AE::ResEditor
     void  ScriptBasePass::_Slider (const String &name, const T &min, const T &max, T val, ESlider type) __Th___
     {
         CHECK_THROW_MSG( _uniqueSliderNames.insert( name ).second,
-            "Slider '"s << name << "' is already exists" );
+            "Slider/Constant '"s << name << "' is already exists" );
 
         uint    idx = _sliderCounter[ uint(type) ]++;
         CHECK_THROW_MSG( idx < UIInteraction::MaxSlidersPerType,
-            "Slider count "s << ToString(idx) << " must be less than " << ToString(UIInteraction::MaxSlidersPerType) );
+            "Slider count "s << ToString(idx+1) << " must be less than " << ToString(UIInteraction::MaxSlidersPerType) );
 
         auto&   dst = _sliders.emplace_back();
 
@@ -204,19 +204,54 @@ namespace AE::ResEditor
     ConstantF*
 =================================================
 */
-    void  ScriptBasePass::ConstantF4 (const String &, const ScriptDynamicFloat4Ptr &) __Th___
-    {
-        // TODO
-    }
+    void  ScriptBasePass::ConstantF1 (const String &name, const ScriptDynamicFloatPtr  &dynVal) __Th___ { return _Constant( name, dynVal, ESlider::Float, 1 ); }
+    void  ScriptBasePass::ConstantF2 (const String &name, const ScriptDynamicFloat2Ptr &dynVal) __Th___ { return _Constant( name, dynVal, ESlider::Float, 2 ); }
+    void  ScriptBasePass::ConstantF3 (const String &name, const ScriptDynamicFloat3Ptr &dynVal) __Th___ { return _Constant( name, dynVal, ESlider::Float, 3 ); }
+    void  ScriptBasePass::ConstantF4 (const String &name, const ScriptDynamicFloat4Ptr &dynVal) __Th___ { return _Constant( name, dynVal, ESlider::Float, 4 ); }
 
 /*
 =================================================
     ConstantI*
 =================================================
 */
-    void  ScriptBasePass::ConstantI4 (const String &, const ScriptDynamicInt4Ptr &) __Th___
+    void  ScriptBasePass::ConstantI1 (const String &name, const ScriptDynamicIntPtr  &dynVal) __Th___   { return _Constant( name, dynVal, ESlider::Int, 1 ); }
+    void  ScriptBasePass::ConstantI2 (const String &name, const ScriptDynamicInt2Ptr &dynVal) __Th___   { return _Constant( name, dynVal, ESlider::Int, 2 ); }
+    void  ScriptBasePass::ConstantI3 (const String &name, const ScriptDynamicInt3Ptr &dynVal) __Th___   { return _Constant( name, dynVal, ESlider::Int, 3 ); }
+    void  ScriptBasePass::ConstantI4 (const String &name, const ScriptDynamicInt4Ptr &dynVal) __Th___   { return _Constant( name, dynVal, ESlider::Int, 4 ); }
+
+/*
+=================================================
+    ConstantU*
+=================================================
+*/
+    void  ScriptBasePass::ConstantU1 (const String &name, const ScriptDynamicUIntPtr  &dynVal) __Th___  { return _Constant( name, dynVal, ESlider::Int, 1 ); }
+    void  ScriptBasePass::ConstantU2 (const String &name, const ScriptDynamicUInt2Ptr &dynVal) __Th___  { return _Constant( name, dynVal, ESlider::Int, 2 ); }
+    void  ScriptBasePass::ConstantU3 (const String &name, const ScriptDynamicUInt3Ptr &dynVal) __Th___  { return _Constant( name, dynVal, ESlider::Int, 3 ); }
+    void  ScriptBasePass::ConstantU4 (const String &name, const ScriptDynamicUInt4Ptr &dynVal) __Th___  { return _Constant( name, dynVal, ESlider::Int, 4 ); }
+
+/*
+=================================================
+    _Constant
+=================================================
+*/
+    template <typename T>
+    void  ScriptBasePass::_Constant (const String &name, const T &dynVal, ESlider type, ubyte count) __Th___
     {
-        // TODO
+        CHECK_THROW_MSG( dynVal and dynVal->Get() );
+
+        CHECK_THROW_MSG( _uniqueSliderNames.insert( name ).second,
+            "Constant/Slider '"s << name << "' is already exists" );
+
+        uint    idx = _constantCounter[ uint(type) ]++;
+        CHECK_THROW_MSG( idx < UIInteraction::MaxSlidersPerType,
+            "Constants count "s << ToString(idx) << " must be less than " << ToString(UIInteraction::MaxSlidersPerType) );
+
+        auto&   dst = _constants.emplace_back();
+        dst.name    = name;
+        dst.index   = idx;
+        dst.type    = type;
+        dst.count   = count;
+        dst.rc      = dynVal->Get();
     }
 
 /*
@@ -291,20 +326,19 @@ namespace AE::ResEditor
 */
     void  ScriptBasePass::_CopyConstants (OUT IPass::Constants &dst) const
     {
-        // TODO
-        /*for (auto& c : _constants)
+        for (auto& c : _constants)
         {
             switch ( c.type )
             {
                 case ESlider::Float :
-                    dst.f[ c.index ] = c.f4->Get();
+                    dst.f[ c.index ] = c.rc;
                     break;
 
                 case ESlider::Int :
-                    dst.i[ c.index ] = c.i4->Get();
+                    dst.i[ c.index ] = c.rc;
                     break;
             }
-        }*/
+        }
     }
 
 /*
@@ -422,6 +456,11 @@ namespace AE::ResEditor
 
         // add constants
         {
+            const uint  max_constants = UIInteraction::MaxSlidersPerType;
+            for (usize i = 0; i < _constantCounter.size(); ++i) {
+                CHECK_THROW_MSG( _constantCounter[i] <= max_constants );
+            }
+
             for (auto& c : _constants)
             {
                 header << "#define " << c.name << " un_PerPass.";
@@ -436,11 +475,55 @@ namespace AE::ResEditor
                 }
                 END_ENUM_CHECKS();
 
-                header << ToString( c.index ) << "]\n";
+                header << ToString( c.index ) << "]";
+                switch ( c.count )
+                {
+                    case 1 :    header << ".x";     break;
+                    case 2 :    header << ".xy";    break;
+                    case 3 :    header << ".xyz";   break;
+                    case 4 :    header << ".xyzw";  break;
+                    default :   CHECK_THROW_MSG( false, "unknown constant value size" );
+                }
+                header << "\n";
             }
         }
     }
 
+/*
+=================================================
+    _AddSlidersAsMacros
+=================================================
+*/
+    void  ScriptBasePass::_AddSlidersAsMacros (OUT String &macros) C_Th___
+    {
+        String  temp;
+        _AddSliders( OUT temp );
+
+        const StringView    str {temp};
+        const StringView    def {"#define "};
+
+        // change format from '#define name  value' to 'name = value;'
+        for (usize pos = 0;;)
+        {
+            pos = str.find( def, pos );
+            if ( pos == StringView::npos )
+                break;
+
+            const usize begin   = pos + def.length();
+
+            pos = str.find( '\n', begin );
+            if ( pos == StringView::npos )
+                break;
+
+            usize   p0 = str.find( " ", begin );
+
+            macros << str.substr( begin, p0 - begin ); // name
+            macros << " = ";
+            macros << str.substr( p0+1, pos - p0-1 );  // value
+            macros << '\n';
+        }
+    }
+
 /*
 =================================================
     EnableIf*
@@ -481,7 +564,7 @@ namespace AE::ResEditor
     _Init
 =================================================
 */
-    void  ScriptBasePass::_Init (IPass &dst) C_Th___
+    void  ScriptBasePass::_Init (IPass &dst, const ScriptBaseControllerPtr &defaultController) C_Th___
     {
         _CopyConstants( OUT dst._shConst );
         _AddSlidersToUIInteraction( &dst );
@@ -489,10 +572,12 @@ namespace AE::ResEditor
         dst._dbgName    = this->_dbgName;
         dst._dbgColor   = this->_dbgColor;
 
-        if ( this->_controller )
+        ScriptBaseControllerPtr controller = this->_controller ? this->_controller : defaultController;
+
+        if ( controller )
         {
-            this->_controller->SetDimensionIfNotSet( _dynamicDim );
-            dst._controller = this->_controller->ToController();  // throw
+            controller->SetDimensionIfNotSet( _dynamicDim );
+            dst._controller = controller->ToController();  // throw
             CHECK_THROW( dst._controller );
         }
 
diff --git a/AE/samples/res_editor/Scripting/ScriptBasePass.cpp.h b/AE/samples/res_editor/Scripting/ScriptBasePass.cpp.h
index a2a6852b..040acf3c 100644
--- a/AE/samples/res_editor/Scripting/ScriptBasePass.cpp.h
+++ b/AE/samples/res_editor/Scripting/ScriptBasePass.cpp.h
@@ -14,7 +14,7 @@ namespace
     template <typename T>
     static ScriptBasePass*  ScriptBasePass_ToBase (T* ptr)
     {
-        STATIC_ASSERT( IsBaseOf< ScriptBasePass, T >);
+        StaticAssert( IsBaseOf< ScriptBasePass, T >);
 
         ScriptBasePassPtr  result{ ptr };
         return result.Detach();
@@ -54,7 +54,7 @@ namespace
 
                 binder.Comment( "Enable alll debug features." );
                 binder.AddValue( "Enable_AllShaderDbg", EFlags::Enable_AllShaderDbg );
-                STATIC_ASSERT( uint(EFlags::All) == 7 );
+                StaticAssert( uint(EFlags::All) == 7 );
             }
         }
 
@@ -91,8 +91,20 @@ namespace
         classBinder.AddMethod( &ScriptBasePass::ColorSelector3,     "ColorSelector",    {"name", "initial"} );
 
         classBinder.Comment( "TODO" );
-        classBinder.AddMethod( &ScriptBasePass::ConstantF4,         "Constant",         {} );
-        classBinder.AddMethod( &ScriptBasePass::ConstantI4,         "Constant",         {} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantF1,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantF2,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantF3,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantF4,         "Constant",         {"name", "dynamicValue"} );
+
+        classBinder.AddMethod( &ScriptBasePass::ConstantI1,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantI2,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantI3,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantI4,         "Constant",         {"name", "dynamicValue"} );
+
+        classBinder.AddMethod( &ScriptBasePass::ConstantU1,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantU2,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantU3,         "Constant",         {"name", "dynamicValue"} );
+        classBinder.AddMethod( &ScriptBasePass::ConstantU4,         "Constant",         {"name", "dynamicValue"} );
 
         classBinder.Comment( "Returns dynamic dimension of the pass.\n"
                              "It is auto-detected when used render targets with dynamic dimension or dynamic size for compute dispatches." );
@@ -105,7 +117,7 @@ namespace
         if ( withArgs )
         {
             classBinder.Comment( "Add resource to all shaders in the current pass.\n"
-                                 "In - resource is used for read access.\n"
+                                 "In  - resource is used for read access.\n"
                                  "Out - resource is used for write access.\n" );
             classBinder.AddMethod( &ScriptBasePass::ArgSceneIn,         "ArgIn",            {"uniformName", "resource"} );
 
@@ -119,7 +131,7 @@ namespace
 
             classBinder.AddMethod( &ScriptBasePass::ArgTextureIn,       "ArgIn",            {"uniformName", "resource", "samplerName"} );
             classBinder.AddMethod( &ScriptBasePass::ArgVideoIn,         "ArgIn",            {"uniformName", "resource", "samplerName"} );
-            classBinder.AddMethod( &ScriptBasePass::ArgController,      "ArgIn",            {"camera"} );
+            classBinder.AddMethod( &ScriptBasePass::ArgController,      "Set",              {"camera"} );
 
             classBinder.AddMethod( &ScriptBasePass::ArgImageArrIn,      "ArgIn",            {"uniformName", "resources"} );
             classBinder.AddMethod( &ScriptBasePass::ArgImageArrOut,     "ArgOut",           {"uniformName", "resources"} );
@@ -145,29 +157,39 @@ namespace
             classBinder.Comment( "Add color/depth render target.\n"
                                  "Implicitly name will be 'out_Color' + index." );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
-            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "mipmap"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "mipmap"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "layerCount"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "layerCount", "mipmap"} );
+
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "clearColor"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "mipmap", "clearColor"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "clearColor"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "mipmap", "clearColor"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "layerCount", "clearColor"} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {"image", "baseLayer", "layerCount", "mipmap", "clearColor"} );
 
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
 
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
 
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
         }
 
         // with name
@@ -177,26 +199,36 @@ namespace
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
 
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32f &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
 
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32u &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
 
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const RGBA32i &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
 
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, const DepthStencil &) >( &ScriptBaseRenderPass::_Output, "Output", {} );
         }
 
         // with blend
@@ -208,22 +240,30 @@ namespace
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
 
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
 
             classBinder.Comment( "Add color render target with blend operation and with explicit name." );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
 
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
             classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
+            classBinder.template AddGenericMethod< void (const String &, const ScriptImagePtr &, const ImageLayer &, uint, const MipmapLevel &, EBlendFactor, EBlendFactor, EBlendOp, EBlendFactor, EBlendFactor, EBlendOp) >( &ScriptBaseRenderPass::_OutputBlend, "OutputBlend", {} );
         }
 
         // depth
diff --git a/AE/samples/res_editor/Scripting/ScriptBasePass.h b/AE/samples/res_editor/Scripting/ScriptBasePass.h
index e2d371bc..e59a84a3 100644
--- a/AE/samples/res_editor/Scripting/ScriptBasePass.h
+++ b/AE/samples/res_editor/Scripting/ScriptBasePass.h
@@ -73,22 +73,19 @@ namespace AE::ResEditor
 
         struct Constant
         {
-            String              name;
-            uint                index       = UMax;
-            ESlider             type        = ESlider::_Count;
-            ScriptRCBase        rc;         // Dynamic + Int|UInt|Float + 1|2|3|4
+            String      name;
+            uint        index       = UMax;
+            ESlider     type        = ESlider::_Count;
+            ubyte       count       = 0;
+            RC<>        rc;         // Dynamic + Int|UInt|Float + 1|2|3|4
         };
-        using Constants_t       = Array< Constant >;
+        using Constants_t   = Array< Constant >;
 
 
     // variables
     protected:
         const EFlags            _baseFlags;
 
-        Sliders_t               _sliders;
-        SliderCounter_t         _sliderCounter      {};
-        Constants_t             _constants;
-
         String                  _defines;
 
         String                  _dbgName;
@@ -106,6 +103,12 @@ namespace AE::ResEditor
         }                       _enablePass;
 
     private:
+        Sliders_t               _sliders;
+        SliderCounter_t         _sliderCounter      {};
+
+        Constants_t             _constants;
+        SliderCounter_t         _constantCounter    {};
+
         UniqueSliderNames_t     _uniqueSliderNames;
 
 
@@ -119,6 +122,7 @@ namespace AE::ResEditor
         void  SetDebugLabel1 (const String &name)                                                                           __Th___;
         void  SetDebugLabel2 (const String &name, const RGBA8u &color)                                                      __Th___;
 
+
         void  SliderI0 (const String &name)                                                                                 __Th___;
         void  SliderI1 (const String &name, int min, int max)                                                               __Th___;
         void  SliderI2 (const String &name, const packed_int2 &min, const packed_int2 &max)                                 __Th___;
@@ -145,10 +149,23 @@ namespace AE::ResEditor
         void  ColorSelector2 (const String &name, const RGBA32f &val)                                                       __Th___;
         void  ColorSelector3 (const String &name, const RGBA8u &val)                                                        __Th___;
 
+
+        void  ConstantF1 (const String &name, const ScriptDynamicFloatPtr  &value)                      __Th___;
+        void  ConstantF2 (const String &name, const ScriptDynamicFloat2Ptr &value)                      __Th___;
+        void  ConstantF3 (const String &name, const ScriptDynamicFloat3Ptr &value)                      __Th___;
         void  ConstantF4 (const String &name, const ScriptDynamicFloat4Ptr &value)                      __Th___;
 
+        void  ConstantI1 (const String &name, const ScriptDynamicIntPtr  &value)                        __Th___;
+        void  ConstantI2 (const String &name, const ScriptDynamicInt2Ptr &value)                        __Th___;
+        void  ConstantI3 (const String &name, const ScriptDynamicInt3Ptr &value)                        __Th___;
         void  ConstantI4 (const String &name, const ScriptDynamicInt4Ptr &value)                        __Th___;
 
+        void  ConstantU1 (const String &name, const ScriptDynamicUIntPtr  &value)                       __Th___;
+        void  ConstantU2 (const String &name, const ScriptDynamicUInt2Ptr &value)                       __Th___;
+        void  ConstantU3 (const String &name, const ScriptDynamicUInt3Ptr &value)                       __Th___;
+        void  ConstantU4 (const String &name, const ScriptDynamicUInt4Ptr &value)                       __Th___;
+
+
         void  EnableIfEqual (const ScriptDynamicUIntPtr &dyn, uint ref)                                 __Th___;
         void  EnableIfLess (const ScriptDynamicUIntPtr &dyn, uint ref)                                  __Th___;
         void  EnableIfGreater (const ScriptDynamicUIntPtr &dyn, uint ref)                               __Th___;
@@ -178,6 +195,9 @@ namespace AE::ResEditor
         template <typename T>
         void  _Slider (const String &name, const T &min, const T &max, T val, ESlider type)             __Th___;
 
+        template <typename T>
+        void  _Constant (const String &name, const T &dynVal, ESlider type, ubyte count)                __Th___;
+
         void  _AddSlidersToUIInteraction (IPass* pass)                                                  const;
         void  _CopyConstants (OUT IPass::Constants &)                                                   const;
 
@@ -185,7 +205,7 @@ namespace AE::ResEditor
     protected:
         explicit ScriptBasePass (EFlags flags)                                                          __Th___;
 
-        void  _Init (IPass &dst)                                                                        C_Th___;
+        void  _Init (IPass &dst, const ScriptBaseControllerPtr &defaultController)                      C_Th___;
 
         ND_ ScriptDynamicDim*   _Dimension ()                                                           __Th___ { return ScriptDynamicDimPtr{_dynamicDim}.Detach(); }
         void  _SetDynamicDimension (const ScriptDynamicDimPtr &)                                        __Th___;
@@ -199,6 +219,7 @@ namespace AE::ResEditor
         static void  _AddDefines (StringView defines, INOUT String &header)                             __Th___;
 
         void  _AddSliders (INOUT String &header)                                                        C_Th___;
+        void  _AddSlidersAsMacros (OUT String &macros)                                                  C_Th___;
     };
 
     AE_BIT_OPERATORS( ScriptBasePass::EFlags );
diff --git a/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.cpp b/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.cpp
index 4b14762a..7c0ee740 100644
--- a/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.cpp
@@ -45,7 +45,10 @@ namespace AE::ResEditor
         if ( args.IsArg< ImageLayer const& >(idx) )
         {
             dst.layer = args.Arg< ImageLayer const& >(idx++);
+            if ( args.IsArg<uint>(idx) )
+                dst.layerCount = args.Arg<uint>(idx++);
         }
+
         if ( args.IsArg< MipmapLevel const& >(idx) )
         {
             dst.mipmap = args.Arg< MipmapLevel const& >(idx++);
@@ -118,7 +121,10 @@ namespace AE::ResEditor
         if ( args.IsArg< ImageLayer const& >(idx) )
         {
             dst.layer = args.Arg< ImageLayer const& >(idx++);
+            if ( args.IsArg<uint>(idx) )
+                dst.layerCount = args.Arg<uint>(idx++);
         }
+
         if ( args.IsArg< MipmapLevel const& >(idx) )
         {
             dst.mipmap = args.Arg< MipmapLevel const& >(idx++);
diff --git a/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.h b/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.h
index 264db6ac..486c043e 100644
--- a/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.h
+++ b/AE/samples/res_editor/Scripting/ScriptBaseRenderPass.h
@@ -22,6 +22,7 @@ namespace AE::ResEditor
             String          name;
             ScriptImagePtr  rt;
             ImageLayer      layer;
+            uint            layerCount      = UMax;
             MipmapLevel     mipmap;
             EBlendFactor    srcFactorRGB    = Default;
             EBlendFactor    srcFactorA      = Default;
diff --git a/AE/samples/res_editor/Scripting/ScriptBuffer.cpp b/AE/samples/res_editor/Scripting/ScriptBuffer.cpp
index bbbe6895..1d3956fc 100644
--- a/AE/samples/res_editor/Scripting/ScriptBuffer.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptBuffer.cpp
@@ -57,9 +57,6 @@ namespace
     constructor
 =================================================
 */
-    ScriptBuffer::ScriptBuffer () __Th___
-    {}
-
     ScriptBuffer::ScriptBuffer (Bytes size) __Th___ :
         _type{ EBufferType::MutableData_NonInitialized }
     {
@@ -552,7 +549,7 @@ namespace
 =================================================
     ULong*
 =================================================
-*/  
+*/
     uint  ScriptBuffer::ULong1 (const String &name, ulong x) __Th___
     {
         _InitConstDataFromScriptLayout();
@@ -1087,7 +1084,7 @@ namespace
         // allow 'FillBuffer' on init
         _desc.usage |= EBufferUsage::TransferDst;
 
-        auto&               res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&               res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&           renderer    = ScriptExe::ScriptResourceApi::GetRenderer(); // throw
         GfxMemAllocatorPtr  gfx_alloc   = _dynCount ? renderer.GetDynamicAllocator() : renderer.GetAllocator();
 
@@ -1157,8 +1154,8 @@ namespace
             }
         }
 
-        _resource = MakeRC<Buffer>( RVRef(buf_ids), _desc, elem_size, RVRef(load_op), struct_type,
-                                    renderer, (_dynCount ? _dynCount->Get() : null), _dbgName, flags, RVRef(_refBuffers) );  // throw
+        _resource = MakeRCTh<Buffer>( RVRef(buf_ids), _desc, elem_size, RVRef(load_op), struct_type,
+                                      renderer, (_dynCount ? _dynCount->Get() : null), _dbgName, flags, RVRef(_refBuffers) );  // throw
         return _resource;
     }
 
diff --git a/AE/samples/res_editor/Scripting/ScriptBuffer.h b/AE/samples/res_editor/Scripting/ScriptBuffer.h
index 8e61e8f8..7f28d832 100644
--- a/AE/samples/res_editor/Scripting/ScriptBuffer.h
+++ b/AE/samples/res_editor/Scripting/ScriptBuffer.h
@@ -66,7 +66,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ScriptBuffer ()                                                                         __Th___;
+        ScriptBuffer ()                                                                         __Th___ {}
         ScriptBuffer (Bytes size)                                                               __Th___;
         ScriptBuffer (const String &filename)                                                   __Th___;
         ~ScriptBuffer ();
diff --git a/AE/samples/res_editor/Scripting/ScriptCollection.cpp b/AE/samples/res_editor/Scripting/ScriptCollection.cpp
index e1e2d15f..f31cbcbf 100644
--- a/AE/samples/res_editor/Scripting/ScriptCollection.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptCollection.cpp
@@ -115,7 +115,7 @@ namespace AE::ResEditor
 
         T*  result = DynCast<T>( it->second.Get() );
         CHECK_THROW_MSG( result != null,
-            "Variable '"s << key << "' is not a '" << typeid(T).name() << "' type" );
+            "Variable '"s << key << "' is not a '" << TypeNameOf<T>() << "' type" );
 
         return ScriptRC<T>{result}.Detach();
     }
diff --git a/AE/samples/res_editor/Scripting/ScriptComputePass.cpp b/AE/samples/res_editor/Scripting/ScriptComputePass.cpp
index 322d3926..d14c6f8d 100644
--- a/AE/samples/res_editor/Scripting/ScriptComputePass.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptComputePass.cpp
@@ -333,9 +333,9 @@ namespace
         CHECK_THROW_MSG( not _args.Empty(), "empty argument list" );
 
         auto        result      = MakeRC<ComputePass>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&   renderer    = ScriptExe::ScriptPassApi::GetRenderer();  // throw
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
         Bytes       ub_size;
 
         result->_rtech = _CompilePipeline( OUT ub_size );   // throw
@@ -361,6 +361,13 @@ namespace
 
         auto    ppln = result->_pipelines.find( IPass::EDebugMode::Unknown )->second;
 
+        #if PIPELINE_STATISTICS
+        {
+            auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+            Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( _dbgName, res.Handle(), res.Options() ));
+        }
+        #endif
+
         result->_localSize  = this->_localSize;
         result->_iterations.assign( this->_iterations.begin(), this->_iterations.end() );
 
@@ -375,7 +382,7 @@ namespace
             _args.InitResources( OUT result->_resources );  // throw
         }
 
-        _Init( *result );
+        _Init( *result, null );
         UIInteraction::Instance().AddPassDbgInfo( result.get(), dbg_modes, EShaderStages::Compute );
 
         return result;
@@ -432,9 +439,9 @@ namespace AE::ResEditor
                 int4        intConst [4];
             )#");
 
-        STATIC_ASSERT( UIInteraction::MaxSlidersPerType == 4 );
-        STATIC_ASSERT( IPass::Constants::MaxCount == 4 );
-        STATIC_ASSERT( IPass::CustomKeys_t{}.max_size() == 1 );
+        StaticAssert( UIInteraction::MaxSlidersPerType == 4 );
+        StaticAssert( IPass::Constants::MaxCount == 4 );
+        StaticAssert( IPass::CustomKeys_t{}.max_size() == 1 );
         return st;
     }
 
@@ -498,10 +505,16 @@ namespace AE::ResEditor
             }
         }
 
-        const EShaderOpt    sh_opt = EShaderOpt::Optimize;
-    //  const EShaderOpt    sh_opt = EShaderOpt::DebugInfo; // for shader debugging in RenderDoc
+        const EShaderOpt    sh_opt  = EShaderOpt::Optimize;
+    //  const EShaderOpt    sh_opt  = EShaderOpt::DebugInfo;    // for shader debugging in RenderDoc
+
+      #if PIPELINE_STATISTICS
+        const EPipelineOpt  ppln_opt = EPipelineOpt::Optimize | EPipelineOpt::CaptureStatistics | EPipelineOpt::CaptureInternalRepresentation;
+      #else
+        const EPipelineOpt  ppln_opt = EPipelineOpt::Optimize;
+      #endif
 
-        _CompilePipeline3( cs, cs_line, "compute", uint(sh_opt), EPipelineOpt::Optimize );
+        _CompilePipeline3( cs, cs_line, "compute", uint(sh_opt), ppln_opt );
 
         if ( AllBits( _baseFlags, EFlags::Enable_ShaderTrace ))
             _CompilePipeline3( cs, cs_line, "compute.Trace", uint(sh_opt | EShaderOpt::Trace), Default );
diff --git a/AE/samples/res_editor/Scripting/ScriptComputePass.h b/AE/samples/res_editor/Scripting/ScriptComputePass.h
index f5cd885b..a95b54a1 100644
--- a/AE/samples/res_editor/Scripting/ScriptComputePass.h
+++ b/AE/samples/res_editor/Scripting/ScriptComputePass.h
@@ -42,7 +42,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ScriptComputePass () : ScriptBasePass{EFlags::Unknown} {}
+        ScriptComputePass () = delete;
         ScriptComputePass (const String &name, const String &defines, EFlags baseFlags)                 __Th___;
 
         void  LocalSize1  (uint x)                                                                      __Th___ { return LocalSize3v({ x, 1u, 1u }); }
diff --git a/AE/samples/res_editor/Scripting/ScriptController.cpp b/AE/samples/res_editor/Scripting/ScriptController.cpp
index 3fb27d5e..17f8c2a6 100644
--- a/AE/samples/res_editor/Scripting/ScriptController.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptController.cpp
@@ -20,7 +20,7 @@ namespace
     template <typename T>
     static ScriptBaseController*  ScriptBaseController_ToBase (T* ptr)
     {
-        STATIC_ASSERT( IsBaseOf< ScriptBaseController, T >);
+        StaticAssert( IsBaseOf< ScriptBaseController, T >);
 
         ScriptBaseControllerPtr result{ ptr };
         return result.Detach();
@@ -121,7 +121,7 @@ namespace
         if ( _controller )
             return _controller;
 
-        _controller = MakeRC<ScaleBiasCamera>( _dynamicDim->Get() );
+        _controller = MakeRCTh<ScaleBiasCamera>( _dynamicDim->Get() );
         return _controller;
     }
 //-----------------------------------------------------------------------------
@@ -203,7 +203,7 @@ namespace
         if ( _controller )
             return _controller;
 
-        _controller = MakeRC<TopDownCamera>( _dynamicDim->Get(), _movingScale, _rotationScale, _initialPos );
+        _controller = MakeRCTh<TopDownCamera>( _dynamicDim->Get(), _movingScale, _rotationScale, _initialPos );
         return _controller;
     }
 //-----------------------------------------------------------------------------
@@ -302,9 +302,9 @@ namespace
         if ( _controller )
             return _controller;
 
-        _controller = MakeRC<OrbitalCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ),
-                                             _rotationScale, _offsetScale, _initialPos, _initialOffset,
-                                             _reverseZ );
+        _controller = MakeRCTh<OrbitalCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ),
+                                               _rotationScale, _offsetScale, _initialPos, _initialOffset,
+                                               _reverseZ );
         return _controller;
     }
 //-----------------------------------------------------------------------------
@@ -473,8 +473,8 @@ namespace
         if ( _controller )
             return _controller;
 
-        _controller = MakeRC<FlightCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ),
-                                            _engineThrustRange, _rotationScale, _initialPos, _reverseZ );
+        _controller = MakeRCTh<FlightCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ),
+                                              _engineThrustRange, _rotationScale, _initialPos, _reverseZ );
         return _controller;
     }
 //-----------------------------------------------------------------------------
@@ -521,8 +521,8 @@ namespace
         if ( _controller )
             return _controller;
 
-        _controller = MakeRC<FPSCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ), _movingScale,
-                                         float2{_rotationScale}, _initialPos, _reverseZ );
+        _controller = MakeRCTh<FPSCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ), _movingScale,
+                                           float2{_rotationScale}, _initialPos, _reverseZ );
         return _controller;
     }
 //-----------------------------------------------------------------------------
@@ -569,8 +569,8 @@ namespace
         if ( _controller )
             return _controller;
 
-        _controller = MakeRC<FPVCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ), _movingScale,
-                                         float2{_rotationScale}, _initialPos, _reverseZ );
+        _controller = MakeRCTh<FPVCamera>( _dynamicDim->Get(), _clipPlanes, Rad::FromDeg( _fovY ), _movingScale,
+                                           float2{_rotationScale}, _initialPos, _reverseZ );
         return _controller;
     }
 
diff --git a/AE/samples/res_editor/Scripting/ScriptDynamicVars.cpp b/AE/samples/res_editor/Scripting/ScriptDynamicVars.cpp
index 08c843fe..e9035ad7 100644
--- a/AE/samples/res_editor/Scripting/ScriptDynamicVars.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptDynamicVars.cpp
@@ -7,6 +7,16 @@ namespace AE::ResEditor
 {
     using namespace AE::Scripting;
 
+namespace
+{
+    template <typename T1, typename T2, typename T3>
+    static T1*  ScriptDynamicT_Ctor (T3 value) {
+        return ScriptRC<T1>{ new T1{ MakeRC<T2>( value )}}.Detach();
+    }
+
+
+} // namespace
+
 //-----------------------------------------------------------------------------
 // ScriptDynamicDim
 
@@ -86,7 +96,7 @@ namespace AE::ResEditor
     void  ScriptDynamicDim::Bind (const ScriptEnginePtr &se) __Th___
     {
         ClassBinder<ScriptDynamicDim>   binder{ se };
-        binder.CreateRef();
+        binder.CreateRef( 0, False{"no ctor"} );
 
         binder.AddMethod( &ScriptDynamicDim::Mul1,      "opMul",        {} );
         binder.AddMethod( &ScriptDynamicDim::Div1,      "opDiv",        {} );
@@ -135,8 +145,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicUInt::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicUInt>  binder{ se };
+        ClassBinder<ScriptDynamicUInt>      binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicUInt, DynamicUInt, uint >, {} );
     }
 
 /*
@@ -146,8 +157,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicUInt2::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicUInt2> binder{ se };
+        ClassBinder<ScriptDynamicUInt2>     binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicUInt2, DynamicUInt2, const packed_uint2& >, {} );
     }
 
 /*
@@ -157,8 +169,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicUInt3::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicUInt3> binder{ se };
+        ClassBinder<ScriptDynamicUInt3>     binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicUInt3, DynamicUInt3, const packed_uint3& >, {} );
     }
 
 /*
@@ -168,8 +181,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicUInt4::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicUInt4> binder{ se };
+        ClassBinder<ScriptDynamicUInt4>     binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicUInt4, DynamicUInt4, const packed_uint4& >, {} );
     }
 //-----------------------------------------------------------------------------
 
@@ -182,8 +196,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicInt::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicInt>   binder{ se };
+        ClassBinder<ScriptDynamicInt>       binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicInt, DynamicInt, int >, {} );
     }
 
 /*
@@ -193,8 +208,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicInt2::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicInt2>  binder{ se };
+        ClassBinder<ScriptDynamicInt2>      binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicInt2, DynamicInt2, const packed_int2& >, {} );
     }
 
 /*
@@ -204,8 +220,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicInt3::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicInt3>  binder{ se };
+        ClassBinder<ScriptDynamicInt3>      binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicInt3, DynamicInt3, const packed_int3& >, {} );
     }
 
 /*
@@ -215,8 +232,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicInt4::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicInt4>  binder{ se };
+        ClassBinder<ScriptDynamicInt4>      binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicInt4, DynamicInt4, const packed_int4& >, {} );
     }
 //-----------------------------------------------------------------------------
 
@@ -229,8 +247,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicFloat::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicFloat> binder{ se };
+        ClassBinder<ScriptDynamicFloat>     binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicFloat, DynamicFloat, float >, {} );
     }
 
 /*
@@ -242,6 +261,7 @@ namespace AE::ResEditor
     {
         ClassBinder<ScriptDynamicFloat2>    binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicFloat2, DynamicFloat2, const packed_float2& >, {} );
     }
 
 /*
@@ -253,6 +273,7 @@ namespace AE::ResEditor
     {
         ClassBinder<ScriptDynamicFloat3>    binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicFloat3, DynamicFloat3, const packed_float3& >, {} );
     }
 
 /*
@@ -264,6 +285,7 @@ namespace AE::ResEditor
     {
         ClassBinder<ScriptDynamicFloat4>    binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicFloat4, DynamicFloat4, const packed_float4& >, {} );
     }
 //-----------------------------------------------------------------------------
 
@@ -276,8 +298,9 @@ namespace AE::ResEditor
 */
     void  ScriptDynamicULong::Bind (const ScriptEnginePtr &se) __Th___
     {
-        ClassBinder<ScriptDynamicULong> binder{ se };
+        ClassBinder<ScriptDynamicULong>     binder{ se };
         binder.CreateRef();
+        binder.AddFactoryCtor( &ScriptDynamicT_Ctor< ScriptDynamicULong, DynamicULong, ulong >, {} );
     }
 
 
diff --git a/AE/samples/res_editor/Scripting/ScriptExe.cpp b/AE/samples/res_editor/Scripting/ScriptExe.cpp
index 3959ff38..2ae9a14a 100644
--- a/AE/samples/res_editor/Scripting/ScriptExe.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptExe.cpp
@@ -87,8 +87,8 @@ namespace {
 
         RC<IPass>   ToPass () C_Th_OV
         {
-            return MakeRC<ResEditor::DebugView>( rt->ToResource(), index, flags, layer, mipmap,
-                                                 s_scriptExe->_GetRenderer(), "DbgView" );
+            return MakeRCTh<ResEditor::DebugView>( rt->ToResource(), index, flags, layer, mipmap,
+                                                   s_scriptExe->_GetRenderer(), "DbgView" );
         }
     };
 //-----------------------------------------------------------------------------
@@ -134,7 +134,7 @@ namespace {
 
         RC<IPass>   ToPass () C_Th_OV
         {
-            return MakeRC<ResEditor::CopyImagePass>( src->ToResource(), dst->ToResource(), "CopyImage" );
+            return MakeRCTh<ResEditor::CopyImagePass>( src->ToResource(), dst->ToResource(), "CopyImage" );
         }
     };
 //-----------------------------------------------------------------------------
@@ -519,7 +519,7 @@ namespace {
                 st_type = it->second;
             });
 
-        return MakeRC<ResEditor::ExportBuffer>( buf, RVRef(prefix),
+        return MakeRCTh<ResEditor::ExportBuffer>( buf, RVRef(prefix),
                                                 [st_type] (const BufferMemView &memView, WStream &stream) {
                                                     _Utils{ *st_type, memView }.Parse( stream );
                                                 });
@@ -566,7 +566,7 @@ namespace {
                 dst_geom = _dstGeometry->ToResource();
             });
 
-        return MakeRC<ResEditor::BuildRTGeometry>(
+        return MakeRCTh<ResEditor::BuildRTGeometry>(
                     dst_geom, _indirect,
                     "BuildRTGeometry" );
     }
@@ -612,7 +612,7 @@ namespace {
                 dst_scene = _dstScene->ToResource();
             });
 
-        return MakeRC<ResEditor::BuildRTScene>(
+        return MakeRCTh<ResEditor::BuildRTScene>(
                     dst_scene, _indirect,
                     "BuildRTScene" );
     }
@@ -686,6 +686,7 @@ namespace {
         const String    Anisotropy16MirrorRepeat{"Anisotropy16MirrorRepeat"};
         const String    Anisotropy16Clamp       {"Anisotropy16Clamp"};
     };
+
 /*
 =================================================
     constructor
@@ -777,7 +778,7 @@ namespace {
         CHECK_ERR( not _tempData );
 
         _tempData.reset( new TempData{} );
-        _tempData->renderer = MakeRC<Renderer>( _rand.Uniform( 0u, 0xFFFF'FFFFu ));
+        _tempData->renderer = MakeRCTh<Renderer>( _rand.Uniform( 0u, 0xFFFF'FFFFu ));  // throw
         _tempData->currPath.push_back( FileSystem::ToAbsolute( filePath ));
         _tempData->dependencies.push_back( _tempData->currPath.front() );
         _tempData->cfg = cfg;
@@ -992,7 +993,7 @@ namespace {
     RTechInfo  ScriptExe::_ConvertAndLoad () __Th___
     {
         auto    mem3     = _ConvertAndLoad2();
-        auto&   res_mngr = RenderTaskScheduler().GetResourceManager();
+        auto&   res_mngr = GraphicsScheduler().GetResourceManager();
 
         PipelinePackDesc    desc;
         desc.stream         = mem3;
@@ -1638,8 +1639,8 @@ namespace {
             binder.AddValue( "Extended_sRGB_linear",    EColorSpace::Extended_sRGB_linear );
             binder.AddValue( "HDR10_ST2084",            EColorSpace::HDR10_ST2084 );
             binder.AddValue( "BT2020_linear",           EColorSpace::BT2020_linear );
-            STATIC_ASSERT( uint(EColorSpace::_Count) == 15 );
-            STATIC_ASSERT( uint(ESurfaceFormat::_Count) == 10 );
+            StaticAssert( uint(EColorSpace::_Count) == 15 );
+            StaticAssert( uint(ESurfaceFormat::_Count) == 10 );
 
             // not compatible with ESurfaceFormat
             //binder.AddValue( "Display_P3_nonlinear",      EColorSpace::Display_P3_nonlinear );
@@ -1700,7 +1701,7 @@ namespace {
         ScriptSceneRayTracingPass::Bind( se );
         ScriptScene::Bind( se );
 
-        se->AddFunction( &ScriptExe::_SurfaceSize,              "SurfaceSize",              {},     "Returns dynamic dimensions of the screen size."    );
+        se->AddFunction( &ScriptExe::_SurfaceSize,              "SurfaceSize",              {},     "Returns dynamic dimensions of the screen surface." );
 
         se->AddFunction( &ScriptExe::_Present1,                 "Present",                  {},     "Present image to the screen." );
         se->AddFunction( &ScriptExe::_Present2,                 "Present",                  {} );
@@ -1745,6 +1746,8 @@ namespace {
         se->AddFunction( &ScriptExe::_GetCylinder1,             "GetCylinder",              {"segmentCount", "isInner", "positions", "texcoords", "indices"},           "Returns cylinder" );
         se->AddFunction( &ScriptExe::_GetCylinder2,             "GetCylinder",              {"segmentCount", "isInner", "positions", "normals", "tangents", "bitangents", "texcoords", "indices"},  "Returns cylinder" );
 
+        se->AddFunction( &ScriptExe::_GetSphericalCube1,        "GetSphericalCube",         {"lod", "positions", "indices"},                        "Returns spherical cube without projection and rotation" );
+
         se->AddFunction( &ScriptExe::_IndicesToPrimitives,      "IndicesToPrimitives",      {"indices", "primitives"},      "Helper function to convert array of indices to array of uint3 indices per triangle" );
         se->AddFunction( &ScriptExe::_GetFrustumPlanes,         "GetFrustumPlanes",         {"viewProj", "outPlanes"},      "Helper function to convert matrix to 6 planes of the frustum." );
         se->AddFunction( &ScriptExe::_MergeMesh,                "MergeMesh",                {"srcIndices", "srcVertexCount", "indicesToAdd"} );
@@ -1796,6 +1799,10 @@ namespace {
         se->AddFunction( &ScriptExe::_WhiteColorSpectrumStep50nm,   "WhiteColorSpectrumStep50nm",   {"wavelengthToRGB", "normalized"} );
         se->AddFunction( &ScriptExe::_WhiteColorSpectrumStep100nm,  "WhiteColorSpectrumStep100nm",  {"wavelengthToRGB", "normalized"} );
 
+        se->AddFunction( &ScriptExe::_CM_CubeSC_Forward,        "CM_CubeSC_Forward",        {} );
+        se->AddFunction( &ScriptExe::_CM_IdentitySC_Forward,    "CM_IdentitySC_Forward",    {} );
+        se->AddFunction( &ScriptExe::_CM_TangentialSC_Forward,  "CM_TangentialSC_Forward",  {} );
+
         // TODO:
         //  PresentVR( left, left_layer, left_mipmap,  right, right_layer, right_mipmap )
 
@@ -1821,7 +1828,7 @@ namespace {
         binder.AddValue( "Histogram",   DebugView::EFlags::Histogram );
         binder.AddValue( "LinearDepth", DebugView::EFlags::LinearDepth );
         binder.AddValue( "Stencil",     DebugView::EFlags::Stencil );
-        STATIC_ASSERT( uint(DebugView::EFlags::_Count) == 5 );
+        StaticAssert( uint(DebugView::EFlags::_Count) == 5 );
     }
 
 /*
@@ -1836,7 +1843,7 @@ namespace {
         binder.AddValue( "RunOnce",                 PassGroup::EFlags::RunOnce );
         binder.AddValue( "OnRequest",               PassGroup::EFlags::OnRequest );
         binder.AddValue( "RunOnce_AfterLoading",    PassGroup::EFlags::RunOnce_AfterLoading );
-        STATIC_ASSERT( uint(PassGroup::EFlags::_Count) == 4 );
+        StaticAssert( uint(PassGroup::EFlags::_Count) == 4 );
     }
 
 /*
@@ -1862,7 +1869,7 @@ namespace {
         se->AddConstProperty( _sampConsts->Anisotropy16MirrorRepeat,    "Sampler_" + _sampConsts->Anisotropy16MirrorRepeat );
         se->AddConstProperty( _sampConsts->Anisotropy16Clamp,           "Sampler_" + _sampConsts->Anisotropy16Clamp );
 
-        STATIC_ASSERT( (sizeof(SamplerConsts) / sizeof(String)) == 15 );
+        StaticAssert( (sizeof(SamplerConsts) / sizeof(String)) == 15 );
     }
 
 /*
@@ -1890,10 +1897,32 @@ namespace {
         if ( data.cpp.empty() )
             return;
 
-        FileWStream     file {fname};
-        CHECK_ERRV( file.IsOpen() );
+        HashVal32   prev_hash;
 
-        CHECK_ERRV( file.Write( data.cpp ));
+        if ( FileSystem::IsFile( fname ))
+        {
+            FileRStream file {fname};
+            if ( file.IsOpen() )
+            {
+                char    hash_str [2+8+1] = {};
+                if ( file.Read( OUT hash_str, Sizeof(hash_str) ))
+                {
+                    ASSERT( hash_str[0] == '/' );
+                    ASSERT( hash_str[1] == '/' );
+                    ASSERT( hash_str[10] == '\n' );
+                    prev_hash = HashVal32{StringToUInt( StringView{hash_str}.substr( 2 ), 16 )};
+                }
+            }
+        }
+
+        const HashVal32 hash = CT_Hash( data.cpp.data(), data.cpp.length(), 0 );
+        if ( hash != prev_hash )
+        {
+            FileWStream     file {fname};
+            CHECK_ERRV( file.IsOpen() );
+            CHECK_ERRV( file.Write( "//"s << ToString<16>(uint{hash}) << "\n" ));
+            CHECK_ERRV( file.Write( data.cpp ));
+        }
     }
 
 /*
@@ -2078,6 +2107,18 @@ namespace {
     {
         return ResEditorAppConfig::Get().pipelineIncludeDirs;
     }
+
+/*
+=================================================
+    GetMonitor
+=================================================
+*/
+    App::Monitor const&  ScriptExe::ScriptPassApi::GetMonitor () __Th___
+    {
+        CHECK_THROW( s_scriptExe != null );
+        CHECK_THROW( s_scriptExe->_tempData );
+        return s_scriptExe->_tempData->cfg.monitor;
+    }
 //-----------------------------------------------------------------------------
 
 
@@ -2138,7 +2179,7 @@ namespace {
 */
     Graphics::FeatureSet const&  ScriptExe::ScriptResourceApi::GetFeatureSet () __NE___
     {
-        return RenderTaskScheduler().GetFeatureSet();
+        return GraphicsScheduler().GetFeatureSet();
     }
 //-----------------------------------------------------------------------------
 
@@ -2171,9 +2212,14 @@ namespace {
                 cfg.SetShaderVersion( EShaderVersion::SPIRV_1_5 );
                 cfg.SetShaderOptions( EShaderOpt::Optimize );
                 cfg.SetDefaultLayout( EStructLayout::Std140 );
-                cfg.SetPipelineOptions( EPipelineOpt::Unknown );
                 cfg.SetPreprocessor( EShaderPreprocessor::AEStyle );
 
+              #if PIPELINE_STATISTICS
+                cfg.SetPipelineOptions( EPipelineOpt::Optimize | EPipelineOpt::CaptureStatistics | EPipelineOpt::CaptureInternalRepresentation );
+              #else
+                cfg.SetPipelineOptions( EPipelineOpt::Optimize );
+              #endif
+
                 ScriptFeatureSetPtr fs {new ScriptFeatureSet{ "DefaultFS" }};
                 fs->fs = ScriptResourceApi::GetFeatureSet();
             }
@@ -2330,7 +2376,7 @@ namespace {
             samp->SetAnisotropy( 16.0f );
         }
 
-        STATIC_ASSERT( (sizeof(SamplerConsts) / sizeof(String)) == 15 );
+        StaticAssert( (sizeof(SamplerConsts) / sizeof(String)) == 15 );
         CHECK_THROW( obj_storage->Build() );
     }
 
@@ -2357,6 +2403,17 @@ namespace {
                 )#");
         }
 
+        /*if ( not obj_storage.structTypes.contains( "CameraSet" ))
+        {
+            ShaderStructTypePtr st{ new ShaderStructType{"CameraSet"}};
+            st->Set( EStructLayout::Std140, R"#(
+                    float       ipd;        // for VR video
+                    float3      globalPos;  // actual position: 'globalPos + data[0].localPos'
+                    uint        count;
+                    CameraData  data [4];
+                )#");
+        }*/
+
         if ( not obj_storage.structTypes.contains( "AccelStructInstance" ))
         {
             ShaderStructTypePtr st{ new ShaderStructType{"AccelStructInstance"}};
@@ -2462,9 +2519,9 @@ namespace {
 */
     bool  CompareImageTypes (const Graphics::ImageDesc &lhs, const ResLoader::IntermImage &rhs)
     {
-        const auto  t0 = GetDescriptorImageTypeRelaxed( lhs );
-        const auto  t1 = GetDescriptorImageTypeRelaxed( rhs.PixelFormat(), rhs.GetType(), false );
-        return t0 == t1;
+        const auto  [lhs_t0, lhs_t1]    = GetDescriptorImageTypeRelaxed( lhs );
+        const auto  rhs_t               = GetDescriptorImageTypeRelaxed( rhs.PixelFormat(), rhs.GetType(), false );
+        return lhs_t0 == rhs_t or lhs_t1 == rhs_t;
     }
 
 } // AE::ResEditor
diff --git a/AE/samples/res_editor/Scripting/ScriptExe.h b/AE/samples/res_editor/Scripting/ScriptExe.h
index 194f4af9..a9b4e677 100644
--- a/AE/samples/res_editor/Scripting/ScriptExe.h
+++ b/AE/samples/res_editor/Scripting/ScriptExe.h
@@ -69,6 +69,7 @@ namespace AE::ResEditor
             Array<Path>     includeDirs;
             Array<Path>     pipelineDirs;
             Path            scriptDir;
+            App::Monitor    monitor;
         };
 
 
@@ -213,6 +214,10 @@ namespace AE::ResEditor
                                 OUT ScriptArray<packed_float3>  &texcoords,         // cubemap
                                 OUT ScriptArray<uint>           &indices)                                       __Th___;
 
+        static void  _GetSphericalCube1 (uint                           lod,
+                                         OUT ScriptArray<packed_float3> &positions,
+                                         OUT ScriptArray<uint>          &indices)                               __Th___;
+
         static void  _GetSphere1 (uint                              lod,
                                   OUT ScriptArray<packed_float3>    &positions,
                                   OUT ScriptArray<uint>             &indices)                                   __Th___;
@@ -309,6 +314,10 @@ namespace AE::ResEditor
         static void  _WhiteColorSpectrumStep50nm (OUT ScriptArray<packed_float4> &, bool)                       __Th___;
         static void  _WhiteColorSpectrumStep100nm (OUT ScriptArray<packed_float4> &, bool)                      __Th___;
 
+        static packed_float3  _CM_CubeSC_Forward (const packed_float3 &);
+        static packed_float3  _CM_IdentitySC_Forward (const packed_float3 &);
+        static packed_float3  _CM_TangentialSC_Forward (const packed_float3 &);
+
         static void  _DbgView1 (const ScriptImagePtr &rt, DebugView::EFlags flags)                                                              __Th___;
         static void  _DbgView2 (const ScriptImagePtr &rt, const MipmapLevel &mipmap, DebugView::EFlags flags)                                   __Th___;
         static void  _DbgView3 (const ScriptImagePtr &rt, const ImageLayer &layer, DebugView::EFlags flags)                                     __Th___;
@@ -382,6 +391,8 @@ namespace AE::ResEditor
         ND_ static Renderer&    GetRenderer ()                                          __Th___;
 
         ND_ static ArrayView<Path>  GetPipelineIncludeDirs ()                           __NE___;
+
+        ND_ static App::Monitor const&  GetMonitor ()                                   __Th___;
     };
 
 
@@ -398,6 +409,7 @@ namespace AE::ResEditor
         friend class ScriptRTGeometry;
         friend class ScriptRTScene;
         friend class ScriptModelGeometrySrc;
+        friend class ScriptChunkedTerrain;
 
         ND_ static Renderer&    GetRenderer ()                                          __Th___;
         ND_ static bool         IsPassGroup (const ScriptBasePassPtr &pass)             __NE___;
@@ -442,6 +454,7 @@ AE_DECL_SCRIPT_OBJ_RC(  AE::ResEditor::ScriptGeomSource,                "GeomSou
 AE_DECL_SCRIPT_OBJ_RC(  AE::ResEditor::ScriptSphericalCube,             "SphericalCube"     );
 AE_DECL_SCRIPT_OBJ_RC(  AE::ResEditor::ScriptUniGeometry,               "UnifiedGeometry"   );
 AE_DECL_SCRIPT_OBJ_RC(  AE::ResEditor::ScriptModelGeometrySrc,          "Model"             );
+AE_DECL_SCRIPT_OBJ_RC(  AE::ResEditor::ScriptChunkedTerrain,            "ChunkedTerrain"    );
 
 AE_DECL_SCRIPT_OBJ(     AE::ResEditor::ScriptUniGeometry::DrawCmd3,                         "UnifiedGeometry_Draw" );
 AE_DECL_SCRIPT_OBJ(     AE::ResEditor::ScriptUniGeometry::DrawIndexedCmd3,                  "UnifiedGeometry_DrawIndexed" );
diff --git a/AE/samples/res_editor/Scripting/ScriptExe_MeshGen.cpp b/AE/samples/res_editor/Scripting/ScriptExe_MeshGen.cpp
index 8f2208af..c4b43aa3 100644
--- a/AE/samples/res_editor/Scripting/ScriptExe_MeshGen.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptExe_MeshGen.cpp
@@ -643,5 +643,85 @@ namespace AE::ResEditor
         }
     }
 
+/*
+=================================================
+    _GetSphericalCube1
+=================================================
+*/
+    void  ScriptExe::_GetSphericalCube1 (uint                           lod,
+                                         OUT ScriptArray<packed_float3> &positions,
+                                         OUT ScriptArray<uint>          &indices) __Th___
+    {
+        positions.clear();
+        indices.clear();
+
+        lod = lod*2 - 1;
+
+        // for cube sides
+        const uint  vcount  = lod + 2;
+        const uint  icount  = lod + 1;
+        uint        vert_i  = 0;
+
+        indices.reserve( icount * icount * 6 );
+        positions.reserve( vcount * vcount );
+
+        // for top/bottom faces
+        for (uint face = 0; face < 6; ++face)
+        {
+            // generate indices
+            for (uint y = 0; y < icount; ++y)
+            for (uint x = 0; x < icount; ++x)
+            {
+                const uint  idx[4] = {  vert_i + (x+0) + (y+0)*vcount, vert_i + (x+1) + (y+0)*vcount,
+                                        vert_i + (x+0) + (y+1)*vcount, vert_i + (x+1) + (y+1)*vcount };
+
+                if ( (x < icount/2 and y < icount/2) or (x >= icount/2 and y >= icount/2) )
+                {
+                    indices.push_back( idx[0] );    indices.push_back( idx[3] );    indices.push_back( idx[1] );
+                    indices.push_back( idx[0] );    indices.push_back( idx[2] );    indices.push_back( idx[3] );
+                }else{
+                    indices.push_back( idx[0] );    indices.push_back( idx[2] );    indices.push_back( idx[1] );
+                    indices.push_back( idx[2] );    indices.push_back( idx[3] );    indices.push_back( idx[1] );
+                }
+            }
+
+            // generate vertices
+            for (uint y = 0; y < vcount; ++y)
+            for (uint x = 0; x < vcount; ++x)
+            {
+                float2      ncoord = ToSNorm( float2{x,y} / float(vcount-1) );
+
+                positions.push_back(float3{ ncoord, float(face) });
+                ++vert_i;
+            }
+        }
+    }
+
+
+/*
+=================================================
+    _CM_CubeSC_Forward
+    _CM_IdentitySC_Forward
+    _CM_TangentialSC_Forward
+=================================================
+*/
+    packed_float3  ScriptExe::_CM_CubeSC_Forward (const packed_float3 &c)
+    {
+        using namespace AE::GeometryTools;
+        return packed_float3{ SCProj2_Cube< SCProj1_Identity >::Forward( double2{c.x, c.y}, ECubeFace(c.z) )};
+    }
+
+    packed_float3  ScriptExe::_CM_IdentitySC_Forward (const packed_float3 &c)
+    {
+        using namespace AE::GeometryTools;
+        return packed_float3{ SCProj2_Spherical< SCProj1_Identity >::Forward( double2{c.x, c.y}, ECubeFace(c.z) )};
+    }
+
+    packed_float3  ScriptExe::_CM_TangentialSC_Forward (const packed_float3 &c)
+    {
+        using namespace AE::GeometryTools;
+        return packed_float3{ SCProj2_Spherical< SCProj1_Tangential >::Forward( double2{c.x, c.y}, ECubeFace(c.z) )};
+    }
+
 
 } // AE::ResEditor
diff --git a/AE/samples/res_editor/Scripting/ScriptGeomSource.cpp b/AE/samples/res_editor/Scripting/ScriptGeomSource.cpp
index dff3ab20..9825a17b 100644
--- a/AE/samples/res_editor/Scripting/ScriptGeomSource.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptGeomSource.cpp
@@ -18,6 +18,8 @@ namespace AE::ResEditor
 {
     using namespace AE::PipelineCompiler;
 
+    using EDebugMode = IGeomSource::EDebugMode;
+
 namespace
 {
     static ScriptModelGeometrySrc*  ScriptSceneGeometry_Ctor1 (const String &filename) {
@@ -41,7 +43,7 @@ namespace
     template <typename T>
     static ScriptGeomSource*  ScriptGeomSource_ToBase (T* ptr)
     {
-        STATIC_ASSERT( IsBaseOf< ScriptGeomSource, T >);
+        StaticAssert( IsBaseOf< ScriptGeomSource, T >);
 
         ScriptGeomSourcePtr  result{ ptr };
         return result.Detach();
@@ -59,7 +61,7 @@ namespace
         auto*   ppln = resMngr.GetResource( pplnId );
         CHECK_THROW( ppln != null );
 
-        auto*   layout = resMngr.GetResource( ppln->LayoutID() );
+        auto*   layout = resMngr.GetResource( ppln->LayoutId() );
         CHECK_THROW( layout != null );
 
         DescriptorSetLayoutID   dsl;
@@ -174,7 +176,7 @@ namespace
         CHECK_THROW_MSG( not out_pplns.empty(),
             "Can't find pipelines with DS '"s << dsName << "' and " <<
             (descType == EDescriptorType::UniformBuffer ? "UniformBuffer" :
-             descType == EDescriptorType::StorageBuffer ? "StorageBuffer" : "<unknown>") << 
+             descType == EDescriptorType::StorageBuffer ? "StorageBuffer" : "<unknown>") <<
             " with type '" << bufTypeName << "'" );
 
         inPipelines = RVRef(out_pplns);
@@ -566,18 +568,27 @@ namespace
 =================================================
 */
     template <typename PplnSpec>
-    ND_ static ScriptGeomSource::PipelineNames_t  _GetSuitablePipeline (Array<PplnSpec> &pipelines)
+    ND_ static ScriptGeomSource::PipelineNames_t  _GetSuitablePipeline (Array<PplnSpec> &pipelines, EShaderOpt opt = Default)
     {
         CHECK_THROW_MSG( not pipelines.empty(),
             "Failed to find suitable pipeline" );
 
-        if ( pipelines.size() > 1 )
-            AE_LOGI( "More than one pipeline are match the requirements" );
+        ScriptGeomSource::PipelineNames_t   result;
 
-        if ( not pipelines.empty() )
-            return ScriptGeomSource::PipelineNames_t{ ScriptGeomSource::PplnNameAndObjectId{ pipelines.front()->Name() }};
+        for (auto& ppln : pipelines)
+        {
+            auto    pl = ppln->GetBase()->GetLayout();
 
-        return Default;
+            if ( pl and pl->GetDebugDS().mode == opt )
+            {
+                result.emplace_back( ppln->Name() );
+            }
+        }
+
+        if ( result.size() > 1 )
+            AE_LOGI( "More than one pipeline are match the requirements" );
+
+        return result;
     }
 
 /*
@@ -716,25 +727,6 @@ namespace
         _maxLod = maxLod;
     }
 
-/*
-=================================================
-    SetTessLevel*
-=================================================
-*/
-    void  ScriptSphericalCube::SetTessLevel1 (float level) __Th___
-    {
-        return SetTessLevel2( ScriptDynamicFloatPtr{ new ScriptDynamicFloat{ new DynamicFloat{level} }});
-    }
-
-    void  ScriptSphericalCube::SetTessLevel2 (const ScriptDynamicFloatPtr &level) __Th___
-    {
-        CHECK_THROW_MSG( not _geomSrc );
-        CHECK_THROW_MSG( level and level->Get() );
-        CHECK_THROW_MSG( not _tessLevel, "already specified" );
-
-        _tessLevel = level->Get();
-    }
-
 /*
 =================================================
     Bind
@@ -752,10 +744,6 @@ namespace
                         "Vertex count: (lod+2)^2, index count: 6*(lod+1)^2." );
         binder.AddMethod( &ScriptSphericalCube::SetDetailLevel1,    "DetailLevel",  {"maxLOD"} );
         binder.AddMethod( &ScriptSphericalCube::SetDetailLevel2,    "DetailLevel",  {"minLOD", "maxLOD"} );
-
-        binder.Comment( "Set constant or dynamic tessellation level." );
-        binder.AddMethod( &ScriptSphericalCube::SetTessLevel1,      "TessLevel",    {"level"} );
-        binder.AddMethod( &ScriptSphericalCube::SetTessLevel2,      "TessLevel",    {"level"} );
     }
 
 /*
@@ -769,7 +757,7 @@ namespace
             return _geomSrc;
 
         Renderer&   renderer    = ScriptExe::ScriptResourceApi::GetRenderer();  // throw
-        auto        result      = MakeRC<SphericalCube>( renderer, _minLod, _maxLod, _tessLevel );
+        auto        result      = MakeRC<SphericalCube>( renderer, _minLod, _maxLod );
 
         _args.InitResources( result->_resources );
 
@@ -806,15 +794,22 @@ namespace
         CHECK_THROW( layer == ERenderLayer::Opaque );
 
         auto        result      = MakeRC<SphericalCube::Material>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&   renderer    = ScriptExe::ScriptResourceApi::GetRenderer();  // throw
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
 
         auto    ppln = rtech->GetGraphicsPipeline( names[0].pplnName );
         CHECK_THROW( ppln );
 
+        #if PIPELINE_STATISTICS
+        {
+            auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+            Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( "SphericalCube", res.Handle(), res.Options() ));
+        }
+        #endif
+
         result->rtech   = rtech;
-        result->ppln    = ppln;
+        result->pplnMap.emplace( EDebugMode::Unknown, ppln );
 
         CHECK_THROW( res_mngr.CreateDescriptorSets( OUT result->mtrDSIndex, OUT result->descSets.data(), max_frames, ppln, DescriptorSetName{c_MtrDS} ));
 
@@ -843,7 +838,7 @@ namespace
         ShaderStructTypePtr st{ new ShaderStructType{"SphericalCubeMaterialUB"}};
         st->Set( EStructLayout::Std140, R"#(
                 float4x4    transform;
-                float       tessLevel;
+                float3x3    normalMat;
             )#");
 
         return st;
@@ -957,7 +952,7 @@ namespace
             }
 
             CHECK_THROW_MSG( false,
-                "IndexBuffer '"s << cmd._indexBuffer->GetName() << "' field '" << cmd._indexBufferField << 
+                "IndexBuffer '"s << cmd._indexBuffer->GetName() << "' field '" << cmd._indexBufferField <<
                 "' must be array of scalar/vec1/vec2/vec4 with uint16/uint32 type" );
         }
         else
@@ -1645,6 +1640,7 @@ namespace
         ShaderStructTypePtr st{ new ShaderStructType{"UnifiedGeometryMaterialUB"}};
         st->Set( EStructLayout::Std140, R"#(
                 float4x4    transform;
+                float3x3    normalMat;
             )#");
 
         return st;
@@ -1803,43 +1799,55 @@ namespace
         CHECK_THROW_MSG( layer == ERenderLayer::Opaque );
         CHECK_THROW_MSG( not _drawCommands.empty() );
 
-        const auto  GetMeshPipeline = [this] () -> PipelineName
+        const auto  GetMeshPipeline = [this] (PipelineNames_t &result, usize idx) __Th___
         {{
             Array<MeshPipelineSpecPtr>      pipelines;
             _GetMeshPipelines( OUT pipelines );
             _FindPipelinesByUB( c_MtrDS, "UnifiedGeometryMaterialUB", INOUT pipelines );    // throw
             _FindPipelinesByResources( c_MtrDS, _args.Args(), INOUT pipelines );            // throw
-            auto    tmp = _GetSuitablePipeline( pipelines );
-            CHECK_THROW_MSG( not tmp.empty() );
-            return tmp.front().pplnName;
+            {
+                auto    tmp = _GetSuitablePipeline( pipelines );
+                CHECK_THROW_MSG( not tmp.empty() );
+                result.emplace_back( tmp.front().pplnName, idx, EDebugMode::Unknown );
+            }{
+                auto    tmp = _GetSuitablePipeline( pipelines, EShaderOpt::Trace );
+                if ( not tmp.empty() )
+                    result.emplace_back( tmp.front().pplnName, idx, EDebugMode::Trace );
+            }
         }};
 
-        const auto  GetGraphicsPipeline = [this] () -> PipelineName
+        const auto  GetGraphicsPipeline = [this] (PipelineNames_t &result, usize idx) __Th___
         {{
             Array<GraphicsPipelineSpecPtr>  pipelines;
             _FindPipelinesWithoutVB( OUT pipelines );
             _FindPipelinesByUB( c_MtrDS, "UnifiedGeometryMaterialUB", INOUT pipelines );    // throw
             _FindPipelinesByResources( c_MtrDS, _args.Args(), INOUT pipelines );            // throw
-            auto    tmp = _GetSuitablePipeline( pipelines );
-            CHECK_THROW_MSG( not tmp.empty() );
-            return tmp.front().pplnName;
+            {
+                auto    tmp = _GetSuitablePipeline( pipelines );
+                CHECK_THROW_MSG( not tmp.empty() );
+                result.emplace_back( tmp.front().pplnName, idx, EDebugMode::Unknown );
+            }{
+                auto    tmp = _GetSuitablePipeline( pipelines, EShaderOpt::Trace );
+                if ( not tmp.empty() )
+                    result.emplace_back( tmp.front().pplnName, idx, EDebugMode::Trace );
+            }
         }};
 
         PipelineNames_t     result;
         result.reserve( _drawCommands.size() );
 
-        for (const auto& [src, idx] : WithIndex( _drawCommands ))
+        for (const auto [src, idx] : WithIndex( _drawCommands ))
         {
             Visit( src,
-                [&] (const DrawCmd3 &)                          { result.emplace_back( GetGraphicsPipeline(), idx ); },
-                [&] (const DrawIndexedCmd3 &)                   { result.emplace_back( GetGraphicsPipeline(), idx ); },
-                [&] (const DrawIndirectCmd3 &)                  { result.emplace_back( GetGraphicsPipeline(), idx ); },
-                [&] (const DrawIndexedIndirectCmd3 &)           { result.emplace_back( GetGraphicsPipeline(), idx ); },
-                [&] (const DrawIndirectCountCmd3 &)             { result.emplace_back( GetGraphicsPipeline(), idx ); },
-                [&] (const DrawIndexedIndirectCountCmd3 &)      { result.emplace_back( GetGraphicsPipeline(), idx ); },
-                [&] (const DrawMeshTasksCmd3 &)                 { result.emplace_back( GetMeshPipeline(), idx ); },
-                [&] (const DrawMeshTasksIndirectCmd3 &)         { result.emplace_back( GetMeshPipeline(), idx ); },
-                [&] (const DrawMeshTasksIndirectCountCmd3 &)    { result.emplace_back( GetMeshPipeline(), idx ); }
+                [&] (const DrawCmd3 &)                          { GetGraphicsPipeline( INOUT result, idx ); },
+                [&] (const DrawIndexedCmd3 &)                   { GetGraphicsPipeline( INOUT result, idx ); },
+                [&] (const DrawIndirectCmd3 &)                  { GetGraphicsPipeline( INOUT result, idx ); },
+                [&] (const DrawIndexedIndirectCmd3 &)           { GetGraphicsPipeline( INOUT result, idx ); },
+                [&] (const DrawIndirectCountCmd3 &)             { GetGraphicsPipeline( INOUT result, idx ); },
+                [&] (const DrawIndexedIndirectCountCmd3 &)      { GetGraphicsPipeline( INOUT result, idx ); },
+                [&] (const DrawMeshTasksCmd3 &)                 { GetMeshPipeline( INOUT result, idx ); },
+                [&] (const DrawMeshTasksIndirectCmd3 &)         { GetMeshPipeline( INOUT result, idx ); },
+                [&] (const DrawMeshTasksIndirectCountCmd3 &)    { GetMeshPipeline( INOUT result, idx ); }
             );
         }
         return result;
@@ -1854,20 +1862,29 @@ namespace
     {
         CHECK_THROW( _geomSrc );
         CHECK_THROW( rtech );
-        CHECK_THROW( names.size() == _drawCommands.size() );
+        CHECK_THROW( names.size() >= _drawCommands.size() );
         CHECK_THROW( layer == ERenderLayer::Opaque );
 
         auto        result      = MakeRC<UnifiedGeometry::Material>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&   renderer    = ScriptExe::ScriptResourceApi::GetRenderer();  // throw
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
         bool        ds_inited   = false;
 
-        const auto  FindMeshPpln    = [&] (const PipelineName &name)
+        result->pipelineMap.reserve( names.size() );
+
+        const auto  FindMeshPpln    = [&] (const PplnNameAndObjectId &info) __Th___
         {{
-            auto    ppln = rtech->GetMeshPipeline( name );
+            auto    ppln = rtech->GetMeshPipeline( info.pplnName );
             CHECK_THROW( ppln );
 
+            #if PIPELINE_STATISTICS
+            {
+                auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+                Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( "UnifiedGeometry", res.Handle(), res.Options() ));
+            }
+            #endif
+
             if ( ds_inited ){
                 CHECK_THROW( result->mtrDSIndex == GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_MtrDS} ));
                 CHECK_THROW( result->passDSIndex == GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_PassDS} ));
@@ -1876,14 +1893,21 @@ namespace
                 CHECK_THROW( res_mngr.CreateDescriptorSets( OUT result->mtrDSIndex, OUT result->descSets.data(), max_frames, ppln, DescriptorSetName{c_MtrDS} ));
                 result->passDSIndex = GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_PassDS} );
             }
-            result->pplns.push_back( ppln );
+            CHECK_THROW( result->pipelineMap.emplace( Pair{info.objId, info.dbgMode}, ppln ).second );
         }};
 
-        const auto  FindGraphicsPpln = [&] (const PipelineName &name)
+        const auto  FindGraphicsPpln = [&] (const PplnNameAndObjectId &info) __Th___
         {{
-            auto    ppln = rtech->GetGraphicsPipeline( name );
+            auto    ppln = rtech->GetGraphicsPipeline( info.pplnName );
             CHECK_THROW( ppln );
 
+            #if PIPELINE_STATISTICS
+            {
+                auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+                Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( "UnifiedGeometry", res.Handle(), res.Options() ));
+            }
+            #endif
+
             if ( ds_inited ){
                 CHECK_THROW( result->mtrDSIndex == GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_MtrDS} ));
                 CHECK_THROW( result->passDSIndex == GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_PassDS} ));
@@ -1892,24 +1916,23 @@ namespace
                 CHECK_THROW( res_mngr.CreateDescriptorSets( OUT result->mtrDSIndex, OUT result->descSets.data(), max_frames, ppln, DescriptorSetName{c_MtrDS} ));
                 result->passDSIndex = GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_PassDS} );
             }
-            result->pplns.push_back( ppln );
+            CHECK_THROW( result->pipelineMap.emplace( Pair{info.objId, info.dbgMode}, ppln ).second );
         }};
 
         result->rtech = rtech;
 
-        for (usize i = 0; i < _drawCommands.size(); ++i)
+        for (auto& info : names)
         {
-            const auto  name = names[i].pplnName;
-            Visit( _drawCommands[i],
-                [&] (const DrawCmd3 &)                      { FindGraphicsPpln( name ); },
-                [&] (const DrawIndexedCmd3 &)               { FindGraphicsPpln( name ); },
-                [&] (const DrawIndirectCmd3 &)              { FindGraphicsPpln( name ); },
-                [&] (const DrawIndexedIndirectCmd3 &)       { FindGraphicsPpln( name ); },
-                [&] (const DrawIndirectCountCmd3 &)         { FindGraphicsPpln( name ); },
-                [&] (const DrawIndexedIndirectCountCmd3 &)  { FindGraphicsPpln( name ); },
-                [&] (const DrawMeshTasksCmd3 &)             { FindMeshPpln( name ); },
-                [&] (const DrawMeshTasksIndirectCmd3 &)     { FindMeshPpln( name ); },
-                [&] (const DrawMeshTasksIndirectCountCmd3 &){ FindMeshPpln( name ); }
+            Visit( _drawCommands[ info.objId ],
+                [&] (const DrawCmd3 &)                      { FindGraphicsPpln( info ); },
+                [&] (const DrawIndexedCmd3 &)               { FindGraphicsPpln( info ); },
+                [&] (const DrawIndirectCmd3 &)              { FindGraphicsPpln( info ); },
+                [&] (const DrawIndexedIndirectCmd3 &)       { FindGraphicsPpln( info ); },
+                [&] (const DrawIndirectCountCmd3 &)         { FindGraphicsPpln( info ); },
+                [&] (const DrawIndexedIndirectCountCmd3 &)  { FindGraphicsPpln( info ); },
+                [&] (const DrawMeshTasksCmd3 &)             { FindMeshPpln( info ); },
+                [&] (const DrawMeshTasksIndirectCmd3 &)     { FindMeshPpln( info ); },
+                [&] (const DrawMeshTasksIndirectCountCmd3 &){ FindMeshPpln( info ); }
             );
         }
 
@@ -1929,7 +1952,7 @@ namespace {
         "-Translucent",
         "-Volumetric"
     };
-    STATIC_ASSERT( CountOf(c_RTGeometrySuffix) == uint(ScriptGeomSource::EGeometryType::_Count) );
+    StaticAssert( CountOf(c_RTGeometrySuffix) == uint(ScriptGeomSource::EGeometryType::_Count) );
 }
 
 /*
@@ -1937,9 +1960,6 @@ namespace {
     constructor
 =================================================
 */
-    ScriptModelGeometrySrc::ScriptModelGeometrySrc () __Th___
-    {}
-
     ScriptModelGeometrySrc::ScriptModelGeometrySrc (const String &filename) __Th___ :
         _scenePath{ ScriptExe::ScriptResourceApi::ToAbsolute( filename )}  // throw
     {
@@ -2101,18 +2121,18 @@ namespace {
         binder.AddFactoryCtor( &ScriptSceneGeometry_Ctor1,  {"scenePathInVFS"} );
 
         binder.Comment( "Set resource name. It is used for debugging." );
-        binder.AddMethod( &ScriptModelGeometrySrc::Name,                        "Name",                 {} );
+        binder.AddMethod( &ScriptModelGeometrySrc::Name,                    "Name",                 {} );
 
         binder.Comment( "Add directory where to search required textures." );
-        binder.AddMethod( &ScriptModelGeometrySrc::AddTextureSearchDir,         "TextureSearchDir",     {"folder"} );
+        binder.AddMethod( &ScriptModelGeometrySrc::AddTextureSearchDir,     "TextureSearchDir",     {"folder"} );
 
         binder.Comment( "Set transformation for model root node." );
-        binder.AddMethod( &ScriptModelGeometrySrc::SetInitialTransform1,        "InitialTransform",     {} );
-        binder.AddMethod( &ScriptModelGeometrySrc::SetInitialTransform2,        "InitialTransform",     {"position", "rotation", "scale"} );
+        binder.AddMethod( &ScriptModelGeometrySrc::SetInitialTransform1,    "InitialTransform",     {} );
+        binder.AddMethod( &ScriptModelGeometrySrc::SetInitialTransform2,    "InitialTransform",     {"position", "rotation", "scale"} );
 
-        binder.AddMethod( &ScriptModelGeometrySrc::AddOmniLight,                "AddOmniLight",         {"position", "attenuation", "color"} );
-        binder.AddMethod( &ScriptModelGeometrySrc::AddConeLight,                "AddConeLight",         {"position", "direction", "coneAngle", "attenuation", "color"} );
-        binder.AddMethod( &ScriptModelGeometrySrc::AddDirLight,                 "AddDirLight",          {"direction", "attenuation", "color"} );
+        binder.AddMethod( &ScriptModelGeometrySrc::AddOmniLight,            "AddOmniLight",         {"position", "attenuation", "color"} );
+        binder.AddMethod( &ScriptModelGeometrySrc::AddConeLight,            "AddConeLight",         {"position", "direction", "coneAngle", "attenuation", "color"} );
+        binder.AddMethod( &ScriptModelGeometrySrc::AddDirLight,             "AddDirLight",          {"direction", "attenuation", "color"} );
     }
 
 /*
@@ -2231,8 +2251,8 @@ namespace {
         // search in scene dir
         _texSearchDirs.push_back( _scenePath.parent_path() );
 
-        _geomSrc = MakeRC<ModelGeomSource>( renderer, _intermScene, _initialTransform,
-                                            _texSearchDirs, _maxTextures, RVRef(geom_types) );
+        _geomSrc = MakeRCTh<ModelGeomSource>( renderer, _intermScene, _initialTransform,
+                                              _texSearchDirs, _maxTextures, RVRef(geom_types) );
         return _geomSrc;
     }
 
@@ -2263,14 +2283,21 @@ namespace {
         CHECK_THROW( names.size() == 1 );
 
         auto        result      = MakeRC<ModelGeomSource::Material>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
 
         result->rtech = rtech;
 
         GraphicsPipelineID  ppln = rtech->GetGraphicsPipeline( names[0].pplnName );
         CHECK_THROW( ppln );
 
+        #if PIPELINE_STATISTICS
+        {
+            auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+            Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( _dbgName, res.Handle(), res.Options() ));
+        }
+        #endif
+
         CHECK_THROW( res_mngr.CreateDescriptorSets( OUT result->mtrDSIndex, OUT result->descSets.data(), max_frames, ppln, DescriptorSetName{c_MtrDS} ));
 
         result->passDSIndex = GetDescSetBinding( res_mngr, ppln, DescriptorSetName{c_PassDS} );  // throw
@@ -2356,7 +2383,7 @@ namespace {
                 else
                     CHECK_THROW_MSG( shared_mtr_dsl == mtr_dsl, "All pipelines must use the same DescriptorSetLayout" );
 
-                ppln_per_obj.emplace_back( ppln_name[0].pplnName, obj_id-1 );
+                ppln_per_obj.emplace_back( ppln_name[0].pplnName, obj_id-1, EDebugMode::Unknown );
             });
 
         if ( not ppln_per_obj.empty() )
@@ -2386,8 +2413,8 @@ namespace {
         END_ENUM_CHECKS();
 
         auto        result      = MakeRC<ModelGeomSource::Material>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
 
         result->rtech = rtech;
 
@@ -2397,7 +2424,7 @@ namespace {
         Array<GraphicsPipelineID>   pipelines;
 
         _intermScene->ForEachModel(
-            [&, i = 0u, obj_id = 0u, init_ds = true] (const ResLoader::IntermScene::ModelData &model) mutable
+            [&, i = 0u, obj_id = 0u, init_ds = true] (const ResLoader::IntermScene::ModelData &model) M_Th___
             {
                 ++obj_id;
 
@@ -2411,6 +2438,13 @@ namespace {
                 auto    ppln = rtech->GetGraphicsPipeline( names[i].pplnName );
                 CHECK_THROW( ppln );
 
+                #if PIPELINE_STATISTICS
+                {
+                    auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+                    Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( _dbgName, res.Handle(), res.Options() ));
+                }
+                #endif
+
                 if ( init_ds )
                 {
                     init_ds = false;
diff --git a/AE/samples/res_editor/Scripting/ScriptGeomSource.h b/AE/samples/res_editor/Scripting/ScriptGeomSource.h
index a9d9c4c7..f29a33ff 100644
--- a/AE/samples/res_editor/Scripting/ScriptGeomSource.h
+++ b/AE/samples/res_editor/Scripting/ScriptGeomSource.h
@@ -23,15 +23,18 @@ namespace AE::ResEditor
     {
     // types
     public:
+        using EDebugMode    = IPass::EDebugMode;
+
         struct PplnNameAndObjectId
         {
             PipelineName    pplnName;
             usize           objId       = 0;
+            EDebugMode      dbgMode     = Default;
 
-            PplnNameAndObjectId ()                                      = default;
-            PplnNameAndObjectId (const PplnNameAndObjectId &)           = default;
-            explicit PplnNameAndObjectId (const PipelineName &name)     : pplnName{name} {}
-            PplnNameAndObjectId (const PipelineName &name, usize objId) : pplnName{name}, objId{objId} {}
+            PplnNameAndObjectId ()                                                      = default;
+            PplnNameAndObjectId (const PplnNameAndObjectId &)                           = default;
+            explicit PplnNameAndObjectId (const PipelineName &name)                     : pplnName{name} {}
+            PplnNameAndObjectId (const PipelineName &name, usize objId, EDebugMode dbg) : pplnName{name}, objId{objId}, dbgMode{dbg} {}
         };
 
         using PipelineNames_t           = Array< PplnNameAndObjectId >;
@@ -93,7 +96,6 @@ namespace AE::ResEditor
     private:
         uint                _minLod     = 0;
         uint                _maxLod     = 0;
-        RC<DynamicFloat>    _tessLevel;
 
         RC<IGeomSource>     _geomSrc;
 
@@ -106,9 +108,6 @@ namespace AE::ResEditor
         void  SetDetailLevel1 (uint maxLod)                                                                 __Th___;
         void  SetDetailLevel2 (uint minLod, uint maxLod)                                                    __Th___;
 
-        void  SetTessLevel1 (float level)                                                                   __Th___;
-        void  SetTessLevel2 (const ScriptDynamicFloatPtr &level)                                            __Th___;
-
         static void  Bind (const ScriptEnginePtr &se)                                                       __Th___;
         static void  GetShaderTypes (INOUT CppStructsFromShaders &)                                         __Th___;
 
@@ -380,7 +379,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ScriptModelGeometrySrc ()                                                                           __Th___;
+        ScriptModelGeometrySrc () = delete;
         ScriptModelGeometrySrc (const String &filename)                                                     __Th___;
         ~ScriptModelGeometrySrc ();
 
diff --git a/AE/samples/res_editor/Scripting/ScriptImage.cpp b/AE/samples/res_editor/Scripting/ScriptImage.cpp
index bc0d781f..46ca3fbf 100644
--- a/AE/samples/res_editor/Scripting/ScriptImage.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptImage.cpp
@@ -420,7 +420,7 @@ namespace
         if ( viewType == EImage::Cube or viewType == EImage::CubeArray )
             _desc.options |= EImageOpt::CubeCompatible;
 
-        ScriptImagePtr  result {new ScriptImage{}};
+        ScriptImagePtr  result {new ScriptImage{0}};
 
         result->_base       = ScriptImagePtr{this};
         result->_viewDesc   = ImageViewDesc{ viewType, Default, baseMipmap, mipmapCount, baseLayer, layerCount };
@@ -496,10 +496,10 @@ namespace
             binder.Comment( "Generate mipmaps after loading" );
             binder.AddValue( "GenMipmaps",  ELoadOpFlags::GenMipmaps );
 
-            STATIC_ASSERT( uint(ELoadOpFlags::All) == 0x1 );
+            StaticAssert( uint(ELoadOpFlags::All) == 0x1 );
         }{
             ClassBinder<ScriptImage>    binder{ se };
-            binder.CreateRef();
+            binder.CreateRef( 0, False{"no ctor"} );
 
             binder.Comment( "Create image from file.\n"
                             "File will be searched in VFS." );
@@ -657,7 +657,7 @@ namespace
         if ( AllBits( _desc.usage, EImageUsage::TransferSrc ) and not AnyBits( _desc.usage, EImageUsage::DepthStencilAttachment ))
             _desc.options |= EImageOpt::BlitSrc;
 
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&   renderer    = ScriptExe::ScriptResourceApi::GetRenderer();  // throw
 
         const auto  mutable_res_usage = EImageUsage::Storage | EImageUsage::ColorAttachment |
@@ -693,9 +693,9 @@ namespace
             renderer.GetDataTransferQueue().EnqueueImageTransition( id.image );
         }
 
-        _resource = MakeRC<Image>( RVRef(id.image), RVRef(id.view), RVRef(_loadOps), renderer, is_dummy, _desc, _viewDesc,
-                                   (_inDynSize ? _inDynSize->Get() : null), (_outDynSize ? _outDynSize->Get() : null),
-                                   _dbgName );  // throw
+        _resource = MakeRCTh<Image>( RVRef(id.image), RVRef(id.view), RVRef(_loadOps), renderer, is_dummy, _desc, _viewDesc,
+                                     (_inDynSize ? _inDynSize->Get() : null), (_outDynSize ? _outDynSize->Get() : null),
+                                     _dbgName );    // throw
         return _resource;
     }
 
diff --git a/AE/samples/res_editor/Scripting/ScriptImage.h b/AE/samples/res_editor/Scripting/ScriptImage.h
index dac5d2f5..c92af026 100644
--- a/AE/samples/res_editor/Scripting/ScriptImage.h
+++ b/AE/samples/res_editor/Scripting/ScriptImage.h
@@ -50,7 +50,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ScriptImage () {}
+        ScriptImage () = delete;
         ScriptImage (uint imageType, const String &filename)                        __Th___;
         ScriptImage (EPixelFormat format, const ScriptDynamicDimPtr &ds)            __Th___;
         ScriptImage (EPixelFormat format, const packed_uint3 &dim)                  __Th___;
@@ -117,6 +117,8 @@ namespace AE::ResEditor
 
 
     private:
+        ScriptImage (int) {}
+
         void  _Load (const String &filename, MipmapLevel mipmap,
                      ImageLayer layer, ELoadOpFlags flags)                          __Th___;
 
diff --git a/AE/samples/res_editor/Scripting/ScriptPostprocess.cpp b/AE/samples/res_editor/Scripting/ScriptPostprocess.cpp
index 843c5e92..c9e4fd1f 100644
--- a/AE/samples/res_editor/Scripting/ScriptPostprocess.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptPostprocess.cpp
@@ -9,20 +9,24 @@ namespace AE::ResEditor
 {
 namespace
 {
+    static ScriptPostprocess*  ScriptPostprocess_Ctor0 () {
+        return ScriptPostprocessPtr{ new ScriptPostprocess{ "", Default, Default, Default }}.Detach();
+    }
+
     static ScriptPostprocess*  ScriptPostprocess_Ctor1 (const String &name) {
-        return ScriptPostprocessPtr{ new ScriptPostprocess{ name, Default, Default, ScriptBasePass::EFlags::Enable_AllShaderDbg }}.Detach();
+        return ScriptPostprocessPtr{ new ScriptPostprocess{ name, Default, Default, Default}}.Detach();
     }
 
     static ScriptPostprocess*  ScriptPostprocess_Ctor2 (const String &name, ScriptPostprocess::EPostprocess ppFlags) {
-        return ScriptPostprocessPtr{ new ScriptPostprocess{ name, ppFlags, Default, ScriptBasePass::EFlags::Enable_AllShaderDbg }}.Detach();
+        return ScriptPostprocessPtr{ new ScriptPostprocess{ name, ppFlags, Default, Default }}.Detach();
     }
 
     static ScriptPostprocess*  ScriptPostprocess_Ctor3 (ScriptPostprocess::EPostprocess ppFlags) {
-        return ScriptPostprocessPtr{ new ScriptPostprocess{ Default, ppFlags, Default, ScriptBasePass::EFlags::Enable_AllShaderDbg }}.Detach();
+        return ScriptPostprocessPtr{ new ScriptPostprocess{ Default, ppFlags, Default, Default }}.Detach();
     }
 
     static ScriptPostprocess*  ScriptPostprocess_Ctor4 (ScriptPostprocess::EPostprocess ppFlags, const String &defines) {
-        return ScriptPostprocessPtr{ new ScriptPostprocess{ Default, ppFlags, defines, ScriptBasePass::EFlags::Enable_AllShaderDbg }}.Detach();
+        return ScriptPostprocessPtr{ new ScriptPostprocess{ Default, ppFlags, defines, Default }}.Detach();
     }
 
     static ScriptPostprocess*  ScriptPostprocess_Ctor5 (ScriptPostprocess::EPostprocess ppFlags, ScriptBasePass::EFlags baseFlags) {
@@ -49,7 +53,7 @@ namespace
         return ScriptPostprocessPtr{ new ScriptPostprocess{ name, Default, defines, baseFlags }}.Detach();
     }
 
-    static constexpr float  DefaultIPD  = 64.0e-3f;
+    //static constexpr float    DefaultIPD  = 64.0e-3f;
 
 } // namespace
 
@@ -59,10 +63,6 @@ namespace
     constructor
 =================================================
 */
-    ScriptPostprocess::ScriptPostprocess () :
-        ScriptBaseRenderPass{ EFlags::Unknown }, _ppFlags{ Default }
-    {}
-
     ScriptPostprocess::ScriptPostprocess (const String &name, EPostprocess ppFlags, const String &defines, EFlags baseFlags) __Th___ :
         ScriptBaseRenderPass{ baseFlags },
         _pplnPath{ ScriptExe::ScriptPassApi::ToShaderPath( name )},
@@ -116,16 +116,20 @@ namespace
             binder.AddValue( "ShadertoyVR_180", EPostprocess::ShadertoyVR_180 );
             binder.AddValue( "ShadertoyVR_360", EPostprocess::ShadertoyVR_360 );
             binder.AddValue( "Shadertoy_360",   EPostprocess::Shadertoy_360 );
-            STATIC_ASSERT( uint(EPostprocess::_Last) == 17 );
+            binder.AddValue( "Curved_1000R",    EPostprocess::Curved_1000R );
+            binder.AddValue( "Curved_1500R",    EPostprocess::Curved_1500R );
+            binder.AddValue( "Curved_1800R",    EPostprocess::Curved_1800R );
+            StaticAssert( uint(EPostprocess::_Count) == 9 );
         }
         {
             ClassBinder<ScriptPostprocess>  binder{ se };
-            binder.CreateRef();
+            binder.CreateRef( 0, False{"no ctor"} );
 
             _BindBase( binder, True{"withArgs"} );
             _BindBaseRenderPass( binder, True{"withBlending"} );
 
             binder.Comment( "Set path to fragment shader, empty - load current file." );
+            binder.AddFactoryCtor( &ScriptPostprocess_Ctor0,    {} );
             binder.AddFactoryCtor( &ScriptPostprocess_Ctor1,    {"shaderPath"} );
             binder.AddFactoryCtor( &ScriptPostprocess_Ctor2,    {"shaderPath", "postprocessFlags"} );
             binder.AddFactoryCtor( &ScriptPostprocess_Ctor3,    {"postprocessFlags"} );
@@ -160,18 +164,13 @@ namespace
     RC<IPass>  ScriptPostprocess::ToPass () C_Th___
     {
         auto        result      = MakeRC<Postprocess>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&   renderer    = ScriptExe::ScriptPassApi::GetRenderer();  // throw
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
         Bytes       ub_size;
 
         result->_rtech = _CompilePipeline( OUT ub_size ); // throw
-
-        result->_rpDesc.renderPassName  = RenderPassName{"rp"};
-        result->_rpDesc.subpassName     = SubpassName{"main"};
-        result->_rpDesc.packId          = result->_rtech.packId;
-        result->_rpDesc.layerCount      = 1_layer;
-        result->_depthRange             = this->_depthRange;
+        result->_depthRange = this->_depthRange;
 
         EnumBitSet<IPass::EDebugMode>   dbg_modes;
 
@@ -194,6 +193,13 @@ namespace
 
         auto    ppln = result->_pipelines.find( IPass::EDebugMode::Unknown )->second;
 
+        #if PIPELINE_STATISTICS
+        {
+            auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+            Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( _dbgName, res.Handle(), res.Options() ));
+        }
+        #endif
+
         result->_ubuffer = res_mngr.CreateBuffer( BufferDesc{ ub_size, EBufferUsage::Uniform | EBufferUsage::TransferDst },
                                                   "ShadertoyUB", renderer.GetAllocator() );
         CHECK_ERR( result->_ubuffer );
@@ -206,6 +212,24 @@ namespace
             _args.InitResources( OUT result->_resources );  // throw
         }
 
+        uint    min_layer_count = UMax;
+        for (auto& src : _output)
+        {
+            const uint  layers  = src.rt->Description().arrayLayers.Get();
+            const uint  count   = (src.layerCount == UMax ? (layers - src.layer.Get()) : src.layerCount);
+
+            CHECK_ERR( src.layer.Get() < layers );
+            CHECK_ERR( src.layer.Get() + count <= layers );
+
+            AssignMin( INOUT min_layer_count, count );
+        }
+        CHECK_ERR( min_layer_count > 0 );
+
+        result->_rpDesc.renderPassName  = RenderPassName{"rp"};
+        result->_rpDesc.subpassName     = SubpassName{"main"};
+        result->_rpDesc.packId          = result->_rtech.packId;
+        result->_rpDesc.layerCount      = ImageLayer{min_layer_count};
+
         for (usize i = 0; i < _output.size(); ++i)
         {
             auto&   src = _output[i];
@@ -220,9 +244,9 @@ namespace
             }
 
             ImageViewDesc   view;
-            view.viewType       = EImage_2D;
+            view.viewType       = (min_layer_count > 1 ? EImage_2DArray : EImage_2D);
             view.baseLayer      = src.layer;
-            view.layerCount     = 1;
+            view.layerCount     = ushort(min_layer_count);
             view.baseMipmap     = src.mipmap;
             view.mipmapCount    = 1;
 
@@ -236,7 +260,7 @@ namespace
         }
         CHECK_ERR( not result->_renderTargets.empty() );
 
-        _Init( *result );
+        _Init( *result, null );
         UIInteraction::Instance().AddPassDbgInfo( result.get(), dbg_modes, EShaderStages::Fragment );
 
         return result;
@@ -284,6 +308,7 @@ namespace AE::ResEditor
                 float4      date;                   // (year, month, day, time in seconds)
                 float       sampleRate;             // sound sample rate (i.e., 44100)
                 float       customKeys;
+                float       pixToMm;
 
                 // controller //
                 CameraData  camera;
@@ -298,9 +323,9 @@ namespace AE::ResEditor
                 int4        intConst [4];
             )#");
 
-        STATIC_ASSERT( UIInteraction::MaxSlidersPerType == 4 );
-        STATIC_ASSERT( IPass::Constants::MaxCount == 4 );
-        STATIC_ASSERT( IPass::CustomKeys_t{}.max_size() == 1 );
+        StaticAssert( UIInteraction::MaxSlidersPerType == 4 );
+        StaticAssert( IPass::Constants::MaxCount == 4 );
+        StaticAssert( IPass::CustomKeys_t{}.max_size() == 1 );
         return st;
     }
 
@@ -404,12 +429,10 @@ ND_ int3  GetGlobalSize() {
     return int3(un_PerPass.resolution);
 }
 )#";
-            if ( AnyBits( _ppFlags, EPostprocess::_ShadertoyBits ))
+            if ( _ppFlags != EPostprocess::Unknown )
             {
                 CHECK_THROW( _output.size() == 1 );
-
                 header
-                    << "#define _ColorOutput0 " << _output.front().name << "\n"
                     << R"#(
 #define iResolution         un_PerPass.resolution
 #define iTime               un_PerPass.time
@@ -420,64 +443,80 @@ ND_ int3  GetGlobalSize() {
 #define iMouse              float4( un_PerPass.mouse.xy * un_PerPass.resolution.xy, un_PerPass.mouse.zw )
 #define iDate               un_PerPass.date
 #define iSampleRate         un_PerPass.sampleRate
+)#";
+                BEGIN_ENUM_CHECKS();
+                switch ( _ppFlags )
+                {
+                    case EPostprocess::Shadertoy :
+                        header << R"#(
+void mainImage (out float4 fragColor, in float2 fragCoord);
 
-#if defined(VIEW_MODE_VR)
-    void mainVR (out float4 fragColor, in float2 fragCoord, in float3 fragRayOri, in float3 fragRayDir);
-
-    void Main ()
-    {
-        float2 coord = gl.FragCoord.xy;     // + gl.SamplePosition;
-        float2 uv    = coord / iResolution.xy;
-        float3 dir   = mix( mix( un_PerPass.cameraFrustumLB, un_PerPass.cameraFrustumRB, uv.x ),
-                            mix( un_PerPass.cameraFrustumLT, un_PerPass.cameraFrustumRT, uv.x ),
-                            uv.y );
-        coord = float2(coord.x - 0.5, iResolution.y - coord.y + 0.5);
-        mainVR( _ColorOutput0, coord, un_PerPass.cameraPos, dir );
-    }
-
-#elif defined(VIEW_MODE_VR180) || defined(VIEW_MODE_VR360) || defined(VIEW_MODE_360)
-    void mainVR (out float4 fragColor, in float2 fragCoord, in float3 fragRayOri, in float3 fragRayDir);
-
-    void Main ()
-    {
-        // from https://developers.google.com/vr/jump/rendering-ods-content.pdf
-        float2  coord   = gl.FragCoord.xy;      // + gl.SamplePosition;
-        float2  uv      = coord / iResolution.xy;
-        float   pi      = 3.14159265358979323846f;
-
-    #if defined(VIEW_MODE_VR360)
-        float   scale   = un_PerPass.cameraIPD * 0.5 * (uv.y < 0.5 ? -1.0 : 1.0);           // vr360 top-bottom
-                uv      = float2( uv.x, (uv.y < 0.5 ? uv.y : uv.y - 0.5) * 2.0 );
-    #elif defined(VIEW_MODE_VR180)
-        float   scale   = un_PerPass.cameraIPD * 0.5 * (uv.x < 0.5 ? -1.0 : 1.0);           // vr180 left-right
-                uv      = float2( (uv.x < 0.5 ? uv.x : uv.x - 0.5) * 0.5 + 0.25, uv.y );    // map [0, 1] to [0.25, 0.75]
-    #elif defined(VIEW_MODE_360)
-        float   scale   = 1.0;
-    #endif
-
-        float   theta   = (uv.x) * 2.0 * pi - pi;
-        float   phi     = pi * 0.5 - uv.y * pi;
-
-        float3  origin  = float3(cos(theta), 0.0, sin(theta)) * scale;
-        float3  dir     = float3(sin(theta) * cos(phi), sin(phi), -cos(theta) * cos(phi));
-
-        coord = float2(coord.x - 0.5, iResolution.y - coord.y + 0.5);
-        mainVR( _ColorOutput0, coord, un_PerPass.cameraPos + origin, dir );
-    }
-
-#else
-    void mainImage (out float4 fragColor, in float2 fragCoord);
-
-    void Main ()
-    {
-        float2 coord = gl.FragCoord.xy;     // + gl.SamplePosition;
-        coord = float2(coord.x - 0.5, iResolution.y - coord.y + 0.5);
+void Main ()
+{
+    float2 coord = gl.FragCoord.xy;     // + gl.SamplePosition;
+    coord = float2(coord.x - 0.5, iResolution.y - coord.y + 0.5);
 
-        mainImage( _ColorOutput0, coord );
-    }
-#endif
-#undef _ColorOutput0
+    mainImage( )#" << _output.front().name << R"#(, coord );
+}
 )#";
+                        break;
+
+                    case EPostprocess::ShadertoyVR :
+                    case EPostprocess::ShadertoyVR_180 :
+                    case EPostprocess::ShadertoyVR_360 :
+                    case EPostprocess::Shadertoy_360 :
+                    case EPostprocess::Curved_1000R :
+                    case EPostprocess::Curved_1500R :
+                    case EPostprocess::Curved_1800R :
+                    {
+                        header << R"#(
+#include "Ray.glsl"
+void mainVR (out float4 fragColor, in float2 fragCoord, in float3 fragRayOri, in float3 fragRayDir);
+
+void Main ()
+{
+    Ray ray = )#";
+                        END_ENUM_CHECKS();
+                        switch ( _ppFlags )
+                        {
+                            case EPostprocess::ShadertoyVR :
+                                header << "Ray_From( un_PerPass.camera.invViewProj, un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                break;
+                            case EPostprocess::ShadertoyVR_180 :
+                                header << "Ray_PlaneToVR180( un_PerPass.cameraIPD, un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                break;
+                            case EPostprocess::ShadertoyVR_360 :
+                                header << "Ray_PlaneToVR360( un_PerPass.cameraIPD, un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                break;
+                            case EPostprocess::Shadertoy_360 :
+                                header << "Ray_PlaneTo360( un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                break;
+                            case EPostprocess::Curved_1000R :
+                                header << "Ray_PlaneToSphere( iResolution.xy * un_PerPass.pixToMm / 1000.0, un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                header << "\tRay_Rotate( INOUT ray, MatTranspose(float3x3(un_PerPass.camera.view)) );\n";
+                                break;
+                            case EPostprocess::Curved_1500R :
+                                header << "Ray_PlaneToSphere( iResolution.xy * un_PerPass.pixToMm / 1500.0, un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                header << "\tRay_Rotate( INOUT ray, MatTranspose(float3x3(un_PerPass.camera.view)) );\n";
+                                break;
+                            case EPostprocess::Curved_1800R :
+                                header << "Ray_PlaneToSphere( iResolution.xy * un_PerPass.pixToMm / 1800.0, un_PerPass.camera.pos, 0.f, gl.FragCoord.xy / iResolution.xy );\n";
+                                header << "\tRay_Rotate( INOUT ray, MatTranspose(float3x3(un_PerPass.camera.view)) );\n";
+                                break;
+                        }
+                        BEGIN_ENUM_CHECKS();
+                        header << R"#(
+    float2 coord = gl.FragCoord.xy;     // + gl.SamplePosition;
+    coord = float2(coord.x - 0.5, iResolution.y - coord.y + 0.5);
+    mainVR( )#" << _output.front().name << R"#(, coord, ray.origin, ray.dir );
+})#";
+                        break;
+                    }
+                    case EPostprocess::Unknown :
+                    case EPostprocess::_Count :
+                        break;
+                }
+                END_ENUM_CHECKS();
             }
 
             _AddSliders( INOUT header );
@@ -499,7 +538,13 @@ ND_ int3  GetGlobalSize() {
         const EShaderOpt    sh_opt = EShaderOpt::Optimize | EShaderOpt::OptimizeSize;
     //  const EShaderOpt    sh_opt = EShaderOpt::DebugInfo; // for shader debugging in RenderDoc
 
-        _CompilePipeline3( subpass, vs, fs, fs_line, "postprocess", uint(sh_opt), EPipelineOpt::Optimize );
+      #if PIPELINE_STATISTICS
+        const EPipelineOpt  ppln_opt = EPipelineOpt::Optimize | EPipelineOpt::CaptureStatistics | EPipelineOpt::CaptureInternalRepresentation;
+      #else
+        const EPipelineOpt  ppln_opt = EPipelineOpt::Optimize;
+      #endif
+
+        _CompilePipeline3( subpass, vs, fs, fs_line, "postprocess", uint(sh_opt), ppln_opt );
 
         if ( AllBits( _baseFlags, EFlags::Enable_ShaderTrace ))
             _CompilePipeline3( subpass, vs, fs, fs_line, "postprocess.Trace", uint(sh_opt | EShaderOpt::Trace), Default );
@@ -536,20 +581,6 @@ ND_ int3  GetGlobalSize() {
         }
         {
             ScriptShaderPtr sh{ new ScriptShader{}};
-            BEGIN_ENUM_CHECKS();
-            switch ( _ppFlags )
-            {
-                case EPostprocess::Shadertoy :                                                      break;
-                case EPostprocess::ShadertoyVR :        sh->Define( "#define VIEW_MODE_VR" );       break;
-                case EPostprocess::ShadertoyVR_180 :    sh->Define( "#define VIEW_MODE_VR180" );    break;
-                case EPostprocess::ShadertoyVR_360 :    sh->Define( "#define VIEW_MODE_VR360" );    break;
-                case EPostprocess::Shadertoy_360 :      sh->Define( "#define VIEW_MODE_360" );      break;
-                case EPostprocess::Unknown :            break;
-                case EPostprocess::_Last :
-                case EPostprocess::_ShadertoyBits :
-                default :                               CHECK_THROW_MSG( false, "unsupported flags" );
-            }
-            END_ENUM_CHECKS();
             sh->SetSource2( EShader::Fragment, fs, PathAndLine{_pplnPath, fsLine} );
             sh->options = EShaderOpt(shaderOpts);
 
diff --git a/AE/samples/res_editor/Scripting/ScriptPostprocess.h b/AE/samples/res_editor/Scripting/ScriptPostprocess.h
index ad84706f..9851cd5b 100644
--- a/AE/samples/res_editor/Scripting/ScriptPostprocess.h
+++ b/AE/samples/res_editor/Scripting/ScriptPostprocess.h
@@ -16,14 +16,19 @@ namespace AE::ResEditor
     public:
         enum class EPostprocess : uint
         {
-            Unknown             = 0,        // entry: Main
-            Shadertoy           = 1 << 0,   // entry: mainImage
-            ShadertoyVR         = 1 << 1,   // entry: mainVR
-            ShadertoyVR_180     = 1 << 2,
-            ShadertoyVR_360     = 1 << 3,
-            Shadertoy_360       = 1 << 4,
-            _Last,
-            _ShadertoyBits      = Shadertoy | ShadertoyVR | ShadertoyVR_180 | ShadertoyVR_360 | Shadertoy_360,
+            Unknown         = 0,    // entry: Main
+            Shadertoy,              // entry: mainImage
+
+            ShadertoyVR,            // entry: mainVR
+            ShadertoyVR_180,
+            ShadertoyVR_360,
+            Shadertoy_360,
+
+            Curved_1000R,           // entry: mainVR,   human eye field of view
+            Curved_1500R,
+            Curved_1800R,
+
+            _Count,
         };
 
 
@@ -35,7 +40,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ScriptPostprocess ();
+        ScriptPostprocess () = delete;
         ScriptPostprocess (const String &pipelineName, EPostprocess ppFlags,
                            const String &defines, EFlags baseFlags)                                     __Th___;
 
diff --git a/AE/samples/res_editor/Scripting/ScriptRTScene.cpp b/AE/samples/res_editor/Scripting/ScriptRTScene.cpp
index dfc73293..0f9187e3 100644
--- a/AE/samples/res_editor/Scripting/ScriptRTScene.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptRTScene.cpp
@@ -473,7 +473,7 @@ namespace
 
         if ( _dummy )
         {
-            _resource = MakeRC<RTGeometry>( renderer, _dbgName );
+            _resource = MakeRCTh<RTGeometry>( renderer, _dbgName );
             return _resource;
         }
 
@@ -501,7 +501,7 @@ namespace
             dst.indexDataOffset = src.indexDataOffset;
         }
 
-        _resource = MakeRC<RTGeometry>( RVRef(tri_meshes), RVRef(ind_buf), renderer, _dbgName, Bool{_allowUpdate} );
+        _resource = MakeRCTh<RTGeometry>( RVRef(tri_meshes), RVRef(ind_buf), renderer, _dbgName, Bool{_allowUpdate} );
         return _resource;
     }
 
@@ -643,7 +643,7 @@ namespace
                             break;
                         }
                     }
-                }   
+                }
             }
             CHECK_THROW_MSG( tri_mesh.maxVertex > 0 );
             CHECK_THROW_MSG( tri_mesh.vertexFormat != Default );
@@ -1117,7 +1117,7 @@ namespace
         }
 
         Renderer&   renderer    = ScriptExe::ScriptResourceApi::GetRenderer(); // throw
-        auto        result      = MakeRC<RTScene>( RVRef(instances), inst_buf, ind_buf, renderer, _dbgName, Bool{_allowUpdate} );
+        auto        result      = MakeRCTh<RTScene>( RVRef(instances), inst_buf, ind_buf, renderer, _dbgName, Bool{_allowUpdate} );
 
         _resource = result;
         return _resource;
diff --git a/AE/samples/res_editor/Scripting/ScriptRTScene.h b/AE/samples/res_editor/Scripting/ScriptRTScene.h
index 6fcc6e04..ac6881c0 100644
--- a/AE/samples/res_editor/Scripting/ScriptRTScene.h
+++ b/AE/samples/res_editor/Scripting/ScriptRTScene.h
@@ -17,10 +17,10 @@ namespace AE::ResEditor
         uint        value   = 0;
 
     // methods
-        RTInstanceCustomIndex () {}
-        explicit RTInstanceCustomIndex (uint v) : value{v} {}
+        RTInstanceCustomIndex ()                        __NE___ {}
+        explicit RTInstanceCustomIndex (uint v)         __NE___ : value{v} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
@@ -33,10 +33,10 @@ namespace AE::ResEditor
         uint        value   = 0xFF;
 
     // methods
-        RTInstanceMask () {}
-        explicit RTInstanceMask (uint v) : value{v} {}
+        RTInstanceMask ()                               __NE___ {}
+        explicit RTInstanceMask (uint v)                __NE___ : value{v} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
@@ -49,10 +49,10 @@ namespace AE::ResEditor
         uint        value   = 0;
 
     // methods
-        RTInstanceSBTOffset () {}
-        explicit RTInstanceSBTOffset (uint v) : value{v} {}
+        RTInstanceSBTOffset ()                          __NE___ {}
+        explicit RTInstanceSBTOffset (uint v)           __NE___ : value{v} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
@@ -67,10 +67,10 @@ namespace AE::ResEditor
         float           scale   = 1.f;
 
     // methods
-        RTInstanceTransform () {}
-        RTInstanceTransform (const packed_float3 &pos, const packed_float3 &angles, float scale = 1.f) : pos{pos}, angles{angles}, scale{scale} {}
+        RTInstanceTransform ()                          __NE___ {}
+        RTInstanceTransform (const packed_float3 &pos, const packed_float3 &angles, float scale = 1.f) __NE___ : pos{pos}, angles{angles}, scale{scale} {}
 
-        static void  Bind (const ScriptEnginePtr &se) __Th___;
+        static void  Bind (const ScriptEnginePtr &se)   __Th___;
     };
 
 
@@ -91,7 +91,7 @@ namespace AE::ResEditor
             String              vbufferField;
             String              ibufferField;
 
-            Bytes32u            vertexStride;
+            Byte32u             vertexStride;
             Bytes               vertexDataOffset;
             Bytes               indexDataOffset;
         };
diff --git a/AE/samples/res_editor/Scripting/ScriptRayTracingPass.cpp b/AE/samples/res_editor/Scripting/ScriptRayTracingPass.cpp
index 50c1e8cf..a0a56f45 100644
--- a/AE/samples/res_editor/Scripting/ScriptRayTracingPass.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptRayTracingPass.cpp
@@ -280,7 +280,7 @@ namespace
 
         groups.resize( Max( groups.size(), rayIndex.value+1 ), Default );
 
-        auto&   dst = groups[ rayIndex.value ];     
+        auto&   dst = groups[ rayIndex.value ];
         CHECK_THROW_MSG( not dst.IsDefined(),
             "TriangleHit shader with Ray("s << ToString(rayIndex.value) << "), Instance(" << ToString(instanceIndex.value) << ") is already set" );
 
@@ -312,7 +312,7 @@ namespace
 
         groups.resize( Max( groups.size(), rayIndex.value+1 ), Default );
 
-        auto&   dst = groups[ rayIndex.value ];     
+        auto&   dst = groups[ rayIndex.value ];
         CHECK_THROW_MSG( not dst.IsDefined(),
             "ProceduralHit shader with Ray("s << ToString(rayIndex.value) << "), Instance(" << ToString(instanceIndex.value) << ") is already set" );
 
@@ -449,9 +449,9 @@ namespace
         CHECK_THROW_MSG( _rayGen.IsDefined(), "RayGen shader must be defined" );
 
         auto        result      = MakeRC<RayTracingPass>();
-        auto&       res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&       res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&   renderer    = ScriptExe::ScriptPassApi::GetRenderer();  // throw
-        const auto  max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto  max_frames  = GraphicsScheduler().GetMaxFrames();
         Bytes       ub_size;
 
         // validate
@@ -502,6 +502,13 @@ namespace
 
         auto    ppln = result->_pipelines.find( IPass::EDebugMode::Unknown )->second.Get<0>();
 
+        #if PIPELINE_STATISTICS
+        {
+            auto&   res = res_mngr.GetResourcesOrThrow( ppln );
+            Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( _dbgName, res.Handle(), res.Options() ));
+        }
+        #endif
+
         result->_iterations.assign( this->_iterations.begin(), this->_iterations.end() );
 
         result->_maxRayRecursion    = this->_maxRayRecursion  ? this->_maxRayRecursion->Get()  : null;
@@ -564,7 +571,7 @@ namespace
         }
       #endif
 
-        _Init( *result );
+        _Init( *result, null );
         UIInteraction::Instance().AddPassDbgInfo( result.get(), dbg_modes, EShaderStages::AllRayTracing );
 
         return result;
@@ -621,9 +628,9 @@ namespace AE::ResEditor
                 int4        intConst [4];
             )#");
 
-        STATIC_ASSERT( UIInteraction::MaxSlidersPerType == 4 );
-        STATIC_ASSERT( IPass::Constants::MaxCount == 4 );
-        STATIC_ASSERT( IPass::CustomKeys_t{}.max_size() == 1 );
+        StaticAssert( UIInteraction::MaxSlidersPerType == 4 );
+        StaticAssert( IPass::Constants::MaxCount == 4 );
+        StaticAssert( IPass::CustomKeys_t{}.max_size() == 1 );
         return st;
     }
 
@@ -672,7 +679,13 @@ namespace AE::ResEditor
         const EShaderOpt    sh_opt = EShaderOpt::Optimize;
     //  const EShaderOpt    sh_opt = EShaderOpt::DebugInfo; // for shader debugging in RenderDoc
 
-        _CompilePipeline3( header, "raytrace", uint(sh_opt), EPipelineOpt::Optimize );
+      #if PIPELINE_STATISTICS
+        const EPipelineOpt  ppln_opt = EPipelineOpt::Optimize | EPipelineOpt::CaptureStatistics | EPipelineOpt::CaptureInternalRepresentation;
+      #else
+        const EPipelineOpt  ppln_opt = EPipelineOpt::Optimize;
+      #endif
+
+        _CompilePipeline3( header, "raytrace", uint(sh_opt), ppln_opt );
 
         if ( AllBits( _baseFlags, EFlags::Enable_ShaderTrace ))
             _CompilePipeline3( header, "raytrace.Trace", uint(sh_opt | EShaderOpt::Trace), Default );
@@ -764,7 +777,7 @@ namespace AE::ResEditor
 
         // specialization
         {
-            const uint  max_recursion = RenderTaskScheduler().GetDevice().GetDeviceProperties().rayTracing.maxRecursion;
+            const uint  max_recursion = GraphicsScheduler().GetDevice().GetDeviceProperties().rayTracing.maxRecursion;
 
             RayTracingPipelineSpecPtr   ppln_spec = ppln_templ->AddSpecialization2( pplnName );
             ppln_spec->AddToRenderTech( "rtech", "Compute" );
@@ -780,18 +793,18 @@ namespace AE::ResEditor
 
             sbt->BindRayGen( "Main" );
 
-            for (auto [miss, i] : WithIndex(_missShaders)) {
+            for (const auto [miss, i] : WithIndex( _missShaders )) {
                 if ( miss.IsDefined() )
                     sbt->BindMiss( miss.name, RayIndex(uint(i)) );
             }
 
-            for (auto [call, i] : WithIndex(_callableShaders)) {
+            for (const auto [call, i] : WithIndex( _callableShaders )) {
                 if ( call.IsDefined() )
                     sbt->BindCallable( call.name, CallableIndex(uint(i)) );
             }
 
-            for (auto [per_inst, inst] : WithIndex(_hitGroups)) {
-                for (auto [group, ray] : WithIndex(per_inst)) {
+            for (const auto [per_inst, inst] : WithIndex( _hitGroups )) {
+                for (const auto [group, ray] : WithIndex( per_inst )) {
                     if ( group.IsDefined() )
                         sbt->BindHitGroup( group.name, InstanceIndex(uint(inst)), RayIndex(uint(ray)) );
                 }
diff --git a/AE/samples/res_editor/Scripting/ScriptRayTracingPass.h b/AE/samples/res_editor/Scripting/ScriptRayTracingPass.h
index 6bee38ca..4683f44a 100644
--- a/AE/samples/res_editor/Scripting/ScriptRayTracingPass.h
+++ b/AE/samples/res_editor/Scripting/ScriptRayTracingPass.h
@@ -11,24 +11,24 @@ namespace AE::ResEditor
     {
         uint        value   = 0;
 
-        RTInstanceIndex () {}
-        explicit RTInstanceIndex (uint v) : value{v} {}
+        RTInstanceIndex ()                  __NE___ {}
+        explicit RTInstanceIndex (uint v)   __NE___ : value{v} {}
     };
 
     struct RTRayIndex
     {
         uint        value   = 0;
 
-        RTRayIndex () {}
-        explicit RTRayIndex (uint v) : value{v} {}
+        RTRayIndex ()                       __NE___ {}
+        explicit RTRayIndex (uint v)        __NE___ : value{v} {}
     };
 
     struct RTCallableIndex
     {
         uint        value   = 0;
 
-        RTCallableIndex () {}
-        explicit RTCallableIndex (uint v) : value{v} {}
+        RTCallableIndex ()                  __NE___ {}
+        explicit RTCallableIndex (uint v)   __NE___ : value{v} {}
     };
 
     struct RTShader
@@ -113,7 +113,7 @@ namespace AE::ResEditor
 
     // methods
     public:
-        ScriptRayTracingPass () : ScriptBasePass{EFlags::Unknown} {}
+        ScriptRayTracingPass () = delete;
         ScriptRayTracingPass (const String &defines, EFlags baseFlags)                          __Th___;
 
         void  DispatchThreads1  (uint threadsX)                                                 __Th___ { return DispatchThreads3v({ threadsX, 1u, 1u }); }
diff --git a/AE/samples/res_editor/Scripting/ScriptScene.cpp b/AE/samples/res_editor/Scripting/ScriptScene.cpp
index 5e3e4b84..13294f21 100644
--- a/AE/samples/res_editor/Scripting/ScriptScene.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptScene.cpp
@@ -9,7 +9,9 @@
 #include "res_editor/Scripting/PipelineCompiler.inl.h"
 
 namespace AE::ResEditor
-{   
+{
+    using DebugModeBits = EnumBitSet<IPass::EDebugMode>;
+
 /*
 =================================================
     InputController
@@ -165,16 +167,11 @@ namespace AE::ResEditor
     constructor
 =================================================
 */
-    ScriptSceneGraphicsPass::ScriptSceneGraphicsPass () :
-        ScriptBaseRenderPass{ EFlags::Unknown }
-    {}
-
     ScriptSceneGraphicsPass::ScriptSceneGraphicsPass (ScriptScenePtr scene, const String &passName) __Th___ :
         ScriptBaseRenderPass{ EFlags::Unknown },
         _scene{scene}, _passName{passName}
     {
-        _dbgName    = passName;
-        _controller = _scene->GetController();
+        _dbgName = passName;
 
         StringToColor( OUT _dbgColor, StringView{_dbgName} );
 
@@ -209,18 +206,6 @@ namespace AE::ResEditor
         }
     }
 
-/*
-=================================================
-    InputController
-=================================================
-*/
-    void  ScriptSceneGraphicsPass::InputController (const ScriptBaseControllerPtr &value) __Th___
-    {
-        CHECK_THROW_MSG( value );
-
-        _controller = value;
-    }
-
 /*
 =================================================
     SetLayer
@@ -251,11 +236,12 @@ namespace AE::ResEditor
         CHECK_THROW_MSG( not _pipelines.empty(), "pipelines must be defined" );
 
         RC<SceneGraphicsPass>   result      = MakeRC<SceneGraphicsPass>();
-        auto&                   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&                   res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&               renderer    = ScriptExe::ScriptPassApi::GetRenderer();  // throw
         auto&                   materials   = result->_materials;
-        const auto              max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto              max_frames  = GraphicsScheduler().GetMaxFrames();
         PipelinesPerInstance_t  pplns_per_inst;
+        DebugModeBits           dbg_modes;
 
         result->_rtech  = _CompilePipelines( OUT pplns_per_inst, OUT result->_scene );  // throw
 
@@ -269,14 +255,11 @@ namespace AE::ResEditor
             auto            mtr     = geom->ToMaterial( _renderLayer, result->_rtech.rtech, pplns );  // throw
             CHECK_THROW( mtr );
             materials.push_back( mtr );
+            dbg_modes |= mtr->GetDebugModeBits();
         }
 
-        result->_rpDesc.renderPassName  = RenderPassName{"rp"};
-        result->_rpDesc.subpassName     = SubpassName{"main"};
-        result->_rpDesc.packId          = result->_rtech.packId;
-        result->_rpDesc.layerCount      = 1_layer;
-        result->_depthRange             = this->_depthRange;
-        result->_renderLayer            = this->_renderLayer;
+        result->_depthRange     = this->_depthRange;
+        result->_renderLayer    = this->_renderLayer;
 
         result->_ubuffer = res_mngr.CreateBuffer( BufferDesc{ SizeOf<ShaderTypes::SceneGraphicsPassUB>, EBufferUsage::Uniform | EBufferUsage::TransferDst },
                                                   "SceneGraphicsPassUB", renderer.GetAllocator() );
@@ -286,6 +269,24 @@ namespace AE::ResEditor
         CHECK_THROW( res_mngr.CreateDescriptorSets( OUT result->_descSets.data(), max_frames, result->_rtech.packId, DSLayoutName{"pass.ds"} ));
         _args.InitResources( OUT result->_resources );  // throw
 
+        uint    min_layer_count = UMax;
+        for (auto& src : _output)
+        {
+            const uint  layers  = src.rt->Description().arrayLayers.Get();
+            const uint  count   = (src.layerCount == UMax ? (layers - src.layer.Get()) : src.layerCount);
+
+            CHECK_ERR( src.layer.Get() < layers );
+            CHECK_ERR( src.layer.Get() + count <= layers );
+
+            AssignMin( INOUT min_layer_count, count );
+        }
+        CHECK_ERR( min_layer_count > 0 );
+
+        result->_rpDesc.renderPassName  = RenderPassName{"rp"};
+        result->_rpDesc.subpassName     = SubpassName{"main"};
+        result->_rpDesc.packId          = result->_rtech.packId;
+        result->_rpDesc.layerCount      = ImageLayer{min_layer_count};
+
         for (usize i = 0; i < _output.size(); ++i)
         {
             auto&   src = _output[i];
@@ -293,9 +294,9 @@ namespace AE::ResEditor
             CHECK_ERR( rt );
 
             ImageViewDesc   view;
-            view.viewType       = EImage_2D;
+            view.viewType       = (min_layer_count > 1 ? EImage_2DArray : EImage_2D);
             view.baseLayer      = src.layer;
-            view.layerCount     = 1;
+            view.layerCount     = ushort(min_layer_count);
             view.baseMipmap     = src.mipmap;
             view.mipmapCount    = 1;
 
@@ -309,10 +310,8 @@ namespace AE::ResEditor
         }
         CHECK_ERR( not result->_renderTargets.empty() );
 
-        _Init( *result );
-
-        EnumBitSet<IPass::EDebugMode>   dbg_modes;  // TODO
-        UIInteraction::Instance().AddPassDbgInfo( result.get(), dbg_modes, EShaderStages::Fragment );
+        _Init( *result, _scene->GetController() );
+        UIInteraction::Instance().AddPassDbgInfo( result.get(), dbg_modes, EShaderStages::AllGraphics );
 
         return result;
     }
@@ -335,14 +334,11 @@ namespace AE::ResEditor
         }
         {
             ClassBinder<ScriptSceneGraphicsPass>    binder{ se };
-            binder.CreateRef();
+            binder.CreateRef( 0, False{"no ctor"} );
 
             _BindBase( binder, True{"with args"} );
             _BindBaseRenderPass( binder, False{"without blending"} );
 
-            binder.Comment( "Set input controller (camera), supported single controller per pass." );
-            binder.AddMethod( &ScriptSceneGraphicsPass::InputController,    "Set",          {} );
-
             binder.Comment( "Add path to single pipeline or folder with pipelines.\n"
                             "Scene geometry will be linked with compatible pipeline or error will be generated." );
             binder.AddMethod( &ScriptSceneGraphicsPass::AddPipeline,        "AddPipeline",  {"pplnFile"} );
@@ -389,8 +385,8 @@ namespace AE::ResEditor
                 int4        intConst [4];
             )#");
 
-        STATIC_ASSERT( UIInteraction::MaxSlidersPerType == 4 );
-        STATIC_ASSERT( IPass::Constants::MaxCount == 4 );
+        StaticAssert( UIInteraction::MaxSlidersPerType == 4 );
+        StaticAssert( IPass::Constants::MaxCount == 4 );
         return st;
     }
 
@@ -472,64 +468,9 @@ namespace AE::ResEditor
             ds_layout->AddUniformBuffer( EShaderStages::AllGraphics, "un_PerPass", ArraySize{1}, "SceneGraphicsPassUB", EResourceState::ShaderUniform, False{} );
             _args.ArgsToDescSet( stage, ds_layout, ArraySize{1}, EAccessType::Coherent );  // throw
 
-            // add sliders
-            {
-                const uint  max_sliders = UIInteraction::MaxSlidersPerType;
-                for (usize i = 0; i < _sliderCounter.size(); ++i) {
-                    CHECK_THROW_MSG( _sliderCounter[i] <= max_sliders );
-                }
-
-                for (auto& slider : _sliders)
-                {
-                    String  str;
-                    str << slider.name << " = un_PerPass.";
-
-                    BEGIN_ENUM_CHECKS();
-                    switch ( slider.type )
-                    {
-                        case ESlider::Int :     str << "intSliders[";   break;
-                        case ESlider::Float :   str << "floatSliders["; break;
-                        case ESlider::Color :   str << "colors[";       break;
-                        case ESlider::_Count :
-                        default :               CHECK_THROW_MSG( false, "unknown slider type" );
-                    }
-                    END_ENUM_CHECKS();
-
-                    str << ToString( slider.index ) << "]";
-                    switch ( slider.count )
-                    {
-                        case 1 :    str << ".x";    break;
-                        case 2 :    str << ".xy";   break;
-                        case 3 :    str << ".xyz";  break;
-                        case 4 :    str << ".xyzw"; break;
-                        default :   CHECK_THROW_MSG( false, "unknown slider value size" );
-                    }
-                    ds_layout->Define( str );
-                }
-            }
-
-            // add constants
-            {
-                for (auto& c : _constants)
-                {
-                    String  str;
-                    str << c.name << " = un_PerPass.";
-
-                    BEGIN_ENUM_CHECKS();
-                    switch ( c.type )
-                    {
-                        case ESlider::Int :     str << "intConst[";     break;
-                        case ESlider::Float :   str << "floatConst[";   break;
-                        case ESlider::Color :
-                        case ESlider::_Count :
-                        default :               CHECK_THROW_MSG( false, "unknown constant type" );
-                    }
-                    END_ENUM_CHECKS();
-
-                    str << ToString( c.index ) << "]";
-                    ds_layout->Define( str );
-                }
-            }
+            String  str;
+            _AddSlidersAsMacros( OUT str );
+            ds_layout->Define( str );
         }
 
         for (auto& inst : _scene->_geomInstances) {
@@ -537,6 +478,7 @@ namespace AE::ResEditor
         }
 
         auto    include_dirs = ScriptExe::ScriptPassApi::GetPipelineIncludeDirs();
+        CHECK_THROW( storage.CompilePipeline( se, ScriptExe::ScriptPassApi::ToPipelinePath( "VertexInput.as" ), include_dirs ));
         CHECK_THROW( storage.CompilePipeline( se, ScriptExe::ScriptPassApi::ToPipelinePath( "ModelShared.as" ), include_dirs ));
         for (auto& ppln : _pipelines) {
             if ( not storage.CompilePipeline( se, ppln, include_dirs ))
@@ -579,16 +521,11 @@ namespace AE::ResEditor
     constructor
 =================================================
 */
-    ScriptSceneRayTracingPass::ScriptSceneRayTracingPass () :
-        ScriptBasePass{ EFlags::Unknown }
-    {}
-
     ScriptSceneRayTracingPass::ScriptSceneRayTracingPass (ScriptScenePtr scene, const String &passName) __Th___ :
         ScriptBasePass{ EFlags::Unknown },
         _scene{scene}, _passName{passName}
     {
-        _dbgName    = passName;
-        _controller = _scene->GetController();
+        _dbgName = passName;
 
         StringToColor( OUT _dbgColor, StringView{_dbgName} );
 
@@ -605,18 +542,6 @@ namespace AE::ResEditor
         _pipeline = ScriptExe::ScriptPassApi::ToPipelinePath( Path{pplnFile} );  // throw
     }
 
-/*
-=================================================
-    InputController
-=================================================
-*/
-    void  ScriptSceneRayTracingPass::InputController (const ScriptBaseControllerPtr &value) __Th___
-    {
-        CHECK_THROW_MSG( value );
-
-        _controller = value;
-    }
-
 /*
 =================================================
     _OnAddArg
@@ -697,18 +622,26 @@ namespace AE::ResEditor
         CHECK_THROW_MSG( not _pipeline.empty(), "pipeline is not defined" );
 
         RC<SceneRayTracingPass> result      = MakeRC<SceneRayTracingPass>();
-        auto&                   res_mngr    = RenderTaskScheduler().GetResourceManager();
+        auto&                   res_mngr    = GraphicsScheduler().GetResourceManager();
         Renderer&               renderer    = ScriptExe::ScriptPassApi::GetRenderer();  // throw
-        const auto              max_frames  = RenderTaskScheduler().GetMaxFrames();
+        const auto              max_frames  = GraphicsScheduler().GetMaxFrames();
         PipelineName            ppln_name;
         RTShaderBindingName     sbt_name;
         ScriptRTScenePtr        rt_scene;
+        DebugModeBits           dbg_modes;
 
         result->_rtech      = _CompilePipelines( OUT ppln_name, OUT sbt_name, OUT result->_scene, OUT rt_scene );   // throw
 
         result->_pipeline   = result->_rtech.rtech->GetRayTracingPipeline( ppln_name );
         CHECK_THROW( result->_pipeline );
 
+        #if PIPELINE_STATISTICS
+        {
+            auto&   res = res_mngr.GetResourcesOrThrow( result->_pipeline );
+            Unused( res_mngr.GetDevice().PrintPipelineExecutableInfo( _dbgName, res.Handle(), res.Options() ));
+        }
+        #endif
+
         result->_sbt        = result->_rtech.rtech->GetRTShaderBinding( sbt_name );
         CHECK_THROW( result->_sbt );
 
@@ -729,9 +662,7 @@ namespace AE::ResEditor
 
         result->_iterations.assign( this->_iterations.begin(), this->_iterations.end() );
 
-        _Init( *result );
-
-        EnumBitSet<IPass::EDebugMode>   dbg_modes;  // TODO
+        _Init( *result, _scene->GetController() );
         UIInteraction::Instance().AddPassDbgInfo( result.get(), dbg_modes, EShaderStages::AllRayTracing );
 
         return result;
@@ -747,13 +678,10 @@ namespace AE::ResEditor
         using namespace Scripting;
 
         ClassBinder<ScriptSceneRayTracingPass>  binder{ se };
-        binder.CreateRef();
+        binder.CreateRef( 0, False{"no ctor"} );
 
         _BindBase( binder, True{"with args"} );
 
-        binder.Comment( "Set input controller (camera), supported single controller per pass." );
-        binder.AddMethod( &ScriptSceneRayTracingPass::InputController,          "Set",              {} );
-
         binder.Comment( "Set path to single pipeline.\n"
                         "Scene geometry will be linked with compatible pipeline or error will be generated." );
         binder.AddMethod( &ScriptSceneRayTracingPass::SetPipeline,              "SetPipeline",      {"pplnFile"} );
@@ -809,8 +737,8 @@ namespace AE::ResEditor
                 int4        intConst [4];
             )#");
 
-        STATIC_ASSERT( UIInteraction::MaxSlidersPerType == 4 );
-        STATIC_ASSERT( IPass::Constants::MaxCount == 4 );
+        StaticAssert( UIInteraction::MaxSlidersPerType == 4 );
+        StaticAssert( IPass::Constants::MaxCount == 4 );
         return st;
     }
 
@@ -855,64 +783,9 @@ namespace AE::ResEditor
             ds_layout->AddRayTracingScene( stage, "un_RtScene", ArraySize{1} );
             _args.ArgsToDescSet( stage, ds_layout, ArraySize{1}, EAccessType::Coherent );  // throw
 
-            // add sliders
-            {
-                const uint  max_sliders = UIInteraction::MaxSlidersPerType;
-                for (usize i = 0; i < _sliderCounter.size(); ++i) {
-                    CHECK_THROW_MSG( _sliderCounter[i] <= max_sliders );
-                }
-
-                for (auto& slider : _sliders)
-                {
-                    String  str;
-                    str << slider.name << " = un_PerPass.";
-
-                    BEGIN_ENUM_CHECKS();
-                    switch ( slider.type )
-                    {
-                        case ESlider::Int :     str << "intSliders[";   break;
-                        case ESlider::Float :   str << "floatSliders["; break;
-                        case ESlider::Color :   str << "colors[";       break;
-                        case ESlider::_Count :
-                        default :               CHECK_THROW_MSG( false, "unknown slider type" );
-                    }
-                    END_ENUM_CHECKS();
-
-                    str << ToString( slider.index ) << "]";
-                    switch ( slider.count )
-                    {
-                        case 1 :    str << ".x";    break;
-                        case 2 :    str << ".xy";   break;
-                        case 3 :    str << ".xyz";  break;
-                        case 4 :    str << ".xyzw"; break;
-                        default :   CHECK_THROW_MSG( false, "unknown slider value size" );
-                    }
-                    ds_layout->Define( str );
-                }
-            }
-
-            // add constants
-            {
-                for (auto& c : _constants)
-                {
-                    String  str;
-                    str << c.name << " = un_PerPass.";
-
-                    BEGIN_ENUM_CHECKS();
-                    switch ( c.type )
-                    {
-                        case ESlider::Int :     str << "intConst[";     break;
-                        case ESlider::Float :   str << "floatConst[";   break;
-                        case ESlider::Color :
-                        case ESlider::_Count :
-                        default :               CHECK_THROW_MSG( false, "unknown constant type" );
-                    }
-                    END_ENUM_CHECKS();
-
-                    str << ToString( c.index ) << "]";
-                    ds_layout->Define( str );
-                }
-            }
+            String  str;
+            _AddSlidersAsMacros( OUT str );
+            ds_layout->Define( str );
         }
 
         for (auto& inst : _scene->_geomInstances) {
diff --git a/AE/samples/res_editor/Scripting/ScriptScene.h b/AE/samples/res_editor/Scripting/ScriptScene.h
index 64630615..ad0074d9 100644
--- a/AE/samples/res_editor/Scripting/ScriptScene.h
+++ b/AE/samples/res_editor/Scripting/ScriptScene.h
@@ -98,13 +98,11 @@ namespace AE::ResEditor
         ScriptSceneGraphicsPass (ScriptScenePtr scene, const String &passName)              __Th___;
 
     public:
-        ScriptSceneGraphicsPass ()                                                          __Th___;
+        ScriptSceneGraphicsPass () = delete;
 
         void  AddPipeline (const String &pplnFile)                                          __Th___;
         void  AddPipelines (const String &pplnsFolder)                                      __Th___;
 
-        void  InputController (const ScriptBaseControllerPtr &)                             __Th___;
-
         void  SetLayer (ERenderLayer layer)                                                 __Th___;
 
         static void  Bind (const ScriptEnginePtr &se)                                       __Th___;
@@ -154,12 +152,10 @@ namespace AE::ResEditor
         ScriptSceneRayTracingPass (ScriptScenePtr scene, const String &passName)            __Th___;
 
     public:
-        ScriptSceneRayTracingPass ()                                                        __Th___;
+        ScriptSceneRayTracingPass () = delete;
 
         void  SetPipeline (const String &pplnFile)                                          __Th___;
 
-        void  InputController (const ScriptBaseControllerPtr &)                             __Th___;
-
         void  DispatchThreads1  (uint threadsX)                                             __Th___ { return DispatchThreads3v({ threadsX, 1u, 1u }); }
         void  DispatchThreads2  (uint threadsX, uint threadsY)                              __Th___ { return DispatchThreads3v({ threadsX, threadsY, 1u }); }
         void  DispatchThreads3  (uint threadsX, uint threadsY, uint threadsZ)               __Th___ { return DispatchThreads3v({ threadsX, threadsY, threadsZ }); }
diff --git a/AE/samples/res_editor/Scripting/ScriptVideoImage.cpp b/AE/samples/res_editor/Scripting/ScriptVideoImage.cpp
index e1e195e5..be69b87d 100644
--- a/AE/samples/res_editor/Scripting/ScriptVideoImage.cpp
+++ b/AE/samples/res_editor/Scripting/ScriptVideoImage.cpp
@@ -150,7 +150,7 @@ namespace
 
         Renderer&   renderer = ScriptExe::ScriptResourceApi::GetRenderer();  // throw
 
-        _resource = MakeRC<VideoImage>( renderer, desc, _videoFile, _outDynSize->Get(), _dbgName );  // throw
+        _resource = MakeRCTh<VideoImage>( renderer, desc, _videoFile, _outDynSize->Get(), _dbgName );
         return _resource;
     }
 
diff --git a/AE/samples/res_editor/_data/cpp/vk_types.h b/AE/samples/res_editor/_data/cpp/vk_types.h
index 00c822d3..c3d7986d 100644
--- a/AE/samples/res_editor/_data/cpp/vk_types.h
+++ b/AE/samples/res_editor/_data/cpp/vk_types.h
@@ -1,232 +1,237 @@
+//725a45c8
 #ifndef CameraData_DEFINED
-#	define CameraData_DEFINED
-	// size: 384, align: 16
-	struct CameraData
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0x8142e66cu}};  // 'CameraData'
-
-		float4x4_storage  viewProj;
-		float4x4_storage  invViewProj;
-		float4x4_storage  proj;
-		float4x4_storage  view;
-		float3  pos;
-		float2  clipPlanes;
-		StaticArray< float4, 6 >    frustum;
-	};
+#   define CameraData_DEFINED
+    // size: 384, align: 16
+    struct CameraData
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x8142e66cu}};  // 'CameraData'
+
+        float4x4_storage  viewProj;
+        float4x4_storage  invViewProj;
+        float4x4_storage  proj;
+        float4x4_storage  view;
+        float3  pos;
+        float2  clipPlanes;
+        StaticArray< float4, 6 >    frustum;
+    };
 #endif
-	STATIC_ASSERT( offsetof(CameraData, viewProj) == 0 );
-	STATIC_ASSERT( offsetof(CameraData, invViewProj) == 64 );
-	STATIC_ASSERT( offsetof(CameraData, proj) == 128 );
-	STATIC_ASSERT( offsetof(CameraData, view) == 192 );
-	STATIC_ASSERT( offsetof(CameraData, pos) == 256 );
-	STATIC_ASSERT( offsetof(CameraData, clipPlanes) == 272 );
-	STATIC_ASSERT( offsetof(CameraData, frustum) == 288 );
-	STATIC_ASSERT( sizeof(CameraData) == 384 );
+    StaticAssert( offsetof(CameraData, viewProj) == 0 );
+    StaticAssert( offsetof(CameraData, invViewProj) == 64 );
+    StaticAssert( offsetof(CameraData, proj) == 128 );
+    StaticAssert( offsetof(CameraData, view) == 192 );
+    StaticAssert( offsetof(CameraData, pos) == 256 );
+    StaticAssert( offsetof(CameraData, clipPlanes) == 272 );
+    StaticAssert( offsetof(CameraData, frustum) == 288 );
+    StaticAssert( sizeof(CameraData) == 384 );
 
 #ifndef ShadertoyUB_DEFINED
-#	define ShadertoyUB_DEFINED
-	// size: 864, align: 16
-	struct ShadertoyUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0xa31fc14bu}};  // 'ShadertoyUB'
-
-		float3  resolution;
-		float  time;
-		float  timeDelta;
-		uint  frame;
-		uint  seed;
-		float4  channelTime;
-		StaticArray< float4, 4 >    channelResolution;
-		float4  mouse;
-		float4  date;
-		float  sampleRate;
-		float  customKeys;
-		CameraData  camera;
-		StaticArray< float4, 4 >    floatSliders;
-		StaticArray< int4, 4 >    intSliders;
-		StaticArray< float4, 4 >    colors;
-		StaticArray< float4, 4 >    floatConst;
-		StaticArray< int4, 4 >    intConst;
-	};
+#   define ShadertoyUB_DEFINED
+    // size: 864, align: 16
+    struct ShadertoyUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xa31fc14bu}};  // 'ShadertoyUB'
+
+        float3  resolution;
+        float  time;
+        float  timeDelta;
+        uint  frame;
+        uint  seed;
+        float4  channelTime;
+        StaticArray< float4, 4 >    channelResolution;
+        float4  mouse;
+        float4  date;
+        float  sampleRate;
+        float  customKeys;
+        float  pixToMm;
+        CameraData  camera;
+        StaticArray< float4, 4 >    floatSliders;
+        StaticArray< int4, 4 >    intSliders;
+        StaticArray< float4, 4 >    colors;
+        StaticArray< float4, 4 >    floatConst;
+        StaticArray< int4, 4 >    intConst;
+    };
 #endif
-	STATIC_ASSERT( offsetof(ShadertoyUB, resolution) == 0 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, time) == 16 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, timeDelta) == 20 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, frame) == 24 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, seed) == 28 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, channelTime) == 32 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, channelResolution) == 48 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, mouse) == 112 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, date) == 128 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, sampleRate) == 144 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, customKeys) == 148 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, camera) == 160 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, floatSliders) == 544 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, intSliders) == 608 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, colors) == 672 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, floatConst) == 736 );
-	STATIC_ASSERT( offsetof(ShadertoyUB, intConst) == 800 );
-	STATIC_ASSERT( sizeof(ShadertoyUB) == 864 );
+    StaticAssert( offsetof(ShadertoyUB, resolution) == 0 );
+    StaticAssert( offsetof(ShadertoyUB, time) == 16 );
+    StaticAssert( offsetof(ShadertoyUB, timeDelta) == 20 );
+    StaticAssert( offsetof(ShadertoyUB, frame) == 24 );
+    StaticAssert( offsetof(ShadertoyUB, seed) == 28 );
+    StaticAssert( offsetof(ShadertoyUB, channelTime) == 32 );
+    StaticAssert( offsetof(ShadertoyUB, channelResolution) == 48 );
+    StaticAssert( offsetof(ShadertoyUB, mouse) == 112 );
+    StaticAssert( offsetof(ShadertoyUB, date) == 128 );
+    StaticAssert( offsetof(ShadertoyUB, sampleRate) == 144 );
+    StaticAssert( offsetof(ShadertoyUB, customKeys) == 148 );
+    StaticAssert( offsetof(ShadertoyUB, pixToMm) == 152 );
+    StaticAssert( offsetof(ShadertoyUB, camera) == 160 );
+    StaticAssert( offsetof(ShadertoyUB, floatSliders) == 544 );
+    StaticAssert( offsetof(ShadertoyUB, intSliders) == 608 );
+    StaticAssert( offsetof(ShadertoyUB, colors) == 672 );
+    StaticAssert( offsetof(ShadertoyUB, floatConst) == 736 );
+    StaticAssert( offsetof(ShadertoyUB, intConst) == 800 );
+    StaticAssert( sizeof(ShadertoyUB) == 864 );
 
 #ifndef ComputePassUB_DEFINED
-#	define ComputePassUB_DEFINED
-	// size: 752, align: 16
-	struct ComputePassUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0xaba36a57u}};  // 'ComputePassUB'
-
-		float  time;
-		float  timeDelta;
-		uint  frame;
-		uint  seed;
-		float4  mouse;
-		float  customKeys;
-		CameraData  camera;
-		StaticArray< float4, 4 >    floatSliders;
-		StaticArray< int4, 4 >    intSliders;
-		StaticArray< float4, 4 >    colors;
-		StaticArray< float4, 4 >    floatConst;
-		StaticArray< int4, 4 >    intConst;
-	};
+#   define ComputePassUB_DEFINED
+    // size: 752, align: 16
+    struct ComputePassUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xaba36a57u}};  // 'ComputePassUB'
+
+        float  time;
+        float  timeDelta;
+        uint  frame;
+        uint  seed;
+        float4  mouse;
+        float  customKeys;
+        CameraData  camera;
+        StaticArray< float4, 4 >    floatSliders;
+        StaticArray< int4, 4 >    intSliders;
+        StaticArray< float4, 4 >    colors;
+        StaticArray< float4, 4 >    floatConst;
+        StaticArray< int4, 4 >    intConst;
+    };
 #endif
-	STATIC_ASSERT( offsetof(ComputePassUB, time) == 0 );
-	STATIC_ASSERT( offsetof(ComputePassUB, timeDelta) == 4 );
-	STATIC_ASSERT( offsetof(ComputePassUB, frame) == 8 );
-	STATIC_ASSERT( offsetof(ComputePassUB, seed) == 12 );
-	STATIC_ASSERT( offsetof(ComputePassUB, mouse) == 16 );
-	STATIC_ASSERT( offsetof(ComputePassUB, customKeys) == 32 );
-	STATIC_ASSERT( offsetof(ComputePassUB, camera) == 48 );
-	STATIC_ASSERT( offsetof(ComputePassUB, floatSliders) == 432 );
-	STATIC_ASSERT( offsetof(ComputePassUB, intSliders) == 496 );
-	STATIC_ASSERT( offsetof(ComputePassUB, colors) == 560 );
-	STATIC_ASSERT( offsetof(ComputePassUB, floatConst) == 624 );
-	STATIC_ASSERT( offsetof(ComputePassUB, intConst) == 688 );
-	STATIC_ASSERT( sizeof(ComputePassUB) == 752 );
+    StaticAssert( offsetof(ComputePassUB, time) == 0 );
+    StaticAssert( offsetof(ComputePassUB, timeDelta) == 4 );
+    StaticAssert( offsetof(ComputePassUB, frame) == 8 );
+    StaticAssert( offsetof(ComputePassUB, seed) == 12 );
+    StaticAssert( offsetof(ComputePassUB, mouse) == 16 );
+    StaticAssert( offsetof(ComputePassUB, customKeys) == 32 );
+    StaticAssert( offsetof(ComputePassUB, camera) == 48 );
+    StaticAssert( offsetof(ComputePassUB, floatSliders) == 432 );
+    StaticAssert( offsetof(ComputePassUB, intSliders) == 496 );
+    StaticAssert( offsetof(ComputePassUB, colors) == 560 );
+    StaticAssert( offsetof(ComputePassUB, floatConst) == 624 );
+    StaticAssert( offsetof(ComputePassUB, intConst) == 688 );
+    StaticAssert( sizeof(ComputePassUB) == 752 );
 
 #ifndef RayTracingPassUB_DEFINED
-#	define RayTracingPassUB_DEFINED
-	// size: 752, align: 16
-	struct RayTracingPassUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0x1539319au}};  // 'RayTracingPassUB'
-
-		float  time;
-		float  timeDelta;
-		uint  frame;
-		uint  seed;
-		float4  mouse;
-		float  customKeys;
-		CameraData  camera;
-		StaticArray< float4, 4 >    floatSliders;
-		StaticArray< int4, 4 >    intSliders;
-		StaticArray< float4, 4 >    colors;
-		StaticArray< float4, 4 >    floatConst;
-		StaticArray< int4, 4 >    intConst;
-	};
+#   define RayTracingPassUB_DEFINED
+    // size: 752, align: 16
+    struct RayTracingPassUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x1539319au}};  // 'RayTracingPassUB'
+
+        float  time;
+        float  timeDelta;
+        uint  frame;
+        uint  seed;
+        float4  mouse;
+        float  customKeys;
+        CameraData  camera;
+        StaticArray< float4, 4 >    floatSliders;
+        StaticArray< int4, 4 >    intSliders;
+        StaticArray< float4, 4 >    colors;
+        StaticArray< float4, 4 >    floatConst;
+        StaticArray< int4, 4 >    intConst;
+    };
 #endif
-	STATIC_ASSERT( offsetof(RayTracingPassUB, time) == 0 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, timeDelta) == 4 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, frame) == 8 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, seed) == 12 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, mouse) == 16 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, customKeys) == 32 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, camera) == 48 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, floatSliders) == 432 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, intSliders) == 496 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, colors) == 560 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, floatConst) == 624 );
-	STATIC_ASSERT( offsetof(RayTracingPassUB, intConst) == 688 );
-	STATIC_ASSERT( sizeof(RayTracingPassUB) == 752 );
+    StaticAssert( offsetof(RayTracingPassUB, time) == 0 );
+    StaticAssert( offsetof(RayTracingPassUB, timeDelta) == 4 );
+    StaticAssert( offsetof(RayTracingPassUB, frame) == 8 );
+    StaticAssert( offsetof(RayTracingPassUB, seed) == 12 );
+    StaticAssert( offsetof(RayTracingPassUB, mouse) == 16 );
+    StaticAssert( offsetof(RayTracingPassUB, customKeys) == 32 );
+    StaticAssert( offsetof(RayTracingPassUB, camera) == 48 );
+    StaticAssert( offsetof(RayTracingPassUB, floatSliders) == 432 );
+    StaticAssert( offsetof(RayTracingPassUB, intSliders) == 496 );
+    StaticAssert( offsetof(RayTracingPassUB, colors) == 560 );
+    StaticAssert( offsetof(RayTracingPassUB, floatConst) == 624 );
+    StaticAssert( offsetof(RayTracingPassUB, intConst) == 688 );
+    StaticAssert( sizeof(RayTracingPassUB) == 752 );
 
 #ifndef SceneGraphicsPassUB_DEFINED
-#	define SceneGraphicsPassUB_DEFINED
-	// size: 736, align: 16
-	struct SceneGraphicsPassUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0x1f8a4833u}};  // 'SceneGraphicsPassUB'
-
-		float2  resolution;
-		float  time;
-		float  timeDelta;
-		uint  frame;
-		uint  seed;
-		CameraData  camera;
-		StaticArray< float4, 4 >    floatSliders;
-		StaticArray< int4, 4 >    intSliders;
-		StaticArray< float4, 4 >    colors;
-		StaticArray< float4, 4 >    floatConst;
-		StaticArray< int4, 4 >    intConst;
-	};
+#   define SceneGraphicsPassUB_DEFINED
+    // size: 736, align: 16
+    struct SceneGraphicsPassUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x1f8a4833u}};  // 'SceneGraphicsPassUB'
+
+        float2  resolution;
+        float  time;
+        float  timeDelta;
+        uint  frame;
+        uint  seed;
+        CameraData  camera;
+        StaticArray< float4, 4 >    floatSliders;
+        StaticArray< int4, 4 >    intSliders;
+        StaticArray< float4, 4 >    colors;
+        StaticArray< float4, 4 >    floatConst;
+        StaticArray< int4, 4 >    intConst;
+    };
 #endif
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, resolution) == 0 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, time) == 8 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, timeDelta) == 12 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, frame) == 16 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, seed) == 20 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, camera) == 32 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, floatSliders) == 416 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, intSliders) == 480 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, colors) == 544 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, floatConst) == 608 );
-	STATIC_ASSERT( offsetof(SceneGraphicsPassUB, intConst) == 672 );
-	STATIC_ASSERT( sizeof(SceneGraphicsPassUB) == 736 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, resolution) == 0 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, time) == 8 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, timeDelta) == 12 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, frame) == 16 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, seed) == 20 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, camera) == 32 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, floatSliders) == 416 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, intSliders) == 480 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, colors) == 544 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, floatConst) == 608 );
+    StaticAssert( offsetof(SceneGraphicsPassUB, intConst) == 672 );
+    StaticAssert( sizeof(SceneGraphicsPassUB) == 736 );
 
 #ifndef SceneRayTracingPassUB_DEFINED
-#	define SceneRayTracingPassUB_DEFINED
-	// size: 720, align: 16
-	struct SceneRayTracingPassUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0xd09ba9b0u}};  // 'SceneRayTracingPassUB'
-
-		float  time;
-		float  timeDelta;
-		uint  frame;
-		uint  seed;
-		CameraData  camera;
-		StaticArray< float4, 4 >    floatSliders;
-		StaticArray< int4, 4 >    intSliders;
-		StaticArray< float4, 4 >    colors;
-		StaticArray< float4, 4 >    floatConst;
-		StaticArray< int4, 4 >    intConst;
-	};
+#   define SceneRayTracingPassUB_DEFINED
+    // size: 720, align: 16
+    struct SceneRayTracingPassUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xd09ba9b0u}};  // 'SceneRayTracingPassUB'
+
+        float  time;
+        float  timeDelta;
+        uint  frame;
+        uint  seed;
+        CameraData  camera;
+        StaticArray< float4, 4 >    floatSliders;
+        StaticArray< int4, 4 >    intSliders;
+        StaticArray< float4, 4 >    colors;
+        StaticArray< float4, 4 >    floatConst;
+        StaticArray< int4, 4 >    intConst;
+    };
 #endif
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, time) == 0 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, timeDelta) == 4 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, frame) == 8 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, seed) == 12 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, camera) == 16 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, floatSliders) == 400 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, intSliders) == 464 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, colors) == 528 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, floatConst) == 592 );
-	STATIC_ASSERT( offsetof(SceneRayTracingPassUB, intConst) == 656 );
-	STATIC_ASSERT( sizeof(SceneRayTracingPassUB) == 720 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, time) == 0 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, timeDelta) == 4 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, frame) == 8 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, seed) == 12 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, camera) == 16 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, floatSliders) == 400 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, intSliders) == 464 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, colors) == 528 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, floatConst) == 592 );
+    StaticAssert( offsetof(SceneRayTracingPassUB, intConst) == 656 );
+    StaticAssert( sizeof(SceneRayTracingPassUB) == 720 );
 
 #ifndef SphericalCubeMaterialUB_DEFINED
-#	define SphericalCubeMaterialUB_DEFINED
-	// size: 68 (80), align: 16
-	struct alignas(16) SphericalCubeMaterialUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0xeb01110au}};  // 'SphericalCubeMaterialUB'
-
-		float4x4_storage  transform;
-		float  tessLevel;
-	};
+#   define SphericalCubeMaterialUB_DEFINED
+    // size: 112, align: 16
+    struct SphericalCubeMaterialUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0xeb01110au}};  // 'SphericalCubeMaterialUB'
+
+        float4x4_storage  transform;
+        float3x3_storage  normalMat;
+    };
 #endif
-	STATIC_ASSERT( offsetof(SphericalCubeMaterialUB, transform) == 0 );
-	STATIC_ASSERT( offsetof(SphericalCubeMaterialUB, tessLevel) == 64 );
-	STATIC_ASSERT( sizeof(SphericalCubeMaterialUB) == 80 );
+    StaticAssert( offsetof(SphericalCubeMaterialUB, transform) == 0 );
+    StaticAssert( offsetof(SphericalCubeMaterialUB, normalMat) == 64 );
+    StaticAssert( sizeof(SphericalCubeMaterialUB) == 112 );
 
 #ifndef UnifiedGeometryMaterialUB_DEFINED
-#	define UnifiedGeometryMaterialUB_DEFINED
-	// size: 64, align: 16
-	struct UnifiedGeometryMaterialUB
-	{
-		static constexpr auto  TypeName = ShaderStructName{HashVal32{0x6940ef36u}};  // 'UnifiedGeometryMaterialUB'
-
-		float4x4_storage  transform;
-	};
+#   define UnifiedGeometryMaterialUB_DEFINED
+    // size: 112, align: 16
+    struct UnifiedGeometryMaterialUB
+    {
+        static constexpr auto  TypeName = ShaderStructName{HashVal32{0x6940ef36u}};  // 'UnifiedGeometryMaterialUB'
+
+        float4x4_storage  transform;
+        float3x3_storage  normalMat;
+    };
 #endif
-	STATIC_ASSERT( offsetof(UnifiedGeometryMaterialUB, transform) == 0 );
-	STATIC_ASSERT( sizeof(UnifiedGeometryMaterialUB) == 64 );
+    StaticAssert( offsetof(UnifiedGeometryMaterialUB, transform) == 0 );
+    StaticAssert( offsetof(UnifiedGeometryMaterialUB, normalMat) == 64 );
+    StaticAssert( sizeof(UnifiedGeometryMaterialUB) == 112 );
 
diff --git a/AE/samples/res_editor/_data/pipelines/ModelShared.as b/AE/samples/res_editor/_data/pipelines/ModelShared.as
index e0b43ff2..13387ad3 100644
--- a/AE/samples/res_editor/_data/pipelines/ModelShared.as
+++ b/AE/samples/res_editor/_data/pipelines/ModelShared.as
@@ -1,4 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Always included for GraphicsPass
+*/
 #include "Model.as"
 
 void  ASmain ()
diff --git a/AE/samples/res_editor/_data/pipelines/VertexInput.as b/AE/samples/res_editor/_data/pipelines/VertexInput.as
index fc8d552f..c67869e4 100644
--- a/AE/samples/res_editor/_data/pipelines/VertexInput.as
+++ b/AE/samples/res_editor/_data/pipelines/VertexInput.as
@@ -1,4 +1,7 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Always included for GraphicsPass
+*/
 #include <pipeline_compiler.as>
 
 void ASmain ()
@@ -6,7 +9,8 @@ void ASmain ()
     // spherical cube
     {
         RC<ShaderStructType>    st = ShaderStructType( "CubeVertex" );
-        st.Set( "packed_short_norm4     Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_short_norm4     Position;" +
                 "packed_short_norm4     Texcoord;" +
                 "packed_short_norm4     Normal;" +
                 "packed_short_norm4     Tangent;" +
@@ -17,7 +21,8 @@ void ASmain ()
         vb.Add( "All", st );
     }{
         RC<ShaderStructType>    st = ShaderStructType( "SphericalCubeVertex" );
-        st.Set( "packed_short_norm4     Position;" +
+        st.Set( EStructLayout::InternalIO,
+                "packed_short_norm4     Position;" +
                 "packed_short_norm4     Texcoord;" +
                 "packed_short_norm4     Tangent;" +
                 "packed_short_norm4     BiTangent;" );
diff --git a/AE/samples/res_editor/_data/pipelines/include/Model.as b/AE/samples/res_editor/_data/pipelines/include/Model.as
index b7225054..848d28b7 100644
--- a/AE/samples/res_editor/_data/pipelines/include/Model.as
+++ b/AE/samples/res_editor/_data/pipelines/include/Model.as
@@ -12,15 +12,18 @@ void  VertexBuffers ()
     // vertex components
     {
         RC<ShaderStructType>    st1 = ShaderStructType( "Posf3" );
-        st1.Set( "packed_float3     Position;" );
+        st1.Set( EStructLayout::InternalIO,
+                 "packed_float3     Position;" );
         st1.AddUsage( ShaderStructTypeUsage::VertexLayout );
 
         RC<ShaderStructType>    st2 = ShaderStructType( "Normf3" );
-        st2.Set( "packed_float3     Normal;" );
+        st2.Set( EStructLayout::InternalIO,
+                 "packed_float3     Normal;" );
         st2.AddUsage( ShaderStructTypeUsage::VertexLayout );
 
         RC<ShaderStructType>    st3 = ShaderStructType( "UVf2" );
-        st3.Set( "packed_float2     Texcoord;" );
+        st3.Set( EStructLayout::InternalIO,
+                 "packed_float2     Texcoord;" );
         st3.AddUsage( ShaderStructTypeUsage::VertexLayout );
     }
 
diff --git a/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as b/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as
index 39ae52c5..f7bd94a7 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as
@@ -57,7 +57,7 @@
                 rs.inputAssembly.topology       = EPrimitive::TriangleList;
 
                 rs.rasterization.frontFaceCCW   = true;
-                rs.rasterization.cullMode       = ECullMode::None;
+                rs.rasterization.cullMode       = ECullMode::Front;
 
                 spec.SetRenderState( rs );
             }
@@ -69,11 +69,19 @@
 #ifdef SH_VERT
     #include "Transform.glsl"
 
+    #ifndef iUVMode
+    # define iUVMode    0
+    #endif
+
     void Main ()
     {
-        gl.Position     = LocalPosToClipSpace( in_Position.xyz );
-        Out.texcoord    = in_Texcoord.xyz;
-        Out.normal      = in_Position.xyz;
+        Out.texcoord = in_Texcoord.xyz;
+
+        if ( iUVMode == 1 ) Out.texcoord = in_Position.xyz;
+        Out.texcoord.y = -Out.texcoord.y;
+
+        gl.Position = LocalPosToClipSpace( in_Position.xyz );
+        Out.normal  = in_Position.xyz;
     }
 
 #endif
diff --git a/AE/samples/res_editor/_data/pipelines/samples/DebugTBN.as b/AE/samples/res_editor/_data/pipelines/samples/DebugTBN.as
index 982c691b..1e0b29b4 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/DebugTBN.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/DebugTBN.as
@@ -176,7 +176,7 @@
         const float3    u_dir   = v10 * duv0.x + v20 * duv0.y;
         const float3    v_dir   = v10 * duv1.x + v20 * duv1.y;
         const float3    center  = (P0 + P1 + P2) / 3.0f;
-        const float3    pos     = center + v_dir * c_Offset + u_dir * c_Offset;
+        const float3    pos     = center + (v_dir + u_dir) * c_Offset;
         {
             gl.Position = un_PerPass.camera.viewProj * float4(pos, 1.0f);
             Out.color   = float3(0.2, 0.2, 0.2);
@@ -286,6 +286,7 @@
             DrawTriangleBorder();
         }
     }
+
 #endif
 //-----------------------------------------------------------------------------
 #ifdef SH_FRAG
diff --git a/AE/samples/res_editor/_data/pipelines/samples/Dispersion2D-area.as b/AE/samples/res_editor/_data/pipelines/samples/Dispersion2D-area.as
index c51ff325..abf33823 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/Dispersion2D-area.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/Dispersion2D-area.as
@@ -100,8 +100,8 @@
             return;
 
         //           /
-        //  /      
-        //  \      
+        //  /
+        //  \ 
         //  cone0    \
         //          cone1
 
diff --git a/AE/samples/res_editor/_data/pipelines/samples/Parallax-Sphere2.as b/AE/samples/res_editor/_data/pipelines/samples/Parallax-Sphere2.as
new file mode 100644
index 00000000..73230370
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/samples/Parallax-Sphere2.as
@@ -0,0 +1,140 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Draw geometry with parallax mapping.
+*/
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     texcoord;" +
+                    "float3     worldPos;" +
+                    "float3     normal;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject",         "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::AllGraphics,"un_Geometry",         "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+            ds.CombinedImage( EShaderStages::Fragment,  "un_ColorMap",          EImageType::FImageCube, Sampler_LinearMipmapRepeat );
+            ds.CombinedImage( EShaderStages::Fragment,  "un_HeightNormalMap",   EImageType::FImageCube, Sampler_LinearMipmapRepeat );
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex, EShader::Fragment, "io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::Back;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "Transform.glsl"
+
+    void Main ()
+    {
+        const uint      idx = gl.VertexIndex;
+        const float4    pos = LocalPosToWorldSpace( un_Geometry.positions[idx] );
+
+        gl.Position     = WorldPosToClipSpace( pos );
+        Out.texcoord    = un_Geometry.texcoords[idx];
+        Out.worldPos    = pos.xyz;
+        Out.normal      = LocalVecToWorldSpace( un_Geometry.positions[idx] );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "Matrix.glsl"
+    #include "ReliefMapping.glsl"
+
+    // sliders:
+    #ifndef iShowNormals
+    # define iShowNormals       0
+    #endif
+    #ifndef iMode
+    # define iMode              3
+    #endif
+    #ifndef iHeightScale
+    # define iHeightScale       0.1
+    #endif
+
+    #define ExtractNormal( _normalMap_, _uv_ )      (ToSNorm(gl.texture.Sample( _normalMap_, _uv_ ).yzw) * float3(1.f, -1.f, 1.f))
+
+
+    ND_ float3  ReliefMapping (const float3 uv, const float3 viewDir, const float3 worldPos, const float3 lightDir)
+    {
+              float3    distorted_uv    = uv;
+        const int       num_layers      = 64;
+
+        switch ( iMode )
+        {
+            case 0 :    break; // normal mapping
+            case 1 :    distorted_uv = ParallaxMapping( un_HeightNormalMap, uv, viewDir, iHeightScale, 0.f );                   break;
+            case 2 :    distorted_uv = SteepParallaxMapping( un_HeightNormalMap, uv, viewDir, num_layers, iHeightScale );       break;
+            case 3:     distorted_uv = ParallaxOcclusionMapping( un_HeightNormalMap, uv, viewDir, num_layers, iHeightScale );   break;
+        }
+
+        const float3    normal          = Normalize( ExtractNormal( un_HeightNormalMap, distorted_uv ));
+        const float3    tex_color       = gl.texture.Sample( un_ColorMap, distorted_uv ).rgb;
+        const bool      left_src        = gl.FragCoord.x < un_PerPass.resolution.x*0.5;
+
+        const float3    halfway_dir     = Normalize( lightDir + viewDir );
+        const float3    ambient         = 0.2 * tex_color;
+        const float3    diffuse         = Max( Dot(lightDir, normal), 0.f ) * tex_color;
+        const float3    specular        = float3(0.2) * Pow( Max( Dot(normal, halfway_dir), 0.f ), 32.f );
+        const float     shadow          = 1.0;
+        const float3    color           = ambient + (diffuse * shadow) + (specular * shadow);
+
+        return Lerp( color, (left_src ? normal : -normal), float(iShowNormals) );
+    }
+
+
+    void  Main ()
+    {
+        const float3    view_dir = -ViewDir( un_PerPass.camera.invViewProj, gl.FragCoord.xy, un_PerPass.resolution.xy );
+
+        out_Color = float4( ReliefMapping( In.texcoord, view_dir, In.worldPos, un_Geometry.lightDir ), 1.0 );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/samples/Parallax.as b/AE/samples/res_editor/_data/pipelines/samples/Parallax.as
index 63ba76d3..aecea753 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/Parallax.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/Parallax.as
@@ -134,18 +134,17 @@
     }
 
 
-    ND_ float4  ReliefMapping (const float2 uv, const float3 viewDir, const float3 worldPos, const float3 lightDir)
+    ND_ float3  ReliefMapping (const float2 uv, const float3 viewDir, const float3 worldPos, const float3 lightDir)
     {
         float3x3        TBN;
         if ( iScreenSpaceTBN == 0 ){
             TBN = float3x3( Normalize( In.tangent ),
-                            Normalize( In.bitangent ), 
+                            Normalize( In.bitangent ),
                             Normalize( In.normal ));
         }else{
             TBN = ComputeTBNinWS_dxdy( uv, worldPos );
         }
-
-        const float3    tan_view_dir    = Normalize( TBN * viewDir );
+        const float3    tan_view_dir    = Normalize( MatTranspose(TBN) * viewDir );
               float2    distorted_uv    = uv;
         const int       num_layers      = 64;
 
@@ -168,7 +167,7 @@
         const float     shadow          = 1.0;
         const float3    color           = ambient + (diffuse * shadow) + (specular * shadow);
 
-        return float4( Lerp( color, (left_src ? normal : -normal), float(iShowNormals) ), 1.0f );
+        return Lerp( color, (left_src ? normal : -normal), float(iShowNormals) );
     }
 
 
@@ -176,7 +175,7 @@
     {
         const float3    view_dir = ViewDir( un_PerPass.camera.invViewProj, gl.FragCoord.xy, un_PerPass.resolution.xy );
 
-        out_Color = ReliefMapping( In.texcoord, view_dir, In.worldPos, un_Geometry.lightDir );
+        out_Color = float4( ReliefMapping( In.texcoord, view_dir, In.worldPos, un_Geometry.lightDir ), 1.0 );
     }
 
 #endif
diff --git a/AE/samples/res_editor/_data/pipelines/samples/Planet-1.as b/AE/samples/res_editor/_data/pipelines/samples/Planet-1.as
index 46973cd4..cb229ffa 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/Planet-1.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/Planet-1.as
@@ -14,7 +14,6 @@
         {
             RC<ShaderStructType>    st = ShaderStructType( "io.vs-fs" );
             st.Set( EStructLayout::InternalIO,
-                    "float3     normal;" +
                     "float3     texcoord;" );
         }{
             RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
@@ -76,7 +75,7 @@
     {
         gl.Position     = LocalPosToClipSpace( in_Position.xyz );
         Out.texcoord    = in_Texcoord.xyz;
-        Out.normal      = in_Position.xyz;
+        //Out.normal    = LocalVecToWorldSpace( in_Position.xyz );
     }
 
 #endif
@@ -86,7 +85,7 @@
 
     void Main ()
     {
-        const float3    light_dir   = float3( 0.f, 0.f, -1.f );
+        const float3    light_dir   = float3( 0.f, 0.f, 1.f );
         const float3    norm        = gl.texture.Sample( un_NormalMap, In.texcoord ).xyz;
         const float3    color       = gl.texture.Sample( un_AlbedoMap, In.texcoord ).xyz;
         const float     light       = Dot( norm, light_dir );
diff --git a/AE/samples/res_editor/_data/pipelines/samples/Planet-2.as b/AE/samples/res_editor/_data/pipelines/samples/Planet-2.as
index 2ccbb06f..ebb4c045 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/Planet-2.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/Planet-2.as
@@ -66,7 +66,7 @@
                 RC<Shader>  tes = Shader();
                 tes.LoadSelf();
                 tes.Define( use_quads ? "USE_QUADS=1" : "USE_QUADS=0" );
-                tes.TessPatchMode( (use_quads ? ETessPatch::Quads : ETessPatch::Triangles), ETessSpacing::Equal, true );
+                tes.TessPatchMode( (use_quads ? ETessPatch::Quads : ETessPatch::Triangles), ETessSpacing::Equal, /*ccw*/false );
                 ppln.SetTessEvalShader( tes );
             }{
                 RC<Shader>  fs = Shader();
@@ -86,7 +86,7 @@
 
                 rs.inputAssembly.topology       = EPrimitive::Patch;
 
-                rs.rasterization.frontFaceCCW   = false;
+                rs.rasterization.frontFaceCCW   = true;
                 rs.rasterization.cullMode       = ECullMode::Back;
 
                 spec.SetRenderState( rs );
@@ -107,19 +107,23 @@
 #endif
 //-----------------------------------------------------------------------------
 #ifdef SH_TESS_CTRL
+
+# ifndef iTessLevel
+#   define iTessLevel   1.f
+# endif
+# define I  gl.InvocationID
+
 # if USE_QUADS
 
     void Main ()
     {
-    #   define I    gl.InvocationID
-
         if ( I == 0 ) {
-            gl.TessLevelInner[0] = un_PerObject.tessLevel;
-            gl.TessLevelInner[1] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[0] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[1] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[2] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[3] = un_PerObject.tessLevel;
+            gl.TessLevelInner[0] = iTessLevel;
+            gl.TessLevelInner[1] = iTessLevel;
+            gl.TessLevelOuter[0] = iTessLevel;
+            gl.TessLevelOuter[1] = iTessLevel;
+            gl.TessLevelOuter[2] = iTessLevel;
+            gl.TessLevelOuter[3] = iTessLevel;
         }
         Out[I].position = In[I].position;
         Out[I].texcoord = In[I].texcoord;
@@ -129,13 +133,11 @@
 
     void Main ()
     {
-    #   define I    gl.InvocationID
-
         if ( I == 0 ) {
-            gl.TessLevelInner[0] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[0] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[1] = un_PerObject.tessLevel;
-            gl.TessLevelOuter[2] = un_PerObject.tessLevel;
+            gl.TessLevelInner[0] = iTessLevel;
+            gl.TessLevelOuter[0] = iTessLevel;
+            gl.TessLevelOuter[1] = iTessLevel;
+            gl.TessLevelOuter[2] = iTessLevel;
         }
         Out[I].position = In[I].position;
         Out[I].texcoord = In[I].texcoord;
@@ -172,7 +174,7 @@
 
     void Main ()
     {
-        const float3    light_dir   = float3( 0.f, 0.f, -1.f );
+        const float3    light_dir   = float3( 0.f, 0.f, 1.f );
         const float3    norm        = gl.texture.Sample( un_NormalMap, In.texcoord ).xyz;
         const float3    color       = gl.texture.Sample( un_AlbedoMap, In.texcoord ).rgb;
         const float     light       = Dot( norm, light_dir );
diff --git a/AE/samples/res_editor/_data/pipelines/samples/ShadowMap-pass2.as b/AE/samples/res_editor/_data/pipelines/samples/ShadowMap-pass2.as
index b1d7c709..e62e7ab5 100644
--- a/AE/samples/res_editor/_data/pipelines/samples/ShadowMap-pass2.as
+++ b/AE/samples/res_editor/_data/pipelines/samples/ShadowMap-pass2.as
@@ -20,7 +20,7 @@
             RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
             ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject", "UnifiedGeometryMaterialUB" );
             ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock",   EResourceState::ShaderStorage_Read );   // external
-            ds.StorageBuffer( EShaderStages::AllGraphics,"un_Lights",   "LightsSBlock",     EResourceState::ShaderStorage_Read );   // external
+            ds.StorageBuffer( EShaderStages::Fragment,  "un_Lights",    "LightsSBlock",     EResourceState::ShaderStorage_Read );   // external
             ds.CombinedImage( EShaderStages::Fragment,  "un_ShadowMap", EImageType::FImage2D, Sampler_LinearClamp );
         }{
             RC<PipelineLayout>      pl = PipelineLayout( "pl" );
diff --git a/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-1.as b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-1.as
new file mode 100644
index 00000000..4e48de70
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-1.as
@@ -0,0 +1,171 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "gs-fs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float      area;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Geometry,      "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::AllGraphics,   "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+            ds.CombinedImage( EShaderStages::Fragment,      "un_CubeMap",   EImageType::FImageCube,  Sampler_LinearMipmapClamp );
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Geometry, EShader::Fragment, "gs-fs.io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  gs = Shader();
+                gs.LoadSelf();
+                ppln.SetGeometryShader( gs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::Back;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "CubeMap.glsl"
+
+    void Main ()
+    {
+        const uint      idx     = gl.VertexIndex;
+        const float2    coord   = un_Geometry.positions[idx].xy;
+        const int       face    = int(un_Geometry.positions[idx].z);
+        float3          uvw     = float3(0.0);
+
+        switch ( iProj )
+        {
+            case 0 :    uvw = CM_CubeSC_Forward( coord, face );         break;
+            case 1 :    uvw = CM_IdentitySC_Forward( coord, face );     break;
+            case 2 :    uvw = CM_TangentialSC_Forward( coord, face );   break;
+            case 3 :    uvw = CM_EverittSC_Forward( coord, face );      break;
+            case 4 :    uvw = CM_5thPolySC_Forward( coord, face );      break;
+            case 5 :    uvw = CM_COBE_SC_Forward( coord, face );        break;
+            case 6 :    uvw = CM_ArvoSC_Forward( coord, face );         break;
+        }
+        gl.Position = float4(uvw, 1.0);
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_GEOM
+    #include "Transform.glsl"
+    #include "Geometry.glsl"
+
+    layout (triangles) in;
+    layout (triangle_strip, max_vertices = 3) out;
+
+    #define P0      gl_in[0].gl_Position.xyz
+    #define P1      gl_in[1].gl_Position.xyz
+    #define P2      gl_in[2].gl_Position.xyz
+
+
+    void Main ()
+    {
+        float   area = TriangleArea( P0, P1, P2 );
+
+        for (uint i = 0; i < 3; ++i)
+        {
+            gl.Position = LocalPosToClipSpace( gl_in[i].gl_Position );
+            Out.area    = area;
+            gl.EmitVertex();
+        }
+        gl.EndPrimitive();
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "CodeTemplates.glsl"
+    #include "Color.glsl"
+    #include "SDF.glsl"
+    #include "GlobalIndex.glsl"
+
+    int3  GetGlobalSize () {
+        return int3(un_PerPass.resolution.xy, 0);
+    }
+
+    void Main ()
+    {
+        // triangle area as color
+        {
+            float   x = In.area * iAreaScale;
+            x = x*x;
+
+            out_Color = Rainbow( 1.0 - Saturate(x) );
+        }
+
+        // debug output
+        out_Color.a = In.area * iAreaScale;
+
+        // wireframe
+        {
+            const float     thickness   = 1.0;  // pixels
+            const float     falloff     = 1.0;  // pixels
+
+            out_Color.rgb *= FSBarycentricWireframe( thickness, falloff );
+        }
+
+        // screen space quad/circle
+        {
+            float2  uv = GetGlobalCoordSNormCorrected2();
+          #if 0
+            float   d  = SDF2_Rect( uv, float2(0.23 * iRadius) );
+                    d  = SDF_OpSub( d, SDF2_Rect( uv, float2(0.2 * iRadius) ));
+          #else
+            float   d  = SDF2_Circle( uv, 0.23 * iRadius );
+                    d  = SDF_OpSub( d, SDF2_Circle( uv, 0.2 * iRadius ));
+          #endif
+
+            float   a  = SmoothStep( 0.02, 0.025, -d*4.0/iRadius );
+            float   b  = SmoothStep( 0.02, 0.025, -d*2.5/iRadius );
+
+            out_Color.rgb *= (1.0 - a);
+            out_Color.rgb = Lerp( out_Color.rgb, float3(0.8, 0.0, 1.0), b );
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-2.as b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-2.as
new file mode 100644
index 00000000..11bea934
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-2.as
@@ -0,0 +1,115 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "vs-fs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     texcoord;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+            ds.CombinedImage( EShaderStages::Fragment,  "un_CubeMap",   EImageType::FImageCube,  Sampler_LinearMipmapClamp );
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex, EShader::Fragment, "vs-fs.io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::None;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "CubeMap.glsl"
+    #include "Transform.glsl"
+
+    void Main ()
+    {
+        const uint      idx     = gl.VertexIndex;
+        const float2    coord   = un_Geometry.positions[idx].xy;
+        const int       face    = int(un_Geometry.positions[idx].z);
+        float3          uvw     = float3(0.0);
+
+        switch ( iProj )
+        {
+            case 0 :    uvw = CM_CubeSC_Forward( coord, face );         break;
+            case 1 :    uvw = CM_IdentitySC_Forward( coord, face );     break;
+            case 2 :    uvw = CM_TangentialSC_Forward( coord, face );   break;
+            case 3 :    uvw = CM_EverittSC_Forward( coord, face );      break;
+            case 4 :    uvw = CM_5thPolySC_Forward( coord, face );      break;
+            case 5 :    uvw = CM_COBE_SC_Forward( coord, face );        break;
+            case 6 :    uvw = CM_ArvoSC_Forward( coord, face );         break;
+        }
+        gl.Position = LocalPosToClipSpace( uvw );
+
+        if ( iProj == 0 )
+            Out.texcoord = CM_CubeSC_Forward( coord, face );
+        else
+            Out.texcoord = CM_IdentitySC_Forward( coord, face );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "CodeTemplates.glsl"
+    #include "Color.glsl"
+
+    void Main ()
+    {
+        // read cubemap
+        out_Color = gl.texture.Sample( un_CubeMap, In.texcoord );
+
+        // wireframe
+        {
+            const float     thickness   = 1.0;  // pixels
+            const float     falloff     = 1.0;  // pixels
+
+            out_Color.rgb *= FSBarycentricWireframe( thickness, falloff );
+        }
+        out_Color.a = 1.0;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-3.as b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-3.as
new file mode 100644
index 00000000..4f1b5434
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-3.as
@@ -0,0 +1,134 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "vs-fs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     texcoord;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+            ds.CombinedImage( EShaderStages::Fragment,  "un_CubeMap",   EImageType::FImageCube,  Sampler_LinearMipmapClamp );
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex, EShader::Fragment, "vs-fs.io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::None;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "CubeMap.glsl"
+    #include "Transform.glsl"
+
+    void Main ()
+    {
+        const uint      idx     = gl.VertexIndex;
+        const float2    coord   = un_Geometry.positions[idx].xy;
+        const int       face    = int(un_Geometry.positions[idx].z);
+        float3          uvw     = float3(0.0);
+
+        switch ( iProj )
+        {
+            case 0 :    uvw = CM_CubeSC_Forward( coord, face );         break;
+            case 1 :    uvw = CM_IdentitySC_Forward( coord, face );     break;
+            case 2 :    uvw = CM_TangentialSC_Forward( coord, face );   break;
+            case 3 :    uvw = CM_EverittSC_Forward( coord, face );      break;
+            case 4 :    uvw = CM_5thPolySC_Forward( coord, face );      break;
+            case 5 :    uvw = CM_COBE_SC_Forward( coord, face );        break;
+            case 6 :    uvw = CM_ArvoSC_Forward( coord, face );         break;
+        }
+        gl.Position = LocalPosToClipSpace( uvw );
+
+        if ( iProj == 0 )
+            Out.texcoord = CM_CubeSC_Forward( coord, face );
+        else
+            Out.texcoord = CM_IdentitySC_Forward( coord, face );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "CodeTemplates.glsl"
+    #include "Color.glsl"
+    #include "SDF.glsl"
+    #include "GlobalIndex.glsl"
+
+    int3  GetGlobalSize () {
+        return int3(un_PerPass.resolution.xy, 0);
+    }
+
+    void Main ()
+    {
+        // read cubemap
+        out_Color = gl.texture.Sample( un_CubeMap, In.texcoord );
+
+        // wireframe
+        /*{
+            const float     thickness   = 1.0;  // pixels
+            const float     falloff     = 1.0;  // pixels
+
+            out_Color.rgb *= FSBarycentricWireframe( thickness, falloff );
+        }*/
+
+        // screen space circle
+        {
+            float2  uv = GetGlobalCoordSNormCorrected2();
+            float   d  = SDF2_Circle( uv, 0.23 * iRadius );
+                    d  = SDF_OpSub( d, SDF2_Circle( uv, 0.2 * iRadius ));
+
+            float   a  = SmoothStep( 0.02, 0.025, -d*4.0/iRadius );
+            float   b  = SmoothStep( 0.02, 0.025, -d*2.5/iRadius );
+
+            out_Color.rgb *= (1.0 - a);
+            out_Color.rgb = Lerp( out_Color.rgb, float3(0.8, 0.0, 1.0), b );
+        }
+        out_Color.a = 1.0;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-4.as b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-4.as
new file mode 100644
index 00000000..d1ea1c90
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-4.as
@@ -0,0 +1,132 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "vs-fs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     texcoord;" +
+                    "float3     normal;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+            ds.CombinedImage( EShaderStages::Fragment,  "un_CubeMap",   EImageType::FImageCube,  Sampler_LinearMipmapClamp );
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex, EShader::Fragment, "vs-fs.io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::None;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "CubeMap.glsl"
+    #include "Transform.glsl"
+
+    void Main ()
+    {
+        const uint      idx     = gl.VertexIndex;
+        const float2    coord   = un_Geometry.positions[idx].xy;
+        const int       face    = int(un_Geometry.positions[idx].z);
+        float3          uvw     = float3(0.0);
+
+        switch ( iProj )
+        {
+            case 1 :    uvw = CM_IdentitySC_Forward( coord, face );     break;
+            case 2 :    uvw = CM_TangentialSC_Forward( coord, face );   break;
+            case 3 :    uvw = CM_EverittSC_Forward( coord, face );      break;
+            case 4 :    uvw = CM_5thPolySC_Forward( coord, face );      break;
+            case 5 :    uvw = CM_COBE_SC_Forward( coord, face );        break;
+            case 6 :    uvw = CM_ArvoSC_Forward( coord, face );         break;
+        }
+        gl.Position     = LocalPosToClipSpace( uvw );
+        Out.texcoord    = CM_IdentitySC_Forward( coord, face );
+        Out.normal      = uvw;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "CodeTemplates.glsl"
+
+    void Main ()
+    {
+        float3  norm1   = Normalize( gl.texture.SampleLod( un_CubeMap, In.texcoord, 0.0 ).rgb );
+        float3  norm2   = Normalize( In.normal );
+        float3  color   = float3(1.0);
+
+        switch ( iCmp )
+        {
+            case 0 :
+                out_Color = float4( norm1, 1.0 );
+                break;
+
+            case 1 :
+                out_Color = float4( norm2, 1.0 );
+                break;
+
+            case 2 :
+            {
+                float   len = Length(norm1 - norm2) * iScale;
+                out_Color = float2( len, 1.0 ).xxxy;
+
+                if ( len >= 1.0 )
+                    out_Color = float4(1.0, 0.0, 0.0, 1.0);
+
+                // wireframe
+                {
+                    const float     thickness   = 1.0;  // pixels
+                    const float     falloff     = 1.0;  // pixels
+
+                    out_Color.rgb = Lerp( float3(0.0, 0.5, 1.0), out_Color.rgb, FSBarycentricWireframe( thickness, falloff ));
+                }
+                break;
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5a.as b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5a.as
new file mode 100644
index 00000000..7b2d51a0
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5a.as
@@ -0,0 +1,143 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "vs-gs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     normal;" +
+                    "int        face;" );
+        }{
+            RC<ShaderStructType>    st = ShaderStructType( "gs-fs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     normal;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex,   EShader::Geometry, "vs-gs.io" );
+            ppln.SetShaderIO( EShader::Geometry, EShader::Fragment, "gs-fs.io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  gs = Shader();
+                gs.LoadSelf();
+                ppln.SetGeometryShader( gs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::None;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "CubeMap.glsl"
+
+    void Main ()
+    {
+        const uint      idx     = gl.VertexIndex;
+        const float2    coord   = un_Geometry.positions[idx].xy;
+        const int       face    = int(un_Geometry.positions[idx].z);
+
+        if ( iMode == 0 )
+        {
+            switch ( iProj )
+            {
+                case 1 :    Out.normal = CM_IdentitySC_Forward( coord, face );      break;
+                case 2 :    Out.normal = CM_TangentialSC_Forward( coord, face );    break;
+                case 3 :    Out.normal = CM_EverittSC_Forward( coord, face );       break;
+                case 4 :    Out.normal = CM_5thPolySC_Forward( coord, face );       break;
+                case 5 :    Out.normal = CM_COBE_SC_Forward( coord, face );         break;
+                case 6 :    Out.normal = CM_ArvoSC_Forward( coord, face );          break;
+            }
+        }
+        else
+            Out.normal = float3( coord, face );
+
+        gl.Position = float4(coord, 0.0, 1.0);
+        Out.face    = face;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_GEOM
+
+    layout (triangles) in;
+    layout (triangle_strip, max_vertices = 3) out;
+
+    void Main ()
+    {
+        for (uint i = 0; i < 3; ++i)
+        {
+            gl.Position     = gl_in[i].gl_Position;
+            gl.Layer        = In[0].face;
+            Out.normal      = In[i].normal;
+            gl.EmitVertex();
+        }
+        gl.EndPrimitive();
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "CubeMap.glsl"
+
+    float3  SphereNormal (float2 coord, ECubeFace face)
+    {
+        switch ( iProj )
+        {
+            case 0 :    return CM_CubeSC_Forward( coord, face );
+            case 1 :    return CM_IdentitySC_Forward( coord, face );
+            case 2 :    return CM_TangentialSC_Forward( coord, face );
+            case 3 :    return CM_EverittSC_Forward( coord, face );
+            case 4 :    return CM_5thPolySC_Forward( coord, face );
+            case 5 :    return CM_COBE_SC_Forward( coord, face );
+            case 6 :    return CM_ArvoSC_Forward( coord, face );
+        }
+    }
+
+    void Main ()
+    {
+        if ( iMode == 0 )
+            out_Color = float4(Normalize(In.normal), 1.0);
+        else
+            out_Color = float4(SphereNormal( In.normal.xy, ECubeFace(In.normal.z) ), 1.0);
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5b.as b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5b.as
new file mode 100644
index 00000000..d1ea1c90
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5b.as
@@ -0,0 +1,132 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "vs-fs.io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     texcoord;" +
+                    "float3     normal;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex,    "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+            ds.CombinedImage( EShaderStages::Fragment,  "un_CubeMap",   EImageType::FImageCube,  Sampler_LinearMipmapClamp );
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex, EShader::Fragment, "vs-fs.io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::None;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "CubeMap.glsl"
+    #include "Transform.glsl"
+
+    void Main ()
+    {
+        const uint      idx     = gl.VertexIndex;
+        const float2    coord   = un_Geometry.positions[idx].xy;
+        const int       face    = int(un_Geometry.positions[idx].z);
+        float3          uvw     = float3(0.0);
+
+        switch ( iProj )
+        {
+            case 1 :    uvw = CM_IdentitySC_Forward( coord, face );     break;
+            case 2 :    uvw = CM_TangentialSC_Forward( coord, face );   break;
+            case 3 :    uvw = CM_EverittSC_Forward( coord, face );      break;
+            case 4 :    uvw = CM_5thPolySC_Forward( coord, face );      break;
+            case 5 :    uvw = CM_COBE_SC_Forward( coord, face );        break;
+            case 6 :    uvw = CM_ArvoSC_Forward( coord, face );         break;
+        }
+        gl.Position     = LocalPosToClipSpace( uvw );
+        Out.texcoord    = CM_IdentitySC_Forward( coord, face );
+        Out.normal      = uvw;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "CodeTemplates.glsl"
+
+    void Main ()
+    {
+        float3  norm1   = Normalize( gl.texture.SampleLod( un_CubeMap, In.texcoord, 0.0 ).rgb );
+        float3  norm2   = Normalize( In.normal );
+        float3  color   = float3(1.0);
+
+        switch ( iCmp )
+        {
+            case 0 :
+                out_Color = float4( norm1, 1.0 );
+                break;
+
+            case 1 :
+                out_Color = float4( norm2, 1.0 );
+                break;
+
+            case 2 :
+            {
+                float   len = Length(norm1 - norm2) * iScale;
+                out_Color = float2( len, 1.0 ).xxxy;
+
+                if ( len >= 1.0 )
+                    out_Color = float4(1.0, 0.0, 0.0, 1.0);
+
+                // wireframe
+                {
+                    const float     thickness   = 1.0;  // pixels
+                    const float     falloff     = 1.0;  // pixels
+
+                    out_Color.rgb = Lerp( float3(0.0, 0.5, 1.0), out_Color.rgb, FSBarycentricWireframe( thickness, falloff ));
+                }
+                break;
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/tests/IndirectDraw.as b/AE/samples/res_editor/_data/pipelines/tests/IndirectDraw.as
new file mode 100644
index 00000000..d8e1a3b4
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/tests/IndirectDraw.as
@@ -0,0 +1,90 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     worldPos;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Vertex, "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex, "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read );    // external
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Vertex, EShader::Fragment, "io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::Back;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+    #include "Transform.glsl"
+
+    void Main ()
+    {
+        const uint      idx = gl.VertexIndex;
+        const float4    pos = LocalPosToWorldSpace( un_Geometry.positions[idx] );
+
+        gl.Position     = WorldPosToClipSpace( pos );
+        Out.worldPos    = pos.xyz;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "Normal.glsl"
+
+    void  Main ()
+    {
+        const float3    light_dir   = Normalize(float3( 0.f, -1.f, 0.2f ));
+        float3          norm        = ComputeNormalInWS_dxdy( In.worldPos );
+        float           n_dot_l     = Max( Dot( light_dir, norm ), 0.1f );
+
+        out_Color = float4(n_dot_l);
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/pipelines/tests/Triangulation.as b/AE/samples/res_editor/_data/pipelines/tests/Triangulation.as
new file mode 100644
index 00000000..9ec82df4
--- /dev/null
+++ b/AE/samples/res_editor/_data/pipelines/tests/Triangulation.as
@@ -0,0 +1,136 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <pipeline_compiler.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        {
+            RC<ShaderStructType>    st = ShaderStructType( "io" );
+            st.Set( EStructLayout::InternalIO,
+                    "float3     normal;" );
+        }{
+            RC<DescriptorSetLayout> ds = DescriptorSetLayout( "mtr.ds" );
+            ds.UniformBuffer( EShaderStages::Geometry,  "un_PerObject", "UnifiedGeometryMaterialUB" );
+            ds.StorageBuffer( EShaderStages::Vertex,    "un_Geometry",  "GeometrySBlock", EResourceState::ShaderStorage_Read ); // external
+        }{
+            RC<PipelineLayout>      pl = PipelineLayout( "pl" );
+            pl.DSLayout( "pass",     0, "pass.ds" );
+            pl.DSLayout( "material", 1, "mtr.ds" );
+        }
+
+        {
+            RC<GraphicsPipeline>    ppln = GraphicsPipeline( "tmpl" );
+            ppln.SetLayout( "pl" );
+            ppln.SetFragmentOutputFromRenderTech( "rtech", "main" );
+            ppln.SetShaderIO( EShader::Geometry, EShader::Fragment, "io" );
+
+            {
+                RC<Shader>  vs = Shader();
+                vs.LoadSelf();
+                ppln.SetVertexShader( vs );
+            }{
+                RC<Shader>  gs = Shader();
+                gs.LoadSelf();
+                ppln.SetGeometryShader( gs );
+            }{
+                RC<Shader>  fs = Shader();
+                fs.LoadSelf();
+                ppln.SetFragmentShader( fs );
+            }
+
+            // specialization
+            {
+                RC<GraphicsPipelineSpec>    spec = ppln.AddSpecialization( "spec" );
+                spec.AddToRenderTech( "rtech", "main" );  // in ScriptSceneGraphicsPass
+
+                RenderState rs;
+
+                rs.depth.test                   = true;
+                rs.depth.write                  = true;
+
+                rs.inputAssembly.topology       = EPrimitive::TriangleList;
+
+                rs.rasterization.frontFaceCCW   = true;
+                rs.rasterization.cullMode       = ECullMode::None;
+
+                spec.SetRenderState( rs );
+            }
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_VERT
+
+    void Main ()
+    {
+        const uint  idx = gl.VertexIndex;
+        gl.Position     = float4( un_Geometry.positions[idx], 1.f );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_GEOM
+    #include "Transform.glsl"
+
+    layout (triangles) in;
+    layout (triangle_strip, max_vertices = 3) out;
+
+    void Main ()
+    {
+        float3  edge1   = (gl_in[1].gl_Position - gl_in[0].gl_Position).xyz;
+        float3  edge2   = (gl_in[2].gl_Position - gl_in[0].gl_Position).xyz;
+        float3  norm    = Normalize( Cross( edge1, edge2 ));
+
+        gl.Position = LocalPosToClipSpace( gl_in[0].gl_Position );
+        Out.normal  = norm;
+        gl.EmitVertex();
+
+        gl.Position = LocalPosToClipSpace( gl_in[1].gl_Position );
+        Out.normal  = norm;
+        gl.EmitVertex();
+
+        gl.Position = LocalPosToClipSpace( gl_in[2].gl_Position );
+        Out.normal  = norm;
+        gl.EmitVertex();
+
+        gl.EndPrimitive();
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "Normal.glsl"
+    #include "CodeTemplates.glsl"
+
+    void  Main ()
+    {
+        out_Color = (gl.FrontFacing ?
+                        float4(0.0, 1.0, 0.0, 1.0) :
+                        float4(1.0, 0.0, 0.0, 1.0));
+
+        // wireframe
+        {
+            const float     thickness   = 1.5;  // pixels
+            const float     falloff     = 6.0;  // pixels
+
+            out_Color *= FSBarycentricWireframe( thickness, falloff );
+        }
+
+        // normals
+        if ( iDbgNormals == 1 )
+        {
+            float3  normal = Normalize( In.normal );// ComputeNormalInWS_dxdy( In.worldPos );
+
+            out_Color = gl.FragCoord.x > un_PerPass.resolution.x*0.5 ?
+                            float4(normal, 1.0f) :
+                            float4(-normal, 1.0f);
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/callable/GenCubemap.as b/AE/samples/res_editor/_data/scripts/callable/GenCubemap.as
deleted file mode 100644
index bf9a2b6c..00000000
--- a/AE/samples/res_editor/_data/scripts/callable/GenCubemap.as
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
-#ifdef __INTELLISENSE__
-#   include <res_editor.as>
-#   include <aestyle.glsl.h>
-#endif
-//-----------------------------------------------------------------------------
-#ifdef SCRIPT
-
-    void ASmain (RC<Collection> collection)
-    {
-        RC<Image>       dst;
-
-        if ( @collection != null )
-        {
-            @dst = collection.Image("dst");
-        }
-        else
-        {
-            @dst = Image( EPixelFormat::RGBA16F, uint2(1024) );     dst.Name( "RT" );
-        }
-
-        string  defines;
-        if ( dst.Is2D() )   defines += "COORD(_uv_)  _uv_.xy";  else
-        if ( dst.IsCube() ) defines += "COORD(_uv_)  _uv_";
-        Assert( defines.length() > 0 );
-
-        RC<ComputePass> pass    = ComputePass( "", defines, EPassFlags::None );
-        pass.ArgOut( "un_OutImage", dst );
-        pass.LocalSize( 8, 8 );
-        pass.DispatchThreads( dst.Dimension2_Layers() );
-
-        GenMipmaps( dst );
-
-        if ( @collection == null )
-        {
-            Present( dst );
-        }
-    }
-
-#endif
-//-----------------------------------------------------------------------------
-#ifdef SH_COMPUTE
-    #include "GlobalIndex.glsl"
-    #include "Color.glsl"
-    #include "CubeMap.glsl"
-    #include "Noise.glsl"
-
-    int  FaceIdx () {
-        return int(gl.WorkGroupID.z);
-    }
-
-    float3  PosOnSphere ()
-    {
-    //  float2  ncoord      = ToSNorm( float2(GetGlobalCoord().xy) / float2(gl.image.GetSize( un_OutImage ).xy - 1) );
-        float2  ncoord      = ToSNorm( (float2(GetGlobalCoord().xy) + 0.5) / float2(gl.image.GetSize( un_OutImage ).xy) );
-        float3  sphere_pos  = CM_TangentialSC_Forward( ncoord, FaceIdx() );
-        return sphere_pos;
-    }
-
-    void  Main ()
-    {
-        const int3      coord   = GetGlobalCoord();
-        const float3    pos     = PosOnSphere();
-        float           hash    = DHash13( Voronoi( Turbulence( pos * 8.0, 1.0, 2.0, 0.6, 7 ), float2(3.9672) ).icenter );
-        float4          color   = Rainbow( hash );
-
-        gl.image.Store( un_OutImage, COORD(coord), color );
-    }
-
-#endif
-//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/callable/GenParallaxCubemap.as b/AE/samples/res_editor/_data/scripts/callable/GenParallaxCubemap.as
new file mode 100644
index 00000000..45e8d6f5
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/callable/GenParallaxCubemap.as
@@ -0,0 +1,84 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain (RC<Collection> collection)
+    {
+        RC<Image>   height_norm;
+        RC<Image>   color;
+
+        if ( @collection != null )
+        {
+            @height_norm = collection.Image( "height_norm" );
+            @color       = collection.Image( "color" );
+        }
+        else
+        {
+            @height_norm = Image( EPixelFormat::RGBA16F, uint2(1024) );     height_norm.Name( "Height & normal" );
+            @color       = Image( EPixelFormat::RGBA8_UNorm, uint2(1024) ); color.Name( "Color" );
+        }
+
+        string  defines;
+        if ( color.Is2D() )     defines += "COORD(_uv_)  _uv_.xy";  else
+        if ( color.IsCube() )   defines += "COORD(_uv_)  _uv_";
+        Assert( defines.length() > 0 );
+
+        RC<ComputePass> pass    = ComputePass( "", defines );
+        pass.ArgOut( "un_ColorMap",         color );
+        pass.ArgOut( "un_HeightNormalMap",  height_norm );
+        pass.LocalSize( 8, 8 );
+        pass.DispatchThreads( color.Dimension2_Layers() );
+
+        GenMipmaps( color );
+        GenMipmaps( height_norm );
+
+        if ( @collection == null )
+        {
+            Present( color );
+        }
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+    #include "Color.glsl"
+    #include "CubeMap.glsl"
+    #include "Noise.glsl"
+    #include "Normal.glsl"
+
+    const float iHeightScale = 0.1;
+
+    int  FaceIdx () {
+        return int(gl.WorkGroupID.z);
+    }
+
+    float4  GetPosition (int2 coord, int2 offset)
+    {
+        float2  ncoord      = float2(coord + offset) / float2(GetGlobalSize().xy);
+        float3  sphere_pos  = CM_TangentialSC_Forward( ToSNorm(ncoord), FaceIdx() );
+        float   dist        = Voronoi( sphere_pos * 8.0, float2(3.9672) ).minDist;
+                dist        = Saturate( 0.5 - dist );
+        return float4( sphere_pos * (1.0 + dist * iHeightScale), dist );
+    }
+
+    void  Main ()
+    {
+        const int3  coord   = GetGlobalCoord();
+        float       height  = GetPosition( coord.xy, int2(0) ).w;
+        float3      norm;
+
+        SmoothNormal3x3i( norm, GetPosition, coord.xy );
+
+        float4  color = Rainbow(height) * (height*1.1 + 0.4);
+
+        gl.image.Store( un_HeightNormalMap, COORD(coord), float4( height, norm ));
+        gl.image.Store( un_ColorMap,        COORD(coord), color );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/callable/GenPlanet.as b/AE/samples/res_editor/_data/scripts/callable/GenPlanet.as
index 02e8817c..efa454ec 100644
--- a/AE/samples/res_editor/_data/scripts/callable/GenPlanet.as
+++ b/AE/samples/res_editor/_data/scripts/callable/GenPlanet.as
@@ -25,20 +25,20 @@
         else
         {
             const uint2 dim = uint2(1024);
-            @height_map = Image( EPixelFormat::RGBA16F, dim );      height_map.Name( "height" );
-            @normal_map = Image( EPixelFormat::RGBA16F, dim );      normal_map.Name( "normal" );
-            @albedo_map = Image( EPixelFormat::RGBA16F, dim );      albedo_map.Name( "albedo" );
-            @emission_map = Image( EPixelFormat::RGBA16F, dim );    emission_map.Name( "emission" );
+            @height_map     = Image( EPixelFormat::RGBA16F, dim );  height_map.Name( "height" );
+            @normal_map     = Image( EPixelFormat::RGBA16F, dim );  normal_map.Name( "normal" );
+            @albedo_map     = Image( EPixelFormat::RGBA16F, dim );  albedo_map.Name( "albedo" );
+            @emission_map   = Image( EPixelFormat::RGBA16F, dim );  emission_map.Name( "emission" );
         }
 
         string  defines;
-        if ( height_map.Is2D() )    defines += "COORD(_uv_)  _uv_.xy";  else
-        if ( height_map.IsCube() )  defines += "COORD(_uv_)  _uv_";
+        if ( height_map.Is2D() )    defines += "COORD(_uv_)  (_uv_).xy";    else
+        if ( height_map.IsCube() )  defines += "COORD(_uv_)  (_uv_)";
         Assert( defines.length() > 0 );
 
-        const uint2     local_size      = uint2( 8, 8 );
-        const uint2     face_size       = height_map.Dimension2();
-        const uint      layers          = height_map.ArrayLayers();
+        const uint2     local_size  = uint2( 8, 8 );
+        const uint2     face_size   = height_map.Dimension2();
+        const uint      layers      = height_map.ArrayLayers();
 
         // height & normal
         {
@@ -78,7 +78,7 @@
 
 #endif
 //-----------------------------------------------------------------------------
-#ifdef GEN_HEIGHT
+#ifdef SH_COMPUTE
     #define PROJECTION  CM_TangentialSC_Forward
 
     #include "GlobalIndex.glsl"
@@ -88,11 +88,20 @@
     #include "Noise.glsl"
     #include "Normal.glsl"
     #include "Geometry.glsl"
+    #include "Color.glsl"
+    #include "Spline.glsl"
 
-    int2    faceDim;
-    int     face;
+    float2  faceDim;
 
-    float  FBM (in float3 coord)
+    int  FaceIdx () {
+        return GetGroupCoord().z;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef GEN_HEIGHT
+
+    float  FBM (const float3 coord)
     {
         float   total       = 0.0;
         float   amplitude   = 1.0;
@@ -111,7 +120,7 @@
     float4  GetPosition (const int2 coord)
     {
         float2  ncoord  = ToSNorm( float2(coord) / float2(faceDim - 1) );
-        float3  pos     = PROJECTION( ncoord, face );
+        float3  pos     = PROJECTION( ncoord, FaceIdx() );
         float   height  = FBM( pos ) * 0.1;
 
         return float4( pos, height );
@@ -135,15 +144,13 @@
 
     void  Main ()
     {
-        faceDim = gl.image.GetSize( un_OutHeight ).xy;
-        face    = GetGroupCoord().z;
+        faceDim = float2(gl.image.GetSize( un_OutHeight ).xy);
 
-        const int2      local       = GetLocalCoord().xy - 1;
-        const int2      lsize       = GetLocalSize().xy - 2;
+        const int2      local       = GetLocalCoord().xy - 1;   // \__ 1 px border
+        const int2      lsize       = GetLocalSize().xy - 2;    // /
         const int2      group       = GetGroupCoord().xy;
-        const int2      coord       = local + lsize * group;
-        const int3      coord3      = int3( coord, face );
-        const float4    pos_h       = GetPosition( coord );
+        const int3      coord       = int3( local + lsize * group, FaceIdx() );
+        const float4    pos_h       = GetPosition( coord.xy );
         const float3    pos         = pos_h.xyz * (1.0 + pos_h.w);
         const bool      is_active   = IsInsideRect( local, int2(0), lsize );
 
@@ -159,25 +166,14 @@
             float3  normal;
             SmoothNormal3x3i( OUT normal, ReadPosition, local );
 
-            gl.image.Store( un_OutHeight, COORD(coord3), float4(pos_h.w) );
-            gl.image.Store( un_OutNormal, COORD(coord3), float4(normal, 0.0) );
+            gl.image.Store( un_OutHeight, COORD(coord), float4(pos_h.w) );
+            gl.image.Store( un_OutNormal, COORD(coord), float4(normal, 0.0) );
         }
     }
 
 #endif
 //-----------------------------------------------------------------------------
 #ifdef GEN_COLOR
-    #define PROJECTION  CM_TangentialSC_Forward
-
-    #include "GlobalIndex.glsl"
-    #include "SDF.glsl"
-    #include "CubeMap.glsl"
-    #include "Hash.glsl"
-    #include "Noise.glsl"
-    #include "Color.glsl"
-
-    int2    faceDim;
-    int     face;
 
     shared float3  s_Positions[ gl.WorkGroupSize.x * gl.WorkGroupSize.y ];
     shared float3  s_Normals  [ gl.WorkGroupSize.x * gl.WorkGroupSize.y ];
@@ -185,19 +181,17 @@
 
     void Main ()
     {
-        faceDim = gl.image.GetSize( un_HeightMap ).xy;
-        face    = GetGroupCoord().z;
+        faceDim = float2(gl.image.GetSize( un_HeightMap ).xy);
 
-        const int3  coord3  = GetGlobalCoord();
-        const int2  coord   = coord3.xy;
+        const int3  coord   = GetGlobalCoord();
 
         // read height map
         float3  sphere_pos;
         {
-            float   height  = gl.image.Load( un_HeightMap, COORD(coord3) ).r;
-            float3  norm    = gl.image.Load( un_NormalMap, COORD(coord3) ).rgb;
-            float2  ncoord  = ToSNorm( float2(coord) / float2(faceDim - 1) );
-            sphere_pos      = PROJECTION( ncoord, face );
+            float   height  = gl.image.Load( un_HeightMap, COORD(coord) ).r;
+            float3  norm    = gl.image.Load( un_NormalMap, COORD(coord) ).rgb;
+            float2  ncoord  = UIndexToSNormRound( float2(coord.xy), faceDim );
+            sphere_pos      = PROJECTION( ncoord, FaceIdx() );
 
             s_Positions[ GetLocalIndex() ] = sphere_pos * (1.0 + height);
             s_Normals[ GetLocalIndex() ]   = norm;
@@ -218,8 +212,8 @@
 
         albedo = HSVtoRGB( float3( biom, 1.0, 1.0 ));
 
-        gl.image.Store( un_OutAlbedo, COORD(coord3), float4(albedo, 0.0) );
-        gl.image.Store( un_OutEmission, COORD(coord3), float4(emission, temperature, 0.0, 0.0) );
+        gl.image.Store( un_OutAlbedo,   COORD(coord), float4(albedo, 0.0) );
+        gl.image.Store( un_OutEmission, COORD(coord), float4(emission, temperature, 0.0, 0.0) );
     }
 
 #endif
diff --git a/AE/samples/res_editor/_data/scripts/games/2d-Labyrinth.as b/AE/samples/res_editor/_data/scripts/games/2d-Labyrinth.as
index 01d465cb..9162916d 100644
--- a/AE/samples/res_editor/_data/scripts/games/2d-Labyrinth.as
+++ b/AE/samples/res_editor/_data/scripts/games/2d-Labyrinth.as
@@ -58,11 +58,11 @@
             gen_map.DispatchThreads( sdf_map.Dimension2() );
 
 
-            RC<ComputePass>     logic = ComputePass( "", "GAME_LOGIC", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     logic = ComputePass( "", "GAME_LOGIC" );
             logic.ArgIn(    "un_SDFMap",    sdf_map,    Sampler_LinearClamp );
             logic.ArgIn(    "un_RT",        rt,         Sampler_LinearClamp );
             logic.ArgInOut( "un_CBuf",      cbuf );
-            logic.ArgIn(    camera );
+            logic.Set(      camera );
             logic.LocalSize( 1 );
             logic.DispatchGroups( 1 );
 
diff --git a/AE/samples/res_editor/_data/scripts/games/3d-Flight.as b/AE/samples/res_editor/_data/scripts/games/3d-Flight.as
index 47389059..044b97be 100644
--- a/AE/samples/res_editor/_data/scripts/games/3d-Flight.as
+++ b/AE/samples/res_editor/_data/scripts/games/3d-Flight.as
@@ -41,13 +41,13 @@
         {
             RC<ComputePass>     logic = ComputePass( "" );
             logic.ArgInOut( "un_CBuf",      cbuf );
-            logic.ArgIn(    camera );
+            logic.Set(      camera );
             logic.LocalSize( 1 );
             logic.DispatchGroups( 1 );
-
+        }{
             RC<Postprocess>     draw = Postprocess( EPostprocess::Shadertoy, EPassFlags::None );
             draw.ArgIn( "un_CBuf",  cbuf );
-            draw.ArgIn( camera );
+            draw.Set(   camera );
             draw.Output( rt );
         }
         Present( rt );
@@ -56,6 +56,8 @@
 #endif
 //-----------------------------------------------------------------------------
 #ifdef SH_COMPUTE
+    #include "Geometry.glsl"
+
     // >>>> 3rd party code
     #include "Skyline.glsl"
 
@@ -96,7 +98,7 @@
         float3  v0  = (un_PerPass.camera.view * float4(-1.f, 0.f, 0.f, 0.f)).xyz;   v0.y = 0.f;
         float3  v1  = (un_PerPass.camera.view * float4( 1.f, 0.f, 0.f, 0.f)).xyz;   v1.y = 0.f;
         float3  v2  = (un_PerPass.camera.view * float4( 0.f, 0.f, 1.f, 0.f)).xyz;   v2.y = 0.f;
-        float   lift = Length(Cross( v2 - v0, v2 - v1 )) * 0.5f;            // area of triangle in XZ plane
+        float   lift = TriangleArea( v0, v1, v2 );  // area of triangle in XZ plane
 
         return Pow( Saturate( 1.f - lift ), 2.0 ) * un_PerPass.timeDelta * un_CBuf.liftScale;
     }
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/BufferReference.as b/AE/samples/res_editor/_data/scripts/samples-2d/BufferReference.as
index 7aaff508..ddc3819a 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/BufferReference.as
+++ b/AE/samples/res_editor/_data/scripts/samples-2d/BufferReference.as
@@ -26,12 +26,12 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", "PASS1", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     pass = ComputePass( "", "PASS1" );
             pass.ArgInOut(  "un_CBuffer",   cbuffer );
             pass.LocalSize( 1 );
             pass.DispatchGroups( 1 );
         }{
-            RC<ComputePass>     pass = ComputePass( "", "PASS2", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     pass = ComputePass( "", "PASS2" );
             pass.ArgIn(     "un_CBuffer",   cbuffer );
             pass.ArgOut(    "un_OutImage",  rt );
             pass.LocalSize( 8, 8 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/SdfFont.as b/AE/samples/res_editor/_data/scripts/samples-2d/SdfFont.as
index 3e78c828..005e71f2 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/SdfFont.as
+++ b/AE/samples/res_editor/_data/scripts/samples-2d/SdfFont.as
@@ -17,7 +17,7 @@
 
         // render loop
         {
-            RC<Postprocess>     pass = Postprocess( EPostprocess::None );
+            RC<Postprocess>     pass = Postprocess();
 
             pass.ArgIn( "un_SdfFont_32",        sdf_font_32,        Sampler_LinearRepeat );
             pass.ArgIn( "un_McSdfFont_32",      mc_sdf_font_32,     Sampler_LinearRepeat );
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/Subgroups.as b/AE/samples/res_editor/_data/scripts/samples-2d/Subgroups.as
index aa0f02de..08795145 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/Subgroups.as
+++ b/AE/samples/res_editor/_data/scripts/samples-2d/Subgroups.as
@@ -16,7 +16,7 @@
 
         // render loop
         {
-            RC<Postprocess>     pass = Postprocess( EPostprocess::None );
+            RC<Postprocess>     pass = Postprocess();
             pass.Output( "out_Color",   rt );
             pass.Slider( "iMode",       0, 3 );
         }
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/VRVideo.as b/AE/samples/res_editor/_data/scripts/samples-2d/VRVideo.as
new file mode 100644
index 00000000..3d68910a
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/samples-2d/VRVideo.as
@@ -0,0 +1,111 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    360 / VR360 / VR180 video player.
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt      = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );
+    //  RC<VideoImage>  vtex    = VideoImage( "res/video/16k_360.mp4" );    // 360
+    //  RC<VideoImage>  vtex    = VideoImage( "res/video/vr180.webm" );     // VR180
+        RC<VideoImage>  vtex    = VideoImage( "res/video/vr360.webm" );     // Cubemap VR360
+    //  RC<VideoImage>  vtex    = VideoImage( "res/video/cube360.webm" );   // Cubemap 360
+        RC<FPVCamera>   camera  = FPVCamera();
+
+        // setup camera
+        {
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 50.f );
+
+            const float s = 0.8f;
+            camera.ForwardBackwardScale( s, s );
+            camera.UpDownScale( s, s );
+            camera.SideMovementScale( s );
+        }
+
+        // render loop
+        {
+            RC<Postprocess>     pass = Postprocess();
+            pass.Set(    camera );
+            pass.ArgIn(  "un_Video",    vtex,   Sampler_LinearClamp );
+            pass.Output( "out_Color",   rt );
+            pass.Slider( "iEye",        0,  1 );
+            pass.Slider( "VRMode",      0,  5,  4 );
+            pass.Slider( "CameraMode",  0,  2 );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "GlobalIndex.glsl"
+    #include "Ray.glsl"
+
+
+    void Main ()
+    {
+        const float2    uv              = GetGlobalCoordUNorm().xy;
+        const float     dist_to_eye     = 0.5f;     // meters
+        const float2    screen_size     = un_PerPass.resolution.xy * un_PerPass.pixToMm * 0.001f;   // meters
+        const float     curve_radius    = 1.8f;     // meters
+        const float     z_near          = 0.1f;
+        Ray             ray;
+        float2          uv2;
+
+        switch ( CameraMode )
+        {
+            case 0 :
+                ray = Ray_From( un_PerPass.camera.invViewProj, un_PerPass.camera.pos, z_near, uv );
+                break;
+
+            case 1 :
+                ray = Ray_FromFlatScreen( un_PerPass.camera.pos, dist_to_eye, screen_size, z_near, ToSNorm(uv) );
+                Ray_Rotate( INOUT ray, MatTranspose(float3x3(un_PerPass.camera.view)) );
+                break;
+
+            case 2 :
+                ray = Ray_FromCurvedScreen( un_PerPass.camera.pos, dist_to_eye, curve_radius, screen_size, z_near, ToSNorm(uv) );
+                Ray_Rotate( INOUT ray, MatTranspose(float3x3(un_PerPass.camera.view)) );
+                break;
+        }
+
+        switch ( VRMode )
+        {
+            // without projection
+            case 0 :    uv2 = uv;                                                               break;
+
+            // 360
+            case 1 :    uv2 = Inverted_PlaneTo360( ray.dir );                                   break;
+
+            // Cubemap 360 (YouTube)
+            case 2 :    uv2 = Inverted_PlaneToCubemap360( ray.dir );                            break;
+
+            // VR360
+            case 3 :
+            //  ray = Ray_PlaneToSphere( ToRad(float2(90.0, 90.0)), float3(0.0), 0.1, uv );
+                uv2  = Inverted_PlaneToVR360( ray.dir, iEye );                                  break;
+
+            // Cubemap VR360 (YouTube)
+            case 4 :
+            //  ray = Ray_PlaneToSphere( ToRad(float2(90.0, 90.0)), float3(0.0), 0.1, uv );
+                uv2  = Inverted_PlaneToCubemapVR360( ray.dir, iEye );                           break;
+
+            // VR180
+            case 5 :
+                ray = Ray_PlaneToSphere( ToRad(float2(80.0, 80.0)), float3(0.0), 0.1, uv );
+                uv2  = Inverted_PlaneToVR180( ray.dir, iEye );                                  break;
+        }
+
+        out_Color = gl.texture.Sample( un_Video, uv2 );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/Video.as b/AE/samples/res_editor/_data/scripts/samples-2d/Video.as
index b5a82375..951ddbca 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/Video.as
+++ b/AE/samples/res_editor/_data/scripts/samples-2d/Video.as
@@ -18,7 +18,7 @@
         // render loop
         {
             RC<Postprocess>     pass = Postprocess( EPostprocess::Shadertoy );
-            pass.ArgIn( "iTexture1",    vtex,   Sampler_LinearClamp );
+            pass.ArgIn( "un_Video", vtex,   Sampler_LinearClamp );
             pass.Output( rt );
         }
         Present( rt );
@@ -32,7 +32,7 @@
     {
         float2 uv = gl.FragCoord.xy / iResolution.xy;
 
-        fragColor = gl.texture.Sample( iTexture1, uv );
+        fragColor = gl.texture.Sample( un_Video, uv );
     }
 
 #endif
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/CameraCollision.as b/AE/samples/res_editor/_data/scripts/samples-3d/CameraCollision.as
index 4afd9857..e65ce69a 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/CameraCollision.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/CameraCollision.as
@@ -36,14 +36,14 @@
 
         // render loop
         {
-            RC<ComputePass>     collision   = ComputePass( "", "CALC_COLLISION", EPassFlags::Enable_ShaderTrace );
-            collision.ArgIn(    camera );
+            RC<ComputePass>     collision   = ComputePass( "", "CALC_COLLISION" );
+            collision.Set(      camera );
             collision.ArgInOut( "un_CollisionData", cam_pos );
             collision.LocalSize( 1 );
             collision.DispatchGroups( 1 );
         }{
-            RC<ComputePass>     draw        = ComputePass( "", "TRACE_RAYS", EPassFlags::Enable_ShaderTrace );
-            draw.ArgIn(  camera );
+            RC<ComputePass>     draw        = ComputePass( "", "TRACE_RAYS" );
+            draw.Set(    camera );
             draw.ArgOut( "un_OutImage",         rt );
             draw.ArgIn(  "un_CollisionData",    cam_pos );
             draw.LocalSize( 8, 8 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-1.as b/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-1.as
index 322878ee..aaf04b2b 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-1.as
@@ -56,10 +56,10 @@ void ASmain ()
     // render loop
     {
         RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
-        draw.AddPipeline( "VertexInput.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/VertexInput.as)
         draw.AddPipeline( "samples/Cubemap.as" );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as)
         draw.Output( "out_Color", rt, RGBA32f(0.0) );
         draw.Output( ds, DepthStencil(1.f, 0) );
+        draw.Slider( "iUVMode", 0, 1, 1 );
     }
     Present( rt );
 }
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-2.as b/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-2.as
index 72cfa3c6..9d33e528 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-2.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Cubemap-2.as
@@ -30,7 +30,7 @@
             RC<FPVCamera>   camera = FPVCamera();
 
             camera.ClipPlanes( 0.1f, 10.f );
-            camera.FovY( 70.f );
+            camera.FovY( 50.f );
 
             const float s = 0.f;
             camera.ForwardBackwardScale( s );
@@ -69,7 +69,6 @@
             GenMipmaps( cubemap_view );
         }{
             RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
-            draw.AddPipeline( "VertexInput.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/VertexInput.as)
             draw.AddPipeline( "samples/Cubemap.as" );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as)
             draw.Output( "out_Color", rt, RGBA32f(0.0) );
             draw.Output( ds, DepthStencil(1.f, 0) );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/DeferredTexturing.as b/AE/samples/res_editor/_data/scripts/samples-3d/DeferredTexturing.as
index 2ccb666d..730ba0f5 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/DeferredTexturing.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/DeferredTexturing.as
@@ -31,7 +31,7 @@
         {
             RC<Model>   model   = Model( "res/models/Sponza/Sponza.gltf" );
 
-            model.InitialTransform( float3(0.f, -1.f, 0.f), float3(0.f, ToRad(90.f), 0.f), 100.f );
+            model.InitialTransform( float3(0.f, -1.f, 0.f), float3(0.f, ToRad(90.f), ToRad(180.f)), 100.f );
 
             model.AddOmniLight( float3(0.f, -5.f, 0.f), float3(0.f, 0.f, 0.05f), RGBA32f(1.f) );
 
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Model-1.as b/AE/samples/res_editor/_data/scripts/samples-3d/Model-1.as
index b78a62d2..500f941c 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Model-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Model-1.as
@@ -30,7 +30,7 @@
         {
             RC<Model>   model   = Model( "res/models/Sponza/Sponza.gltf" );
 
-            model.InitialTransform( float3(0.f, -1.f, 0.f), float3(0.f, ToRad(90.f), 0.f), 100.f );
+            model.InitialTransform( float3(0.f, -1.f, 0.f), float3(0.f, ToRad(90.f), ToRad(180.f)), 100.f );
 
             model.AddOmniLight( float3(0.f, -5.f, 0.f), float3(0.f, 0.f, 0.05f), RGBA32f(1.f) );
 
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-1.as b/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-1.as
index 7530008d..636dd341 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-1.as
@@ -68,7 +68,7 @@
 
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.UIntArray(  "indices",   indices );
@@ -99,7 +99,7 @@
             draw.Output( ds, DepthStencil( 1.f, 0 ));
         }
         {
-            RC<Postprocess>     pass = Postprocess( EPostprocess::None, EPassFlags::Enable_ShaderTrace );
+            RC<Postprocess>     pass = Postprocess();
             pass.ArgIn( "un_ABuffer",   abuf );
             pass.ArgIn( "un_Storage",   storage );
             pass.ArgIn( "un_DrawTasks", drawtasks );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-2.as b/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-2.as
index 0d996068..3ed1a0c8 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-2.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/OIT-LinkedList-2.as
@@ -68,7 +68,7 @@
 
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.UIntArray(  "indices",   indices );
@@ -99,7 +99,7 @@
             draw.Output( ds, DepthStencil( 1.f, 0 ));
         }
         {
-            RC<Postprocess>     pass = Postprocess( EPostprocess::None, EPassFlags::Enable_ShaderTrace );
+            RC<Postprocess>     pass = Postprocess();
             pass.ArgIn( "un_ABuffer",   abuf );
             pass.ArgIn( "un_Storage",   storage );
             pass.ArgIn( "un_DrawTasks", drawtasks );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-1.as b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cube.as
similarity index 87%
rename from AE/samples/res_editor/_data/scripts/samples-3d/Parallax-1.as
rename to AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cube.as
index 3348ba52..32a19781 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cube.as
@@ -4,7 +4,6 @@
 */
 #ifdef __INTELLISENSE__
 #   include <res_editor.as>
-#   include <aestyle.glsl.h>
 #endif
 //-----------------------------------------------------------------------------
 #ifdef SCRIPT
@@ -14,23 +13,20 @@
         // initialize
         RC<Image>       rt          = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
         RC<Image>       ds          = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
-        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
-        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
         RC<Scene>       scene       = Scene();
 
-        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
+        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
+        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
+                        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
 
         // setup camera
         {
-            RC<FPVCamera>   camera = FPVCamera();
+            RC<OrbitalCamera>   camera = OrbitalCamera();
 
             camera.ClipPlanes( 0.1f, 100.f );
-            camera.FovY( 50.f );
-
-            const float s = 0.8f;
-            camera.ForwardBackwardScale( s );
-            camera.UpDownScale( s );
-            camera.SideMovementScale( s );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
 
             scene.Set( camera );
         }
@@ -66,7 +62,7 @@
             geometry.ArgIn( "un_ColorMap",          color_map,  Sampler_LinearMipmapRepeat );
             geometry.ArgIn( "un_HeightNormalMap",   norm_h_map, Sampler_LinearMipmapRepeat );
 
-            scene.Add( geometry, float3(0.f, 0.f, 4.f) );
+            scene.Add( geometry );
         }
 
         // render loop
@@ -75,11 +71,11 @@
             draw.AddPipeline( "samples/Parallax.as" );      // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Parallax.as)
             draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
             draw.Output( ds, DepthStencil( 1.f, 0 ));
-            draw.Slider( "iHeightScale",    0.f,    0.1f );
+            draw.Slider( "iHeightScale",    0.f,    0.1f,   0.1f );
             draw.Slider( "iShowNormals",    0,      1 );
             draw.Slider( "iScreenSpaceTBN", 0,      1 );
             draw.Slider( "iCalcNormal",     0,      1 );
-            draw.Slider( "iMode",           0,      3 );
+            draw.Slider( "iMode",           0,      3,      3 );
         }
         {
             RC<SceneGraphicsPass>   dbg_draw = scene.AddGraphicsPass( "debug normals" );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-3.as b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cylinder.as
similarity index 87%
rename from AE/samples/res_editor/_data/scripts/samples-3d/Parallax-3.as
rename to AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cylinder.as
index 21bf5a24..c1b9d761 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-3.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cylinder.as
@@ -4,7 +4,6 @@
 */
 #ifdef __INTELLISENSE__
 #   include <res_editor.as>
-#   include <aestyle.glsl.h>
 #endif
 //-----------------------------------------------------------------------------
 #ifdef SCRIPT
@@ -14,23 +13,20 @@
         // initialize
         RC<Image>       rt          = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
         RC<Image>       ds          = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
-        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
-        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
         RC<Scene>       scene       = Scene();
 
-        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
+        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
+        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
+                        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
 
         // setup camera
         {
-            RC<FPVCamera>   camera = FPVCamera();
+            RC<OrbitalCamera>   camera = OrbitalCamera();
 
             camera.ClipPlanes( 0.1f, 100.f );
-            camera.FovY( 50.f );
-
-            const float s = 0.8f;
-            camera.ForwardBackwardScale( s );
-            camera.UpDownScale( s );
-            camera.SideMovementScale( s );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
 
             scene.Set( camera );
         }
@@ -71,7 +67,7 @@
             geometry.ArgIn( "un_ColorMap",          color_map,  Sampler_LinearMipmapRepeat );
             geometry.ArgIn( "un_HeightNormalMap",   norm_h_map, Sampler_LinearMipmapRepeat );
 
-            scene.Add( geometry, float3(0.f, 0.f, 4.f) );
+            scene.Add( geometry );
         }
 
         // render loop
@@ -80,11 +76,11 @@
             draw.AddPipeline( "samples/Parallax.as" );      // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Parallax.as)
             draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
             draw.Output( ds, DepthStencil( 1.f, 0 ));
-            draw.Slider( "iHeightScale",    0.f,    0.1f );
+            draw.Slider( "iHeightScale",    0.f,    0.1f,   0.1f );
             draw.Slider( "iShowNormals",    0,      1 );
             draw.Slider( "iScreenSpaceTBN", 0,      1 );
             draw.Slider( "iCalcNormal",     0,      1 );
-            draw.Slider( "iMode",           0,      3 );
+            draw.Slider( "iMode",           0,      3,      3 );
         }
         {
             RC<SceneGraphicsPass>   dbg_draw = scene.AddGraphicsPass( "debug normals" );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-2.as b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-InnerCylinder.as
similarity index 94%
rename from AE/samples/res_editor/_data/scripts/samples-3d/Parallax-2.as
rename to AE/samples/res_editor/_data/scripts/samples-3d/Parallax-InnerCylinder.as
index 546fb356..2272f75f 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-2.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-InnerCylinder.as
@@ -4,7 +4,6 @@
 */
 #ifdef __INTELLISENSE__
 #   include <res_editor.as>
-#   include <aestyle.glsl.h>
 #endif
 //-----------------------------------------------------------------------------
 #ifdef SCRIPT
@@ -14,11 +13,11 @@
         // initialize
         RC<Image>       rt          = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
         RC<Image>       ds          = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
-        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
-        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
         RC<Scene>       scene       = Scene();
 
-        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
+        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
+        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
+                        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
 
         // setup camera
         {
@@ -80,11 +79,11 @@
             draw.AddPipeline( "samples/Parallax.as" );      // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Parallax.as)
             draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
             draw.Output( ds, DepthStencil( 1.f, 0 ));
-            draw.Slider( "iHeightScale",    0.f,    0.1f );
+            draw.Slider( "iHeightScale",    0.f,    0.1f,   0.1f );
             draw.Slider( "iShowNormals",    0,      1 );
             draw.Slider( "iScreenSpaceTBN", 0,      1 );
             draw.Slider( "iCalcNormal",     0,      1 );
-            draw.Slider( "iMode",           0,      3 );
+            draw.Slider( "iMode",           0,      3,      3 );
         }
         {
             RC<SceneGraphicsPass>   dbg_draw = scene.AddGraphicsPass( "debug normals" );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere.as b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere.as
new file mode 100644
index 00000000..d9844d9b
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere.as
@@ -0,0 +1,91 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Draw sphere with parallax mapping.
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt          = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>       ds          = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>       scene       = Scene();
+
+        RC<Image>       color_map   = Image( EImageType::FImage2D, "res/tex/rocks_color_rgba.ktx" );
+        RC<Image>       norm_h_map  = Image( EImageType::FImage2D, "res/tex/rocks_normal_height_rgba.ktx" );
+                        norm_h_map.SetSwizzle( "ARGB" );    // R - height, GBA - normal
+
+        // setup camera
+        {
+            RC<OrbitalCamera>   camera = OrbitalCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+
+            scene.Set( camera );
+        }
+
+        // create cube
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<float3>   normals;
+            array<float3>   tangents;
+            array<float3>   bitangents;
+            array<float2>   texcoords;
+            array<uint>     indices;
+            GetSphere( 4, OUT positions, OUT normals, OUT tangents, OUT bitangents, OUT texcoords, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.FloatArray(   "texcoords",    texcoords );
+            geom_data.FloatArray(   "normals",      normals );
+            geom_data.FloatArray(   "tangents",     tangents );
+            geom_data.FloatArray(   "bitangents",   bitangents );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.Float(        "lightDir",     Normalize(float3( 0.f, -1.f, 0.f )) );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",          geom_data );
+            geometry.ArgIn( "un_ColorMap",          color_map,  Sampler_LinearMipmapRepeat );
+            geometry.ArgIn( "un_HeightNormalMap",   norm_h_map, Sampler_LinearMipmapRepeat );
+
+            scene.Add( geometry );
+        }
+
+        // render loop
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+            draw.AddPipeline( "samples/Parallax.as" );      // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Parallax.as)
+            draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
+            draw.Output( ds, DepthStencil( 1.f, 0 ));
+            draw.Slider( "iHeightScale",    0.f,    0.1f,   0.1f );
+            draw.Slider( "iShowNormals",    0,      1 );
+            draw.Slider( "iCalcNormal",     0,      1 );
+            draw.Slider( "iMode",           0,      3,      3 );
+        }
+        {
+            RC<SceneGraphicsPass>   dbg_draw = scene.AddGraphicsPass( "debug normals" );
+            dbg_draw.AddPipeline( "samples/DebugTBN.as" );  // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/DebugTBN.as)
+            dbg_draw.Output( "out_Color", rt );
+            dbg_draw.Output( ds );
+            dbg_draw.Slider( "DbgTBN", 0, 3 );
+        }
+
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere2.as b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere2.as
new file mode 100644
index 00000000..fd0e9c76
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere2.as
@@ -0,0 +1,88 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Draw sphere with parallax mapping on cubemap.
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>       ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>       scene           = Scene();
+
+        const uint2     cubemap_dim     = uint2(1024);
+
+        RC<Image>       height_map      = Image( EPixelFormat::RGBA16F, cubemap_dim, ImageLayer(6), MipmapLevel(~0) );  height_map.Name( "Height & normal map" );
+        RC<Image>       height_view     = height_map.CreateView( EImage::Cube );
+        RC<Image>       color_map       = Image( EPixelFormat::RGBA8_UNorm, cubemap_dim, ImageLayer(6), MipmapLevel(~0) );  color_map.Name( "Color map" );
+        RC<Image>       color_view      = color_map.CreateView( EImage::Cube );
+
+        // setup camera
+        {
+            RC<OrbitalCamera>   camera = OrbitalCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+
+            scene.Set( camera );
+        }
+
+        // generate cubemap
+        {
+            RC<Collection>  args = Collection();
+            args.Add( "height_norm",    height_view );
+            args.Add( "color",          color_view );
+            RunScript( "GenParallaxCubemap.as", ScriptFlags::RunOnce, args );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/callable/GenParallaxCubemap.as)
+        }
+
+        // create cube
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<float3>   texcoords;
+            array<uint>     indices;
+            GetSphere( 4, OUT positions, OUT texcoords, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.FloatArray(   "texcoords",    texcoords );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.Float(        "lightDir",     Normalize(float3( 0.f, -1.f, 0.f )) );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",          geom_data );
+            geometry.ArgIn( "un_ColorMap",          color_view,     Sampler_LinearMipmapRepeat );
+            geometry.ArgIn( "un_HeightNormalMap",   height_view,    Sampler_LinearMipmapRepeat );
+
+            scene.Add( geometry );
+        }
+
+        // render loop
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+            draw.AddPipeline( "samples/Parallax-Sphere2.as" );      // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Parallax-Sphere2.as)
+            draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
+            draw.Output( ds, DepthStencil( 1.f, 0 ));
+            draw.Slider( "iHeightScale",    0.f,    0.2f,   0.1f );
+            draw.Slider( "iShowNormals",    0,      1 );
+            draw.Slider( "iMode",           0,      3,      3 );
+        }
+
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Planet-1.as b/AE/samples/res_editor/_data/scripts/samples-3d/Planet-1.as
index a41628d1..74688e19 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Planet-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Planet-1.as
@@ -34,8 +34,8 @@ void ASmain ()
 
         camera.ClipPlanes( 0.1f, 100.f );
         camera.FovY( 60.f );
-        camera.Offset( 3.f );
-        camera.OffsetScale( 10.0f );
+        camera.Offset( 2.f );
+        camera.OffsetScale( -10.0f );
 
         scene.Set( camera );
     }
@@ -68,7 +68,6 @@ void ASmain ()
     // render loop
     {
         RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
-        draw.AddPipeline( "VertexInput.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/VertexInput.as)
         draw.AddPipeline( "samples/Planet-1.as" );  // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Planet-1.as)
         draw.Output( "out_Color", rt, RGBA32f(0.0) );
         draw.Output( ds, DepthStencil(1.f, 0) );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Planet-2.as b/AE/samples/res_editor/_data/scripts/samples-3d/Planet-2.as
index 315ac396..c936623e 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Planet-2.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Planet-2.as
@@ -45,17 +45,14 @@ void ASmain ()
 
     // setup planet
     {
-        RC<DynamicFloat>    tess_level  = DynamicFloat();
-        RC<SphericalCube>   planet      = SphericalCube();
+        RC<SphericalCube>   planet = SphericalCube();
 
         planet.ArgIn( "un_HeightMap",   height_view,    Sampler_LinearMipmapRepeat );
         planet.ArgIn( "un_NormalMap",   normal_view,    Sampler_LinearMipmapRepeat );
         planet.ArgIn( "un_AlbedoMap",   albedo_view,    Sampler_LinearMipmapRepeat );
         planet.ArgIn( "un_EmissionMap", emission_view,  Sampler_LinearMipmapRepeat );
         planet.DetailLevel( 0, 9 );
-        planet.TessLevel( tess_level );
 
-        Slider( tess_level, "Tess level", 1.f, 64.f );
         scene.Add( planet, float3(0.f, 0.f, 2.f) );
     }
 
@@ -74,10 +71,10 @@ void ASmain ()
     // render loop
     {
         RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
-        draw.AddPipeline( "VertexInput.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/VertexInput.as)
         draw.AddPipeline( "samples/Planet-2.as" );  // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Planet-2.as)
         draw.Output( "out_Color", rt, RGBA32f(0.0) );
         draw.Output( ds, DepthStencil(1.f, 0) );
+        draw.Slider( "iTessLevel",  1.f,    64.f,   16.f );
     }
     Present( rt );
 }
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/ReverseZ.as b/AE/samples/res_editor/_data/scripts/samples-3d/ReverseZ.as
index f380b9a3..a331ef46 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/ReverseZ.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/ReverseZ.as
@@ -56,7 +56,7 @@
             array<float3>   bitangents;
             array<float2>   texcoords;
             array<uint>     indices;
-            GetSphere( 8, OUT positions, OUT normals, OUT tangents, OUT bitangents, OUT texcoords, OUT indices );
+            GetSphere( 4, OUT positions, OUT normals, OUT tangents, OUT bitangents, OUT texcoords, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.FloatArray( "normals",   normals );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/ShadowMap.as b/AE/samples/res_editor/_data/scripts/samples-3d/ShadowMap.as
index c712f406..9c5f63be 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/ShadowMap.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/ShadowMap.as
@@ -49,7 +49,7 @@
 
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             array<float3>   normals = positions;
 
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/SimpleRayMarching.as b/AE/samples/res_editor/_data/scripts/samples-3d/SimpleRayMarching.as
index e16b6547..83d18d86 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/SimpleRayMarching.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/SimpleRayMarching.as
@@ -31,7 +31,7 @@
         // render loop
         {
             RC<Postprocess>     pass = Postprocess( EPostprocess::Shadertoy, EPassFlags::None );
-            pass.ArgIn( camera );
+            pass.Set(   camera );
             pass.ArgIn( "un_Object2Tex",    tex1,   Sampler_LinearMipmapRepeat );
             pass.ArgIn( "un_Object3Tex",    tex2,   Sampler_LinearMipmapRepeat );
             pass.Output( rt );
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/Volumetric-1.as b/AE/samples/res_editor/_data/scripts/samples-3d/Volumetric-1.as
index 7e5c8412..4528968d 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/Volumetric-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-3d/Volumetric-1.as
@@ -30,7 +30,7 @@
         // render loop
         {
             RC<Postprocess>     pass = Postprocess( EPostprocess::Shadertoy, EPassFlags::None );
-            pass.ArgIn( camera );
+            pass.Set( camera );
             pass.Output( rt );
         }
         Present( rt );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2D.as b/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2D.as
index 5486f623..fa167fe4 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2D.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2D.as
@@ -123,7 +123,7 @@
         {
             ClearBuffer( rtrace_raybuf, 0, 8, 0 );  // reset counter
 
-            RC<RayTracingPass>      pass = RayTracingPass( EPassFlags::Enable_ShaderTrace );
+            RC<RayTracingPass>      pass = RayTracingPass();
             pass.ArgIn(     "un_RtScene",       rtrace_scene );
             pass.ArgIn(     "un_Constants",     rtrace_cbuf );
             pass.ArgOut(    "un_RayStorage",    rtrace_raybuf );
@@ -155,7 +155,7 @@
             draw.Output( "out_Color", hdr, RGBA32f(0.0, 0.0, 0.0, 1.0) );
             draw.EnableIfEqual( dbg_mode, 0 );
         }{
-            RC<Postprocess>     pass = Postprocess( EPostprocess::None, "TONEMAPPING", EPassFlags::None );
+            RC<Postprocess>     pass = Postprocess( EPostprocess::None, "TONEMAPPING" );
             pass.ArgIn(  "un_HDR",          hdr,    Sampler_LinearClamp );
             pass.Output( "out_Color",       rt );
             pass.Slider( "iTonemapping",    0,      2 );
@@ -321,7 +321,7 @@
             float2          obj_norm    = ToV2( ComputeNormal( pos_addr.positions[ idx_addr.indices[ idx+0 ]],
                                                                pos_addr.positions[ idx_addr.indices[ idx+1 ]],
                                                                pos_addr.positions[ idx_addr.indices[ idx+2 ]] )
-                                                * float3x3(MatTranspose( GetCommittedIntersectionObjectToWorld( ray_query ))) );
+                                                * float3x3( GetCommittedIntersectionObjectToWorld3x4( ray_query )) );
 
             hit.t           = GetCommittedIntersectionT( ray_query );
             hit.mtrId       = mtr_id;
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2DLayered.as b/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2DLayered.as
index e1be21b3..5e2fe41a 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2DLayered.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2DLayered.as
@@ -141,7 +141,7 @@
         {
             ClearBuffer( rtrace_raybuf, 0, 8, 0 );  // reset counter
 
-            RC<RayTracingPass>      pass = RayTracingPass( EPassFlags::Enable_ShaderTrace );
+            RC<RayTracingPass>      pass = RayTracingPass();
             pass.ArgIn(     "un_RtScene",       rtrace_scene );
             pass.ArgIn(     "un_Constants",     rtrace_cbuf );
             pass.ArgOut(    "un_RayStorage",    rtrace_raybuf );
@@ -173,7 +173,7 @@
             draw.Output( "out_Color", hdr, RGBA32f(0.0, 0.0, 0.0, 1.0) );
             draw.EnableIfEqual( dbg_mode, 0 );
         }{
-            RC<Postprocess>     pass = Postprocess( EPostprocess::None, "TONEMAPPING", EPassFlags::None );
+            RC<Postprocess>     pass = Postprocess( EPostprocess::None, "TONEMAPPING" );
             pass.ArgIn(  "un_HDR",          hdr,    Sampler_LinearClamp );
             pass.Output( "out_Color",       rt );
             pass.Slider( "iTonemapping",    0,      2 );
@@ -374,13 +374,13 @@
             {
                 hit.mtrId       = GetCommittedIntersectionInstanceId( ray_query );
                 prim_id         = GetCommittedIntersectionPrimitiveIndex( ray_query );
-                normal_mat      = float3x3(MatTranspose( GetCommittedIntersectionObjectToWorld( ray_query )));
+                normal_mat      = float3x3( GetCommittedIntersectionObjectToWorld3x4( ray_query ));
                 hit.t           = GetCommittedIntersectionT( ray_query );
                 hit.frontFace   = true;
             }
 
             // Find back face.
-            // 
+            //
             gl.rayQuery.Initialize( ray_query, un_RtScene, gl::RayFlags::Opaque | gl::RayFlags::CullFrontFacingTriangles,
                                     /*cullMask*/0xFF, ToV3(origin),
                                     /*Tmin*/0.0f, ToV3(dir), /*Tmax*/c_MaxRayLen );
@@ -396,7 +396,7 @@
             {
                 hit.mtrId       = GetCommittedIntersectionInstanceId( ray_query );
                 prim_id         = GetCommittedIntersectionPrimitiveIndex( ray_query );
-                normal_mat      = float3x3(MatTranspose( GetCommittedIntersectionObjectToWorld( ray_query )));
+                normal_mat      = float3x3( GetCommittedIntersectionObjectToWorld3x4( ray_query ));
                 hit.t           = GetCommittedIntersectionT( ray_query );
                 hit.frontFace   = false;
             }
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-1.as b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-1.as
index 99ea156b..d9ad7816 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-1.as
@@ -40,7 +40,7 @@
         {
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.UIntArray(  "indices",   indices );
@@ -63,8 +63,8 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
-            pass.ArgIn(  camera );
+            RC<ComputePass>     pass = ComputePass();
+            pass.Set(    camera );
             pass.ArgOut( "un_OutImage",         rt );
             pass.ArgIn(  "un_RtScene",          scene );
             pass.ArgIn(  "un_Geometry",         sphere );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-2.as b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-2.as
index 2475c376..71635016 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-2.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-2.as
@@ -40,7 +40,7 @@
         {
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.UIntArray(  "indices",   indices );
@@ -63,8 +63,8 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
-            pass.ArgIn(  camera );
+            RC<ComputePass>     pass = ComputePass();
+            pass.Set(    camera );
             pass.ArgOut( "un_OutImage",         rt );
             pass.ArgIn(  "un_RtScene",          scene );
             pass.ArgIn(  "un_Geometry",         sphere );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-3.as b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-3.as
index 66800d17..e03aaedc 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-3.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-3.as
@@ -40,7 +40,7 @@
         {
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.UIntArray(  "indices",   indices );
@@ -63,8 +63,8 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
-            pass.ArgIn(  camera );
+            RC<ComputePass>     pass = ComputePass();
+            pass.Set(    camera );
             pass.ArgOut( "un_OutImage",         rt );
             pass.ArgIn(  "un_RtScene",          scene );
             pass.ArgIn(  "un_Geometry",         sphere );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-4.as b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-4.as
index c75cfec4..f2147544 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/OIT-4.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/OIT-4.as
@@ -40,7 +40,7 @@
         {
             array<float3>   positions;
             array<uint>     indices;
-            GetSphere( 7, OUT positions, OUT indices );
+            GetSphere( 3, OUT positions, OUT indices );
 
             sphere.FloatArray( "positions", positions );
             sphere.UIntArray(  "indices",   indices );
@@ -63,8 +63,8 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
-            pass.ArgIn(  camera );
+            RC<ComputePass>     pass = ComputePass();
+            pass.Set(    camera );
             pass.ArgOut( "un_OutImage",         rt );
             pass.ArgIn(  "un_RtScene",          scene );
             pass.ArgIn(  "un_Geometry",         sphere );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RT-Model-1.as b/AE/samples/res_editor/_data/scripts/samples-rt/RT-Model-1.as
index fb28b4fb..924a2769 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RT-Model-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/RT-Model-1.as
@@ -30,7 +30,7 @@
         {
             RC<Model>   model = Model( "res/models/Sponza/Sponza.gltf" );
 
-            model.InitialTransform( float3(0.f, -1.f, 0.f), float3(0.f, ToRad(90.f), 0.f), 100.f );
+            model.InitialTransform( float3(0.f, -1.f, 0.f), float3(0.f, ToRad(90.f), ToRad(180.f)), 100.f );
 
             model.AddOmniLight( float3(0.f, -5.f, 0.f), float3(0.f, 0.f, 0.05f), RGBA32f(1.f) );
 
@@ -42,17 +42,16 @@
 
         // render loop
         {
-            RC<SceneGraphicsPass>   draw_pass = scene.AddGraphicsPass( "draw opaque" );
-            draw_pass.AddPipeline( "samples/Model-1.as" );  // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Model-1.as)
-            draw_pass.Output( "out_Color", rt, RGBA32f(0.0f, 1.f, 1.f, 1.f) );
-            draw_pass.Output( ds, DepthStencil(1.f, 0) );
-            draw_pass.Layer( ERenderLayer::Opaque );
-            draw_pass.EnableIfEqual( view_mode, 0 );
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "draw opaque" );
+            draw.AddPipeline( "samples/Model-1.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Model-1.as)
+            draw.Output( "out_Color", rt, RGBA32f(0.0f, 1.f, 1.f, 1.f) );
+            draw.Output( ds, DepthStencil(1.f, 0) );
+            draw.Layer( ERenderLayer::Opaque );
+            draw.EnableIfEqual( view_mode, 0 );
         }
         {
             RC<SceneRayTracingPass> pass = scene.AddRayTracingPass( "rtrace" );
             pass.SetPipeline( "samples/Model-RT-1.as" );    // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Model-RT-1.as)
-            pass.Set( camera );
             pass.ArgOut( "un_OutImage", rt );
             pass.Dispatch( rt.Dimension() );
             pass.EnableIfEqual( view_mode, 1 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RT-MultiBounce-1.as b/AE/samples/res_editor/_data/scripts/samples-rt/RT-MultiBounce-1.as
index 049713bc..4db6a24c 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RT-MultiBounce-1.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/RT-MultiBounce-1.as
@@ -99,7 +99,7 @@
         // render loop
         {
             RC<RayTracingPass>      pass = RayTracingPass( EPassFlags::None );
-            pass.ArgIn(  camera );
+            pass.Set(    camera );
             pass.ArgOut( "un_OutImage",     rt );
             pass.ArgIn(  "un_RtScene",      scene );
             pass.ArgIn(  "un_Geometry",     geom_data );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RT-Shadow.as b/AE/samples/res_editor/_data/scripts/samples-rt/RT-Shadow.as
index c7887402..5652fc3c 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RT-Shadow.as
+++ b/AE/samples/res_editor/_data/scripts/samples-rt/RT-Shadow.as
@@ -108,7 +108,7 @@
             array<float3>   bitangents;
             array<float3>   texcoords;
             array<uint>     indices;
-            GetSphere( 9, OUT positions, OUT normals, OUT tangents, OUT bitangents, OUT texcoords, OUT indices );
+            GetSphere( 4, OUT positions, OUT normals, OUT tangents, OUT bitangents, OUT texcoords, OUT indices );
 
             uint    pos_off     = sphere.FloatArray(    "positions",    positions );
             uint    norm_off    = sphere.FloatArray(    "normals",      normals );
@@ -137,8 +137,8 @@
 
         // render loop
         {
-            RC<RayTracingPass>      pass = RayTracingPass( EPassFlags::Enable_ShaderTrace );
-            pass.ArgIn(  camera );
+            RC<RayTracingPass>      pass = RayTracingPass();
+            pass.Set(    camera );
             pass.ArgOut( "un_OutImage", rt );
             pass.ArgIn(  "un_RtScene",  scene );
             pass.ArgIn(  "un_Geometry", geom_data );
diff --git a/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-1.as b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-1.as
new file mode 100644
index 00000000..040d2be5
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-1.as
@@ -0,0 +1,70 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        RC<Image>   rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>   ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>   scene           = Scene();
+
+        RC<Image>   cubemap         = Image( EPixelFormat::RGBA8_UNorm, uint2(1024), ImageLayer(6), MipmapLevel(~0) );  cubemap.Name( "Cubemap tex" );
+        RC<Image>   cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+        const uint  lod             = 4;
+
+        // setup camera
+        {
+            RC<OrbitalCamera>   camera = OrbitalCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+
+            scene.Set( camera );
+        }
+
+        // setup sphere
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<uint>     indices;
+            GetSphericalCube( lod, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",  geom_data );
+            geometry.ArgIn( "un_CubeMap",   cubemap_view, Sampler_LinearMipmapClamp );
+
+            scene.Add( geometry );
+        }
+
+        // render loop
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "draw sphere" );
+            draw.AddPipeline( "sphere/SphericalCube-1.as" );    // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-1.as)
+            draw.Output( "out_Color", rt, RGBA32f(0.0) );
+            draw.Output( ds, DepthStencil(1.f, 0) );
+            draw.Slider( "iAreaScale",  40.0f,  60.f,   45.f );
+            draw.Slider( "iProj",       0,      6,      1 );
+            draw.Slider( "iRadius",     0.0f,   2.5f,   0.f );  // used to measure triangle size
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-2.as b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-2.as
new file mode 100644
index 00000000..6f46a1dd
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-2.as
@@ -0,0 +1,102 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        RC<Image>   rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>   ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>   scene           = Scene();
+
+        RC<Image>   cubemap         = Image( EPixelFormat::RGBA8_UNorm, uint2(1024), ImageLayer(6), MipmapLevel(~0) );  cubemap.Name( "Cubemap tex" );
+        RC<Image>   cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+        const uint  lod             = 4;
+
+        // setup camera
+        {
+            RC<OrbitalCamera>   camera = OrbitalCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+
+            scene.Set( camera );
+        }
+
+        // setup sphere
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<uint>     indices;
+            GetSphericalCube( lod, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",  geom_data );
+            geometry.ArgIn( "un_CubeMap",   cubemap_view, Sampler_LinearMipmapClamp );
+
+            scene.Add( geometry );
+        }
+
+        // render loop
+        {
+            RC<ComputePass>     pass = ComputePass( "", "LOD=" + lod );
+            pass.ArgInOut(  "un_OutImage",  cubemap_view );
+            pass.LocalSize( 8, 8 );
+            pass.DispatchThreads( cubemap_view.Dimension2_Layers() );
+
+            GenMipmaps( cubemap_view );
+        }
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "draw sphere" );
+            draw.AddPipeline( "sphere/SphericalCube-2.as" );    // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-2.as)
+            draw.Output( "out_Color", rt, RGBA32f(0.0) );
+            draw.Output( ds, DepthStencil(1.f, 0) );
+            draw.Slider( "iProj",   0,  6,  1  );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+    #include "Color.glsl"
+    #include "CubeMap.glsl"
+    #include "Hash.glsl"
+    #include "Noise.glsl"
+    #include "SDF.glsl"
+
+
+    int  FaceIdx () {
+        return int(gl.WorkGroupID.z);
+    }
+
+    void  Main ()
+    {
+        const float     lod     = float(LOD) * 2.f;
+        const float2    ncoord  = GetGlobalCoordUNorm().xy;
+
+        float2  pos     = Floor( ncoord * lod );
+        float4  color   = RainbowWrap( (pos.x * 2.0 / lod) + (pos.y * 0.25) );
+
+        gl.image.Store( un_OutImage, GetGlobalCoord(), color );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-3.as b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-3.as
new file mode 100644
index 00000000..22bb7dcf
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-3.as
@@ -0,0 +1,150 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        RC<Image>   rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>   ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>   scene           = Scene();
+
+        RC<Image>   cubemap         = Image( EPixelFormat::RGBA8_UNorm, uint2(1024), ImageLayer(6), MipmapLevel(~0) );  cubemap.Name( "Cubemap tex" );
+        RC<Image>   cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+        const uint  lod             = 4;
+
+        // setup camera
+        {
+            RC<OrbitalCamera>   camera = OrbitalCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+            camera.RotationScale( 0.25f );
+
+            scene.Set( camera );
+        }
+
+        // setup sphere
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<uint>     indices;
+            GetSphericalCube( lod, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",  geom_data );
+            geometry.ArgIn( "un_CubeMap",   cubemap_view, Sampler_LinearMipmapClamp );
+
+            scene.Add( geometry );
+        }
+
+        RC<DynamicInt>  proj_type = DynamicInt();
+        Slider( proj_type, "iProj",  0, 6,  2 );
+
+        // render loop
+        {
+            RC<ComputePass>     pass = ComputePass( "", "LOD=" + lod );
+            pass.ArgInOut(  "un_OutImage",  cubemap_view );
+            pass.LocalSize( 8, 8 );
+            pass.DispatchThreads( cubemap_view.Dimension2_Layers() );
+            pass.Constant(  "iProj",                proj_type );
+            pass.Slider(    "iDistanceOnSphere",    0, 1 );
+
+            GenMipmaps( cubemap_view );
+        }
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "draw sphere" );
+            draw.AddPipeline( "sphere/SphericalCube-3.as" );    // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-3.as)
+            draw.Output( "out_Color", rt, RGBA32f(0.0) );
+            draw.Output( ds, DepthStencil(1.f, 0) );
+            draw.Constant( "iProj",     proj_type );
+            draw.Slider( "iRadius",     0.0f,   2.5f,   1.f );  // used to check circle distortion
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+    #include "Color.glsl"
+    #include "CubeMap.glsl"
+    #include "Geometry.glsl"
+    #include "SDF.glsl"
+
+
+    int  FaceIdx () {
+        return int(gl.WorkGroupID.z);
+    }
+
+    float3  ProjectToSphere (const float2 snormCoord)
+    {
+        switch ( iProj )
+        {
+            case 0 :    return CM_CubeSC_Forward(       snormCoord, FaceIdx() );
+            case 1 :    return CM_IdentitySC_Forward(   snormCoord, FaceIdx() );
+            case 2 :    return CM_TangentialSC_Forward( snormCoord, FaceIdx() );
+            case 3 :    return CM_EverittSC_Forward(    snormCoord, FaceIdx() );
+            case 4 :    return CM_5thPolySC_Forward(    snormCoord, FaceIdx() );
+            case 5 :    return CM_COBE_SC_Forward(      snormCoord, FaceIdx() );
+            case 6 :    return CM_ArvoSC_Forward(       snormCoord, FaceIdx() );
+        }
+        return float3(0.0);
+    }
+
+    float  Distance2 (const float3 lhs, const float3 rhs)
+    {
+        if ( iDistanceOnSphere == 0 )
+            return Distance( lhs, rhs );
+        else
+            return DistanceOnSphere( lhs, rhs );    // radius = 1.0
+    }
+
+    void  Main ()
+    {
+        const float     lod             = float(LOD);
+        const float2    size            = float2(GetGlobalSize().xy);
+        const float2    ncoord          = GetGlobalCoordSNorm().xy;
+        const float3    pos_on_sphere   = ProjectToSphere( ncoord );    // == normal
+        float4          color           = float4(0.0);
+
+        color.b = AA_QuadGrid( size * ncoord, lod/size, 12.5 ) * 0.6;
+
+        const float2    scale   = float2(lod);
+        float           dist    = 1.0e+10;
+
+        for (int y = -1; y <= 1; ++y)
+        for (int x = -1; x <= 1; ++x)
+        {
+            const float2    pos_on_face = Floor( scale * ncoord ) + float2(x,y) + 0.5;
+            const float3    obj_pos     = ProjectToSphere( pos_on_face / scale );
+            const float     d           = SDF_Sphere( pos_on_sphere - obj_pos, 0.06 );
+        //  const float     d           = Distance2( pos_on_sphere, obj_pos ) - 0.06;
+
+            dist = Min( dist, d );
+        }
+
+        color.g = Saturate( 1.0 - SmoothStep( -0.005, 0.005, dist ));
+        color.b *= (1.0 - color.g);
+
+        gl.image.Store( un_OutImage, GetGlobalCoord(), color );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-4.as b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-4.as
new file mode 100644
index 00000000..1227b524
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-4.as
@@ -0,0 +1,138 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        RC<Image>   rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>   ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>   scene           = Scene();
+
+        RC<Image>   cubemap         = Image( EPixelFormat::RGBA32F, uint2(1024), ImageLayer(6), MipmapLevel(~0) );  cubemap.Name( "Cubemap tex" );
+        RC<Image>   cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+        const uint  lod             = 6;
+
+        // setup camera
+        {
+            RC<OrbitalCamera>   camera = OrbitalCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+
+            scene.Set( camera );
+        }
+
+        // setup sphere
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<uint>     indices;
+            GetSphericalCube( lod, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",  geom_data );
+            geometry.ArgIn( "un_CubeMap",   cubemap_view, Sampler_LinearMipmapClamp );
+
+            scene.Add( geometry );
+        }
+
+        RC<DynamicInt>  proj_type = DynamicInt();
+        Slider( proj_type, "iProj",  1, 6,  1 );
+
+        // render loop
+        {
+            RC<ComputePass>     pass = ComputePass( "", "LOD=" + lod );
+            pass.ArgInOut(  "un_OutImage",  cubemap_view );
+            pass.LocalSize( 8, 8 );
+            pass.DispatchThreads( cubemap_view.Dimension2_Layers() );
+            pass.Constant(  "iProj",        proj_type );
+            pass.Slider(    "iCorrection",  0,  1,  1 );
+
+            GenMipmaps( cubemap_view );
+        }
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "draw sphere" );
+            draw.AddPipeline( "sphere/SphericalCube-4.as" );    // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-4.as)
+            draw.Output(    "out_Color", rt, RGBA32f(0.2) );
+            draw.Output( ds, DepthStencil(1.f, 0) );
+            draw.Constant(  "iProj",    proj_type );
+            draw.Slider(    "iCmp",     0,      2,          2 );
+            draw.Slider(    "iScale",   1.f,    1000.f,     310.f );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+    #include "CubeMap.glsl"
+
+    int  FaceIdx () {
+        return int(gl.WorkGroupID.z);
+    }
+
+    float3  ProjectToSphere1 (const float2 snormCoord)
+    {
+        switch ( iProj )
+        {
+            case 1 :    return CM_IdentitySC_Forward(   snormCoord, FaceIdx() );
+            case 2 :    return CM_TangentialSC_Forward( snormCoord, FaceIdx() );
+            case 3 :    return CM_EverittSC_Forward(    snormCoord, FaceIdx() );
+            case 4 :    return CM_5thPolySC_Forward(    snormCoord, FaceIdx() );
+            case 5 :    return CM_COBE_SC_Forward(      snormCoord, FaceIdx() );
+            case 6 :    return CM_ArvoSC_Forward(       snormCoord, FaceIdx() );
+        }
+        return float3(0.0);
+    }
+
+    float3  ProjectToSphere2 (const float2 snormCoord)
+    {
+        const float     lod = float(LOD);
+        const float2    min = Floor( snormCoord * lod ) / lod;
+        const float2    max = Ceil( snormCoord * lod ) / lod;
+        float3          p0  = ProjectToSphere1( float2( min.x, min.y ));
+        float3          p1  = ProjectToSphere1( float2( max.x, min.y ));
+        float3          p2  = ProjectToSphere1( float2( min.x, max.y ));
+        float3          p3  = ProjectToSphere1( float2( max.x, max.y ));
+        float2          uv  = (snormCoord - min) / (max - min);
+
+        return Normalize( BiLerp( p0, p1, p2, p3, uv ));
+    }
+
+    float3  ProjectToSphere (const float2 snormCoord)
+    {
+        if ( iCorrection == 0 or iProj == 1 )
+            return ProjectToSphere1( snormCoord );
+        else
+            return ProjectToSphere2( snormCoord );
+    }
+
+    void  Main ()
+    {
+        const float2    size    = float2(GetGlobalSize().xy);
+        const float2    ncoord  = GetGlobalCoordSNorm().xy;
+        float3          norm    = ProjectToSphere( ncoord );
+
+        gl.image.Store( un_OutImage, GetGlobalCoord(), float4(norm, 1.0) );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-5.as b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-5.as
new file mode 100644
index 00000000..b22dc4b4
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-5.as
@@ -0,0 +1,86 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        RC<Image>   rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>   ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>   scene           = Scene();
+        RC<Scene>   scene_to_cm     = Scene();
+
+        RC<Image>   cubemap         = Image( EPixelFormat::RGBA32F, uint2(1024), ImageLayer(6), MipmapLevel(~0) );  cubemap.Name( "Cubemap tex" );
+        RC<Image>   cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+        RC<OrbitalCamera>   camera  = OrbitalCamera();
+
+        // setup camera
+        {
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 60.f );
+            camera.Offset( 3.f );
+            camera.OffsetScale( 10.0f );
+        }
+
+        // setup sphere
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+            RC<UnifiedGeometry>     geometry2   = UnifiedGeometry();
+
+            array<float3>   positions;
+            array<uint>     indices;
+            GetSphericalCube( 6, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",  geom_data );
+            geometry.ArgIn( "un_CubeMap",   cubemap_view, Sampler_LinearMipmapClamp );
+
+            scene.Add( geometry );
+
+            geometry2.Draw( cmd );
+            geometry2.ArgIn( "un_Geometry", geom_data );
+
+            scene_to_cm.Add( geometry2 );
+        }
+
+        RC<DynamicInt>  proj_type = DynamicInt();
+        Slider( proj_type, "iProj",  1, 6,  1 );
+
+        // render loop
+        {
+            RC<SceneGraphicsPass>   draw = scene_to_cm.AddGraphicsPass( "draw to cubemap" );
+            draw.AddPipeline( "sphere/SphericalCube-5a.as" );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5a.as)
+            draw.Output(    "out_Color",    cubemap, RGBA32f(0.2) );
+            draw.Constant(  "iProj",        proj_type );
+            draw.Slider(    "iMode",        0, 1 );
+
+            GenMipmaps( cubemap_view );
+        }
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "draw sphere" );
+            draw.AddPipeline( "sphere/SphericalCube-5b.as" );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/sphere/SphericalCube-5b.as)
+            draw.Output(    "out_Color", rt, RGBA32f(0.2) );
+            draw.Output(    ds,         DepthStencil(1.f, 0) );
+            draw.Constant(  "iProj",    proj_type );
+            draw.Slider(    "iCmp",     0,      2,          2 );
+            draw.Slider(    "iScale",   1.f,    1000.f,     240.f );
+            draw.Set( camera );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/BufferExport.as b/AE/samples/res_editor/_data/scripts/tests/BufferExport.as
similarity index 100%
rename from AE/samples/res_editor/_data/scripts/samples-2d/BufferExport.as
rename to AE/samples/res_editor/_data/scripts/tests/BufferExport.as
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/ColorLerp.as b/AE/samples/res_editor/_data/scripts/tests/ColorLerp.as
similarity index 97%
rename from AE/samples/res_editor/_data/scripts/samples-2d/ColorLerp.as
rename to AE/samples/res_editor/_data/scripts/tests/ColorLerp.as
index 073c7ff6..e0ab33a5 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/ColorLerp.as
+++ b/AE/samples/res_editor/_data/scripts/tests/ColorLerp.as
@@ -13,7 +13,7 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     pass = ComputePass();
             pass.ArgOut( "un_OutImage", rt );
             pass.LocalSize( 8, 8 );
             pass.DispatchThreads( rt.Dimension() );
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/Compute.as b/AE/samples/res_editor/_data/scripts/tests/Compute.as
similarity index 100%
rename from AE/samples/res_editor/_data/scripts/samples-2d/Compute.as
rename to AE/samples/res_editor/_data/scripts/tests/Compute.as
diff --git a/AE/samples/res_editor/_data/scripts/tests/CoopMatrix.as b/AE/samples/res_editor/_data/scripts/tests/CoopMatrix.as
new file mode 100644
index 00000000..66f77d35
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/CoopMatrix.as
@@ -0,0 +1,52 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Doesn't make any effect, just compiles.
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   define SH_COMPUTE
+#   define AE_COOP_MATRIX
+#   define AE_MEM_SCOPE
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>   rt = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );     rt.Name( "RT" );
+
+        // render loop
+        {
+            RC<ComputePass>     pass = ComputePass();
+            pass.ArgOut( "un_OutImage", rt );
+            pass.LocalSize( 8, 8 );
+            pass.DispatchThreads( rt.Dimension() );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+
+    #define CoopMatA    gl::CoopMat< half, gl::Scope::Subgroup, 16, 16, gl::MatrixUse::A >
+    #define CoopMatB    gl::CoopMat< half, gl::Scope::Subgroup, 16, 16, gl::MatrixUse::B >
+    #define CoopMatC    gl::CoopMat< half, gl::Scope::Subgroup, 16, 16, gl::MatrixUse::C >
+
+    void  Main ()
+    {
+        CoopMatA    s_MatA = CoopMatA(half(0.0));
+        CoopMatB    s_MatB = CoopMatB(half(0.0));
+        CoopMatC    s_MatC = CoopMatC(half(0.0));
+        CoopMatC    s_MatR;
+
+        s_MatR = gl.CoopMatMulAdd( s_MatA, s_MatB, s_MatC );
+
+        gl.image.Store( un_OutImage, GetGlobalCoord().xy, float4(0.0) );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/tests/CubeMapTest-1.as b/AE/samples/res_editor/_data/scripts/tests/CubeMapTest-1.as
new file mode 100644
index 00000000..bfaf1126
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/CubeMapTest-1.as
@@ -0,0 +1,106 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   define SH_COMPUTE
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>   rt = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );     rt.Name( "RT" );
+
+        // render loop
+        {
+            RC<ComputePass>     pass = ComputePass();
+
+            pass.ArgOut( "un_OutImage", rt );
+            pass.LocalSize( 8, 8 );
+            pass.DispatchThreads( rt.Dimension() );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+    #include "CubeMap.glsl"
+    #include "Ray.glsl"
+
+    float3  CubeFaceToNormal (ECubeFace face)
+    {
+        switch ( face )
+        {
+            case ECubeFace_XPos :   return float3(+1.0,  0.0,  0.0 );
+            case ECubeFace_XNeg :   return float3(-1.0,  0.0,  0.0 );
+            case ECubeFace_YPos :   return float3( 0.0, +1.0,  0.0 );
+            case ECubeFace_YNeg :   return float3( 0.0, -1.0,  0.0 );
+            case ECubeFace_ZPos :   return float3( 0.0,  0.0, +1.0 );
+            case ECubeFace_ZNeg :   return float3( 0.0,  0.0, -1.0 );
+        }
+        return float3(0.0);
+    }
+
+    void  Main ()
+    {
+        float4      col     = float4(0.0);
+        const float y_max   = 7.0;
+        const float y       = Floor( GetGroupCoordUNorm().y * y_max );
+        const float scale   = 1000.0;
+
+        float2      uv      = GetGlobalCoordUNorm().xy;     uv.y = (uv.y - y/y_max) * y_max;
+        float3      dir     = Ray_PlaneTo360( float3(0.0), 0.1, uv ).dir;
+
+        switch ( int(y) )
+        {
+            case 0 : {
+                float3  uv_f    = CM_IdentitySC_Inverse( dir );
+                float3  dir2    = CM_IdentitySC_Forward( uv_f.xy, int(uv_f.z) );
+                col.rgb = Abs( dir - dir2 ) * scale;
+                break;
+            }
+            case 1 : {
+                float3  uv_f    = CM_TangentialSC_Inverse( dir );
+                float3  dir2    = CM_TangentialSC_Forward( uv_f.xy, int(uv_f.z) );
+                col.rgb = Abs( dir - dir2 ) * scale;
+                break;
+            }
+            case 2 : {
+                float3  uv_f    = CM_EverittSC_Inverse( dir );
+                float3  dir2    = CM_EverittSC_Forward( uv_f.xy, int(uv_f.z) );
+                col.rgb = Abs( dir - dir2 ) * scale;
+                break;
+            }
+            case 3 : {
+                float3  uv_f    = CM_5thPolySC_Inverse( dir );
+                float3  dir2    = CM_5thPolySC_Forward( uv_f.xy, int(uv_f.z) );
+                col.rgb = Abs( dir - dir2 ) * scale;
+                break;
+            }
+            case 4 : {
+                float3  uv_f    = CM_COBE_SC_Inverse( dir );
+                float3  dir2    = CM_COBE_SC_Forward( uv_f.xy, int(uv_f.z) );
+                col.rgb = Abs( dir - dir2 ) * scale;
+                break;
+            }
+            case 5 : {
+                float3  uv_f    = CM_ArvoSC_Inverse( dir );
+                float3  dir2    = CM_ArvoSC_Forward( uv_f.xy, int(uv_f.z) );
+                col.rgb = Abs( dir - dir2 ) * scale;
+                break;
+            }
+            case 6 : {
+                float3  uv_f    = CM_IdentitySC_Inverse( dir );
+                col.rgb = Abs( CubeFaceToNormal( ECubeFace(uv_f.z) ) - dir );
+                break;
+            }
+        }
+
+        gl.image.Store( un_OutImage, GetGlobalCoord().xy, col );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/VolumetricExport.as b/AE/samples/res_editor/_data/scripts/tests/ImageExport-3D.as
similarity index 96%
rename from AE/samples/res_editor/_data/scripts/samples-3d/VolumetricExport.as
rename to AE/samples/res_editor/_data/scripts/tests/ImageExport-3D.as
index 204c5ae1..be0ede6d 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/VolumetricExport.as
+++ b/AE/samples/res_editor/_data/scripts/tests/ImageExport-3D.as
@@ -1,6 +1,6 @@
 // Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
 /*
-    Simple volumetric rendering.
+    Press 'F3' to export 3D image to a file.
 */
 #ifdef __INTELLISENSE__
 #   include <res_editor.as>
@@ -35,10 +35,10 @@
             pass.LocalSize( 4, 4, 4 );
             pass.DispatchThreads( volume.Dimension3() );
 
-            Export( volume, "exported-image-.aeimg" );
+            Export( volume, "exported-image-3d-.aeimg" );
         }{
             RC<Postprocess>     pass = Postprocess( EPostprocess::Shadertoy, EPassFlags::None );
-            pass.ArgIn( camera );
+            pass.Set(   camera );
             pass.ArgIn( "un_Volume",    volume,     Sampler_LinearClamp );
             pass.ColorSelector( "iVolumeColor", RGBA32f(0.0, 1.0, 0.0, 1.0) );
             pass.Output( rt );
diff --git a/AE/samples/res_editor/_data/scripts/tests/ImageExport-CubeMap.as b/AE/samples/res_editor/_data/scripts/tests/ImageExport-CubeMap.as
new file mode 100644
index 00000000..bef06530
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/ImageExport-CubeMap.as
@@ -0,0 +1,116 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Press 'F3' to export Cube map to a file.
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        RC<Image>           rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>           ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+
+        const int2          tile_size       = int2(128);
+        const int           tile_count_pot  = 5;    // 2^X
+        const int2          cubemap_dim     = tile_size << tile_count_pot;
+
+        RC<Image>           cubemap         = Image( EPixelFormat::RGBA8_UNorm, uint2(cubemap_dim), ImageLayer(6), MipmapLevel(~0) );   cubemap.Name( "Cubemap tex" );
+        RC<Image>           cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+        RC<Scene>           scene           = Scene();
+        RC<Buffer>          cbuf            = Buffer();
+
+        // setup camera
+        {
+            RC<FPVCamera>   camera = FPVCamera();
+
+            camera.ClipPlanes( 0.1f, 10.f );
+            camera.FovY( 50.f );
+
+            const float s = 0.f;
+            camera.ForwardBackwardScale( s );
+            camera.UpDownScale( s );
+            camera.SideMovementScale( s );
+
+            scene.Set( camera );
+        }
+
+        // setup constants
+        {
+            cbuf.Int(   "tileSize",     tile_size );
+            cbuf.Int(   "dim",          cubemap_dim );
+            cbuf.Int(   "frameToTile",  tile_count_pot );
+        }
+
+        // setup skybox
+        {
+            RC<SphericalCube>   skybox = SphericalCube();
+
+            skybox.ArgIn( "un_CubeMap", cubemap_view, Sampler_LinearMipmapRepeat );
+            skybox.DetailLevel( 0, 9 );
+
+            scene.Add( skybox );
+        }
+
+        // render loop
+        {
+            RC<ComputePass>     update_skybox = ComputePass( "", EPassFlags::None );
+            update_skybox.ArgIn(    "un_CBuf",      cbuf );
+            update_skybox.ArgInOut( "un_OutImage",  cubemap_view );
+            update_skybox.LocalSize( 8, 8 );
+            update_skybox.DispatchThreads( uint3( tile_size, cubemap_view.ArrayLayers() )); // 1 tile per frame
+
+            GenMipmaps( cubemap_view );
+        }{
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+            draw.AddPipeline( "samples/Cubemap.as" );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as)
+            draw.Output( "out_Color", rt, RGBA32f(0.0) );
+            draw.Output( ds, DepthStencil(1.f, 0) );
+        }
+
+        Export( cubemap_view, "exported-image-cm-.aeimg" );
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+    #include "GlobalIndex.glsl"
+    #include "Color.glsl"
+    #include "CubeMap.glsl"
+    #include "Noise.glsl"
+
+    ND_ int  FaceIdx () {
+        return int(gl.WorkGroupID.z);
+    }
+
+    ND_ int3  GetGlobalCoord2 ()
+    {
+        int3    coord = GetGlobalCoord();
+        coord.x += un_CBuf.tileSize.x * int(un_PerPass.frame &  ((1u << un_CBuf.frameToTile) - 1));
+        coord.y += un_CBuf.tileSize.y * int(un_PerPass.frame >> un_CBuf.frameToTile);
+        return coord;
+    }
+
+    ND_ float3  PosOnSphere ()
+    {
+        float2  ncoord      = ToSNorm( (float2(GetGlobalCoord2().xy) + 0.5) / float2(un_CBuf.dim) );
+        float3  sphere_pos  = CM_TangentialSC_Forward( ncoord, FaceIdx() );
+        return sphere_pos;
+    }
+
+    void  Main ()
+    {
+        const int3      coord   = GetGlobalCoord2();
+        const float3    pos     = PosOnSphere();
+        float           hash    = DHash13( Voronoi( Turbulence( pos * 8.0, 1.0, 2.0, 0.6, 7 ), float2(3.9672) ).icenter );
+
+        gl.image.Store( un_OutImage, coord, Rainbow(hash) );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-3d/VolumetricImport.as b/AE/samples/res_editor/_data/scripts/tests/ImageImport-3D.as
similarity index 98%
rename from AE/samples/res_editor/_data/scripts/samples-3d/VolumetricImport.as
rename to AE/samples/res_editor/_data/scripts/tests/ImageImport-3D.as
index dcb34f8b..3f4d3981 100644
--- a/AE/samples/res_editor/_data/scripts/samples-3d/VolumetricImport.as
+++ b/AE/samples/res_editor/_data/scripts/tests/ImageImport-3D.as
@@ -13,7 +13,7 @@
     {
         // initialize
         RC<Image>       rt      = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );        rt.Name( "RT" );
-        RC<Image>       volume  = Image( EImageType::FImage3D, "export/exported-image-0.aeimg" );
+        RC<Image>       volume  = Image( EImageType::FImage3D, "export/exported-image-3d-0.aeimg" );
         RC<FPVCamera>   camera  = FPVCamera();
 
         // setup camera
@@ -31,7 +31,7 @@
         // render loop
         {
             RC<Postprocess>     pass = Postprocess( EPostprocess::Shadertoy, EPassFlags::None );
-            pass.ArgIn( camera );
+            pass.Set(   camera );
             pass.ArgIn( "un_Volume",    volume,     Sampler_LinearClamp );
             pass.ColorSelector( "iVolumeColor", RGBA32f(0.0, 1.0, 0.0, 1.0) );
             pass.Output( rt );
diff --git a/AE/samples/res_editor/_data/scripts/tests/ImageImport-CubeMap.as b/AE/samples/res_editor/_data/scripts/tests/ImageImport-CubeMap.as
new file mode 100644
index 00000000..3f62d237
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/ImageImport-CubeMap.as
@@ -0,0 +1,53 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+    Load cubemap texture and draw it using spherical cube with tangential projection to minimize distortions.
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#endif
+
+void ASmain ()
+{
+    RC<Image>       rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+    RC<Image>       ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+
+    RC<Image>       cubemap         = Image( EImageType::FImageCube, "export/exported-image-cm-0.aeimg" );
+    RC<Image>       cubemap_view    = cubemap.CreateView( EImage::Cube );
+
+    RC<Scene>       scene           = Scene();
+
+    // setup camera
+    {
+        RC<FPVCamera>   camera = FPVCamera();
+
+        camera.ClipPlanes( 0.1f, 10.f );
+        camera.FovY( 70.f );
+
+        const float s = 0.f;
+        camera.ForwardBackwardScale( s );
+        camera.UpDownScale( s );
+        camera.SideMovementScale( s );
+
+        scene.Set( camera );
+    }
+
+    // setup skybox
+    {
+        RC<SphericalCube>   skybox = SphericalCube();
+
+        skybox.ArgIn( "un_CubeMap", cubemap_view, Sampler_LinearMipmapRepeat );
+        skybox.DetailLevel( 0, 9 );
+
+        scene.Add( skybox );
+    }
+
+    // render loop
+    {
+        RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+        draw.AddPipeline( "samples/Cubemap.as" );   // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/samples/Cubemap.as)
+        draw.Output( "out_Color", rt, RGBA32f(0.0) );
+        draw.Output( ds, DepthStencil(1.f, 0) );
+        draw.Slider( "iUVMode", 0, 1, 0 );
+    }
+    Present( rt );
+}
diff --git a/AE/samples/res_editor/_data/scripts/tests/IndirectDraw.as b/AE/samples/res_editor/_data/scripts/tests/IndirectDraw.as
new file mode 100644
index 00000000..261c9a22
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/IndirectDraw.as
@@ -0,0 +1,117 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt              = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>       ds              = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>       scene           = Scene();
+        RC<Buffer>      indirect_buf    = Buffer();
+        RC<Buffer>      geom_data       = Buffer();
+
+        // setup camera
+        {
+            RC<FPVCamera>   camera = FPVCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 50.f );
+
+            const float s = 0.8f;
+            camera.ForwardBackwardScale( s );
+            camera.UpDownScale( s );
+            camera.SideMovementScale( s );
+
+            camera.Position( float3(0.f, 0.f, -3.f));
+
+            scene.Set( camera );
+        }
+
+        // create geometry
+        {
+            RC<UnifiedGeometry>     geometry        = UnifiedGeometry();
+            const uint              max_commands    = 64;
+
+            indirect_buf.Layout(
+                "IndirectCmd",
+                "   uint                        count;" +
+                "   DrawIndexedIndirectCommand  commands [" + max_commands + "];"
+            );
+
+            array<float3>   positions;
+            array<uint>     indices;
+            GetSphere( 3, OUT positions, OUT indices );
+
+            geom_data.FloatArray( "positions",  positions );
+            geom_data.UIntArray(  "indices",    indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            #if 0
+                UnifiedGeometry_DrawIndexed cmd;
+                cmd.indexCount      = indices.size();
+                cmd.IndexBuffer(    geom_data,  "indices" );
+            #endif
+            #if 0
+                UnifiedGeometry_DrawIndexedIndirect cmd;
+                cmd.drawCount       = 1;
+                cmd.IndexBuffer(    geom_data,      "indices" );
+                cmd.IndirectBuffer( indirect_buf,   "commands" );
+            #endif
+            #if 1
+                UnifiedGeometry_DrawIndexedIndirectCount    cmd;
+                cmd.maxDrawCount    = max_commands;
+                cmd.IndexBuffer(    geom_data,      "indices" );
+                cmd.IndirectBuffer( indirect_buf,   "commands" );
+                cmd.CountBuffer(    indirect_buf,   "count" );
+            #endif
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry",  geom_data );
+
+            scene.Add( geometry );
+        }
+
+        // render loop
+        {
+            RC<ComputePass>     pass = ComputePass();
+            pass.ArgIn(     "un_Geometry",      geom_data );
+            pass.ArgInOut(  "un_IndirectBuf",   indirect_buf );
+            pass.LocalSize( 1 );
+            pass.DispatchThreads( 1 );
+        }{
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+            draw.AddPipeline( "tests/IndirectDraw.as" );    // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/tests/IndirectDraw.as)
+            draw.Output( "out_Color", rt, RGBA32f(0.f) );
+            draw.Output( ds, DepthStencil( 1.f, 0 ));
+        }
+
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_COMPUTE
+
+    void  Main ()
+    {
+        DrawIndexedIndirectCommand  cmd;
+
+        cmd.indexCount      = un_Geometry.indices.length();
+        cmd.instanceCount   = 1;
+        cmd.firstIndex      = 0;
+        cmd.vertexOffset    = 0;
+        cmd.firstInstance   = 0;
+
+        un_IndirectBuf.count = 1;
+
+        un_IndirectBuf.commands[0] = cmd;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/MultiPassTest.as b/AE/samples/res_editor/_data/scripts/tests/MultiPassTest.as
similarity index 98%
rename from AE/samples/res_editor/_data/scripts/samples-2d/MultiPassTest.as
rename to AE/samples/res_editor/_data/scripts/tests/MultiPassTest.as
index 8ee1fe03..552ff393 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/MultiPassTest.as
+++ b/AE/samples/res_editor/_data/scripts/tests/MultiPassTest.as
@@ -30,7 +30,7 @@
         }{
             RC<Postprocess>     pass = Postprocess( EPostprocess::Shadertoy, "PASS2" );
             pass.ArgIn( "iTexture2",    rt1,    Sampler_LinearClamp );
-            pass.ArgIn( camera );
+            pass.Set(   camera );
             pass.Output( rt2 );
         }
         Present( rt2 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/NaN.as b/AE/samples/res_editor/_data/scripts/tests/NaN.as
similarity index 95%
rename from AE/samples/res_editor/_data/scripts/samples-2d/NaN.as
rename to AE/samples/res_editor/_data/scripts/tests/NaN.as
index bc73c0d0..24c3173c 100644
--- a/AE/samples/res_editor/_data/scripts/samples-2d/NaN.as
+++ b/AE/samples/res_editor/_data/scripts/tests/NaN.as
@@ -17,7 +17,7 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     pass = ComputePass();
 
             pass.ArgOut( "un_OutImage", rt );
             pass.LocalSize( 8, 8 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-1.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-1.as
similarity index 97%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-1.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-1.as
index aea0e446..f2c4ee03 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-1.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-1.as
@@ -37,7 +37,7 @@
 
         // render loop
         {
-            RC<ComputePass>     pass = ComputePass( "", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     pass = ComputePass();
             pass.ArgOut( "un_OutImage", rt );
             pass.ArgIn(  "un_RtScene",  scene );
             pass.LocalSize( 8, 8 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-2.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-2.as
similarity index 98%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-2.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-2.as
index fa174f44..279968dd 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-2.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-2.as
@@ -47,7 +47,7 @@
             // update RTScene using instance data from prev pass
             BuildRTScene( scene );
         }{
-            RC<ComputePass>     rt_pass = ComputePass( "", "TRACE_RAYS", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     rt_pass = ComputePass( "", "TRACE_RAYS" );
             rt_pass.ArgOut( "un_OutImage",  rt );
             rt_pass.ArgIn(  "un_RtScene",   scene );
             rt_pass.LocalSize( 8, 8 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-3.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-3.as
similarity index 98%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-3.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-3.as
index 4285d407..f7037cc5 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-3.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-3.as
@@ -59,7 +59,7 @@
 
         // render loop
         {
-            RC<ComputePass>     upd_verts = ComputePass( "", "GEN_MESH", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     upd_verts = ComputePass( "", "GEN_MESH" );
             upd_verts.ArgInOut( "un_Triangles", triangles );
             upd_verts.LocalSize( 8, 8 );
             upd_verts.DispatchThreads( grid_size, grid_size );
@@ -68,7 +68,7 @@
             BuildRTScene( scene );
         }{
             RC<ComputePass>     rtrace = ComputePass( "", "RAYTRACE" );
-            rtrace.ArgIn(   camera );
+            rtrace.Set(     camera );
             rtrace.ArgIn(   "un_Triangles", triangles );
             rtrace.ArgOut(  "un_OutImage",  rt );
             rtrace.ArgIn(   "un_RtScene",   scene );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-4.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-4.as
similarity index 99%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-4.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-4.as
index 809d87d4..b4d74c30 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-4.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-4.as
@@ -49,7 +49,7 @@
             // update RTScene using instance data from prev pass
             BuildRTSceneIndirect( scene );
         }{
-            RC<ComputePass>     rt_pass = ComputePass( "", "TRACE_RAYS", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     rt_pass = ComputePass( "", "TRACE_RAYS" );
             rt_pass.ArgOut( "un_OutImage",  rt );
             rt_pass.ArgIn(  "un_RtScene",   scene );
             rt_pass.LocalSize( 8, 8 );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-5.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-5.as
similarity index 98%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-5.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-5.as
index d6fe47a3..9a08238a 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-5.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-5.as
@@ -59,7 +59,7 @@
 
         // render loop
         {
-            RC<ComputePass>     upd_verts = ComputePass( "", "GEN_MESH", EPassFlags::Enable_ShaderTrace );
+            RC<ComputePass>     upd_verts = ComputePass( "", "GEN_MESH" );
             upd_verts.ArgInOut( "un_Triangles",     triangles );
             upd_verts.ArgInOut( "un_IndirectCmd",   geom.IndirectBuffer() );
             upd_verts.LocalSize( 8, 8 );
@@ -69,7 +69,7 @@
             BuildRTScene( scene );
         }{
             RC<ComputePass>     rtrace = ComputePass( "", "RAYTRACE" );
-            rtrace.ArgIn(   camera );
+            rtrace.Set(     camera );
             rtrace.ArgIn(   "un_Triangles", triangles );
             rtrace.ArgOut(  "un_OutImage",  rt );
             rtrace.ArgIn(   "un_RtScene",   scene );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-6.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-6.as
similarity index 98%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-6.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-6.as
index fd7e5e6d..3bbdd91d 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-6.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-6.as
@@ -45,7 +45,7 @@
 
         // render loop
         {
-            RC<RayTracingPass>      pass = RayTracingPass( EPassFlags::Enable_ShaderTrace );
+            RC<RayTracingPass>      pass = RayTracingPass();
             pass.ArgOut( "un_OutImage",     rt );
             pass.ArgIn(  "un_RtScene",      scene );
             pass.ArgIn(  "un_Triangles",    triangles );
diff --git a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-7.as b/AE/samples/res_editor/_data/scripts/tests/RayTracing-7.as
similarity index 96%
rename from AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-7.as
rename to AE/samples/res_editor/_data/scripts/tests/RayTracing-7.as
index 6d3b4f84..fa3b8145 100644
--- a/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-7.as
+++ b/AE/samples/res_editor/_data/scripts/tests/RayTracing-7.as
@@ -18,7 +18,7 @@
 
         // render loop
         {
-            RC<RayTracingPass>      pass = RayTracingPass( EPassFlags::Enable_ShaderTrace );
+            RC<RayTracingPass>      pass = RayTracingPass();
             pass.ArgOut( "un_OutImage",     rt );
             pass.Slider( "iCallable",   0,  4 );
             pass.Dispatch( rt.Dimension() );
diff --git a/AE/samples/res_editor/_data/scripts/tests/ScreenProjection.as b/AE/samples/res_editor/_data/scripts/tests/ScreenProjection.as
new file mode 100644
index 00000000..4f1b3503
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/ScreenProjection.as
@@ -0,0 +1,93 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+/*
+*/
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#   include <aestyle.glsl.h>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt      = Image( EPixelFormat::RGBA16F, SurfaceSize() );
+        RC<FPVCamera>   camera  = FPVCamera();
+
+        // setup camera
+        {
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 50.f );
+
+            const float s = 0.8f;
+            camera.ForwardBackwardScale( s, s );
+            camera.UpDownScale( s, s );
+            camera.SideMovementScale( s );
+        }
+
+        // render loop
+        {
+            RC<Postprocess>     pass = Postprocess();
+            pass.Set(    camera );
+            pass.Output( "out_Color", rt );
+            pass.Slider( "iProj",           0,  5 );
+            pass.Slider( "iDbgView",        0,  1 );
+            pass.Slider( "iInversionError", 0,  1 );
+        }
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SH_FRAG
+    #include "GlobalIndex.glsl"
+    #include "Ray.glsl"
+    #include "Waves.glsl"
+
+    void Main ()
+    {
+        Ray             ray;
+        const float2    uv              = GetGlobalCoordUNorm().xy;
+        float2          uv2             = uv;
+        const float     ipd             = 64.0e-3f; // meters
+        const float     z_near          = 0.1f;
+        const float     dist_to_eye     = 0.5f;     // meters
+        const float2    screen_size     = un_PerPass.resolution.xy * un_PerPass.pixToMm * 0.001f;   // meters
+        const float     curve_radius    = 1.8f; // meters
+
+        switch ( iProj )
+        {
+            // screen ViewProj matrix to ray:
+            case 0 :    ray = Ray_From( un_PerPass.camera.invViewProj, un_PerPass.camera.pos, z_near, uv );         break;
+
+            // VR video:
+            case 1 :    ray = Ray_PlaneToVR180( ipd, un_PerPass.camera.pos, z_near, uv );
+                        uv2 = Inverted_PlaneToVR180( ray.dir, uv.x < 0.5 ? 0 : 1 );                                 break;
+
+            case 2 :    ray = Ray_PlaneToVR360( ipd, un_PerPass.camera.pos, z_near, uv );
+                        uv2 = Inverted_PlaneToVR360( ray.dir, uv.y < 0.5 ? 0 : 1 );                                 break;
+
+            // 360 video
+            case 3 :    ray = Ray_PlaneTo360( un_PerPass.camera.pos, z_near, uv );
+                        uv2 = Inverted_PlaneTo360( ray.dir );                                                       break;
+
+            // flat screen
+            case 4 :    ray = Ray_FromFlatScreen( un_PerPass.camera.pos, dist_to_eye, screen_size, z_near, ToSNorm(uv) ); break;
+
+            // curved screen
+            case 5 :    ray = Ray_FromCurvedScreen( un_PerPass.camera.pos, dist_to_eye, curve_radius, screen_size, z_near, ToSNorm(uv) ); break;
+        }
+
+        out_Color = float4( ray.dir, 1.0 );
+
+        if ( iDbgView == 0 )
+            out_Color.rgb *= TriangleWave( ray.dir.z*100.0 );
+
+        if ( iInversionError == 1 )
+            out_Color.rgb = float3( Abs( uv - uv2 ) * 1000.f, 0.f );
+
+        out_Color.a = ray.dir.z;
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/ShadertoyDefault.as b/AE/samples/res_editor/_data/scripts/tests/ShadertoyDefault.as
similarity index 100%
rename from AE/samples/res_editor/_data/scripts/samples-2d/ShadertoyDefault.as
rename to AE/samples/res_editor/_data/scripts/tests/ShadertoyDefault.as
diff --git a/AE/samples/res_editor/_data/scripts/samples-2d/Spectrum.as b/AE/samples/res_editor/_data/scripts/tests/Spectrum.as
similarity index 100%
rename from AE/samples/res_editor/_data/scripts/samples-2d/Spectrum.as
rename to AE/samples/res_editor/_data/scripts/tests/Spectrum.as
diff --git a/AE/samples/res_editor/_data/scripts/tests/Triangulation-1.as b/AE/samples/res_editor/_data/scripts/tests/Triangulation-1.as
new file mode 100644
index 00000000..d9f8830e
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/Triangulation-1.as
@@ -0,0 +1,69 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt      = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>       ds      = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>       scene   = Scene();
+
+        // setup camera
+        {
+            RC<FPVCamera>   camera = FPVCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 50.f );
+
+            const float s = 0.8f;
+            camera.ForwardBackwardScale( s );
+            camera.UpDownScale( s );
+            camera.SideMovementScale( s );
+
+            scene.Set( camera );
+        }
+
+        // create geometry
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float2>   contour_verts       = { float2(0.f, 0.f), float2(1.5f, 1.f), float2(2.f, 2.f), float2(2.5f, 1.f), float2(4.f, 0.f), float2(2.f, 4.f) };
+            array<uint>     contour_idcs        = { 0,5,  5,4,  4,0,  1,2,  2,3,  3,1 };
+
+            array<float3>   positions;
+            array<uint>     indices;
+            Triangulate( contour_verts, contour_idcs, 0.f, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry", geom_data );
+
+            scene.Add( geometry, float3(0.f, 0.2f, 0.f) );
+        }
+
+        // render loop
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+            draw.AddPipeline( "tests/Triangulation.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/tests/Triangulation.as)
+            draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
+            draw.Output( ds, DepthStencil( 1.f, 0 ));
+            draw.Slider( "iDbgNormals", 0, 1 );
+        }
+
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/scripts/tests/Triangulation-2.as b/AE/samples/res_editor/_data/scripts/tests/Triangulation-2.as
new file mode 100644
index 00000000..f875ccdd
--- /dev/null
+++ b/AE/samples/res_editor/_data/scripts/tests/Triangulation-2.as
@@ -0,0 +1,69 @@
+// Copyright (c) Zhirnov Andrey. For more information see 'LICENSE'
+#ifdef __INTELLISENSE__
+#   include <res_editor.as>
+#endif
+//-----------------------------------------------------------------------------
+#ifdef SCRIPT
+
+    void ASmain ()
+    {
+        // initialize
+        RC<Image>       rt      = Image( EPixelFormat::RGBA8_UNorm, SurfaceSize() );    rt.Name( "RT-Color" );
+        RC<Image>       ds      = Image( EPixelFormat::Depth32F, SurfaceSize() );       ds.Name( "RT-Depth" );
+        RC<Scene>       scene   = Scene();
+
+        // setup camera
+        {
+            RC<FPVCamera>   camera = FPVCamera();
+
+            camera.ClipPlanes( 0.1f, 100.f );
+            camera.FovY( 50.f );
+
+            const float s = 0.8f;
+            camera.ForwardBackwardScale( s );
+            camera.UpDownScale( s );
+            camera.SideMovementScale( s );
+
+            scene.Set( camera );
+        }
+
+        // create geometry
+        {
+            RC<Buffer>              geom_data   = Buffer();
+            RC<UnifiedGeometry>     geometry    = UnifiedGeometry();
+
+            array<float2>   contour_verts       = { float2(0.f, 0.f), float2(1.5f, 1.f), float2(2.f, 2.f), float2(2.5f, 1.f), float2(4.f, 0.f), float2(2.f, 4.f) };
+            array<uint>     contour_idcs        = { 0,5,  5,4,  4,0,  1,2,  2,3,  3,1 };
+
+            array<float3>   positions;
+            array<uint>     indices;
+            TriangulateAndExtrude( contour_verts, contour_idcs, 1.f, OUT positions, OUT indices );
+
+            geom_data.FloatArray(   "positions",    positions );
+            geom_data.UIntArray(    "indices",      indices );
+            geom_data.LayoutName( "GeometrySBlock" );
+
+            UnifiedGeometry_DrawIndexed cmd;
+            cmd.indexCount = indices.size();
+            cmd.IndexBuffer( geom_data, "indices" );
+
+            geometry.Draw( cmd );
+            geometry.ArgIn( "un_Geometry", geom_data );
+
+            scene.Add( geometry, float3(0.f, 0.2f, 0.f) );
+        }
+
+        // render loop
+        {
+            RC<SceneGraphicsPass>   draw = scene.AddGraphicsPass( "main pass" );
+            draw.AddPipeline( "tests/Triangulation.as" );       // [src](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/pipelines/tests/Triangulation.as)
+            draw.Output( "out_Color", rt, RGBA32f( 0.3, 0.5, 1.0, 1.0 ));
+            draw.Output( ds, DepthStencil( 1.f, 0 ));
+            draw.Slider( "iDbgNormals", 0, 1 );
+        }
+
+        Present( rt );
+    }
+
+#endif
+//-----------------------------------------------------------------------------
diff --git a/AE/samples/res_editor/_data/shaders/Particles-Simulation.glsl b/AE/samples/res_editor/_data/shaders/Particles-Simulation.glsl
index be553f94..18e55b80 100644
--- a/AE/samples/res_editor/_data/shaders/Particles-Simulation.glsl
+++ b/AE/samples/res_editor/_data/shaders/Particles-Simulation.glsl
@@ -91,39 +91,40 @@ ND_ uint  ParticleColor_FromVelocityLength (const float3 velocity)
 }
 
 
-ND_ float3  ParticleEmitter_Plane (const float pointIndex, const float pointsCount)
+ND_ float3  ParticleEmitter_Plane (const float index, const float count)
 {
-    const float side = Sqrt( pointsCount );
-    return float3( ToSNorm( float2(Mod( pointIndex, side ), Floor( pointIndex / side )) / side ), 0.0 );
+    const float side = Sqrt( count );
+    return float3( ToSNorm( float2(Mod( index, side ), Floor( index / side )) / side ), 0.0 );
 }
 
 
-ND_ float3  ParticleEmitter_Plane (const float pointIndex, const float pointsCount, const float ratio)
+ND_ float3  ParticleEmitter_Plane (const float index, const float count, const float ratio)
 {
-    const float side_x   = Sqrt( pointsCount * ratio );
-    const float side_y   = pointsCount / side_x;
+    const float side_x   = Sqrt( count * ratio );
+    const float side_y   = count / side_x;
     const float max_side = Max( side_x, side_y );
 
-    return float3( (float2(Mod( pointIndex, side_x ), Floor( pointIndex / side_x )) * 2.0 - float2(side_x, side_y)) / max_side, 0.0 );
+    return float3( (float2(Mod( index, side_x ), Floor( index / side_x )) * 2.0 - float2(side_x, side_y)) / max_side, 0.0 );
 }
 
 
-ND_ float3  ParticleEmitter_Circle (const float pointIndex, const float pointsCount)
+ND_ float3  ParticleEmitter_Circle (const float index, const float count)
 {
-    return float3( SinCos( Pi() * 2.0 * pointIndex / (pointsCount - 1.0) ), 0.0 );
+    return float3( SinCos( Pi() * 2.0 * index / (count - 1.0) ), 0.0 );
 }
 
 
-ND_ float3  ParticleEmitter_FillCircle (const float pointIndex, const float pointsCount)
+ND_ float3  ParticleEmitter_FillCircle (const float index, const float count)
 {
-    const float2    p = ParticleEmitter_Plane( pointIndex, pointsCount ).xy;
+    const float2    p = ParticleEmitter_Plane( index, count ).xy;
     return float3( SinCos( Pi() * 2.0 * p.x ) * p.y, 0.0 );
 }
 
 
-ND_ float3  ParticleEmitter_Sphere (const float pointIndex, const float pointsCount)
+ND_ float3  ParticleEmitter_Sphere (const float index, const float count)
 {
-    const float2    angle   = ParticleEmitter_Plane( pointIndex, pointsCount, 0.5 ).yx * Pi();
+    // TODO: spherical cube
+    const float2    angle   = ParticleEmitter_Plane( index, count, 0.5 ).yx * Pi();
     const float2    theta   = SinCos( angle.x );
     const float2    phi     = SinCos( angle.y );
 
@@ -131,9 +132,9 @@ ND_ float3  ParticleEmitter_Sphere (const float pointIndex, const float pointsCo
 }
 
 
-ND_ float3  ParticleEmitter_ConeVector (const float pointIndex, const float pointsCount, const float zLength)
+ND_ float3  ParticleEmitter_ConeVector (const float index, const float count, const float zLength)
 {
-    const float2    p = ParticleEmitter_Plane( pointIndex, pointsCount ).xy;
+    const float2    p = ParticleEmitter_Plane( index, count ).xy;
     const float2    c = SinCos( Pi() * 2.0 * p.x ) * p.y;
     return Normalize( float3( c, zLength ));
 }
diff --git a/AE/samples/res_editor/_data/shaders/Transform.glsl b/AE/samples/res_editor/_data/shaders/Transform.glsl
index 25890fbd..a17151f8 100644
--- a/AE/samples/res_editor/_data/shaders/Transform.glsl
+++ b/AE/samples/res_editor/_data/shaders/Transform.glsl
@@ -13,6 +13,8 @@
 /*
 =================================================
     LocalPosToWorldSpace
+----
+    world space where camera in zero coords
 =================================================
 */
 ND_ float4  LocalPosToWorldSpace (const float4 pos)
@@ -34,7 +36,7 @@ ND_ float4  LocalPosToWorldSpace (const float3 pos)
 */
 ND_ float3  LocalVecToWorldSpace (const float3 dir)
 {
-    return Normalize( float3x3(un_PerObject.transform) * dir );
+    return Normalize( un_PerObject.normalMat * dir );
 }
 
 #else
diff --git a/AE/samples/res_editor/_ui_data/controls/glfw.as b/AE/samples/res_editor/_ui_data/controls/glfw.as
index 9dbc561d..b43e3039 100644
--- a/AE/samples/res_editor/_ui_data/controls/glfw.as
+++ b/AE/samples/res_editor/_ui_data/controls/glfw.as
@@ -133,13 +133,13 @@ void ASmain (GLFW_ActionBindings& bindings)
                   ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Move, float4(1.f, 1.f, 0.f, 0.f) * mouse_scale ));
 
         bind.Add( GLFW_Input::ArrowLeft,
-                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("+0"), arrow_scale ));
-        bind.Add( GLFW_Input::ArrowRight,
                   ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("-0"), arrow_scale ));
+        bind.Add( GLFW_Input::ArrowRight,
+                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("+0"), arrow_scale ));
         bind.Add( GLFW_Input::ArrowUp,
-                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("0+"), arrow_scale ));
-        bind.Add( GLFW_Input::ArrowDown,
                   ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("0-"), arrow_scale ));
+        bind.Add( GLFW_Input::ArrowDown,
+                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("0+"), arrow_scale ));
 
         bind.Add( GLFW_Input::W,
                   ActionInfo( "Camera.Move", EValueType::Float2, EGestureType::Hold, VecSwizzle("0-") ));
diff --git a/AE/samples/res_editor/_ui_data/controls/winapi.as b/AE/samples/res_editor/_ui_data/controls/winapi.as
index 77053090..1c6f03b2 100644
--- a/AE/samples/res_editor/_ui_data/controls/winapi.as
+++ b/AE/samples/res_editor/_ui_data/controls/winapi.as
@@ -133,13 +133,13 @@ void ASmain (WinAPI_ActionBindings& bindings)
                   ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Move, float4(1.f, 1.f, 0.f, 0.f) * mouse_scale ));
 
         bind.Add( WinAPI_Input::ArrowLeft,
-                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("+0"), arrow_scale ));
-        bind.Add( WinAPI_Input::ArrowRight,
                   ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("-0"), arrow_scale ));
+        bind.Add( WinAPI_Input::ArrowRight,
+                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("+0"), arrow_scale ));
         bind.Add( WinAPI_Input::ArrowUp,
-                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("0+"), arrow_scale ));
-        bind.Add( WinAPI_Input::ArrowDown,
                   ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("0-"), arrow_scale ));
+        bind.Add( WinAPI_Input::ArrowDown,
+                  ActionInfo( "Camera.Rotate", EValueType::Float2, EGestureType::Hold, VecSwizzle("0+"), arrow_scale ));
 
         bind.Add( WinAPI_Input::W,
                   ActionInfo( "Camera.Move", EValueType::Float2, EGestureType::Hold, VecSwizzle("0-") ));
diff --git a/AE/samples/res_editor/_ui_data/cpp/vk_types.h b/AE/samples/res_editor/_ui_data/cpp/vk_types.h
index ecf169ae..332bf678 100644
--- a/AE/samples/res_editor/_ui_data/cpp/vk_types.h
+++ b/AE/samples/res_editor/_ui_data/cpp/vk_types.h
@@ -13,17 +13,17 @@
         uint  specularRGBM;
     };
 #endif
-    STATIC_ASSERT( offsetof(ModelMaterial, flags) == 0 );
-    STATIC_ASSERT( offsetof(ModelMaterial, albedoMap) == 4 );
-    STATIC_ASSERT( offsetof(ModelMaterial, normalMap) == 8 );
-    STATIC_ASSERT( offsetof(ModelMaterial, albedoRGBM) == 12 );
-    STATIC_ASSERT( offsetof(ModelMaterial, emissiveRGBM) == 16 );
-    STATIC_ASSERT( offsetof(ModelMaterial, specularRGBM) == 20 );
-    STATIC_ASSERT( sizeof(ModelMaterial) == 24 );
+    StaticAssert( offsetof(ModelMaterial, flags) == 0 );
+    StaticAssert( offsetof(ModelMaterial, albedoMap) == 4 );
+    StaticAssert( offsetof(ModelMaterial, normalMap) == 8 );
+    StaticAssert( offsetof(ModelMaterial, albedoRGBM) == 12 );
+    StaticAssert( offsetof(ModelMaterial, emissiveRGBM) == 16 );
+    StaticAssert( offsetof(ModelMaterial, specularRGBM) == 20 );
+    StaticAssert( sizeof(ModelMaterial) == 24 );
 
 #ifndef CubeVertex_DEFINED
 #   define CubeVertex_DEFINED
-    // size: 40, align: 2 (16)
+    // size: 40, align: 2
     struct CubeVertex
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x38ec4b6bu}};  // 'CubeVertex'
@@ -35,16 +35,16 @@
         packed_short4  BiTangent;
     };
 #endif
-    STATIC_ASSERT( offsetof(CubeVertex, Position) == 0 );
-    STATIC_ASSERT( offsetof(CubeVertex, Texcoord) == 8 );
-    STATIC_ASSERT( offsetof(CubeVertex, Normal) == 16 );
-    STATIC_ASSERT( offsetof(CubeVertex, Tangent) == 24 );
-    STATIC_ASSERT( offsetof(CubeVertex, BiTangent) == 32 );
-    STATIC_ASSERT( sizeof(CubeVertex) == 40 );
+    StaticAssert( offsetof(CubeVertex, Position) == 0 );
+    StaticAssert( offsetof(CubeVertex, Texcoord) == 8 );
+    StaticAssert( offsetof(CubeVertex, Normal) == 16 );
+    StaticAssert( offsetof(CubeVertex, Tangent) == 24 );
+    StaticAssert( offsetof(CubeVertex, BiTangent) == 32 );
+    StaticAssert( sizeof(CubeVertex) == 40 );
 
 #ifndef SphericalCubeVertex_DEFINED
 #   define SphericalCubeVertex_DEFINED
-    // size: 32, align: 2 (16)
+    // size: 32, align: 2
     struct SphericalCubeVertex
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x35a6eeecu}};  // 'SphericalCubeVertex'
@@ -55,11 +55,11 @@
         packed_short4  BiTangent;
     };
 #endif
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, Position) == 0 );
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, Texcoord) == 8 );
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, Tangent) == 16 );
-    STATIC_ASSERT( offsetof(SphericalCubeVertex, BiTangent) == 24 );
-    STATIC_ASSERT( sizeof(SphericalCubeVertex) == 32 );
+    StaticAssert( offsetof(SphericalCubeVertex, Position) == 0 );
+    StaticAssert( offsetof(SphericalCubeVertex, Texcoord) == 8 );
+    StaticAssert( offsetof(SphericalCubeVertex, Tangent) == 16 );
+    StaticAssert( offsetof(SphericalCubeVertex, BiTangent) == 24 );
+    StaticAssert( sizeof(SphericalCubeVertex) == 32 );
 
 #ifndef SceneOmniLight_DEFINED
 #   define SceneOmniLight_DEFINED
@@ -73,10 +73,10 @@
         uint  colorRGBM;
     };
 #endif
-    STATIC_ASSERT( offsetof(SceneOmniLight, position) == 0 );
-    STATIC_ASSERT( offsetof(SceneOmniLight, attenuation) == 16 );
-    STATIC_ASSERT( offsetof(SceneOmniLight, colorRGBM) == 32 );
-    STATIC_ASSERT( sizeof(SceneOmniLight) == 48 );
+    StaticAssert( offsetof(SceneOmniLight, position) == 0 );
+    StaticAssert( offsetof(SceneOmniLight, attenuation) == 16 );
+    StaticAssert( offsetof(SceneOmniLight, colorRGBM) == 32 );
+    StaticAssert( sizeof(SceneOmniLight) == 48 );
 
 #ifndef ModelNode_DEFINED
 #   define ModelNode_DEFINED
@@ -91,11 +91,11 @@
         uint  materialIdx;
     };
 #endif
-    STATIC_ASSERT( offsetof(ModelNode, transform) == 0 );
-    STATIC_ASSERT( offsetof(ModelNode, normalMat) == 64 );
-    STATIC_ASSERT( offsetof(ModelNode, meshIdx) == 112 );
-    STATIC_ASSERT( offsetof(ModelNode, materialIdx) == 116 );
-    STATIC_ASSERT( sizeof(ModelNode) == 128 );
+    StaticAssert( offsetof(ModelNode, transform) == 0 );
+    StaticAssert( offsetof(ModelNode, normalMat) == 64 );
+    StaticAssert( offsetof(ModelNode, meshIdx) == 112 );
+    StaticAssert( offsetof(ModelNode, materialIdx) == 116 );
+    StaticAssert( sizeof(ModelNode) == 128 );
 
 #ifndef ModelRTMesh_DEFINED
 #   define ModelRTMesh_DEFINED
@@ -109,10 +109,10 @@
         TDeviceAddress< uint *>  indices;
     };
 #endif
-    STATIC_ASSERT( offsetof(ModelRTMesh, normals) == 0 );
-    STATIC_ASSERT( offsetof(ModelRTMesh, texcoords) == 8 );
-    STATIC_ASSERT( offsetof(ModelRTMesh, indices) == 16 );
-    STATIC_ASSERT( sizeof(ModelRTMesh) == 24 );
+    StaticAssert( offsetof(ModelRTMesh, normals) == 0 );
+    StaticAssert( offsetof(ModelRTMesh, texcoords) == 8 );
+    StaticAssert( offsetof(ModelRTMesh, indices) == 16 );
+    StaticAssert( sizeof(ModelRTMesh) == 24 );
 
 #ifndef ModelRTInstances_DEFINED
 #   define ModelRTInstances_DEFINED
@@ -126,10 +126,10 @@
         StaticArray< TDeviceAddress< float3x3_storage *>, 4 >    normalMatPerInstance;
     };
 #endif
-    STATIC_ASSERT( offsetof(ModelRTInstances, meshesPerInstance) == 0 );
-    STATIC_ASSERT( offsetof(ModelRTInstances, materialsPerInstance) == 32 );
-    STATIC_ASSERT( offsetof(ModelRTInstances, normalMatPerInstance) == 64 );
-    STATIC_ASSERT( sizeof(ModelRTInstances) == 96 );
+    StaticAssert( offsetof(ModelRTInstances, meshesPerInstance) == 0 );
+    StaticAssert( offsetof(ModelRTInstances, materialsPerInstance) == 32 );
+    StaticAssert( offsetof(ModelRTInstances, normalMatPerInstance) == 64 );
+    StaticAssert( sizeof(ModelRTInstances) == 96 );
 
 #ifndef SceneDirectionalLight_DEFINED
 #   define SceneDirectionalLight_DEFINED
@@ -143,10 +143,10 @@
         uint  colorRGBM;
     };
 #endif
-    STATIC_ASSERT( offsetof(SceneDirectionalLight, direction) == 0 );
-    STATIC_ASSERT( offsetof(SceneDirectionalLight, attenuation) == 16 );
-    STATIC_ASSERT( offsetof(SceneDirectionalLight, colorRGBM) == 32 );
-    STATIC_ASSERT( sizeof(SceneDirectionalLight) == 48 );
+    StaticAssert( offsetof(SceneDirectionalLight, direction) == 0 );
+    StaticAssert( offsetof(SceneDirectionalLight, attenuation) == 16 );
+    StaticAssert( offsetof(SceneDirectionalLight, colorRGBM) == 32 );
+    StaticAssert( sizeof(SceneDirectionalLight) == 48 );
 
 #ifndef SceneConeLight_DEFINED
 #   define SceneConeLight_DEFINED
@@ -162,12 +162,12 @@
         uint  colorRGBM;
     };
 #endif
-    STATIC_ASSERT( offsetof(SceneConeLight, position) == 0 );
-    STATIC_ASSERT( offsetof(SceneConeLight, direction) == 16 );
-    STATIC_ASSERT( offsetof(SceneConeLight, attenuation) == 32 );
-    STATIC_ASSERT( offsetof(SceneConeLight, cone) == 48 );
-    STATIC_ASSERT( offsetof(SceneConeLight, colorRGBM) == 56 );
-    STATIC_ASSERT( sizeof(SceneConeLight) == 64 );
+    StaticAssert( offsetof(SceneConeLight, position) == 0 );
+    StaticAssert( offsetof(SceneConeLight, direction) == 16 );
+    StaticAssert( offsetof(SceneConeLight, attenuation) == 32 );
+    StaticAssert( offsetof(SceneConeLight, cone) == 48 );
+    StaticAssert( offsetof(SceneConeLight, colorRGBM) == 56 );
+    StaticAssert( sizeof(SceneConeLight) == 64 );
 
 #ifndef SceneLights_DEFINED
 #   define SceneLights_DEFINED
@@ -184,13 +184,13 @@
         StaticArray< SceneOmniLight, 8 >    omni;
     };
 #endif
-    STATIC_ASSERT( offsetof(SceneLights, directionalCount) == 0 );
-    STATIC_ASSERT( offsetof(SceneLights, coneCount) == 4 );
-    STATIC_ASSERT( offsetof(SceneLights, omniCount) == 8 );
-    STATIC_ASSERT( offsetof(SceneLights, directional) == 16 );
-    STATIC_ASSERT( offsetof(SceneLights, cone) == 400 );
-    STATIC_ASSERT( offsetof(SceneLights, omni) == 1424 );
-    STATIC_ASSERT( sizeof(SceneLights) == 1808 );
+    StaticAssert( offsetof(SceneLights, directionalCount) == 0 );
+    StaticAssert( offsetof(SceneLights, coneCount) == 4 );
+    StaticAssert( offsetof(SceneLights, omniCount) == 8 );
+    StaticAssert( offsetof(SceneLights, directional) == 16 );
+    StaticAssert( offsetof(SceneLights, cone) == 400 );
+    StaticAssert( offsetof(SceneLights, omni) == 1424 );
+    StaticAssert( sizeof(SceneLights) == 1808 );
 
 #ifndef Histogram_ssb_DEFINED
 #   define Histogram_ssb_DEFINED
@@ -204,10 +204,10 @@
         StaticArray< uint4, 130 >    RGBLuma;
     };
 #endif
-    STATIC_ASSERT( offsetof(Histogram_ssb, maxRGB) == 0 );
-    STATIC_ASSERT( offsetof(Histogram_ssb, maxLuma) == 4 );
-    STATIC_ASSERT( offsetof(Histogram_ssb, RGBLuma) == 16 );
-    STATIC_ASSERT( sizeof(Histogram_ssb) == 2096 );
+    StaticAssert( offsetof(Histogram_ssb, maxRGB) == 0 );
+    StaticAssert( offsetof(Histogram_ssb, maxLuma) == 4 );
+    StaticAssert( offsetof(Histogram_ssb, RGBLuma) == 16 );
+    StaticAssert( sizeof(Histogram_ssb) == 2096 );
 
 #ifndef imgui_ub_DEFINED
 #   define imgui_ub_DEFINED
@@ -220,9 +220,9 @@
         float2  translate;
     };
 #endif
-    STATIC_ASSERT( offsetof(imgui_ub, scale) == 0 );
-    STATIC_ASSERT( offsetof(imgui_ub, translate) == 8 );
-    STATIC_ASSERT( sizeof(imgui_ub) == 16 );
+    StaticAssert( offsetof(imgui_ub, scale) == 0 );
+    StaticAssert( offsetof(imgui_ub, translate) == 8 );
+    StaticAssert( sizeof(imgui_ub) == 16 );
 
 #ifndef imgui_pc_DEFINED
 #   define imgui_pc_DEFINED
@@ -234,12 +234,12 @@
         uint  textureIdx;
     };
 #endif
-    STATIC_ASSERT( offsetof(imgui_pc, textureIdx) == 0 );
-    STATIC_ASSERT( sizeof(imgui_pc) == 4 );
+    StaticAssert( offsetof(imgui_pc, textureIdx) == 0 );
+    StaticAssert( sizeof(imgui_pc) == 4 );
 
 #ifndef imgui_vertex_DEFINED
 #   define imgui_vertex_DEFINED
-    // size: 20, align: 4 (16)
+    // size: 20, align: 4
     struct imgui_vertex
     {
         static constexpr auto  TypeName = ShaderStructName{HashVal32{0x9e6b2802u}};  // 'imgui_vertex'
@@ -249,10 +249,10 @@
         packed_ubyte4  Color;
     };
 #endif
-    STATIC_ASSERT( offsetof(imgui_vertex, Position) == 0 );
-    STATIC_ASSERT( offsetof(imgui_vertex, UV) == 8 );
-    STATIC_ASSERT( offsetof(imgui_vertex, Color) == 16 );
-    STATIC_ASSERT( sizeof(imgui_vertex) == 20 );
+    StaticAssert( offsetof(imgui_vertex, Position) == 0 );
+    StaticAssert( offsetof(imgui_vertex, UV) == 8 );
+    StaticAssert( offsetof(imgui_vertex, Color) == 16 );
+    StaticAssert( sizeof(imgui_vertex) == 20 );
 
 #ifndef LinearDepth_draw_pc_DEFINED
 #   define LinearDepth_draw_pc_DEFINED
@@ -264,6 +264,6 @@
         float2  clipPlanes;
     };
 #endif
-    STATIC_ASSERT( offsetof(LinearDepth_draw_pc, clipPlanes) == 0 );
-    STATIC_ASSERT( sizeof(LinearDepth_draw_pc) == 8 );
+    StaticAssert( offsetof(LinearDepth_draw_pc, clipPlanes) == 0 );
+    StaticAssert( sizeof(LinearDepth_draw_pc) == 8 );
 
diff --git a/AE/samples/res_editor/_ui_data/pipelines/imgui.as b/AE/samples/res_editor/_ui_data/pipelines/imgui.as
index f84895ac..065fbf1d 100644
--- a/AE/samples/res_editor/_ui_data/pipelines/imgui.as
+++ b/AE/samples/res_editor/_ui_data/pipelines/imgui.as
@@ -76,7 +76,8 @@ void  CreatePipeline (const array<string> &passNames)
     }
     {
         RC<ShaderStructType>    st = ShaderStructType( "imgui_vertex" );
-        st.Set( "packed_float2      Position;"  +
+        st.Set( EStructLayout::InternalIO,
+                "packed_float2      Position;"  +
                 "packed_float2      UV;"        +
                 "packed_ubyte_norm4 Color;"     );
 
diff --git a/AE/samples/res_editor/docs/EditorUI.md b/AE/samples/res_editor/docs/EditorUI.md
index 9f250567..a4f67fb2 100644
--- a/AE/samples/res_editor/docs/EditorUI.md
+++ b/AE/samples/res_editor/docs/EditorUI.md
@@ -59,7 +59,7 @@ Draw some statistics:
 **Linear filter** - enable linear filter when blit the image to the surface, this will add a slight blur effect.<br/>
 ![](img/UI-Graphics-1.png)
 
-**Surface format** - allows to change window surface format, `RGBA16F` format enables [HDR output](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/HDR_Display.md).<br/>
+**Surface format** - allows to change window surface format, `RGBA16F` format enables [HDR output](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/HDR_Display.md).<br/>
 ![](img/UI-Graphics-2.png)
 
 **Present mode** - allows to change present mode. `FIFO` - enable vertical synchronization.<br/>
@@ -68,4 +68,4 @@ Draw some statistics:
 
 # Profiler windows
 
-See [Engine Profiling](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Profiling.md) docs.
+See [Engine Profiling](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Profiling.md) docs.
diff --git a/AE/samples/res_editor/docs/Samples.md b/AE/samples/res_editor/docs/Samples.md
index e222ac7b..032ef00f 100644
--- a/AE/samples/res_editor/docs/Samples.md
+++ b/AE/samples/res_editor/docs/Samples.md
@@ -6,6 +6,7 @@ Content:
 * [Ray Tracing](#ray-tracing)
 * [Order-Independent Transparency](#order-independent-transparency)
 * [Games](#games)
+* [Tests](#tests)
 
 ## 2D
 
@@ -13,14 +14,7 @@ Content:
 ![](img/Bloom.jpg)
 * [SDF and MSDF font with anti-aliasing](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/SdfFont.as)
 * [Video texture](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/Video.as)
-
-**Tests:**
-* [Shadertoy default shader](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/ShadertoyDefault.as)
-* [Compute pass](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/Compute.as)
-* [Multiple passes](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/MultiPassTest.as)
-* [NaN in shader](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/NaN.as)
-* [White color spectrum](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/Spectrum.as)
-* [Color interpolation](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/ColorLerp.as)
+* [VR Video player](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/VRVideo.as)
 
 **Extensions:**
 * [Subgroups](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/Subgroups.as)<br/>
@@ -29,14 +23,17 @@ Content:
 * [Binary tree with buffer reference](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/BufferReference.as)<br/>
 ![](img/BufferReferenceBinaryTree.png)
 
+
 ## 3D
 
 **Relief mapping:**<br/>
 Supported precalculated TBN and screen-space TBN calculation. Debug drawing for TBN, UV, triangle border.<br/>
-* [Cube](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-1.as)<br/>
+* [Cube](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cube.as)<br/>
 ![](img/Parallax.png)
-* [Cylinder inner side](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-2.as)
-* [Cylinder outer side](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-3.as)
+* [Cylinder inner side](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-InnerCylinder.as)
+* [Cylinder outer side](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Cylinder.as)
+* [Sphere with 2D texture](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere.as)
+* [Sphere with cubemap](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/Parallax-Sphere2.as)
 
 **Ray marching:**
 * [Simple ray marching](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/SimpleRayMarching.as)<br/>
@@ -71,24 +68,15 @@ Supported precalculated TBN and screen-space TBN calculation. Debug drawing for
 
 ## Ray Tracing
 
-**Tests:**
-* [Triangles with transformation](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-1.as)
-* [Triangles, update instances every frame](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-2.as)
-* [Animated grid, vertices updated every frame](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-3.as)
-* [Multiple triangles, used `BuildRTSceneIndirect()`](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-4.as)
-* [Animated grid, used `BuildRTGeometryIndirect()`](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-5.as)
-* [Triangle in recursive ray tracing](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-6.as)
-* [Callable shader](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RayTracing-7.as)
-
 **Samples:**
 * [Simple geometry with dynamic shadows](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RT-Shadow.as)<br/>
 ![](img/RT-Shadow.jpg)
 * [Cube with reflections and refractions](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RT-MultiBounce-1.as)<br/>
 ![](img/RT-MultiBounce-1.jpg)
 
-* [Dispersion in prism](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2D.as)
-* [Dispersion in multiple prisms](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2DLayered.as)<br/>
+* [Dispersion in prism](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2D.as)<br/>
 ![](img/Dispersion2D.jpg)
+* [Dispersion in multiple prisms](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/Dispersion2DLayered.as)
 
 * [glTF scene tracing](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/RT-Model-1.as)<br/>
 
@@ -111,13 +99,6 @@ Supported precalculated TBN and screen-space TBN calculation. Debug drawing for
 * [Ray tracing](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-rt/OIT-4.as)
 
 
-## Export
-
-* [Image export](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/VolumetricExport.as)
-* [Image import](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-3d/VolumetricImport.as)
-* [Buffer export](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/samples-2d/BufferExport.as)
-
-
 ## Games
 
 ResEditor allows to create game prototypes.
@@ -125,3 +106,39 @@ ResEditor allows to create game prototypes.
 * [2D Labyrinth](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/games/2d-Labyrinth.as)
 * [Flight](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/games/3d-Flight.as)<br/>
 ![](img/FlightGame.jpg)
+
+
+## Tests
+**2D**
+* [Color interpolation](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ColorLerp.as)
+* [Compute pass](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/Compute.as)
+* [Cooperative matrix](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/CoopMatrix.as)
+* [Multiple passes](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/MultiPassTest.as)
+* [NaN in shader](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/NaN.as)
+* [Projections](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ScreenProjection.as)
+* [Shadertoy default shader](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ShadertoyDefault.as)
+* [White color spectrum](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/Spectrum.as)
+
+**3D**
+* [Indirect draw test](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/IndirectDraw.as)
+* [Spherical Cube: triangle area](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-1.as)
+* [Spherical Cube: texture projection](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-2.as)
+* [Spherical Cube: circle distortion](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-3.as)
+* [Spherical Cube: 3D to texture in CS](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-4.as)
+* [Spherical Cube: 3D to texture in FS](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/sphere/SphericalCube-5.as)
+* [Triangulation-1](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/Triangulation-1.as)
+* [Triangulation-2](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/Triangulation-2.as)
+
+**Export**
+* [3D Image export](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ImageExport-3D.as), [import](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ImageImport-3D.as)
+* [Cube Map export](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ImageExport-CubeMap.as), [import](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/ImageImport-CubeMap.as)
+* [Buffer export](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/BufferExport.as)
+
+**Ray tracing**
+* [Triangles with transformation](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-1.as)
+* [Triangles, update instances every frame](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-2.as)
+* [Animated grid, vertices updated every frame](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-3.as)
+* [Multiple triangles, used `BuildRTSceneIndirect()`](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-4.as)
+* [Animated grid, used `BuildRTGeometryIndirect()`](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-5.as)
+* [Triangle in recursive ray tracing](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-6.as)
+* [Callable shader](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/_data/scripts/tests/RayTracing-7.as)
diff --git a/AE/samples/res_editor/docs/Scripts.md b/AE/samples/res_editor/docs/Scripts.md
index ef1a656c..fd69c1bc 100644
--- a/AE/samples/res_editor/docs/Scripts.md
+++ b/AE/samples/res_editor/docs/Scripts.md
@@ -14,4 +14,4 @@ See '[res_editor.as](https://github.com/azhirnov/as-en/blob/dev/AE/engine/shared
 Second type of script is used to define pipelines which will be selected by the main script.
 The `pipelines` folder contains this type of scripts.
 
-See 'Pipelines' tab in [Resource Compilation](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ResourceCompilation.md) docs and '[pipeline_compiler.as](https://github.com/azhirnov/as-en/blob/dev/AE/engine/shared_data/scripts/pipeline_compiler.as)' file with built-in docs.
+See 'Pipelines' tab in [Resource Compilation](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/ResourceCompilation.md) docs and '[pipeline_compiler.as](https://github.com/azhirnov/as-en/blob/dev/AE/engine/shared_data/scripts/pipeline_compiler.as)' file with built-in docs.
diff --git a/Readme.md b/Readme.md
index f63a64f4..01a47c8a 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,24 +7,30 @@ Platforms: Windows, Android, Linux, MacOS, Emscripten (without graphics)<br/>
 GraphicsAPI: Vulkan, Metal<br/>
 Shaders: GLSL, MSL<br/>
 
-**Public version**: some features are removed.
-
-Technical documentation:
- * [Build instructions](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Build.md)
- * [Licensing information](https://github.com/azhirnov/as-en/blob/dev/AE/LICENSE.md)
- * [Engine Concept](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Concept.md)
- * Graphics: [DeviceProperties](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/DeviceProperties.md)
- * Graphics: [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/FeatureSet.md)
- * Graphics features: [Vulkan](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/VulkanFeatures.md), [Metal](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/MetalFeatures.md)
- * [Graphics Resources](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/GraphicsResources.md)
- * [Supported platforms](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Platforms.md)
- * [Profiling](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/Profiling.md)
- * [Resource Compilation](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ResourceCompilation.md)
- * [HDR Display](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/HDR_Display.md)
+Not available in public version:
+ * Metal backend
+ * Remote graphics backend
+ * Encrypted stream
+ * Performance tests
+
+Engine documentation:
+ * [Build instructions](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Build.md)
+ * [Licensing information](https://github.com/azhirnov/as-en/blob/dev/AE/LICENSE)
+ * [Engine Concept](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Concept.md)
+ * Graphics: [DeviceProperties](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/DeviceProperties.md)
+ * Graphics: [FeatureSet](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/FeatureSet.md)
+ * Low-level Graphics features: [Vulkan](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/VulkanFeatures.md), [Metal](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/MetalFeatures.md)
+ * [Graphics Resources](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/GraphicsResources.md)
+ * [Supported platforms](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Platforms.md)
+ * [Profiling](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/Profiling.md)
+ * [Resource Compilation](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/ResourceCompilation.md)
+
+Papers:
+ * [HDR Display](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/HDR_Display.md)
 
 Samples and tools:
- * [Resource Editor](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/Readme.md) (Windows only)
- * [Demo](https://github.com/azhirnov/as-en/blob/dev/AE/samples/demo/Readme.md) (Cross platform)
+ * [Shader Playground](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/Readme.md), [Samples](https://github.com/azhirnov/as-en/blob/dev/AE/samples/res_editor/docs/Samples.md)
+ * [Demo](https://github.com/azhirnov/as-en/blob/dev/AE/samples/demo/Readme.md) (in progress)
  * [Lock-Free Algorithms Sandbox](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/lfas/Readme.md)
  * [GLSL-Trace](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/res_pack/shader_trace/Readme.md)
  * [Detect Image Z-Curve](https://github.com/azhirnov/as-en/blob/dev/AE/engine/tools/vulkan_image_zcurve/Readme.md)
@@ -42,14 +48,17 @@ __AsEn__ - полностью асинхронный движок для исп
 Графика: Vulkan, Metal<br/>
 Шейдеры: GLSL, MSL<br/>
 
+Документация по движку:
+ * [Планировщик асинхронных задач](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/TaskScheduler-ru.md)
+ * [Планировщик графических задач](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/RenderTaskScheduler-ru.md)
+ * [Рендер граф](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/RenderGraph-ru.md)
+ * [Файловая система](https://github.com/azhirnov/as-en/blob/dev/AE/docs/engine/VirtualFileSystem-ru.md)
+
 Статьи:
- * [Планировщик асинхронных задач](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/TaskScheduler.md)
- * [Планировщик графических задач](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/RenderTaskScheduler.md)
- * [Рендер граф](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/RenderGraph.md)
- * [Файловая система](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/VirtualFileSystem.md)
- * [HDR дисплеи](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/HDR_Display.md)
- * [Асинхронное программирование](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/AsyncProgramming.md)
- * [Заметки по архитектуре](https://github.com/azhirnov/as-en/blob/dev/AE/engine/docs/ru/ArchitectureNotes.md)
+ * [HDR дисплеи](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/HDR_Display-ru.md)
+ * [Асинхронное программирование](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/AsyncProgramming-ru.md)
+ * [Заметки по архитектуре](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/ArchitectureNotes-ru.md)
+ * [Сферический куб](https://github.com/azhirnov/as-en/blob/dev/AE/docs/papers/SphericalCube-ru.md)
 
 Обсуждение:
- * [форум gamedev](https://gamedev.ru/flame/forum/?id=277212) 
+ * [форум gamedev](https://gamedev.ru/flame/forum/?id=277212)