diff --git a/Source/Editor/Content/Import/ModelImportEntry.cs b/Source/Editor/Content/Import/ModelImportEntry.cs
index 8eb240093..f2bde04a8 100644
--- a/Source/Editor/Content/Import/ModelImportEntry.cs
+++ b/Source/Editor/Content/Import/ModelImportEntry.cs
@@ -364,7 +364,7 @@ namespace FlaxEditor.Content.Import
         private bool ShowAnimation => Type == ModelType.Animation;
 
         [StructLayout(LayoutKind.Sequential)]
-        [NativeMarshalling(typeof(InternalOptionsMarshaler))]
+        [NativeMarshalling(typeof(InternalOptionsMarshaller))]
         internal struct InternalOptions
         {
             public ModelType Type;
@@ -421,8 +421,8 @@ namespace FlaxEditor.Content.Import
             public int ObjectIndex;
         }
 
-        [CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaler))]
-        internal static class InternalOptionsMarshaler
+        [CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaller))]
+        internal static class InternalOptionsMarshaller
         {
             [Unmanaged]
             [StructLayout(LayoutKind.Sequential)]
@@ -442,7 +442,6 @@ namespace FlaxEditor.Content.Import
                 public byte ImportVertexColors;
                 public byte ImportBlendShapes;
                 public int LightmapUVsSource;
-                //[MarshalAs(UnmanagedType.LPWStr)]
                 public IntPtr CollisionMeshesPrefix;
 
                 // Transform
@@ -459,8 +458,8 @@ namespace FlaxEditor.Content.Import
                 public float SamplingRate;
                 public byte SkipEmptyCurves;
                 public byte OptimizeKeyframes;
+                public byte ImportScaleTracks;
                 public byte EnableRootMotion;
-                //[MarshalAs(UnmanagedType.LPWStr)]
                 public IntPtr RootNodeName;
 
                 // Level Of Detail
@@ -514,6 +513,7 @@ namespace FlaxEditor.Content.Import
                     SamplingRate = managed.SamplingRate,
                     SkipEmptyCurves = managed.SkipEmptyCurves,
                     OptimizeKeyframes = managed.OptimizeKeyframes,
+                    ImportScaleTracks = managed.ImportScaleTracks,
                     EnableRootMotion = managed.EnableRootMotion,
                     RootNodeName = ManagedString.ToManaged(managed.RootNodeName),
                     GenerateLODs = managed.GenerateLODs,
@@ -557,6 +557,7 @@ namespace FlaxEditor.Content.Import
                     SamplingRate = managed.SamplingRate,
                     SkipEmptyCurves = managed.SkipEmptyCurves,
                     OptimizeKeyframes = managed.OptimizeKeyframes,
+                    ImportScaleTracks = managed.ImportScaleTracks,
                     EnableRootMotion = managed.EnableRootMotion,
                     RootNodeName = ManagedString.ToNative(managed.RootNodeName),
                     GenerateLODs = managed.GenerateLODs,
diff --git a/Source/Editor/Content/Import/TextureImportEntry.cs b/Source/Editor/Content/Import/TextureImportEntry.cs
index ed3216f6b..ce9a94510 100644
--- a/Source/Editor/Content/Import/TextureImportEntry.cs
+++ b/Source/Editor/Content/Import/TextureImportEntry.cs
@@ -299,7 +299,7 @@ namespace FlaxEditor.Content.Import
         public List<SpriteInfo> Sprites = new List<SpriteInfo>();
 
         [StructLayout(LayoutKind.Sequential)]
-        [NativeMarshalling(typeof(InternalOptionsMarshaler))]
+        [NativeMarshalling(typeof(InternalOptionsMarshaller))]
         internal struct InternalOptions
         {
             public TextureFormatType Type;
@@ -321,8 +321,8 @@ namespace FlaxEditor.Content.Import
             public string[] SpriteNames;
         }
 
-        [CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaler))]
-        internal static class InternalOptionsMarshaler
+        [CustomMarshaller(typeof(InternalOptions), MarshalMode.Default, typeof(InternalOptionsMarshaller))]
+        internal static class InternalOptionsMarshaller
         {
             [StructLayout(LayoutKind.Sequential)]
             internal struct InternalOptionsNative
diff --git a/Source/Engine/Animations/AnimationGraph.cs b/Source/Engine/Animations/AnimationGraph.cs
index baf3e1b4c..46b3acfc1 100644
--- a/Source/Engine/Animations/AnimationGraph.cs
+++ b/Source/Engine/Animations/AnimationGraph.cs
@@ -45,7 +45,7 @@ namespace FlaxEngine
             /// The node evaluation context structure.
             /// </summary>
             [StructLayout(LayoutKind.Sequential)]
-            [NativeMarshalling(typeof(ContextMarshaler))]
+            [NativeMarshalling(typeof(ContextMarshaller))]
             public struct Context
             {
                 /// <summary>
@@ -94,8 +94,8 @@ namespace FlaxEngine
                 public AnimatedModel Instance;
             }
 
-            [CustomMarshaller(typeof(Context), MarshalMode.Default, typeof(ContextMarshaler))]
-            internal static class ContextMarshaler
+            [CustomMarshaller(typeof(Context), MarshalMode.Default, typeof(ContextMarshaller))]
+            internal static class ContextMarshaller
             {
                 [StructLayout(LayoutKind.Sequential)]
                 public struct ContextNative