From 7f33a13ff9ff6b79437002ad7c2da5122d2f76be Mon Sep 17 00:00:00 2001
From: Dmitry Stepanov <xcoolmrdimas@gmail.com>
Date: Thu, 28 May 2026 21:50:17 +0300
Subject: [PATCH] merged `TypeUuidProvider` trait into `Reflect`

---
 editor/src/asset/creator.rs                   |   3 +-
 editor/src/asset/item.rs                      |  10 +-
 editor/src/asset/menu.rs                      |  17 +-
 editor/src/asset/preview/cache.rs             |   3 +-
 editor/src/asset/preview/mod.rs               |  22 +-
 editor/src/asset/selection.rs                 |   6 +-
 editor/src/asset/selector.rs                  |  28 +--
 editor/src/audio/bus.rs                       |  27 +--
 editor/src/interaction/gizmo/move_gizmo.rs    |   3 +
 editor/src/interaction/gizmo/rotate_gizmo.rs  |   5 +
 editor/src/interaction/gizmo/scale_gizmo.rs   |   5 +
 editor/src/interaction/mod.rs                 |  16 +-
 editor/src/interaction/move_mode.rs           |  17 +-
 editor/src/interaction/navmesh/mod.rs         |  19 +-
 editor/src/interaction/plane.rs               |   4 +-
 editor/src/interaction/rotate_mode.rs         |  12 +-
 editor/src/interaction/scale_mode.rs          |  12 +-
 editor/src/interaction/select_mode.rs         |  12 +-
 editor/src/interaction/terrain.rs             |  23 +-
 editor/src/lib.rs                             |  22 +-
 editor/src/light.rs                           |   1 +
 editor/src/menu/create.rs                     |   2 +-
 editor/src/menu/edit.rs                       |   2 +-
 editor/src/menu/file.rs                       |   3 +-
 editor/src/menu/help.rs                       |   2 +-
 editor/src/menu/mod.rs                        |   2 +-
 editor/src/menu/ui.rs                         |   2 +-
 editor/src/menu/utils.rs                      |   2 +-
 editor/src/menu/view.rs                       |   2 +-
 editor/src/message.rs                         |   2 +-
 editor/src/overlay.rs                         |   3 +-
 editor/src/plugins/absm/blendspace.rs         |  17 +-
 editor/src/plugins/absm/canvas.rs             |  11 +-
 editor/src/plugins/absm/connection.rs         |   9 +-
 editor/src/plugins/absm/mod.rs                |   4 +-
 editor/src/plugins/absm/node.rs               |  17 +-
 editor/src/plugins/absm/segment.rs            |   1 +
 editor/src/plugins/absm/selectable.rs         |   1 +
 editor/src/plugins/absm/socket.rs             |  12 +-
 .../src/plugins/absm/state_graph/context.rs   |   2 +-
 .../src/plugins/absm/state_viewer/context.rs  |   2 +-
 editor/src/plugins/absm/transition.rs         |   8 +-
 editor/src/plugins/animation/mod.rs           |   3 +-
 editor/src/plugins/animation/ruler.rs         |   9 +-
 editor/src/plugins/animation/thumb.rs         |   8 +-
 editor/src/plugins/animation/track.rs         |   9 +-
 editor/src/plugins/collider/mod.rs            |  32 ++-
 editor/src/plugins/collider/panel.rs          |   4 +-
 editor/src/plugins/curve_editor.rs            |   3 +-
 .../src/plugins/inspector/editors/dyntype.rs  |  12 +-
 editor/src/plugins/inspector/editors/font.rs  |  10 +-
 .../src/plugins/inspector/editors/handle.rs   |   6 +-
 .../src/plugins/inspector/editors/resource.rs |  13 +-
 .../src/plugins/inspector/editors/script.rs   |  12 +-
 .../plugins/inspector/editors/shader/field.rs |   6 +-
 .../plugins/inspector/editors/shader/mod.rs   |   6 +-
 .../inspector/editors/spritesheet/mod.rs      |   9 +-
 .../inspector/editors/spritesheet/window.rs   |   9 +-
 .../src/plugins/inspector/editors/surface.rs  |   6 +-
 .../src/plugins/inspector/editors/texture.rs  |   9 +-
 editor/src/plugins/inspector/mod.rs           |   3 +-
 editor/src/plugins/material/editor.rs         |  11 +-
 editor/src/plugins/probe.rs                   |  15 +-
 editor/src/plugins/ragdoll.rs                 |   3 +-
 editor/src/plugins/settings.rs                |   3 +-
 editor/src/plugins/stats.rs                   |   3 +-
 editor/src/plugins/tilemap/autotile.rs        |   9 +-
 editor/src/plugins/tilemap/brush_macro.rs     |   4 +-
 editor/src/plugins/tilemap/collider_editor.rs |   2 +-
 editor/src/plugins/tilemap/commands.rs        |  12 +-
 editor/src/plugins/tilemap/handle_editor.rs   |   9 +-
 editor/src/plugins/tilemap/handle_field.rs    |   4 +-
 .../src/plugins/tilemap/interaction_mode.rs   |  18 +-
 editor/src/plugins/tilemap/macro_inspector.rs |   1 +
 editor/src/plugins/tilemap/mod.rs             |   7 +-
 editor/src/plugins/tilemap/palette.rs         |   5 +-
 editor/src/plugins/tilemap/panel_preview.rs   |   5 +-
 .../src/plugins/tilemap/tile_bounds_editor.rs |   6 +-
 editor/src/plugins/tilemap/tile_inspector.rs  |   9 +-
 .../src/plugins/tilemap/tile_prop_editor.rs   |   5 +-
 editor/src/plugins/tilemap/wfc.rs             |   8 +-
 editor/src/scene/clipboard.rs                 |   2 +-
 editor/src/scene/commands/mod.rs              |   1 +
 editor/src/scene/container.rs                 |   6 +-
 editor/src/scene/mod.rs                       |   4 +-
 editor/src/scene/nullscene.rs                 |   1 +
 editor/src/scene/property.rs                  |  16 +-
 editor/src/scene/selector.rs                  |  11 +-
 editor/src/settings/build.rs                  |   1 +
 editor/src/settings/camera.rs                 |   1 +
 editor/src/settings/debugging.rs              |   1 +
 editor/src/settings/general.rs                |   9 +-
 editor/src/settings/graphics.rs               |   1 +
 editor/src/settings/keys.rs                   |   2 +
 editor/src/settings/log.rs                    |   1 +
 editor/src/settings/mod.rs                    |   1 +
 editor/src/settings/model.rs                  |   1 +
 editor/src/settings/move_mode.rs              |   1 +
 editor/src/settings/navmesh.rs                |   1 +
 editor/src/settings/rotate_mode.rs            |   1 +
 editor/src/settings/selection.rs              |   1 +
 editor/src/settings/windows.rs                |   1 +
 editor/src/test/macros.rs                     |   5 +-
 editor/src/test/utils.rs                      |   3 +-
 editor/src/ui_scene/clipboard.rs              |   2 +-
 editor/src/ui_scene/commands/mod.rs           |   1 +
 editor/src/ui_scene/interaction/mod.rs        |  12 +-
 editor/src/ui_scene/interaction/move_mode.rs  |  15 +-
 editor/src/ui_scene/menu.rs                   |   2 +-
 editor/src/world/item.rs                      |   5 +-
 editor/src/world/menu.rs                      |   2 +-
 fyrox-animation/src/container.rs              |   3 +
 fyrox-animation/src/lib.rs                    |  20 +-
 fyrox-animation/src/machine/layer.rs          |   1 +
 fyrox-animation/src/machine/mask.rs           |   1 +
 fyrox-animation/src/machine/mod.rs            |   1 +
 fyrox-animation/src/machine/node/blend.rs     |  19 +-
 .../src/machine/node/blendspace.rs            |  11 +-
 fyrox-animation/src/machine/node/mod.rs       |   2 +
 fyrox-animation/src/machine/node/play.rs      |   1 +
 fyrox-animation/src/machine/parameter.rs      |  11 +-
 fyrox-animation/src/machine/state.rs          |  19 +-
 fyrox-animation/src/machine/transition.rs     |  18 +-
 fyrox-animation/src/signal.rs                 |   1 +
 fyrox-animation/src/spritesheet/mod.rs        |  27 +--
 fyrox-animation/src/spritesheet/signal.rs     |   4 +-
 fyrox-animation/src/track.rs                  |   2 +
 fyrox-animation/src/value.rs                  |   4 +
 fyrox-build-tools/src/build.rs                |   2 +-
 fyrox-build-tools/src/export/mod.rs           |   1 +
 fyrox-build-tools/src/lib.rs                  |  14 +-
 fyrox-core-derive/src/lib.rs                  |  10 -
 fyrox-core-derive/src/reflect.rs              |  19 ++
 fyrox-core-derive/src/reflect/args.rs         |   2 +
 fyrox-core-derive/src/uuid.rs                 |  48 -----
 fyrox-core-derive/tests/it/main.rs            |   1 -
 fyrox-core-derive/tests/it/reflect.rs         |  25 ++-
 fyrox-core-derive/tests/it/uuid.rs            |  32 ---
 fyrox-core/src/color.rs                       |   5 +-
 fyrox-core/src/color_gradient.rs              |   2 +
 fyrox-core/src/dyntype.rs                     |  21 +-
 fyrox-core/src/lib.rs                         |   7 +-
 fyrox-core/src/log.rs                         |   1 +
 fyrox-core/src/math/mod.rs                    |   9 +-
 fyrox-core/src/pool/handle.rs                 |  26 +--
 fyrox-core/src/pool/mod.rs                    |   4 +
 fyrox-core/src/reflect/array.rs               |   6 +-
 fyrox-core/src/reflect/impls.rs               | 198 ++++++++++++++----
 fyrox-core/src/reflect/macros.rs              |   6 +-
 fyrox-core/src/reflect/map.rs                 |   3 +-
 fyrox-core/src/reflect/mod.rs                 |  42 +++-
 fyrox-core/src/sstorage.rs                    |   4 -
 fyrox-core/src/type_traits.rs                 | 124 -----------
 fyrox-core/src/variable.rs                    |  14 +-
 fyrox-graph/src/constructor.rs                |   7 +-
 fyrox-graph/src/lib.rs                        |  20 +-
 fyrox-graphics/src/gpu_program.rs             |  25 +--
 fyrox-graphics/src/lib.rs                     |  96 ++-------
 fyrox-impl/src/engine/mod.rs                  |  47 +++--
 fyrox-impl/src/engine/task.rs                 |   7 +-
 fyrox-impl/src/plugin/mod.rs                  |   8 +-
 fyrox-impl/src/renderer/settings.rs           |  12 +-
 fyrox-impl/src/resource/curve/loader.rs       |   5 +-
 fyrox-impl/src/resource/curve/mod.rs          |  16 +-
 fyrox-impl/src/resource/fbx/mod.rs            |   3 +-
 fyrox-impl/src/resource/gltf/material.rs      |   3 +-
 fyrox-impl/src/resource/gltf/mod.rs           |   6 +-
 fyrox-impl/src/resource/model/loader.rs       |   5 +-
 fyrox-impl/src/resource/model/mod.rs          |  18 +-
 fyrox-impl/src/scene/animation/absm.rs        |  14 +-
 fyrox-impl/src/scene/animation/mod.rs         |  14 +-
 fyrox-impl/src/scene/base.rs                  |  25 ++-
 fyrox-impl/src/scene/camera.rs                |  26 +--
 fyrox-impl/src/scene/collider.rs              |  35 ++--
 fyrox-impl/src/scene/decal.rs                 |  14 +-
 fyrox-impl/src/scene/dim2/collider.rs         |  31 +--
 fyrox-impl/src/scene/dim2/joint.rs            |  24 +--
 fyrox-impl/src/scene/dim2/physics.rs          |   1 +
 fyrox-impl/src/scene/dim2/rectangle.rs        |  14 +-
 fyrox-impl/src/scene/dim2/rigidbody.rs        |  14 +-
 fyrox-impl/src/scene/graph/mod.rs             |  10 +-
 fyrox-impl/src/scene/graph/physics.rs         |   6 +-
 fyrox-impl/src/scene/joint.rs                 |  26 +--
 fyrox-impl/src/scene/light/directional.rs     |  19 +-
 fyrox-impl/src/scene/light/mod.rs             |   1 +
 fyrox-impl/src/scene/light/point.rs           |  14 +-
 fyrox-impl/src/scene/light/spot.rs            |  14 +-
 fyrox-impl/src/scene/mesh/buffer.rs           |   6 +
 fyrox-impl/src/scene/mesh/mod.rs              |  20 +-
 fyrox-impl/src/scene/mesh/surface.rs          |  20 +-
 fyrox-impl/src/scene/mod.rs                   |  19 +-
 fyrox-impl/src/scene/navmesh.rs               |  15 +-
 fyrox-impl/src/scene/node/container.rs        |   1 +
 fyrox-impl/src/scene/node/mod.rs              |  14 +-
 .../src/scene/particle_system/emitter/base.rs |   1 +
 .../scene/particle_system/emitter/cuboid.rs   |   1 +
 .../scene/particle_system/emitter/cylinder.rs |   1 +
 .../src/scene/particle_system/emitter/mod.rs  |   5 +-
 .../scene/particle_system/emitter/sphere.rs   |   1 +
 fyrox-impl/src/scene/particle_system/mod.rs   |  18 +-
 fyrox-impl/src/scene/pivot.rs                 |  14 +-
 fyrox-impl/src/scene/probe.rs                 |  22 +-
 fyrox-impl/src/scene/ragdoll.rs               |  18 +-
 fyrox-impl/src/scene/rigidbody.rs             |  23 +-
 fyrox-impl/src/scene/skybox.rs                |   5 +-
 fyrox-impl/src/scene/sound/listener.rs        |  14 +-
 fyrox-impl/src/scene/sound/mod.rs             |  14 +-
 fyrox-impl/src/scene/sprite.rs                |  14 +-
 .../src/scene/terrain/brushstroke/mod.rs      |  12 +-
 fyrox-impl/src/scene/terrain/geometry.rs      |   2 +-
 fyrox-impl/src/scene/terrain/mod.rs           |  22 +-
 fyrox-impl/src/scene/tilemap/brush.rs         |  14 +-
 fyrox-impl/src/scene/tilemap/data.rs          |  13 +-
 fyrox-impl/src/scene/tilemap/mod.rs           |  16 +-
 fyrox-impl/src/scene/tilemap/property.rs      |  17 +-
 fyrox-impl/src/scene/tilemap/tile_collider.rs |  23 +-
 fyrox-impl/src/scene/tilemap/tile_source.rs   |   6 +-
 fyrox-impl/src/scene/tilemap/tileset.rs       |  21 +-
 fyrox-impl/src/scene/tilemap/transform.rs     |   1 +
 fyrox-impl/src/scene/tilemap/update.rs        |   3 +-
 fyrox-impl/src/scene/transform.rs             |   1 +
 fyrox-impl/src/script/constructor.rs          |   7 +-
 fyrox-impl/src/script/mod.rs                  |  52 ++---
 fyrox-impl/src/utils/lightmap.rs              |   4 +-
 fyrox-impl/src/utils/navmesh.rs               |   1 +
 fyrox-material/src/lib.rs                     |  27 +--
 fyrox-material/src/loader.rs                  |   5 +-
 fyrox-material/src/shader/loader.rs           |   5 +-
 fyrox-material/src/shader/mod.rs              |  23 +-
 fyrox-resource/src/builtin.rs                 |  13 +-
 fyrox-resource/src/constructor.rs             |  20 +-
 fyrox-resource/src/graph.rs                   |   3 +-
 fyrox-resource/src/lib.rs                     |  65 +++---
 fyrox-resource/src/loader.rs                  |  10 +-
 fyrox-resource/src/manager.rs                 |  39 ++--
 fyrox-resource/src/metadata.rs                |   3 +-
 fyrox-resource/src/registry.rs                |   5 +-
 fyrox-resource/src/state.rs                   |  40 ++--
 fyrox-resource/src/untyped.rs                 |  38 ++--
 fyrox-scripts/src/camera.rs                   |   4 +-
 fyrox-scripts/src/lib.rs                      |   2 +-
 fyrox-sound/src/buffer/generic.rs             |   2 +
 fyrox-sound/src/buffer/loader.rs              |   5 +-
 fyrox-sound/src/buffer/mod.rs                 |  15 +-
 fyrox-sound/src/buffer/streaming.rs           |   1 +
 fyrox-sound/src/bus.rs                        |   2 +
 fyrox-sound/src/context.rs                    |  10 +-
 fyrox-sound/src/dsp/filters.rs                |   4 +-
 fyrox-sound/src/effects/filter.rs             |   8 +-
 fyrox-sound/src/effects/mod.rs                |   6 +-
 fyrox-sound/src/effects/reverb.rs             |   1 +
 fyrox-sound/src/listener.rs                   |   1 +
 fyrox-sound/src/renderer/hrtf.rs              |  15 +-
 fyrox-sound/src/renderer/mod.rs               |   4 +-
 fyrox-sound/src/source.rs                     |   5 +-
 fyrox-texture/src/lib.rs                      |  59 ++----
 fyrox-texture/src/loader.rs                   |   5 +-
 fyrox-ui/src/absm.rs                          |  32 +--
 fyrox-ui/src/alignment.rs                     |   7 +-
 fyrox-ui/src/animation.rs                     |  12 +-
 fyrox-ui/src/bit.rs                           |  20 +-
 fyrox-ui/src/border.rs                        |   6 +-
 fyrox-ui/src/brush.rs                         |   7 +-
 fyrox-ui/src/build.rs                         |   8 +-
 fyrox-ui/src/button.rs                        |   9 +-
 fyrox-ui/src/canvas.rs                        |   9 +-
 fyrox-ui/src/check_box.rs                     |   5 +-
 fyrox-ui/src/color/gradient.rs                |  17 +-
 fyrox-ui/src/color/mod.rs                     |  36 ++--
 fyrox-ui/src/control.rs                       |  27 ++-
 fyrox-ui/src/curve/key.rs                     |   2 +
 fyrox-ui/src/curve/mod.rs                     |  13 +-
 fyrox-ui/src/decorator.rs                     |  11 +-
 fyrox-ui/src/dock/mod.rs                      |   9 +-
 fyrox-ui/src/dock/tile.rs                     |  11 +-
 fyrox-ui/src/dropdown_list.rs                 |  11 +-
 fyrox-ui/src/dropdown_menu.rs                 |   6 +-
 fyrox-ui/src/expander.rs                      |   9 +-
 fyrox-ui/src/file_browser/dialog.rs           |   6 +-
 fyrox-ui/src/file_browser/field.rs            |   9 +-
 fyrox-ui/src/file_browser/filter.rs           |   2 +
 fyrox-ui/src/file_browser/menu.rs             |  12 +-
 fyrox-ui/src/file_browser/mod.rs              |   7 +-
 fyrox-ui/src/file_browser/selector.rs         |  12 +-
 fyrox-ui/src/font/loader.rs                   |   5 +-
 fyrox-ui/src/font/mod.rs                      |  12 +-
 fyrox-ui/src/formatted_text.rs                |   7 +-
 fyrox-ui/src/formatted_text/run.rs            |   7 +-
 fyrox-ui/src/grid.rs                          |  15 +-
 fyrox-ui/src/image.rs                         |   6 +-
 fyrox-ui/src/input.rs                         |   8 +-
 fyrox-ui/src/inspector/editors/array.rs       |  12 +-
 fyrox-ui/src/inspector/editors/collection.rs  |  22 +-
 fyrox-ui/src/inspector/editors/enumeration.rs |  30 +--
 fyrox-ui/src/inspector/editors/inherit.rs     |   8 +-
 fyrox-ui/src/inspector/editors/mod.rs         |   1 +
 fyrox-ui/src/inspector/editors/style.rs       |  12 +-
 .../src/inspector/editors/texture_slice.rs    |  13 +-
 fyrox-ui/src/inspector/mod.rs                 |  15 +-
 fyrox-ui/src/key.rs                           |  17 +-
 fyrox-ui/src/lib.rs                           |  25 ++-
 fyrox-ui/src/list_view.rs                     |  18 +-
 fyrox-ui/src/loader.rs                        |   8 +-
 fyrox-ui/src/matrix.rs                        |  26 +--
 fyrox-ui/src/menu.rs                          |  30 ++-
 fyrox-ui/src/message.rs                       |  10 +-
 fyrox-ui/src/messagebox.rs                    |   9 +-
 fyrox-ui/src/navigation.rs                    |   9 +-
 fyrox-ui/src/nine_patch.rs                    |  11 +-
 fyrox-ui/src/node/container.rs                |   1 +
 fyrox-ui/src/node/mod.rs                      |  16 +-
 fyrox-ui/src/numeric.rs                       |  20 +-
 fyrox-ui/src/path.rs                          |  12 +-
 fyrox-ui/src/popup.rs                         |   6 +-
 fyrox-ui/src/progress_bar.rs                  |   8 +-
 fyrox-ui/src/range.rs                         |  19 +-
 fyrox-ui/src/rect.rs                          |  22 +-
 fyrox-ui/src/screen.rs                        |  12 +-
 fyrox-ui/src/scroll_bar.rs                    |   9 +-
 fyrox-ui/src/scroll_panel.rs                  |   9 +-
 fyrox-ui/src/scroll_viewer.rs                 |  11 +-
 fyrox-ui/src/searchbar.rs                     |   9 +-
 fyrox-ui/src/selector.rs                      |   9 +-
 fyrox-ui/src/stack_panel.rs                   |   9 +-
 fyrox-ui/src/style/mod.rs                     |  22 +-
 fyrox-ui/src/style/resource.rs                |  10 +-
 fyrox-ui/src/tab_control.rs                   |  12 +-
 fyrox-ui/src/text.rs                          |  10 +-
 fyrox-ui/src/text_box.rs                      |  16 +-
 fyrox-ui/src/thickness.rs                     |   1 +
 fyrox-ui/src/thumb.rs                         |   9 +-
 fyrox-ui/src/toggle.rs                        |   6 +-
 fyrox-ui/src/tree.rs                          |  16 +-
 fyrox-ui/src/utils.rs                         |   3 +-
 fyrox-ui/src/uuid.rs                          |  11 +-
 fyrox-ui/src/vec.rs                           |  39 +---
 fyrox-ui/src/vector_image.rs                  |  11 +-
 fyrox-ui/src/widget.rs                        |   2 +
 fyrox-ui/src/window.rs                        |  12 +-
 fyrox-ui/src/wrap_panel.rs                    |   9 +-
 project-manager/src/main.rs                   |   2 +-
 project-manager/src/settings.rs               |   1 +
 template-core/src/lib.rs                      |   6 +-
 343 files changed, 1808 insertions(+), 2262 deletions(-)
 delete mode 100644 fyrox-core-derive/src/uuid.rs
 delete mode 100644 fyrox-core-derive/tests/it/uuid.rs
 delete mode 100644 fyrox-core/src/type_traits.rs

diff --git a/editor/src/asset/creator.rs b/editor/src/asset/creator.rs
index d9c60670d..0b04df38c 100644
--- a/editor/src/asset/creator.rs
+++ b/editor/src/asset/creator.rs
@@ -24,7 +24,7 @@ use crate::{
             manager::ResourceManager,
             untyped::{ResourceKind, UntypedResource},
         },
-        core::{log::Log, make_pretty_type_name, pool::Handle, SafeLock, Uuid},
+        core::{log::Log, make_pretty_type_name, pool::Handle, SafeLock},
         engine::Engine,
         gui::{
             button::{ButtonBuilder, ButtonMessage},
@@ -43,6 +43,7 @@ use crate::{
     message::MessageSender,
     Message,
 };
+use fyrox::core::uuid::Uuid;
 use fyrox::gui::button::Button;
 use fyrox::gui::list_view::ListView;
 use fyrox::gui::text_box::TextBox;
diff --git a/editor/src/asset/item.rs b/editor/src/asset/item.rs
index 3566eb9ef..d88f9a9f4 100644
--- a/editor/src/asset/item.rs
+++ b/editor/src/asset/item.rs
@@ -26,8 +26,7 @@ use crate::{
         asset::{manager::ResourceManager, untyped::UntypedResource, Resource, TypedResourceData},
         core::{
             algebra::Vector2, color::Color, futures::executor::block_on, make_relative_path,
-            parking_lot::lock_api::Mutex, pool::Handle, reflect::prelude::*, uuid_provider,
-            visitor::prelude::*,
+            parking_lot::lock_api::Mutex, pool::Handle, reflect::prelude::*, visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -81,7 +80,10 @@ impl MessageData for AssetItemMessage {}
 
 #[allow(dead_code)]
 #[derive(Debug, Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "54f7d9c1-e707-4c8c-a5c9-3fc5cc80b545"
+)]
 pub struct AssetItem {
     widget: Widget,
     pub path: PathBuf,
@@ -254,8 +256,6 @@ impl DerefMut for AssetItem {
     }
 }
 
-uuid_provider!(AssetItem = "54f7d9c1-e707-4c8c-a5c9-3fc5cc80b545");
-
 impl Control for AssetItem {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         drawing_context.push_rect_filled(&self.bounding_rect(), None);
diff --git a/editor/src/asset/menu.rs b/editor/src/asset/menu.rs
index f02cfb562..41af9adf3 100644
--- a/editor/src/asset/menu.rs
+++ b/editor/src/asset/menu.rs
@@ -24,8 +24,7 @@ use crate::{
         asset::manager::ResourceManager,
         core::{
             futures::executor::block_on, log::Log, ok_or_return, pool::Handle,
-            pool::HandlesVecExtension, reflect::prelude::*, type_traits::prelude::*,
-            visitor::prelude::*, SafeLock,
+            pool::HandlesVecExtension, reflect::prelude::*, visitor::prelude::*, SafeLock,
         },
         engine::Engine,
         graph::SceneGraph,
@@ -62,9 +61,9 @@ use std::{
     path::PathBuf,
 };
 
-#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider)]
+#[derive(Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
-#[type_uuid(id = "8c9934ad-b4e1-4c68-9876-f253e34c6667")]
+#[reflect(type_uuid = "8c9934ad-b4e1-4c68-9876-f253e34c6667")]
 struct AssetRenameDialog {
     window: Window,
     name_field: Handle<TextBox>,
@@ -437,18 +436,18 @@ impl AssetItemContextMenu {
                                     let loaders = engine.resource_manager.state().loaders.clone();
                                     let loaders = loaders.lock();
 
-                                    if let Some(loader) =
-                                        loaders.loader_for_data_type(data.type_uuid())
-                                    {
+                                    if let Some(loader) = loaders.loader_for_data_type(
+                                        data.inner_ref().type_info_ref().type_uuid,
+                                    ) {
                                         if let Some(extension) = loader.extensions().first() {
-                                            if data.can_be_saved() {
+                                            if data.inner_ref().can_be_saved() {
                                                 let final_copy_path = asset::make_unique_path(
                                                     &registry_path,
                                                     path.to_str().unwrap(),
                                                     extension,
                                                 );
                                                 drop(loaders);
-                                                if data.save(&final_copy_path).is_ok() {
+                                                if data.inner_mut().save(&final_copy_path).is_ok() {
                                                     engine
                                                         .resource_manager
                                                         .request_untyped(&final_copy_path);
diff --git a/editor/src/asset/preview/cache.rs b/editor/src/asset/preview/cache.rs
index e5cae74bd..0d9b9ff7a 100644
--- a/editor/src/asset/preview/cache.rs
+++ b/editor/src/asset/preview/cache.rs
@@ -25,7 +25,7 @@ use crate::{
     },
     fyrox::{
         asset::untyped::UntypedResource,
-        core::{futures::executor::block_on, parking_lot::Mutex, pool::Handle, SafeLock, Uuid},
+        core::{futures::executor::block_on, parking_lot::Mutex, pool::Handle, SafeLock},
         engine::Engine,
         fxhash::FxHashMap,
         gui::UiNode,
@@ -33,6 +33,7 @@ use crate::{
     load_image,
 };
 use fyrox::core::pool::ObjectOrVariant;
+use fyrox::core::uuid::Uuid;
 use std::{
     collections::VecDeque,
     sync::{mpsc::Receiver, Arc},
diff --git a/editor/src/asset/preview/mod.rs b/editor/src/asset/preview/mod.rs
index 3511f9906..43aad5007 100644
--- a/editor/src/asset/preview/mod.rs
+++ b/editor/src/asset/preview/mod.rs
@@ -29,7 +29,6 @@ use crate::{
             color::Color,
             pool::Handle,
             uuid::Uuid,
-            TypeUuidProvider,
         },
         engine::{Engine, GraphicsContext},
         fxhash::FxHashMap,
@@ -63,6 +62,7 @@ use crate::{
     },
     load_image,
 };
+use fyrox::core::reflect::prelude::*;
 use fyrox::renderer::ui_renderer::UiRenderInfo;
 use image::{ColorType, GenericImage, Rgba};
 
@@ -74,16 +74,16 @@ pub struct AssetPreviewGeneratorsCollection {
 impl AssetPreviewGeneratorsCollection {
     pub fn new() -> Self {
         let mut this = Self::default();
-        this.add(Texture::type_uuid(), TexturePreview);
-        this.add(Model::type_uuid(), ModelPreview);
-        this.add(SoundBuffer::type_uuid(), SoundPreview);
-        this.add(Shader::type_uuid(), ShaderPreview);
-        this.add(Material::type_uuid(), MaterialPreview);
-        this.add(HrirSphereResourceData::type_uuid(), HrirPreview);
-        this.add(CurveResourceState::type_uuid(), CurvePreview);
-        this.add(Font::type_uuid(), FontPreview);
-        this.add(UserInterface::type_uuid(), UserInterfacePreview);
-        this.add(SurfaceData::type_uuid(), SurfaceDataPreview);
+        this.add(Texture::type_info().type_uuid, TexturePreview);
+        this.add(Model::type_info().type_uuid, ModelPreview);
+        this.add(SoundBuffer::type_info().type_uuid, SoundPreview);
+        this.add(Shader::type_info().type_uuid, ShaderPreview);
+        this.add(Material::type_info().type_uuid, MaterialPreview);
+        this.add(HrirSphereResourceData::type_info().type_uuid, HrirPreview);
+        this.add(CurveResourceState::type_info().type_uuid, CurvePreview);
+        this.add(Font::type_info().type_uuid, FontPreview);
+        this.add(UserInterface::type_info().type_uuid, UserInterfacePreview);
+        this.add(SurfaceData::type_info().type_uuid, SurfaceDataPreview);
         this
     }
 
diff --git a/editor/src/asset/selection.rs b/editor/src/asset/selection.rs
index 420eef481..71c282372 100644
--- a/editor/src/asset/selection.rs
+++ b/editor/src/asset/selection.rs
@@ -62,7 +62,7 @@ impl SaveResourceCommand {
     fn save(&self) {
         let mut guard = self.resource.lock();
         if let Some(data) = guard.state.data_mut() {
-            Log::verify(data.save(&self.path));
+            Log::verify(data.inner_mut().save(&self.path));
         }
     }
 }
@@ -218,7 +218,7 @@ impl SelectionContainer for AssetSelection {
                 if !self.resource_manager.is_built_in_resource(&resource) {
                     if let Some(command) = make_command(args, move |_| {
                         let mut guard = resource.lock();
-                        let data = &mut **guard.state.data_mut()?;
+                        let data = guard.state.data_mut()?.inner_mut();
                         // SAFETY: This is safe, because the closure owns its own copy of
                         // resource strong ref, and the entity getter is used only once per
                         // do/undo/redo calls.
@@ -277,7 +277,7 @@ impl SelectionContainer for AssetSelection {
                             value,
                             move |_| {
                                 let mut guard = resource.lock();
-                                let data = &mut **guard.state.data_mut()?;
+                                let data = guard.state.data_mut()?.inner_mut();
                                 // SAFETY: This is safe, because the closure owns its own copy of
                                 // resource strong ref, and the entity getter is used only once per
                                 // do/undo/redo calls.
diff --git a/editor/src/asset/selector.rs b/editor/src/asset/selector.rs
index 338186f6d..d94802312 100644
--- a/editor/src/asset/selector.rs
+++ b/editor/src/asset/selector.rs
@@ -31,7 +31,6 @@ use crate::{
             pool::{Handle, HandlesVecExtension},
             reflect::prelude::*,
             some_or_continue,
-            type_traits::prelude::*,
             visitor::prelude::*,
             PhantomDataSendSync, SafeLock,
         },
@@ -79,8 +78,8 @@ pub enum AssetSelectorMessage {
 }
 impl MessageData for AssetSelectorMessage {}
 
-#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
-#[type_uuid(id = "aa4f0726-8d25-4c90-add1-92ba392310c6")]
+#[derive(Clone, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "aa4f0726-8d25-4c90-add1-92ba392310c6")]
 struct Item {
     pub widget: Widget,
     image: Handle<Image>,
@@ -230,8 +229,8 @@ impl ItemBuilder {
     }
 }
 
-#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
-#[type_uuid(id = "970bb83b-51e8-48e7-8050-f97bf0ac470b")]
+#[derive(Clone, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "970bb83b-51e8-48e7-8050-f97bf0ac470b")]
 pub struct AssetSelector {
     pub widget: Widget,
     list_view: Handle<ListView>,
@@ -321,10 +320,14 @@ impl<'a> AssetSelectorBuilder<'a> {
 
         supported_resource_paths.extend(state.built_in_resources.values().filter_map(|res| {
             let resource_state = res.resource.lock();
-            if self
-                .asset_types
-                .contains(&resource_state.state.data_ref()?.type_uuid())
-            {
+            if self.asset_types.contains(
+                &resource_state
+                    .state
+                    .data_ref()?
+                    .inner_ref()
+                    .type_info_ref()
+                    .type_uuid,
+            ) {
                 Some(res.id.clone())
             } else {
                 None
@@ -384,8 +387,8 @@ impl<'a> AssetSelectorBuilder<'a> {
     }
 }
 
-#[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
-#[type_uuid(id = "c348ad3d-52a6-40ad-a5e4-bf63fefe1906")]
+#[derive(Clone, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "c348ad3d-52a6-40ad-a5e4-bf63fefe1906")]
 pub struct AssetSelectorWindow {
     pub window: Window,
     selector: Handle<AssetSelector>,
@@ -571,7 +574,7 @@ impl<'a> AssetSelectorWindowBuilder<'a> {
                 .unwrap_or_default()
                 .into(),
         )
-        .with_asset_types(vec![<T as TypeUuidProvider>::type_uuid()])
+        .with_asset_types(vec![<T as Reflect>::type_info().type_uuid])
         .build(icon_request_sender, resource_manager, &mut ui.build_ctx());
 
         ui.send(
@@ -588,6 +591,7 @@ impl<'a> AssetSelectorWindowBuilder<'a> {
 }
 
 #[derive(Reflect, Visit, Debug)]
+#[reflect(type_uuid = "7839eb64-1e6e-4e40-a8fb-53c9d0945b16")]
 pub struct AssetSelectorMixin<T: TypedResourceData> {
     pub selector: Cell<Handle<AssetSelectorWindow>>,
     pub select: Handle<Button>,
diff --git a/editor/src/audio/bus.rs b/editor/src/audio/bus.rs
index 7a43c8827..30c1dc684 100644
--- a/editor/src/audio/bus.rs
+++ b/editor/src/audio/bus.rs
@@ -19,30 +19,24 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     gui::{
         border::BorderBuilder,
         decorator::DecoratorBuilder,
         define_widget_deref,
-        dropdown_list::{DropdownListBuilder, DropdownListMessage},
+        dropdown_list::{DropdownList, DropdownListBuilder, DropdownListMessage},
         grid::{Column, GridBuilder, Row},
-        list_view::{ListViewBuilder, ListViewMessage},
-        message::UiMessage,
-        text::{TextBuilder, TextMessage},
-        utils::make_simple_tooltip,
+        list_view::{ListView, ListViewBuilder, ListViewMessage},
+        message::{MessageData, UiMessage},
+        style::{resource::StyleResourceExt, Style},
+        text::{Text, TextBuilder, TextMessage},
+        utils::{make_dropdown_list_option, make_simple_tooltip},
         widget::{Widget, WidgetBuilder},
         BuildContext, Control, HorizontalAlignment, Thickness, UiNode, UserInterface,
         VerticalAlignment,
     },
     scene::sound::{AudioBus, AudioBusGraph},
 };
-use fyrox::gui::dropdown_list::DropdownList;
-use fyrox::gui::list_view::ListView;
-use fyrox::gui::message::MessageData;
-use fyrox::gui::style::resource::StyleResourceExt;
-use fyrox::gui::style::Style;
-use fyrox::gui::text::Text;
-use fyrox::gui::utils::make_dropdown_list_option;
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum AudioBusViewMessage {
@@ -54,7 +48,10 @@ pub enum AudioBusViewMessage {
 impl MessageData for AudioBusViewMessage {}
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5439e3a9-096a-4155-922c-ed57a76a46f3"
+)]
 pub struct AudioBusView {
     widget: Widget,
     pub bus: Handle<AudioBus>,
@@ -66,8 +63,6 @@ pub struct AudioBusView {
 
 define_widget_deref!(AudioBusView);
 
-uuid_provider!(AudioBusView = "5439e3a9-096a-4155-922c-ed57a76a46f3");
-
 impl Control for AudioBusView {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/editor/src/interaction/gizmo/move_gizmo.rs b/editor/src/interaction/gizmo/move_gizmo.rs
index 4928e701a..cafbb4004 100644
--- a/editor/src/interaction/gizmo/move_gizmo.rs
+++ b/editor/src/interaction/gizmo/move_gizmo.rs
@@ -47,10 +47,13 @@ use crate::{
     settings::Settings,
     Engine,
 };
+use fyrox::core::reflect::prelude::*;
 use fyrox::scene::camera::Camera;
 use fyrox::scene::mesh::Mesh;
 use fyrox::scene::pivot::Pivot;
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "060abe31-ce96-4696-aa5d-e44e9639df0e")]
 pub struct MoveGizmo {
     pub origin: Handle<Pivot>,
     smart_dot: Handle<Mesh>,
diff --git a/editor/src/interaction/gizmo/rotate_gizmo.rs b/editor/src/interaction/gizmo/rotate_gizmo.rs
index 935ca4746..31dce0f17 100644
--- a/editor/src/interaction/gizmo/rotate_gizmo.rs
+++ b/editor/src/interaction/gizmo/rotate_gizmo.rs
@@ -46,16 +46,21 @@ use crate::{
     settings::Settings,
     Engine,
 };
+use fyrox::core::reflect::prelude::*;
 use fyrox::scene::camera::Camera;
 use fyrox::scene::mesh::Mesh;
 use fyrox::scene::pivot::Pivot;
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "5ef2c27b-18af-458d-9549-1395f0869551")]
 pub enum RotateGizmoMode {
     Pitch,
     Yaw,
     Roll,
 }
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "36fc1ea4-33cd-4108-ae61-bab544f8ac02")]
 pub struct RotationGizmo {
     mode: RotateGizmoMode,
     pub origin: Handle<Pivot>,
diff --git a/editor/src/interaction/gizmo/scale_gizmo.rs b/editor/src/interaction/gizmo/scale_gizmo.rs
index 0f0dc6827..7a381c2d5 100644
--- a/editor/src/interaction/gizmo/scale_gizmo.rs
+++ b/editor/src/interaction/gizmo/scale_gizmo.rs
@@ -45,9 +45,12 @@ use crate::{
     settings::Settings,
     Engine,
 };
+use fyrox::core::reflect::prelude::*;
 use fyrox::scene::camera::Camera;
 use fyrox::scene::mesh::Mesh;
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "0555e074-bbd8-4753-a2ab-56d7092251c1")]
 pub enum ScaleGizmoMode {
     None,
     X,
@@ -56,6 +59,8 @@ pub enum ScaleGizmoMode {
     Uniform,
 }
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "c8827bb2-1aac-41e7-b2c1-ba04e0dc59e0")]
 pub struct ScaleGizmo {
     mode: ScaleGizmoMode,
     pub origin: Handle<Mesh>,
diff --git a/editor/src/interaction/mod.rs b/editor/src/interaction/mod.rs
index 046ca7530..d09cee502 100644
--- a/editor/src/interaction/mod.rs
+++ b/editor/src/interaction/mod.rs
@@ -23,8 +23,8 @@ use crate::{
         core::{
             algebra::{Vector2, Vector3},
             pool::Handle,
+            reflect::prelude::*,
             uuid::Uuid,
-            TypeUuidProvider,
         },
         gui::{
             border::BorderBuilder,
@@ -62,7 +62,7 @@ pub mod terrain;
 
 define_as_any_trait!(InteractionModeAsAny => InteractionMode);
 
-pub trait InteractionMode: InteractionModeAsAny {
+pub trait InteractionMode: Reflect + InteractionModeAsAny {
     fn on_left_mouse_button_down(
         &mut self,
         editor_selection: &Selection,
@@ -302,8 +302,8 @@ impl InteractionModeContainer {
         }
     }
 
-    pub fn remove_typed<T: InteractionMode + TypeUuidProvider>(&mut self) -> Option<Box<T>> {
-        self.remove(&T::type_uuid())
+    pub fn remove_typed<T: InteractionMode>(&mut self) -> Option<Box<T>> {
+        self.remove(&T::type_info().type_uuid)
             .and_then(|mode| mode.into_any().downcast::<T>().ok())
     }
 
@@ -325,13 +325,13 @@ impl InteractionModeContainer {
             .map(|mode| &mut **mode)
     }
 
-    pub fn of_type<T: InteractionMode + TypeUuidProvider>(&self) -> Option<&T> {
-        self.get(&T::type_uuid())
+    pub fn of_type<T: InteractionMode>(&self) -> Option<&T> {
+        self.get(&T::type_info().type_uuid)
             .and_then(|mode| mode.as_any().downcast_ref())
     }
 
-    pub fn of_type_mut<T: InteractionMode + TypeUuidProvider>(&mut self) -> Option<&mut T> {
-        self.get_mut(&T::type_uuid())
+    pub fn of_type_mut<T: InteractionMode>(&mut self) -> Option<&mut T> {
+        self.get_mut(&T::type_info().type_uuid)
             .and_then(|mode| mode.as_any_mut().downcast_mut())
     }
 
diff --git a/editor/src/interaction/move_mode.rs b/editor/src/interaction/move_mode.rs
index 7aab282a9..6d1f1aea2 100644
--- a/editor/src/interaction/move_mode.rs
+++ b/editor/src/interaction/move_mode.rs
@@ -27,8 +27,8 @@ use crate::{
             algebra::{Matrix4, Point3, Vector2, Vector3},
             math::plane::Plane,
             pool::Handle,
+            reflect::prelude::*,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         fxhash::FxHashSet,
         graph::SceneGraph,
@@ -52,6 +52,8 @@ use crate::{
 use fyrox::core::some_or_return;
 use fyrox::gui::button::Button;
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "067c67e2-865b-4112-8d60-133ee1e1883a")]
 struct Entry {
     node: Handle<Node>,
     initial_offset_gizmo_space: Vector3<f32>,
@@ -60,7 +62,10 @@ struct Entry {
     new_local_position: Vector3<f32>,
 }
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "f50af953-308e-40e8-85ae-48c905ba5f46")]
 struct MoveContext {
+    #[reflect(hidden)]
     plane: Option<Plane>,
     objects: Vec<Entry>,
     plane_kind: PlaneKind,
@@ -275,6 +280,8 @@ impl MoveContext {
     }
 }
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "067c67e2-865b-4112-8d60-133ee1e1883a")]
 pub struct MoveInteractionMode {
     move_context: Option<MoveContext>,
     move_gizmo: MoveGizmo,
@@ -291,12 +298,6 @@ impl MoveInteractionMode {
     }
 }
 
-impl TypeUuidProvider for MoveInteractionMode {
-    fn type_uuid() -> Uuid {
-        uuid!("067c67e2-865b-4112-8d60-133ee1e1883a")
-    }
-}
-
 impl InteractionMode for MoveInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -517,6 +518,6 @@ impl InteractionMode for MoveInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/interaction/navmesh/mod.rs b/editor/src/interaction/navmesh/mod.rs
index 3750a8e78..19be2ea65 100644
--- a/editor/src/interaction/navmesh/mod.rs
+++ b/editor/src/interaction/navmesh/mod.rs
@@ -27,8 +27,8 @@ use crate::{
             color::Color,
             math::{ray::CylinderKind, TriangleEdge},
             pool::Handle,
+            reflect::prelude::*,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         engine::Engine,
         graph::SceneGraph,
@@ -198,6 +198,12 @@ impl NavmeshPanel {
     }
 }
 
+#[derive(Reflect, Debug)]
+#[reflect(
+    non_cloneable,
+    type_uuid = "986eb5f1-5f17-4373-bffb-1e213e7c97e5",
+    hide_all
+)]
 enum DragContext {
     MoveSelection {
         initial_positions: HashMap<usize, Vector3<f32>>,
@@ -214,9 +220,12 @@ impl DragContext {
     }
 }
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "a8ed875d-0932-400d-b5b0-e0dcfb78c6c1")]
 pub struct EditNavmeshMode {
     move_gizmo: MoveGizmo,
     message_sender: MessageSender,
+    #[reflect(hidden)]
     drag_context: Option<DragContext>,
     plane_kind: PlaneKind,
 }
@@ -232,12 +241,6 @@ impl EditNavmeshMode {
     }
 }
 
-impl TypeUuidProvider for EditNavmeshMode {
-    fn type_uuid() -> Uuid {
-        uuid!("a8ed875d-0932-400d-b5b0-e0dcfb78c6c1")
-    }
-}
-
 impl InteractionMode for EditNavmeshMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -693,6 +696,6 @@ impl InteractionMode for EditNavmeshMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/interaction/plane.rs b/editor/src/interaction/plane.rs
index 8512a80e6..a6e67e36d 100644
--- a/editor/src/interaction/plane.rs
+++ b/editor/src/interaction/plane.rs
@@ -19,9 +19,11 @@
 // SOFTWARE.
 
 use crate::fyrox::core::{algebra::Vector3, math::plane::Plane, num_traits::Zero};
+use fyrox::core::reflect::prelude::*;
 use strum_macros::EnumIter;
 
-#[derive(Copy, Clone, Debug, EnumIter)]
+#[derive(Copy, Clone, Debug, EnumIter, Reflect)]
+#[reflect(type_uuid = "f50af953-308e-40e8-85ae-48c905ba5f46")]
 pub enum PlaneKind {
     X,
     Y,
diff --git a/editor/src/interaction/rotate_mode.rs b/editor/src/interaction/rotate_mode.rs
index 8103f45f7..be09d636a 100644
--- a/editor/src/interaction/rotate_mode.rs
+++ b/editor/src/interaction/rotate_mode.rs
@@ -26,9 +26,9 @@ use crate::{
             algebra::{UnitQuaternion, Vector2},
             math::round_to_step,
             pool::Handle,
+            reflect::prelude::*,
             some_or_return,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         gui::BuildContext,
     },
@@ -47,6 +47,8 @@ use crate::{
 };
 use fyrox::gui::button::Button;
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "37f20364-feb5-4731-8c19-c3df922818d6")]
 pub struct RotateInteractionMode {
     initial_rotations: Vec<UnitQuaternion<f32>>,
     rotation_gizmo: RotationGizmo,
@@ -65,12 +67,6 @@ impl RotateInteractionMode {
     }
 }
 
-impl TypeUuidProvider for RotateInteractionMode {
-    fn type_uuid() -> Uuid {
-        uuid!("37f20364-feb5-4731-8c19-c3df922818d6")
-    }
-}
-
 impl InteractionMode for RotateInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -304,6 +300,6 @@ impl InteractionMode for RotateInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/interaction/scale_mode.rs b/editor/src/interaction/scale_mode.rs
index 4dc009ed6..325f4f803 100644
--- a/editor/src/interaction/scale_mode.rs
+++ b/editor/src/interaction/scale_mode.rs
@@ -25,9 +25,9 @@ use crate::{
         core::{
             algebra::{Vector2, Vector3},
             pool::Handle,
+            reflect::prelude::*,
             some_or_return,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         gui::BuildContext,
     },
@@ -44,6 +44,8 @@ use crate::{
 };
 use fyrox::gui::button::Button;
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "64b4da1a-5d0f-49e1-9f48-011165cd1ec5")]
 pub struct ScaleInteractionMode {
     initial_scales: Vec<Vector3<f32>>,
     scale_gizmo: ScaleGizmo,
@@ -62,12 +64,6 @@ impl ScaleInteractionMode {
     }
 }
 
-impl TypeUuidProvider for ScaleInteractionMode {
-    fn type_uuid() -> Uuid {
-        uuid!("64b4da1a-5d0f-49e1-9f48-011165cd1ec5")
-    }
-}
-
 impl InteractionMode for ScaleInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -279,6 +275,6 @@ impl InteractionMode for ScaleInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/interaction/select_mode.rs b/editor/src/interaction/select_mode.rs
index 6700479ed..6841b8518 100644
--- a/editor/src/interaction/select_mode.rs
+++ b/editor/src/interaction/select_mode.rs
@@ -23,8 +23,8 @@ use crate::{
         core::{
             algebra::Vector2,
             pool::Handle,
+            reflect::prelude::*,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         gui::BuildContext,
         scene::node::Node,
@@ -41,6 +41,8 @@ use fyrox::gui::button::Button;
 use fyrox::gui::image::Image;
 use fyrox::gui::widget::WidgetMessage;
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "bab9ce8c-d679-4c49-beb9-f5a8482e0678")]
 pub struct SelectInteractionMode {
     preview: Handle<Image>,
     selection_frame: Handle<Border>,
@@ -65,12 +67,6 @@ impl SelectInteractionMode {
     }
 }
 
-impl TypeUuidProvider for SelectInteractionMode {
-    fn type_uuid() -> Uuid {
-        uuid!("bab9ce8c-d679-4c49-beb9-f5a8482e0678")
-    }
-}
-
 impl InteractionMode for SelectInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -209,6 +205,6 @@ impl InteractionMode for SelectInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/interaction/terrain.rs b/editor/src/interaction/terrain.rs
index 34ad7e07c..e0bd83297 100644
--- a/editor/src/interaction/terrain.rs
+++ b/editor/src/interaction/terrain.rs
@@ -19,6 +19,7 @@
 // SOFTWARE.
 
 use fyrox::scene::terrain::brushstroke::{BrushSender, BrushThreadMessage, UndoData};
+use std::fmt::{Debug, Formatter};
 
 use crate::{
     fyrox::{
@@ -29,8 +30,8 @@ use crate::{
             log::{Log, MessageKind},
             math::vector_to_quat,
             pool::Handle,
+            reflect::prelude::*,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         engine::Engine,
         graph::SceneGraph,
@@ -105,6 +106,12 @@ fn handle_undo_chunks(undo_chunks: UndoData, sender: &MessageSender) {
     }
 }
 
+#[derive(Reflect)]
+#[reflect(
+    non_cloneable,
+    type_uuid = "bc19eff3-3e3a-49c0-9a9d-17d36fccc34e",
+    hide_all
+)]
 pub struct TerrainInteractionMode {
     message_sender: MessageSender,
     brush_sender: Option<BrushSender>,
@@ -118,6 +125,12 @@ pub struct TerrainInteractionMode {
     scene_viewer_frame: Handle<Image>,
 }
 
+impl Debug for TerrainInteractionMode {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "TerrainInteractionMode")
+    }
+}
+
 impl TerrainInteractionMode {
     pub fn new(
         game_scene: &GameScene,
@@ -263,12 +276,6 @@ impl BrushGizmo {
     }
 }
 
-impl TypeUuidProvider for TerrainInteractionMode {
-    fn type_uuid() -> Uuid {
-        uuid!("bc19eff3-3e3a-49c0-9a9d-17d36fccc34e")
-    }
-}
-
 impl InteractionMode for TerrainInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -547,7 +554,7 @@ impl InteractionMode for TerrainInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
 
diff --git a/editor/src/lib.rs b/editor/src/lib.rs
index e5eb1a105..4270c6041 100644
--- a/editor/src/lib.rs
+++ b/editor/src/lib.rs
@@ -68,6 +68,7 @@ use crate::{
     export::ExportWindow,
     fyrox::{
         asset::{io::FsResourceIo, manager::ResourceManager, untyped::ResourceKind},
+        core::info,
         core::{
             algebra::{Matrix3, Vector2},
             color::Color,
@@ -75,12 +76,12 @@ use crate::{
             make_relative_path,
             parking_lot::Mutex,
             pool::Handle,
+            reflect::prelude::*,
             task::TaskPool,
             uuid::Uuid,
             watcher::FileSystemWatcher,
-            SafeLock, TypeUuidProvider,
+            SafeLock,
         },
-        core::{info, uuid},
         dpi::{PhysicalPosition, PhysicalSize},
         engine::GraphicsContext,
         engine::{
@@ -183,6 +184,7 @@ use crate::{
     utils::doc::DocWindow,
     world::{graph::EditorSceneWrapper, menu::SceneNodeContextMenu, WorldViewer},
 };
+use fyrox::core::uuid::uuid;
 use fyrox_build_tools::{build::BuildWindow, CommandDescriptor};
 pub use message::Message;
 use plugins::inspector::InspectorPlugin;
@@ -1228,23 +1230,27 @@ impl Editor {
                     sender.send(Message::UndoCurrentSceneCommand);
                 } else if hot_key == key_bindings.enable_select_mode {
                     sender.send(Message::SetInteractionMode(
-                        SelectInteractionMode::type_uuid(),
+                        SelectInteractionMode::type_info().type_uuid,
                     ));
                 } else if hot_key == key_bindings.enable_move_mode {
-                    sender.send(Message::SetInteractionMode(MoveInteractionMode::type_uuid()));
+                    sender.send(Message::SetInteractionMode(
+                        MoveInteractionMode::type_info().type_uuid,
+                    ));
                 } else if hot_key == key_bindings.enable_rotate_mode {
                     sender.send(Message::SetInteractionMode(
-                        RotateInteractionMode::type_uuid(),
+                        RotateInteractionMode::type_info().type_uuid,
                     ));
                 } else if hot_key == key_bindings.enable_scale_mode {
                     sender.send(Message::SetInteractionMode(
-                        ScaleInteractionMode::type_uuid(),
+                        ScaleInteractionMode::type_info().type_uuid,
                     ));
                 } else if hot_key == key_bindings.enable_navmesh_mode {
-                    sender.send(Message::SetInteractionMode(EditNavmeshMode::type_uuid()));
+                    sender.send(Message::SetInteractionMode(
+                        EditNavmeshMode::type_info().type_uuid,
+                    ));
                 } else if hot_key == key_bindings.enable_terrain_mode {
                     sender.send(Message::SetInteractionMode(
-                        TerrainInteractionMode::type_uuid(),
+                        TerrainInteractionMode::type_info().type_uuid,
                     ));
                 } else if hot_key == key_bindings.load_scene {
                     sender.send(Message::OpenLoadSceneDialog);
diff --git a/editor/src/light.rs b/editor/src/light.rs
index 87bd46f50..c49b5fcfb 100644
--- a/editor/src/light.rs
+++ b/editor/src/light.rs
@@ -56,6 +56,7 @@ use std::{
 };
 
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "86eed637-0d96-4ad2-9566-a451f0b00237")]
 struct LightmapperSettings {
     /// Name of the property in a material that will be modified in all materials for all surfaces
     /// that will receive the light map.
diff --git a/editor/src/menu/create.rs b/editor/src/menu/create.rs
index 9ecc301e0..b62ef9a6d 100644
--- a/editor/src/menu/create.rs
+++ b/editor/src/menu/create.rs
@@ -41,7 +41,7 @@ use crate::{
     Mode,
 };
 use fyrox::core::log::Log;
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::graph::constructor::{VariantConstructor, VariantResult};
 use fyrox::gui::constructor::WidgetConstructorContainer;
 use fyrox::gui::menu::{MenuItem, SortingPredicate};
diff --git a/editor/src/menu/edit.rs b/editor/src/menu/edit.rs
index d58b36ccd..c6172167c 100644
--- a/editor/src/menu/edit.rs
+++ b/editor/src/menu/edit.rs
@@ -33,7 +33,7 @@ use crate::{
     scene::{commands::PasteCommand, GameScene, Selection},
     Engine, Message, Mode,
 };
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu;
 use fyrox::gui::menu::MenuItem;
 
diff --git a/editor/src/menu/file.rs b/editor/src/menu/file.rs
index e42361b91..dcc07dd95 100644
--- a/editor/src/menu/file.rs
+++ b/editor/src/menu/file.rs
@@ -23,7 +23,7 @@ use crate::{
     export::ExportWindow,
     fyrox::{
         asset::manager::ResourceManager,
-        core::{pool::Handle, uuid, Uuid},
+        core::pool::Handle,
         gui::{
             file_browser::{FileSelectorBuilder, FileSelectorMessage, FileType, PathFilter},
             menu::{self, MenuItemMessage},
@@ -42,6 +42,7 @@ use crate::{
     Engine, Message, Mode, Panels, SaveSceneConfirmationDialogAction,
 };
 use fyrox::core::parking_lot::Mutex;
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::graph::SceneGraph;
 use fyrox::gui::file_browser::FileSelector;
 use fyrox::gui::menu::MenuItem;
diff --git a/editor/src/menu/help.rs b/editor/src/menu/help.rs
index 96b3e260a..e72d7e8fb 100644
--- a/editor/src/menu/help.rs
+++ b/editor/src/menu/help.rs
@@ -23,7 +23,7 @@ use crate::fyrox::{
     gui::{menu::MenuItemMessage, message::UiMessage, BuildContext},
 };
 use crate::menu::{create_menu_item, create_root_menu_item};
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu::MenuItem;
 
 pub struct HelpMenu {
diff --git a/editor/src/menu/mod.rs b/editor/src/menu/mod.rs
index d0ca01aba..2f0ffd26b 100644
--- a/editor/src/menu/mod.rs
+++ b/editor/src/menu/mod.rs
@@ -41,7 +41,7 @@ use crate::{
     Engine, Mode, SceneSettingsWindow,
 };
 use fyrox::asset::manager::ResourceManager;
-use fyrox::core::Uuid;
+use fyrox::core::uuid::Uuid;
 use fyrox::gui::file_browser::FileType;
 use fyrox::gui::image::{Image, ImageBuilder};
 use fyrox::gui::menu::MenuItem;
diff --git a/editor/src/menu/ui.rs b/editor/src/menu/ui.rs
index b00351b8c..4dabc91c7 100644
--- a/editor/src/menu/ui.rs
+++ b/editor/src/menu/ui.rs
@@ -33,7 +33,7 @@ use crate::{
     scene::Selection,
     ui_scene::{commands::graph::AddWidgetCommand, UiScene},
 };
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu::{MenuItem, SortingPredicate};
 
 pub struct UiMenu {
diff --git a/editor/src/menu/utils.rs b/editor/src/menu/utils.rs
index dcb79644e..111bdccd1 100644
--- a/editor/src/menu/utils.rs
+++ b/editor/src/menu/utils.rs
@@ -26,7 +26,7 @@ use crate::{
     menu::{create_menu_item, create_root_menu_item, Panels},
     stats::StatisticsWindow,
 };
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu::MenuItem;
 
 pub struct UtilsMenu {
diff --git a/editor/src/menu/view.rs b/editor/src/menu/view.rs
index e42ef0655..93f931ad1 100644
--- a/editor/src/menu/view.rs
+++ b/editor/src/menu/view.rs
@@ -32,7 +32,7 @@ use crate::{
     message::MessageSender,
     Message,
 };
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu::MenuItem;
 use fyrox::gui::window::{Window, WindowAlignment};
 
diff --git a/editor/src/message.rs b/editor/src/message.rs
index 93737cc28..d8c3e8fd8 100644
--- a/editor/src/message.rs
+++ b/editor/src/message.rs
@@ -125,7 +125,7 @@ pub enum Message {
 }
 
 #[derive(Clone, Debug, Reflect)]
-#[reflect(hide_all)]
+#[reflect(hide_all, type_uuid = "86eed637-0d96-4ad2-9566-a451f0b00237")]
 pub struct MessageSender(pub Sender<Message>);
 
 impl Default for MessageSender {
diff --git a/editor/src/overlay.rs b/editor/src/overlay.rs
index f69f8b206..d162c2592 100644
--- a/editor/src/overlay.rs
+++ b/editor/src/overlay.rs
@@ -21,7 +21,7 @@
 use crate::{
     fyrox::{
         asset::untyped::ResourceKind,
-        core::{algebra::Matrix4, math::Matrix4Ext, pool::Handle, sstorage::ImmutableString, Uuid},
+        core::{algebra::Matrix4, math::Matrix4Ext, pool::Handle, sstorage::ImmutableString},
         graphics::{
             buffer::BufferUsage, error::FrameworkError, geometry_buffer::GpuGeometryBuffer,
             server::GraphicsServer,
@@ -41,6 +41,7 @@ use crate::{
     },
     Editor,
 };
+use fyrox::core::uuid::Uuid;
 use std::{any::TypeId, cell::RefCell, rc::Rc};
 
 pub struct OverlayRenderPass {
diff --git a/editor/src/plugins/absm/blendspace.rs b/editor/src/plugins/absm/blendspace.rs
index 5eb493de4..25bbbb80d 100644
--- a/editor/src/plugins/absm/blendspace.rs
+++ b/editor/src/plugins/absm/blendspace.rs
@@ -25,8 +25,6 @@ use crate::fyrox::{
         math::{Rect, TriangleDefinition},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
-        uuid_provider,
         visitor::prelude::*,
     },
     generic_animation::machine::{
@@ -92,6 +90,7 @@ impl MessageData for BlendSpaceFieldMessage {
 }
 
 #[derive(Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "5cdb0ab3-b6fd-41c3-a6c4-d1178346eb81")]
 struct ContextMenu {
     #[visit(skip)]
     #[reflect(hidden)]
@@ -109,7 +108,10 @@ enum DragContext {
 }
 
 #[derive(Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "854a7c2d-3ccd-4331-95e1-956a3a035bd0"
+)]
 struct BlendSpaceField {
     widget: Widget,
     points: Vec<Handle<BlendSpaceFieldPoint>>,
@@ -180,8 +182,6 @@ fn make_points<P: Iterator<Item = Vector2<f32>>>(
         .collect()
 }
 
-uuid_provider!(BlendSpaceField = "854a7c2d-3ccd-4331-95e1-956a3a035bd0");
-
 impl Control for BlendSpaceField {
     fn measure_override(&self, ui: &UserInterface, _available_size: Vector2<f32>) -> Vector2<f32> {
         let size_for_child = Vector2::new(f32::INFINITY, f32::INFINITY);
@@ -558,7 +558,10 @@ pub enum BlendSpaceFieldPointMessage {
 impl MessageData for BlendSpaceFieldPointMessage {}
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "22c215c1-ff23-4a64-9aa7-640b5014a78b"
+)]
 struct BlendSpaceFieldPoint {
     widget: Widget,
     selected: bool,
@@ -566,8 +569,6 @@ struct BlendSpaceFieldPoint {
 
 define_widget_deref!(BlendSpaceFieldPoint);
 
-uuid_provider!(BlendSpaceFieldPoint = "22c215c1-ff23-4a64-9aa7-640b5014a78b");
-
 impl Control for BlendSpaceFieldPoint {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         drawing_context.push_circle_filled(
diff --git a/editor/src/plugins/absm/canvas.rs b/editor/src/plugins/absm/canvas.rs
index 24b7c2065..3f66f07d0 100644
--- a/editor/src/plugins/absm/canvas.rs
+++ b/editor/src/plugins/absm/canvas.rs
@@ -25,7 +25,6 @@ use crate::fyrox::{
         math::Rect,
         pool::Handle,
         reflect::prelude::*,
-        uuid_provider,
         visitor::prelude::*,
     },
     graph::SceneGraph,
@@ -52,18 +51,21 @@ use fyrox::gui::message::MessageData;
 use std::cell::Cell;
 
 #[derive(Debug, Clone, PartialEq, Visit, Reflect, Default)]
+#[reflect(type_uuid = "d5425ec9-e945-4452-af2a-743147518eb6")]
 pub(crate) struct Entry {
     pub node: Handle<UiNode>,
     pub initial_position: Vector2<f32>,
 }
 
 #[derive(Debug, Clone, PartialEq, Visit, Reflect, Default)]
+#[reflect(type_uuid = "575d4cac-5456-42db-bed1-36c627bc44c0")]
 pub(crate) struct DragContext {
     initial_cursor_position: Vector2<f32>,
     entries: Vec<Entry>,
 }
 
 #[derive(Debug, Clone, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "488b0b46-11ed-4eef-b58b-a52f3a71dd84")]
 pub(crate) enum Mode {
     Normal,
     Drag {
@@ -112,7 +114,10 @@ impl MessageData for AbsmCanvasMessage {
 }
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "100b1c33-d017-4fe6-95e7-e1daf310ef27"
+)]
 pub struct AbsmCanvas {
     widget: Widget,
     selection: Vec<Handle<UiNode>>,
@@ -303,8 +308,6 @@ impl AbsmCanvas {
     }
 }
 
-uuid_provider!(AbsmCanvas = "100b1c33-d017-4fe6-95e7-e1daf310ef27");
-
 impl Control for AbsmCanvas {
     fn draw(&self, ctx: &mut DrawingContext) {
         let grid_size = 9999.0;
diff --git a/editor/src/plugins/absm/connection.rs b/editor/src/plugins/absm/connection.rs
index 466733364..cb1db48c3 100644
--- a/editor/src/plugins/absm/connection.rs
+++ b/editor/src/plugins/absm/connection.rs
@@ -21,7 +21,7 @@
 use crate::fyrox::{
     core::{
         algebra::Vector2, color::Color, math::Rect, pool::Handle, reflect::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        visitor::prelude::*,
     },
     gui::{
         brush::Brush,
@@ -44,7 +44,10 @@ const PICKED_BRUSH: Brush = Brush::Solid(Color::opaque(100, 100, 100));
 const NORMAL_BRUSH: Brush = Brush::Solid(Color::opaque(80, 80, 80));
 
 #[derive(Debug, Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "c802b6fa-a5ef-4464-a097-749c731ffde0"
+)]
 pub struct Connection {
     widget: Widget,
     pub segment: Segment,
@@ -74,8 +77,6 @@ pub fn draw_connection(
     drawing_context.commit(clip_bounds, brush, CommandTexture::None, material, None);
 }
 
-uuid_provider!(Connection = "c802b6fa-a5ef-4464-a097-749c731ffde0");
-
 impl Control for Connection {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         draw_connection(
diff --git a/editor/src/plugins/absm/mod.rs b/editor/src/plugins/absm/mod.rs
index f32e72733..66b06d8d6 100644
--- a/editor/src/plugins/absm/mod.rs
+++ b/editor/src/plugins/absm/mod.rs
@@ -23,9 +23,8 @@ use crate::{
         core::{
             pool::{ErasedHandle, Handle},
             reflect::Reflect,
-            some_or_return, uuid,
+            some_or_return,
             variable::InheritableVariable,
-            Uuid,
         },
         engine::ApplicationLoopController,
         fxhash::FxHashSet,
@@ -71,6 +70,7 @@ use crate::{
 };
 use fyrox::core::err;
 use fyrox::core::pool::ObjectOrVariantHelper;
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::UiNode;
 use fyrox::resource::model::Model;
 use fyrox::scene::graph::Graph;
diff --git a/editor/src/plugins/absm/node.rs b/editor/src/plugins/absm/node.rs
index e3cff5bdc..c8eb1cb80 100644
--- a/editor/src/plugins/absm/node.rs
+++ b/editor/src/plugins/absm/node.rs
@@ -19,10 +19,7 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{
-        color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*, uuid::uuid,
-        visitor::prelude::*,
-    },
+    core::{color::Color, pool::Handle, reflect::prelude::*, uuid::uuid, visitor::prelude::*},
     gui::{
         border::{BorderBuilder, BorderMessage},
         brush::Brush,
@@ -52,13 +49,17 @@ use std::{
 };
 
 #[derive(Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "1a5d0042-3607-4fcb-88c6-025a0bce6111")]
 pub struct AbsmBaseNode {
     pub input_sockets: Vec<Handle<Socket>>,
     pub output_socket: Handle<Socket>,
 }
 
 #[derive(Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "15bc1a7e-a385-46e0-a65c-7e9c014b4a1d"
+)]
 pub struct AbsmNode<T>
 where
     T: Reflect,
@@ -154,12 +155,6 @@ pub enum AbsmNodeMessage {
 }
 impl MessageData for AbsmNodeMessage {}
 
-impl<T: Reflect> TypeUuidProvider for AbsmNode<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("15bc1a7e-a385-46e0-a65c-7e9c014b4a1d")
-    }
-}
-
 impl<T> Control for AbsmNode<T>
 where
     T: Reflect,
diff --git a/editor/src/plugins/absm/segment.rs b/editor/src/plugins/absm/segment.rs
index 43044c6de..4e0ff9ec1 100644
--- a/editor/src/plugins/absm/segment.rs
+++ b/editor/src/plugins/absm/segment.rs
@@ -32,6 +32,7 @@ pub enum SegmentMessage {
 impl MessageData for SegmentMessage {}
 
 #[derive(Debug, Clone, Reflect, Visit)]
+#[reflect(type_uuid = "fda5a731-e927-40e5-9d96-e19104fbb63e")]
 pub struct Segment {
     pub source: Handle<UiNode>,
     pub source_pos: Vector2<f32>,
diff --git a/editor/src/plugins/absm/selectable.rs b/editor/src/plugins/absm/selectable.rs
index ba1881c15..f28efe49b 100644
--- a/editor/src/plugins/absm/selectable.rs
+++ b/editor/src/plugins/absm/selectable.rs
@@ -36,6 +36,7 @@ pub enum SelectableMessage {
 impl MessageData for SelectableMessage {}
 
 #[derive(Default, Clone, Debug, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "5a49c5e4-8b2f-4631-8c83-7cc1eb0b2754")]
 pub struct Selectable {
     pub selected: bool,
 }
diff --git a/editor/src/plugins/absm/socket.rs b/editor/src/plugins/absm/socket.rs
index b64ab16fc..73b3025a9 100644
--- a/editor/src/plugins/absm/socket.rs
+++ b/editor/src/plugins/absm/socket.rs
@@ -20,9 +20,7 @@
 
 use crate::fyrox::core::pool::ErasedHandle;
 use crate::fyrox::{
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     gui::{
         define_widget_deref,
         grid::{Column, GridBuilder, Row},
@@ -48,6 +46,7 @@ pub enum SocketMessage {
 impl MessageData for SocketMessage {}
 
 #[derive(Copy, Clone, PartialEq, Hash, Debug, Eq, Visit, Reflect, Default)]
+#[reflect(type_uuid = "c77c74cf-d055-4ab3-8d20-67749e276169")]
 pub enum SocketDirection {
     #[default]
     Input,
@@ -55,7 +54,10 @@ pub enum SocketDirection {
 }
 
 #[derive(Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "a6c0473e-7073-4e91-a681-cf88795af52a"
+)]
 pub struct Socket {
     widget: Widget,
     click_position: Option<Vector2<f32>>,
@@ -71,8 +73,6 @@ define_widget_deref!(Socket);
 
 const RADIUS: f32 = 8.0;
 
-uuid_provider!(Socket = "a6c0473e-7073-4e91-a681-cf88795af52a");
-
 impl Control for Socket {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/editor/src/plugins/absm/state_graph/context.rs b/editor/src/plugins/absm/state_graph/context.rs
index 3f686ecc0..0f7fa7a9a 100644
--- a/editor/src/plugins/absm/state_graph/context.rs
+++ b/editor/src/plugins/absm/state_graph/context.rs
@@ -51,7 +51,7 @@ use crate::{
 
 use fyrox::core::pool::HandlesArrayExtension;
 use fyrox::core::reflect::Reflect;
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu::{ContextMenuBuilder, MenuItem};
 
 pub struct CanvasContextMenu {
diff --git a/editor/src/plugins/absm/state_viewer/context.rs b/editor/src/plugins/absm/state_viewer/context.rs
index 900da5b09..817055a53 100644
--- a/editor/src/plugins/absm/state_viewer/context.rs
+++ b/editor/src/plugins/absm/state_viewer/context.rs
@@ -54,7 +54,7 @@ use crate::{
     message::MessageSender,
     scene::{commands::ChangeSelectionCommand, Selection},
 };
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::menu::{ContextMenuBuilder, MenuItem};
 
 pub struct CanvasContextMenu {
diff --git a/editor/src/plugins/absm/transition.rs b/editor/src/plugins/absm/transition.rs
index 828c81355..09f36b660 100644
--- a/editor/src/plugins/absm/transition.rs
+++ b/editor/src/plugins/absm/transition.rs
@@ -26,7 +26,6 @@ use crate::fyrox::{
         math::Rect,
         pool::Handle,
         reflect::prelude::*,
-        uuid_provider,
         visitor::prelude::*,
     },
     gui::{
@@ -56,7 +55,10 @@ pub enum TransitionMessage {
 impl MessageData for TransitionMessage {}
 
 #[derive(Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "01798aee-8fe5-4480-a69d-8e5b95c3cc96"
+)]
 pub struct TransitionView {
     widget: Widget,
     pub segment: Segment,
@@ -105,8 +107,6 @@ pub fn draw_transition(
     drawing_context.commit(clip_bounds, brush, CommandTexture::None, material, None);
 }
 
-uuid_provider!(TransitionView = "01798aee-8fe5-4480-a69d-8e5b95c3cc96");
-
 impl Control for TransitionView {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         let brush = if let Brush::Solid(color) = self.foreground() {
diff --git a/editor/src/plugins/animation/mod.rs b/editor/src/plugins/animation/mod.rs
index ae75e77a5..248c0ca25 100644
--- a/editor/src/plugins/animation/mod.rs
+++ b/editor/src/plugins/animation/mod.rs
@@ -24,7 +24,7 @@ use crate::{
         asset::manager::ResourceManager,
         core::{
             algebra::Vector2, color::Color, log::Log, math::curve::Curve, math::Rect,
-            pool::ErasedHandle, pool::Handle, reflect::Reflect, some_or_return, uuid, uuid::Uuid,
+            pool::ErasedHandle, pool::Handle, reflect::Reflect, some_or_return, uuid::Uuid,
             variable::InheritableVariable,
         },
         engine::ApplicationLoopController,
@@ -65,6 +65,7 @@ use crate::{
     ui_scene::UiScene,
     Editor, Message,
 };
+use fyrox::core::uuid::uuid;
 use fyrox::gui::UiNode;
 use fyrox::scene::node::Node;
 use std::any::Any;
diff --git a/editor/src/plugins/animation/ruler.rs b/editor/src/plugins/animation/ruler.rs
index 84354dd3a..35dcfcdf9 100644
--- a/editor/src/plugins/animation/ruler.rs
+++ b/editor/src/plugins/animation/ruler.rs
@@ -25,8 +25,6 @@ use crate::fyrox::{
         math::Rect,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
-        uuid_provider,
         visitor::prelude::*,
     },
     gui::{
@@ -162,7 +160,10 @@ struct DragContext {
 }
 
 #[derive(Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "98655c9b-428f-4977-a478-ad3674cc66d4"
+)]
 pub struct Ruler {
     widget: Widget,
     #[visit(skip)]
@@ -215,8 +216,6 @@ impl Ruler {
     }
 }
 
-uuid_provider!(Ruler = "98655c9b-428f-4977-a478-ad3674cc66d4");
-
 impl Control for Ruler {
     fn draw(&self, ctx: &mut DrawingContext) {
         self.transform.set_bounds(self.screen_bounds());
diff --git a/editor/src/plugins/animation/thumb.rs b/editor/src/plugins/animation/thumb.rs
index 480558968..ae843449e 100644
--- a/editor/src/plugins/animation/thumb.rs
+++ b/editor/src/plugins/animation/thumb.rs
@@ -27,7 +27,6 @@ use crate::fyrox::{
         algebra::{Point2, Vector2},
         pool::Handle,
         reflect::prelude::*,
-        uuid_provider,
         visitor::prelude::*,
     },
     gui::{
@@ -53,7 +52,10 @@ pub enum ThumbMessage {
 impl MessageData for ThumbMessage {}
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "820ba009-54e0-4050-ba7e-28f1f5b40429"
+)]
 pub struct Thumb {
     widget: Widget,
     #[visit(skip)]
@@ -73,8 +75,6 @@ impl Thumb {
     }
 }
 
-uuid_provider!(Thumb = "820ba009-54e0-4050-ba7e-28f1f5b40429");
-
 impl Control for Thumb {
     fn draw(&self, ctx: &mut DrawingContext) {
         self.transform.set_bounds(self.screen_bounds());
diff --git a/editor/src/plugins/animation/track.rs b/editor/src/plugins/animation/track.rs
index 232c63ed4..21700dfb9 100644
--- a/editor/src/plugins/animation/track.rs
+++ b/editor/src/plugins/animation/track.rs
@@ -35,8 +35,6 @@ use crate::{
             pool::{ErasedHandle, Handle},
             reflect::{prelude::*, Reflect},
             some_or_return,
-            type_traits::prelude::*,
-            uuid_provider,
             variable::InheritableVariable,
             visitor::prelude::*,
         },
@@ -349,7 +347,10 @@ pub enum TrackViewMessage {
 impl MessageData for TrackViewMessage {}
 
 #[derive(Clone, Debug, Reflect, Visit)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "c1e930da-d55d-492e-b87b-16c1adf03319"
+)]
 struct TrackView {
     pub tree: Tree,
     id: Uuid,
@@ -373,8 +374,6 @@ impl DerefMut for TrackView {
     }
 }
 
-uuid_provider!(TrackView = "c1e930da-d55d-492e-b87b-16c1adf03319");
-
 impl Control for TrackView {
     fn on_remove(&self, sender: &Sender<UiMessage>) {
         self.tree.on_remove(sender)
diff --git a/editor/src/plugins/collider/mod.rs b/editor/src/plugins/collider/mod.rs
index a05bcf197..d3c61a8ee 100644
--- a/editor/src/plugins/collider/mod.rs
+++ b/editor/src/plugins/collider/mod.rs
@@ -35,8 +35,6 @@ mod segment2d;
 mod triangle;
 mod triangle2d;
 
-use std::sync::LazyLock;
-
 use super::inspector::InspectorPlugin;
 use crate::{
     camera::PickingOptions,
@@ -47,10 +45,8 @@ use crate::{
             color::Color,
             math::{plane::Plane, Matrix4Ext},
             pool::Handle,
-            reflect::Reflect,
+            reflect::prelude::*,
             some_or_return,
-            type_traits::prelude::*,
-            Uuid,
         },
         engine::Engine,
         graph::{SceneGraph, SceneGraphNode},
@@ -87,10 +83,13 @@ use crate::{
     settings::Settings,
     Editor, Message,
 };
+use fyrox::core::uuid::Uuid;
 use fyrox::gui::button::Button;
 use fyrox::gui::widget::WidgetMessage;
 use fyrox::scene::camera::Camera;
 use fyrox::scene::pivot::Pivot;
+use std::fmt::{Debug, Formatter};
+use std::sync::LazyLock;
 
 fn try_get_collider_shape(collider: Handle<Node>, scene: &Scene) -> Option<ColliderShape> {
     scene
@@ -299,7 +298,8 @@ fn make_handle(scene: &mut Scene, root: Handle<Pivot>, visible: bool) -> Handle<
     handle
 }
 
-#[derive(Copy, Clone)]
+#[derive(Copy, Clone, Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "42b19406-299d-4c3d-a7e3-77b41817ae71")]
 enum ShapeHandleValue {
     Scalar(f32),
     Vector(Vector3<f32>),
@@ -323,15 +323,19 @@ impl ShapeHandleValue {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "70d6130f-da5d-4f14-bbfd-0744927053a0")]
 enum ColliderInitialShape {
     TwoD(dim2::collider::ColliderShape),
     ThreeD(ColliderShape),
 }
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "e9aac4a5-0755-4d94-94ff-dfa37b40d5ca")]
 struct DragContext {
     handle: Handle<Sprite>,
     initial_handle_position: Vector3<f32>,
+    #[reflect(hidden)]
     plane: Plane,
     initial_value: ShapeHandleValue,
     handle_major_axis: Option<Vector3<f32>>,
@@ -339,17 +343,25 @@ struct DragContext {
     initial_shape: ColliderInitialShape,
 }
 
-#[derive(TypeUuidProvider)]
-#[type_uuid(id = "a012dd4c-ce6d-4e7e-8879-fd8eddaa9677")]
+#[derive(Reflect)]
+#[reflect(non_cloneable, type_uuid = "a012dd4c-ce6d-4e7e-8879-fd8eddaa9677")]
 pub struct ColliderShapeInteractionMode {
     collider: Handle<Node>,
+    #[reflect(hidden)]
     shape_gizmo: Box<dyn ShapeGizmoTrait>,
     move_gizmo: MoveGizmo,
+    #[reflect(hidden)]
     drag_context: Option<DragContext>,
     selected_handle: Handle<Sprite>,
     message_sender: MessageSender,
 }
 
+impl Debug for ColliderShapeInteractionMode {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "ColliderShapeInteractionMode")
+    }
+}
+
 impl ColliderShapeInteractionMode {
     fn set_visibility(
         &mut self,
@@ -674,7 +686,7 @@ impl InteractionMode for ColliderShapeInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
 
diff --git a/editor/src/plugins/collider/panel.rs b/editor/src/plugins/collider/panel.rs
index 8c38f515d..7a067456a 100644
--- a/editor/src/plugins/collider/panel.rs
+++ b/editor/src/plugins/collider/panel.rs
@@ -21,7 +21,7 @@
 use crate::{
     command::{Command, CommandGroup, SetPropertyCommand},
     fyrox::{
-        core::{algebra::Vector3, pool::Handle, reflect::Reflect, TypeUuidProvider},
+        core::{algebra::Vector3, pool::Handle, reflect::Reflect},
         engine::Engine,
         graph::SceneGraph,
         gui::{
@@ -237,7 +237,7 @@ impl ColliderControlPanel {
             }
         } else if message.destination() == self.edit {
             sender.send(Message::SetInteractionMode(
-                ColliderShapeInteractionMode::type_uuid(),
+                ColliderShapeInteractionMode::type_info().type_uuid,
             ));
         }
     }
diff --git a/editor/src/plugins/curve_editor.rs b/editor/src/plugins/curve_editor.rs
index bdb00a728..3d20a5633 100644
--- a/editor/src/plugins/curve_editor.rs
+++ b/editor/src/plugins/curve_editor.rs
@@ -25,7 +25,7 @@ use crate::{
         asset::Resource,
         core::{
             futures::executor::block_on, math::curve::Curve, pool::Handle, reflect::prelude::*,
-            some_or_return, type_traits::prelude::*, visitor::prelude::*,
+            some_or_return, visitor::prelude::*,
         },
         engine::Engine,
         gui::{
@@ -62,6 +62,7 @@ use crate::{
 use std::{fmt::Debug, path::PathBuf};
 
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "f29aa9c7-e0c4-4602-8588-3e8a20ab7cdc")]
 pub struct CurveEditorContext {}
 
 impl CommandContext for CurveEditorContext {}
diff --git a/editor/src/plugins/inspector/editors/dyntype.rs b/editor/src/plugins/inspector/editors/dyntype.rs
index 2cf814fe6..ad83f5330 100644
--- a/editor/src/plugins/inspector/editors/dyntype.rs
+++ b/editor/src/plugins/inspector/editors/dyntype.rs
@@ -23,10 +23,7 @@ use crate::{
         core::dyntype::{DynTypeConstructorContainer, DynTypeContainer},
         graph::SceneGraph,
         gui::{
-            core::{
-                parking_lot::Mutex, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-                uuid_provider, visitor::prelude::*,
-            },
+            core::{parking_lot::Mutex, pool::Handle, reflect::prelude::*, visitor::prelude::*},
             dropdown_list::{DropdownList, DropdownListBuilder, DropdownListMessage},
             grid::{GridBuilder, GridDimension},
             inspector::InspectorContextArgs,
@@ -65,7 +62,10 @@ pub enum DynTypePropertyEditorMessage {
 impl MessageData for DynTypePropertyEditorMessage {}
 
 #[derive(Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "f43c3bfb-8b39-4cc0-be77-04141a45822e"
+)]
 pub struct DynTypePropertyEditor {
     widget: Widget,
     inspector: Handle<Inspector>,
@@ -88,8 +88,6 @@ impl DerefMut for DynTypePropertyEditor {
     }
 }
 
-uuid_provider!(DynTypePropertyEditor = "f43c3bfb-8b39-4cc0-be77-04141a45822e");
-
 impl Control for DynTypePropertyEditor {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/editor/src/plugins/inspector/editors/font.rs b/editor/src/plugins/inspector/editors/font.rs
index 917e1dd65..e9e870ca2 100644
--- a/editor/src/plugins/inspector/editors/font.rs
+++ b/editor/src/plugins/inspector/editors/font.rs
@@ -22,8 +22,7 @@ use crate::{
     asset::item::AssetItem,
     fyrox::{
         core::{
-            algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
-            visitor::prelude::*,
+            algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -56,7 +55,10 @@ use std::{
 };
 
 #[derive(Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5db49479-ff89-49b8-a038-0766253d6493"
+)]
 pub struct FontField {
     widget: Widget,
     text_preview: Handle<Text>,
@@ -92,8 +94,6 @@ pub enum FontFieldMessage {
 }
 impl MessageData for FontFieldMessage {}
 
-uuid_provider!(FontField = "5db49479-ff89-49b8-a038-0766253d6493");
-
 impl Control for FontField {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         // Emit transparent geometry for the field to be able to catch mouse events without precise pointing at the
diff --git a/editor/src/plugins/inspector/editors/handle.rs b/editor/src/plugins/inspector/editors/handle.rs
index e905ace1b..1c49c1d0b 100644
--- a/editor/src/plugins/inspector/editors/handle.rs
+++ b/editor/src/plugins/inspector/editors/handle.rs
@@ -23,7 +23,7 @@ use crate::{
     fyrox::{
         core::{
             color::Color, pool::ErasedHandle, pool::Handle, reflect::prelude::*,
-            type_traits::prelude::*, visitor::prelude::*, SafeLock,
+            visitor::prelude::*, SafeLock,
         },
         graph::SceneGraph,
         gui::{
@@ -104,8 +104,8 @@ impl MessageData for HandlePropertyEditorNameMessage {}
 pub struct HandlePropertyEditorHierarchyMessage(pub HierarchyNode);
 impl MessageData for HandlePropertyEditorHierarchyMessage {}
 
-#[derive(Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "3ceca8c1-c365-4f03-a413-062f8f3cd685")]
+#[derive(Visit, Reflect)]
+#[reflect(type_uuid = "3ceca8c1-c365-4f03-a413-062f8f3cd685")]
 #[reflect(derived_type = "UiNode")]
 pub struct HandlePropertyEditor<T: Reflect> {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/editors/resource.rs b/editor/src/plugins/inspector/editors/resource.rs
index 0cb6c809d..ea6c17cb0 100644
--- a/editor/src/plugins/inspector/editors/resource.rs
+++ b/editor/src/plugins/inspector/editors/resource.rs
@@ -27,7 +27,7 @@ use crate::{
         asset::{manager::ResourceManager, state::LoadError, Resource, TypedResourceData},
         core::{
             color::Color, log::Log, parking_lot::Mutex, pool::Handle, reflect::prelude::*,
-            type_traits::prelude::*, uuid::uuid, visitor::prelude::*, PhantomDataSendSync,
+            uuid::uuid, visitor::prelude::*, PhantomDataSendSync,
         },
         graph::SceneGraph,
         gui::{
@@ -115,7 +115,10 @@ pub type ResourceLoaderCallback<T> = Arc<
 >;
 
 #[derive(Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5179b3b9-855f-43a6-b23a-831129fee1cf"
+)]
 pub struct ResourceField<T>
 where
     T: TypedResourceData,
@@ -181,12 +184,6 @@ where
     }
 }
 
-impl<T: TypedResourceData> TypeUuidProvider for ResourceField<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("5179b3b9-855f-43a6-b23a-831129fee1cf")
-    }
-}
-
 impl<T> Control for ResourceField<T>
 where
     T: TypedResourceData,
diff --git a/editor/src/plugins/inspector/editors/script.rs b/editor/src/plugins/inspector/editors/script.rs
index 2e2831b66..6a9f164b7 100644
--- a/editor/src/plugins/inspector/editors/script.rs
+++ b/editor/src/plugins/inspector/editors/script.rs
@@ -19,10 +19,7 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{
-        log::Log, parking_lot::Mutex, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
-    },
+    core::{log::Log, parking_lot::Mutex, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     engine::SerializationContext,
     graph::SceneGraph,
     gui::{
@@ -73,7 +70,10 @@ pub enum ScriptPropertyEditorMessage {
 impl MessageData for ScriptPropertyEditorMessage {}
 
 #[derive(Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "f43c3bfb-8b39-4cc0-be77-04141a45822e"
+)]
 pub struct ScriptPropertyEditor {
     widget: Widget,
     inspector: Handle<Inspector>,
@@ -97,8 +97,6 @@ impl DerefMut for ScriptPropertyEditor {
     }
 }
 
-uuid_provider!(ScriptPropertyEditor = "f43c3bfb-8b39-4cc0-be77-04141a45822e");
-
 impl Control for ScriptPropertyEditor {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/editor/src/plugins/inspector/editors/shader/field.rs b/editor/src/plugins/inspector/editors/shader/field.rs
index 4b2377b9c..ac0ad8e7b 100644
--- a/editor/src/plugins/inspector/editors/shader/field.rs
+++ b/editor/src/plugins/inspector/editors/shader/field.rs
@@ -20,7 +20,7 @@
 
 use crate::{
     fyrox::{
-        core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+        core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
         gui::{
             button::{ButtonBuilder, ButtonMessage},
             define_widget_deref_proxy,
@@ -45,8 +45,8 @@ use crate::{
 use fyrox::gui::button::Button;
 use std::{any::TypeId, cell::RefCell};
 
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "f2024683-812e-4e0d-8065-7d168a82cce6")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "f2024683-812e-4e0d-8065-7d168a82cce6")]
 #[reflect(derived_type = "UiNode")]
 pub struct ShaderSourceCodeEditorField {
     widget: Widget,
diff --git a/editor/src/plugins/inspector/editors/shader/mod.rs b/editor/src/plugins/inspector/editors/shader/mod.rs
index a29bb79f9..dd589c3bb 100644
--- a/editor/src/plugins/inspector/editors/shader/mod.rs
+++ b/editor/src/plugins/inspector/editors/shader/mod.rs
@@ -19,7 +19,7 @@
 // SOFTWARE.
 
 use fyrox::{
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     gui::{
         control_trait_proxy_impls, define_widget_deref_proxy,
         formatted_text::WrapMode,
@@ -42,8 +42,8 @@ pub enum ShaderSourceCodeEditorMessage {
 }
 impl MessageData for ShaderSourceCodeEditorMessage {}
 
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "c2e0bdcc-28a6-4141-93b5-5dad50c8b29c")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "c2e0bdcc-28a6-4141-93b5-5dad50c8b29c")]
 #[reflect(derived_type = "UiNode")]
 pub struct ShaderSourceCodeEditor {
     window: Window,
diff --git a/editor/src/plugins/inspector/editors/spritesheet/mod.rs b/editor/src/plugins/inspector/editors/spritesheet/mod.rs
index 1f33f3ef8..841f0be50 100644
--- a/editor/src/plugins/inspector/editors/spritesheet/mod.rs
+++ b/editor/src/plugins/inspector/editors/spritesheet/mod.rs
@@ -19,7 +19,7 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     gui::{
         button::{ButtonBuilder, ButtonMessage},
         define_widget_deref,
@@ -58,7 +58,10 @@ pub enum SpriteSheetFramesPropertyEditorMessage {
 impl MessageData for SpriteSheetFramesPropertyEditorMessage {}
 
 #[derive(Clone, Debug, Reflect, Visit)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "8994228d-6106-4e41-872c-5191840badcc"
+)]
 pub struct SpriteSheetFramesPropertyEditor {
     widget: Widget,
     edit_button: Handle<Button>,
@@ -67,8 +70,6 @@ pub struct SpriteSheetFramesPropertyEditor {
 
 define_widget_deref!(SpriteSheetFramesPropertyEditor);
 
-uuid_provider!(SpriteSheetFramesPropertyEditor = "8994228d-6106-4e41-872c-5191840badcc");
-
 impl Control for SpriteSheetFramesPropertyEditor {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/editor/src/plugins/inspector/editors/spritesheet/window.rs b/editor/src/plugins/inspector/editors/spritesheet/window.rs
index 02f93f40d..c84b3067b 100644
--- a/editor/src/plugins/inspector/editors/spritesheet/window.rs
+++ b/editor/src/plugins/inspector/editors/spritesheet/window.rs
@@ -21,7 +21,7 @@
 use crate::fyrox::graph::SceneGraph;
 use crate::fyrox::{
     core::{
-        algebra::Vector2, parking_lot::Mutex, pool::Handle, reflect::prelude::*, uuid_provider,
+        algebra::Vector2, parking_lot::Mutex, pool::Handle, reflect::prelude::*,
         visitor::prelude::*,
     },
     gui::{
@@ -60,7 +60,10 @@ use std::{
 };
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "55607fe0-2996-418d-ad31-a5b96fdfa4b7"
+)]
 pub struct SpriteSheetFramesEditorWindow {
     window: Window,
     editor: Handle<UiNode>,
@@ -89,8 +92,6 @@ impl DerefMut for SpriteSheetFramesEditorWindow {
     }
 }
 
-uuid_provider!(SpriteSheetFramesEditorWindow = "55607fe0-2996-418d-ad31-a5b96fdfa4b7");
-
 impl Control for SpriteSheetFramesEditorWindow {
     fn on_remove(&self, sender: &Sender<UiMessage>) {
         self.window.on_remove(sender);
diff --git a/editor/src/plugins/inspector/editors/surface.rs b/editor/src/plugins/inspector/editors/surface.rs
index f3c282568..a60ae24cb 100644
--- a/editor/src/plugins/inspector/editors/surface.rs
+++ b/editor/src/plugins/inspector/editors/surface.rs
@@ -28,7 +28,7 @@ use crate::{
         asset::manager::ResourceManager,
         core::{
             futures::executor::block_on, log::Log, make_relative_path, pool::Handle,
-            reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*,
+            reflect::prelude::*, visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -67,8 +67,8 @@ pub enum SurfaceDataPropertyEditorMessage {
 }
 impl MessageData for SurfaceDataPropertyEditorMessage {}
 
-#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "8461a183-4fd4-4f74-a4f4-7fd8e84bf423")]
+#[derive(Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "8461a183-4fd4-4f74-a4f4-7fd8e84bf423")]
 #[reflect(derived_type = "UiNode")]
 #[allow(dead_code)]
 pub struct SurfaceDataPropertyEditor {
diff --git a/editor/src/plugins/inspector/editors/texture.rs b/editor/src/plugins/inspector/editors/texture.rs
index 859a08409..7440551f0 100644
--- a/editor/src/plugins/inspector/editors/texture.rs
+++ b/editor/src/plugins/inspector/editors/texture.rs
@@ -24,7 +24,7 @@ use crate::{
         asset::{manager::ResourceManager, untyped::UntypedResource},
         core::{
             algebra::Vector2, color::Color, make_relative_path, pool::Handle, reflect::prelude::*,
-            uuid_provider, visitor::prelude::*,
+            visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -59,7 +59,10 @@ use std::{
 };
 
 #[derive(Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5db49479-ff89-49b8-a038-0766253d6493"
+)]
 pub struct TextureEditor {
     widget: Widget,
     image: Handle<Image>,
@@ -99,8 +102,6 @@ pub enum TextureEditorMessage {
 }
 impl MessageData for TextureEditorMessage {}
 
-uuid_provider!(TextureEditor = "5db49479-ff89-49b8-a038-0766253d6493");
-
 fn texture_name(texture: Option<&TextureResource>, resource_manager: &ResourceManager) -> String {
     match texture.and_then(|tex| resource_manager.resource_path(tex.as_ref())) {
         None => "Unassigned".to_string(),
diff --git a/editor/src/plugins/inspector/mod.rs b/editor/src/plugins/inspector/mod.rs
index 17aaf71c7..cffd82a1a 100644
--- a/editor/src/plugins/inspector/mod.rs
+++ b/editor/src/plugins/inspector/mod.rs
@@ -68,13 +68,14 @@ pub mod editors;
 pub mod handlers;
 
 #[derive(Clone, Reflect, Debug)]
+#[reflect(type_uuid = "e617f0b6-fb5f-4e41-85c2-9dbb1869af30")]
 pub struct AnimationDefinition {
     name: String,
     handle: ErasedHandle,
 }
 
 #[derive(Reflect, Clone, Debug)]
-#[reflect(non_cloneable)]
+#[reflect(non_cloneable, type_uuid = "ff4bc6f3-a735-47d8-b455-f9fd6354bd5f")]
 pub struct EditorEnvironment {
     pub resource_manager: ResourceManager,
     #[reflect(hidden)]
diff --git a/editor/src/plugins/material/editor.rs b/editor/src/plugins/material/editor.rs
index 2b54f2016..88fac80d0 100644
--- a/editor/src/plugins/material/editor.rs
+++ b/editor/src/plugins/material/editor.rs
@@ -27,8 +27,8 @@ use crate::{
     fyrox::{
         asset::{core::pool::Handle, manager::ResourceManager, state::ResourceState},
         core::{
-            color::Color, log::Log, parking_lot::Mutex, reflect::prelude::*, uuid_provider,
-            visitor::prelude::*, SafeLock,
+            color::Color, log::Log, parking_lot::Mutex, reflect::prelude::*, visitor::prelude::*,
+            SafeLock,
         },
         graph::SceneGraph,
         gui::{
@@ -72,7 +72,10 @@ pub enum MaterialFieldMessage {
 impl MessageData for MaterialFieldMessage {}
 
 #[derive(Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "d3fa0a7c-52d6-4cca-885e-0db8b18542e2"
+)]
 pub struct MaterialFieldEditor {
     widget: Widget,
     #[visit(skip)]
@@ -108,8 +111,6 @@ impl DerefMut for MaterialFieldEditor {
     }
 }
 
-uuid_provider!(MaterialFieldEditor = "d3fa0a7c-52d6-4cca-885e-0db8b18542e2");
-
 impl Control for MaterialFieldEditor {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         // Emit transparent geometry for the field to be able to catch mouse events without precise
diff --git a/editor/src/plugins/probe.rs b/editor/src/plugins/probe.rs
index 909e965e7..8ca6a85c0 100644
--- a/editor/src/plugins/probe.rs
+++ b/editor/src/plugins/probe.rs
@@ -25,9 +25,8 @@ use crate::{
         core::{
             algebra::{Vector2, Vector3},
             pool::Handle,
+            reflect::prelude::*,
             some_or_return,
-            type_traits::prelude::*,
-            Uuid,
         },
         engine::Engine,
         graph::SceneGraph,
@@ -52,6 +51,7 @@ use crate::{
     Editor, Message,
 };
 use fyrox::core::reflect::Reflect;
+use fyrox::core::uuid::Uuid;
 use fyrox::gui::button::Button;
 use fyrox::gui::grid::Grid;
 
@@ -126,7 +126,7 @@ impl ReflectionProbePreviewControlPanel {
                     }
                 } else if message.destination == self.adjust {
                     sender.send(Message::SetInteractionMode(
-                        ReflectionProbeInteractionMode::type_uuid(),
+                        ReflectionProbeInteractionMode::type_info().type_uuid,
                     ));
                 }
             }
@@ -138,17 +138,20 @@ impl ReflectionProbePreviewControlPanel {
     }
 }
 
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "9a535782-87a9-4407-8d12-a723d67e179d")]
 struct DragContext {
     new_position: Vector3<f32>,
     plane_kind: PlaneKind,
 }
 
-#[derive(TypeUuidProvider)]
-#[type_uuid(id = "d8fd164c-523c-447a-93ab-e86f2d71eed6")]
+#[derive(Reflect, Debug)]
+#[reflect(non_cloneable, type_uuid = "d8fd164c-523c-447a-93ab-e86f2d71eed6")]
 pub struct ReflectionProbeInteractionMode {
     probe: Handle<ReflectionProbe>,
     move_gizmo: MoveGizmo,
     message_sender: MessageSender,
+    #[reflect(hidden)]
     drag_context: Option<DragContext>,
 }
 
@@ -313,7 +316,7 @@ impl InteractionMode for ReflectionProbeInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 }
 
diff --git a/editor/src/plugins/ragdoll.rs b/editor/src/plugins/ragdoll.rs
index bde69f3a7..ad21ee803 100644
--- a/editor/src/plugins/ragdoll.rs
+++ b/editor/src/plugins/ragdoll.rs
@@ -27,7 +27,7 @@ use crate::{
             math::Matrix4Ext,
             pool::Handle,
             reflect::prelude::*,
-            some_or_return, uuid, Uuid,
+            some_or_return,
         },
         graph::SceneGraph,
         gui::{
@@ -75,6 +75,7 @@ use fyrox::scene::ragdoll::Ragdoll;
 use std::{ops::Range, sync::Arc};
 
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "07d73807-1716-4ea6-bef4-91903c214f7e")]
 pub struct RagdollPreset {
     /// A handle of a hips (pelvis) bone.
     hips: Handle<Node>,
diff --git a/editor/src/plugins/settings.rs b/editor/src/plugins/settings.rs
index 041231a53..653efd00f 100644
--- a/editor/src/plugins/settings.rs
+++ b/editor/src/plugins/settings.rs
@@ -51,7 +51,8 @@ use crate::{
     settings::Settings,
     Editor,
 };
-use fyrox::core::{ok_or_return, uuid, Uuid};
+use fyrox::core::ok_or_return;
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::engine::GraphicsContext;
 use fyrox::gui::button::Button;
 use fyrox::gui::dock::DockingManager;
diff --git a/editor/src/plugins/stats.rs b/editor/src/plugins/stats.rs
index 9a40f0e10..d8c4ab88b 100644
--- a/editor/src/plugins/stats.rs
+++ b/editor/src/plugins/stats.rs
@@ -20,7 +20,7 @@
 
 use crate::{
     fyrox::{
-        core::{pool::Handle, uuid, Uuid},
+        core::pool::Handle,
         engine::ApplicationLoopController,
         gui::{
             menu::{MenuItem, MenuItemMessage},
@@ -36,6 +36,7 @@ use crate::{
     plugin::EditorPlugin,
     Editor,
 };
+use fyrox::core::uuid::{uuid, Uuid};
 
 /// Editor statistics, useful to track number of active widgets, memory consumption, and other
 /// various useful information.
diff --git a/editor/src/plugins/tilemap/autotile.rs b/editor/src/plugins/tilemap/autotile.rs
index 118ae6fc1..ba17ead32 100644
--- a/editor/src/plugins/tilemap/autotile.rs
+++ b/editor/src/plugins/tilemap/autotile.rs
@@ -117,6 +117,7 @@ pub struct AutoTileMacro {
 }
 
 #[derive(Default, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "e50fa366-145d-4491-8126-acdd162031ea")]
 struct CellData {
     terrain_id: TileTerrainId,
     #[reflect(hidden)]
@@ -137,8 +138,8 @@ impl Visit for CellData {
     }
 }
 
-#[derive(Debug, Default, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "b320543d-3df0-43fd-b0d9-60a398f49853")]
+#[derive(Debug, Default, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "b320543d-3df0-43fd-b0d9-60a398f49853")]
 pub(super) struct AutoTileInstance {
     frequency_property: Option<TileSetPropertyF32>,
     pattern_property: Option<TileSetPropertyNine>,
@@ -159,10 +160,6 @@ struct InstanceCellWidgets {
 }
 
 impl ResourceData for AutoTileInstance {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, _path: &std::path::Path) -> Result<(), Box<dyn std::error::Error>> {
         Err("Saving is not supported!".to_string().into())
     }
diff --git a/editor/src/plugins/tilemap/brush_macro.rs b/editor/src/plugins/tilemap/brush_macro.rs
index 4e0630411..ea1fadbd9 100644
--- a/editor/src/plugins/tilemap/brush_macro.rs
+++ b/editor/src/plugins/tilemap/brush_macro.rs
@@ -128,7 +128,7 @@ impl BrushMacroInstance {
     /// A typed reference to the configuration resource.
     pub fn settings<T>(&self) -> Option<Resource<T>>
     where
-        T: ResourceData + Default + TypeUuidProvider,
+        T: ResourceData + Default,
     {
         self.settings.as_ref()?.try_cast()
     }
@@ -211,7 +211,7 @@ impl BrushMacroCellContext {
     /// A typed reference to the configuration resource.
     pub fn settings<T>(&self) -> Option<Resource<T>>
     where
-        T: ResourceData + Default + TypeUuidProvider,
+        T: ResourceData + Default,
     {
         self.settings.as_ref()?.try_cast()
     }
diff --git a/editor/src/plugins/tilemap/collider_editor.rs b/editor/src/plugins/tilemap/collider_editor.rs
index 7f6dab0f3..a7d5f4be4 100644
--- a/editor/src/plugins/tilemap/collider_editor.rs
+++ b/editor/src/plugins/tilemap/collider_editor.rs
@@ -32,7 +32,7 @@ use fyrox::gui::text::Text;
 use fyrox::gui::text_box::TextBox;
 use fyrox::{
     asset::Resource,
-    core::{algebra::Vector2, color::Color, pool::Handle, type_traits::prelude::*},
+    core::{algebra::Vector2, color::Color, pool::Handle},
     gui::{
         border::BorderBuilder,
         brush::Brush,
diff --git a/editor/src/plugins/tilemap/commands.rs b/editor/src/plugins/tilemap/commands.rs
index f756edda6..6192ee4f5 100644
--- a/editor/src/plugins/tilemap/commands.rs
+++ b/editor/src/plugins/tilemap/commands.rs
@@ -20,10 +20,15 @@
 
 //! Commands that allow modifications to tile maps, tile sets, and brushes.
 
+use crate::{
+    command::{CommandContext, CommandTrait},
+    scene::commands::GameSceneContext,
+};
+use fyrox::core::uuid::Uuid;
 use fyrox::{
     core::{
         algebra::Vector2, color::Color, log::Log, pool::Handle, swap_hash_map_entry,
-        ImmutableString, Uuid,
+        ImmutableString,
     },
     fxhash::FxHashMap,
     material::MaterialResource,
@@ -42,11 +47,6 @@ use fyrox::{
     },
 };
 
-use crate::{
-    command::{CommandContext, CommandTrait},
-    scene::commands::GameSceneContext,
-};
-
 #[derive(Debug)]
 pub struct SetColliderLayerNameCommand {
     pub tile_set: TileSetResource,
diff --git a/editor/src/plugins/tilemap/handle_editor.rs b/editor/src/plugins/tilemap/handle_editor.rs
index f5995d41e..6de204b0c 100644
--- a/editor/src/plugins/tilemap/handle_editor.rs
+++ b/editor/src/plugins/tilemap/handle_editor.rs
@@ -28,10 +28,7 @@ use fyrox::gui::inspector::FieldAction;
 use fyrox::gui::message::MessageData;
 use fyrox::gui::text_box::TextBox;
 use fyrox::{
-    core::{
-        color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     gui::{
         brush::Brush,
         button::{ButtonBuilder, ButtonMessage},
@@ -79,9 +76,9 @@ impl MessageData for TileDefinitionHandleEditorMessage {}
 /// pair is the page coordinates and the second pair is the tile coordinates.
 /// When editing the handle, one need merely type four integers. Whatever
 /// characters separate the integers are ignored, so "1 2 3 4" would be accepted.
-#[derive(Clone, Debug, Visit, Reflect, TypeUuidProvider)]
+#[derive(Clone, Debug, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
-#[type_uuid(id = "60146cf0-33e3-4757-8e66-e7196324271f")]
+#[reflect(type_uuid = "60146cf0-33e3-4757-8e66-e7196324271f")]
 pub struct TileDefinitionHandleEditor {
     widget: Widget,
     field: Handle<TextBox>,
diff --git a/editor/src/plugins/tilemap/handle_field.rs b/editor/src/plugins/tilemap/handle_field.rs
index 944792f0e..dae930d64 100644
--- a/editor/src/plugins/tilemap/handle_field.rs
+++ b/editor/src/plugins/tilemap/handle_field.rs
@@ -53,8 +53,8 @@ impl MessageData for TileHandleEditorMessage {}
 /// pair is the page coordinates and the second pair is the tile coordinates.
 /// When editing the handle, one need merely type four integers. Whatever
 /// characters separate the integers are ignored, so "1 2 3 4" would be accepted.
-#[derive(Debug, Default, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "86513074-461d-4583-a214-fb84f5aacac1")]
+#[derive(Debug, Default, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "86513074-461d-4583-a214-fb84f5aacac1")]
 #[reflect(derived_type = "UiNode")]
 pub struct TileHandleField {
     widget: Widget,
diff --git a/editor/src/plugins/tilemap/interaction_mode.rs b/editor/src/plugins/tilemap/interaction_mode.rs
index fed99e079..d2a47e4fa 100644
--- a/editor/src/plugins/tilemap/interaction_mode.rs
+++ b/editor/src/plugins/tilemap/interaction_mode.rs
@@ -28,6 +28,7 @@ use commands::{MoveMapTileCommand, SetMapTilesCommand};
 use fyrox::gui::button::Button;
 use fyrox::{
     asset::untyped::UntypedResource,
+    core::reflect::prelude::*,
     core::SafeLock,
     fxhash::FxHashMap,
     scene::tilemap::{
@@ -38,6 +39,7 @@ use fyrox::{
         TransTilesUpdate,
     },
 };
+use std::fmt::Formatter;
 
 use super::*;
 
@@ -59,8 +61,12 @@ enum MouseMode {
     Drawing,
 }
 
-#[derive(TypeUuidProvider)]
-#[type_uuid(id = "33fa8ef9-a29c-45d4-a493-79571edd870a")]
+#[derive(Reflect)]
+#[reflect(
+    non_cloneable,
+    type_uuid = "33fa8ef9-a29c-45d4-a493-79571edd870a",
+    hide_all
+)]
 pub struct TileMapInteractionMode {
     tile_map: Handle<Node>,
     /// The state that is shared between this interaction mode and the
@@ -105,6 +111,12 @@ pub struct TileMapInteractionMode {
     update_effect: Arc<Mutex<TileUpdateEffect>>,
 }
 
+impl Debug for TileMapInteractionMode {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "TileMapInteractionMode")
+    }
+}
+
 impl TileMapInteractionMode {
     pub fn new(
         tile_map: Handle<Node>,
@@ -823,7 +835,7 @@ impl InteractionMode for TileMapInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 
     fn on_hot_key_pressed(
diff --git a/editor/src/plugins/tilemap/macro_inspector.rs b/editor/src/plugins/tilemap/macro_inspector.rs
index c07bdc4cb..a52bcd405 100644
--- a/editor/src/plugins/tilemap/macro_inspector.rs
+++ b/editor/src/plugins/tilemap/macro_inspector.rs
@@ -40,6 +40,7 @@ const CELL_WITH_MACRO_COLOR: Color = Color::DARK_SLATE_BLUE;
 const CELL_WITHOUT_MACRO_COLOR: Color = Color::opaque(50, 50, 50);
 
 #[derive(Visit, Clone, Reflect)]
+#[reflect(type_uuid = "b003f118-4dda-4529-a791-ad20860c124d")]
 pub struct MacroInspector {
     handle: Handle<UiNode>,
     content: Handle<UiNode>,
diff --git a/editor/src/plugins/tilemap/mod.rs b/editor/src/plugins/tilemap/mod.rs
index d9be70fb8..94e89d25c 100644
--- a/editor/src/plugins/tilemap/mod.rs
+++ b/editor/src/plugins/tilemap/mod.rs
@@ -82,9 +82,7 @@ use crate::fyrox::{
         parking_lot::{Mutex, MutexGuard},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
-        Uuid,
     },
     engine::Engine,
     fxhash::FxHashSet,
@@ -283,6 +281,7 @@ fn make_drawing_mode_button(
 
 /// The possible drawing mode when the user is editing tiles.
 #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "07ae3005-13ee-46b6-aad5-b7a5bb3e1e8c")]
 pub enum DrawingMode {
     /// Paste the currently selected tiles as a stamp wherever the user clicks or drags the mouse.
     #[default]
@@ -720,7 +719,7 @@ impl EditorPlugin for TileMapEditorPlugin {
         editor
             .asset_browser
             .preview_generators
-            .add(TileSet::type_uuid(), TileSetPreview);
+            .add(TileSet::type_info().type_uuid, TileSetPreview);
         let state = editor.engine.resource_manager.state();
         state.constructors_container.add::<AutoTileInstance>();
         state.constructors_container.add::<WfcInstance>();
@@ -858,7 +857,7 @@ impl EditorPlugin for TileMapEditorPlugin {
         }
 
         if let Message::SetInteractionMode(uuid) = message {
-            if *uuid == TileMapInteractionMode::type_uuid() && self.panel.is_none() {
+            if *uuid == TileMapInteractionMode::type_info().type_uuid && self.panel.is_none() {
                 if let Some(tile_map) = self.get_tile_map_mut(editor) {
                     let resource = if let Some(brush) = tile_map.active_brush() {
                         TileBook::Brush(brush.clone())
diff --git a/editor/src/plugins/tilemap/palette.rs b/editor/src/plugins/tilemap/palette.rs
index c421833df..de3b330a4 100644
--- a/editor/src/plugins/tilemap/palette.rs
+++ b/editor/src/plugins/tilemap/palette.rs
@@ -33,7 +33,6 @@ use crate::{
             math::Rect,
             pool::Handle,
             reflect::prelude::*,
-            type_traits::prelude::*,
             visitor::prelude::*,
             SafeLock,
         },
@@ -165,8 +164,8 @@ fn calc_slice_coord(position: f32, step: f32) -> usize {
 
 /// Displays a scrollable grid of till cells, with options to allow the tiles
 /// to be selected, dragged, and edits in various ways.
-#[derive(Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "5356a864-c026-4bd7-a4b1-30bacf77d8fa")]
+#[derive(Clone, Visit, Reflect)]
+#[reflect(type_uuid = "5356a864-c026-4bd7-a4b1-30bacf77d8fa")]
 #[reflect(derived_type = "UiNode")]
 pub struct PaletteWidget {
     widget: Widget,
diff --git a/editor/src/plugins/tilemap/panel_preview.rs b/editor/src/plugins/tilemap/panel_preview.rs
index 36c840bc9..34079da3e 100644
--- a/editor/src/plugins/tilemap/panel_preview.rs
+++ b/editor/src/plugins/tilemap/panel_preview.rs
@@ -29,7 +29,6 @@ use crate::fyrox::{
         math::Rect,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     gui::formatted_text::{FormattedText, FormattedTextBuilder},
@@ -50,8 +49,8 @@ use fyrox::material::MaterialResource;
 /// The preview widget of the tile map control panel. This allows the user to see the
 /// currently selected tile stamp, including whatever transformations have been applied
 /// to the stamp.
-#[derive(Clone, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "5356a864-c026-4bd7-a4b1-30bacf77d8fa")]
+#[derive(Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "5356a864-c026-4bd7-a4b1-30bacf77d8fa")]
 #[reflect(derived_type = "UiNode")]
 pub struct PanelPreview {
     widget: Widget,
diff --git a/editor/src/plugins/tilemap/tile_bounds_editor.rs b/editor/src/plugins/tilemap/tile_bounds_editor.rs
index 09e36a5af..60dc4abfc 100644
--- a/editor/src/plugins/tilemap/tile_bounds_editor.rs
+++ b/editor/src/plugins/tilemap/tile_bounds_editor.rs
@@ -23,7 +23,7 @@ use super::*;
 use fyrox::gui::grid::Grid;
 use fyrox::gui::vec::VecEditor;
 use fyrox::{
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     gui::{
         button::ButtonMessage,
         define_widget_deref,
@@ -46,8 +46,8 @@ pub enum TileBoundsMessage {
 }
 impl MessageData for TileBoundsMessage {}
 
-#[derive(Clone, Default, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "1e600103-6516-4c5a-a30b-f90f64fc9623")]
+#[derive(Clone, Default, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "1e600103-6516-4c5a-a30b-f90f64fc9623")]
 #[reflect(derived_type = "UiNode")]
 pub struct TileBoundsEditor {
     widget: Widget,
diff --git a/editor/src/plugins/tilemap/tile_inspector.rs b/editor/src/plugins/tilemap/tile_inspector.rs
index 2b17d7592..e8b012a32 100644
--- a/editor/src/plugins/tilemap/tile_inspector.rs
+++ b/editor/src/plugins/tilemap/tile_inspector.rs
@@ -30,10 +30,7 @@ use crate::{
 };
 use fyrox::{
     asset::ResourceDataRef,
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*, SafeLock,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*, SafeLock},
     gui::{
         button::{Button, ButtonMessage},
         decorator::DecoratorMessage,
@@ -548,6 +545,7 @@ fn find_collider_value(
 }
 
 #[derive(Clone, Default, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "9c65682b-0160-443c-95fc-0b88f86a497b")]
 struct InspectorField {
     handle: Handle<Grid>,
     field: Handle<UiNode>,
@@ -574,6 +572,7 @@ impl InspectorField {
 
 /// Object that keeps track of the editors for all the property layers.
 #[derive(Clone, Default, Visit, Reflect)]
+#[reflect(type_uuid = "89171a35-a7e7-4ce7-a017-124e8eec5746")]
 struct PropertyEditors {
     handle: Handle<UiNode>,
     content: Handle<UiNode>,
@@ -647,6 +646,7 @@ impl PropertyEditors {
 
 /// Object that keeps track of the editors for all the collider layers.
 #[derive(Clone, Default, Visit, Reflect)]
+#[reflect(type_uuid = "97acc27d-c6fc-491b-9faa-6ad2f124f126")]
 struct ColliderEditors {
     handle: Handle<UiNode>,
     content: Handle<UiNode>,
@@ -719,6 +719,7 @@ impl ColliderEditors {
 }
 
 #[derive(Visit, Reflect, Clone)]
+#[reflect(type_uuid = "cd0f6716-3d7c-4c39-a2aa-98274ca6efa2")]
 pub struct TileInspector {
     handle: Handle<UiNode>,
     /// The shared state that represents the user's currently selected tool and tiles.
diff --git a/editor/src/plugins/tilemap/tile_prop_editor.rs b/editor/src/plugins/tilemap/tile_prop_editor.rs
index 73561359b..998a493b9 100644
--- a/editor/src/plugins/tilemap/tile_prop_editor.rs
+++ b/editor/src/plugins/tilemap/tile_prop_editor.rs
@@ -30,9 +30,7 @@ use fyrox::gui::dropdown_list::DropdownList;
 use fyrox::gui::grid::Grid;
 use fyrox::gui::text::Text;
 use fyrox::{
-    core::{
-        algebra::Vector2, color::Color, pool::Handle, type_traits::prelude::*, ImmutableString,
-    },
+    core::{algebra::Vector2, color::Color, pool::Handle, ImmutableString},
     fxhash::FxHashMap,
     gui::{
         border::BorderBuilder,
@@ -58,6 +56,7 @@ use palette::Subposition;
 use super::*;
 
 #[derive(Debug, Clone, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "d10c7388-94a8-41fa-870c-304e7f2805cc")]
 enum DrawValue {
     I8(i8),
     I32(i32),
diff --git a/editor/src/plugins/tilemap/wfc.rs b/editor/src/plugins/tilemap/wfc.rs
index 6e2e4628d..e8dee3e7d 100644
--- a/editor/src/plugins/tilemap/wfc.rs
+++ b/editor/src/plugins/tilemap/wfc.rs
@@ -71,8 +71,8 @@ pub struct WfcMacro {
     current_terrain: TileTerrainId,
 }
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "24f9947e-f58b-4623-ad14-cb21cd09297e")]
+#[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "24f9947e-f58b-4623-ad14-cb21cd09297e")]
 pub(super) struct WfcInstance {
     frequency_property: Option<TileSetPropertyF32>,
     pattern_property: Option<TileSetPropertyNine>,
@@ -238,10 +238,6 @@ impl WfcInstance {
 }
 
 impl ResourceData for WfcInstance {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, _path: &std::path::Path) -> Result<(), Box<dyn std::error::Error>> {
         Err("Saving is not supported!".to_string().into())
     }
diff --git a/editor/src/scene/clipboard.rs b/editor/src/scene/clipboard.rs
index 881434da1..b953e4b0d 100644
--- a/editor/src/scene/clipboard.rs
+++ b/editor/src/scene/clipboard.rs
@@ -34,7 +34,7 @@ pub struct Clipboard {
 }
 
 impl Reflect for &'static mut Clipboard {
-    blank_reflect_ref!();
+    blank_reflect_ref!("ab09394a-ad19-477b-85cb-5dccf7401c80");
 }
 
 impl Default for Clipboard {
diff --git a/editor/src/scene/commands/mod.rs b/editor/src/scene/commands/mod.rs
index b73998894..b55e04ba3 100644
--- a/editor/src/scene/commands/mod.rs
+++ b/editor/src/scene/commands/mod.rs
@@ -47,6 +47,7 @@ pub mod terrain;
 
 #[derive(Reflect, Debug)]
 #[reflect(non_cloneable)]
+#[reflect(type_uuid = "4dd03d8c-b0c9-43a2-871c-55e5fd603afd")]
 pub struct GameSceneContext {
     pub selection: &'static mut Selection,
     pub scene: &'static mut Scene,
diff --git a/editor/src/scene/container.rs b/editor/src/scene/container.rs
index ff5e744d6..14760f17b 100644
--- a/editor/src/scene/container.rs
+++ b/editor/src/scene/container.rs
@@ -20,7 +20,7 @@
 
 use crate::command::CommandStack;
 use crate::fyrox::{
-    core::{algebra::Vector2, math::Rect, pool::Handle, uuid::Uuid, TypeUuidProvider},
+    core::{algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, uuid::Uuid},
     engine::Engine,
     gui::{
         message::{KeyCode, MouseButton},
@@ -154,7 +154,7 @@ impl EditorSceneEntry {
             command_stack: CommandStack::new(false, settings.general.max_history_entries),
         };
 
-        entry.set_interaction_mode(engine, Some(MoveInteractionMode::type_uuid()));
+        entry.set_interaction_mode(engine, Some(MoveInteractionMode::type_info().type_uuid));
 
         entry
     }
@@ -190,7 +190,7 @@ impl EditorSceneEntry {
             command_stack: CommandStack::new(false, settings.general.max_history_entries),
         };
 
-        entry.set_interaction_mode(engine, Some(UiSelectInteractionMode::type_uuid()));
+        entry.set_interaction_mode(engine, Some(UiSelectInteractionMode::type_info().type_uuid));
 
         entry
     }
diff --git a/editor/src/scene/mod.rs b/editor/src/scene/mod.rs
index 4b3d0e76e..3f36a27e1 100644
--- a/editor/src/scene/mod.rs
+++ b/editor/src/scene/mod.rs
@@ -35,7 +35,6 @@ use crate::{
             pool::{ErasedHandle, Handle},
             reflect::Reflect,
             visitor::Visitor,
-            Uuid,
         },
         engine::{Engine, SerializationContext},
         fxhash::FxHashSet,
@@ -97,6 +96,7 @@ use crate::{
     Message, Settings,
 };
 use fyrox::core::blank_reflect_ref;
+use fyrox::core::uuid::Uuid;
 use fyrox::engine::GraphicsContext;
 use fyrox::gui::file_browser::FileType;
 use fyrox::scene::collider::BitMask;
@@ -1207,7 +1207,7 @@ impl dyn SelectionContainer {
 pub struct Selection(pub Option<Box<dyn SelectionContainer>>);
 
 impl Reflect for &'static mut Selection {
-    blank_reflect_ref!();
+    blank_reflect_ref!("f740f60a-ade1-4357-ac6f-7088e9189518");
 }
 
 impl PartialEq for Selection {
diff --git a/editor/src/scene/nullscene.rs b/editor/src/scene/nullscene.rs
index 860162902..73a2694cf 100644
--- a/editor/src/scene/nullscene.rs
+++ b/editor/src/scene/nullscene.rs
@@ -31,6 +31,7 @@ use super::*;
 /// null scene.
 #[derive(Reflect, Debug)]
 #[reflect(non_cloneable)]
+#[reflect(type_uuid = "09ba866d-db75-46fb-938b-b3cc583f4469")]
 pub struct NullSceneContext {
     pub selection: &'static mut Selection,
     pub message_sender: MessageSender,
diff --git a/editor/src/scene/property.rs b/editor/src/scene/property.rs
index 0d272ba61..658e019fe 100644
--- a/editor/src/scene/property.rs
+++ b/editor/src/scene/property.rs
@@ -21,7 +21,7 @@
 use crate::fyrox::{
     core::{
         make_pretty_type_name, parking_lot::Mutex, pool::Handle, reflect::prelude::*,
-        sstorage::ImmutableString, uuid_provider, visitor::prelude::*,
+        sstorage::ImmutableString, visitor::prelude::*,
     },
     fxhash::FxHashSet,
     graph::SceneGraph,
@@ -291,7 +291,10 @@ where
 }
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "8e58e123-48a1-4e18-9e90-fd35a1669bdc"
+)]
 pub struct PropertySelector {
     widget: Widget,
     #[reflect(hidden)]
@@ -304,8 +307,6 @@ pub struct PropertySelector {
 
 define_widget_deref!(PropertySelector);
 
-uuid_provider!(PropertySelector = "8e58e123-48a1-4e18-9e90-fd35a1669bdc");
-
 impl PropertySelector {
     fn find_selected_tree_items(&self, ui: &UserInterface) -> Vec<Handle<Tree>> {
         let mut stack = vec![self.tree_root.to_base()];
@@ -480,7 +481,10 @@ impl PropertySelectorBuilder {
 }
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "725e4a10-eca6-4345-9833-d54dae2f20f2"
+)]
 pub struct PropertySelectorWindow {
     window: Window,
     selector: Handle<PropertySelector>,
@@ -515,8 +519,6 @@ impl PropertySelectorWindow {
     }
 }
 
-uuid_provider!(PropertySelectorWindow = "725e4a10-eca6-4345-9833-d54dae2f20f2");
-
 impl Control for PropertySelectorWindow {
     control_trait_proxy_impls!(window);
 
diff --git a/editor/src/scene/selector.rs b/editor/src/scene/selector.rs
index 7e57f99b7..e1004d350 100644
--- a/editor/src/scene/selector.rs
+++ b/editor/src/scene/selector.rs
@@ -22,7 +22,7 @@ use crate::{
     fyrox::{
         core::{
             parking_lot::Mutex, pool::ErasedHandle, pool::Handle, reflect::prelude::*,
-            type_traits::prelude::*, visitor::prelude::*,
+            visitor::prelude::*,
         },
         fxhash::FxHashSet,
         graph::{SceneGraph, SceneGraphNode},
@@ -159,6 +159,7 @@ impl HierarchyNode {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "760fdb9d-45f6-4fc1-9fa0-86a802a40a1f")]
 pub struct SelectedHandle {
     #[visit(skip)]
     #[reflect(hidden)]
@@ -206,9 +207,9 @@ struct TreeData {
     pub derived_type_ids: Vec<TypeId>,
 }
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
+#[derive(Debug, Clone, Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
-#[type_uuid(id = "1d718f90-323c-492d-b057-98d47495900a")]
+#[reflect(type_uuid = "1d718f90-323c-492d-b057-98d47495900a")]
 pub struct NodeSelector {
     widget: Widget,
     tree_root: Handle<TreeRoot>,
@@ -427,8 +428,8 @@ impl NodeSelectorBuilder {
     }
 }
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "5bb00f15-d6ec-4f0e-af7e-9472b0e290b4")]
+#[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "5bb00f15-d6ec-4f0e-af7e-9472b0e290b4")]
 #[reflect(derived_type = "UiNode")]
 pub struct NodeSelectorWindow {
     window: Window,
diff --git a/editor/src/settings/build.rs b/editor/src/settings/build.rs
index 50210d982..45acc012c 100644
--- a/editor/src/settings/build.rs
+++ b/editor/src/settings/build.rs
@@ -23,6 +23,7 @@ use fyrox_build_tools::BuildProfile;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "09af1ddc-e918-47a9-af8a-0261927ff022")]
 pub struct BuildSettings {
     #[reflect(hidden)]
     pub selected_profile: usize,
diff --git a/editor/src/settings/camera.rs b/editor/src/settings/camera.rs
index db2973401..2e8ba54a2 100644
--- a/editor/src/settings/camera.rs
+++ b/editor/src/settings/camera.rs
@@ -36,6 +36,7 @@ fn default_zoom_range() -> Range<f32> {
 }
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "f468bb97-6017-4b43-b369-94374ecc4239")]
 pub struct CameraSettings {
     #[serde(default)]
     pub speed: f32,
diff --git a/editor/src/settings/debugging.rs b/editor/src/settings/debugging.rs
index fc771bd25..907cd313a 100644
--- a/editor/src/settings/debugging.rs
+++ b/editor/src/settings/debugging.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "7bfe6c22-7113-41df-b5d9-ec1215a724eb")]
 pub struct DebuggingSettings {
     pub show_physics: bool,
     pub show_bounds: bool,
diff --git a/editor/src/settings/general.rs b/editor/src/settings/general.rs
index 845298a71..0c1cd3dca 100644
--- a/editor/src/settings/general.rs
+++ b/editor/src/settings/general.rs
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use crate::fyrox::core::{reflect::prelude::*, type_traits::prelude::*, uuid_provider};
+use crate::fyrox::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
@@ -37,15 +37,15 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "35e8d30d-1213-4d87-905e-19d48550e6d5")]
+#[reflect(type_uuid = "35e8d30d-1213-4d87-905e-19d48550e6d5")]
 pub enum EditorStyle {
     Dark,
     Light,
 }
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "9f97ae95-85bd-4fe8-9b80-7d45417df7c8")]
 pub struct GeneralSettings {
     /// Defines whether the editor checks for references to an object that is about to be deleted or not.
     pub show_node_removal_dialog: bool,
@@ -123,6 +123,7 @@ fn default_generate_previews() -> bool {
     EnumString,
     VariantNames,
 )]
+#[reflect(type_uuid = "d0c942e8-24e4-40f2-ad2e-1b9f189d3ca2")]
 pub enum ScriptEditor {
     SystemDefault,
     VSCode,
@@ -131,8 +132,6 @@ pub enum ScriptEditor {
     Zed,
 }
 
-uuid_provider!(ScriptEditor = "d0c942e8-24e4-40f2-ad2e-1b9f189d3ca2");
-
 impl Default for GeneralSettings {
     fn default() -> Self {
         Self {
diff --git a/editor/src/settings/graphics.rs b/editor/src/settings/graphics.rs
index 9bb5e8c04..b12ab33d6 100644
--- a/editor/src/settings/graphics.rs
+++ b/editor/src/settings/graphics.rs
@@ -22,6 +22,7 @@ use crate::fyrox::{core::reflect::prelude::*, renderer::QualitySettings};
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "e748b2e7-9d51-4c9b-bb88-ada78bcfa447")]
 pub struct GraphicsSettings {
     pub quality: QualitySettings,
     pub z_near: f32,
diff --git a/editor/src/settings/keys.rs b/editor/src/settings/keys.rs
index 495762eec..88bbaab11 100644
--- a/editor/src/settings/keys.rs
+++ b/editor/src/settings/keys.rs
@@ -29,6 +29,7 @@ use fyrox::gui::message::KeyboardModifiers;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "fbcdc91c-ba63-4d24-b604-c8ffd58834bf")]
 pub struct TerrainKeyBindings {
     pub modify_height_map_mode: HotKey,
     pub draw_on_mask_mode: HotKey,
@@ -42,6 +43,7 @@ pub struct TerrainKeyBindings {
 }
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "82d67946-8b7b-41f0-9520-5d4a927aa68f")]
 pub struct KeyBindings {
     pub move_forward: KeyBinding,
     pub move_back: KeyBinding,
diff --git a/editor/src/settings/log.rs b/editor/src/settings/log.rs
index 25eadf721..973418d87 100644
--- a/editor/src/settings/log.rs
+++ b/editor/src/settings/log.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "e7c93c38-c6aa-4be3-ab9c-85666b976763")]
 pub struct LogSettings {
     pub log_info: bool,
     pub log_warning: bool,
diff --git a/editor/src/settings/mod.rs b/editor/src/settings/mod.rs
index 5535af6d5..43e71b8ad 100644
--- a/editor/src/settings/mod.rs
+++ b/editor/src/settings/mod.rs
@@ -57,6 +57,7 @@ pub mod selection;
 pub mod windows;
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Default, Debug, Reflect)]
+#[reflect(type_uuid = "8b5064fc-e25b-442c-af34-67b12b6f9e66")]
 pub struct SettingsData {
     #[reflect(tag = "Group.Selection")]
     pub selection: SelectionSettings,
diff --git a/editor/src/settings/model.rs b/editor/src/settings/model.rs
index c27b8b3a8..a108ae6bb 100644
--- a/editor/src/settings/model.rs
+++ b/editor/src/settings/model.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::{algebra::Vector3, reflect::prelude::*};
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "126ee9c2-3b75-4fcf-ba25-dcb6c3a0d158")]
 pub struct ModelSettings {
     /// Initial scale the root of the instance will have after instantiation. Useful when you have
     /// lots of huge models and don't want to rescale them manually.
diff --git a/editor/src/settings/move_mode.rs b/editor/src/settings/move_mode.rs
index f6afb0da8..8ecae10d7 100644
--- a/editor/src/settings/move_mode.rs
+++ b/editor/src/settings/move_mode.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::{algebra::Vector3, math, reflect::prelude::*};
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "cb860a68-31ca-4327-8769-082b97a200c1")]
 pub struct MoveInteractionModeSettings {
     pub grid_snapping: bool,
     pub x_snap_step: f32,
diff --git a/editor/src/settings/navmesh.rs b/editor/src/settings/navmesh.rs
index 7f4c6e7a5..af54e5722 100644
--- a/editor/src/settings/navmesh.rs
+++ b/editor/src/settings/navmesh.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "e2432bfe-3204-48e3-9cab-607443246e10")]
 pub struct NavmeshSettings {
     /// Show all navigational meshes in scene. With this function turned off, only currently edited
     /// navmesh will be shown.
diff --git a/editor/src/settings/rotate_mode.rs b/editor/src/settings/rotate_mode.rs
index 6fbc65567..ebc47cee4 100644
--- a/editor/src/settings/rotate_mode.rs
+++ b/editor/src/settings/rotate_mode.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "dd762679-f378-4e0f-9957-cb57277537d6")]
 pub struct RotateInteractionModeSettings {
     pub angle_snapping: bool,
     pub x_snap_step: f32,
diff --git a/editor/src/settings/selection.rs b/editor/src/settings/selection.rs
index 8db82e7a7..eebc3b522 100644
--- a/editor/src/settings/selection.rs
+++ b/editor/src/settings/selection.rs
@@ -22,6 +22,7 @@ use crate::fyrox::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Reflect)]
+#[reflect(type_uuid = "1c251ee7-f805-4051-90c0-0d80aa57eebe")]
 pub struct SelectionSettings {
     pub ignore_back_faces: bool,
 
diff --git a/editor/src/settings/windows.rs b/editor/src/settings/windows.rs
index 74c11aa84..157eef520 100644
--- a/editor/src/settings/windows.rs
+++ b/editor/src/settings/windows.rs
@@ -25,6 +25,7 @@ use crate::fyrox::{
 use serde::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "80cc6a63-e128-4a74-8c79-987ee5fee6e2")]
 pub struct WindowsSettings {
     #[serde(default)]
     pub window_position: Vector2<f32>,
diff --git a/editor/src/test/macros.rs b/editor/src/test/macros.rs
index 3f29149b0..9aa11b3eb 100644
--- a/editor/src/test/macros.rs
+++ b/editor/src/test/macros.rs
@@ -19,11 +19,10 @@
 // SOFTWARE.
 
 use crate::{
-    fyrox::{core::Uuid, engine::ApplicationLoopController},
-    test::utils::EditorTestingExtension,
-    Editor,
+    fyrox::engine::ApplicationLoopController, test::utils::EditorTestingExtension, Editor,
 };
 use fyrox::core::info;
+use fyrox::core::uuid::Uuid;
 use std::collections::VecDeque;
 
 type Action = Box<dyn FnOnce(&mut Editor)>;
diff --git a/editor/src/test/utils.rs b/editor/src/test/utils.rs
index 8c9782d8f..d5d91a649 100644
--- a/editor/src/test/utils.rs
+++ b/editor/src/test/utils.rs
@@ -20,7 +20,7 @@
 
 use crate::{
     fyrox::{
-        core::{algebra::Vector2, info, pool::Handle, Uuid},
+        core::{algebra::Vector2, info, pool::Handle},
         engine::ApplicationLoopController,
         gui::{test::UserInterfaceTestingExtension, Control, UiNode},
     },
@@ -29,6 +29,7 @@ use crate::{
     test::macros::Macro,
     Editor, StartupData,
 };
+use fyrox::core::uuid::Uuid;
 use std::path::PathBuf;
 
 /// Initializes the editor as is a user would open it, adds the specified plugin that runs the test
diff --git a/editor/src/ui_scene/clipboard.rs b/editor/src/ui_scene/clipboard.rs
index 1d931fc9d..2cd91b9cc 100644
--- a/editor/src/ui_scene/clipboard.rs
+++ b/editor/src/ui_scene/clipboard.rs
@@ -35,7 +35,7 @@ pub struct Clipboard {
 }
 
 impl Reflect for &'static mut Clipboard {
-    blank_reflect_ref!();
+    blank_reflect_ref!("5c62193c-3be8-48f3-ac0d-d278e8ac3925");
 }
 
 impl Default for Clipboard {
diff --git a/editor/src/ui_scene/commands/mod.rs b/editor/src/ui_scene/commands/mod.rs
index d5b729ee9..45578502e 100644
--- a/editor/src/ui_scene/commands/mod.rs
+++ b/editor/src/ui_scene/commands/mod.rs
@@ -32,6 +32,7 @@ use fyrox::gui::UiNode;
 
 #[derive(Reflect, Debug)]
 #[reflect(non_cloneable)]
+#[reflect(type_uuid = "32b695b1-7c5d-4cfd-b53b-2e879b78b749")]
 pub struct UiSceneContext {
     pub ui: &'static mut UserInterface,
     pub selection: &'static mut Selection,
diff --git a/editor/src/ui_scene/interaction/mod.rs b/editor/src/ui_scene/interaction/mod.rs
index 486a825e6..b16e883d5 100644
--- a/editor/src/ui_scene/interaction/mod.rs
+++ b/editor/src/ui_scene/interaction/mod.rs
@@ -24,8 +24,8 @@ use crate::{
         core::{
             algebra::Vector2,
             pool::Handle,
+            reflect::prelude::*,
             uuid::{uuid, Uuid},
-            TypeUuidProvider,
         },
         engine::Engine,
         gui::{widget::WidgetMessage, BuildContext, UiNode},
@@ -43,6 +43,8 @@ use fyrox::gui::image::Image;
 
 pub mod move_mode;
 
+#[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "12e550dc-0fb2-4a45-8060-fa363db3e197")]
 pub struct UiSelectInteractionMode {
     preview: Handle<Image>,
     selection_frame: Handle<Border>,
@@ -67,12 +69,6 @@ impl UiSelectInteractionMode {
     }
 }
 
-impl TypeUuidProvider for UiSelectInteractionMode {
-    fn type_uuid() -> Uuid {
-        uuid!("12e550dc-0fb2-4a45-8060-fa363db3e197")
-    }
-}
-
 impl InteractionMode for UiSelectInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -222,6 +218,6 @@ impl InteractionMode for UiSelectInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/ui_scene/interaction/move_mode.rs b/editor/src/ui_scene/interaction/move_mode.rs
index 95d31f29a..816c35797 100644
--- a/editor/src/ui_scene/interaction/move_mode.rs
+++ b/editor/src/ui_scene/interaction/move_mode.rs
@@ -19,10 +19,7 @@
 // SOFTWARE.
 
 use crate::fyrox::{
-    core::{
-        algebra::Point2, algebra::Vector2, pool::Handle, uuid::Uuid, uuid_provider,
-        TypeUuidProvider,
-    },
+    core::{algebra::Point2, algebra::Vector2, pool::Handle, reflect::prelude::*, uuid::Uuid},
     engine::Engine,
     graph::SceneGraph,
     gui::{BuildContext, UiNode},
@@ -37,6 +34,8 @@ use crate::{
 };
 use fyrox::gui::button::Button;
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "05a1b439-d354-45b1-9014-10393c5ba35d")]
 struct Entry {
     widget: Handle<UiNode>,
     initial_local_position: Vector2<f32>,
@@ -44,10 +43,14 @@ struct Entry {
     delta: Vector2<f32>,
 }
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "c9b6b3d6-ade9-4da2-a5e7-48893f24d97f")]
 struct MoveContext {
     entries: Vec<Entry>,
 }
 
+#[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "e5c09b04-5c31-4044-ac48-5227ab4a4b83")]
 pub struct MoveWidgetsInteractionMode {
     move_context: Option<MoveContext>,
     sender: MessageSender,
@@ -62,8 +65,6 @@ impl MoveWidgetsInteractionMode {
     }
 }
 
-uuid_provider!(MoveWidgetsInteractionMode = "e5c09b04-5c31-4044-ac48-5227ab4a4b83");
-
 impl InteractionMode for MoveWidgetsInteractionMode {
     fn on_left_mouse_button_down(
         &mut self,
@@ -213,6 +214,6 @@ impl InteractionMode for MoveWidgetsInteractionMode {
     }
 
     fn uuid(&self) -> Uuid {
-        Self::type_uuid()
+        Self::type_info().type_uuid
     }
 }
diff --git a/editor/src/ui_scene/menu.rs b/editor/src/ui_scene/menu.rs
index 776030175..91cc62dcc 100644
--- a/editor/src/ui_scene/menu.rs
+++ b/editor/src/ui_scene/menu.rs
@@ -43,7 +43,7 @@ use crate::{
     Engine, Message,
 };
 use fyrox::asset::manager::ResourceManager;
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::constructor::WidgetConstructorContainer;
 use fyrox::gui::menu::{ContextMenuBuilder, MenuItem};
 use std::path::PathBuf;
diff --git a/editor/src/world/item.rs b/editor/src/world/item.rs
index 577f54411..bb17b3a13 100644
--- a/editor/src/world/item.rs
+++ b/editor/src/world/item.rs
@@ -22,7 +22,7 @@ use crate::{
     fyrox::{
         core::{
             algebra::Vector2, color::Color, pool::ErasedHandle, pool::Handle, reflect::prelude::*,
-            uuid_provider, visitor::prelude::*,
+            visitor::prelude::*,
         },
         graph::SceneGraph,
         gui::{
@@ -73,6 +73,7 @@ pub enum DropAnchor {
 
 #[derive(Visit, Reflect)]
 #[reflect(derived_type = "UiNode")]
+#[reflect(type_uuid = "16f35257-a250-413b-ab51-b1ad086a3a9c")]
 pub struct SceneItem {
     pub tree: Tree,
     text_name: Handle<Text>,
@@ -130,8 +131,6 @@ impl DerefMut for SceneItem {
     }
 }
 
-uuid_provider!(SceneItem = "16f35257-a250-413b-ab51-b1ad086a3a9c");
-
 impl Control for SceneItem {
     fn measure_override(&self, ui: &UserInterface, available_size: Vector2<f32>) -> Vector2<f32> {
         self.tree.measure_override(ui, available_size)
diff --git a/editor/src/world/menu.rs b/editor/src/world/menu.rs
index d78590ce0..1793f4e3f 100644
--- a/editor/src/world/menu.rs
+++ b/editor/src/world/menu.rs
@@ -59,7 +59,7 @@ use crate::{
     world::WorldViewerItemContextMenu,
     Engine, Message, PasteCommand,
 };
-use fyrox::core::{uuid, Uuid};
+use fyrox::core::uuid::{uuid, Uuid};
 use fyrox::gui::file_browser::{FileSelector, FileType};
 use fyrox::gui::menu::MenuItem;
 use fyrox::gui::window::WindowAlignment;
diff --git a/fyrox-animation/src/container.rs b/fyrox-animation/src/container.rs
index c303b951e..fe268fd94 100644
--- a/fyrox-animation/src/container.rs
+++ b/fyrox-animation/src/container.rs
@@ -36,6 +36,7 @@ use fyrox_core::algebra::{Quaternion, UnitQuaternion};
 /// The kind of track output value, the animation system works only with numeric properties and the number
 /// of variants is small.
 #[derive(Clone, Copy, Debug, Visit, Reflect, PartialEq, Eq, Default)]
+#[reflect(type_uuid = "1b0d11b8-5276-4633-9179-355f8521bd40")]
 pub enum TrackValueKind {
     /// A real number. Requires only 1 parametric curve.
     Real,
@@ -80,6 +81,7 @@ impl TrackValueKind {
 
 /// Interpolation mode for track data.
 #[derive(Visit, Reflect, Debug, Clone, Default, PartialEq)]
+#[reflect(type_uuid = "592fa764-097f-4a71-a1a1-e53b63f49c1a")]
 pub enum InterpolationMode {
     /// Default interpolation mode.
     #[default]
@@ -96,6 +98,7 @@ pub enum InterpolationMode {
 /// Each component is bound to a specific curve. For example, in case of [`Vector3`] its components bound
 /// to the following curve indices: `X = 0`, `Y = 1`, `Z = 2`. This order cannot be changed.
 #[derive(Visit, Reflect, Debug, Clone, Default, PartialEq)]
+#[reflect(type_uuid = "23b7fc05-7530-409b-9698-cf079cc38933")]
 pub struct TrackDataContainer {
     curves: Vec<Curve>,
     kind: TrackValueKind,
diff --git a/fyrox-animation/src/lib.rs b/fyrox-animation/src/lib.rs
index 7c6a09731..387d32982 100644
--- a/fyrox-animation/src/lib.rs
+++ b/fyrox-animation/src/lib.rs
@@ -32,7 +32,6 @@ use crate::{
         math::wrapf,
         pool::{ErasedHandle, Handle, Pool, Ticket},
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         visitor::{Visit, VisitResult, Visitor},
         ImmutableString, NameProvider,
@@ -67,8 +66,8 @@ pub mod value;
 /// A container for animation tracks. Multiple animations can share the same container to reduce
 /// memory consumption. It could be extremely useful in case of many instances of a little amount
 /// of kinds of animated models.
-#[derive(Default, Debug, Reflect, Clone, PartialEq, TypeUuidProvider)]
-#[type_uuid(id = "044d9f7c-5c6c-4b29-8de9-d0d975a48256")]
+#[derive(Default, Debug, Reflect, Clone, PartialEq)]
+#[reflect(type_uuid = "044d9f7c-5c6c-4b29-8de9-d0d975a48256")]
 pub struct AnimationTracksData {
     /// Tracks of the animation. See [`Track`] docs for more info.
     pub tracks: Vec<Track>,
@@ -123,10 +122,6 @@ impl Visit for AnimationTracksData {
 }
 
 impl ResourceData for AnimationTracksData {
-    fn type_uuid(&self) -> Uuid {
-        <AnimationTracksData as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
         // TODO
         Ok(())
@@ -268,6 +263,7 @@ pub type AnimationTracksDataResource = Resource<AnimationTracksData>;
 /// is only for the sake of completeness of the example. In the real games you need to add the animation to an animation
 /// player scene node and it will do the job for you.
 #[derive(Debug, Reflect, Visit, PartialEq)]
+#[reflect(type_uuid = "aade8e9d-e2cf-401d-a4d1-59c6943645f3")]
 pub struct Animation<T: EntityId> {
     name: ImmutableString,
     tracks_data: AnimationTracksDataResource,
@@ -292,15 +288,9 @@ pub struct Animation<T: EntityId> {
     events: VecDeque<AnimationEvent>,
 }
 
-impl<T: EntityId> TypeUuidProvider for Animation<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("aade8e9d-e2cf-401d-a4d1-59c6943645f3")
-    }
-}
-
 /// Identifier of an entity, that can be animated.
 pub trait EntityId:
-    Default + Send + Copy + Reflect + Visit + PartialEq + Eq + Hash + Debug + Ord + PartialEq + 'static
+    Default + Send + Copy + Reflect + Visit + PartialEq + Eq + Hash + Ord + PartialEq
 {
 }
 
@@ -311,6 +301,7 @@ impl EntityId for ErasedHandle {}
 /// as well as filter out some unnecessary parts of the motion (i.e. do not extract motion on
 /// Y axis).
 #[derive(Default, Debug, Clone, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "5e80b85f-c8de-439f-b602-9eb70763c9e6")]
 pub struct RootMotionSettings<T: EntityId> {
     /// A handle to a node which movement will be extracted and put in root motion field of an animation
     /// to which these settings were set to.
@@ -953,6 +944,7 @@ impl<T: EntityId> Default for Animation<T> {
 /// A container for animations. It is a tiny wrapper around [`Pool`], you should never create the container yourself,
 /// it is managed by the engine.
 #[derive(Debug, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "f4f9f317-b84a-4880-9c46-e08c1adb574b")]
 pub struct AnimationContainer<T: EntityId> {
     pool: Pool<Animation<T>>,
 }
diff --git a/fyrox-animation/src/machine/layer.rs b/fyrox-animation/src/machine/layer.rs
index 29cf7718c..01bf2f762 100644
--- a/fyrox-animation/src/machine/layer.rs
+++ b/fyrox-animation/src/machine/layer.rs
@@ -82,6 +82,7 @@ use fyrox_core::{find_by_name_mut, find_by_name_ref, NameProvider};
 ///
 /// ```
 #[derive(Default, Debug, Visit, Reflect, Clone, PartialEq)]
+#[reflect(type_uuid = "e24e025c-b816-49f7-8227-f74f75862403")]
 pub struct MachineLayer<T: EntityId> {
     name: String,
 
diff --git a/fyrox-animation/src/machine/mask.rs b/fyrox-animation/src/machine/mask.rs
index 4a71500fa..b61911ea4 100644
--- a/fyrox-animation/src/machine/mask.rs
+++ b/fyrox-animation/src/machine/mask.rs
@@ -28,6 +28,7 @@ use crate::EntityId;
 /// disable animation on animation layers for specific body parts of humanoid (but not only) characters. The
 /// mask holds handles of nodes that **will not** be animated.
 #[derive(Default, Debug, Visit, Reflect, Clone, PartialEq, Eq)]
+#[reflect(type_uuid = "fde99dd1-444f-4c38-a4be-7716933c3115")]
 pub struct LayerMask<T: EntityId> {
     excluded_bones: Vec<T>,
 }
diff --git a/fyrox-animation/src/machine/mod.rs b/fyrox-animation/src/machine/mod.rs
index 9919a7660..797fb1ae2 100644
--- a/fyrox-animation/src/machine/mod.rs
+++ b/fyrox-animation/src/machine/mod.rs
@@ -191,6 +191,7 @@ pub mod transition;
 ///
 /// Complex state machines quite hard to create from code, you should use ABSM editor instead whenever possible.
 #[derive(Default, Debug, Visit, Reflect, Clone, PartialEq)]
+#[reflect(type_uuid = "ce9290d2-022f-4d4a-960f-23c11b3c3eba")]
 pub struct Machine<T: EntityId> {
     parameters: ParameterContainer,
 
diff --git a/fyrox-animation/src/machine/node/blend.rs b/fyrox-animation/src/machine/node/blend.rs
index 04715b7d6..6f9d668fd 100644
--- a/fyrox-animation/src/machine/node/blend.rs
+++ b/fyrox-animation/src/machine/node/blend.rs
@@ -32,8 +32,7 @@ use crate::{
     },
     Animation, AnimationContainer, AnimationEvent, AnimationPose, EntityId,
 };
-use fyrox_core::uuid::{uuid, Uuid};
-use fyrox_core::TypeUuidProvider;
+use fyrox_core::uuid::uuid;
 use std::cmp::Ordering;
 use std::{
     cell::{Cell, Ref, RefCell},
@@ -43,6 +42,7 @@ use std::{
 /// Weighted proxy for animation pose. It has an input pose source and a weight, that tells in which proportion
 /// the pose should be blended into final pose.
 #[derive(Default, Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "b01d7639-7b39-4eaf-87e6-29fd5221951b")]
 pub struct BlendPose<T: EntityId> {
     /// Weight of the pose.
     pub weight: PoseWeight,
@@ -52,12 +52,6 @@ pub struct BlendPose<T: EntityId> {
     pub pose_source: Handle<PoseNode<T>>,
 }
 
-impl<T: EntityId> TypeUuidProvider for BlendPose<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("b01d7639-7b39-4eaf-87e6-29fd5221951b")
-    }
-}
-
 impl<T: EntityId> BlendPose<T> {
     /// Creates new instance of blend pose with given weight and animation pose.
     pub fn new(weight: PoseWeight, pose_source: Handle<PoseNode<T>>) -> Self {
@@ -94,6 +88,7 @@ impl<T: EntityId> BlendPose<T> {
 /// can decrease weight of hit animation over time and increase weight of run animation, so character will recover
 /// from his wounds.
 #[derive(Default, Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "5380c877-e6aa-4d80-b44f-8c72cffcfdb8")]
 pub struct BlendAnimations<T: EntityId> {
     /// Base node.
     pub base: BasePoseNode<T>,
@@ -230,6 +225,7 @@ impl<T: EntityId> AnimationPoseSource<T> for BlendAnimations<T> {
 /// An animation pose with specific blend time. Blend time tells the engine how many time it should use to perform
 /// blending to this pose.
 #[derive(Default, Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "92fcc992-9a68-4152-8449-657546faa286")]
 pub struct IndexedBlendInput<T: EntityId> {
     /// Blend time tells the engine how many time it should use to perform blending to this pose.
     pub blend_time: f32,
@@ -239,12 +235,6 @@ pub struct IndexedBlendInput<T: EntityId> {
     pub pose_source: Handle<PoseNode<T>>,
 }
 
-impl<T: EntityId> TypeUuidProvider for IndexedBlendInput<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("92fcc992-9a68-4152-8449-657546faa286")
-    }
-}
-
 /// A node that switches between given animations using index and smoothly blends from one animation to another
 /// while switching. It is very useful for situations when you need to switch between different animations. For
 /// example you could have an `aim` state, it is suitable for any weapon (you don't need to create a ton of states
@@ -254,6 +244,7 @@ impl<T: EntityId> TypeUuidProvider for IndexedBlendInput<T> {
 /// parameter in the machine parameters. The node will automatically perform smooth transition between different
 /// animations.
 #[derive(Default, Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "3a299514-8362-4112-84c7-277961fdb89b")]
 pub struct BlendAnimationsByIndex<T: EntityId> {
     /// Base node.
     pub base: BasePoseNode<T>,
diff --git a/fyrox-animation/src/machine/node/blendspace.rs b/fyrox-animation/src/machine/node/blendspace.rs
index 3aa143cab..7355d3485 100644
--- a/fyrox-animation/src/machine/node/blendspace.rs
+++ b/fyrox-animation/src/machine/node/blendspace.rs
@@ -34,8 +34,7 @@ use crate::{
     },
     Animation, AnimationContainer, AnimationEvent, AnimationPose, EntityId,
 };
-use fyrox_core::uuid::{uuid, Uuid};
-use fyrox_core::TypeUuidProvider;
+use fyrox_core::uuid::uuid;
 use spade::{DelaunayTriangulation, Point2, Triangulation};
 use std::cmp::Ordering;
 use std::{
@@ -44,18 +43,14 @@ use std::{
 };
 
 #[derive(Debug, Visit, Clone, Reflect, PartialEq, Default)]
+#[reflect(type_uuid = "d163b4b9-aed6-447f-bb93-b7e539099417")]
 pub struct BlendSpacePoint<T: EntityId> {
     pub position: Vector2<f32>,
     pub pose_source: Handle<PoseNode<T>>,
 }
 
-impl<T: EntityId> TypeUuidProvider for BlendSpacePoint<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("d163b4b9-aed6-447f-bb93-b7e539099417")
-    }
-}
-
 #[derive(Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "78ec087e-d07b-4652-b6d5-e291a41a3a8e")]
 pub struct BlendSpace<T: EntityId> {
     base: BasePoseNode<T>,
 
diff --git a/fyrox-animation/src/machine/node/mod.rs b/fyrox-animation/src/machine/node/mod.rs
index 3c3b46a3c..8c14af161 100644
--- a/fyrox-animation/src/machine/node/mod.rs
+++ b/fyrox-animation/src/machine/node/mod.rs
@@ -46,6 +46,7 @@ pub mod play;
 
 /// A set of common data fields that is used in every node.
 #[derive(Debug, Visit, Clone, Default, Reflect, PartialEq)]
+#[reflect(type_uuid = "8fb1a1f3-caa9-47fa-8f1f-002e52807bc7")]
 pub struct BasePoseNode<T: EntityId> {
     /// Position on the canvas, it is editor-specific data.
     pub position: Vector2<f32>,
@@ -57,6 +58,7 @@ pub struct BasePoseNode<T: EntityId> {
 
 /// Specialized node that provides animation pose. See documentation for each variant.
 #[derive(Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "064dc4e5-c45c-432c-9df0-df3bc528fb1a")]
 pub enum PoseNode<T: EntityId> {
     /// See docs for [`PlayAnimation`].
     PlayAnimation(PlayAnimation<T>),
diff --git a/fyrox-animation/src/machine/node/play.rs b/fyrox-animation/src/machine/node/play.rs
index a40b53f6f..c6e424c08 100644
--- a/fyrox-animation/src/machine/node/play.rs
+++ b/fyrox-animation/src/machine/node/play.rs
@@ -42,6 +42,7 @@ use std::{
 /// Animation handle should point to an animation in some animation container see [`AnimationContainer`] docs
 /// for more info.
 #[derive(Default, Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "8b610777-c2ad-4777-ae13-b6619286dabf")]
 pub struct PlayAnimation<T: EntityId> {
     /// Base node.
     pub base: BasePoseNode<T>,
diff --git a/fyrox-animation/src/machine/parameter.rs b/fyrox-animation/src/machine/parameter.rs
index 71f8d2605..a08bd32d1 100644
--- a/fyrox-animation/src/machine/parameter.rs
+++ b/fyrox-animation/src/machine/parameter.rs
@@ -22,7 +22,6 @@
 
 use crate::core::{algebra::Vector2, reflect::prelude::*, visitor::prelude::*};
 use fxhash::FxHashMap;
-use fyrox_core::uuid_provider;
 use std::{
     cell::{Cell, RefCell},
     ops::{Deref, DerefMut},
@@ -33,6 +32,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 /// Rule parameter is used to check where transition from a state to state is possible, `Weight` parameters are used to be
 /// a source real numbers that are used to calculate blend weights, etc.
 #[derive(Copy, Clone, Debug, PartialEq, Reflect, Visit, VariantNames, EnumString, AsRefStr)]
+#[reflect(type_uuid = "ace1b8ea-15ee-444d-97be-1682cd9e4245")]
 pub enum Parameter {
     /// Weight parameter is used to control blend weight in animation blending nodes.
     Weight(f32),
@@ -47,8 +47,6 @@ pub enum Parameter {
     SamplingPoint(Vector2<f32>),
 }
 
-uuid_provider!(Parameter = "ace1b8ea-15ee-444d-97be-1682cd9e4245");
-
 impl Default for Parameter {
     fn default() -> Self {
         Self::Weight(0.0)
@@ -57,6 +55,7 @@ impl Default for Parameter {
 
 /// Specific animation pose weight.
 #[derive(Debug, Visit, Clone, PartialEq, Reflect, VariantNames, EnumString, AsRefStr)]
+#[reflect(type_uuid = "46af44ea-eae9-4f3e-803c-06306caed23f")]
 pub enum PoseWeight {
     /// Fixed scalar value. Should not be negative, negative numbers will probably result in weird visual artifacts.
     Constant(f32),
@@ -65,8 +64,6 @@ pub enum PoseWeight {
     Parameter(String),
 }
 
-uuid_provider!(PoseWeight = "46af44ea-eae9-4f3e-803c-06306caed23f");
-
 impl PoseWeight {
     /// Calculates the actual pose weight value.
     pub fn value(&self, params: &ParameterContainer) -> Option<f32> {
@@ -91,6 +88,7 @@ impl Default for PoseWeight {
 
 /// A parameter value with its name.
 #[derive(Reflect, Visit, Default, Debug, Clone, PartialEq)]
+#[reflect(type_uuid = "6cbba5c9-8daf-4f4c-a920-9716ed233d89")]
 pub struct ParameterDefinition {
     /// Name of the parameter.
     pub name: String,
@@ -99,8 +97,6 @@ pub struct ParameterDefinition {
     pub value: Parameter,
 }
 
-uuid_provider!(ParameterDefinition = "6cbba5c9-8daf-4f4c-a920-9716ed233d89");
-
 #[derive(Default, Debug, Clone)]
 struct Wrapper {
     parameters: Vec<ParameterDefinition>,
@@ -136,6 +132,7 @@ impl DerefMut for Wrapper {
 
 /// A container for all parameters used by a state machine. Parameters are shared across multiple animation layers.
 #[derive(Reflect, Visit, Default, Debug)]
+#[reflect(type_uuid = "d4e8f9fe-24af-4ee8-bcba-c896b1b9a40f")]
 pub struct ParameterContainer {
     #[reflect(deref)]
     parameters: Wrapper,
diff --git a/fyrox-animation/src/machine/state.rs b/fyrox-animation/src/machine/state.rs
index c0f1082c4..ea9eed76e 100644
--- a/fyrox-animation/src/machine/state.rs
+++ b/fyrox-animation/src/machine/state.rs
@@ -33,8 +33,8 @@ use crate::{
 };
 use fxhash::FxHashSet;
 use fyrox_core::pool::PoolError;
-use fyrox_core::uuid::{uuid, Uuid};
-use fyrox_core::{NameProvider, TypeUuidProvider};
+use fyrox_core::uuid::uuid;
+use fyrox_core::NameProvider;
 use std::{
     cell::Ref,
     ops::{Deref, DerefMut},
@@ -43,14 +43,9 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 #[doc(hidden)]
 #[derive(Default, Debug, Visit, Reflect, Clone, PartialEq)]
+#[reflect(type_uuid = "d686fac8-5cc1-46b1-82a4-7f4438cc078d")]
 pub struct StateActionWrapper<T: EntityId>(pub StateAction<T>);
 
-impl<T: EntityId> TypeUuidProvider for StateActionWrapper<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("d686fac8-5cc1-46b1-82a4-7f4438cc078d")
-    }
-}
-
 impl<T: EntityId> Deref for StateActionWrapper<T> {
     type Target = StateAction<T>;
 
@@ -72,6 +67,7 @@ impl<T: EntityId> DerefMut for StateActionWrapper<T> {
 /// to tell the engine to automatically rewind the animation before using it. Otherwise, when the
 /// transition will happen, the animation could be ended already and you'll get "frozen" animation.
 #[derive(Default, Debug, Visit, Reflect, Clone, PartialEq, VariantNames, EnumString, AsRefStr)]
+#[reflect(type_uuid = "c50a15cc-0f63-4409-bbe0-74b9d3e94755")]
 pub enum StateAction<T: EntityId> {
     /// No action.
     #[default]
@@ -89,12 +85,6 @@ pub enum StateAction<T: EntityId> {
     EnableRandomAnimation(Vec<Handle<Animation<T>>>),
 }
 
-impl<T: EntityId> TypeUuidProvider for StateAction<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("c50a15cc-0f63-4409-bbe0-74b9d3e94755")
-    }
-}
-
 impl<T: EntityId> StateAction<T> {
     /// Applies the action to the given animation container.
     pub fn apply(&self, animations: &mut AnimationContainer<T>) {
@@ -129,6 +119,7 @@ impl<T: EntityId> StateAction<T> {
 /// State is a final "container" for animation pose. It has backing pose node which provides a set of values.
 /// States can be connected with each other using _transitions_, states with transitions form a state graph.
 #[derive(Default, Debug, Visit, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "0d78e1e8-ca1e-4155-9af1-17e379d13a02")]
 pub struct State<T: EntityId> {
     /// Position of state on the canvas. It is editor-specific data.
     pub position: Vector2<f32>,
diff --git a/fyrox-animation/src/machine/transition.rs b/fyrox-animation/src/machine/transition.rs
index a61023075..541000275 100644
--- a/fyrox-animation/src/machine/transition.rs
+++ b/fyrox-animation/src/machine/transition.rs
@@ -25,14 +25,14 @@ use crate::{
     machine::{Parameter, ParameterContainer, State},
     Animation, AnimationContainer, EntityId,
 };
-use fyrox_core::uuid::{uuid, Uuid};
-use fyrox_core::{NameProvider, TypeUuidProvider};
+use fyrox_core::uuid::uuid;
+use fyrox_core::NameProvider;
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 macro_rules! define_two_args_node {
     ($(#[$meta:meta])* $name:ident) => {
-        $(#[$meta])*
         #[derive(Debug, Clone, PartialEq, Reflect, Visit)]
+        $(#[$meta])*
         pub struct $name <T:EntityId> {
             /// Left argument.
             pub lhs: Box<LogicNode<T>>,
@@ -53,19 +53,23 @@ macro_rules! define_two_args_node {
 
 define_two_args_node!(
     /// Calculates logical AND between two arguments. Output value will be `true` iff both of the arguments is `true`.
+    #[reflect(type_uuid = "cd0e3ec8-54d0-40da-b182-d7f8e9df7ed6")]
     AndNode
 );
 define_two_args_node!(
     /// Calculates logical OR between two arguments. Output value will be `true` iff any of the arguments is `true`.
+    #[reflect(type_uuid = "ed98d148-c6d2-45a3-b322-63dc5b09f396")]
     OrNode
 );
 define_two_args_node!(
     /// Calculates logical XOR (excluding OR) between two arguments. Output value will be `true` iff the arguments differ.
+    #[reflect(type_uuid = "7b853d2e-3659-4060-a5be-2fae7a68431b")]
     XorNode
 );
 
 /// Calculates logical NOT of an argument. Output value will be `true` if the value of the argument is `false`.
 #[derive(Debug, Clone, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "3ee5dca4-8509-4251-8591-7adb4a90264b")]
 pub struct NotNode<T: EntityId> {
     /// Argument to be negated.
     pub lhs: Box<LogicNode<T>>,
@@ -106,6 +110,7 @@ impl<T: EntityId> Default for NotNode<T> {
 /// assert_eq!(transition_logic.calculate_value(&parameters, &AnimationContainer::default()), true);
 /// ```
 #[derive(Debug, Visit, Clone, Reflect, PartialEq, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "98a5b767-5560-4ed7-ad40-1625a8868e39")]
 pub enum LogicNode<T: EntityId> {
     /// Fetches a value of `Rule` parameter and returns its value. `false` if the parameter is not found.
     Parameter(String),
@@ -121,12 +126,6 @@ pub enum LogicNode<T: EntityId> {
     IsAnimationEnded(Handle<Animation<T>>),
 }
 
-impl<T: EntityId> TypeUuidProvider for LogicNode<T> {
-    fn type_uuid() -> Uuid {
-        uuid!("98a5b767-5560-4ed7-ad40-1625a8868e39")
-    }
-}
-
 impl<T: EntityId> Default for LogicNode<T> {
     fn default() -> Self {
         Self::Parameter(Default::default())
@@ -174,6 +173,7 @@ impl<T: EntityId> LogicNode<T> {
 
 /// Transition is a connection between two states with a rule that defines possibility of actual transition with blending.
 #[derive(Default, Debug, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "2c0bb5f4-4496-4a8b-a719-c0c48650dce6")]
 pub struct Transition<T: EntityId> {
     /// The name of the transition, it is used for debug output.
     pub(crate) name: String,
diff --git a/fyrox-animation/src/signal.rs b/fyrox-animation/src/signal.rs
index a9c40a91b..6e9387a58 100644
--- a/fyrox-animation/src/signal.rs
+++ b/fyrox-animation/src/signal.rs
@@ -40,6 +40,7 @@ pub struct AnimationEvent {
 /// After that all you need to do is to fetch animation events one-by-one and emit respective sounds. See [`AnimationSignal`] docs
 /// for more info and examples.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "37a7fcb2-048a-4f4c-b0ae-013df0ef4f1b")]
 pub struct AnimationSignal {
     /// An id of the animation signal. Any event produced by the signal will have this id.
     pub id: Uuid,
diff --git a/fyrox-animation/src/spritesheet/mod.rs b/fyrox-animation/src/spritesheet/mod.rs
index feff51110..9ae5489ae 100644
--- a/fyrox-animation/src/spritesheet/mod.rs
+++ b/fyrox-animation/src/spritesheet/mod.rs
@@ -24,15 +24,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
-        algebra::Vector2,
-        math::Rect,
-        reflect::prelude::*,
-        uuid::{uuid, Uuid},
-        uuid_provider,
-        visitor::prelude::*,
-        TypeUuidProvider,
-    },
+    core::{algebra::Vector2, math::Rect, reflect::prelude::*, uuid::uuid, visitor::prelude::*},
     spritesheet::signal::Signal,
 };
 use std::collections::vec_deque::VecDeque;
@@ -49,6 +41,7 @@ impl<T: PartialEq + Clone + Visit + Reflect + Default> SpriteSheetTexture for T
 #[derive(
     Visit, Reflect, Copy, Clone, Eq, PartialEq, Debug, AsRefStr, EnumString, VariantNames, Default,
 )]
+#[reflect(type_uuid = "74a31122-a7a8-476c-ab87-77e53cf0523c")]
 pub enum Status {
     /// Animation is playing.
     Playing,
@@ -62,10 +55,9 @@ pub enum Status {
     Paused,
 }
 
-uuid_provider!(Status = "74a31122-a7a8-476c-ab87-77e53cf0523c");
-
 /// Some animation event.
 #[derive(Visit, Reflect, Clone, Debug, Eq, PartialEq)]
+#[reflect(type_uuid = "78d527d0-de7d-41e8-abe6-48b8ae550fc7")]
 #[non_exhaustive]
 pub enum Event {
     /// A signal with an id was hit.
@@ -80,6 +72,7 @@ impl Default for Event {
 
 /// Container for a sprite sheet animation frames.
 #[derive(Reflect, Visit, Clone, Debug, PartialEq, Eq)]
+#[reflect(type_uuid = "7c0bc2a6-b6be-463b-ac33-d6e4daf8b691")]
 pub struct SpriteSheetFramesContainer<T>
 where
     T: SpriteSheetTexture,
@@ -168,6 +161,7 @@ where
 /// Sprite sheet animation is an animation based on key frames, where each key frame is packed into single image. Usually, all key
 /// frames have the same size, but this is not mandatory.
 #[derive(Visit, Reflect, Clone, Debug)]
+#[reflect(type_uuid = "1fa13feb-a16d-4539-acde-672aaeb0f62b")]
 pub struct SpriteSheetAnimation<T>
 where
     T: SpriteSheetTexture,
@@ -200,15 +194,6 @@ impl<T: SpriteSheetTexture> PartialEq for SpriteSheetAnimation<T> {
     }
 }
 
-impl<T> TypeUuidProvider for SpriteSheetAnimation<T>
-where
-    T: SpriteSheetTexture,
-{
-    fn type_uuid() -> Uuid {
-        uuid!("1fa13feb-a16d-4539-acde-672aaeb0f62b")
-    }
-}
-
 impl<T> Default for SpriteSheetAnimation<T>
 where
     T: SpriteSheetTexture,
@@ -293,6 +278,7 @@ where
     /// # use fyrox_core::{reflect::prelude::*, visitor::prelude::*};
     /// #
     /// #[derive(PartialEq, Clone, Reflect, Visit, Debug, Default)]
+    /// #[reflect(type_uuid = "cd0e3ec8-54d0-40da-b182-d7f8e9df7ed6")]
     /// struct MyTexture {}
     ///
     /// fn extract_animations() {
@@ -596,6 +582,7 @@ mod test {
     use fyrox_core::{algebra::Vector2, math::Rect, reflect::prelude::*, visitor::prelude::*};
 
     #[derive(PartialEq, Clone, Reflect, Visit, Debug, Default)]
+    #[reflect(type_uuid = "38425475-1f56-4c6a-9ef5-bb59d42d45fa")]
     struct MyTexture {}
 
     #[test]
diff --git a/fyrox-animation/src/spritesheet/signal.rs b/fyrox-animation/src/spritesheet/signal.rs
index cb72196f6..6028e37a1 100644
--- a/fyrox-animation/src/spritesheet/signal.rs
+++ b/fyrox-animation/src/spritesheet/signal.rs
@@ -22,11 +22,11 @@
 //! started to play a specific frame.
 
 use crate::core::{reflect::prelude::*, visitor::prelude::*};
-use fyrox_core::uuid_provider;
 
 /// Animation signal is used as a point at which to notify external observers that animation just
 /// started to play a specific frame.
 #[derive(PartialEq, Visit, Reflect, Debug, Clone)]
+#[reflect(type_uuid = "30fd963f-4ce7-4dcc-bdff-691897267420")]
 pub struct Signal {
     /// Signal id. It should be used to distinguish different signals. For example, `JUMP` signal
     /// can have `id = 0`, while `CROUCH` signal - `id = 1`, etc.
@@ -39,8 +39,6 @@ pub struct Signal {
     pub enabled: bool,
 }
 
-uuid_provider!(Signal = "30fd963f-4ce7-4dcc-bdff-691897267420");
-
 impl Default for Signal {
     fn default() -> Self {
         Self {
diff --git a/fyrox-animation/src/track.rs b/fyrox-animation/src/track.rs
index f2f6eafe1..28bc591d2 100644
--- a/fyrox-animation/src/track.rs
+++ b/fyrox-animation/src/track.rs
@@ -32,6 +32,7 @@ use std::fmt::Debug;
 /// Additionally, the binding could be disabled to temporarily prevent animation from affecting the
 /// target.
 #[derive(Debug, Visit, Reflect, Clone, PartialEq)]
+#[reflect(type_uuid = "967751f6-b1ae-433e-b511-8ee477b49bc8")]
 pub struct TrackBinding<T: EntityId> {
     /// The binding could be disabled to temporarily prevent animation from affecting the target.
     pub enabled: bool,
@@ -89,6 +90,7 @@ impl<T: EntityId> TrackBinding<T> {
 /// that contains the actual property data. Parametric curves allows the engine to perform various interpolations between
 /// key values.
 #[derive(Debug, Reflect, Clone, PartialEq, Visit)]
+#[reflect(type_uuid = "9eb99baa-8d4b-4a93-bad2-32b977032149")]
 pub struct Track {
     pub(super) binding: ValueBinding,
     pub(super) frames: TrackDataContainer,
diff --git a/fyrox-animation/src/value.rs b/fyrox-animation/src/value.rs
index 1a60a59f6..ba37a65e7 100644
--- a/fyrox-animation/src/value.rs
+++ b/fyrox-animation/src/value.rs
@@ -39,6 +39,7 @@ use std::{
 
 /// An actual type of a property value.
 #[derive(Visit, Reflect, Clone, Copy, Debug, PartialEq, Eq, Hash, Default)]
+#[reflect(type_uuid = "8f0e5b25-2fd1-4534-8cbf-ac4844548b47")]
 pub enum ValueType {
     /// `bool`
     Bool,
@@ -353,6 +354,7 @@ impl TrackValue {
 /// reflection system, while the special cases handles bindings to standard properties (such as position, scaling, or
 /// rotation) for optimization. Reflection is quite slow to be used as the universal property setting mechanism.  
 #[derive(Default, Clone, Visit, Reflect, Debug, PartialEq, Eq)]
+#[reflect(type_uuid = "077d92ac-fa96-4c5e-bdb1-e3e0acc4adc4")]
 pub enum ValueBinding {
     /// A binding to position of a scene node.
     #[default]
@@ -462,6 +464,7 @@ mod test {
     use fyrox_core::{reflect::prelude::*, variable::InheritableVariable};
 
     #[derive(Reflect, Debug, Clone, PartialEq)]
+    #[reflect(type_uuid = "a59259ab-11a4-4008-8e25-1097841aa6f2")]
     struct OtherStruct {
         field: u32,
         inheritable_variable: InheritableVariable<u32>,
@@ -477,6 +480,7 @@ mod test {
     }
 
     #[derive(Default, Reflect, Clone, Debug, PartialEq)]
+    #[reflect(type_uuid = "4aa11b23-1f85-42cf-9c38-8928c6752f54")]
     struct MyStruct {
         some_bool: bool,
         some_property: f32,
diff --git a/fyrox-build-tools/src/build.rs b/fyrox-build-tools/src/build.rs
index ffa46ec72..25f3535ff 100644
--- a/fyrox-build-tools/src/build.rs
+++ b/fyrox-build-tools/src/build.rs
@@ -19,7 +19,7 @@
 // SOFTWARE.
 
 use fyrox_core::algebra::{Matrix3, Vector2};
-use fyrox_core::Uuid;
+use fyrox_core::uuid::Uuid;
 use fyrox_resource::untyped::ResourceKind;
 use fyrox_ui::button::Button;
 use fyrox_ui::image::Image;
diff --git a/fyrox-build-tools/src/export/mod.rs b/fyrox-build-tools/src/export/mod.rs
index b5382dc62..411de96fd 100644
--- a/fyrox-build-tools/src/export/mod.rs
+++ b/fyrox-build-tools/src/export/mod.rs
@@ -50,6 +50,7 @@ pub struct BuildOutput {
 pub type BuildResult = Result<BuildOutput, String>;
 
 #[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "b1387e05-fb9f-48d8-8776-5b1d2993fa1a")]
 pub struct ExportOptions {
     #[reflect(hidden)]
     pub target_platform: TargetPlatform,
diff --git a/fyrox-build-tools/src/lib.rs b/fyrox-build-tools/src/lib.rs
index d2c7779fd..bbbadc15c 100644
--- a/fyrox-build-tools/src/lib.rs
+++ b/fyrox-build-tools/src/lib.rs
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use fyrox_core::{reflect::prelude::*, type_traits::prelude::*};
+use fyrox_core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 use std::collections::VecDeque;
 use std::fmt::{Display, Formatter};
@@ -26,15 +26,15 @@ use std::fmt::{Display, Formatter};
 pub mod build;
 pub mod export;
 
-#[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Default, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "55e7651e-8840-4c81-aa93-3f01348855e6")]
+#[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Default, Reflect)]
+#[reflect(type_uuid = "55e7651e-8840-4c81-aa93-3f01348855e6")]
 pub struct EnvironmentVariable {
     pub name: String,
     pub value: String,
 }
 
-#[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Default, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "67b93136-17fe-4776-b5f0-f4a9ef3d8972")]
+#[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Default, Reflect)]
+#[reflect(type_uuid = "67b93136-17fe-4776-b5f0-f4a9ef3d8972")]
 pub struct CommandDescriptor {
     pub command: String,
     pub args: Vec<String>,
@@ -74,8 +74,8 @@ impl Display for CommandDescriptor {
     }
 }
 
-#[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Default, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "1a9443df-bf75-42fb-93d3-860a0249168a")]
+#[derive(Deserialize, Serialize, PartialEq, Clone, Debug, Default, Reflect)]
+#[reflect(type_uuid = "1a9443df-bf75-42fb-93d3-860a0249168a")]
 pub struct BuildProfile {
     pub name: String,
     /// A set of commands that will be used to build your game.
diff --git a/fyrox-core-derive/src/lib.rs b/fyrox-core-derive/src/lib.rs
index b0fcb1d08..32dec1c37 100644
--- a/fyrox-core-derive/src/lib.rs
+++ b/fyrox-core-derive/src/lib.rs
@@ -22,7 +22,6 @@
 
 mod reflect;
 mod script_message_payload;
-mod uuid;
 mod visit;
 
 use darling::FromDeriveInput;
@@ -173,15 +172,6 @@ pub fn impl_visit(input: TokenStream) -> TokenStream {
     TokenStream::from(visit::impl_visit(ast))
 }
 
-/// Implements `TypeUuidProvider` trait
-///
-/// User has to import `TypeUuidProvider` trait to use this macro.
-#[proc_macro_derive(TypeUuidProvider, attributes(type_uuid))]
-pub fn type_uuid(input: TokenStream) -> TokenStream {
-    let ast = parse_macro_input!(input as DeriveInput);
-    TokenStream::from(uuid::impl_type_uuid_provider(ast))
-}
-
 /// Implements `ScriptMessagePayload` trait
 ///
 /// User has to import `ScriptMessagePayload` trait to use this macro.
diff --git a/fyrox-core-derive/src/reflect.rs b/fyrox-core-derive/src/reflect.rs
index 8744d98b6..066333e78 100644
--- a/fyrox-core-derive/src/reflect.rs
+++ b/fyrox-core-derive/src/reflect.rs
@@ -443,6 +443,24 @@ fn gen_impl(
         }
     };
 
+    let type_uuid_str = ty_args.type_uuid.as_str();
+    let type_uuid = if ty_args.generics.params.is_empty() {
+        quote! { uuid!(#type_uuid_str) }
+    } else {
+        // Try to combine uuids from types and consts.
+        let mut combined = quote! { uuid!(#type_uuid_str) };
+        for ty in ty_args.generics.type_params() {
+            let type_name = &ty.ident;
+            combined = quote! {combine_uuids(#combined, #type_name::type_info().type_uuid)}
+        }
+        for constant in ty_args.generics.const_params() {
+            let value = &constant.ident;
+            let uuid = quote! { Uuid::from_u64_pair(#value as u64, #value as u64)};
+            combined = quote! {combine_uuids(#combined, #uuid)}
+        }
+        combined
+    };
+
     let types = ty_args
         .derived_type
         .iter()
@@ -466,6 +484,7 @@ fn gen_impl(
                     assembly_name: #assembly_name,
                     doc_comment: #doc,
                     derived_types: &DERIVED_TYPES,
+                    type_uuid: #type_uuid
                 }
             }
 
diff --git a/fyrox-core-derive/src/reflect/args.rs b/fyrox-core-derive/src/reflect/args.rs
index 64b590a61..45b574e0e 100644
--- a/fyrox-core-derive/src/reflect/args.rs
+++ b/fyrox-core-derive/src/reflect/args.rs
@@ -65,6 +65,8 @@ pub struct TypeArgs {
 
     #[darling(default)]
     pub clone_fn: Option<Path>,
+
+    pub type_uuid: String,
 }
 
 impl TypeArgs {
diff --git a/fyrox-core-derive/src/uuid.rs b/fyrox-core-derive/src/uuid.rs
deleted file mode 100644
index cbd9284e6..000000000
--- a/fyrox-core-derive/src/uuid.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2019-present Dmitry Stepanov and Fyrox Engine contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// 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 OR COPYRIGHT HOLDERS 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.
-
-use darling::*;
-use proc_macro2::TokenStream as TokenStream2;
-use quote::*;
-use syn::*;
-
-#[derive(FromDeriveInput)]
-#[darling(attributes(type_uuid), supports(struct_any, enum_any))]
-pub struct TypeArgs {
-    pub ident: Ident,
-    pub generics: Generics,
-    pub id: String,
-}
-
-pub fn impl_type_uuid_provider(ast: DeriveInput) -> TokenStream2 {
-    let ty_args = TypeArgs::from_derive_input(&ast).unwrap();
-    let ty_ident = &ty_args.ident;
-    let id = &ty_args.id;
-
-    let (impl_generics, ty_generics, where_clause) = ty_args.generics.split_for_impl();
-
-    quote! {
-        impl #impl_generics TypeUuidProvider for #ty_ident #ty_generics #where_clause {
-            fn type_uuid() -> Uuid {
-                uuid!(#id)
-            }
-        }
-    }
-}
diff --git a/fyrox-core-derive/tests/it/main.rs b/fyrox-core-derive/tests/it/main.rs
index cf0a36488..70a27c4b0 100644
--- a/fyrox-core-derive/tests/it/main.rs
+++ b/fyrox-core-derive/tests/it/main.rs
@@ -26,5 +26,4 @@
 // trace_macros!(true);
 
 pub mod reflect;
-pub mod uuid;
 pub mod visit;
diff --git a/fyrox-core-derive/tests/it/reflect.rs b/fyrox-core-derive/tests/it/reflect.rs
index 11b08c7d9..fbc727942 100644
--- a/fyrox-core-derive/tests/it/reflect.rs
+++ b/fyrox-core-derive/tests/it/reflect.rs
@@ -27,11 +27,13 @@ use std::{
     ops::{Deref, DerefMut},
 };
 
-use fyrox_core::{parking_lot::Mutex, reflect::*};
+use fyrox_core::reflect::GetField;
+use fyrox_core::{parking_lot::Mutex, reflect::prelude::*};
 
 /// Struct doc comment.
 #[allow(dead_code)]
 #[derive(Reflect, Debug, Clone)]
+#[reflect(type_uuid = "ad7fce64-1e1d-4751-b7c7-63b0f981443d")]
 pub struct Struct {
     /// This is a
     /// multiline doc comment.
@@ -41,9 +43,11 @@ pub struct Struct {
 }
 
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "56bb558c-3e75-44ed-b249-dfe1dc4ae00d")]
 pub struct Tuple(usize, usize);
 
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "e11dd933-5fe0-4e19-9183-e116c438eb0f")]
 pub enum Enum {
     Named { field: usize },
     Tuple(usize),
@@ -141,6 +145,7 @@ fn reflect_containers() {
     }
 
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "414ec606-65bc-478e-94ea-326f477818aa")]
     struct X {
         #[reflect(deref)]
         container: DerefContainer<Struct>,
@@ -163,6 +168,7 @@ fn reflect_containers() {
 
     #[derive(Reflect, Clone, Debug)]
     #[reflect(bounds = "T: Reflect + Clone")]
+    #[reflect(type_uuid = "b3120e24-2c01-40ef-9c89-6ca40e713260")]
     struct B<T> {
         #[reflect(deref)]
         data: Box<T>,
@@ -182,6 +188,7 @@ fn reflect_containers() {
 #[test]
 fn reflect_path() {
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "d539b45a-c8be-4009-95ff-3ac0dfeaa47f")]
     struct Hierarchy {
         s: Struct,
         e: Enum,
@@ -221,11 +228,13 @@ fn reflect_list_path() {
     data.get_resolve_path("[0][1]", &mut |result| assert_eq!(result, Ok(&1usize)));
 
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "19d84906-550f-4dcd-82f8-1261ddc86139")]
     struct X {
         data: Vec<usize>,
     }
 
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "29da25ee-14ae-42b3-89f7-bca518188600")]
     struct A {
         xs: Vec<X>,
     }
@@ -248,6 +257,7 @@ fn reflect_list_path() {
 fn reflect_custom_setter() {
     #[derive(Reflect, Clone, Debug)]
     #[reflect(bounds = "T: Reflect + Clone")]
+    #[reflect(type_uuid = "9b23adf0-e9dd-4fbc-b410-8f9c0da26a20")]
     pub struct Wrapper<T> {
         #[reflect(setter = "set_value")]
         value: T,
@@ -276,6 +286,7 @@ fn reflect_custom_setter() {
 #[test]
 fn reflect_fields_list_of_struct() {
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "45204fc1-ca94-4349-a6b8-f8a812545052")]
     struct Foo {
         field_a: f32,
         field_b: String,
@@ -301,6 +312,7 @@ fn reflect_fields_list_of_struct() {
 #[test]
 fn reflect_fields_list_of_enum() {
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "ea3d20cf-7f77-40d1-b1f3-38cb9f2ccc06")]
     enum Foo {
         Bar { field_a: f32 },
         Baz { field_b: u32, field_c: String },
@@ -348,6 +360,7 @@ fn default_prop_metadata() -> FieldMetadata<'static> {
 #[test]
 fn inspect_default() {
     #[derive(Debug, Default, Clone, Reflect)]
+    #[reflect(type_uuid = "51374579-08e8-4233-930e-239b00938371")]
     pub struct Data {
         the_field: String,
         another_field: f32,
@@ -384,12 +397,14 @@ fn inspect_default() {
 #[test]
 fn inspect_attributes() {
     #[derive(Debug, Default, Clone, Reflect)]
+    #[reflect(type_uuid = "e8bb7752-6ff6-4cbb-87fd-e7c10e5ec970")]
     pub struct AarGee {
         aar: u32,
         gee: u32,
     }
 
     #[derive(Debug, Default, Clone, Reflect)]
+    #[reflect(type_uuid = "4e0709c6-b89a-47cb-ab06-f19b01b85ec1")]
     pub struct Data {
         // NOTE: Even though this field is skipped, the next field is given index `1` for simplicity
         #[reflect(hidden)]
@@ -444,6 +459,7 @@ fn inspect_attributes() {
 #[test]
 fn inspect_struct() {
     #[derive(Debug, Default, Clone, Reflect)]
+    #[reflect(type_uuid = "488c51be-b7d8-4d2b-ad70-fbfd688f372f")]
     struct Tuple(f32, f32);
 
     let x = Tuple::default();
@@ -473,6 +489,7 @@ fn inspect_struct() {
     });
 
     #[derive(Debug, Default, Clone, Reflect)]
+    #[reflect(type_uuid = "ea0a8630-f6ca-45b1-84f4-e49f523328b5")]
     struct Unit;
 
     let x = Unit;
@@ -482,11 +499,13 @@ fn inspect_struct() {
 #[test]
 fn inspect_enum() {
     #[derive(Debug, Clone, Reflect)]
+    #[reflect(type_uuid = "3c045962-be82-4655-8444-ec5867fc8244")]
     pub struct NonCopy {
         inner: u32,
     }
 
     #[derive(Debug, Clone, Reflect)]
+    #[reflect(type_uuid = "1948ec80-47d6-4607-ac39-aa92b225e2a8")]
     pub enum Data {
         Named { x: u32, y: u32, z: NonCopy },
         Tuple(f32, f32),
@@ -581,6 +600,7 @@ fn inspect_enum() {
 fn inspect_prop_key_constants() {
     #[allow(dead_code)]
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "7a97f35b-3919-4ad8-bf7a-72f21c8639c4")]
     pub struct SStruct {
         field: usize,
         #[reflect(hidden)]
@@ -594,10 +614,12 @@ fn inspect_prop_key_constants() {
     // assert_eq!(SStruct::HIDDEN, "hidden");
 
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "16aeb5c7-e3cd-49bd-999f-5d54c159dc20")]
     pub struct STuple(usize);
     assert_eq!(STuple::F_0, "0");
 
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "272d8a6f-59dd-412e-a28a-0e9b63df40cc")]
     #[allow(unused)]
     pub enum E {
         Tuple(usize),
@@ -669,6 +691,7 @@ fn test_hash_map() {
 
     // Check path resolution.
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "89281d16-93d1-4669-8006-f7d371cb28f3")]
     struct Something {
         hash_map: HashMap<String, Struct>,
     }
diff --git a/fyrox-core-derive/tests/it/uuid.rs b/fyrox-core-derive/tests/it/uuid.rs
deleted file mode 100644
index dab78ce42..000000000
--- a/fyrox-core-derive/tests/it/uuid.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2019-present Dmitry Stepanov and Fyrox Engine contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// 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 OR COPYRIGHT HOLDERS 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.
-
-use fyrox_core::type_traits::prelude::*;
-use std::marker::PhantomData;
-
-#[derive(TypeUuidProvider)]
-#[type_uuid(id = "5fb10a22-4ea9-4a13-a58c-82f2734aefd8")]
-struct _Foo {}
-
-#[derive(TypeUuidProvider)]
-#[type_uuid(id = "5fb10a22-4ea9-4a13-a58c-82f2734aefd9")]
-struct _Bar<T> {
-    phantom: PhantomData<T>,
-}
diff --git a/fyrox-core/src/color.rs b/fyrox-core/src/color.rs
index bc3010d1a..f389b167d 100644
--- a/fyrox-core/src/color.rs
+++ b/fyrox-core/src/color.rs
@@ -21,7 +21,6 @@
 use crate::{
     algebra::{Vector3, Vector4},
     reflect::prelude::*,
-    uuid_provider,
     visitor::{Visit, VisitResult, Visitor},
 };
 use bytemuck::{Pod, Zeroable};
@@ -33,6 +32,7 @@ use std::{
 };
 
 #[derive(Copy, Clone, Debug, PartialOrd, PartialEq, Eq, Visit, Reflect, Pod, Zeroable)]
+#[reflect(type_uuid = "74e898aa-de19-44bd-8213-3b6d450b1bf8")]
 #[repr(C)]
 pub struct Color {
     // Do not change order! OpenGL requires this order!
@@ -42,8 +42,6 @@ pub struct Color {
     pub a: u8,
 }
 
-uuid_provider!(Color = "74e898aa-de19-44bd-8213-3b6d450b1bf8");
-
 impl Default for Color {
     #[inline]
     fn default() -> Self {
@@ -81,6 +79,7 @@ impl From<Vector4<f32>> for Color {
 }
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "65ca8b48-dc26-4ab3-bcc2-c45a463f597d")]
 pub struct Hsv {
     /// [0; 360] range
     hue: f32,
diff --git a/fyrox-core/src/color_gradient.rs b/fyrox-core/src/color_gradient.rs
index b3d425a15..9a88af2d2 100644
--- a/fyrox-core/src/color_gradient.rs
+++ b/fyrox-core/src/color_gradient.rs
@@ -26,6 +26,7 @@ use crate::{
 use std::cmp::Ordering;
 
 #[derive(PartialEq, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "76564e00-ecd1-4a8e-93cd-c09ff02d66d6")]
 pub struct GradientPoint {
     location: f32,
     color: Color,
@@ -67,6 +68,7 @@ impl Clone for GradientPoint {
 }
 
 #[derive(PartialEq, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "3b3df19b-b71a-4d05-ac0e-1eee8e53882b")]
 pub struct ColorGradient {
     points: Vec<GradientPoint>,
 }
diff --git a/fyrox-core/src/dyntype.rs b/fyrox-core/src/dyntype.rs
index d93263336..4159912ba 100644
--- a/fyrox-core/src/dyntype.rs
+++ b/fyrox-core/src/dyntype.rs
@@ -24,7 +24,7 @@
 #![warn(missing_docs)]
 
 use crate::reflect::TypeInfo;
-use crate::{reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*, SafeLock};
+use crate::{reflect::prelude::*, visitor::prelude::*, SafeLock};
 use fxhash::FxHashMap;
 use parking_lot::{Mutex, MutexGuard};
 use std::{
@@ -111,10 +111,10 @@ pub trait DynType: Reflect + Visit + Debug + Send {
 
 impl<T> DynType for T
 where
-    T: TypeUuidProvider + Clone + Visit + Reflect + Send,
+    T: Clone + Visit + Reflect + Send,
 {
     fn type_uuid(&self) -> Uuid {
-        <T as TypeUuidProvider>::type_uuid()
+        T::type_info().type_uuid
     }
 
     fn clone_box(&self) -> Box<dyn DynType> {
@@ -146,8 +146,8 @@ impl dyn DynType {
 }
 
 /// A container for a boxed dyntype.
-#[derive(Debug, TypeUuidProvider, Reflect)]
-#[type_uuid(id = "87d9ef74-09a9-4228-a2d1-df270b50fddb")]
+#[derive(Debug, Reflect)]
+#[reflect(type_uuid = "87d9ef74-09a9-4228-a2d1-df270b50fddb")]
 pub struct DynTypeWrapper(#[reflect(deref, display_name = "Data")] pub Box<dyn DynType>);
 
 impl Clone for DynTypeWrapper {
@@ -159,6 +159,7 @@ impl Clone for DynTypeWrapper {
 /// "Nullable" container for a dyntype. This container is essentially a wrapper for [`Option`] that
 /// supports additional functionality and handles serialization for you.
 #[derive(Default, Reflect, Clone, Debug)]
+#[reflect(type_uuid = "c0510bdd-36cd-451c-975b-9333b18db308")]
 pub struct DynTypeContainer(pub Option<DynTypeWrapper>);
 
 impl DynTypeContainer {
@@ -270,7 +271,11 @@ pub struct DynTypeConstructorDefinition {
 
 /// A set of constructors that allows to create a dyntype by its type uuid.
 #[derive(Default, Reflect)]
-#[reflect(hide_all, non_cloneable)] // TODO
+#[reflect(
+    hide_all,
+    non_cloneable,
+    type_uuid = "2a5937b8-b139-4dce-8765-4d63ea17c0e0"
+)] // TODO
 pub struct DynTypeConstructorContainer {
     map: Mutex<FxHashMap<Uuid, DynTypeConstructorDefinition>>,
 }
@@ -295,11 +300,11 @@ impl DynTypeConstructorContainer {
     /// human-readable `name`.
     pub fn add<T, A>(&self, name: &str) -> &Self
     where
-        T: TypeUuidProvider + Default + DynType,
+        T: Default + DynType,
         A: Reflect,
     {
         let old = self.map.safe_lock().insert(
-            <T as TypeUuidProvider>::type_uuid(),
+            T::type_info().type_uuid,
             DynTypeConstructorDefinition {
                 name: name.to_string(),
                 constructor: Box::new(|| Box::new(T::default())),
diff --git a/fyrox-core/src/lib.rs b/fyrox-core/src/lib.rs
index 5a8b0c080..7d63d33fc 100644
--- a/fyrox-core/src/lib.rs
+++ b/fyrox-core/src/lib.rs
@@ -70,7 +70,6 @@ mod safelock;
 pub mod sparse;
 pub mod sstorage;
 pub mod task;
-pub mod type_traits;
 pub mod variable;
 pub mod visitor;
 pub mod watcher;
@@ -90,7 +89,6 @@ pub use wasm_bindgen_futures;
 #[cfg(target_arch = "wasm32")]
 pub use web_sys;
 
-pub use type_traits::prelude::*;
 /// Defines as_(variant), as_mut_(variant) and is_(variant) methods.
 #[macro_export]
 macro_rules! define_is_as {
@@ -636,8 +634,9 @@ mod test {
     use std::path::Path;
 
     use crate::{
-        append_extension, cmp_strings_case_insensitive, combine_uuids, hash_combine,
-        make_relative_path, transmute_vec_as_bytes,
+        append_extension, cmp_strings_case_insensitive, hash_combine, make_relative_path,
+        reflect::prelude::*,
+        transmute_vec_as_bytes,
         visitor::{Visit, Visitor},
         BiDirHashMap,
     };
diff --git a/fyrox-core/src/log.rs b/fyrox-core/src/log.rs
index e990e36f8..320c9eb86 100644
--- a/fyrox-core/src/log.rs
+++ b/fyrox-core/src/log.rs
@@ -72,6 +72,7 @@ static LOG: LazyLock<Mutex<Log>> = LazyLock::new(|| {
 
 /// A kind of message.
 #[derive(Debug, Default, Copy, Clone, PartialOrd, PartialEq, Eq, Ord, Hash, Visit, Reflect)]
+#[reflect(type_uuid = "090d0418-4766-43df-821f-dff65dfe9b6e")]
 #[repr(u32)]
 pub enum MessageKind {
     /// Some useful information.
diff --git a/fyrox-core/src/math/mod.rs b/fyrox-core/src/math/mod.rs
index c0cb3bf98..15043e05a 100644
--- a/fyrox-core/src/math/mod.rs
+++ b/fyrox-core/src/math/mod.rs
@@ -34,10 +34,10 @@ use crate::{
     visitor::prelude::*,
 };
 use fyrox_core_derive::{impl_reflect, impl_visit};
-use std::fmt::Debug;
 
 impl_reflect!(
-    pub struct Rect<T: Debug + Copy> {}
+    #[reflect(type_uuid = "64ef33b7-d05a-4d8d-b0c7-99bcc919271f")]
+    pub struct Rect<T: Reflect + Copy> {}
 );
 
 impl<T> Visit for Rect<T>
@@ -106,6 +106,7 @@ impl Visit for Plane {
 }
 
 impl_reflect!(
+    #[reflect(type_uuid = "f317d328-8a0d-4404-8681-7aae272a0023")]
     pub struct TriangleDefinition(pub [u32; 3]);
 );
 
@@ -118,6 +119,7 @@ impl_visit!(
 );
 
 impl_reflect!(
+    #[reflect(type_uuid = "b20a5c3f-902b-4943-9de2-defbd9709dc2")]
     pub struct SmoothAngle {
         angle: f32,
         target: f32,
@@ -126,6 +128,7 @@ impl_reflect!(
 );
 
 impl_reflect!(
+    #[reflect(type_uuid = "e7e30ddb-9ae9-4bb1-9d68-726b5d99d895")]
     pub enum CurveKeyKind {
         Constant,
         Linear,
@@ -157,7 +160,7 @@ impl_visit!(
 );
 
 impl_reflect!(
-    #[reflect(hide_all)]
+    #[reflect(hide_all, type_uuid = "d42bcb0c-92c6-4fc8-8a6f-2fa5604f0d22")]
     pub struct Curve {
         pub id: Uuid,
         pub name: String,
diff --git a/fyrox-core/src/pool/handle.rs b/fyrox-core/src/pool/handle.rs
index 8c2ac9df7..2206e6963 100644
--- a/fyrox-core/src/pool/handle.rs
+++ b/fyrox-core/src/pool/handle.rs
@@ -20,10 +20,7 @@
 
 use crate::pool::ObjectOrVariant;
 use crate::reflect::{ReflectHandle, TypeInfo};
-use crate::{
-    combine_uuids, pool::INVALID_GENERATION, reflect::prelude::*, uuid_provider,
-    visitor::prelude::*, TypeUuidProvider,
-};
+use crate::{pool::INVALID_GENERATION, reflect::prelude::*, visitor::prelude::*};
 use serde::{Deserialize, Serialize};
 use std::any::{type_name, TypeId};
 use std::{
@@ -33,7 +30,6 @@ use std::{
     marker::PhantomData,
     sync::atomic::{self, AtomicUsize},
 };
-use uuid::Uuid;
 
 /// Handle is some sort of non-owning reference to content in a pool. It stores
 /// index of object and additional information that allows to ensure that handle
@@ -118,6 +114,10 @@ impl<T: Reflect> Reflect for Handle<T> {
             assembly_name: env!("CARGO_PKG_NAME"),
             doc_comment: "",
             derived_types: T::type_info().derived_types,
+            type_uuid: combine_uuids(
+                uuid::uuid!("30c0668d-7a2c-47e6-8c7b-208fdcc905a1"),
+                T::type_info().type_uuid,
+            ),
         }
     }
 
@@ -310,19 +310,6 @@ impl<T> Handle<T> {
     }
 }
 
-impl<T> TypeUuidProvider for Handle<T>
-where
-    T: TypeUuidProvider,
-{
-    #[inline]
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid::uuid!("30c0668d-7a2c-47e6-8c7b-208fdcc905a1"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T> PartialOrd for Handle<T> {
     #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
@@ -430,6 +417,7 @@ impl Debug for AtomicHandle {
 #[derive(
     Copy, Clone, Debug, Ord, PartialOrd, PartialEq, Eq, Hash, Reflect, Visit, Serialize, Deserialize,
 )]
+#[reflect(type_uuid = "50131acc-8b3b-40b5-b495-e2c552c94db3")]
 pub struct ErasedHandle {
     /// Index of object in pool.
     #[reflect(read_only)]
@@ -440,8 +428,6 @@ pub struct ErasedHandle {
     generation: u32,
 }
 
-uuid_provider!(ErasedHandle = "50131acc-8b3b-40b5-b495-e2c552c94db3");
-
 impl Display for ErasedHandle {
     #[inline]
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
diff --git a/fyrox-core/src/pool/mod.rs b/fyrox-core/src/pool/mod.rs
index dba56b50e..02f259a10 100644
--- a/fyrox-core/src/pool/mod.rs
+++ b/fyrox-core/src/pool/mod.rs
@@ -155,6 +155,10 @@ where
             assembly_name: env!("CARGO_PKG_NAME"),
             doc_comment: "",
             derived_types: &[],
+            type_uuid: combine_uuids(
+                uuid!("1f615965-820a-4948-970d-8e99cd588006"),
+                combine_uuids(T::type_info().type_uuid, P::type_info().type_uuid),
+            ),
         }
     }
 
diff --git a/fyrox-core/src/reflect/array.rs b/fyrox-core/src/reflect/array.rs
index 94ce3bb4c..b4132964f 100644
--- a/fyrox-core/src/reflect/array.rs
+++ b/fyrox-core/src/reflect/array.rs
@@ -22,6 +22,7 @@ use crate::blank_reflect;
 use crate::reflect::Reflect;
 use crate::reflect::*;
 use fyrox_core_derive::impl_reflect;
+use uuid::uuid;
 
 /// [`Reflect`] sub trait for working with slices.
 pub trait ReflectArray: Reflect {
@@ -65,7 +66,8 @@ impl<const N: usize, T: Reflect + Clone> ReflectArray for [T; N] {
 }
 
 impl<const N: usize, T: Reflect + Clone> Reflect for [T; N] {
-    blank_reflect!();
+    // TODO: combine uuids.
+    blank_reflect!("6d2a2f2d-d74e-4125-8840-b4910aa2e0cc");
 
     fn as_array(&self) -> Option<&dyn ReflectArray> {
         Some(self)
@@ -77,7 +79,7 @@ impl<const N: usize, T: Reflect + Clone> Reflect for [T; N] {
 }
 
 impl_reflect! {
-    #[reflect(ReflectList, ReflectArray)]
+    #[reflect(ReflectList, ReflectArray, type_uuid = "2d704c2b-c87e-4489-b680-aa9699ba2c91")]
     pub struct Vec<T: Reflect + Clone>;
 }
 
diff --git a/fyrox-core/src/reflect/impls.rs b/fyrox-core/src/reflect/impls.rs
index d4c8f4dae..ba8249907 100644
--- a/fyrox-core/src/reflect/impls.rs
+++ b/fyrox-core/src/reflect/impls.rs
@@ -28,93 +28,195 @@ use crate::{
 };
 use fyrox_core_derive::impl_reflect;
 use nalgebra::*;
-use std::any::type_name;
 use std::{
+    any::type_name,
     cell::{Cell, RefCell},
     fmt::Debug,
     ops::{Deref, DerefMut, Range},
+    path::PathBuf,
     rc::Rc,
     sync::Arc,
     time::{Duration, Instant},
 };
+use uuid::uuid;
 
 impl_reflect! {
-    pub struct Matrix<T: Copy + 'static, R: Dim + 'static, C: Dim + 'static, S: Copy + Debug + Reflect + 'static> {
+    #[reflect(type_uuid = "a1ac7e15-e67d-4df6-b3f6-ed11e1dc15a2")]
+    pub struct Const<const R: usize>;
+}
+
+impl_reflect! {
+    #[reflect(type_uuid = "53ca268f-7f7a-4b1c-bdee-af49f2d89945")]
+    pub struct Matrix<T: Reflect + Copy, R: Dim + Reflect, C: Dim + Reflect, S: Copy + Reflect> {
         pub data: S,
         // _phantoms: PhantomData<(T, R, C)>,
     }
 }
 
 impl_reflect! {
-    pub struct ArrayStorage<T: Copy + Debug + Reflect, const R: usize, const C: usize>(pub [[T; R]; C]);
+    #[reflect(type_uuid = "469986cd-6611-4e61-b6f0-bd2d984913c4")]
+    pub struct ArrayStorage<T: Copy + Reflect, const R: usize, const C: usize>(pub [[T; R]; C]);
 }
 
 impl_reflect! {
-    pub struct Unit<T: Copy + Debug + 'static> {
+    #[reflect(type_uuid = "470e104b-992f-405f-ba6c-c2634502a668")]
+    pub struct Unit<T: Copy + Reflect> {
         // pub(crate) value: T,
     }
 }
 
 impl_reflect! {
+    #[reflect(type_uuid = "3b45cc6d-6db4-4fa3-9d96-edcc87d47919")]
     pub struct Quaternion<T: Copy + Debug + Reflect> {
         pub coords: Vector4<T>,
     }
 }
 
-macro_rules! impl_blank_reflect {
-    ( $( $ty:ty ),* $(,)? ) => {
-        $(
-            impl Reflect for $ty {
-                blank_reflect!();
-            }
-        )*
+impl_reflect! {
+    #[reflect(type_uuid = "399bf5fd-e506-4874-9d2f-ca40ed11bc5d")]
+    pub struct Complex<T: Copy + Debug + Reflect> {
+        pub re: T,
+        pub im: T,
     }
 }
 
-impl_blank_reflect! {
-    f32, f64,
-    usize, u8, u16, u32, u64,
-    isize, i8, i16, i32, i64,
-    bool, char,
-    String,
-    std::path::PathBuf,
-    Duration, Instant,
-    ImmutableString
+impl Reflect for f32 {
+    blank_reflect!("479e29c6-85fd-4bb8-b311-7b98793b8bf6");
 }
 
-macro_rules! impl_reflect_tuple {
-    (
-        $(
-            ( $($t:ident,)* );
-        )*
-    ) => {
-        $(
-            impl< $($t: Clone + Reflect),* > Reflect for ( $($t,)* ) {
-                blank_reflect!();
-            }
-        )*
-    }
+impl Reflect for f64 {
+    blank_reflect!("dac09d54-d069-47f4-aa0e-aa0057cc2b52");
 }
 
-impl_reflect_tuple! {
-    (T0,);
-    (T0, T1, );
-    (T0, T1, T2, );
-    (T0, T1, T2, T3,);
-    (T0, T1, T2, T3, T4,);
+impl Reflect for usize {
+    blank_reflect!("620e24e3-fb51-48c6-a885-91d65135c5c9");
+}
+
+impl Reflect for u8 {
+    blank_reflect!("7a8c337c-0219-466b-92b5-81460fa9c836");
+}
+
+impl Reflect for i8 {
+    blank_reflect!("3036f00e-5986-4ac3-8763-19e51d0889d7");
+}
+
+impl Reflect for u16 {
+    blank_reflect!("c662169d-cc3b-453c-bdf3-e0104ac3b966");
+}
+
+impl Reflect for i16 {
+    blank_reflect!("abce35a9-5e7b-4f7e-a729-2620a9806a6b");
+}
+
+impl Reflect for u32 {
+    blank_reflect!("8c4d2541-76a5-4dd8-9eb1-10222d2d6912");
+}
+
+impl Reflect for i32 {
+    blank_reflect!("7413ddd4-71ce-484d-a808-4f3479f5712d");
+}
+
+impl Reflect for u64 {
+    blank_reflect!("d1a45bd5-5066-4b28-b103-95c59c230e77");
+}
+
+impl Reflect for i64 {
+    blank_reflect!("35b89368-805f-486d-b3b1-fd3e86b5d645");
+}
+
+impl Reflect for isize {
+    blank_reflect!("0a06591a-1c66-4299-ba6f-2b205b795575");
+}
+
+impl Reflect for bool {
+    blank_reflect!("3b104074-9d39-4a2b-b974-da8cc1759fe8");
+}
+
+impl Reflect for PathBuf {
+    blank_reflect!("3b104074-9d39-4a2b-b974-da8cc1759666");
+}
+
+impl Reflect for String {
+    blank_reflect!("3b104074-9d39-4a2b-b974-da8cc1759999");
+}
+
+impl Reflect for char {
+    blank_reflect!("9b5050ef-b3e5-41d2-90f8-8273bcdf7bfb");
+}
+
+impl Reflect for Duration {
+    blank_reflect!("da291c90-a796-439e-8d0e-a3e206693813");
+}
+
+impl Reflect for Instant {
+    blank_reflect!("68bb51d9-7fb6-4391-b05d-59137234577d");
+}
+
+impl Reflect for ImmutableString {
+    blank_reflect!("452caac1-19f7-43d6-9e33-92c2c9163332");
+}
+
+impl<T0> Reflect for (T0,)
+where
+    T0: Clone + Reflect,
+{
+    blank_reflect!("874c2dd7-8e5c-44dd-a4f0-b6e64e07113d");
+}
+
+impl<T0, T1> Reflect for (T0, T1)
+where
+    T0: Clone + Reflect,
+    T1: Clone + Reflect,
+{
+    blank_reflect!("2722316a-172e-4c95-8cb6-b75c81454233");
+}
+
+impl<T0, T1, T2> Reflect for (T0, T1, T2)
+where
+    T0: Clone + Reflect,
+    T1: Clone + Reflect,
+    T2: Clone + Reflect,
+{
+    blank_reflect!("99983877-3ed7-4e58-aef0-3a5951789900");
+}
+
+impl<T0, T1, T2, T3> Reflect for (T0, T1, T2, T3)
+where
+    T0: Clone + Reflect,
+    T1: Clone + Reflect,
+    T2: Clone + Reflect,
+    T3: Clone + Reflect,
+{
+    blank_reflect!("1d9b68be-0bf4-498a-a337-d84960d08049");
+}
+
+impl<T0, T1, T2, T3, T4> Reflect for (T0, T1, T2, T3, T4)
+where
+    T0: Clone + Reflect,
+    T1: Clone + Reflect,
+    T2: Clone + Reflect,
+    T3: Clone + Reflect,
+    T4: Clone + Reflect,
+{
+    blank_reflect!("02a92848-9a7b-4bdf-8cc0-0e525a1a8021");
 }
 
 impl Reflect for () {
-    blank_reflect!();
-}
-
-impl_reflect! { pub struct Uuid; }
-
-impl_reflect! {
-    pub struct Cell<T: Debug + Copy>;
+    blank_reflect!("fb11afff-0afc-467f-b271-7c5b94ea159d");
 }
 
 impl_reflect! {
+    #[reflect(type_uuid = "6f5cc9a7-e8ce-4841-8c82-30007c9c1039")]
+    pub struct Uuid;
+}
+
+impl_reflect! {
+    #[reflect(type_uuid = "c0112c31-73fb-4457-a851-a15c0bae00e6")]
+    pub struct Cell<T: Reflect + Debug + Copy>;
+}
+
+impl_reflect! {
+    #[reflect(type_uuid = "99c30632-b72f-4460-8f3b-c7d3c47b1702")]
     pub enum Option<T: Clone + Debug + Reflect> {
         Some(T),
         None
@@ -122,6 +224,7 @@ impl_reflect! {
 }
 
 impl_reflect! {
+    #[reflect(type_uuid = "0e37a8f6-fae7-48a7-b7b4-f824e40d6d7e")]
     pub struct Range<Idx: Clone + Debug + Reflect> {
         pub start: Idx,
         pub end: Idx,
@@ -136,6 +239,10 @@ impl<T: Reflect + Clone> Reflect for Box<T> {
             assembly_name: env!("CARGO_PKG_NAME"),
             doc_comment: "",
             derived_types: &[],
+            type_uuid: combine_uuids(
+                uuid!("bc74add8-4b4a-4b9f-84ee-b67b21bdad1d"),
+                T::type_info().type_uuid,
+            ),
         }
     }
 
@@ -215,6 +322,7 @@ macro_rules! impl_reflect_inner_mutability {
                 assembly_name: env!("CARGO_PKG_NAME"),
                 doc_comment: "",
                 derived_types: T::type_info().derived_types,
+                type_uuid: T::type_info().type_uuid
             }
         }
 
diff --git a/fyrox-core/src/reflect/macros.rs b/fyrox-core/src/reflect/macros.rs
index 94c65f2a9..cf699784a 100644
--- a/fyrox-core/src/reflect/macros.rs
+++ b/fyrox-core/src/reflect/macros.rs
@@ -138,7 +138,7 @@ macro_rules! newtype_reflect {
 
 #[macro_export]
 macro_rules! blank_reflect {
-    () => {
+    ($type_uuid:expr) => {
         fn type_info() -> $crate::reflect::TypeInfo {
             $crate::reflect::TypeInfo {
                 source_path: file!(),
@@ -146,6 +146,7 @@ macro_rules! blank_reflect {
                 assembly_name: env!("CARGO_PKG_NAME"),
                 doc_comment: "",
                 derived_types: &[],
+                type_uuid: $crate::uuid::uuid!($type_uuid),
             }
         }
 
@@ -186,7 +187,7 @@ macro_rules! blank_reflect {
 
 #[macro_export]
 macro_rules! blank_reflect_ref {
-    () => {
+    ($type_uuid:expr) => {
         fn type_info() -> $crate::reflect::TypeInfo {
             $crate::reflect::TypeInfo {
                 source_path: file!(),
@@ -194,6 +195,7 @@ macro_rules! blank_reflect_ref {
                 assembly_name: env!("CARGO_PKG_NAME"),
                 doc_comment: "",
                 derived_types: &[],
+                type_uuid: $crate::uuid::uuid!($type_uuid),
             }
         }
 
diff --git a/fyrox-core/src/reflect/map.rs b/fyrox-core/src/reflect/map.rs
index dfb28afd8..f275e1d40 100644
--- a/fyrox-core/src/reflect/map.rs
+++ b/fyrox-core/src/reflect/map.rs
@@ -49,7 +49,8 @@ where
     V: Reflect + Clone,
     S: BuildHasher + Clone + 'static,
 {
-    blank_reflect!();
+    // TODO: combine uuids
+    blank_reflect!("56412555-c491-4f28-9604-4609b3f47e53");
 
     fn as_hash_map(&self) -> Option<&dyn ReflectHashMap> {
         Some(self)
diff --git a/fyrox-core/src/reflect/mod.rs b/fyrox-core/src/reflect/mod.rs
index 9d4be462e..1b789ba8d 100644
--- a/fyrox-core/src/reflect/mod.rs
+++ b/fyrox-core/src/reflect/mod.rs
@@ -31,27 +31,39 @@ mod map;
 
 use crate::sstorage::ImmutableString;
 
+pub use array::*;
+pub use error::*;
+pub use field::*;
 pub use fyrox_core_derive::Reflect;
+pub use handle::*;
+pub use inherit::*;
+pub use macros::*;
+pub use map::*;
 use std::{
     any::{Any, TypeId},
     fmt::Debug,
     mem::ManuallyDrop,
 };
-
-pub use array::*;
-pub use error::*;
-pub use field::*;
-pub use handle::*;
-pub use inherit::*;
-pub use macros::*;
-pub use map::*;
+use uuid::Uuid;
 
 pub mod prelude {
     pub use super::{
-        FieldMetadata, FieldMut, FieldRef, Reflect, ReflectArray, ReflectHashMap,
+        combine_uuids, FieldMetadata, FieldMut, FieldRef, Reflect, ReflectArray, ReflectHashMap,
         ReflectInheritableVariable, ReflectList, ResolvePath, SetFieldByPathError, SetFieldError,
         TypeInfo,
     };
+    pub use crate::uuid::{uuid, Uuid};
+}
+
+#[inline]
+pub fn combine_uuids(a: Uuid, b: Uuid) -> Uuid {
+    let mut combined_bytes = a.into_bytes();
+
+    for (src, dest) in b.into_bytes().into_iter().zip(combined_bytes.iter_mut()) {
+        *dest ^= src;
+    }
+
+    Uuid::from_bytes(combined_bytes)
 }
 
 /// A set of useful information about a type that can be queried at runtime.
@@ -80,6 +92,9 @@ pub struct TypeInfo {
     /// derived class, it is just a "link" between this type an others. It is widely used to link
     /// an actual type with its wrapper type (which typically contains `Box<dyn SomeTrait>`).
     pub derived_types: &'static [TypeId],
+
+    /// Unique id of the type.
+    pub type_uuid: Uuid,
 }
 
 /// A trait for runtime reflection.
@@ -997,6 +1012,7 @@ mod test {
     use std::collections::HashMap;
 
     #[derive(Reflect, Clone, Default, PartialEq, Debug)]
+    #[reflect(type_uuid = "407bcd52-9603-4436-b16c-638c8f6ea97e")]
     enum Enum {
         #[default]
         Empty,
@@ -1006,6 +1022,7 @@ mod test {
     }
 
     #[derive(Reflect, Clone, Default, Debug)]
+    #[reflect(type_uuid = "97718a85-3901-407e-9347-b684c0047743")]
     struct Foo {
         enum_field: InheritableVariable<Enum>,
         bar: Bar,
@@ -1015,11 +1032,13 @@ mod test {
     }
 
     #[derive(Reflect, Clone, Default, Debug)]
+    #[reflect(type_uuid = "9465ea72-dd27-43f3-8ccf-b634e4b2887f")]
     struct Item {
         payload: u32,
     }
 
     #[derive(Reflect, Clone, Default, Debug)]
+    #[reflect(type_uuid = "8fb478ac-e4c4-4762-a43a-451147e6e509")]
     struct Bar {
         stuff: String,
     }
@@ -1076,7 +1095,10 @@ mod test {
     }
 
     #[derive(Reflect, Clone, Debug)]
-    #[reflect(derived_type = "Derived")]
+    #[reflect(
+        derived_type = "Derived",
+        type_uuid = "8c093dc1-fd18-45ff-97bc-8d2364b7ed30"
+    )]
     struct Base;
 
     #[allow(dead_code)]
diff --git a/fyrox-core/src/sstorage.rs b/fyrox-core/src/sstorage.rs
index ec5031f9d..3542f82e3 100644
--- a/fyrox-core/src/sstorage.rs
+++ b/fyrox-core/src/sstorage.rs
@@ -25,12 +25,10 @@
 
 use crate::{
     parking_lot::Mutex,
-    uuid_provider,
     visitor::{Visit, VisitResult, Visitor},
     SafeLock,
 };
 use fxhash::{FxHashMap, FxHasher};
-pub use fyrox_core_derive::TypeUuidProvider;
 use serde::{Deserialize, Serialize};
 use std::{
     fmt::{Debug, Display, Formatter},
@@ -59,8 +57,6 @@ struct State {
 #[derive(Clone)]
 pub struct ImmutableString(Arc<State>);
 
-uuid_provider!(ImmutableString = "452caac1-19f7-43d6-9e33-92c2c9163332");
-
 impl Display for ImmutableString {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.write_str(self.0.string.as_ref())
diff --git a/fyrox-core/src/type_traits.rs b/fyrox-core/src/type_traits.rs
deleted file mode 100644
index 0be6175da..000000000
--- a/fyrox-core/src/type_traits.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2019-present Dmitry Stepanov and Fyrox Engine contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// 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 OR COPYRIGHT HOLDERS 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.
-
-use crate::math::Rect;
-pub use fyrox_core_derive::TypeUuidProvider;
-use nalgebra::{SMatrix, Vector2, Vector3, Vector4};
-use std::path::PathBuf;
-use uuid::Uuid;
-
-pub mod prelude {
-    pub use super::{combine_uuids, TypeUuidProvider};
-    pub use uuid::{uuid, Uuid};
-}
-
-/// A trait for an entity that has unique type identifier.
-pub trait TypeUuidProvider: Sized {
-    /// Return type UUID.
-    fn type_uuid() -> Uuid;
-}
-
-#[macro_export]
-macro_rules! uuid_provider {
-    ($type:ty = $uuid:expr) => {
-        impl $crate::type_traits::TypeUuidProvider for $type {
-            fn type_uuid() -> $crate::uuid::Uuid {
-                $crate::uuid::uuid!($uuid)
-            }
-        }
-    };
-}
-
-#[macro_export]
-macro_rules! stub_uuid_provider {
-    ($type:ty) => {
-        impl $crate::TypeUuidProvider for $type {
-            fn type_uuid() -> $crate::uuid::Uuid {
-                unimplemented!()
-            }
-        }
-    };
-}
-
-uuid_provider!(u8 = "7a8c337c-0219-466b-92b5-81460fa9c836");
-uuid_provider!(i8 = "3036f00e-5986-4ac3-8763-19e51d0889d7");
-uuid_provider!(u16 = "c662169d-cc3b-453c-bdf3-e0104ac3b966");
-uuid_provider!(i16 = "abce35a9-5e7b-4f7e-a729-2620a9806a6b");
-uuid_provider!(u32 = "8c4d2541-76a5-4dd8-9eb1-10222d2d6912");
-uuid_provider!(i32 = "7413ddd4-71ce-484d-a808-4f3479f5712d");
-uuid_provider!(u64 = "d1a45bd5-5066-4b28-b103-95c59c230e77");
-uuid_provider!(i64 = "35b89368-805f-486d-b3b1-fd3e86b5d645");
-uuid_provider!(f32 = "479e29c6-85fd-4bb8-b311-7b98793b8bf6");
-uuid_provider!(f64 = "dac09d54-d069-47f4-aa0e-aa0057cc2b52");
-uuid_provider!(usize = "620e24e3-fb51-48c6-a885-91d65135c5c9");
-uuid_provider!(isize = "0a06591a-1c66-4299-ba6f-2b205b795575");
-uuid_provider!(bool = "3b104074-9d39-4a2b-b974-da8cc1759fe8");
-uuid_provider!(PathBuf = "3b104074-9d39-4a2b-b974-da8cc1759666");
-uuid_provider!(String = "3b104074-9d39-4a2b-b974-da8cc1759999");
-uuid_provider!(char = "9b5050ef-b3e5-41d2-90f8-8273bcdf7bfb");
-
-uuid_provider!(Vector2<f32> = "79d4fae7-27f7-4d28-ac3e-6a569b025a82");
-uuid_provider!(Vector3<f32> = "85e32efb-1784-46f7-8ec0-8ee038661ed4");
-uuid_provider!(Vector4<f32> = "c5222adb-5b68-4105-93e9-4ecaee39987f");
-
-uuid_provider!(SMatrix<f32,2,2> = "9ff7f3d0-6c2c-4282-9b90-1822f3818559");
-uuid_provider!(SMatrix<f32,3,3> = "ca636377-9078-4d60-ac6a-e275e88a7e30");
-uuid_provider!(SMatrix<f32,4,4> = "b822b0c6-b396-4950-ba03-40cebad0bfc1");
-uuid_provider!(SMatrix<f64,2,2> = "3d51e09c-df48-4d22-84f7-ae805a24562a");
-uuid_provider!(SMatrix<f64,3,3> = "a3493898-6a81-40e1-9e36-9389587d0f1e");
-uuid_provider!(SMatrix<f64,4,4> = "1277658b-9da7-40fa-98ee-cbf6050c60a4");
-
-impl<T: TypeUuidProvider> TypeUuidProvider for Rect<T> {
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid::uuid!("0f88dcde-f145-4ba0-a5c1-cf5036fa0706"),
-            T::type_uuid(),
-        )
-    }
-}
-
-impl<T: TypeUuidProvider> TypeUuidProvider for Option<T> {
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid::uuid!("ffe06d3b-0d07-42cd-886b-5248f6ca7f7d"),
-            T::type_uuid(),
-        )
-    }
-}
-
-impl<T: TypeUuidProvider> TypeUuidProvider for Vec<T> {
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid::uuid!("51bc577b-5a50-4a97-9b31-eda2f3d46c9c"),
-            T::type_uuid(),
-        )
-    }
-}
-
-#[inline]
-pub fn combine_uuids(a: Uuid, b: Uuid) -> Uuid {
-    let mut combined_bytes = a.into_bytes();
-
-    for (src, dest) in b.into_bytes().into_iter().zip(combined_bytes.iter_mut()) {
-        *dest ^= src;
-    }
-
-    Uuid::from_bytes(combined_bytes)
-}
diff --git a/fyrox-core/src/variable.rs b/fyrox-core/src/variable.rs
index 8026106b0..fac46f5e4 100644
--- a/fyrox-core/src/variable.rs
+++ b/fyrox-core/src/variable.rs
@@ -37,6 +37,7 @@ use std::{
 
 #[derive(Reflect, Copy, Clone, Ord, PartialOrd, PartialEq, Eq)]
 #[repr(transparent)]
+#[reflect(type_uuid = "96d40c31-5c76-44df-a6f7-c5c69b55f36e")]
 pub struct VariableFlags(u8);
 
 bitflags! {
@@ -422,6 +423,10 @@ where
             assembly_name: env!("CARGO_PKG_NAME"),
             doc_comment: "",
             derived_types: T::type_info().derived_types,
+            type_uuid: combine_uuids(
+                uuid!("7ee965ef-5251-4fd8-b9bc-9238ff8d29fe"),
+                T::type_info().type_uuid,
+            ),
         }
     }
 
@@ -743,14 +748,15 @@ mod test {
     use std::{cell::Cell, ops::DerefMut};
 
     #[derive(Reflect, Clone, Debug, PartialEq)]
+    #[reflect(type_uuid = "c4e377d6-80db-4a1c-bfb5-75a2b9157f4e")]
     struct Foo {
         value: InheritableVariable<f32>,
     }
 
     #[derive(Reflect, Clone, Debug, PartialEq)]
+    #[reflect(type_uuid = "4c77a181-c71c-4a08-9bfe-5bbb558ddc96")]
     struct Bar {
         foo: Foo,
-
         other_value: InheritableVariable<String>,
     }
 
@@ -795,6 +801,7 @@ mod test {
     }
 
     #[derive(Reflect, Clone, Debug)]
+    #[reflect(type_uuid = "17b55aac-57f2-42e6-82e0-ead9b40a8cce")]
     enum SomeEnum {
         Bar(InheritableVariable<f32>),
         Baz {
@@ -841,17 +848,20 @@ mod test {
     #[test]
     fn test_collection_inheritance() {
         #[derive(Reflect, Clone, Debug, PartialEq)]
+        #[reflect(type_uuid = "3cbdd81f-e925-4977-88d1-b6fa8075e799")]
         struct Foo {
             some_data: f32,
         }
 
         #[derive(Reflect, Clone, Debug, PartialEq)]
+        #[reflect(type_uuid = "08e2122d-b854-4afa-a62d-95f30745297b")]
         struct CollectionItem {
             foo: InheritableVariable<Foo>,
             bar: InheritableVariable<u32>,
         }
 
         #[derive(Reflect, Clone, Debug, PartialEq)]
+        #[reflect(type_uuid = "67fb16c9-e746-42c6-a325-35db683b07c7")]
         struct MyEntity {
             collection: InheritableVariable<Vec<CollectionItem>>,
         }
@@ -884,11 +894,13 @@ mod test {
     #[test]
     fn test_compound_inheritance() {
         #[derive(Reflect, Clone, Debug, PartialEq, Eq)]
+        #[reflect(type_uuid = "8e44131e-1ef6-4ef3-bf99-edbfba937d2c")]
         struct SomeComplexData {
             foo: InheritableVariable<u32>,
         }
 
         #[derive(Reflect, Clone, Debug, PartialEq)]
+        #[reflect(type_uuid = "fe38a8bc-7580-4f41-bc4c-a14ecb7ad4a7")]
         struct MyEntity {
             some_field: InheritableVariable<f32>,
 
diff --git a/fyrox-graph/src/constructor.rs b/fyrox-graph/src/constructor.rs
index 73aa9d43e..387aa5d8c 100644
--- a/fyrox-graph/src/constructor.rs
+++ b/fyrox-graph/src/constructor.rs
@@ -20,14 +20,15 @@
 
 use fxhash::FxHashMap;
 use fyrox_core::pool::Handle;
+use fyrox_core::uuid::Uuid;
 use fyrox_core::{
     parking_lot::{Mutex, MutexGuard},
     reflect::prelude::*,
-    SafeLock, TypeUuidProvider, Uuid,
+    SafeLock,
 };
 use std::sync::Arc;
 
-pub trait ConstructorProvider<T, Ctx>: TypeUuidProvider + Default + Reflect {
+pub trait ConstructorProvider<T, Ctx>: Default + Reflect {
     fn constructor() -> GraphNodeConstructor<T, Ctx>;
 }
 
@@ -139,7 +140,7 @@ impl<Node, Ctx> GraphNodeConstructorContainer<Node, Ctx> {
         let previous = self
             .map
             .safe_lock()
-            .insert(Inner::type_uuid(), Inner::constructor());
+            .insert(Inner::type_info().type_uuid, Inner::constructor());
         assert!(previous.is_none());
     }
 
diff --git a/fyrox-graph/src/lib.rs b/fyrox-graph/src/lib.rs
index 5682098be..443f33222 100644
--- a/fyrox-graph/src/lib.rs
+++ b/fyrox-graph/src/lib.rs
@@ -31,12 +31,13 @@ pub mod prelude {
 use fxhash::FxHashMap;
 use fyrox_core::pool::{ObjectOrVariant, PayloadContainer, PoolError};
 use fyrox_core::reflect::ReflectHandle;
+use fyrox_core::uuid::Uuid;
 use fyrox_core::{
     log::{Log, MessageKind},
     pool::Handle,
     reflect::prelude::*,
     variable::{self, InheritableVariable},
-    NameProvider, Uuid,
+    NameProvider,
 };
 use fyrox_resource::{untyped::UntypedResource, Resource, TypedResourceData};
 use std::cmp::Ordering;
@@ -47,6 +48,7 @@ use std::{
 };
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, Reflect)]
+#[reflect(type_uuid = "057d3a49-913a-4f83-9203-549a5c2872aa")]
 #[repr(u32)]
 pub enum NodeMapping {
     UseNames = 0,
@@ -1581,11 +1583,11 @@ where
 mod test {
     use crate::{NodeHandleMap, NodeMapping, PrefabData, SceneGraph, SceneGraphNode};
     use fyrox_core::pool::{ObjectOrVariant, ObjectOrVariantHelper, PoolError};
+    use fyrox_core::uuid::Uuid;
     use fyrox_core::{
         define_as_any_trait,
         pool::{Handle, PayloadContainer, Pool},
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
         NameProvider,
     };
@@ -1600,6 +1602,7 @@ mod test {
     };
 
     #[derive(Visit, Reflect, Debug, Clone)]
+    #[reflect(type_uuid = "34f5e3ea-3008-45e9-9e6e-0b8fbff1ac28")]
     pub struct Base {
         name: String,
         self_handle: Handle<Node>,
@@ -1659,6 +1662,7 @@ mod test {
     }
 
     #[derive(Debug, Reflect)]
+    #[reflect(type_uuid = "e2c18cd6-f1bf-40e5-9ec6-0dc48cc75409")]
     pub struct Node(#[reflect(deref, display_name = "Node")] Box<dyn NodeTrait>);
 
     impl Clone for Node {
@@ -1702,6 +1706,7 @@ mod test {
     /// A wrapper for node pool record that allows to define custom visit method to have full
     /// control over instantiation process at deserialization.
     #[derive(Debug, Default, Clone, Reflect)]
+    #[reflect(type_uuid = "08052dac-c0c0-4df3-8005-1330827bf9c2")]
     pub struct NodeContainer(Option<Node>);
 
     impl Visit for NodeContainer {
@@ -1802,18 +1807,14 @@ mod test {
         }
     }
 
-    #[derive(Default, Clone, TypeUuidProvider, Visit, Reflect, Debug)]
-    #[type_uuid(id = "fc887063-7780-44af-8710-5e0bcf9a83fd")]
+    #[derive(Default, Clone, Visit, Reflect, Debug)]
+    #[reflect(type_uuid = "fc887063-7780-44af-8710-5e0bcf9a83fd")]
     pub struct Graph {
         root: Handle<Node>,
         nodes: Pool<Node, NodeContainer>,
     }
 
     impl ResourceData for Graph {
-        fn type_uuid(&self) -> Uuid {
-            <Graph as TypeUuidProvider>::type_uuid()
-        }
-
         fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
             Ok(())
         }
@@ -2050,6 +2051,7 @@ mod test {
 
     #[derive(Clone, Reflect, Visit, Default, Debug)]
     #[reflect(derived_type = "Node")]
+    #[reflect(type_uuid = "c7452fb6-78c1-4e77-a2f9-d9ae31f50327")]
     pub struct Pivot {
         base: Base,
     }
@@ -2072,6 +2074,7 @@ mod test {
 
     #[derive(Clone, Reflect, Visit, Default, Debug)]
     #[reflect(derived_type = "Node")]
+    #[reflect(type_uuid = "17cc2d25-6ba4-4e2d-a31e-867e429bc659")]
     pub struct RigidBody {
         base: Base,
     }
@@ -2094,6 +2097,7 @@ mod test {
 
     #[derive(Clone, Reflect, Visit, Default, Debug)]
     #[reflect(derived_type = "Node")]
+    #[reflect(type_uuid = "1f869298-37b1-4153-a2a9-6576daa0e8b3")]
     pub struct Joint {
         base: Base,
         connected_body1: Handle<RigidBody>,
diff --git a/fyrox-graphics/src/gpu_program.rs b/fyrox-graphics/src/gpu_program.rs
index 4061fb1cb..70886c6af 100644
--- a/fyrox-graphics/src/gpu_program.rs
+++ b/fyrox-graphics/src/gpu_program.rs
@@ -26,7 +26,6 @@ use crate::{
         algebra::{Matrix2, Matrix3, Matrix4, Vector2, Vector3, Vector4},
         reflect::prelude::*,
         sstorage::ImmutableString,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     define_shared_wrapper,
@@ -92,9 +91,8 @@ define_shared_wrapper!(GpuShader<dyn GpuShaderTrait>);
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "791b333c-eb3f-4279-97fe-cf2ba45c6d78")]
+#[reflect(type_uuid = "791b333c-eb3f-4279-97fe-cf2ba45c6d78")]
 pub enum SamplerFallback {
     /// A 1x1px white texture.
     #[default]
@@ -123,9 +121,8 @@ pub enum SamplerFallback {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "50dc9197-f7f7-4a7d-9b64-9f0868785f56")]
+#[reflect(type_uuid = "50dc9197-f7f7-4a7d-9b64-9f0868785f56")]
 pub enum SamplerKind {
     /// A sampler for a 1D linear texture, a series of values that are indexed by a single coordinate
     /// and where each component of the value is a float.
@@ -167,12 +164,11 @@ pub enum SamplerKind {
     Reflect,
     Visit,
     Clone,
-    TypeUuidProvider,
     AsRefStr,
     EnumString,
     VariantNames,
 )]
-#[type_uuid(id = "13896a77-dae6-481e-9c76-808a3d4c3ff0")]
+#[reflect(type_uuid = "13896a77-dae6-481e-9c76-808a3d4c3ff0")]
 pub enum ShaderResourceKind {
     /// A texture.
     Texture {
@@ -210,12 +206,11 @@ pub enum ShaderResourceKind {
     Clone,
     Reflect,
     Visit,
-    TypeUuidProvider,
     AsRefStr,
     EnumString,
     VariantNames,
 )]
-#[type_uuid(id = "0053de9a-0911-4d26-8f8e-8a4f65e1b0a7")]
+#[reflect(type_uuid = "0053de9a-0911-4d26-8f8e-8a4f65e1b0a7")]
 pub enum ShaderPropertyKind {
     /// Real number.
     Float {
@@ -384,10 +379,8 @@ fn default_color_component() -> u8 {
 }
 
 /// A uniform value that is supplied to a shader by a material.
-#[derive(
-    Serialize, Deserialize, Debug, PartialEq, Reflect, Visit, Clone, Default, TypeUuidProvider,
-)]
-#[type_uuid(id = "078b9f26-8fae-4f2f-99d9-9e882c439ebc")]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Reflect, Visit, Clone, Default)]
+#[reflect(type_uuid = "078b9f26-8fae-4f2f-99d9-9e882c439ebc")]
 pub struct ShaderProperty {
     /// The name of the value in the shader and when editing the value in the material.
     pub name: ImmutableString,
@@ -561,10 +554,8 @@ impl Default for ShaderResourceKind {
 }
 
 /// Shader resource definition.
-#[derive(
-    Default, Serialize, Deserialize, Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider,
-)]
-#[type_uuid(id = "281df21d-ec95-42c7-a17e-a3eb4724dfc9")]
+#[derive(Default, Serialize, Deserialize, Clone, Debug, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "281df21d-ec95-42c7-a17e-a3eb4724dfc9")]
 pub struct ShaderResourceDefinition {
     /// The name of the uniform as it appears in the source code, ready to be passed to `glGetUniformLocation`.
     /// If the name begins with "fyrox_" then Fyrox will treat it specially and try to automatically generate
diff --git a/fyrox-graphics/src/lib.rs b/fyrox-graphics/src/lib.rs
index 7bf968b47..674f1646a 100644
--- a/fyrox-graphics/src/lib.rs
+++ b/fyrox-graphics/src/lib.rs
@@ -29,7 +29,7 @@
 pub use fyrox_core as core;
 use std::fmt::Debug;
 
-use crate::core::{reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*};
+use crate::core::{reflect::prelude::*, visitor::prelude::*};
 use serde::{Deserialize, Serialize};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
@@ -96,10 +96,9 @@ macro_rules! define_shared_wrapper {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
     Default,
 )]
-#[type_uuid(id = "47aff01a-7daa-427c-874c-87464a7ffe28")]
+#[reflect(type_uuid = "47aff01a-7daa-427c-874c-87464a7ffe28")]
 pub enum PolygonFillMode {
     /// Only vertices of polygons are rendered. Their size is 1px by default.
     Point,
@@ -129,9 +128,8 @@ pub enum PolygonFillMode {
     EnumString,
     VariantNames,
     Default,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "95922b07-d532-4183-8f3f-89ebe058b6f1")]
+#[reflect(type_uuid = "95922b07-d532-4183-8f3f-89ebe058b6f1")]
 pub enum CompareFunc {
     /// Never passes.
     Never,
@@ -180,9 +178,8 @@ pub enum CompareFunc {
     EnumString,
     VariantNames,
     Default,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "8d99d682-8993-4a42-bdab-77bee84e62c9")]
+#[reflect(type_uuid = "8d99d682-8993-4a42-bdab-77bee84e62c9")]
 pub enum BlendFactor {
     /// The color is multiplied by zero, turning it black.
     #[default]
@@ -244,9 +241,8 @@ pub enum BlendFactor {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "2c7b09ab-d2b1-4fbb-9c5f-95b31584b048")]
+#[reflect(type_uuid = "2c7b09ab-d2b1-4fbb-9c5f-95b31584b048")]
 pub enum BlendMode {
     /// Addition of two operands (`Source + Dest`). This is default operation.
     #[default]
@@ -277,9 +273,8 @@ pub enum BlendMode {
     Visit,
     Debug,
     Reflect,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "83403a0b-b16f-42a4-ba62-4d72c3318691")]
+#[reflect(type_uuid = "83403a0b-b16f-42a4-ba62-4d72c3318691")]
 pub struct BlendEquation {
     /// An operation for RGB part.
     pub rgb: BlendMode,
@@ -291,21 +286,9 @@ pub struct BlendEquation {
 /// for RGB and Alpha parts). Default blending function is replacing destination values with the
 /// source ones.
 #[derive(
-    Copy,
-    Clone,
-    PartialOrd,
-    PartialEq,
-    Ord,
-    Eq,
-    Hash,
-    Serialize,
-    Deserialize,
-    Visit,
-    Debug,
-    Reflect,
-    TypeUuidProvider,
+    Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Hash, Serialize, Deserialize, Visit, Debug, Reflect,
 )]
-#[type_uuid(id = "42021d36-fdd7-4c14-9a8a-9598c13dbf96")]
+#[reflect(type_uuid = "42021d36-fdd7-4c14-9a8a-9598c13dbf96")]
 pub struct BlendFunc {
     /// Factor for the source (the value that is produced by a shader) in the blending equation (RGB part).
     pub sfactor: BlendFactor,
@@ -362,6 +345,7 @@ impl Default for BlendFunc {
 #[derive(
     Copy, Clone, PartialOrd, PartialEq, Hash, Debug, Serialize, Deserialize, Visit, Eq, Reflect,
 )]
+#[reflect(type_uuid = "2bfabbf6-ba98-49b8-8a7f-9ef42ce31305")]
 pub struct ColorMask {
     /// A flag, that defines whether the red channel is written or not in a frame buffer.
     pub red: bool,
@@ -413,9 +397,8 @@ impl ColorMask {
     EnumString,
     VariantNames,
     Default,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "30a58aa9-eda9-4673-bc50-046f6d46d122")]
+#[reflect(type_uuid = "30a58aa9-eda9-4673-bc50-046f6d46d122")]
 pub enum PolygonFace {
     /// Only front faces will be rendered.
     Front,
@@ -428,20 +411,9 @@ pub enum PolygonFace {
 
 /// Defines a function that used in a stencil test by comparing the `ref_value` to the stencil buffer.
 #[derive(
-    Copy,
-    Clone,
-    PartialOrd,
-    PartialEq,
-    Hash,
-    Debug,
-    Serialize,
-    Deserialize,
-    Visit,
-    Eq,
-    Reflect,
-    TypeUuidProvider,
+    Copy, Clone, PartialOrd, PartialEq, Hash, Debug, Serialize, Deserialize, Visit, Eq, Reflect,
 )]
-#[type_uuid(id = "9d03366d-2537-4ef2-8e19-54f06d81d05e")]
+#[reflect(type_uuid = "9d03366d-2537-4ef2-8e19-54f06d81d05e")]
 pub struct StencilFunc {
     /// The function that is used to compare the stencil buffer value against `ref_value`.
     /// In this case the incoming value is `ref_value` and the stored value is the stencil buffer value
@@ -486,9 +458,8 @@ impl Default for StencilFunc {
     EnumString,
     VariantNames,
     Default,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "3e057392-6900-4506-880d-21391e6b4787")]
+#[reflect(type_uuid = "3e057392-6900-4506-880d-21391e6b4787")]
 pub enum StencilAction {
     /// Keeps the current value. This is the default variant.
     #[default]
@@ -524,20 +495,9 @@ pub enum StencilAction {
 
 /// A set of actions that will be performed with the stencil buffer during various testing stages.
 #[derive(
-    Copy,
-    Clone,
-    PartialOrd,
-    PartialEq,
-    Hash,
-    Debug,
-    Serialize,
-    Deserialize,
-    Visit,
-    Eq,
-    Reflect,
-    TypeUuidProvider,
+    Copy, Clone, PartialOrd, PartialEq, Hash, Debug, Serialize, Deserialize, Visit, Eq, Reflect,
 )]
-#[type_uuid(id = "5eec1018-60aa-4ebb-8884-547ba5f4b398")]
+#[reflect(type_uuid = "5eec1018-60aa-4ebb-8884-547ba5f4b398")]
 pub struct StencilOp {
     /// An action that happens when the stencil test has failed.
     pub fail: StencilAction,
@@ -587,9 +547,8 @@ impl Default for StencilOp {
     EnumString,
     VariantNames,
     Default,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "9f467cd4-0a65-435d-b5d6-301493dbdc9b")]
+#[reflect(type_uuid = "9f467cd4-0a65-435d-b5d6-301493dbdc9b")]
 pub enum CullFace {
     /// Cull only back faces.
     #[default]
@@ -599,10 +558,8 @@ pub enum CullFace {
 }
 
 /// Blending parameters (such as blending function and its equation).
-#[derive(
-    Serialize, Deserialize, Default, Visit, Debug, PartialEq, Clone, Eq, Reflect, TypeUuidProvider,
-)]
-#[type_uuid(id = "4c0afa4d-5b67-43b3-b486-5ec64cc20e7d")]
+#[derive(Serialize, Deserialize, Default, Visit, Debug, PartialEq, Clone, Eq, Reflect)]
+#[reflect(type_uuid = "4c0afa4d-5b67-43b3-b486-5ec64cc20e7d")]
 pub struct BlendParameters {
     /// Blending function, see [`BlendFunc`] for more info.
     pub func: BlendFunc,
@@ -611,20 +568,8 @@ pub struct BlendParameters {
 }
 
 /// A rectangular area that defines which pixels will be rendered in a frame buffer or not.
-#[derive(
-    Serialize,
-    Deserialize,
-    Default,
-    Visit,
-    Debug,
-    PartialEq,
-    Clone,
-    Copy,
-    Eq,
-    Reflect,
-    TypeUuidProvider,
-)]
-#[type_uuid(id = "22be6d48-772e-4dc0-bae5-37f5e8f3a3db")]
+#[derive(Serialize, Deserialize, Default, Visit, Debug, PartialEq, Clone, Copy, Eq, Reflect)]
+#[reflect(type_uuid = "22be6d48-772e-4dc0-bae5-37f5e8f3a3db")]
 pub struct ScissorBox {
     /// X coordinate of the box's origin.
     pub x: i32,
@@ -639,6 +584,7 @@ pub struct ScissorBox {
 /// A set of drawing parameters, that are used during draw call. It defines pretty much all pipeline
 /// settings all at once.
 #[derive(Serialize, Deserialize, Visit, Debug, PartialEq, Clone, Eq, Reflect)]
+#[reflect(type_uuid = "a8cc8ce3-88da-4565-9901-2a2cb767e1ce")]
 pub struct DrawParameters {
     /// An optional cull face. If [`None`], then the culling is disabled.
     pub cull_face: Option<CullFace>,
diff --git a/fyrox-impl/src/engine/mod.rs b/fyrox-impl/src/engine/mod.rs
index ccb8a2e9c..fcca4aef1 100644
--- a/fyrox-impl/src/engine/mod.rs
+++ b/fyrox-impl/src/engine/mod.rs
@@ -146,7 +146,11 @@ use winit::{
 /// Serialization context holds runtime type information that allows to create unknown types using
 /// their UUIDs and a respective constructors.
 #[derive(Reflect)]
-#[reflect(hide_all, non_cloneable)] // TODO
+#[reflect(
+    hide_all,
+    non_cloneable,
+    type_uuid = "1973a8c9-6ac6-48a2-bca1-9b4f3cce0774"
+)] // TODO
 pub struct SerializationContext {
     /// A node constructor container.
     pub node_constructors: NodeConstructorContainer,
@@ -2865,10 +2869,7 @@ mod test {
     use crate::scene::pivot::Pivot;
     use crate::{
         asset::manager::ResourceManager,
-        core::{
-            pool::Handle, reflect::prelude::*, task::TaskPool, type_traits::prelude::*,
-            visitor::prelude::*,
-        },
+        core::{pool::Handle, reflect::prelude::*, task::TaskPool, visitor::prelude::*},
         engine::{task::TaskPoolHandler, GraphicsContext, ScriptProcessor},
         graph::SceneGraph,
         scene::{base::BaseBuilder, node::Node, pivot::PivotBuilder, Scene, SceneContainer},
@@ -2924,8 +2925,8 @@ mod test {
         EventReceived(Source),
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "2569de84-d4b2-427d-969b-d5c7b31a0ba6")]
+    #[derive(Debug, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "2569de84-d4b2-427d-969b-d5c7b31a0ba6")]
     struct MyScript {
         #[reflect(hidden)]
         #[visit(skip)]
@@ -2991,8 +2992,8 @@ mod test {
         }
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "1cebacd9-b500-4753-93be-39db344add21")]
+    #[derive(Debug, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "1cebacd9-b500-4753-93be-39db344add21")]
     struct MySubScript {
         #[reflect(hidden)]
         #[visit(skip)]
@@ -3150,8 +3151,8 @@ mod test {
         Bar(String),
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "bf2976ad-f41d-4de6-9a32-b1a293956058")]
+    #[derive(Debug, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "bf2976ad-f41d-4de6-9a32-b1a293956058")]
     struct ScriptListeningToMessages {
         index: u32,
         #[reflect(hidden)]
@@ -3201,8 +3202,8 @@ mod test {
         }
     }
 
-    #[derive(Debug, Clone, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "6bcbf9b4-9546-42d3-965a-de055ab85475")]
+    #[derive(Debug, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "6bcbf9b4-9546-42d3-965a-de055ab85475")]
     struct ScriptSendingMessages {
         index: u32,
     }
@@ -3290,8 +3291,8 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "7bcbf9b4-9546-42d3-965a-de055ab85475")]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit)]
+    #[reflect(type_uuid = "7bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptSpawningAsyncTasks {
         num: Option<u32>,
     }
@@ -3313,8 +3314,8 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "8bcbf9b4-9546-42d3-965a-de055ab85475")]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit)]
+    #[reflect(type_uuid = "8bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptWithoutAsyncTasks {}
 
     impl ScriptTrait for ScriptWithoutAsyncTasks {}
@@ -3390,8 +3391,8 @@ mod test {
         );
     }
 
-    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
+    #[derive(Clone, Debug, Reflect, Visit)]
+    #[reflect(type_uuid = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptThatDeletesItself {
         #[reflect(hidden)]
         #[visit(skip)]
@@ -3431,8 +3432,8 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
+    #[derive(Clone, Debug, Reflect, Visit)]
+    #[reflect(type_uuid = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct ScriptThatAddsScripts {
         num: usize,
         #[reflect(hidden)]
@@ -3480,8 +3481,8 @@ mod test {
         }
     }
 
-    #[derive(Clone, Debug, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
+    #[derive(Clone, Debug, Reflect, Visit)]
+    #[reflect(type_uuid = "9bcbf9b4-9546-42d3-965a-de055ab85475")]
     pub struct SimpleScript {
         stuff: usize,
         #[reflect(hidden)]
diff --git a/fyrox-impl/src/engine/task.rs b/fyrox-impl/src/engine/task.rs
index d122ff4e3..82ac37b08 100644
--- a/fyrox-impl/src/engine/task.rs
+++ b/fyrox-impl/src/engine/task.rs
@@ -104,7 +104,7 @@ impl TaskPoolHandler {
     /// # use std::{fs::File, io::Read};
     ///
     /// #[derive(Visit, Reflect, Debug)]
-    /// #[reflect(non_cloneable)]
+    /// #[reflect(non_cloneable, type_uuid = "a7ba17c1-6104-4938-9ba7-ba479acf716a")]
     /// struct MyGame {
     ///     data: Option<Vec<u8>>,
     /// }
@@ -178,14 +178,13 @@ impl TaskPoolHandler {
     /// #     resource::model::{Model, ModelResourceExtension},
     /// #     script::{ScriptContext, ScriptTrait},
     /// # };
-    /// # use fyrox_core::uuid_provider;
+    /// #
     /// # use fyrox_impl::plugin::error::GameResult;
     /// #
     /// #[derive(Reflect, Visit, Default, Debug, Clone)]
+    /// #[reflect(type_uuid = "f5ded79e-6101-4e23-b20d-48cbdb25d87a")]
     /// struct MyScript;
     ///
-    /// # uuid_provider!(MyScript = "f5ded79e-6101-4e23-b20d-48cbdb25d87a");
-    ///
     /// impl ScriptTrait for MyScript {
     ///     fn on_start(&mut self, ctx: &mut ScriptContext) -> GameResult {
     ///         ctx.task_pool.spawn_script_task(
diff --git a/fyrox-impl/src/plugin/mod.rs b/fyrox-impl/src/plugin/mod.rs
index 8fb2bff9f..e8beba9c1 100644
--- a/fyrox-impl/src/plugin/mod.rs
+++ b/fyrox-impl/src/plugin/mod.rs
@@ -245,7 +245,7 @@ impl<'a, 'b> PluginContext<'a, 'b> {
     /// # use std::str::FromStr;
     ///
     /// #[derive(Default, Visit, Reflect, Debug)]
-    /// #[reflect(non_cloneable)]
+    /// #[reflect(non_cloneable, type_uuid = "ce9c7ff9-f490-4274-89c9-0b53b9f80532")]
     /// struct MyGame {}
     ///
     /// impl Plugin for MyGame {
@@ -316,7 +316,7 @@ impl<'a, 'b> PluginContext<'a, 'b> {
     /// # use std::str::FromStr;
     /// #
     /// #[derive(Default, Visit, Reflect, Debug)]
-    /// #[reflect(non_cloneable)]
+    /// #[reflect(non_cloneable, type_uuid = "65b2da10-3926-48e4-93b4-01193cdc11ca")]
     /// struct MyGame {}
     ///
     /// impl MyGame {
@@ -494,7 +494,7 @@ impl dyn Plugin {
 /// # use std::str::FromStr;
 ///
 /// #[derive(Default, Visit, Reflect, Debug)]
-/// #[reflect(non_cloneable)]
+/// #[reflect(non_cloneable, type_uuid = "342b2ef7-210d-465f-bcae-f59aa3a96420")]
 /// struct MyPlugin {}
 ///
 /// impl Plugin for MyPlugin {
@@ -536,7 +536,7 @@ impl dyn Plugin {
 /// # };
 /// # use std::str::FromStr;
 /// #[derive(Default, Visit, Reflect, Debug)]
-/// #[reflect(non_cloneable)]
+/// #[reflect(non_cloneable, type_uuid = "94801cca-3f50-4bef-9b6f-ee2edd9dcb2b")]
 /// struct MyPlugin {
 ///     scene: Handle<Scene>,
 ///     player: Handle<Node>,
diff --git a/fyrox-impl/src/renderer/settings.rs b/fyrox-impl/src/renderer/settings.rs
index d880ac47c..fea59964e 100644
--- a/fyrox-impl/src/renderer/settings.rs
+++ b/fyrox-impl/src/renderer/settings.rs
@@ -18,12 +18,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use crate::core::{reflect::prelude::*, type_traits::prelude::*};
+use crate::core::reflect::prelude::*;
 use serde::{Deserialize, Serialize};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Bloom effect settings.
 #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize, Reflect)]
+#[reflect(type_uuid = "6862fea7-10a9-4a8a-8701-c003415aa3b3")]
 pub struct BloomSettings {
     /// Whether to use bloom effect.
     pub use_bloom: bool,
@@ -56,9 +57,8 @@ impl Default for BloomSettings {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "b1994c1c-bc2f-497c-a05d-062a02b69ff1")]
+#[reflect(type_uuid = "b1994c1c-bc2f-497c-a05d-062a02b69ff1")]
 pub enum LuminanceCalculationMethod {
     /// Simplest and fastest luminance calculation method based on average of luminance of all
     /// pixels of the frame.
@@ -71,6 +71,7 @@ pub enum LuminanceCalculationMethod {
 
 /// Settings of high dynamic range rendering pipeline.
 #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize, Reflect)]
+#[reflect(type_uuid = "15a2975b-0f2d-4839-ba20-951e4625ee75")]
 pub struct HdrSettings {
     /// Whether the HDR pipeline enabled or not.
     pub use_hdr: bool,
@@ -96,6 +97,7 @@ impl Default for HdrSettings {
 /// Quality settings allows you to find optimal balance between performance and
 /// graphics quality.
 #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize, Reflect)]
+#[reflect(type_uuid = "ef3c1b91-dd8a-49b9-9249-1ba4c03f7176")]
 pub struct QualitySettings {
     /// Point shadows
     /// Size of cube map face of shadow map texture in pixels.
@@ -339,6 +341,7 @@ impl QualitySettings {
 
 /// Cascaded-shadow maps settings.
 #[derive(Debug, Copy, Clone, PartialEq, Serialize, Deserialize, Reflect, Eq)]
+#[reflect(type_uuid = "f3dc86da-f1d4-499a-89bb-7d784eebc32d")]
 pub struct CsmSettings {
     /// Whether cascaded shadow maps enabled or not.
     pub enabled: bool,
@@ -381,9 +384,8 @@ impl Default for CsmSettings {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "f9b2755b-248e-46ba-bcab-473eac1acdb8")]
+#[reflect(type_uuid = "f9b2755b-248e-46ba-bcab-473eac1acdb8")]
 pub enum ShadowMapPrecision {
     /// Shadow map will use 2 times less memory by switching to 16bit pixel format,
     /// but "shadow acne" may occur.
diff --git a/fyrox-impl/src/resource/curve/loader.rs b/fyrox-impl/src/resource/curve/loader.rs
index 0eb87b989..1e0cb9378 100644
--- a/fyrox-impl/src/resource/curve/loader.rs
+++ b/fyrox-impl/src/resource/curve/loader.rs
@@ -25,9 +25,10 @@ use crate::{
         io::ResourceIo,
         loader::{BoxedLoaderFuture, LoaderPayload, ResourceLoader},
     },
-    core::{uuid::Uuid, TypeUuidProvider},
+    core::uuid::Uuid,
     resource::curve::CurveResourceState,
 };
+use fyrox_core::reflect::Reflect;
 use fyrox_resource::state::LoadError;
 use std::{path::PathBuf, sync::Arc};
 
@@ -45,7 +46,7 @@ impl ResourceLoader for CurveLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        CurveResourceState::type_uuid()
+        <CurveResourceState as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-impl/src/resource/curve/mod.rs b/fyrox-impl/src/resource/curve/mod.rs
index bb10fea09..444493e58 100644
--- a/fyrox-impl/src/resource/curve/mod.rs
+++ b/fyrox-impl/src/resource/curve/mod.rs
@@ -22,10 +22,7 @@
 
 use crate::{
     asset::{io::ResourceIo, Resource, ResourceData},
-    core::{
-        io::FileError, math::curve::Curve, reflect::prelude::*, uuid::Uuid, visitor::prelude::*,
-        TypeUuidProvider,
-    },
+    core::{io::FileError, math::curve::Curve, reflect::prelude::*, visitor::prelude::*},
 };
 use std::error::Error;
 use std::{
@@ -76,16 +73,13 @@ impl From<VisitError> for CurveResourceError {
 
 /// State of the [`CurveResource`]
 #[derive(Debug, Clone, Visit, Default, Reflect)]
+#[reflect(type_uuid = "f28b949f-28a2-4b68-9089-59c234f58b6b")]
 pub struct CurveResourceState {
     /// Actual curve.
     pub curve: Curve,
 }
 
 impl ResourceData for CurveResourceState {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
         // TODO: Add saving.
         Err("Saving is not supported!".to_string().into())
@@ -100,12 +94,6 @@ impl ResourceData for CurveResourceState {
     }
 }
 
-impl TypeUuidProvider for CurveResourceState {
-    fn type_uuid() -> Uuid {
-        uuid!("f28b949f-28a2-4b68-9089-59c234f58b6b")
-    }
-}
-
 impl CurveResourceState {
     /// Load a curve resource from the specific file path.
     pub async fn from_file(path: &Path, io: &dyn ResourceIo) -> Result<Self, CurveResourceError> {
diff --git a/fyrox-impl/src/resource/fbx/mod.rs b/fyrox-impl/src/resource/fbx/mod.rs
index 09bd2fa31..63f16edbf 100644
--- a/fyrox-impl/src/resource/fbx/mod.rs
+++ b/fyrox-impl/src/resource/fbx/mod.rs
@@ -80,12 +80,13 @@ use crate::{
 };
 use fxhash::{FxHashMap, FxHashSet};
 use fyrox_animation::track::TrackBinding;
-use fyrox_core::{err, Uuid};
+use fyrox_core::err;
 use fyrox_material::shader::{ShaderResource, ShaderResourceExtension};
 use fyrox_material::MaterialResource;
 use fyrox_resource::io::ResourceIo;
 use fyrox_resource::untyped::ResourceKind;
 use std::{cmp::Ordering, path::Path};
+use uuid::Uuid;
 
 /// Input angles in degrees
 fn quat_from_euler(euler: Vector3<f32>) -> UnitQuaternion<f32> {
diff --git a/fyrox-impl/src/resource/gltf/material.rs b/fyrox-impl/src/resource/gltf/material.rs
index 83d42d09b..6b9ae417a 100644
--- a/fyrox-impl/src/resource/gltf/material.rs
+++ b/fyrox-impl/src/resource/gltf/material.rs
@@ -83,11 +83,10 @@ fn convert_mag(filter: GltfMagFilter) -> FyroxMagFilter {
 
 use crate::material::{MaterialResourceBinding, MaterialTextureBinding};
 use crate::resource::texture::TextureWrapMode as FyroxWrapMode;
-use fyrox_core::Uuid;
 use fyrox_resource::builtin::BuiltInResource;
 use fyrox_resource::embedded_data_source;
 use gltf::texture::WrappingMode as GltfWrapMode;
-use uuid::uuid;
+use uuid::{uuid, Uuid};
 
 fn convert_wrap(mode: GltfWrapMode) -> FyroxWrapMode {
     match mode {
diff --git a/fyrox-impl/src/resource/gltf/mod.rs b/fyrox-impl/src/resource/gltf/mod.rs
index 01b8fd23a..6c82285c8 100644
--- a/fyrox-impl/src/resource/gltf/mod.rs
+++ b/fyrox-impl/src/resource/gltf/mod.rs
@@ -28,7 +28,6 @@ use crate::asset::state::LoadError;
 use crate::core::algebra::{Matrix4, Unit};
 use crate::core::log::Log;
 use crate::core::pool::Handle;
-use crate::core::TypeUuidProvider;
 use crate::graph::NodeMapping;
 use crate::graph::SceneGraph;
 use crate::gui::core::io::FileError;
@@ -61,6 +60,7 @@ mod surface;
 mod uri;
 
 use animation::import_animations;
+use fyrox_core::reflect::Reflect;
 use fyrox_resource::untyped::ResourceKind;
 use material::*;
 pub use surface::SurfaceDataError;
@@ -295,8 +295,8 @@ impl loader::ResourceLoader for GltfLoader {
         &["gltf", "glb"]
     }
 
-    fn data_type_uuid(&self) -> crate::core::type_traits::prelude::Uuid {
-        Model::type_uuid()
+    fn data_type_uuid(&self) -> Uuid {
+        <Model as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> loader::BoxedLoaderFuture {
diff --git a/fyrox-impl/src/resource/model/loader.rs b/fyrox-impl/src/resource/model/loader.rs
index 278441016..ca584f0ce 100644
--- a/fyrox-impl/src/resource/model/loader.rs
+++ b/fyrox-impl/src/resource/model/loader.rs
@@ -29,11 +29,12 @@ use crate::{
         manager::ResourceManager,
         options::{try_get_import_settings, try_get_import_settings_opaque, BaseImportOptions},
     },
-    core::{uuid::Uuid, TypeUuidProvider},
+    core::uuid::Uuid,
     engine::SerializationContext,
     resource::model::{Model, ModelImportOptions},
 };
 use fyrox_core::dyntype::DynTypeConstructorContainer;
+use fyrox_core::reflect::Reflect;
 use fyrox_resource::state::LoadError;
 use std::{path::PathBuf, sync::Arc};
 
@@ -60,7 +61,7 @@ impl ResourceLoader for ModelLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        Model::type_uuid()
+        <Model as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-impl/src/resource/model/mod.rs b/fyrox-impl/src/resource/model/mod.rs
index 691b4ddab..7c3cd94b7 100644
--- a/fyrox-impl/src/resource/model/mod.rs
+++ b/fyrox-impl/src/resource/model/mod.rs
@@ -51,11 +51,10 @@ use crate::{
         pool::Handle,
         reflect::prelude::*,
         uuid::Uuid,
-        uuid_provider,
         variable::InheritableVariable,
         visitor::error::VisitError,
         visitor::{Visit, VisitResult, Visitor},
-        NameProvider, TypeUuidProvider,
+        NameProvider,
     },
     engine::SerializationContext,
     generic_animation::AnimationContainer,
@@ -83,6 +82,7 @@ pub mod loader;
 
 /// See module docs.
 #[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "44cd768f-b4ca-4804-a98c-0adf85577ada")]
 pub struct Model {
     #[visit(skip)]
     pub(crate) mapping: NodeMapping,
@@ -104,12 +104,6 @@ impl PrefabData for Model {
     }
 }
 
-impl TypeUuidProvider for Model {
-    fn type_uuid() -> Uuid {
-        uuid!("44cd768f-b4ca-4804-a98c-0adf85577ada")
-    }
-}
-
 /// Instantiation context holds additional data that could be useful for a prefab instantiation.
 pub struct InstantiationContext<'a> {
     model: &'a ModelResource,
@@ -620,10 +614,6 @@ impl ModelResourceExtension for ModelResource {
 }
 
 impl ResourceData for Model {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.scene.save("Scene", &mut visitor)?;
@@ -674,6 +664,7 @@ impl Default for Model {
     VariantNames,
     Default,
 )]
+#[reflect(type_uuid = "11634aa0-cf8f-4532-a8cd-c0fa6ef804f1")]
 pub enum MaterialSearchOptions {
     /// Search in specified materials directory. It is suitable for cases when
     /// your model resource use shared textures.
@@ -711,8 +702,6 @@ pub enum MaterialSearchOptions {
     UsePathDirectly,
 }
 
-uuid_provider!(MaterialSearchOptions = "11634aa0-cf8f-4532-a8cd-c0fa6ef804f1");
-
 impl MaterialSearchOptions {
     /// A helper to create MaterialsDirectory variant.
     pub fn materials_directory<P: AsRef<Path>>(path: P) -> Self {
@@ -736,6 +725,7 @@ impl MaterialSearchOptions {
 ///
 /// Check documentation of the field of the structure for more info about each parameter.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Default, Reflect, Eq)]
+#[reflect(type_uuid = "9b1c3667-f571-4aac-81cf-bcec0dbf0e11")]
 pub struct ModelImportOptions {
     /// See [`MaterialSearchOptions`] docs for more info.
     #[serde(default)]
diff --git a/fyrox-impl/src/scene/animation/absm.rs b/fyrox-impl/src/scene/animation/absm.rs
index acce1fc51..284629543 100644
--- a/fyrox-impl/src/scene/animation/absm.rs
+++ b/fyrox-impl/src/scene/animation/absm.rs
@@ -27,7 +27,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -221,7 +220,10 @@ type AnimationPlayerHandle = InheritableVariable<Handle<AnimationPlayer>>;
 /// }
 /// ```
 #[derive(Visit, Reflect, Clone, Debug, Default)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "4b08c753-2a10-41e3-8fb2-4fd0517e86bc"
+)]
 pub struct AnimationBlendingStateMachine {
     base: Base,
     machine: MachineType,
@@ -257,12 +259,6 @@ impl AnimationBlendingStateMachine {
     }
 }
 
-impl TypeUuidProvider for AnimationBlendingStateMachine {
-    fn type_uuid() -> Uuid {
-        uuid!("4b08c753-2a10-41e3-8fb2-4fd0517e86bc")
-    }
-}
-
 impl Deref for AnimationBlendingStateMachine {
     type Target = Base;
 
@@ -309,7 +305,7 @@ impl NodeTrait for AnimationBlendingStateMachine {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn update(&mut self, context: &mut UpdateContext) {
diff --git a/fyrox-impl/src/scene/animation/mod.rs b/fyrox-impl/src/scene/animation/mod.rs
index f2c50ae40..5b62932ed 100644
--- a/fyrox-impl/src/scene/animation/mod.rs
+++ b/fyrox-impl/src/scene/animation/mod.rs
@@ -28,7 +28,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -244,7 +243,10 @@ impl BoundValueCollectionExt for BoundValueCollection {
 /// (`animated_node`). Only then it creates an animation player node with an animation container with a single animation.
 /// To understand why this is so complicated, see the docs of [`Animation`].
 #[derive(Visit, Reflect, Clone, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "44d1c94e-354f-4f9a-b918-9d31c28aa16a"
+)]
 pub struct AnimationPlayer {
     base: Base,
     animations: InheritableVariable<AnimationContainer>,
@@ -298,12 +300,6 @@ impl AnimationPlayer {
     }
 }
 
-impl TypeUuidProvider for AnimationPlayer {
-    fn type_uuid() -> Uuid {
-        uuid!("44d1c94e-354f-4f9a-b918-9d31c28aa16a")
-    }
-}
-
 impl Deref for AnimationPlayer {
     type Target = Base;
 
@@ -340,7 +336,7 @@ impl NodeTrait for AnimationPlayer {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn update(&mut self, context: &mut UpdateContext) {
diff --git a/fyrox-impl/src/scene/base.rs b/fyrox-impl/src/scene/base.rs
index 6556ece39..691cc7cb0 100644
--- a/fyrox-impl/src/scene/base.rs
+++ b/fyrox-impl/src/scene/base.rs
@@ -30,7 +30,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, Matrix4Ext},
         pool::{ErasedHandle, Handle},
         reflect::prelude::*,
-        type_traits::prelude::*,
         variable::InheritableVariable,
         visitor::{Visit, VisitResult, Visitor},
         ImmutableString,
@@ -57,8 +56,8 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 /// Normalized distance is a distance in (0; 1) range where 0 - closest to camera,
 /// 1 - farthest. Real distance can be obtained by multiplying normalized distance
 /// with z_far of current projection matrix.
-#[derive(Debug, Default, Clone, Visit, Reflect, PartialEq, TypeUuidProvider)]
-#[type_uuid(id = "576b31a2-2b39-4c79-95dd-26aeaf381d8b")]
+#[derive(Debug, Default, Clone, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "576b31a2-2b39-4c79-95dd-26aeaf381d8b")]
 pub struct LevelOfDetail {
     /// Beginning of the range in which the level will be visible. It is expressed in normalized
     /// coordinates: where 0.0 - closest to camera, 1.0 - farthest from camera.
@@ -125,18 +124,16 @@ impl LevelOfDetail {
 /// Lod group must contain non-overlapping cascades, each cascade with its own set of objects
 /// that belongs to level of detail. Engine does not care if you create overlapping cascades,
 /// it is your responsibility to create non-overlapping cascades.
-#[derive(Debug, Default, Clone, Visit, Reflect, PartialEq, TypeUuidProvider)]
-#[type_uuid(id = "8e7b18b1-c1e0-47d7-b952-4394c1d049e5")]
+#[derive(Debug, Default, Clone, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "8e7b18b1-c1e0-47d7-b952-4394c1d049e5")]
 pub struct LodGroup {
     /// Set of cascades.
     pub levels: Vec<LevelOfDetail>,
 }
 
 /// A property value.
-#[derive(
-    Debug, Visit, Reflect, PartialEq, Clone, AsRefStr, EnumString, VariantNames, TypeUuidProvider,
-)]
-#[type_uuid(id = "cce94b60-a57e-48ba-b6f4-e5e84788f7f8")]
+#[derive(Debug, Visit, Reflect, PartialEq, Clone, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "cce94b60-a57e-48ba-b6f4-e5e84788f7f8")]
 pub enum PropertyValue {
     /// A node handle.
     ///
@@ -183,8 +180,8 @@ impl Default for PropertyValue {
 }
 
 /// A custom property.
-#[derive(Debug, Visit, Reflect, Default, Clone, PartialEq, TypeUuidProvider)]
-#[type_uuid(id = "fc87fd21-a5e6-40d5-a79d-19f96b25d6c9")]
+#[derive(Debug, Visit, Reflect, Default, Clone, PartialEq)]
+#[reflect(type_uuid = "fc87fd21-a5e6-40d5-a79d-19f96b25d6c9")]
 pub struct Property {
     /// Name of the property.
     pub name: String,
@@ -230,6 +227,7 @@ pub enum NodeScriptMessage {
     Deserialize,
 )]
 #[repr(transparent)]
+#[reflect(type_uuid = "6cebe796-6e14-479d-93a6-9fb04665740c")]
 pub struct SceneNodeId(pub Uuid);
 
 impl Visit for SceneNodeId {
@@ -239,8 +237,8 @@ impl Visit for SceneNodeId {
 }
 
 /// A script container record.
-#[derive(Clone, Reflect, Debug, Default, TypeUuidProvider)]
-#[type_uuid(id = "51bc577b-5a50-4a97-9b31-eda2f3d46c9d")]
+#[derive(Clone, Reflect, Debug, Default)]
+#[reflect(type_uuid = "51bc577b-5a50-4a97-9b31-eda2f3d46c9d")]
 pub struct ScriptRecord {
     // Script is wrapped into `Option` to be able to do take-return trick to bypass borrow checker
     // issues.
@@ -369,6 +367,7 @@ impl<T> DerefMut for TrackedProperty<T> {
 /// }
 /// ```
 #[derive(Debug, Reflect, Clone)]
+#[reflect(type_uuid = "5bf7fb77-fd50-4b92-83d7-27153b7da531")]
 pub struct Base {
     #[reflect(hidden)]
     self_handle: Handle<Node>,
diff --git a/fyrox-impl/src/scene/camera.rs b/fyrox-impl/src/scene/camera.rs
index d7665b95a..2ba103942 100644
--- a/fyrox-impl/src/scene/camera.rs
+++ b/fyrox-impl/src/scene/camera.rs
@@ -28,9 +28,7 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, frustum::Frustum, ray::Ray, Rect},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
-        uuid_provider,
         variable::InheritableVariable,
         visitor::{Visit, VisitResult, Visitor},
     },
@@ -58,6 +56,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 /// with increasing distance. This the projection type "used" by human eyes, photographic lens and
 /// it looks most realistic.
 #[derive(Reflect, Clone, Debug, PartialEq, Visit, Serialize, Deserialize)]
+#[reflect(type_uuid = "7a9662f3-28f1-4353-ba57-d610cc04834b")]
 pub struct PerspectiveProjection {
     /// Vertical angle at the top of viewing frustum, in radians. Larger values will increase field
     /// of view and create fish-eye effect, smaller values could be used to create "binocular" effect
@@ -110,6 +109,7 @@ impl PerspectiveProjection {
 /// Parallel projection. Object's size won't be affected by distance from the viewer, it can be
 /// used for 2D games.
 #[derive(Reflect, Clone, Debug, PartialEq, Visit, Serialize, Deserialize)]
+#[reflect(type_uuid = "dcfe9e8b-f6a7-42ce-a2be-5d389175d555")]
 pub struct OrthographicProjection {
     /// Location of the near clipping plane. If it is larger than [`Self::z_far`] then it will be
     /// treated like far clipping plane.
@@ -192,6 +192,7 @@ impl OrthographicProjection {
     Serialize,
     Deserialize,
 )]
+#[reflect(type_uuid = "0eb5bec0-fc4e-4945-99b6-e6c5392ad971")]
 pub enum Projection {
     /// See [`PerspectiveProjection`] docs.
     Perspective(PerspectiveProjection),
@@ -199,8 +200,6 @@ pub enum Projection {
     Orthographic(OrthographicProjection),
 }
 
-uuid_provider!(Projection = "0eb5bec0-fc4e-4945-99b6-e6c5392ad971");
-
 impl Projection {
     /// Sets the new value for the near clipping plane.
     #[inline]
@@ -303,6 +302,7 @@ impl Default for Projection {
     Serialize,
     Deserialize,
 )]
+#[reflect(type_uuid = "0e35ee3d-8baa-4b0c-b3dd-6c31a08c121e")]
 pub enum Exposure {
     /// Automatic exposure based on the frame luminance. High luminance values will result
     /// in lower exposure levels and vice versa.
@@ -322,8 +322,6 @@ pub enum Exposure {
     Manual(f32),
 }
 
-uuid_provider!(Exposure = "0e35ee3d-8baa-4b0c-b3dd-6c31a08c121e");
-
 impl Default for Exposure {
     fn default() -> Self {
         Self::Manual(1.0)
@@ -354,7 +352,10 @@ impl Default for Exposure {
 /// Each camera forces engine to re-render same scene one more time, which may cause almost double load
 /// of your GPU.
 #[derive(Debug, Visit, Reflect, Clone)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "198d3aca-433c-4ce1-bb25-3190699b757f"
+)]
 pub struct Camera {
     base: Base,
 
@@ -415,12 +416,6 @@ impl Default for Camera {
     }
 }
 
-impl TypeUuidProvider for Camera {
-    fn type_uuid() -> Uuid {
-        uuid!("198d3aca-433c-4ce1-bb25-3190699b757f")
-    }
-}
-
 /// A set of camera fitting parameters for different projection modes. You should take these parameters
 /// and modify camera position and projection accordingly. In case of perspective projection all you need
 /// to do is to set new world-space position of the camera. In cae of orthographic projection, do previous
@@ -812,7 +807,7 @@ impl NodeTrait for Camera {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn update(&mut self, context: &mut UpdateContext) {
@@ -892,6 +887,7 @@ impl Display for ColorGradingLutCreationError {
 ///
 /// See [more info in Unreal engine docs](https://docs.unrealengine.com/4.26/en-US/RenderingAndGraphics/PostProcessEffects/UsingLUTs/)
 #[derive(Visit, Clone, Default, PartialEq, Debug, Reflect, Eq)]
+#[reflect(type_uuid = "bca9c90a-7cde-4960-8814-c132edfc9614")]
 pub struct ColorGradingLut {
     unwrapped_lut: Option<TextureResource>,
 
@@ -900,8 +896,6 @@ pub struct ColorGradingLut {
     lut: Option<TextureResource>,
 }
 
-uuid_provider!(ColorGradingLut = "bca9c90a-7cde-4960-8814-c132edfc9614");
-
 impl ColorGradingLut {
     /// Creates 3D look-up texture from 2D strip.
     ///
diff --git a/fyrox-impl/src/scene/collider.rs b/fyrox-impl/src/scene/collider.rs
index bb3aacf41..78e6bc8ca 100644
--- a/fyrox-impl/src/scene/collider.rs
+++ b/fyrox-impl/src/scene/collider.rs
@@ -30,7 +30,6 @@ use crate::{
         num_traits::{NumCast, One, ToPrimitive, Zero},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -47,7 +46,6 @@ use crate::{
     },
 };
 use fyrox_core::algebra::{Isometry3, Translation3};
-use fyrox_core::uuid_provider;
 
 use fyrox_graph::constructor::ConstructorProvider;
 use fyrox_graph::SceneGraph;
@@ -61,6 +59,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Ball is an idea sphere shape defined by a single parameters - its radius.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "6b94901a-2f8f-45f6-851d-89342e8455b1")]
 pub struct BallShape {
     /// Radius of the sphere.
     #[reflect(min_value = 0.001, step = 0.05)]
@@ -75,6 +74,7 @@ impl Default for BallShape {
 
 /// Cylinder shape aligned in Y axis.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "cfcb8dfb-4ca9-41f1-8547-6d24c03399ed")]
 pub struct CylinderShape {
     /// Half height of the cylinder, actual height will be 2 times bigger.
     #[reflect(min_value = 0.001, step = 0.05)]
@@ -95,6 +95,7 @@ impl Default for CylinderShape {
 
 /// Cone shape aligned in Y axis.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "afacc379-4cc6-4dd2-8d95-4663a582b680")]
 pub struct ConeShape {
     /// Half height of the cone, actual height will be 2 times bigger.
     #[reflect(min_value = 0.001, step = 0.05)]
@@ -115,6 +116,7 @@ impl Default for ConeShape {
 
 /// Cuboid shape (box).
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "9618ec4f-88c4-40f1-aa4a-20a15efd5355")]
 pub struct CuboidShape {
     /// Half extents of the box. X - half width, Y - half height, Z - half depth.
     /// Actual _size_ will be 2 times bigger.
@@ -132,6 +134,7 @@ impl Default for CuboidShape {
 
 /// Arbitrary capsule shape defined by 2 points (which forms axis) and a radius.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "595c7250-7a88-4c18-b961-e61ed81aa8f2")]
 pub struct CapsuleShape {
     /// Begin point of the capsule.
     pub begin: Vector3<f32>,
@@ -155,6 +158,7 @@ impl Default for CapsuleShape {
 
 /// Arbitrary segment shape defined by two points.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "4fda8c19-597f-4caa-a006-2eaedef312a1")]
 pub struct SegmentShape {
     /// Begin point of the capsule.
     pub begin: Vector3<f32>,
@@ -173,6 +177,7 @@ impl Default for SegmentShape {
 
 /// Arbitrary triangle shape.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "b27adb3c-bec6-4cd4-9e9f-68a19d69312e")]
 pub struct TriangleShape {
     /// First point of the triangle shape.
     pub a: Vector3<f32>,
@@ -198,12 +203,12 @@ impl Default for TriangleShape {
 ///
 /// Currently there is only one way to set geometry - using a scene node as a source of data.
 #[derive(Default, Clone, Copy, PartialEq, Hash, Debug, Visit, Reflect, Eq)]
+#[reflect(type_uuid = "6fea7c72-c488-48a1-935f-2752a8a10e9a")]
 pub struct GeometrySource(pub Handle<Node>);
 
-uuid_provider!(GeometrySource = "6fea7c72-c488-48a1-935f-2752a8a10e9a");
-
 /// Arbitrary triangle mesh shape.
 #[derive(Default, Clone, Debug, Visit, Reflect, PartialEq, Eq)]
+#[reflect(type_uuid = "664c4ed4-26d1-437e-b198-c25aa3b7b790")]
 pub struct TrimeshShape {
     /// Geometry sources for the shape.
     pub sources: Vec<GeometrySource>,
@@ -211,6 +216,7 @@ pub struct TrimeshShape {
 
 /// Arbitrary height field shape.
 #[derive(Default, Clone, Debug, Visit, Reflect, PartialEq, Eq)]
+#[reflect(type_uuid = "a5c12eb6-d4af-49ee-8bf1-6766c753a3d5")]
 pub struct HeightfieldShape {
     /// A handle to terrain scene node.
     pub geometry_source: GeometrySource,
@@ -218,6 +224,7 @@ pub struct HeightfieldShape {
 
 /// Arbitrary convex polyhedron shape.
 #[derive(Default, Clone, Debug, Visit, Reflect, PartialEq, Eq)]
+#[reflect(type_uuid = "fbf2e9b1-56ad-4450-8806-582151dc1868")]
 pub struct ConvexPolyhedronShape {
     /// A handle to a mesh node.
     pub geometry_source: GeometrySource,
@@ -225,10 +232,9 @@ pub struct ConvexPolyhedronShape {
 
 /// A set of bits used for pairwise collision filtering.
 #[derive(Clone, Copy, Default, PartialEq, Reflect, Eq)]
+#[reflect(type_uuid = "f2db0c2a-921b-4728-9ce4-2506d95c60fa")]
 pub struct BitMask(pub u32);
 
-uuid_provider!(BitMask = "f2db0c2a-921b-4728-9ce4-2506d95c60fa");
-
 impl BitMask {
     /// BitMask with all bits set. BitMask(u32::MAX)
     pub const fn all() -> Self {
@@ -386,6 +392,7 @@ impl NumCast for BitMask {
 /// (self.memberships & rhs.filter) != 0 && (rhs.memberships & self.filter) != 0
 /// ```
 #[derive(Visit, Debug, Clone, Copy, PartialEq, Reflect, Eq)]
+#[reflect(type_uuid = "423f1fde-d1f8-461a-8fa9-1fa09db915d4")]
 pub struct InteractionGroups {
     /// Groups memberships.
     pub memberships: BitMask,
@@ -500,6 +507,7 @@ impl From<rapier2d::parry::query::ShapeCastStatus> for TOIStatus {
 
 /// Possible collider shapes.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "2e627337-71ea-4b33-a5f1-be697f705a86")]
 pub enum ColliderShape {
     /// See [`BallShape`] docs.
     Ball(BallShape),
@@ -523,8 +531,6 @@ pub enum ColliderShape {
     Polyhedron(ConvexPolyhedronShape),
 }
 
-uuid_provider!(ColliderShape = "2e627337-71ea-4b33-a5f1-be697f705a86");
-
 impl Default for ColliderShape {
     fn default() -> Self {
         Self::Ball(Default::default())
@@ -612,7 +618,10 @@ impl ColliderShape {
 /// Collider is a geometric entity that can be attached to a rigid body to allow participate it
 /// participate in contact generation, collision response and proximity queries.
 #[derive(Reflect, Visit, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "bfaa2e82-9c19-4b99-983b-3bc115744a1d"
+)]
 pub struct Collider {
     base: Base,
 
@@ -699,12 +708,6 @@ impl Clone for Collider {
     }
 }
 
-impl TypeUuidProvider for Collider {
-    fn type_uuid() -> Uuid {
-        uuid!("bfaa2e82-9c19-4b99-983b-3bc115744a1d")
-    }
-}
-
 impl Collider {
     /// Sets the new shape to the collider.
     ///
@@ -1000,7 +1003,7 @@ impl NodeTrait for Collider {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/decal.rs b/fyrox-impl/src/scene/decal.rs
index 5dd8a01ac..f30754960 100644
--- a/fyrox-impl/src/scene/decal.rs
+++ b/fyrox-impl/src/scene/decal.rs
@@ -28,7 +28,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -109,7 +108,10 @@ use std::ops::{Deref, DerefMut};
 /// }
 /// ```
 #[derive(Debug, Visit, Default, Clone, Reflect)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "c4d24e48-edd1-4fb2-ad82-4b3d3ea985d8"
+)]
 pub struct Decal {
     base: Base,
 
@@ -141,12 +143,6 @@ impl DerefMut for Decal {
     }
 }
 
-impl TypeUuidProvider for Decal {
-    fn type_uuid() -> Uuid {
-        uuid!("c4d24e48-edd1-4fb2-ad82-4b3d3ea985d8")
-    }
-}
-
 impl Decal {
     /// Sets new diffuse texture.
     pub fn set_diffuse_texture(
@@ -239,7 +235,7 @@ impl NodeTrait for Decal {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 }
 
diff --git a/fyrox-impl/src/scene/dim2/collider.rs b/fyrox-impl/src/scene/dim2/collider.rs
index 3eaba5956..6e512e1df 100644
--- a/fyrox-impl/src/scene/dim2/collider.rs
+++ b/fyrox-impl/src/scene/dim2/collider.rs
@@ -30,10 +30,9 @@ use crate::{
         pool::Handle,
         reflect::prelude::*,
         uuid::{uuid, Uuid},
-        uuid_provider,
         variable::InheritableVariable,
         visitor::prelude::*,
-        ImmutableString, TypeUuidProvider,
+        ImmutableString,
     },
     graph::SceneGraph,
     scene::{
@@ -59,6 +58,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Ball is an idea sphere shape defined by a single parameters - its radius.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "8847dfd3-2d41-4e77-ab68-5d16503eafe0")]
 pub struct BallShape {
     /// Radius of the sphere.
     #[reflect(min_value = 0.001, step = 0.05)]
@@ -73,6 +73,7 @@ impl Default for BallShape {
 
 /// Cuboid shape (rectangle).
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "47b69ea8-d203-4c4a-9451-fec2d77233b3")]
 pub struct CuboidShape {
     /// Half extents of the box. X - half width, Y - half height.
     /// Actual _size_ will be 2 times bigger.
@@ -90,6 +91,7 @@ impl Default for CuboidShape {
 
 /// Arbitrary capsule shape defined by 2 points (which forms axis) and a radius.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "d5c3444c-38eb-4a72-bb70-939fccc7a044")]
 pub struct CapsuleShape {
     /// Begin point of the capsule.
     pub begin: Vector2<f32>,
@@ -113,6 +115,7 @@ impl Default for CapsuleShape {
 
 /// Arbitrary segment shape defined by two points.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "53725358-ae6e-4928-b7e2-89b99703a66c")]
 pub struct SegmentShape {
     /// Begin point of the capsule.
     pub begin: Vector2<f32>,
@@ -131,6 +134,7 @@ impl Default for SegmentShape {
 
 /// Arbitrary triangle shape.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "7b5c0314-10c7-4593-96f4-ace606ccda8d")]
 pub struct TriangleShape {
     /// First point of the triangle shape.
     pub a: Vector2<f32>,
@@ -155,12 +159,13 @@ impl Default for TriangleShape {
 /// # Notes
 ///
 /// Currently, there is only one way to set geometry - using a scene node as a source of data.
-#[derive(Default, Clone, Copy, PartialEq, Hash, Debug, Visit, Reflect, Eq, TypeUuidProvider)]
-#[type_uuid(id = "1d451699-d76e-4774-87ea-dd3e2751cb39")]
+#[derive(Default, Clone, Copy, PartialEq, Hash, Debug, Visit, Reflect, Eq)]
+#[reflect(type_uuid = "1d451699-d76e-4774-87ea-dd3e2751cb39")]
 pub struct GeometrySource(pub Handle<Node>);
 
 /// Arbitrary triangle mesh shape.
 #[derive(Default, Clone, Debug, PartialEq, Visit, Reflect, Eq)]
+#[reflect(type_uuid = "bdf7cb5f-7a68-4ac1-b261-b6d1b537d8e1")]
 pub struct TrimeshShape {
     /// Geometry sources for the shape.
     pub sources: Vec<GeometrySource>,
@@ -168,6 +173,7 @@ pub struct TrimeshShape {
 
 /// Arbitrary height field shape.
 #[derive(Default, Clone, Debug, PartialEq, Visit, Reflect, Eq)]
+#[reflect(type_uuid = "ff6e1e20-4b32-4607-b4c7-d2398b607232")]
 pub struct HeightfieldShape {
     /// A handle to terrain scene node.
     pub geometry_source: GeometrySource,
@@ -175,6 +181,7 @@ pub struct HeightfieldShape {
 
 /// Arbitrary tile map shape.
 #[derive(Default, Clone, Debug, PartialEq, Visit, Reflect, Eq)]
+#[reflect(type_uuid = "57502a1f-a3df-4c48-ad91-69e321a237dc")]
 pub struct TileMapShape {
     /// A handle to tile map scene node.
     pub tile_map: GeometrySource,
@@ -184,6 +191,7 @@ pub struct TileMapShape {
 
 /// Possible collider shapes.
 #[derive(Clone, Debug, Visit, Reflect, AsRefStr, PartialEq, EnumString, VariantNames)]
+#[reflect(type_uuid = "4615485f-f8db-4405-b4a5-437e74b3f5b8")]
 pub enum ColliderShape {
     /// See [`BallShape`] docs.
     Ball(BallShape),
@@ -203,8 +211,6 @@ pub enum ColliderShape {
     TileMap(TileMapShape),
 }
 
-uuid_provider!(ColliderShape = "4615485f-f8db-4405-b4a5-437e74b3f5b8");
-
 impl Default for ColliderShape {
     fn default() -> Self {
         Self::Ball(Default::default())
@@ -268,7 +274,10 @@ impl ColliderShape {
 /// Collider is a geometric entity that can be attached to a rigid body to allow to participate in
 /// contact generation, collision response and proximity queries.
 #[derive(Reflect, Visit, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "2b1659ea-a116-4224-bcd4-7931e3ae3b40"
+)]
 pub struct Collider {
     base: Base,
 
@@ -355,12 +364,6 @@ impl Clone for Collider {
     }
 }
 
-impl TypeUuidProvider for Collider {
-    fn type_uuid() -> Uuid {
-        uuid!("2b1659ea-a116-4224-bcd4-7931e3ae3b40")
-    }
-}
-
 impl Collider {
     /// Sets the new shape to the collider.
     ///
@@ -656,7 +659,7 @@ impl NodeTrait for Collider {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/dim2/joint.rs b/fyrox-impl/src/scene/dim2/joint.rs
index 4f4025682..fd87ed0a4 100644
--- a/fyrox-impl/src/scene/dim2/joint.rs
+++ b/fyrox-impl/src/scene/dim2/joint.rs
@@ -28,7 +28,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, m4x4_approx_eq},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -41,7 +40,6 @@ use crate::{
         Scene,
     },
 };
-use fyrox_core::uuid_provider;
 
 use fyrox_graph::constructor::ConstructorProvider;
 use fyrox_graph::SceneGraph;
@@ -56,6 +54,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 /// allows rigid bodies to perform relative rotations. The real world example is a human shoulder,
 /// pendulum, etc.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "b35f39a3-7b93-4ea9-8f9a-01faeee658ae")]
 pub struct BallJoint {
     /// Whether angular limits are enabled or not. Default is `false`
     pub limits_enabled: bool,
@@ -76,11 +75,13 @@ impl Default for BallJoint {
 /// A fixed joint ensures that two rigid bodies does not move relative to each other. There is no
 /// straightforward real-world example, but it can be thought as two bodies were "welded" together.
 #[derive(Clone, Debug, Default, Visit, PartialEq, Reflect, Eq)]
+#[reflect(type_uuid = "cf69b42d-0d7d-41a0-9354-af7659aaf5e6")]
 pub struct FixedJoint;
 
 /// Prismatic joint prevents any relative movement between two rigid-bodies, except for relative
 /// translations along one axis. The real world example is a sliders that used to support drawers.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "4b02e35a-a1b1-4617-a08a-c06139223969")]
 pub struct PrismaticJoint {
     /// Whether linear limits along local X axis of the joint are enabled or not. Default is `false`
     pub limits_enabled: bool,
@@ -100,6 +101,7 @@ impl Default for PrismaticJoint {
 
 /// Parameters that define how the joint motor will behave.
 #[derive(Default, Clone, Debug, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "b4dab2d7-8cba-4b6a-85c9-ac7c6dd48ed5")]
 pub struct JointMotorParams {
     /// The target velocity of the motor.
     pub target_vel: f32,
@@ -115,6 +117,7 @@ pub struct JointMotorParams {
 
 /// The exact kind of the joint.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "e1fa2015-3ea3-47bb-8ad3-d408559c9643")]
 pub enum JointParams {
     /// See [`BallJoint`] for more info.
     BallJoint(BallJoint),
@@ -124,8 +127,6 @@ pub enum JointParams {
     PrismaticJoint(PrismaticJoint),
 }
 
-uuid_provider!(JointParams = "e1fa2015-3ea3-47bb-8ad3-d408559c9643");
-
 impl Default for JointParams {
     fn default() -> Self {
         Self::BallJoint(Default::default())
@@ -133,6 +134,7 @@ impl Default for JointParams {
 }
 
 #[derive(Visit, Reflect, Debug, Clone, Default)]
+#[reflect(type_uuid = "d22556ef-f011-4b85-ac67-c1ff4d43d59e")]
 pub(crate) struct LocalFrame {
     pub position: Vector2<f32>,
     pub rotation: UnitComplex<f32>,
@@ -148,6 +150,7 @@ impl LocalFrame {
 }
 
 #[derive(Visit, Reflect, Debug, Clone, Default)]
+#[reflect(type_uuid = "448ce88b-1c89-4a66-b909-6835aff07d12")]
 pub(crate) struct JointLocalFrames {
     pub body1: LocalFrame,
     pub body2: LocalFrame,
@@ -165,7 +168,10 @@ impl JointLocalFrames {
 /// Joint is used to restrict motion of two rigid bodies. There are numerous examples of joints in
 /// real life: door hinge, ball joints in human arms, etc.
 #[derive(Visit, Reflect, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "b8d66eda-b69f-4c57-80ba-d76665573565"
+)]
 pub struct Joint {
     base: Base,
 
@@ -238,12 +244,6 @@ impl Clone for Joint {
     }
 }
 
-impl TypeUuidProvider for Joint {
-    fn type_uuid() -> Uuid {
-        uuid!("b8d66eda-b69f-4c57-80ba-d76665573565")
-    }
-}
-
 impl Joint {
     /// Sets new parameters of the joint.
     pub fn set_params(&mut self, params: JointParams) -> JointParams {
@@ -558,7 +558,7 @@ impl NodeTrait for Joint {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/dim2/physics.rs b/fyrox-impl/src/scene/dim2/physics.rs
index e5049fa28..e11f4d927 100644
--- a/fyrox-impl/src/scene/dim2/physics.rs
+++ b/fyrox-impl/src/scene/dim2/physics.rs
@@ -458,6 +458,7 @@ fn isometry2_to_mat4(isometry: &Isometry2<f32>) -> Matrix4<f32> {
 /// methods, mostly for ray casting. You should add physical entities using scene graph nodes, such
 /// as RigidBody, Collider, Joint.
 #[derive(Visit, Reflect)]
+#[reflect(type_uuid = "035cccc1-a098-4b25-bbd6-cac507d6649d")]
 pub struct PhysicsWorld {
     /// A flag that defines whether physics simulation is enabled or not.
     pub enabled: InheritableVariable<bool>,
diff --git a/fyrox-impl/src/scene/dim2/rectangle.rs b/fyrox-impl/src/scene/dim2/rectangle.rs
index cd4644526..23c6b587a 100644
--- a/fyrox-impl/src/scene/dim2/rectangle.rs
+++ b/fyrox-impl/src/scene/dim2/rectangle.rs
@@ -31,7 +31,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, Rect, TriangleDefinition},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         value_as_u8_slice,
         variable::InheritableVariable,
@@ -172,7 +171,10 @@ impl Hash for RectangleVertex {
 /// which means `[0; 0]` corresponds to top-left corner of the texture and `[1; 1]` corresponds to
 /// right-bottom corner.
 #[derive(Reflect, Debug, Clone, Visit)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "bb57b5e0-367a-4490-bf30-7f547407d5b5"
+)]
 pub struct Rectangle {
     base: Base,
 
@@ -222,12 +224,6 @@ impl DerefMut for Rectangle {
     }
 }
 
-impl TypeUuidProvider for Rectangle {
-    fn type_uuid() -> Uuid {
-        uuid!("bb57b5e0-367a-4490-bf30-7f547407d5b5")
-    }
-}
-
 impl Rectangle {
     /// Returns current color of the rectangle.
     pub fn color(&self) -> Color {
@@ -321,7 +317,7 @@ impl NodeTrait for Rectangle {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn collect_render_data(&self, ctx: &mut RenderContext) -> RdcControlFlow {
diff --git a/fyrox-impl/src/scene/dim2/rigidbody.rs b/fyrox-impl/src/scene/dim2/rigidbody.rs
index 525947cff..81f51798e 100644
--- a/fyrox-impl/src/scene/dim2/rigidbody.rs
+++ b/fyrox-impl/src/scene/dim2/rigidbody.rs
@@ -37,7 +37,6 @@ use crate::{
         parking_lot::Mutex,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -91,7 +90,10 @@ pub(crate) enum ApplyAction {
 /// Rigid body that does not move for some time will go asleep. This means that the body will not
 /// move unless it is woken up by some other moving body. This feature allows to save CPU resources.
 #[derive(Visit, Reflect)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "0b242335-75a4-4c65-9685-3e82a8979047"
+)]
 pub struct RigidBody {
     base: Base,
 
@@ -218,12 +220,6 @@ impl Clone for RigidBody {
     }
 }
 
-impl TypeUuidProvider for RigidBody {
-    fn type_uuid() -> Uuid {
-        uuid!("0b242335-75a4-4c65-9685-3e82a8979047")
-    }
-}
-
 impl RigidBody {
     /// Sets new linear velocity of the rigid body. Changing this parameter will wake up the rigid
     /// body!
@@ -488,7 +484,7 @@ impl NodeTrait for RigidBody {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/graph/mod.rs b/fyrox-impl/src/scene/graph/mod.rs
index 6f2067cf6..c8a603559 100644
--- a/fyrox-impl/src/scene/graph/mod.rs
+++ b/fyrox-impl/src/scene/graph/mod.rs
@@ -126,6 +126,7 @@ pub type NodePool = Pool<Node, NodeContainer>;
 
 /// See module docs.
 #[derive(Reflect)]
+#[reflect(type_uuid = "92b8e89c-3934-4876-a60a-2970286a56f6")]
 pub struct Graph {
     #[reflect(hidden)]
     root: Handle<Node>,
@@ -2216,7 +2217,6 @@ mod test {
             futures::executor::block_on,
             pool::Handle,
             reflect::prelude::*,
-            type_traits::prelude::*,
             visitor::prelude::*,
         },
         engine::{self, SerializationContext},
@@ -2240,8 +2240,8 @@ mod test {
     use fyrox_resource::untyped::ResourceKind;
     use std::{fs, path::Path, sync::Arc};
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "722feb80-a10b-4ee0-8cef-5d1473df8457")]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit)]
+    #[reflect(type_uuid = "722feb80-a10b-4ee0-8cef-5d1473df8457")]
     struct MyScript {
         foo: String,
         bar: f32,
@@ -2249,8 +2249,8 @@ mod test {
 
     impl ScriptTrait for MyScript {}
 
-    #[derive(Clone, Debug, PartialEq, Reflect, Visit, TypeUuidProvider)]
-    #[type_uuid(id = "722feb80-a10b-4ee0-8cef-5d1473df8458")]
+    #[derive(Clone, Debug, PartialEq, Reflect, Visit)]
+    #[reflect(type_uuid = "722feb80-a10b-4ee0-8cef-5d1473df8458")]
     struct MyOtherScript {
         baz: u32,
         foobar: Vec<u32>,
diff --git a/fyrox-impl/src/scene/graph/physics.rs b/fyrox-impl/src/scene/graph/physics.rs
index 478ef28e6..14e62ab6c 100644
--- a/fyrox-impl/src/scene/graph/physics.rs
+++ b/fyrox-impl/src/scene/graph/physics.rs
@@ -33,7 +33,6 @@ use crate::{
         parking_lot::Mutex,
         pool::Handle,
         reflect::prelude::*,
-        uuid_provider,
         variable::{InheritableVariable, VariableFlags},
         visitor::prelude::*,
         BiDirHashMap, SafeLock,
@@ -130,6 +129,7 @@ impl From<rapier2d::geometry::FeatureId> for FeatureId {
     Copy, Clone, Debug, PartialEq, Eq, Visit, Reflect, VariantNames, EnumString, AsRefStr, Default,
 )]
 #[repr(u32)]
+#[reflect(type_uuid = "775d5598-c283-4b44-9cc0-2e23dc8936f4")]
 pub enum CoefficientCombineRule {
     /// The two coefficients are averaged.
     #[default]
@@ -144,8 +144,6 @@ pub enum CoefficientCombineRule {
     ClampedSum = 4,
 }
 
-uuid_provider!(CoefficientCombineRule = "775d5598-c283-4b44-9cc0-2e23dc8936f4");
-
 impl From<rapier3d::dynamics::CoefficientCombineRule> for CoefficientCombineRule {
     fn from(v: rapier3d::dynamics::CoefficientCombineRule) -> Self {
         match v {
@@ -828,6 +826,7 @@ fn collider_shape_into_native_shape(
 /// each parameter.
 #[derive(Copy, Clone, Visit, Reflect, Debug, PartialEq)]
 #[visit(optional)]
+#[reflect(type_uuid = "bd4ca07f-34a5-4cf8-a70e-24919124545b")]
 pub struct IntegrationParameters {
     /// The time step length, default is None - this means that physics simulation will use engine's
     /// time step.
@@ -913,6 +912,7 @@ impl Default for IntegrationParameters {
 /// methods, mostly for ray casting. You should add physical entities using scene graph nodes, such
 /// as RigidBody, Collider, Joint.
 #[derive(Visit, Reflect)]
+#[reflect(type_uuid = "17e663b8-98a4-46db-be71-a336246f571a")]
 pub struct PhysicsWorld {
     /// A flag that defines whether physics simulation is enabled or not.
     pub enabled: InheritableVariable<bool>,
diff --git a/fyrox-impl/src/scene/joint.rs b/fyrox-impl/src/scene/joint.rs
index da163d1de..cf81eccef 100644
--- a/fyrox-impl/src/scene/joint.rs
+++ b/fyrox-impl/src/scene/joint.rs
@@ -28,7 +28,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, m4x4_approx_eq},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -42,7 +41,7 @@ use crate::{
     },
 };
 use fyrox_core::algebra::{Isometry3, Vector3};
-use fyrox_core::uuid_provider;
+
 use fyrox_graph::constructor::ConstructorProvider;
 use fyrox_graph::SceneGraph;
 use rapier2d::na::UnitQuaternion;
@@ -58,6 +57,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 /// allows rigid bodies to perform relative rotations. The real world example is a human shoulder,
 /// pendulum, etc.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "bb63213b-5be2-4fc7-878e-c7389ab03685")]
 pub struct BallJoint {
     /// Whether X angular limits are enabled or not. Default is `false`
     pub x_limits_enabled: bool,
@@ -94,11 +94,13 @@ impl Default for BallJoint {
 /// A fixed joint ensures that two rigid bodies does not move relative to each other. There is no
 /// straightforward real-world example, but it can be thought as two bodies were "welded" together.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect, Default, Eq)]
+#[reflect(type_uuid = "24ff690c-e797-47b4-8bd4-0e1fed4f7bb7")]
 pub struct FixedJoint;
 
 /// Prismatic joint prevents any relative movement between two rigid-bodies, except for relative
 /// translations along one axis. The real world example is a sliders that used to support drawers.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "af31abc5-49e6-4ef8-8f23-f3aaa96d0634")]
 pub struct PrismaticJoint {
     /// Whether linear limits along local joint X axis are enabled or not. Default is `false`
     pub limits_enabled: bool,
@@ -120,6 +122,7 @@ impl Default for PrismaticJoint {
 /// along one axis. The real world example is wheels, fans, etc. It can also be used to simulate door
 /// hinge.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "d7365d59-ef93-4558-8ce3-52b25be8161a")]
 pub struct RevoluteJoint {
     /// Whether angular limits around local X axis of the joint are enabled or not. Default is `false`
     pub limits_enabled: bool,
@@ -139,6 +142,7 @@ impl Default for RevoluteJoint {
 
 /// Parameters that define how the joint motor will behave.
 #[derive(Default, Clone, Debug, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "4a0ff733-121b-49f7-943d-6aaa0c3540ec")]
 pub struct JointMotorParams {
     /// The target velocity of the motor.
     pub target_vel: f32,
@@ -154,6 +158,7 @@ pub struct JointMotorParams {
 
 /// The exact kind of the joint.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "a3e09303-9de4-4123-9492-05e27f29aaa3")]
 pub enum JointParams {
     /// See [`BallJoint`] for more info.
     BallJoint(BallJoint),
@@ -165,8 +170,6 @@ pub enum JointParams {
     RevoluteJoint(RevoluteJoint),
 }
 
-uuid_provider!(JointParams = "a3e09303-9de4-4123-9492-05e27f29aaa3");
-
 impl Default for JointParams {
     fn default() -> Self {
         Self::BallJoint(Default::default())
@@ -174,6 +177,7 @@ impl Default for JointParams {
 }
 
 #[derive(Visit, Reflect, Debug, Clone, Default)]
+#[reflect(type_uuid = "1be0b82e-d05e-4b93-808a-41895c5a1627")]
 pub(crate) struct LocalFrame {
     pub position: Vector3<f32>,
     pub rotation: UnitQuaternion<f32>,
@@ -189,6 +193,7 @@ impl LocalFrame {
 }
 
 #[derive(Visit, Reflect, Debug, Clone, Default)]
+#[reflect(type_uuid = "2a8e0d9c-4c14-454e-967b-920a032bbafb")]
 pub(crate) struct JointLocalFrames {
     pub body1: LocalFrame,
     pub body2: LocalFrame,
@@ -206,7 +211,10 @@ impl JointLocalFrames {
 /// Joint is used to restrict motion of two rigid bodies. There are numerous examples of joints in
 /// real life: door hinge, ball joints in human arms, etc.
 #[derive(Visit, Reflect, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "439d48f5-e3a3-4255-aa08-353c1ca42e3b"
+)]
 pub struct Joint {
     base: Base,
 
@@ -284,12 +292,6 @@ impl Clone for Joint {
     }
 }
 
-impl TypeUuidProvider for Joint {
-    fn type_uuid() -> Uuid {
-        uuid!("439d48f5-e3a3-4255-aa08-353c1ca42e3b")
-    }
-}
-
 impl Joint {
     /// Returns a shared reference to the current joint parameters.
     pub fn params(&self) -> &JointParams {
@@ -636,7 +638,7 @@ impl NodeTrait for Joint {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/light/directional.rs b/fyrox-impl/src/scene/light/directional.rs
index e3829adab..0d0d7f621 100644
--- a/fyrox-impl/src/scene/light/directional.rs
+++ b/fyrox-impl/src/scene/light/directional.rs
@@ -33,9 +33,7 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
-        uuid_provider,
         variable::InheritableVariable,
         visitor::{Visit, VisitResult, Visitor},
     },
@@ -58,6 +56,7 @@ pub const CSM_NUM_CASCADES: usize = 3;
 
 /// Frustum split options defines how to split camera's frustum to generate cascades.
 #[derive(Reflect, Clone, Visit, Debug, PartialEq, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "b2ed128a-b7da-4d34-b027-a0af19c2f563")]
 pub enum FrustumSplitOptions {
     /// Camera frustum will be split into a [`CSM_NUM_CASCADES`] splits where each sub-frustum
     /// will have fixed far plane location.
@@ -83,8 +82,6 @@ pub enum FrustumSplitOptions {
     },
 }
 
-uuid_provider!(FrustumSplitOptions = "b2ed128a-b7da-4d34-b027-a0af19c2f563");
-
 impl Default for FrustumSplitOptions {
     fn default() -> Self {
         Self::Absolute {
@@ -95,6 +92,7 @@ impl Default for FrustumSplitOptions {
 
 /// Cascade Shadow Mapping (CSM) options.
 #[derive(Reflect, Clone, Visit, PartialEq, Debug)]
+#[reflect(type_uuid = "a521b6d1-665f-42f8-af3b-0e628e1bf09d")]
 pub struct CsmOptions {
     /// See [`FrustumSplitOptions`].
     pub split_options: FrustumSplitOptions,
@@ -128,7 +126,10 @@ impl CsmOptions {
 
 /// See module docs.
 #[derive(Default, Debug, Visit, Reflect, Clone)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "8b8248e1-1cdf-42a3-9abe-0691de82c519"
+)]
 pub struct DirectionalLight {
     base_light: BaseLight,
     /// See [`CsmOptions`].
@@ -158,12 +159,6 @@ impl DerefMut for DirectionalLight {
     }
 }
 
-impl TypeUuidProvider for DirectionalLight {
-    fn type_uuid() -> Uuid {
-        uuid!("8b8248e1-1cdf-42a3-9abe-0691de82c519")
-    }
-}
-
 impl DirectionalLight {
     /// Returns a reference to base light.
     pub fn base_light_ref(&self) -> &BaseLight {
@@ -201,7 +196,7 @@ impl NodeTrait for DirectionalLight {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn debug_draw(&self, ctx: &mut SceneDrawingContext) {
diff --git a/fyrox-impl/src/scene/light/mod.rs b/fyrox-impl/src/scene/light/mod.rs
index 68efca296..929bb147b 100644
--- a/fyrox-impl/src/scene/light/mod.rs
+++ b/fyrox-impl/src/scene/light/mod.rs
@@ -68,6 +68,7 @@ pub const DEFAULT_SCATTER_B: f32 = 0.03;
 /// scattering factor (per color channel) and other useful properties. Exact
 /// behavior defined by specific light kind.
 #[derive(Debug, Reflect, Clone, Visit)]
+#[reflect(type_uuid = "5c9486ed-5f3b-4225-bed5-95f9bde6360e")]
 pub struct BaseLight {
     base: Base,
 
diff --git a/fyrox-impl/src/scene/light/point.rs b/fyrox-impl/src/scene/light/point.rs
index 73378ddc4..8c328fbc2 100644
--- a/fyrox-impl/src/scene/light/point.rs
+++ b/fyrox-impl/src/scene/light/point.rs
@@ -45,7 +45,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::{Visit, VisitResult, Visitor},
@@ -64,7 +63,10 @@ use std::ops::{Deref, DerefMut};
 
 /// See module docs.
 #[derive(Debug, Reflect, Clone, Visit)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "c81dcc31-7cb9-465f-abd9-b385ac6f4d37"
+)]
 pub struct PointLight {
     base_light: BaseLight,
 
@@ -91,12 +93,6 @@ impl DerefMut for PointLight {
     }
 }
 
-impl TypeUuidProvider for PointLight {
-    fn type_uuid() -> Uuid {
-        uuid!("c81dcc31-7cb9-465f-abd9-b385ac6f4d37")
-    }
-}
-
 impl PointLight {
     /// Returns a reference to base light.    
     pub fn base_light_ref(&self) -> &BaseLight {
@@ -160,7 +156,7 @@ impl NodeTrait for PointLight {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn debug_draw(&self, ctx: &mut SceneDrawingContext) {
diff --git a/fyrox-impl/src/scene/light/spot.rs b/fyrox-impl/src/scene/light/spot.rs
index 854187c55..2247d038c 100644
--- a/fyrox-impl/src/scene/light/spot.rs
+++ b/fyrox-impl/src/scene/light/spot.rs
@@ -51,7 +51,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, Matrix4Ext},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::{Visit, VisitResult, Visitor},
@@ -71,7 +70,10 @@ use std::ops::{Deref, DerefMut};
 
 /// See module docs.
 #[derive(Debug, Reflect, Clone, Visit)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "9856a3c1-ced7-47ec-b682-4dc4dea89d8f"
+)]
 pub struct SpotLight {
     base_light: BaseLight,
 
@@ -122,12 +124,6 @@ impl Default for SpotLight {
     }
 }
 
-impl TypeUuidProvider for SpotLight {
-    fn type_uuid() -> Uuid {
-        uuid!("9856a3c1-ced7-47ec-b682-4dc4dea89d8f")
-    }
-}
-
 impl SpotLight {
     /// Returns a reference to base light.
     pub fn base_light_ref(&self) -> &BaseLight {
@@ -248,7 +244,7 @@ impl NodeTrait for SpotLight {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn debug_draw(&self, ctx: &mut SceneDrawingContext) {
diff --git a/fyrox-impl/src/scene/mesh/buffer.rs b/fyrox-impl/src/scene/mesh/buffer.rs
index 9f8f4a3eb..81dc4be77 100644
--- a/fyrox-impl/src/scene/mesh/buffer.rs
+++ b/fyrox-impl/src/scene/mesh/buffer.rs
@@ -59,6 +59,7 @@ pub trait VertexTrait: Copy + 'static {
 #[derive(Reflect, Copy, Clone, PartialOrd, PartialEq, Eq, Ord, Hash, Visit, Debug)]
 #[repr(u8)]
 #[derive(Default)]
+#[reflect(type_uuid = "c131e587-c400-4185-93fb-fbfbd11c1d8b")]
 pub enum VertexAttributeDataType {
     /// 32-bit floating-point.
     #[default]
@@ -87,6 +88,7 @@ impl VertexAttributeDataType {
 #[derive(Reflect, Copy, Clone, PartialOrd, PartialEq, Eq, Ord, Hash, Visit, Debug)]
 #[repr(u32)]
 #[derive(Default)]
+#[reflect(type_uuid = "17839987-f47f-4dd4-9a66-4c39b301681f")]
 pub enum VertexAttributeUsage {
     /// Vertex position. Usually `Vector2<f32>` or `Vector3<f32>`.
     #[default]
@@ -169,6 +171,7 @@ pub struct VertexAttributeDescriptor {
 /// Vertex attribute is a simple "bridge" between raw data and its interpretation. In
 /// other words it defines how to treat raw data in vertex shader.
 #[derive(Reflect, Visit, Copy, Clone, Default, Debug, Hash)]
+#[reflect(type_uuid = "705f8ad3-69b4-4b39-99aa-a3f97e319202")]
 pub struct VertexAttribute {
     /// Claimed usage of the attribute. It could be Position, Normal, etc.
     pub usage: VertexAttributeUsage,
@@ -217,6 +220,7 @@ impl Display for VertexAttribute {
 
 /// Bytes storage of a vertex buffer.
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "493045ee-fba2-4c5f-a5cd-c27034d1ec71")]
 pub struct BytesStorage {
     bytes: Vec<u8>,
     #[reflect(hidden)]
@@ -396,6 +400,7 @@ impl Deref for BytesStorage {
 /// Vertex size cannot be more than 256 bytes, this limitation shouldn't be a problem because almost every GPU supports up to
 /// 16 vertex attributes with 16 bytes of size each, which gives exactly 256 bytes.
 #[derive(Reflect, Clone, Visit, Default, Debug)]
+#[reflect(type_uuid = "edab7161-6695-4e2a-b947-13305709d451")]
 pub struct VertexBuffer {
     dense_layout: Vec<VertexAttribute>,
     sparse_layout: [Option<VertexAttribute>; VertexAttributeUsage::Count as usize],
@@ -1464,6 +1469,7 @@ impl VertexWriteTrait for VertexViewMut<'_> {
 
 /// A buffer for data that defines connections between vertices.
 #[derive(Reflect, Default, Clone, Debug)]
+#[reflect(type_uuid = "ed9f9aa9-e1fb-4f58-b1cb-162d51dbc9e7")]
 pub struct TriangleBuffer {
     triangles: Vec<TriangleDefinition>,
     modifications_counter: u64,
diff --git a/fyrox-impl/src/scene/mesh/mod.rs b/fyrox-impl/src/scene/mesh/mod.rs
index eb8129af4..5cb885a24 100644
--- a/fyrox-impl/src/scene/mesh/mod.rs
+++ b/fyrox-impl/src/scene/mesh/mod.rs
@@ -29,7 +29,6 @@ use crate::{
         parking_lot::Mutex,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         variable::InheritableVariable,
         visitor::prelude::*,
         SafeLock,
@@ -93,9 +92,8 @@ pub mod vertex;
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "009bccb6-42e4-4dc6-bb26-6a8a70b3fab9")]
+#[reflect(type_uuid = "009bccb6-42e4-4dc6-bb26-6a8a70b3fab9")]
 #[repr(u32)]
 pub enum RenderPath {
     /// Deferred rendering has much better performance than Forward, but it does not support transparent
@@ -143,9 +141,8 @@ fn transform_vertex(mut vertex: VertexViewMut, world: &Matrix4<f32>) {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "745e6f32-63f5-46fe-8edb-9708699ae328")]
+#[reflect(type_uuid = "745e6f32-63f5-46fe-8edb-9708699ae328")]
 #[repr(u32)]
 pub enum BatchingMode {
     /// No batching. The mesh will be drawn in a separate draw call.
@@ -318,7 +315,10 @@ impl RenderDataBundleStorageTrait for BatchContainer {
 /// This example creates a unit cube surface with default material and then creates a mesh with this surface. If you need to create
 /// custom surface, see [`crate::scene::mesh::surface::SurfaceData`] docs for more info.
 #[derive(Debug, Reflect, Clone, Visit)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "caaf9d7b-bd74-48ce-b7cc-57e9dc65c2e6"
+)]
 pub struct Mesh {
     #[visit(rename = "Common")]
     base: Base,
@@ -401,12 +401,6 @@ impl DerefMut for Mesh {
     }
 }
 
-impl TypeUuidProvider for Mesh {
-    fn type_uuid() -> Uuid {
-        uuid!("caaf9d7b-bd74-48ce-b7cc-57e9dc65c2e6")
-    }
-}
-
 impl Mesh {
     /// Default name of the blend shapes storage property in a shader.
     pub const DEFAULT_BLEND_SHAPES_PROPERTY_NAME: &'static str = "blendShapesStorage";
@@ -661,7 +655,7 @@ impl NodeTrait for Mesh {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_global_transform_changed(
diff --git a/fyrox-impl/src/scene/mesh/surface.rs b/fyrox-impl/src/scene/mesh/surface.rs
index 07630f3c2..86f4d1571 100644
--- a/fyrox-impl/src/scene/mesh/surface.rs
+++ b/fyrox-impl/src/scene/mesh/surface.rs
@@ -37,11 +37,8 @@ use crate::{
         pool::{ErasedHandle, Handle},
         reflect::prelude::*,
         sparse::AtomicIndex,
-        type_traits::prelude::*,
-        uuid_provider,
         variable::InheritableVariable,
         visitor::{Visit, VisitResult, Visitor},
-        Uuid,
     },
     material::{Material, MaterialResource, MaterialResourceExtension},
     resource::texture::{TextureKind, TexturePixelKind, TextureResource, TextureResourceExtension},
@@ -70,6 +67,7 @@ use std::{
 
 /// A target shape for blending.
 #[derive(Debug, Clone, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "fea08418-58fe-4fde-991b-36be235432bd")]
 pub struct BlendShape {
     /// Weight of the shape.
     #[reflect(min_value = 0.0, max_value = 100.0, step = 1.0)]
@@ -79,8 +77,6 @@ pub struct BlendShape {
     pub name: String,
 }
 
-uuid_provider!(BlendShape = "fea08418-58fe-4fde-991b-36be235432bd");
-
 impl Default for BlendShape {
     fn default() -> Self {
         Self {
@@ -92,6 +88,7 @@ impl Default for BlendShape {
 
 /// A container for multiple blend shapes/
 #[derive(Reflect, Debug, Clone, Default)]
+#[reflect(type_uuid = "bd60343b-4a27-42aa-959e-b0d1bc8682db")]
 pub struct BlendShapesContainer {
     /// A list of blend shapes.
     pub blend_shapes: Vec<BlendShape>,
@@ -223,8 +220,8 @@ impl BlendShapesContainer {
 /// Data source of a surface. Each surface can share same data source, this is used
 /// in instancing technique to render multiple instances of same model at different
 /// places.
-#[derive(Debug, Clone, Default, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "8a23a414-e66d-4e12-9628-92c6ab49c2f0")]
+#[derive(Debug, Clone, Default, Reflect)]
+#[reflect(type_uuid = "8a23a414-e66d-4e12-9628-92c6ab49c2f0")]
 pub struct SurfaceData {
     /// Current vertex buffer.
     pub vertex_buffer: VertexBuffer,
@@ -237,10 +234,6 @@ pub struct SurfaceData {
 }
 
 impl ResourceData for SurfaceData {
-    fn type_uuid(&self) -> Uuid {
-        <SurfaceData as fyrox_core::TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.visit("SurfaceData", &mut visitor)?;
@@ -1252,6 +1245,7 @@ impl SurfaceResourceExtension for SurfaceResource {
 /// This code snippet creates a cone surface instance, check the docs for [`SurfaceData`] for more info about built-in
 /// methods.
 #[derive(Debug, Reflect, Visit, PartialEq)]
+#[reflect(type_uuid = "485caf12-4e7d-4b1a-b6bd-0681fd92f789")]
 pub struct Surface {
     pub(crate) data: InheritableVariable<SurfaceResource>,
 
@@ -1276,8 +1270,6 @@ pub struct Surface {
     pub(crate) vertex_weights: Vec<VertexWeightSet>,
 }
 
-uuid_provider!(Surface = "485caf12-4e7d-4b1a-b6bd-0681fd92f789");
-
 impl Clone for Surface {
     fn clone(&self) -> Self {
         Self {
@@ -1451,7 +1443,7 @@ impl ResourceLoader for SurfaceDataLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        <SurfaceData as TypeUuidProvider>::type_uuid()
+        <SurfaceData as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-impl/src/scene/mod.rs b/fyrox-impl/src/scene/mod.rs
index bbcf6b003..48ab09c31 100644
--- a/fyrox-impl/src/scene/mod.rs
+++ b/fyrox-impl/src/scene/mod.rs
@@ -59,7 +59,6 @@ use crate::{
         log::{Log, MessageKind},
         pool::{Handle, Pool, Ticket},
         reflect::prelude::*,
-        type_traits::prelude::*,
         variable::InheritableVariable,
         visitor::{error::VisitError, Visit, VisitResult, Visitor},
         SafeLock,
@@ -170,19 +169,9 @@ impl IndexMut<Handle<Navmesh>> for NavMeshContainer {
 /// A set of options, that allows selecting the source of environment lighting for a scene. By
 /// default, it is set to [`EnvironmentLightingSource::SkyBox`].
 #[derive(
-    Reflect,
-    Visit,
-    Debug,
-    Default,
-    Clone,
-    Copy,
-    PartialEq,
-    AsRefStr,
-    EnumString,
-    VariantNames,
-    TypeUuidProvider,
+    Reflect, Visit, Debug, Default, Clone, Copy, PartialEq, AsRefStr, EnumString, VariantNames,
 )]
-#[type_uuid(id = "28f22fe7-22ed-47e1-ae43-779866a46cdf")]
+#[reflect(type_uuid = "28f22fe7-22ed-47e1-ae43-779866a46cdf")]
 pub enum EnvironmentLightingSource {
     /// Sky box of a scene will be the source of lighting.
     #[default]
@@ -193,6 +182,7 @@ pub enum EnvironmentLightingSource {
 
 /// Rendering options of a scene. It allows you to specify a render target to render the scene to, change its clear color, etc.
 #[derive(Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "74a58c1d-4f70-4a04-9cac-bfdaec63b321")]
 pub struct SceneRenderingOptions {
     /// A texture to draw the scene to. If empty, then the scene will be drawn on screen directly. It is useful to "embed" some scene into other
     /// by drawing a quad with this texture. This can be used to make in-game video conference - you can make separate scene with
@@ -251,6 +241,7 @@ impl Clone for SceneRenderingOptions {
 
 /// See module docs.
 #[derive(Debug, Reflect)]
+#[reflect(type_uuid = "03b3f812-3518-429b-befe-3f7a160503fa")]
 pub struct Scene {
     /// Graph is main container for all scene nodes. It calculates global transforms for nodes,
     /// updates them and performs all other important work. See `graph` module docs for more
@@ -282,7 +273,7 @@ pub struct Scene {
 }
 
 impl Reflect for &'static mut Scene {
-    blank_reflect_ref!();
+    blank_reflect_ref!("1258e495-5789-4aa4-a2c5-3f9f79bef5f4");
 }
 
 impl Clone for Scene {
diff --git a/fyrox-impl/src/scene/navmesh.rs b/fyrox-impl/src/scene/navmesh.rs
index 9ac919d4d..3d15b6f65 100644
--- a/fyrox-impl/src/scene/navmesh.rs
+++ b/fyrox-impl/src/scene/navmesh.rs
@@ -29,7 +29,6 @@ use crate::{
         parking_lot::RwLock,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -53,6 +52,7 @@ use std::{
 };
 
 #[derive(Clone, Default, Reflect, Debug)]
+#[reflect(type_uuid = "7e5978ab-788b-4f41-a125-299ad89b81c7")]
 pub(crate) struct Container(Arc<RwLock<Navmesh>>);
 
 impl PartialEq for Container {
@@ -157,19 +157,16 @@ impl Visit for Container {
 /// }
 /// ```
 #[derive(Debug, Clone, Visit, Reflect, Default)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "d0ce963c-b50a-4707-bd21-af6dc0d1c668"
+)]
 pub struct NavigationalMesh {
     base: Base,
     #[reflect(read_only)]
     navmesh: InheritableVariable<Container>,
 }
 
-impl TypeUuidProvider for NavigationalMesh {
-    fn type_uuid() -> Uuid {
-        uuid!("d0ce963c-b50a-4707-bd21-af6dc0d1c668")
-    }
-}
-
 impl Deref for NavigationalMesh {
     type Target = Base;
 
@@ -215,7 +212,7 @@ impl NodeTrait for NavigationalMesh {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn debug_draw(&self, ctx: &mut SceneDrawingContext) {
diff --git a/fyrox-impl/src/scene/node/container.rs b/fyrox-impl/src/scene/node/container.rs
index 234dd3c32..964908509 100644
--- a/fyrox-impl/src/scene/node/container.rs
+++ b/fyrox-impl/src/scene/node/container.rs
@@ -36,6 +36,7 @@ use fyrox_core::visitor::error::VisitError;
 /// A wrapper for node pool record that allows to define custom visit method to have full
 /// control over instantiation process at deserialization.
 #[derive(Debug, Clone, Default, Reflect)]
+#[reflect(type_uuid = "be27db20-c0b0-491e-9421-8b1ebc357b9a")]
 pub struct NodeContainer(Option<Node>);
 
 fn read_node(name: &str, visitor: &mut Visitor) -> Result<Node, VisitError> {
diff --git a/fyrox-impl/src/scene/node/mod.rs b/fyrox-impl/src/scene/node/mod.rs
index cb57554f1..5d7c1a5fe 100644
--- a/fyrox-impl/src/scene/node/mod.rs
+++ b/fyrox-impl/src/scene/node/mod.rs
@@ -33,7 +33,7 @@ use crate::{
         pool::Handle,
         reflect::prelude::*,
         uuid::Uuid,
-        uuid_provider, variable,
+        variable,
         variable::mark_inheritable_properties_non_modified,
         visitor::{Visit, VisitResult, Visitor},
         NameProvider,
@@ -359,6 +359,7 @@ impl<T: NodeTrait> ObjectOrVariantHelper<Node, T> for PhantomData<T> {
 /// of every field, even those inheritable variables which are non-modified. Which means that there's no benefits of RAM
 /// consumption, only disk space usage is reduced.
 #[derive(Debug, Reflect)]
+#[reflect(type_uuid = "a9bc5231-155c-4564-b0ca-f23972673925")]
 pub struct Node(#[reflect(deref, display_name = "Node")] pub(crate) Box<dyn NodeTrait>);
 
 impl<T: NodeTrait> From<T> for Node {
@@ -437,8 +438,6 @@ impl NameProvider for Node {
     }
 }
 
-uuid_provider!(Node = "a9bc5231-155c-4564-b0ca-f23972673925");
-
 impl Deref for Node {
     type Target = dyn NodeTrait;
 
@@ -588,7 +587,7 @@ mod test {
             uuid::{uuid, Uuid},
             variable::InheritableVariable,
             visitor::{prelude::*, Visitor},
-            SafeLock, TypeUuidProvider,
+            SafeLock,
         },
         engine::{self, SerializationContext},
         resource::model::{Model, ModelResourceExtension},
@@ -610,17 +609,12 @@ mod test {
     use std::{fs, path::Path, sync::Arc};
 
     #[derive(Debug, Clone, Reflect, Visit, Default)]
+    #[reflect(type_uuid = "d3f66902-803f-4ace-8170-0aa485d98b40")]
     struct MyScript {
         some_field: InheritableVariable<String>,
         some_collection: InheritableVariable<Vec<u32>>,
     }
 
-    impl TypeUuidProvider for MyScript {
-        fn type_uuid() -> Uuid {
-            uuid!("d3f66902-803f-4ace-8170-0aa485d98b40")
-        }
-    }
-
     impl ScriptTrait for MyScript {}
 
     fn create_scene() -> Scene {
diff --git a/fyrox-impl/src/scene/particle_system/emitter/base.rs b/fyrox-impl/src/scene/particle_system/emitter/base.rs
index fcae2144a..77fa6d04e 100644
--- a/fyrox-impl/src/scene/particle_system/emitter/base.rs
+++ b/fyrox-impl/src/scene/particle_system/emitter/base.rs
@@ -31,6 +31,7 @@ use std::ops::Range;
 
 /// See module docs.
 #[derive(Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "61dcd2a8-58e5-4b53-92ed-7e0b531e1ed2")]
 pub struct BaseEmitter {
     /// Offset from center of particle system.
     position: Vector3<f32>,
diff --git a/fyrox-impl/src/scene/particle_system/emitter/cuboid.rs b/fyrox-impl/src/scene/particle_system/emitter/cuboid.rs
index d3e631aa7..ffa467aae 100644
--- a/fyrox-impl/src/scene/particle_system/emitter/cuboid.rs
+++ b/fyrox-impl/src/scene/particle_system/emitter/cuboid.rs
@@ -37,6 +37,7 @@ use std::ops::{Deref, DerefMut};
 
 /// See module docs.
 #[derive(Debug, Clone, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "3afa3670-fa3f-4da2-b971-b0223b1309ec")]
 pub struct CuboidEmitter {
     emitter: BaseEmitter,
     #[reflect(min_value = 0.0, step = 0.1)]
diff --git a/fyrox-impl/src/scene/particle_system/emitter/cylinder.rs b/fyrox-impl/src/scene/particle_system/emitter/cylinder.rs
index f54f37e0a..53b7c4afd 100644
--- a/fyrox-impl/src/scene/particle_system/emitter/cylinder.rs
+++ b/fyrox-impl/src/scene/particle_system/emitter/cylinder.rs
@@ -35,6 +35,7 @@ use std::ops::{Deref, DerefMut};
 
 /// See module docs.
 #[derive(Clone, Debug, Visit, PartialEq, Reflect)]
+#[reflect(type_uuid = "6cff3e6e-bc27-4f36-8b79-cdfbc46550b7")]
 pub struct CylinderEmitter {
     emitter: BaseEmitter,
     #[reflect(min_value = 0.0, step = 0.1)]
diff --git a/fyrox-impl/src/scene/particle_system/emitter/mod.rs b/fyrox-impl/src/scene/particle_system/emitter/mod.rs
index 1af4ee7aa..0250c716c 100644
--- a/fyrox-impl/src/scene/particle_system/emitter/mod.rs
+++ b/fyrox-impl/src/scene/particle_system/emitter/mod.rs
@@ -31,7 +31,7 @@ use crate::{
         Particle, ParticleSystemRng,
     },
 };
-use fyrox_core::uuid_provider;
+
 use std::ops::{Deref, DerefMut};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
@@ -48,6 +48,7 @@ pub trait Emit {
 
 /// See module docs.
 #[derive(PartialEq, Debug, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "4cad87ed-6b2c-411d-8c05-86dc26e463b2")]
 pub enum Emitter {
     /// See BoxEmitter docs.
     Cuboid(CuboidEmitter),
@@ -57,8 +58,6 @@ pub enum Emitter {
     Cylinder(CylinderEmitter),
 }
 
-uuid_provider!(Emitter = "4cad87ed-6b2c-411d-8c05-86dc26e463b2");
-
 impl Emitter {
     /// Creates new emitter from given id.
     pub fn new(id: i32) -> Result<Self, String> {
diff --git a/fyrox-impl/src/scene/particle_system/emitter/sphere.rs b/fyrox-impl/src/scene/particle_system/emitter/sphere.rs
index 547bd80cb..63d922366 100644
--- a/fyrox-impl/src/scene/particle_system/emitter/sphere.rs
+++ b/fyrox-impl/src/scene/particle_system/emitter/sphere.rs
@@ -36,6 +36,7 @@ use std::ops::{Deref, DerefMut};
 
 /// See module docs.
 #[derive(Debug, Clone, Reflect, PartialEq, Visit)]
+#[reflect(type_uuid = "5482aeb8-6a7c-4346-bb17-063b561f0e26")]
 pub struct SphereEmitter {
     emitter: BaseEmitter,
     #[reflect(min_value = 0.0, step = 0.1)]
diff --git a/fyrox-impl/src/scene/particle_system/mod.rs b/fyrox-impl/src/scene/particle_system/mod.rs
index 9a4ee6526..1e9bf3a99 100644
--- a/fyrox-impl/src/scene/particle_system/mod.rs
+++ b/fyrox-impl/src/scene/particle_system/mod.rs
@@ -30,7 +30,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, TriangleDefinition},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         value_as_u8_slice,
         variable::InheritableVariable,
@@ -65,6 +64,7 @@ pub mod particle;
 
 /// Pseudo-random numbers generator for particle systems.
 #[derive(Debug, Clone, Reflect)]
+#[reflect(type_uuid = "13d58184-e65c-41a3-9986-fc8d31231636")]
 pub struct ParticleSystemRng {
     rng_seed: u64,
 
@@ -219,7 +219,10 @@ impl Visit for ParticleSystemRng {
 /// }
 /// ```
 #[derive(Debug, Clone, Reflect)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "8b210eff-97a4-494f-ba7a-a581d3f4a442"
+)]
 pub struct ParticleSystem {
     base: Base,
 
@@ -278,9 +281,8 @@ pub struct ParticleSystem {
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "d19e13ec-03d5-4c88-b0b2-d161d1912632")]
+#[reflect(type_uuid = "d19e13ec-03d5-4c88-b0b2-d161d1912632")]
 pub enum CoordinateSystem {
     /// Local coordinate system moves particles together with the particle system itself. For example
     /// if a particle system is moved, rotated, scaled, etc. then the particle will be moved, rotated,
@@ -335,12 +337,6 @@ impl DerefMut for ParticleSystem {
     }
 }
 
-impl TypeUuidProvider for ParticleSystem {
-    fn type_uuid() -> Uuid {
-        uuid!("8b210eff-97a4-494f-ba7a-a581d3f4a442")
-    }
-}
-
 impl ParticleSystem {
     /// Returns current acceleration for particles in particle system.
     pub fn acceleration(&self) -> Vector3<f32> {
@@ -547,7 +543,7 @@ impl NodeTrait for ParticleSystem {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn update(&mut self, context: &mut UpdateContext) {
diff --git a/fyrox-impl/src/scene/pivot.rs b/fyrox-impl/src/scene/pivot.rs
index d6aac5244..662f808f2 100644
--- a/fyrox-impl/src/scene/pivot.rs
+++ b/fyrox-impl/src/scene/pivot.rs
@@ -25,7 +25,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         visitor::prelude::*,
     },
@@ -41,7 +40,10 @@ use std::ops::{Deref, DerefMut};
 
 /// A simplest possible node which represents point in space.
 #[derive(Clone, Reflect, Default, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "dd2ecb96-b1f4-4ee0-943b-2a4d1844e3bb"
+)]
 pub struct Pivot {
     base: Base,
 }
@@ -60,12 +62,6 @@ impl Deref for Pivot {
     }
 }
 
-impl TypeUuidProvider for Pivot {
-    fn type_uuid() -> Uuid {
-        uuid!("dd2ecb96-b1f4-4ee0-943b-2a4d1844e3bb")
-    }
-}
-
 impl DerefMut for Pivot {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.base
@@ -92,7 +88,7 @@ impl NodeTrait for Pivot {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 }
 
diff --git a/fyrox-impl/src/scene/probe.rs b/fyrox-impl/src/scene/probe.rs
index 16e8e764b..ece6d4ff2 100644
--- a/fyrox-impl/src/scene/probe.rs
+++ b/fyrox-impl/src/scene/probe.rs
@@ -28,7 +28,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -52,19 +51,8 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 const DEFAULT_RESOLUTION: usize = 512;
 
 /// Update mode of reflection probes.
-#[derive(
-    Clone,
-    Reflect,
-    PartialEq,
-    Default,
-    Debug,
-    Visit,
-    TypeUuidProvider,
-    AsRefStr,
-    EnumString,
-    VariantNames,
-)]
-#[type_uuid(id = "66450303-4f6c-4456-bde5-a7309f25b7ce")]
+#[derive(Clone, Reflect, PartialEq, Default, Debug, Visit, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "66450303-4f6c-4456-bde5-a7309f25b7ce")]
 pub enum UpdateMode {
     /// The probe will be updated once it is created and its content won't change until the
     /// [`ReflectionProbe::force_update`] call.
@@ -140,8 +128,8 @@ pub enum UpdateMode {
 ///     .build(graph)
 /// }
 /// ```
-#[derive(Clone, Reflect, Debug, Visit, TypeUuidProvider)]
-#[type_uuid(id = "7e0c138f-e371-4045-bd2c-ff5b165c7ee6")]
+#[derive(Clone, Reflect, Debug, Visit)]
+#[reflect(type_uuid = "7e0c138f-e371-4045-bd2c-ff5b165c7ee6")]
 #[reflect(derived_type = "Node")]
 #[visit(optional, post_visit_method = "on_visited")]
 pub struct ReflectionProbe {
@@ -282,7 +270,7 @@ impl NodeTrait for ReflectionProbe {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn update(&mut self, _context: &mut UpdateContext) {
diff --git a/fyrox-impl/src/scene/ragdoll.rs b/fyrox-impl/src/scene/ragdoll.rs
index 82c4bfcbb..d901f27be 100644
--- a/fyrox-impl/src/scene/ragdoll.rs
+++ b/fyrox-impl/src/scene/ragdoll.rs
@@ -29,9 +29,7 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, Matrix4Ext},
         pool::{Handle, PoolError},
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
-        uuid_provider,
         variable::InheritableVariable,
         visitor::prelude::*,
     },
@@ -50,6 +48,7 @@ use std::ops::{Deref, DerefMut};
 /// A part of ragdoll, that has a physical rigid body, a bone and zero or more children limbs.
 /// Multiple limbs together forms a ragdoll.
 #[derive(Clone, Debug, PartialEq, Default, Visit, Reflect)]
+#[reflect(type_uuid = "6d5bc2f7-8acc-4b64-8e4b-65d4551150bf")]
 pub struct Limb {
     /// A handle of a scene node, that is used as a bone in some other scene node (mesh).
     pub bone: Handle<Node>,
@@ -59,8 +58,6 @@ pub struct Limb {
     pub children: Vec<Limb>,
 }
 
-uuid_provider!(Limb = "6d5bc2f7-8acc-4b64-8e4b-65d4551150bf");
-
 impl Limb {
     /// Iterates recursively across the entire tree of descendant limbs and does the specified action
     /// with every limb along the way.
@@ -89,7 +86,10 @@ impl Limb {
 /// you're brave enough you can read this code <https://github.com/FyroxEngine/Fyrox/blob/master/editor/src/utils/ragdoll.rs> -
 /// it creates a ragdoll using a humanoid skeleton.  
 #[derive(Clone, Reflect, Visit, Debug, Default)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "f4441683-dcef-472d-9d7d-4adca4579107"
+)]
 #[visit(optional)]
 pub struct Ragdoll {
     base: Base,
@@ -123,12 +123,6 @@ impl DerefMut for Ragdoll {
     }
 }
 
-impl TypeUuidProvider for Ragdoll {
-    fn type_uuid() -> Uuid {
-        uuid!("f4441683-dcef-472d-9d7d-4adca4579107")
-    }
-}
-
 impl ConstructorProvider<Node, Graph> for Ragdoll {
     fn constructor() -> NodeConstructor {
         NodeConstructor::new::<Self>()
@@ -151,7 +145,7 @@ impl NodeTrait for Ragdoll {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn update(&mut self, ctx: &mut UpdateContext) {
diff --git a/fyrox-impl/src/scene/rigidbody.rs b/fyrox-impl/src/scene/rigidbody.rs
index f151b5f4e..ab961d2fd 100644
--- a/fyrox-impl/src/scene/rigidbody.rs
+++ b/fyrox-impl/src/scene/rigidbody.rs
@@ -38,7 +38,6 @@ use crate::{
         parking_lot::Mutex,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -51,7 +50,7 @@ use crate::{
         Scene,
     },
 };
-use fyrox_core::uuid_provider;
+
 use fyrox_graph::constructor::ConstructorProvider;
 use fyrox_graph::SceneGraph;
 use rapier3d::{dynamics, prelude::RigidBodyHandle};
@@ -69,6 +68,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 )]
 #[repr(u32)]
 #[derive(Default)]
+#[reflect(type_uuid = "562d2907-1b41-483a-8ca2-12eebaff7f5d")]
 pub enum RigidBodyType {
     /// Dynamic rigid bodies can be affected by external forces.
     #[default]
@@ -83,8 +83,6 @@ pub enum RigidBodyType {
     KinematicVelocityBased = 3,
 }
 
-uuid_provider!(RigidBodyType = "562d2907-1b41-483a-8ca2-12eebaff7f5d");
-
 impl From<dynamics::RigidBodyType> for RigidBodyType {
     fn from(s: dynamics::RigidBodyType) -> Self {
         match s {
@@ -146,8 +144,9 @@ pub(crate) enum ApplyAction {
     NextPosition(Isometry3<f32>),
 }
 
-#[derive(Copy, Clone, Debug, Reflect, Visit, PartialEq, AsRefStr, EnumString, VariantNames)]
 /// Possible types of rigidbody mass properties
+#[derive(Copy, Clone, Debug, Reflect, Visit, PartialEq, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "663b6a92-9c0f-4f47-b66a-6b4293312a5d")]
 pub enum RigidBodyMassPropertiesType {
     /// Use default mass properties
     Default,
@@ -159,7 +158,6 @@ pub enum RigidBodyMassPropertiesType {
         principal_inertia: Vector3<f32>,
     },
 }
-uuid_provider!(RigidBodyMassPropertiesType = "663b6a92-9c0f-4f47-b66a-6b4293312a5d");
 
 /// Rigid body is a physics entity that responsible for the dynamics and kinematics of the solid.
 /// Use this node when you need to simulate real-world physics in your game.
@@ -169,7 +167,10 @@ uuid_provider!(RigidBodyMassPropertiesType = "663b6a92-9c0f-4f47-b66a-6b4293312a
 /// Rigid body that does not move for some time will go asleep. This means that the body will not
 /// move unless it is woken up by some other moving body. This feature allows to save CPU resources.
 #[derive(Visit, Reflect)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "4be15a7c-3566-49c4-bba8-2f4ccc57ffed"
+)]
 pub struct RigidBody {
     base: Base,
 
@@ -311,12 +312,6 @@ impl Clone for RigidBody {
     }
 }
 
-impl TypeUuidProvider for RigidBody {
-    fn type_uuid() -> Uuid {
-        uuid!("4be15a7c-3566-49c4-bba8-2f4ccc57ffed")
-    }
-}
-
 impl RigidBody {
     /// Sets new linear velocity of the rigid body. Changing this parameter will wake up the rigid
     /// body!
@@ -630,7 +625,7 @@ impl NodeTrait for RigidBody {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/skybox.rs b/fyrox-impl/src/scene/skybox.rs
index a6c36455a..d6ac01476 100644
--- a/fyrox-impl/src/scene/skybox.rs
+++ b/fyrox-impl/src/scene/skybox.rs
@@ -24,7 +24,7 @@ use std::{fmt::Display, sync::LazyLock};
 
 use crate::{
     asset::{builtin::BuiltInResource, embedded_data_source, untyped::ResourceKind},
-    core::{log::Log, reflect::prelude::*, uuid_provider, visitor::prelude::*},
+    core::{log::Log, reflect::prelude::*, visitor::prelude::*},
 };
 use fyrox_core::color::Color;
 use fyrox_texture::{
@@ -39,6 +39,7 @@ use uuid::{uuid, Uuid};
 /// in outdoor scenes, however real use of it limited only by your imagination. Skybox
 /// will be drawn first, none of objects could be drawn before skybox.
 #[derive(Debug, Clone, Default, PartialEq, Reflect, Visit, Eq)]
+#[reflect(type_uuid = "45f359f1-e26f-4ace-81df-097f63474c72")]
 pub struct SkyBox {
     /// Texture for front face.
     #[reflect(setter = "set_front")]
@@ -70,8 +71,6 @@ pub struct SkyBox {
     pub(crate) cubemap: Option<TextureResource>,
 }
 
-uuid_provider!(SkyBox = "45f359f1-e26f-4ace-81df-097f63474c72");
-
 impl SkyBox {
     /// Creates a new sky box from a single color.
     pub fn from_single_color(color: Color) -> Self {
diff --git a/fyrox-impl/src/scene/sound/listener.rs b/fyrox-impl/src/scene/sound/listener.rs
index 93a046a47..7581b3c0a 100644
--- a/fyrox-impl/src/scene/sound/listener.rs
+++ b/fyrox-impl/src/scene/sound/listener.rs
@@ -29,7 +29,6 @@ use crate::{
         math::aabb::AxisAlignedBoundingBox,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         visitor::prelude::*,
     },
@@ -58,7 +57,10 @@ use std::ops::{Deref, DerefMut};
 /// 2D sound sources (with spatial blend == 0.0) are not influenced by listener's position and
 /// orientation.
 #[derive(Visit, Reflect, Default, Clone, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "2c7dabc1-5666-4256-b020-01532701e4c6"
+)]
 pub struct Listener {
     base: Base,
 }
@@ -77,12 +79,6 @@ impl DerefMut for Listener {
     }
 }
 
-impl TypeUuidProvider for Listener {
-    fn type_uuid() -> Uuid {
-        uuid!("2c7dabc1-5666-4256-b020-01532701e4c6")
-    }
-}
-
 impl ConstructorProvider<Node, Graph> for Listener {
     fn constructor() -> NodeConstructor {
         NodeConstructor::new::<Self>()
@@ -110,7 +106,7 @@ impl NodeTrait for Listener {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn sync_native(&self, _self_handle: Handle<Node>, context: &mut SyncContext) {
diff --git a/fyrox-impl/src/scene/sound/mod.rs b/fyrox-impl/src/scene/sound/mod.rs
index f63c477b0..cf84be9ce 100644
--- a/fyrox-impl/src/scene/sound/mod.rs
+++ b/fyrox-impl/src/scene/sound/mod.rs
@@ -26,7 +26,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, m4x4_approx_eq},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -74,7 +73,10 @@ pub mod listener;
 
 /// Sound source.
 #[derive(Visit, Reflect, Debug)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "28621735-8cd1-4fad-8faf-ecd24bf8aa99"
+)]
 pub struct Sound {
     base: Base,
 
@@ -189,12 +191,6 @@ impl Clone for Sound {
     }
 }
 
-impl TypeUuidProvider for Sound {
-    fn type_uuid() -> Uuid {
-        uuid!("28621735-8cd1-4fad-8faf-ecd24bf8aa99")
-    }
-}
-
 impl Sound {
     /// Changes buffer of source. Source will continue playing from beginning, old
     /// position will be discarded.
@@ -410,7 +406,7 @@ impl NodeTrait for Sound {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn on_removed_from_graph(&mut self, graph: &mut Graph) {
diff --git a/fyrox-impl/src/scene/sprite.rs b/fyrox-impl/src/scene/sprite.rs
index 0a753ce2a..c7b629b3f 100644
--- a/fyrox-impl/src/scene/sprite.rs
+++ b/fyrox-impl/src/scene/sprite.rs
@@ -30,7 +30,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, Rect, TriangleDefinition},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         value_as_u8_slice,
         variable::InheritableVariable,
@@ -155,7 +154,10 @@ impl VertexTrait for SpriteVertex {
 /// to get the best possible performance. Otherwise, each your sprite will be put in a separate batch
 /// which will force your GPU to render a single sprite in dedicated draw call which is quite slow.
 #[derive(Debug, Reflect, Clone, Visit)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "60fd7e34-46c1-4ae9-8803-1f5f4c341518"
+)]
 pub struct Sprite {
     base: Base,
 
@@ -201,12 +203,6 @@ impl Default for Sprite {
     }
 }
 
-impl TypeUuidProvider for Sprite {
-    fn type_uuid() -> Uuid {
-        uuid!("60fd7e34-46c1-4ae9-8803-1f5f4c341518")
-    }
-}
-
 impl Sprite {
     /// Sets new size of sprite. Since sprite is always square, size defines half of width or height, so actual size
     /// will be doubled. Default value is 0.2.
@@ -320,7 +316,7 @@ impl NodeTrait for Sprite {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn collect_render_data(&self, ctx: &mut RenderContext) -> RdcControlFlow {
diff --git a/fyrox-impl/src/scene/terrain/brushstroke/mod.rs b/fyrox-impl/src/scene/terrain/brushstroke/mod.rs
index a34970c48..11a1ad9d2 100644
--- a/fyrox-impl/src/scene/terrain/brushstroke/mod.rs
+++ b/fyrox-impl/src/scene/terrain/brushstroke/mod.rs
@@ -50,7 +50,7 @@ use crate::core::{
 use crate::fxhash::FxHashMap;
 use crate::resource::texture::{Texture, TextureResource};
 use crate::scene::node::Node;
-use fyrox_core::uuid_provider;
+
 use std::collections::VecDeque;
 use std::sync::mpsc::{Receiver, SendError, Sender};
 
@@ -685,6 +685,7 @@ impl<V> StrokeData<V> {
 
 /// Shape of a brush.
 #[derive(Copy, Clone, Reflect, Debug)]
+#[reflect(type_uuid = "a4dbfba0-077c-4658-9972-38384a8432f9")]
 pub enum BrushShape {
     /// Circle with given radius.
     Circle {
@@ -700,8 +701,6 @@ pub enum BrushShape {
     },
 }
 
-uuid_provider!(BrushShape = "a4dbfba0-077c-4658-9972-38384a8432f9");
-
 impl Default for BrushShape {
     fn default() -> Self {
         BrushShape::Circle { radius: 1.0 }
@@ -726,6 +725,7 @@ impl BrushShape {
 
 /// Paint mode of a brush. It defines operation that will be performed on the terrain.
 #[derive(Clone, PartialEq, PartialOrd, Reflect, Debug)]
+#[reflect(type_uuid = "48ad4cac-05f3-485a-b2a3-66812713841f")]
 pub enum BrushMode {
     /// Raise or lower the value
     Raise {
@@ -750,8 +750,6 @@ pub enum BrushMode {
     },
 }
 
-uuid_provider!(BrushMode = "48ad4cac-05f3-485a-b2a3-66812713841f");
-
 impl Default for BrushMode {
     fn default() -> Self {
         BrushMode::Raise { amount: 1.0 }
@@ -760,6 +758,7 @@ impl Default for BrushMode {
 
 /// Paint target of a brush. It defines the data that the brush will operate on.
 #[derive(Copy, Default, Clone, Reflect, Debug, PartialEq, Eq)]
+#[reflect(type_uuid = "461c1be7-189e-44ee-b8fd-00b8fdbc668f")]
 pub enum BrushTarget {
     #[default]
     /// Modifies the height map
@@ -773,10 +772,9 @@ pub enum BrushTarget {
     HoleMask,
 }
 
-uuid_provider!(BrushTarget = "461c1be7-189e-44ee-b8fd-00b8fdbc668f");
-
 /// Brush is used to modify terrain. It supports multiple shapes and modes.
 #[derive(Clone, Reflect, Debug)]
+#[reflect(type_uuid = "dcc4c17b-dad6-42ba-accf-8b88aa2ad31b")]
 pub struct Brush {
     /// Shape of the brush.
     pub shape: BrushShape,
diff --git a/fyrox-impl/src/scene/terrain/geometry.rs b/fyrox-impl/src/scene/terrain/geometry.rs
index 55cbd87bd..a11bcc8ea 100644
--- a/fyrox-impl/src/scene/terrain/geometry.rs
+++ b/fyrox-impl/src/scene/terrain/geometry.rs
@@ -30,8 +30,8 @@ use crate::{
         vertex::StaticVertex,
     },
 };
-use fyrox_core::Uuid;
 use fyrox_resource::untyped::ResourceKind;
+use uuid::Uuid;
 
 /// The [SurfaceSharedData](crate::scene::mesh::surface::SurfaceResource) of a grid mesh for use
 /// in rendering a terrain.
diff --git a/fyrox-impl/src/scene/terrain/mod.rs b/fyrox-impl/src/scene/terrain/mod.rs
index a8b517509..0794b9e2a 100644
--- a/fyrox-impl/src/scene/terrain/mod.rs
+++ b/fyrox-impl/src/scene/terrain/mod.rs
@@ -30,7 +30,6 @@ use crate::{
         parking_lot::Mutex,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::{uuid, Uuid},
         variable::InheritableVariable,
         visitor::prelude::*,
@@ -60,7 +59,7 @@ use crate::{
     },
 };
 use fxhash::FxHashMap;
-use fyrox_core::{uuid_provider, warn};
+use fyrox_core::warn;
 use fyrox_graph::SceneGraph;
 use fyrox_resource::untyped::ResourceKind;
 use half::f16;
@@ -243,6 +242,7 @@ impl std::ops::IndexMut<Vector2<i32>> for ChunkHeightMutData<'_> {
 /// performance, so keep amount of layers on reasonable level (1 - 5 should be enough for most
 /// cases).
 #[derive(Debug, Clone, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "7439d5fd-43a9-45f0-bd7c-76cf4d2ec22e")]
 pub struct Layer {
     /// Material of the layer.
     pub material: MaterialResource,
@@ -263,8 +263,6 @@ pub struct Layer {
     pub node_uv_offsets_property_name: String,
 }
 
-uuid_provider!(Layer = "7439d5fd-43a9-45f0-bd7c-76cf4d2ec22e");
-
 impl Default for Layer {
     fn default() -> Self {
         Self {
@@ -350,6 +348,7 @@ fn make_height_map_texture(height_map: Vec<f32>, size: Vector2<u32>) -> TextureR
 /// use its own set of materials for layers. This could be useful for different biomes, to prevent high amount of
 /// layers which could harm the performance.
 #[derive(Debug, Reflect)]
+#[reflect(type_uuid = "ae996754-69c1-49ba-9c17-a7bd4be072a9")]
 pub struct Chunk {
     #[reflect(hidden)]
     quad_tree: Mutex<QuadTree>,
@@ -377,8 +376,6 @@ pub struct Chunk {
     height_map_modifications_count: u64,
 }
 
-uuid_provider!(Chunk = "ae996754-69c1-49ba-9c17-a7bd4be072a9");
-
 impl PartialEq for Chunk {
     fn eq(&self, other: &Self) -> bool {
         self.heightmap == other.heightmap
@@ -1033,7 +1030,10 @@ impl BrushContext {
 /// overlap with their neighbors just as chunks overlap. Two adjacent blocks share vertices along their edge,
 /// so they also share pixels in the height map data.
 #[derive(Debug, Reflect, Clone)]
-#[reflect(derived_type = "Node")]
+#[reflect(
+    derived_type = "Node",
+    type_uuid = "4b0a7927-bcd8-41a3-949a-dd10fba8e16a"
+)]
 pub struct Terrain {
     base: Base,
 
@@ -1259,12 +1259,6 @@ fn create_zero_margin(mut data: Vec<f32>, data_size: Vector2<u32>) -> Vec<f32> {
     data
 }
 
-impl TypeUuidProvider for Terrain {
-    fn type_uuid() -> Uuid {
-        uuid!("4b0a7927-bcd8-41a3-949a-dd10fba8e16a")
-    }
-}
-
 impl Terrain {
     /// The height map of a chunk must have one-pixel margins around the edges which do not correspond
     /// to vertices in the terrain of that chunk, but are still needed for calculating the normal of
@@ -2432,7 +2426,7 @@ impl NodeTrait for Terrain {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn collect_render_data(&self, ctx: &mut RenderContext) -> RdcControlFlow {
diff --git a/fyrox-impl/src/scene/tilemap/brush.rs b/fyrox-impl/src/scene/tilemap/brush.rs
index a49368704..502839ccc 100644
--- a/fyrox-impl/src/scene/tilemap/brush.rs
+++ b/fyrox-impl/src/scene/tilemap/brush.rs
@@ -43,7 +43,6 @@ use crate::{
         color::Color,
         io::FileError,
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     scene::debug::SceneDrawingContext,
@@ -100,6 +99,7 @@ impl From<VisitError> for TileMapBrushResourceError {
 /// with the UUID of some macro or other user, and it is up to the user to determine
 /// the type of the resource.
 #[derive(Debug, Clone, Default, Reflect)]
+#[reflect(type_uuid = "a3427eef-8d8e-4573-a328-ab06e1d56e25")]
 pub struct BrushMacroInstanceList(Vec<BrushMacroData>);
 
 impl BrushMacroInstanceList {
@@ -160,6 +160,7 @@ impl Visit for BrushMacroInstanceList {
 /// A brush can have zero or more instances of a macro, and each instance
 /// has its own configuration data.
 #[derive(Debug, Default, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "3aa87ac2-c05f-4e9b-86eb-ee846a364585")]
 pub struct BrushMacroData {
     /// The UUID of the macro that owns this instance data.
     /// This is used to identify the macro that knows the type of this data.
@@ -178,6 +179,7 @@ pub struct BrushMacroData {
 /// A page of tiles within a brush. Having multiple pages allows a brush to be optimized
 /// for use in multiple contexts.
 #[derive(Default, Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "1e3de522-678b-4922-b959-76a6045de788")]
 pub struct TileMapBrushPage {
     /// The tile that represents this page in the editor
     pub icon: TileDefinitionHandle,
@@ -240,8 +242,8 @@ fn draw_tile_outline(
 
 /// Tile map brush is a set of tiles arranged in arbitrary shape, that can be used to draw on a tile
 /// map.
-#[derive(Default, Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "23ed39da-cb01-4181-a058-94dc77ecb4b2")]
+#[derive(Default, Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "23ed39da-cb01-4181-a058-94dc77ecb4b2")]
 pub struct TileMapBrush {
     /// The tile set used by this brush. This must match the tile set of any tile map that this
     /// brush is used to edit.
@@ -557,10 +559,6 @@ impl TileMapBrush {
 }
 
 impl ResourceData for TileMapBrush {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         self.save(path)
     }
@@ -590,7 +588,7 @@ impl ResourceLoader for TileMapBrushLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        <TileMapBrush as TypeUuidProvider>::type_uuid()
+        <TileMapBrush as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-impl/src/scene/tilemap/data.rs b/fyrox-impl/src/scene/tilemap/data.rs
index 96b58ab8b..6adf6d8b3 100644
--- a/fyrox-impl/src/scene/tilemap/data.rs
+++ b/fyrox-impl/src/scene/tilemap/data.rs
@@ -24,9 +24,7 @@ use crate::asset::{Resource, ResourceData};
 use fxhash::FxHashMap;
 use fyrox_core::visitor::BinaryBlob;
 
-use crate::core::{
-    algebra::Vector2, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*,
-};
+use crate::core::{algebra::Vector2, reflect::prelude::*, visitor::prelude::*};
 
 use super::*;
 
@@ -53,6 +51,7 @@ fn tile_position_to_chunk_position(position: Vector2<i32>) -> (Vector2<i32>, Vec
 }
 
 #[derive(Clone, Debug, Reflect)]
+#[reflect(type_uuid = "dad649ae-eb5f-4328-832a-891edd79aff5")]
 struct Chunk([TileDefinitionHandle; CHUNK_WIDTH * CHUNK_HEIGHT]);
 
 impl Visit for Chunk {
@@ -177,8 +176,8 @@ impl<'a, P: FnMut(Vector2<i32>) -> bool> TileMapDataIterator<'a, P> {
 }
 
 /// Asset containing the tile handles of a tile map.
-#[derive(Clone, Default, Debug, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "a8e4b6b4-c1bd-4ed9-a753-0d5a3dfe1729")]
+#[derive(Clone, Default, Debug, Reflect)]
+#[reflect(type_uuid = "a8e4b6b4-c1bd-4ed9-a753-0d5a3dfe1729")]
 pub struct TileMapData {
     content: FxHashMap<Vector2<i32>, Chunk>,
 }
@@ -193,10 +192,6 @@ impl Visit for TileMapData {
 }
 
 impl ResourceData for TileMapData {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.visit("TileMapData", &mut visitor)?;
diff --git a/fyrox-impl/src/scene/tilemap/mod.rs b/fyrox-impl/src/scene/tilemap/mod.rs
index 91519aaec..e3d441b07 100644
--- a/fyrox-impl/src/scene/tilemap/mod.rs
+++ b/fyrox-impl/src/scene/tilemap/mod.rs
@@ -59,7 +59,6 @@ use crate::{
         math::{aabb::AxisAlignedBoundingBox, Matrix4Ext, TriangleDefinition},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         variable::InheritableVariable,
         visitor::prelude::*,
         ImmutableString, SafeLock,
@@ -365,6 +364,7 @@ impl VertexTrait for TileVertex {
 /// Giving a particular `TilePaletteStage` to a tile map palette will control which kind of
 /// tiles it will display.
 #[derive(Clone, Copy, Default, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "05cec1a9-faa9-45a2-a4a4-245849cb2fb4")]
 pub enum TilePaletteStage {
     /// The page tile stage. These tiles allow the user to select which page they want to use.
     #[default]
@@ -403,6 +403,7 @@ pub enum PageType {
 /// [`TileRenderData`]. For pages this is due to having an icon to allow the user to select the page.
 /// Both pages and tiles can be selected by the user, moved, and deleted.
 #[derive(Clone, Copy, Debug, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "be84a122-3d0f-4a9f-8bba-d55cf8583aad")]
 pub enum ResourceTilePosition {
     /// This position refers to some page, and so it lacks tile coordinates.
     Page(Vector2<i32>),
@@ -487,8 +488,8 @@ impl ResourceTilePosition {
 
 /// Tile is a base block of a tile map. It has a position and a handle of tile definition, stored
 /// in the respective tile set.
-#[derive(Clone, Reflect, Default, Debug, PartialEq, Visit, TypeUuidProvider)]
-#[type_uuid(id = "e429ca1b-a311-46c3-b580-d5a2f49db7e2")]
+#[derive(Clone, Reflect, Default, Debug, PartialEq, Visit)]
+#[reflect(type_uuid = "e429ca1b-a311-46c3-b580-d5a2f49db7e2")]
 pub struct Tile {
     /// Position of the tile (in grid coordinates).
     pub position: Vector2<i32>,
@@ -518,10 +519,11 @@ impl<I: Iterator<Item = Vector2<i32>>> Iterator for TileIter<I> {
     }
 }
 
-#[derive(Debug, Default, Clone, PartialEq, Visit, Reflect)]
 /// Abstract source of tiles, which can either be a tile set or a brush.
 /// It is called a "book" because each of these tile resources contains
 /// pages of tiles.
+#[derive(Debug, Default, Clone, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "76563800-35fa-46aa-bb58-5f358d769654")]
 pub enum TileBook {
     /// A tile resource containing no tiles.
     #[default]
@@ -951,9 +953,9 @@ impl OrthoTransform for TileRenderData {
 /// which contains all the pages that may be referenced by the tile map's handles.
 ///
 /// Optional [`TileMapEffect`] objects may be included in the `TileMap` to change how it renders.
-#[derive(Reflect, Debug, TypeUuidProvider)]
+#[derive(Reflect, Debug)]
 #[reflect(derived_type = "Node")]
-#[type_uuid(id = "aa9a3385-a4af-4faf-a69a-8d3af1a3aa67")]
+#[reflect(type_uuid = "aa9a3385-a4af-4faf-a69a-8d3af1a3aa67")]
 pub struct TileMap {
     base: Base,
     /// The source of rendering data for tiles in this tile map.
@@ -1393,7 +1395,7 @@ impl NodeTrait for TileMap {
     }
 
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn collect_render_data(&self, ctx: &mut RenderContext) -> RdcControlFlow {
diff --git a/fyrox-impl/src/scene/tilemap/property.rs b/fyrox-impl/src/scene/tilemap/property.rs
index b774dafb5..ea0bb4c30 100644
--- a/fyrox-impl/src/scene/tilemap/property.rs
+++ b/fyrox-impl/src/scene/tilemap/property.rs
@@ -35,8 +35,8 @@
 //! so the user can see each tile's shape and the shepe's layer at a glance.
 
 use crate::core::{
-    algebra::Vector2, color::Color, num_traits::Euclid, reflect::prelude::*,
-    type_traits::prelude::*, visitor::prelude::*, ImmutableString,
+    algebra::Vector2, color::Color, num_traits::Euclid, reflect::prelude::*, visitor::prelude::*,
+    ImmutableString,
 };
 use std::fmt::{Debug, Display, Formatter};
 
@@ -69,15 +69,19 @@ pub trait TileSetPropertyId {
 
 /// UUID for a property with values of type i32.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "013a1dfe-2f5c-4e55-91af-f234048ba2ea")]
 pub struct TileSetPropertyI32(pub Uuid);
 /// UUID for a property with values of type f32.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "1b59e7b8-aa07-455e-a153-085e9603183b")]
 pub struct TileSetPropertyF32(pub Uuid);
 /// UUID for a property with values of type ImmutableString.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "86af5ddd-037b-4687-8142-6e859f9f3145")]
 pub struct TileSetPropertyString(pub Uuid);
 /// UUID for a property with values of type [`NineI8`].
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "8546733a-3d3b-49b3-88c9-d2066f920c2f")]
 pub struct TileSetPropertyNine(pub Uuid);
 
 impl TileSetPropertyId for TileSetPropertyI32 {
@@ -112,6 +116,7 @@ impl TileSetPropertyId for TileSetPropertyNine {
 /// tile set data must allow each tile to include multiple values for its collider information.
 /// These multiple collider values are associated with their collider objects by a UUID and a name.
 #[derive(Clone, Default, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "f61cca93-6df4-44d6-a9da-902d82e0c401")]
 pub struct TileSetColliderLayer {
     /// The id number that identifies the collider
     pub uuid: Uuid,
@@ -125,6 +130,7 @@ pub struct TileSetColliderLayer {
 /// across all tiles in a tile set. A tile property layer represents the association between a property name
 /// and its data type, along with other information.
 #[derive(Clone, Default, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "99967dc1-b358-4480-8cd6-e519d6deecb5")]
 pub struct TileSetPropertyLayer {
     /// The id number that identifies this property
     pub uuid: Uuid,
@@ -140,6 +146,7 @@ pub struct TileSetPropertyLayer {
 /// for the game that is using the values, so it is useful to be able to label those values
 /// so their special meaning can be visible in the editor.
 #[derive(Clone, Default, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "43913556-aebd-45ae-8d2a-c9ecc8e98e70")]
 pub struct NamedValue {
     /// The label associated with the value.
     pub name: String,
@@ -152,6 +159,7 @@ pub struct NamedValue {
 /// Named values can be either an integer or a float.
 /// It would make little sense to name a string or a nine slice.
 #[derive(Copy, Clone, Debug, Reflect, Visit, PartialEq)]
+#[reflect(type_uuid = "e0d453bc-a71a-476f-ad49-a9c5b0bfb6de")]
 pub enum NamableValue {
     /// A value for an element of a nine-slice
     I8(i8),
@@ -301,6 +309,7 @@ impl TileSetPropertyLayer {
 /// be stored in that property, as the data type will affect how the editor
 /// allows users to edit the property on each tile.
 #[derive(Copy, Clone, Default, Debug, Eq, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "20a3d9d4-b3f0-41e2-bade-96eac6f34a01")]
 pub enum TileSetPropertyType {
     /// The type for integer properties.
     #[default]
@@ -341,6 +350,7 @@ impl TileSetPropertyType {
 
 /// The data stored in a tile property.
 #[derive(Clone, Debug, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "f8bc82fc-641c-4005-af2a-35e31ab91880")]
 pub enum TileSetPropertyValue {
     /// Integer property data.
     I32(i32),
@@ -359,6 +369,7 @@ pub enum TileSetPropertyValue {
 /// is assigned a color and tiles are arranged so that whenever two tiles are adjacent the touching edges
 /// are the same color.
 #[derive(Default, Clone, Copy, PartialEq, Reflect)]
+#[reflect(type_uuid = "385699f4-3d1d-4e79-9a13-6520abb53daa")]
 pub struct NineI8(pub [i8; 9]);
 
 impl Visit for NineI8 {
@@ -426,6 +437,7 @@ impl NineI8 {
 /// For most value types, the element is the whole of the value,
 /// but a nine-slice value contains nine elements.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "f116c004-8f0a-4f96-9967-e50eae542433")]
 pub enum TileSetPropertyValueElement {
     /// Integer property data.
     I32(i32),
@@ -574,6 +586,7 @@ impl TileSetPropertyValue {
 /// A representation of data stored in a tile property, or the absence of that data
 /// when the data is unknown.
 #[derive(Clone, Debug, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "ad0584b2-fccb-4bd5-a3fb-6c15a74148ba")]
 pub enum TileSetPropertyOptionValue {
     /// Integer property data.
     I32(Option<i32>),
diff --git a/fyrox-impl/src/scene/tilemap/tile_collider.rs b/fyrox-impl/src/scene/tilemap/tile_collider.rs
index 84505349b..37a1e3203 100644
--- a/fyrox-impl/src/scene/tilemap/tile_collider.rs
+++ b/fyrox-impl/src/scene/tilemap/tile_collider.rs
@@ -30,7 +30,6 @@ use crate::{
     core::{
         algebra::{Matrix4, Point3, Vector2},
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
 };
@@ -46,19 +45,9 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Supported collider types for tiles.
 #[derive(
-    Clone,
-    Hash,
-    PartialEq,
-    Eq,
-    Default,
-    Visit,
-    Reflect,
-    AsRefStr,
-    EnumString,
-    VariantNames,
-    TypeUuidProvider,
+    Clone, Hash, PartialEq, Eq, Default, Visit, Reflect, AsRefStr, EnumString, VariantNames,
 )]
-#[type_uuid(id = "04a44fec-394f-4497-97d5-fe9e6f915831")]
+#[reflect(type_uuid = "04a44fec-394f-4497-97d5-fe9e6f915831")]
 pub enum TileCollider {
     /// No collider.
     #[default]
@@ -178,8 +167,8 @@ pub type CustomTileColliderResource = Resource<CustomTileCollider>;
 /// a valid string for a custom tile collider. The commas (,) are used to connect two numbers
 /// as being part of the same group. Any other characters are ignored, so this would also be
 /// accepted: "(0,0) (1,1) (1,0) \[0,1,2\]".
-#[derive(Clone, PartialEq, Debug, Default, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "118da556-a444-4bd9-bd88-12d78d26107f")]
+#[derive(Clone, PartialEq, Debug, Default, Visit, Reflect)]
+#[reflect(type_uuid = "118da556-a444-4bd9-bd88-12d78d26107f")]
 pub struct CustomTileCollider {
     /// The vertices of the triangles, with the boundaries of the tile being between (0,0) and (1,1).
     pub vertices: Vec<Vector2<f32>>,
@@ -188,10 +177,6 @@ pub struct CustomTileCollider {
 }
 
 impl ResourceData for CustomTileCollider {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.visit("CustomTileCollider", &mut visitor)?;
diff --git a/fyrox-impl/src/scene/tilemap/tile_source.rs b/fyrox-impl/src/scene/tilemap/tile_source.rs
index e8183593c..2292dc58c 100644
--- a/fyrox-impl/src/scene/tilemap/tile_source.rs
+++ b/fyrox-impl/src/scene/tilemap/tile_source.rs
@@ -58,6 +58,7 @@ fn position_to_vector(source: PalettePosition) -> Vector2<i32> {
 
 /// A 2D grid that contains tile data.
 #[derive(Default, Debug, Clone, PartialEq, Reflect)]
+#[reflect(type_uuid = "161e38e6-197c-41ed-aa87-de293662cd3d")]
 pub struct TileGridMap<V: Debug + Clone + Reflect>(FxHashMap<Vector2<i32>, V>);
 
 impl<V: Visit + Default + Debug + Clone + Reflect> Visit for TileGridMap<V> {
@@ -80,8 +81,8 @@ impl<V: Debug + Clone + Reflect> DerefMut for TileGridMap<V> {
 }
 
 /// Position of a tile definition within some tile set
-#[derive(Eq, PartialEq, Clone, Copy, Default, Hash, Reflect, Visit, TypeUuidProvider)]
-#[type_uuid(id = "3eb69303-d361-482d-8094-44b9f9c323ca")]
+#[derive(Eq, PartialEq, Clone, Copy, Default, Hash, Reflect, Visit)]
+#[reflect(type_uuid = "3eb69303-d361-482d-8094-44b9f9c323ca")]
 #[repr(C)]
 pub struct TileDefinitionHandle {
     /// Position of the tile's page
@@ -383,6 +384,7 @@ pub struct Stamp {
 /// Each cell of a stamp must have a tile handle and it may optionally have
 /// the handle of a brush cell where the tile was taken from.
 #[derive(Clone, Debug, Reflect, Visit, Default)]
+#[reflect(type_uuid = "40f40b03-0061-4221-909f-d8590f15efd9")]
 pub struct StampElement {
     /// The stamp cell's tile handle
     pub handle: TileDefinitionHandle,
diff --git a/fyrox-impl/src/scene/tilemap/tileset.rs b/fyrox-impl/src/scene/tilemap/tileset.rs
index bee49c9c2..6259483ba 100644
--- a/fyrox-impl/src/scene/tilemap/tileset.rs
+++ b/fyrox-impl/src/scene/tilemap/tileset.rs
@@ -38,7 +38,7 @@ use crate::{
     },
     core::{
         algebra::Vector2, color::Color, io::FileError, log::Log, reflect::prelude::*,
-        type_traits::prelude::*, visitor::prelude::*, ImmutableString,
+        visitor::prelude::*, ImmutableString,
     },
     fxhash::{FxHashMap, FxHashSet},
     material::{MaterialResource, MaterialResourceExtension},
@@ -104,6 +104,7 @@ impl From<VisitError> for TileSetResourceError {
 
 /// Definition of a tile.
 #[derive(Clone, Default, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "5decdb65-5489-47ad-9f16-9ab952cdac59")]
 #[visit(optional)]
 pub struct TileDefinition {
     /// The tile's material resource and the rect within that material that should be rendered as the tile.
@@ -137,6 +138,7 @@ impl OrthoTransform for TileDefinition {
 
 /// A tile's material resource and the rect within that material that should be rendered as the tile.
 #[derive(Clone, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "8e9d5152-bfec-43c1-bf2e-2b47a554dbbd")]
 pub struct TileMaterialBounds {
     /// Material of the tile.
     pub material: MaterialResource,
@@ -171,6 +173,7 @@ impl OrthoTransform for TileMaterialBounds {
 
 /// Miscellaneous data that is stored with the tile definition.
 #[derive(Clone, Default, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "44053a39-2d64-4f85-9b26-9ffed230da31")]
 #[visit(optional)]
 pub struct TileData {
     /// Colliders of the tile.
@@ -210,6 +213,7 @@ impl OrthoTransform for TileData {
 /// and otherwise transformed with respect the their source material, so for example the
 /// left-top corner of the tile may be to the right of the right-top corner in the material.
 #[derive(Clone, Default, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "3eaf24a1-74c9-4f48-8292-2ba50c4d4eae")]
 pub struct TileBounds {
     /// The position of the tile's left-top corner within its source material.
     pub left_top_corner: Vector2<u32>,
@@ -289,6 +293,7 @@ impl OrthoTransform for TileBounds {
 /// A tile set can contain multiple pages of tiles, and each page may have its own
 /// independent source of tile data.
 #[derive(Clone, Default, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "d781e98c-802a-4e0a-b228-77b13368c24d")]
 pub struct TileSetPage {
     /// The tile that represents this page in the editor
     pub icon: TileDefinitionHandle,
@@ -542,6 +547,7 @@ pub enum AbstractTile {
 
 /// This is where tile set pages store their tile data.
 #[derive(Clone, PartialEq, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "cbff9460-53ce-4427-b265-d3866e32a641")]
 pub enum TileSetPageSource {
     /// A page that gets its data from a material resource and arranges its tiles according to their positions in the material.
     /// All tiles in an atlas page share the same material and their UV data is automatically calculated based on the position
@@ -617,6 +623,7 @@ impl TileSetPageSource {
 /// for any combination of 90-degree rotations, horizontal flips, and vertical flips by
 /// moving around the 2x4 grid.
 #[derive(Default, Clone, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "520d903b-cbf6-4dde-8f93-397ecaa333e7")]
 pub struct TransformSetTiles(
     #[reflect(hidden)]
     #[visit(optional)]
@@ -643,6 +650,7 @@ impl DerefMut for TransformSetTiles {
 /// along continuous rows of tiles, until an empty cell is found, and then
 /// the animation returns to the start of the sequence and repeats.
 #[derive(Clone, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "638f7a76-7d03-4ade-89af-6748a36f4767")]
 pub struct AnimationTiles {
     /// The speed of the animation in frames per second.
     pub frame_rate: f32,
@@ -678,6 +686,7 @@ impl DerefMut for AnimationTiles {
 /// A material resource plus the size of each tile, so that the tile set can
 /// carve up the material into tiles.
 #[derive(Clone, PartialEq, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "d1a299ca-930d-462d-9455-e4c8ca7ab5f6")]
 pub struct TileMaterial {
     /// The source material.
     pub material: MaterialResource,
@@ -1323,8 +1332,8 @@ impl AnimationCache {
 /// Each layer has a name and a color. The color is used to allow the user to quickly
 /// identify which shapes correspond to which layers while in the tile set editor.
 /// See [`TileSetColliderLayer`] for more information.
-#[derive(Clone, Default, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "7b7e057b-a41e-4150-ab3b-0ae99f4024f0")]
+#[derive(Clone, Default, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "7b7e057b-a41e-4150-ab3b-0ae99f4024f0")]
 pub struct TileSet {
     /// A mapping from animated tiles to the corresponding cells on animation pages.
     #[reflect(hidden)]
@@ -2104,10 +2113,6 @@ impl TileSet {
 }
 
 impl ResourceData for TileSet {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.visit("TileSet", &mut visitor)?;
@@ -2143,7 +2148,7 @@ impl ResourceLoader for TileSetLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        <TileSet as TypeUuidProvider>::type_uuid()
+        <TileSet as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-impl/src/scene/tilemap/transform.rs b/fyrox-impl/src/scene/tilemap/transform.rs
index 34a8fd8ec..41034663c 100644
--- a/fyrox-impl/src/scene/tilemap/transform.rs
+++ b/fyrox-impl/src/scene/tilemap/transform.rs
@@ -50,6 +50,7 @@ use super::OptionTileRect;
 /// These transformations are useful in situations where positions are
 /// restricted to an orthogonal grid, as in a tile map.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "fc588f6b-0f07-467c-af6c-c6b62ffc6063")]
 pub struct OrthoTransformation(i8);
 
 /// A map from `Vector2<i32>` to values. It can be transformed to flip and rotate the positions of the values.
diff --git a/fyrox-impl/src/scene/tilemap/update.rs b/fyrox-impl/src/scene/tilemap/update.rs
index 52201810b..69ca13ea6 100644
--- a/fyrox-impl/src/scene/tilemap/update.rs
+++ b/fyrox-impl/src/scene/tilemap/update.rs
@@ -38,7 +38,7 @@
 //! update is the final step before finally applying the modification to a tile map.
 
 use super::*;
-use crate::core::{algebra::Vector2, color::Color, log::Log, type_traits::prelude::*};
+use crate::core::{algebra::Vector2, color::Color, log::Log};
 use fxhash::FxHashMap;
 use fyrox_core::swap_hash_map_entry;
 use std::{
@@ -586,6 +586,7 @@ impl TileSetUpdate {
 /// allowing the stamp element itself to be later transformed before it is applied to a tile map,
 /// tile set, or brush.
 #[derive(Debug, Clone, Reflect)]
+#[reflect(type_uuid = "276857c4-1104-496e-8878-f3fd4368afe9")]
 pub struct RotTileHandle {
     /// The transformation of the element.
     pub transform: OrthoTransformation,
diff --git a/fyrox-impl/src/scene/transform.rs b/fyrox-impl/src/scene/transform.rs
index fc7dd2b39..f3690167b 100644
--- a/fyrox-impl/src/scene/transform.rs
+++ b/fyrox-impl/src/scene/transform.rs
@@ -75,6 +75,7 @@ use std::cell::Cell;
 
 /// See module docs.
 #[derive(Clone, Debug, Reflect)]
+#[reflect(type_uuid = "16c75838-4a4f-4880-acf5-7e612fc54f01")]
 pub struct Transform {
     // Indicates that some property has changed and matrix must be
     // recalculated before use. This is some sort of lazy evaluation.
diff --git a/fyrox-impl/src/script/constructor.rs b/fyrox-impl/src/script/constructor.rs
index e44fb8272..64d3db741 100644
--- a/fyrox-impl/src/script/constructor.rs
+++ b/fyrox-impl/src/script/constructor.rs
@@ -24,10 +24,11 @@ use crate::{
     core::{
         parking_lot::{Mutex, MutexGuard},
         uuid::Uuid,
-        SafeLock, TypeUuidProvider,
+        SafeLock,
     },
     script::{Script, ScriptTrait},
 };
+use fyrox_core::reflect::Reflect;
 use std::collections::BTreeMap;
 
 /// Script constructor contains all required data and methods to create script instances
@@ -66,12 +67,12 @@ impl ScriptConstructorContainer {
     /// The method will panic if there is already a constructor for given type uuid.
     pub fn add<T>(&self, name: &str) -> &Self
     where
-        T: TypeUuidProvider + ScriptTrait + Default,
+        T: ScriptTrait + Default,
     {
         let type_info = T::type_info();
 
         let old = self.map.safe_lock().insert(
-            T::type_uuid(),
+            <T as Reflect>::type_info().type_uuid,
             ScriptConstructor {
                 constructor: Box::new(|| Script::new(T::default())),
                 name: name.to_owned(),
diff --git a/fyrox-impl/src/script/mod.rs b/fyrox-impl/src/script/mod.rs
index 63ad8ef82..1a74c3154 100644
--- a/fyrox-impl/src/script/mod.rs
+++ b/fyrox-impl/src/script/mod.rs
@@ -28,10 +28,9 @@ use crate::{
     core::{
         log::Log,
         pool::{Handle, PoolError},
-        reflect::{FieldMut, FieldRef, Reflect},
+        reflect::prelude::*,
         uuid::Uuid,
         visitor::{Visit, VisitResult, Visitor},
-        TypeUuidProvider,
     },
     engine::{input::InputState, task::TaskPoolHandler, GraphicsContext, ScriptMessageDispatcher},
     event::Event,
@@ -47,7 +46,6 @@ use std::{
     any::Any,
     fmt::{Debug, Formatter},
     ops::{Deref, DerefMut},
-    str::FromStr,
     sync::mpsc::Sender,
 };
 
@@ -227,23 +225,14 @@ pub trait BaseScript: Visit + Reflect + Send + Debug + 'static {
     ///     core::reflect::prelude::*,
     ///     core::uuid::Uuid,
     ///     script::ScriptTrait,
-    ///     core::TypeUuidProvider,
-    ///     core::uuid::uuid, core::type_traits::prelude::*
+    ///     core::uuid::uuid,
     /// };
     ///
     /// #[derive(Reflect, Visit, Debug, Clone)]
+    /// // Use https://www.uuidgenerator.net/ to generate new UUID or an extension for your IDE.
+    /// #[reflect(type_uuid = "4cfbe65e-a2c1-474f-b123-57516d80b1f8")]
     /// struct MyScript { }
     ///
-    /// // Implement TypeUuidProvider trait that will return type uuid of the type.
-    /// // Every script must implement the trait so the script can be registered in
-    /// // serialization context of the engine.
-    /// impl TypeUuidProvider for MyScript {
-    ///     fn type_uuid() -> Uuid {
-    ///         // Use https://www.uuidgenerator.net/ to generate new UUID.
-    ///         uuid!("4cfbe65e-a2c1-474f-b123-57516d80b1f8")
-    ///     }
-    /// }
-    ///
     /// impl ScriptTrait for MyScript { }
     /// ```
     fn id(&self) -> Uuid;
@@ -251,7 +240,7 @@ pub trait BaseScript: Visit + Reflect + Send + Debug + 'static {
 
 impl<T> BaseScript for T
 where
-    T: Clone + ScriptTrait + Any + TypeUuidProvider,
+    T: Clone + ScriptTrait + Any,
 {
     fn clone_box(&self) -> Box<dyn ScriptTrait> {
         Box::new(self.clone())
@@ -266,7 +255,7 @@ where
     }
 
     fn id(&self) -> Uuid {
-        T::type_uuid()
+        <T as Reflect>::type_info().type_uuid
     }
 }
 
@@ -341,21 +330,21 @@ pub struct ScriptContext<'a, 'b, 'c> {
     ///
     /// ```rust
     /// # use fyrox_impl::{
-    /// #     core::{reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    /// #     core::{reflect::prelude::*,  visitor::prelude::*},
     /// #     plugin::{Plugin, error::GameResult},
     /// #     script::{ScriptContext, ScriptTrait},
     /// # };
     /// #
     /// #[derive(Visit, Reflect, Default, Debug)]
-    /// #[reflect(non_cloneable)]
+    /// #[reflect(non_cloneable, type_uuid = "bf06a1f4-5e76-4560-a260-e64187a9484b")]
     /// struct Game {
     ///     player_name: String,
     /// }
     ///
     /// impl Plugin for Game {}
     ///
-    /// #[derive(Visit, Reflect, Clone, Default, Debug, TypeUuidProvider)]
-    /// #[type_uuid(id = "f732654e-5e3c-4b52-9a3d-44c0cfb14e18")]
+    /// #[derive(Visit, Reflect, Clone, Default, Debug)]
+    /// #[reflect(type_uuid = "f732654e-5e3c-4b52-9a3d-44c0cfb14e18")]
     /// struct MyScript {}
     ///
     /// impl ScriptTrait for MyScript {
@@ -663,8 +652,7 @@ pub trait ScriptTrait: BaseScript {
     ///
     /// ```rust
     /// use fyrox_impl::{
-    ///     core::{reflect::prelude::*, uuid::Uuid, visitor::prelude::*, type_traits::prelude::*},
-    ///     core::TypeUuidProvider,
+    ///     core::{reflect::prelude::*, uuid::Uuid, visitor::prelude::*},
     ///     script::ScriptTrait,
     ///     plugin::error::GameResult,
     ///     script::{ScriptContext, ScriptMessageContext, ScriptMessagePayload},
@@ -673,14 +661,9 @@ pub trait ScriptTrait: BaseScript {
     /// struct Message;
     ///
     /// #[derive(Reflect, Visit, Debug, Clone)]
+    /// #[reflect(type_uuid = "2649187c-46c2-485f-bf62-c9d3aef0c432")]
     /// struct MyScript {}
     ///
-    /// # impl TypeUuidProvider for MyScript {
-    /// #     fn type_uuid() -> Uuid {
-    /// #         todo!();
-    /// #     }
-    /// # }
-    ///
     /// impl ScriptTrait for MyScript {
     ///     fn on_start(&mut self, ctx: &mut ScriptContext) -> GameResult {
     ///         // Subscription is mandatory to receive any message of the type!
@@ -711,6 +694,7 @@ pub trait ScriptTrait: BaseScript {
 
 /// A wrapper for actual script instance internals, it used by the engine.
 #[derive(Debug, Reflect)]
+#[reflect(type_uuid = "24ecd17d-9b46-4cc8-9d07-a1273e50a20e")]
 pub struct Script {
     #[reflect(deref, display_name = "Script")]
     instance: Box<dyn ScriptTrait>,
@@ -720,12 +704,6 @@ pub struct Script {
     pub(crate) started: bool,
 }
 
-impl TypeUuidProvider for Script {
-    fn type_uuid() -> Uuid {
-        Uuid::from_str("24ecd17d-9b46-4cc8-9d07-a1273e50a20e").unwrap()
-    }
-}
-
 impl Deref for Script {
     type Target = dyn ScriptTrait;
 
@@ -844,15 +822,13 @@ mod test {
         scene::base::Base,
         script::{Script, ScriptTrait},
     };
-    use fyrox_core::uuid_provider;
 
     #[derive(Reflect, Visit, Debug, Clone, Default)]
+    #[reflect(type_uuid = "eed9bf56-7d71-44a0-ba8e-0f3163c59669")]
     struct MyScript {
         field: InheritableVariable<f32>,
     }
 
-    uuid_provider!(MyScript = "eed9bf56-7d71-44a0-ba8e-0f3163c59669");
-
     impl ScriptTrait for MyScript {}
 
     #[test]
diff --git a/fyrox-impl/src/utils/lightmap.rs b/fyrox-impl/src/utils/lightmap.rs
index e000eba17..e5d7cfcd6 100644
--- a/fyrox-impl/src/utils/lightmap.rs
+++ b/fyrox-impl/src/utils/lightmap.rs
@@ -53,7 +53,7 @@ use crate::{
     utils::{uvgen, uvgen::SurfaceDataPatch},
 };
 use fxhash::FxHashMap;
-use fyrox_core::{ok_or_continue, warn, Uuid};
+use fyrox_core::{ok_or_continue, warn};
 use fyrox_graph::SceneGraphNode;
 use fyrox_material::Material;
 use fyrox_resource::ResourceData;
@@ -125,6 +125,7 @@ pub fn apply_surface_data_patch(
 
 /// Lightmap entry.
 #[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "17c570ce-0e98-42c0-b93f-ddc97012380d")]
 pub struct LightmapEntry {
     /// Lightmap texture.
     ///
@@ -166,6 +167,7 @@ impl Visit for SurfaceDataPatchWrapper {
 
 /// Lightmap is a texture with precomputed lighting.
 #[derive(Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "931d2ee2-f8f0-42e7-9d9b-3c429ca75128")]
 pub struct Lightmap {
     /// Name of the property this light map is bound to in all materials across all
     /// surfaces for which the light map was generated.
diff --git a/fyrox-impl/src/utils/navmesh.rs b/fyrox-impl/src/utils/navmesh.rs
index f5a775071..701ae14e7 100644
--- a/fyrox-impl/src/utils/navmesh.rs
+++ b/fyrox-impl/src/utils/navmesh.rs
@@ -76,6 +76,7 @@ impl VertexDataProvider for Vertex {}
 
 /// See module docs.
 #[derive(Clone, Debug, Default, Reflect)]
+#[reflect(type_uuid = "5bc7c49c-2dc4-4f67-916c-1d9affd755ef")]
 #[reflect(hide_all)]
 pub struct Navmesh {
     octree: Octree,
diff --git a/fyrox-material/src/lib.rs b/fyrox-material/src/lib.rs
index 111bb1ac2..52d07eae9 100644
--- a/fyrox-material/src/lib.rs
+++ b/fyrox-material/src/lib.rs
@@ -14,7 +14,6 @@ use fyrox_core::{
     sstorage::ImmutableString,
     uuid::{uuid, Uuid},
     visitor::prelude::*,
-    TypeUuidProvider,
 };
 use fyrox_resource::{
     io::ResourceIo,
@@ -37,8 +36,8 @@ pub mod loader;
 pub mod shader;
 
 /// A texture binding.
-#[derive(Default, Debug, Visit, Clone, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "e1642a47-d372-4840-a8eb-f16350f436f8")]
+#[derive(Default, Debug, Visit, Clone, Reflect)]
+#[reflect(type_uuid = "e1642a47-d372-4840-a8eb-f16350f436f8")]
 pub struct MaterialTextureBinding {
     /// Actual value of the texture binding. Could be [`None`], in this case fallback value of the
     /// shader will be used.
@@ -51,8 +50,8 @@ pub struct MaterialTextureBinding {
 ///
 /// There is a limited set of possible types that can be passed to a shader, most of them are
 /// just simple data types.
-#[derive(Debug, Visit, Clone, Reflect, TypeUuidProvider, AsRefStr, EnumString, VariantNames)]
-#[type_uuid(id = "2df8f1e5-0075-4d0d-9860-70fc27d3e165")]
+#[derive(Debug, Visit, Clone, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "2df8f1e5-0075-4d0d-9860-70fc27d3e165")]
 pub enum MaterialResourceBinding {
     /// A texture.
     Texture(MaterialTextureBinding),
@@ -80,6 +79,7 @@ impl MaterialResourceBinding {
 /// Property group stores a bunch of named values of a fixed set of types, that will be used for
 /// rendering with some shader.
 #[derive(Default, Debug, Visit, Clone, Reflect)]
+#[reflect(type_uuid = "f7bfc838-f115-463d-a714-ab48d309058a")]
 pub struct MaterialPropertyGroup {
     properties: FxHashMap<ImmutableString, MaterialProperty>,
 }
@@ -166,8 +166,8 @@ impl MaterialPropertyGroup {
 }
 
 /// A set of possible material property types.
-#[derive(Debug, Visit, Clone, Reflect, AsRefStr, EnumString, VariantNames, TypeUuidProvider)]
-#[type_uuid(id = "1c25018d-ab6e-4dca-99a6-e3d9639bc33c")]
+#[derive(Debug, Visit, Clone, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "1c25018d-ab6e-4dca-99a6-e3d9639bc33c")]
 pub enum MaterialProperty {
     /// Real number.
     Float(f32),
@@ -601,6 +601,7 @@ impl Default for MaterialProperty {
 /// that we using resource manager to get shader instance, and then we just use the instance to create
 /// material instance. Then we populate properties as usual.
 #[derive(Debug, Clone, Reflect)]
+#[reflect(type_uuid = "0e54fe44-0c58-4108-a681-d6eefc88c234")]
 pub struct Material {
     shader: ShaderResource,
     resource_bindings: FxHashMap<ImmutableString, MaterialResourceBinding>,
@@ -635,17 +636,7 @@ impl Default for Material {
     }
 }
 
-impl TypeUuidProvider for Material {
-    fn type_uuid() -> Uuid {
-        uuid!("0e54fe44-0c58-4108-a681-d6eefc88c234")
-    }
-}
-
 impl ResourceData for Material {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.visit("Material", &mut visitor)?;
@@ -1074,7 +1065,7 @@ impl MaterialResourceExtension for MaterialResource {
             ResourceState::Ok { ref data } => MaterialResource::new_ok(
                 Uuid::new_v4(),
                 ResourceKind::Embedded,
-                (&**data as &dyn Any)
+                (data.inner_ref() as &dyn Any)
                     .downcast_ref::<Material>()
                     .unwrap()
                     .clone(),
diff --git a/fyrox-material/src/loader.rs b/fyrox-material/src/loader.rs
index 48932c410..c6805e327 100644
--- a/fyrox-material/src/loader.rs
+++ b/fyrox-material/src/loader.rs
@@ -21,7 +21,8 @@
 //! Material loader.
 
 use crate::Material;
-use fyrox_core::{uuid::Uuid, TypeUuidProvider};
+use fyrox_core::reflect::Reflect;
+use fyrox_core::uuid::Uuid;
 use fyrox_resource::state::LoadError;
 use fyrox_resource::{
     io::ResourceIo,
@@ -46,7 +47,7 @@ impl ResourceLoader for MaterialLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        Material::type_uuid()
+        <Material as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-material/src/shader/loader.rs b/fyrox-material/src/shader/loader.rs
index 47be497dd..1972236ff 100644
--- a/fyrox-material/src/shader/loader.rs
+++ b/fyrox-material/src/shader/loader.rs
@@ -21,7 +21,8 @@
 //! Shader loader.
 
 use crate::shader::Shader;
-use fyrox_core::{uuid::Uuid, TypeUuidProvider};
+use fyrox_core::reflect::Reflect;
+use fyrox_core::uuid::Uuid;
 use fyrox_resource::{
     io::ResourceIo,
     loader::{BoxedLoaderFuture, LoaderPayload, ResourceLoader},
@@ -38,7 +39,7 @@ impl ResourceLoader for ShaderLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        Shader::type_uuid()
+        <Shader as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-material/src/shader/mod.rs b/fyrox-material/src/shader/mod.rs
index 0703202f3..5a9974899 100644
--- a/fyrox-material/src/shader/mod.rs
+++ b/fyrox-material/src/shader/mod.rs
@@ -460,7 +460,6 @@
 use fyrox_core::some_or_continue;
 use fyrox_core::{
     io::FileError, reflect::prelude::*, sparse::AtomicIndex, uuid::Uuid, visitor::prelude::*,
-    TypeUuidProvider,
 };
 pub use fyrox_graphics::gpu_program::{
     SamplerFallback, ShaderResourceDefinition, ShaderResourceKind,
@@ -517,6 +516,7 @@ pub const STANDARD_WIDGET_SHADER_NAME: &str = "Widget Shader";
 /// Usually you don't need to access internals of the shader, but there sometimes could be a need to
 /// read shader definition, to get supported passes and properties.
 #[derive(Default, Debug, Clone, Reflect, Visit)]
+#[reflect(type_uuid = "f1346417-b726-492a-b80f-c02096c6c019")]
 pub struct Shader {
     /// Shader definition contains description of properties and render passes.
     #[visit(optional)]
@@ -528,15 +528,9 @@ pub struct Shader {
     pub cache_index: Arc<AtomicIndex>,
 }
 
-impl TypeUuidProvider for Shader {
-    fn type_uuid() -> Uuid {
-        uuid!("f1346417-b726-492a-b80f-c02096c6c019")
-    }
-}
-
 /// A simple wrapper over string to hold shader source code.
-#[derive(Default, Clone, Debug, PartialEq, Eq, Reflect, Visit, TypeUuidProvider)]
-#[type_uuid(id = "d2aa5ba0-59e8-4f21-b7af-d6aab3a65379")]
+#[derive(Default, Clone, Debug, PartialEq, Eq, Reflect, Visit)]
+#[reflect(type_uuid = "d2aa5ba0-59e8-4f21-b7af-d6aab3a65379")]
 pub struct ShaderSourceCode(pub String);
 
 impl Serialize for ShaderSourceCode {
@@ -572,10 +566,8 @@ impl DerefMut for ShaderSourceCode {
 }
 
 /// A render pass definition. See [`ShaderResource`] docs for more info about render passes.
-#[derive(
-    Default, Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Reflect, Visit, TypeUuidProvider,
-)]
-#[type_uuid(id = "450f2f3a-bdc8-4fd8-b62e-c4c924cd94ca")]
+#[derive(Default, Clone, Serialize, Deserialize, Debug, PartialEq, Eq, Reflect, Visit)]
+#[reflect(type_uuid = "450f2f3a-bdc8-4fd8-b62e-c4c924cd94ca")]
 pub struct RenderPassDefinition {
     /// A name of render pass.
     pub name: String,
@@ -598,6 +590,7 @@ pub struct RenderPassDefinition {
 
 /// A definition of the shader.
 #[derive(Default, Clone, Serialize, Deserialize, Debug, PartialEq, Reflect, Visit)]
+#[reflect(type_uuid = "182e300f-c810-4063-8c48-4ac4972fa5d8")]
 pub struct ShaderDefinition {
     /// A name of the shader.
     pub name: String,
@@ -827,10 +820,6 @@ impl Shader {
 }
 
 impl ResourceData for Shader {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut file = File::create(path)?;
         file.write_all(
diff --git a/fyrox-resource/src/builtin.rs b/fyrox-resource/src/builtin.rs
index 6e2d8cd35..d851e57d2 100644
--- a/fyrox-resource/src/builtin.rs
+++ b/fyrox-resource/src/builtin.rs
@@ -22,8 +22,9 @@
 //! mechanism when you need to bundle all game resources and put them in the executable file. See
 //! [`BuiltInResource`] docs for more info.
 
-use crate::{core::Uuid, untyped::UntypedResource, Resource, TypedResourceData};
+use crate::{untyped::UntypedResource, Resource, TypedResourceData};
 use fxhash::FxHashMap;
+use fyrox_core::uuid::Uuid;
 use std::{
     borrow::Cow,
     ops::Deref,
@@ -89,23 +90,19 @@ pub struct UntypedBuiltInResource {
 /// ```rust
 /// use fyrox_resource::{
 ///     builtin::BuiltInResource,
-///     core::{reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*, Uuid},
+///     core::{reflect::prelude::*, visitor::prelude::*},
 ///     manager::ResourceManager,
 ///     Resource, ResourceData,
 /// };
 /// use std::{error::Error, path::Path};
 ///
-/// #[derive(TypeUuidProvider, Default, Debug, Clone, Visit, Reflect)]
-/// #[type_uuid(id = "00d036bb-fbed-47f7-94e3-b3fce93dee17")]
+/// #[derive(Default, Debug, Clone, Visit, Reflect)]
+/// #[reflect(type_uuid = "00d036bb-fbed-47f7-94e3-b3fce93dee17")]
 /// struct MyResource {
 ///     some_data: String,
 /// }
 ///
 /// impl ResourceData for MyResource {
-///     fn type_uuid(&self) -> Uuid {
-///         <Self as TypeUuidProvider>::type_uuid()
-///     }
-///
 ///     fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
 ///         Ok(())
 ///     }
diff --git a/fyrox-resource/src/constructor.rs b/fyrox-resource/src/constructor.rs
index 42f5cf72a..0535ffe91 100644
--- a/fyrox-resource/src/constructor.rs
+++ b/fyrox-resource/src/constructor.rs
@@ -23,10 +23,11 @@
 //! on deserialization to create a default instance of corresponding resource.
 
 use crate::{
-    core::{parking_lot::Mutex, uuid::Uuid, SafeLock, TypeUuidProvider},
+    core::{parking_lot::Mutex, uuid::Uuid, SafeLock},
     ResourceData,
 };
 use fxhash::FxHashMap;
+use fyrox_core::reflect::Reflect;
 
 /// A simple type alias for boxed resource constructor.
 pub struct ResourceDataConstructor {
@@ -60,10 +61,10 @@ impl ResourceConstructorContainer {
     /// (if any).
     pub fn add<T>(&self)
     where
-        T: ResourceData + Default + TypeUuidProvider,
+        T: ResourceData + Default,
     {
         let previous = self.map.safe_lock().insert(
-            <T as TypeUuidProvider>::type_uuid(),
+            <T as Reflect>::type_info().type_uuid,
             ResourceDataConstructor {
                 callback: Box::new(|| Box::<T>::default()),
                 type_name: std::any::type_name::<T>().to_owned(),
@@ -113,13 +114,10 @@ mod test {
     use super::*;
 
     #[derive(Debug, Default, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "ba5f1e9b-557f-4565-bbb1-c299a6510bb7")]
     struct Stub {}
 
     impl ResourceData for Stub {
-        fn type_uuid(&self) -> Uuid {
-            Uuid::default()
-        }
-
         fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
             Err("Saving is not supported!".to_string().into())
         }
@@ -133,12 +131,6 @@ mod test {
         }
     }
 
-    impl TypeUuidProvider for Stub {
-        fn type_uuid() -> Uuid {
-            Uuid::default()
-        }
-    }
-
     #[test]
     fn resource_constructor_container_new() {
         let c = ResourceConstructorContainer::new();
@@ -173,7 +165,7 @@ mod test {
         let c = ResourceConstructorContainer::new();
         c.add::<Stub>();
 
-        let res = c.try_create(&Uuid::default());
+        let res = c.try_create(&uuid!("ba5f1e9b-557f-4565-bbb1-c299a6510bb7"));
         assert!(res.is_some());
     }
 }
diff --git a/fyrox-resource/src/graph.rs b/fyrox-resource/src/graph.rs
index d9419261d..a2477e514 100644
--- a/fyrox-resource/src/graph.rs
+++ b/fyrox-resource/src/graph.rs
@@ -113,10 +113,9 @@ impl ResourceDependencyGraph {
 }
 #[cfg(test)]
 mod test {
-    use fyrox_core::Uuid;
-
     use super::*;
     use crate::untyped::ResourceKind;
+    use fyrox_core::uuid::Uuid;
 
     #[test]
     fn resource_graph_node_new() {
diff --git a/fyrox-resource/src/lib.rs b/fyrox-resource/src/lib.rs
index 88cc6e362..6c8cb9edf 100644
--- a/fyrox-resource/src/lib.rs
+++ b/fyrox-resource/src/lib.rs
@@ -27,12 +27,10 @@
 
 use crate::{
     core::{
-        combine_uuids,
         parking_lot::MutexGuard,
         reflect::prelude::*,
         uuid::{uuid, Uuid},
         visitor::prelude::*,
-        TypeUuidProvider,
     },
     state::{LoadError, ResourceState},
     untyped::{ResourceHeader, ResourceKind, UntypedResource},
@@ -71,9 +69,6 @@ pub mod untyped;
 
 /// A trait for resource data.
 pub trait ResourceData: Debug + Visit + Send + Reflect {
-    /// Returns unique data type id.
-    fn type_uuid(&self) -> Uuid;
-
     /// Saves the resource data a file at the specified path. This method is free to
     /// decide how the resource data is saved. This is needed, because there are multiple formats
     /// that defines various kinds of resources. For example, a rectangular texture could be saved
@@ -95,10 +90,10 @@ pub trait ResourceData: Debug + Visit + Send + Reflect {
 /// Extension trait for a resource data of a particular type, which adds additional functionality,
 /// such as: a way to get default state of the data (`Default` impl), a way to get data's type uuid.
 /// The trait has automatic implementation for any type that implements
-/// ` ResourceData + Default + TypeUuidProvider` traits.
-pub trait TypedResourceData: ResourceData + Default + TypeUuidProvider {}
+/// ` ResourceData + Default ` traits.
+pub trait TypedResourceData: ResourceData + Default {}
 
-impl<T> TypedResourceData for T where T: ResourceData + Default + TypeUuidProvider {}
+impl<T> TypedResourceData for T where T: ResourceData + Default {}
 
 /// A trait for resource load error.
 pub trait ResourceLoadError: 'static + Debug + Display + Send + Sync {}
@@ -145,7 +140,7 @@ where
     /// type of the resource.
     pub fn data(&mut self) -> Option<&mut T> {
         if let ResourceState::Ok { ref mut data, .. } = self.guard.state {
-            (&mut **data as &mut dyn Any).downcast_mut::<T>()
+            (data.inner_mut() as &mut dyn Any).downcast_mut::<T>()
         } else {
             None
         }
@@ -156,7 +151,7 @@ where
     /// type of the resource.
     pub fn data_ref(&self) -> Option<&T> {
         if let ResourceState::Ok { ref data, .. } = self.guard.state {
-            (&**data as &dyn Any).downcast_ref::<T>()
+            (data.inner_ref() as &dyn Any).downcast_ref::<T>()
         } else {
             None
         }
@@ -168,7 +163,7 @@ where
     pub fn data_ref_with_id(&self) -> Option<(&T, &Uuid)> {
         let uuid = &self.guard.uuid;
         if let ResourceState::Ok { ref data } = self.guard.state {
-            (&**data as &dyn Any)
+            (data.inner_ref() as &dyn Any)
                 .downcast_ref::<T>()
                 .map(|typed| (typed, uuid))
         } else {
@@ -189,13 +184,14 @@ where
     from = "UntypedResource",
     into = "UntypedResource"
 )]
-pub struct Resource<T: Debug> {
+#[reflect(type_uuid = "790b1a1c-a997-46c4-ac3b-8565501f0052")]
+pub struct Resource<T: Reflect + Debug> {
     untyped: UntypedResource,
     #[reflect(hidden)]
     phantom: PhantomData<T>,
 }
 
-impl<T: Debug> Debug for Resource<T> {
+impl<T: Reflect> Debug for Resource<T> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
@@ -218,22 +214,16 @@ impl AsRef<UntypedResource> for UntypedResource {
     }
 }
 
-impl<T: TypedResourceData> TypeUuidProvider for Resource<T> {
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("790b1a1c-a997-46c4-ac3b-8565501f0052"),
-            <T as TypeUuidProvider>::type_uuid(),
-        )
-    }
-}
-
 impl<T> Visit for Resource<T>
 where
     T: TypedResourceData,
 {
     fn visit(&mut self, name: &str, visitor: &mut Visitor) -> VisitResult {
-        self.untyped
-            .visit_with_type_uuid(name, Some(<T as TypeUuidProvider>::type_uuid()), visitor)
+        self.untyped.visit_with_type_uuid(
+            name,
+            Some(<T as Reflect>::type_info().type_uuid),
+            visitor,
+        )
     }
 }
 
@@ -414,7 +404,7 @@ where
     }
 }
 
-impl<T: Debug> Clone for Resource<T> {
+impl<T: Reflect> Clone for Resource<T> {
     #[inline]
     fn clone(&self) -> Self {
         Self {
@@ -440,7 +430,7 @@ where
     #[inline]
     fn from(untyped: UntypedResource) -> Self {
         if let Some(type_uuid) = untyped.type_uuid() {
-            let expected = <T as TypeUuidProvider>::type_uuid();
+            let expected = <T as Reflect>::type_info().type_uuid;
             if type_uuid != expected {
                 panic!("Resource type mismatch. Expected: {expected}. Found: {type_uuid}");
             }
@@ -493,7 +483,7 @@ where
     #[inline]
     pub fn as_loaded_ref(&self) -> Option<&T> {
         match self.guard.state {
-            ResourceState::Ok { ref data, .. } => (&**data as &dyn Any).downcast_ref(),
+            ResourceState::Ok { ref data, .. } => (data.inner_ref() as &dyn Any).downcast_ref(),
             _ => None,
         }
     }
@@ -501,7 +491,9 @@ where
     #[inline]
     pub fn as_loaded_mut(&mut self) -> Option<&mut T> {
         match self.guard.state {
-            ResourceState::Ok { ref mut data, .. } => (&mut **data as &mut dyn Any).downcast_mut(),
+            ResourceState::Ok { ref mut data, .. } => {
+                (data.inner_mut() as &mut dyn Any).downcast_mut()
+            }
             _ => None,
         }
     }
@@ -567,7 +559,7 @@ where
                 };
                 panic!("Attempt to get reference to resource data which failed to load! Type {}. Path: {path}. Error: {error:?}", std::any::type_name::<T>())
             }
-            ResourceState::Ok { ref data } => (&**data as &dyn Any)
+            ResourceState::Ok { ref data } => (data.inner_ref() as &dyn Any)
                 .downcast_ref()
                 .expect("Type mismatch!"),
         }
@@ -590,7 +582,7 @@ where
             ResourceState::LoadError { .. } => {
                 panic!("Attempt to get reference to resource data which failed to load!")
             }
-            ResourceState::Ok { ref mut data, .. } => (&mut **data as &mut dyn Any)
+            ResourceState::Ok { ref mut data, .. } => (data.inner_mut() as &mut dyn Any)
                 .downcast_mut()
                 .expect("Type mismatch!"),
         }
@@ -697,8 +689,7 @@ mod tests {
     };
     use fyrox_core::{
         append_extension, futures::executor::block_on, io::FileError, parking_lot::Mutex,
-        reflect::prelude::*, task::TaskPool, uuid, visitor::prelude::*, SafeLock, TypeUuidProvider,
-        Uuid,
+        reflect::prelude::*, task::TaskPool, visitor::prelude::*, SafeLock,
     };
     use ron::ser::PrettyConfig;
     use serde::{Deserialize, Serialize};
@@ -711,8 +702,8 @@ mod tests {
         sync::Arc,
     };
 
-    #[derive(Serialize, Deserialize, Default, Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-    #[type_uuid(id = "241d14c7-079e-4395-a63c-364f0fc3e6ea")]
+    #[derive(Serialize, Deserialize, Default, Debug, Clone, Visit, Reflect)]
+    #[reflect(type_uuid = "241d14c7-079e-4395-a63c-364f0fc3e6ea")]
     struct MyData {
         data: u32,
     }
@@ -733,10 +724,6 @@ mod tests {
     }
 
     impl ResourceData for MyData {
-        fn type_uuid(&self) -> Uuid {
-            <Self as TypeUuidProvider>::type_uuid()
-        }
-
         fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
             let string = ron::ser::to_string_pretty(self, PrettyConfig::default())
                 .map_err(|err| {
@@ -773,7 +760,7 @@ mod tests {
         }
 
         fn data_type_uuid(&self) -> Uuid {
-            <MyData as TypeUuidProvider>::type_uuid()
+            <MyData as Reflect>::type_info().type_uuid
         }
 
         fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-resource/src/loader.rs b/fyrox-resource/src/loader.rs
index f23a2fd74..5c28ff1a4 100644
--- a/fyrox-resource/src/loader.rs
+++ b/fyrox-resource/src/loader.rs
@@ -21,14 +21,12 @@
 //! Resource loader. It manages resource loading.
 
 use crate::{
-    core::{uuid::Uuid, TypeUuidProvider},
-    io::ResourceIo,
-    options::BaseImportOptions,
-    state::LoadError,
-    ResourceData, TypedResourceData,
+    core::uuid::Uuid, io::ResourceIo, options::BaseImportOptions, state::LoadError, ResourceData,
+    TypedResourceData,
 };
 use fyrox_core::io::FileError;
 use fyrox_core::platform::TargetPlatform;
+use fyrox_core::reflect::Reflect;
 use fyrox_core::visitor::{Format, Visitor};
 use std::{
     any::Any,
@@ -303,7 +301,7 @@ impl ResourceLoadersContainer {
                 .iter()
                 .find(|loader| loader.supports_extension(&extension.to_string_lossy()))
                 .is_some_and(|loader| {
-                    loader.data_type_uuid() == <T as TypeUuidProvider>::type_uuid()
+                    loader.data_type_uuid() == <T as Reflect>::type_info().type_uuid
                 })
         })
     }
diff --git a/fyrox-resource/src/manager.rs b/fyrox-resource/src/manager.rs
index 006776bed..9f46a1101 100644
--- a/fyrox-resource/src/manager.rs
+++ b/fyrox-resource/src/manager.rs
@@ -35,7 +35,7 @@ use crate::{
         reflect::prelude::*,
         task::TaskPool,
         watcher::FileSystemWatcher,
-        SafeLock, TypeUuidProvider, Uuid,
+        SafeLock,
     },
     entry::{TimedEntry, DEFAULT_RESOURCE_LIFETIME},
     event::{ResourceEvent, ResourceEventBroadcaster},
@@ -49,6 +49,7 @@ use crate::{
     Resource, TypedResourceData, UntypedResource,
 };
 use fxhash::FxHashSet;
+use fyrox_core::uuid::Uuid;
 use fyrox_core::{
     futures::executor::block_on, make_relative_path, notify::Event, ok_or_return, some_or_continue,
     some_or_return,
@@ -118,7 +119,7 @@ pub struct ResourceManagerState {
 /// It is a simple wrapper over [`ResourceManagerState`] that can be shared (cloned). In other words,
 /// it is just a strong reference to the inner state.
 #[derive(Clone, Reflect)]
-#[reflect(hide_all)] // Inner content is hidden.
+#[reflect(hide_all, type_uuid = "d2acab72-67d4-4660-b198-096df3fa3c29")] // Inner content is hidden.
 pub struct ResourceManager {
     state: Arc<Mutex<ResourceManagerState>>,
 }
@@ -448,7 +449,7 @@ impl ResourceManager {
 
         let data_type_uuid_matches = untyped
             .type_uuid_non_blocking()
-            .is_some_and(|uuid| uuid == <T as TypeUuidProvider>::type_uuid());
+            .is_some_and(|uuid| uuid == <T as Reflect>::type_info().type_uuid);
 
         if !data_type_uuid_matches {
             let has_loader_for_extension = state
@@ -490,7 +491,7 @@ impl ResourceManager {
 
         let data_type_uuid_matches = untyped
             .type_uuid_non_blocking()
-            .is_some_and(|uuid| uuid == <T as TypeUuidProvider>::type_uuid());
+            .is_some_and(|uuid| uuid == <T as Reflect>::type_info().type_uuid);
 
         if !data_type_uuid_matches {
             let has_loader_for_extension = state
@@ -503,7 +504,7 @@ impl ResourceManager {
                     "Unable to get a resource of type {} from {path:?}! The resource has no \
                     associated loader for its extension and its actual data has some other \
                     data type!",
-                    <T as TypeUuidProvider>::type_uuid(),
+                    <T as Reflect>::type_info().type_uuid,
                 )
             }
         }
@@ -532,11 +533,11 @@ impl ResourceManager {
         let untyped = state.find_uuid(uuid);
 
         if let Some(type_uuid) = untyped.type_uuid_non_blocking() {
-            if type_uuid != <T as TypeUuidProvider>::type_uuid() {
+            if type_uuid != <T as Reflect>::type_info().type_uuid {
                 panic!(
                     "Unable to get a resource of type {} from {uuid} UUID! Its actual data has some other \
                     data type with type UUID {type_uuid}!",
-                    <T as TypeUuidProvider>::type_uuid(),
+                    <T as Reflect>::type_info().type_uuid,
                 )
             }
         }
@@ -596,7 +597,7 @@ impl ResourceManager {
 
         let data_type_uuid_matches = untyped
             .type_uuid_non_blocking()
-            .is_some_and(|uuid| uuid == <T as TypeUuidProvider>::type_uuid());
+            .is_some_and(|uuid| uuid == <T as Reflect>::type_info().type_uuid);
 
         if !data_type_uuid_matches {
             let has_loader_for_extension = state
@@ -609,7 +610,7 @@ impl ResourceManager {
                     "Unable to get a resource of type {} from {path:?}! The resource has no \
                     associated loader for its extension and its actual data has some other \
                     data type!",
-                    <T as TypeUuidProvider>::type_uuid(),
+                    <T as Reflect>::type_info().type_uuid,
                 )
             }
         }
@@ -665,7 +666,7 @@ impl ResourceManager {
         state.request_resource(&mut resource.untyped);
 
         if let Some(type_uuid) = resource.untyped.type_uuid_non_blocking() {
-            let needed_type_uuid = <T as TypeUuidProvider>::type_uuid();
+            let needed_type_uuid = <T as Reflect>::type_info().type_uuid;
             if type_uuid != needed_type_uuid {
                 panic!(
                     "Unable to get a resource of type {needed_type_uuid} from resource UUID {}! The resource is \
@@ -688,7 +689,7 @@ impl ResourceManager {
         state.add_resource(&mut resource.untyped);
 
         if let Some(type_uuid) = resource.untyped.type_uuid_non_blocking() {
-            let needed_type_uuid = <T as TypeUuidProvider>::type_uuid();
+            let needed_type_uuid = <T as Reflect>::type_info().type_uuid;
             if type_uuid != needed_type_uuid {
                 panic!(
                     "Unable to add a resource of type {needed_type_uuid} from resource UUID {}! The resource is \
@@ -713,7 +714,7 @@ impl ResourceManager {
         let untyped = state.request(path.as_ref());
         if untyped
             .type_uuid_non_blocking()
-            .is_some_and(|uuid| uuid == <T as TypeUuidProvider>::type_uuid())
+            .is_some_and(|uuid| uuid == <T as Reflect>::type_info().type_uuid)
             || state
                 .loaders
                 .safe_lock()
@@ -2086,24 +2087,14 @@ mod test {
     use fyrox_core::{
         uuid::{uuid, Uuid},
         visitor::{Visit, VisitResult, Visitor},
-        TypeUuidProvider,
     };
     use std::{error::Error, fs::File, time::Duration};
 
     #[derive(Debug, Default, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "2c729b8e-93d3-4bcc-a3a7-2d89e77947e5")]
     struct Stub {}
 
-    impl TypeUuidProvider for Stub {
-        fn type_uuid() -> Uuid {
-            uuid!("9d873ff4-3126-47e1-a492-7cd8e7168239")
-        }
-    }
-
     impl ResourceData for Stub {
-        fn type_uuid(&self) -> Uuid {
-            <Self as TypeUuidProvider>::type_uuid()
-        }
-
         fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
             Err("Saving is not supported!".to_string().into())
         }
@@ -2123,7 +2114,7 @@ mod test {
         }
 
         fn data_type_uuid(&self) -> Uuid {
-            <Stub as TypeUuidProvider>::type_uuid()
+            <Stub as Reflect>::type_info().type_uuid
         }
 
         fn load(&self, _path: PathBuf, _io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-resource/src/metadata.rs b/fyrox-resource/src/metadata.rs
index 7c8b5703f..4a9eb878a 100644
--- a/fyrox-resource/src/metadata.rs
+++ b/fyrox-resource/src/metadata.rs
@@ -21,7 +21,8 @@
 //! Resource metadata. See [`ResourceMetadata`] docs for more info.
 
 use crate::io::ResourceIo;
-use fyrox_core::{io::FileError, Uuid};
+use fyrox_core::io::FileError;
+use fyrox_core::uuid::Uuid;
 use ron::ser::PrettyConfig;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
diff --git a/fyrox-resource/src/registry.rs b/fyrox-resource/src/registry.rs
index 3b3bbe09b..faa757462 100644
--- a/fyrox-resource/src/registry.rs
+++ b/fyrox-resource/src/registry.rs
@@ -22,14 +22,13 @@
 //! resource used in your game. See [`ResourceRegistry`] docs for more info.
 
 use crate::{
-    core::{
-        append_extension, err, info, io::FileError, ok_or_return, parking_lot::Mutex, warn, Uuid,
-    },
+    core::{append_extension, err, info, io::FileError, ok_or_return, parking_lot::Mutex, warn},
     io::ResourceIo,
     loader::ResourceLoadersContainer,
     metadata::ResourceMetadata,
 };
 use fxhash::FxHashSet;
+use fyrox_core::uuid::Uuid;
 use fyrox_core::{futures::executor::block_on, SafeLock};
 use ron::ser::PrettyConfig;
 use std::sync::atomic::{AtomicBool, Ordering};
diff --git a/fyrox-resource/src/state.rs b/fyrox-resource/src/state.rs
index 8eb2343bb..e16eb0d10 100644
--- a/fyrox-resource/src/state.rs
+++ b/fyrox-resource/src/state.rs
@@ -32,7 +32,7 @@ use std::{
 
 #[doc(hidden)]
 #[derive(Reflect, Debug, Default, Clone)]
-#[reflect(hide_all)]
+#[reflect(hide_all, type_uuid = "238a5490-6627-48ef-8035-4b589497293b")]
 pub struct WakersList(Vec<Waker>);
 
 impl Deref for WakersList {
@@ -61,7 +61,7 @@ impl DerefMut for WakersList {
 
 /// Arbitrary loading error, that could be optionally be empty.
 #[derive(Reflect, Debug, Clone, Default)]
-#[reflect(hide_all)]
+#[reflect(hide_all, type_uuid = "cb2257dc-b344-49e6-972e-cd99be4c3615")]
 pub struct LoadError(pub Option<Arc<dyn ResourceLoadError>>);
 
 impl std::error::Error for LoadError {}
@@ -84,20 +84,17 @@ impl Display for LoadError {
 
 #[doc(hidden)]
 #[derive(Debug, Reflect)]
+#[reflect(type_uuid = "e7675337-0b9b-49b4-962a-03cc571a0ab7")]
 pub struct ResourceDataWrapper(
     #[reflect(deref, display_name = "Resource Data")] pub Box<dyn ResourceData>,
 );
 
-impl Deref for ResourceDataWrapper {
-    type Target = dyn ResourceData;
-
-    fn deref(&self) -> &Self::Target {
+impl ResourceDataWrapper {
+    pub fn inner_ref(&self) -> &dyn ResourceData {
         &*self.0
     }
-}
 
-impl DerefMut for ResourceDataWrapper {
-    fn deref_mut(&mut self) -> &mut Self::Target {
+    pub fn inner_mut(&mut self) -> &mut dyn ResourceData {
         &mut *self.0
     }
 }
@@ -135,6 +132,7 @@ impl Clone for ResourceDataWrapper {
 /// is present. It is somewhat possible to get a UUID when a resource is failed to load, but not in
 /// 100% cases.
 #[derive(Clone, Reflect)]
+#[reflect(type_uuid = "3d49c715-4a48-4b41-b8c6-45bcb8b3fd17")]
 pub enum ResourceState {
     /// Resource is not loaded. In some situations, having a handle to a resource
     /// can be sufficient even without the resource's data.
@@ -313,7 +311,7 @@ impl ResourceState {
             ResourceState::Pending { .. }
             | ResourceState::LoadError { .. }
             | ResourceState::Unloaded => None,
-            ResourceState::Ok { data, .. } => (&**data as &dyn Any).downcast_ref::<T>(),
+            ResourceState::Ok { data, .. } => (data.inner_ref() as &dyn Any).downcast_ref::<T>(),
         }
     }
 
@@ -324,32 +322,26 @@ impl ResourceState {
             ResourceState::Pending { .. }
             | ResourceState::LoadError { .. }
             | ResourceState::Unloaded => None,
-            ResourceState::Ok { data, .. } => (&mut **data as &mut dyn Any).downcast_mut::<T>(),
+            ResourceState::Ok { data, .. } => {
+                (data.inner_mut() as &mut dyn Any).downcast_mut::<T>()
+            }
         }
     }
 }
 
 #[cfg(test)]
 mod test {
-    use fyrox_core::{
-        reflect::{FieldRef, Reflect},
-        uuid::Uuid,
-        visitor::prelude::*,
-        TypeUuidProvider,
-    };
+    use fyrox_core::{reflect::prelude::*, visitor::prelude::*};
     use std::error::Error;
     use std::path::Path;
 
     use super::*;
 
     #[derive(Debug, Default, Clone, Reflect, Visit)]
+    #[reflect(type_uuid = "96a59120-b174-4b2c-9069-1770ec495011")]
     struct Stub {}
 
     impl ResourceData for Stub {
-        fn type_uuid(&self) -> Uuid {
-            Uuid::default()
-        }
-
         fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
             Err("Saving is not supported!".to_string().into())
         }
@@ -363,12 +355,6 @@ mod test {
         }
     }
 
-    impl TypeUuidProvider for Stub {
-        fn type_uuid() -> Uuid {
-            Uuid::default()
-        }
-    }
-
     #[test]
     fn resource_state_new_pending() {
         let state = ResourceState::new_pending();
diff --git a/fyrox-resource/src/untyped.rs b/fyrox-resource/src/untyped.rs
index 29fcbfbe7..4d185a905 100644
--- a/fyrox-resource/src/untyped.rs
+++ b/fyrox-resource/src/untyped.rs
@@ -23,10 +23,7 @@
 use crate::state::ResourceDataWrapper;
 use crate::ResourceHeaderGuard;
 use crate::{
-    core::{
-        parking_lot::Mutex, reflect::prelude::*, uuid, uuid::Uuid, visitor::prelude::*,
-        TypeUuidProvider,
-    },
+    core::{parking_lot::Mutex, reflect::prelude::*, uuid::Uuid, visitor::prelude::*},
     manager::ResourceManager,
     state::{LoadError, ResourceState},
     Resource, ResourceData, ResourceLoadError, TypedResourceData,
@@ -54,6 +51,7 @@ const MISSING_RESOURCE_MANAGER: &str =
 
 /// Kind of a resource. It defines how the resource manager will treat a resource content on serialization.
 #[derive(Default, Reflect, Debug, Visit, Copy, Clone, PartialEq, Eq, Hash)]
+#[reflect(type_uuid = "16204cca-cdb6-40d2-87de-8e96e5178e54")]
 pub enum ResourceKind {
     /// The content of embedded resources will be fully serialized.
     #[default]
@@ -113,6 +111,7 @@ impl Display for ResourceKind {
 /// Header of a resource, it contains a common data about the resource, such as its data type uuid,
 /// its kind, etc.
 #[derive(Reflect, Clone, Debug)]
+#[reflect(type_uuid = "2a41dd3e-bb8f-4654-ad0b-d8b7ca0cc9f2")]
 pub struct ResourceHeader {
     /// The unique identifier of this resource.
     pub uuid: Uuid,
@@ -146,7 +145,7 @@ impl ResourceHeader {
     /// The type of the data, if this resource is Ok.
     pub fn type_uuid(&self) -> Option<Uuid> {
         if let ResourceState::Ok { data } = &self.state {
-            Some(data.type_uuid())
+            Some(data.inner_ref().type_info_ref().type_uuid)
         } else {
             None
         }
@@ -200,9 +199,9 @@ impl Visit for ResourceHeader {
         } else {
             match (&self.kind, &mut self.state) {
                 (ResourceKind::Embedded, ResourceState::Ok { data }) => {
-                    let mut type_uuid = data.type_uuid();
+                    let mut type_uuid = data.inner_ref().type_info_ref().type_uuid;
                     type_uuid.visit("TypeUuid", &mut region)?;
-                    data.visit("Data", &mut region)
+                    data.inner_mut().visit("Data", &mut region)
                 }
                 (ResourceKind::External, _) => {
                     Err(VisitError::User("Writing an external resource".into()))
@@ -254,9 +253,9 @@ impl Visit for ResourceHeader {
 /// that the resource is in default state. This is a trade-off to prevent wrapping internals into
 /// `Option`, that in some cases could lead to convoluted code with lots of `unwrap`s and state
 /// assumptions.
-#[derive(Default, Clone, Reflect, TypeUuidProvider, Deserialize)]
+#[derive(Default, Clone, Reflect, Deserialize)]
 #[serde(from = "Uuid")]
-#[type_uuid(id = "21613484-7145-4d1c-87d8-62fa767560ab")]
+#[reflect(type_uuid = "21613484-7145-4d1c-87d8-62fa767560ab")]
 pub struct UntypedResource(pub Arc<Mutex<ResourceHeader>>);
 
 impl Serialize for UntypedResource {
@@ -483,7 +482,7 @@ impl UntypedResource {
     pub fn type_uuid(&self) -> Option<Uuid> {
         let header = self.lock();
         match header.state {
-            ResourceState::Ok { ref data, .. } => Some(data.type_uuid()),
+            ResourceState::Ok { ref data, .. } => Some(data.inner_ref().type_info_ref().type_uuid),
             _ => None,
         }
     }
@@ -493,7 +492,7 @@ impl UntypedResource {
     pub fn type_uuid_non_blocking(&self) -> Option<Uuid> {
         let header = self.try_lock()?;
         match header.state {
-            ResourceState::Ok { ref data, .. } => Some(data.type_uuid()),
+            ResourceState::Ok { ref data, .. } => Some(data.inner_ref().type_info_ref().type_uuid),
             _ => None,
         }
     }
@@ -503,7 +502,7 @@ impl UntypedResource {
     pub fn data_type_name(&self) -> Option<String> {
         match self.lock().state {
             ResourceState::Ok { ref data, .. } => {
-                Some((**data).type_info_ref().type_name.to_string())
+                Some(data.inner_ref().type_info_ref().type_name.to_string())
             }
             _ => None,
         }
@@ -571,7 +570,7 @@ impl UntypedResource {
             ResourceState::Pending { .. }
             | ResourceState::LoadError { .. }
             | ResourceState::Unloaded => Err("Unable to save unloaded resource!".into()),
-            ResourceState::Ok { ref mut data, .. } => data.save(path),
+            ResourceState::Ok { ref mut data, .. } => data.inner_mut().save(path),
         }
     }
 
@@ -580,7 +579,7 @@ impl UntypedResource {
     where
         T: TypedResourceData,
     {
-        if self.type_uuid() == Some(<T as TypeUuidProvider>::type_uuid()) {
+        if self.type_uuid() == Some(<T as Reflect>::type_info().type_uuid) {
             Some(Resource {
                 untyped: self.clone(),
                 phantom: PhantomData::<T>,
@@ -643,13 +642,10 @@ mod test {
     use super::*;
 
     #[derive(Debug, Default, Reflect, Visit, Clone, Copy)]
+    #[reflect(type_uuid = "7130e63a-8aa3-44f7-b264-bc19072a70ba")]
     struct Stub {}
 
     impl ResourceData for Stub {
-        fn type_uuid(&self) -> Uuid {
-            Uuid::default()
-        }
-
         fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
             Err("Saving is not supported!".to_string().into())
         }
@@ -663,12 +659,6 @@ mod test {
         }
     }
 
-    impl TypeUuidProvider for Stub {
-        fn type_uuid() -> Uuid {
-            Uuid::default()
-        }
-    }
-
     impl ResourceLoadError for str {}
 
     #[test]
diff --git a/fyrox-scripts/src/camera.rs b/fyrox-scripts/src/camera.rs
index 76a1d0a48..a3180bd1b 100644
--- a/fyrox-scripts/src/camera.rs
+++ b/fyrox-scripts/src/camera.rs
@@ -29,7 +29,6 @@ use fyrox::{
         math::curve::{Curve, CurveKey, CurveKeyKind},
         math::Vector3Ext,
         reflect::prelude::*,
-        uuid_provider,
         variable::InheritableVariable,
         visitor::prelude::*,
     },
@@ -44,6 +43,7 @@ use std::ops::Range;
 /// Use it, if you need to create a sort of "spectator" camera. To use it, all you need to do is to assign it to your camera
 /// node (or one if its parent nodes).
 #[derive(Visit, Reflect, Debug, Clone)]
+#[reflect(type_uuid = "8d9e2feb-8c61-482c-8ba4-b0b13b201113")]
 pub struct FlyingCameraController {
     /// Current yaw of the camera pivot (in radians).
     #[visit(optional)]
@@ -200,8 +200,6 @@ impl Default for FlyingCameraController {
     }
 }
 
-uuid_provider!(FlyingCameraController = "8d9e2feb-8c61-482c-8ba4-b0b13b201113");
-
 impl ScriptTrait for FlyingCameraController {
     fn on_os_event(&mut self, event: &Event<()>, context: &mut ScriptContext) -> GameResult {
         match event {
diff --git a/fyrox-scripts/src/lib.rs b/fyrox-scripts/src/lib.rs
index db2d2d45f..1bd74fcad 100644
--- a/fyrox-scripts/src/lib.rs
+++ b/fyrox-scripts/src/lib.rs
@@ -36,7 +36,7 @@ pub mod camera;
 /// # };
 /// #
 /// # #[derive(Visit, Reflect, Debug)]
-/// # #[reflect(non_cloneable)]
+/// # #[reflect(non_cloneable, type_uuid = "38a3d4cf-65e1-4e86-a730-365804c51cff")]
 /// # struct Game;
 /// #
 /// # impl Plugin for Game {
diff --git a/fyrox-sound/src/buffer/generic.rs b/fyrox-sound/src/buffer/generic.rs
index 5047a40f7..691353f11 100644
--- a/fyrox-sound/src/buffer/generic.rs
+++ b/fyrox-sound/src/buffer/generic.rs
@@ -52,6 +52,7 @@ use super::SoundBufferResourceLoadError;
 
 /// Samples container.
 #[derive(Debug, Default, Visit, Clone, Reflect)]
+#[reflect(type_uuid = "7b0ba106-9ed5-41e1-a8c7-82c609d6f74e")]
 pub struct Samples(pub Vec<f32>);
 
 impl Deref for Samples {
@@ -70,6 +71,7 @@ impl DerefMut for Samples {
 
 /// Generic sound buffer that contains decoded samples and allows random access.
 #[derive(Debug, Clone, Default, Visit, Reflect)]
+#[reflect(type_uuid = "e5bf74a5-13d9-4518-96f2-0e4f3413966e")]
 pub struct GenericBuffer {
     /// Interleaved decoded samples (mono sounds: L..., stereo sounds: LR...)
     /// For streaming buffers it contains only small part of decoded data
diff --git a/fyrox-sound/src/buffer/loader.rs b/fyrox-sound/src/buffer/loader.rs
index 866e8e0c4..1ecec3da0 100644
--- a/fyrox-sound/src/buffer/loader.rs
+++ b/fyrox-sound/src/buffer/loader.rs
@@ -21,7 +21,7 @@
 //! Sound buffer loader.
 
 use crate::buffer::{DataSource, SoundBuffer};
-use fyrox_core::{reflect::prelude::*, uuid::Uuid, TypeUuidProvider};
+use fyrox_core::{reflect::prelude::*, uuid::Uuid};
 use fyrox_resource::{
     io::ResourceIo,
     loader::{BoxedImportOptionsLoaderFuture, BoxedLoaderFuture, LoaderPayload, ResourceLoader},
@@ -35,6 +35,7 @@ use std::{path::PathBuf, sync::Arc};
 
 /// Defines sound buffer resource import options.
 #[derive(Clone, Deserialize, Serialize, Default, Debug, Reflect)]
+#[reflect(type_uuid = "032e333a-f0bd-41f2-a7e5-79207f6064ce")]
 pub struct SoundBufferImportOptions {
     /// Whether the buffer is streaming or not.
     pub stream: bool,
@@ -54,7 +55,7 @@ impl ResourceLoader for SoundBufferLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        SoundBuffer::type_uuid()
+        <SoundBuffer as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-sound/src/buffer/mod.rs b/fyrox-sound/src/buffer/mod.rs
index b6bb92d5a..ee01e6a0c 100644
--- a/fyrox-sound/src/buffer/mod.rs
+++ b/fyrox-sound/src/buffer/mod.rs
@@ -32,9 +32,7 @@ use crate::{
     buffer::{generic::GenericBuffer, streaming::StreamingBuffer},
     error::SoundError,
 };
-use fyrox_core::{
-    io::FileError, reflect::prelude::*, uuid, uuid::Uuid, visitor::prelude::*, TypeUuidProvider,
-};
+use fyrox_core::{io::FileError, reflect::prelude::*, uuid::Uuid, visitor::prelude::*};
 use fyrox_resource::untyped::ResourceKind;
 use fyrox_resource::{
     io::{FileReader, ResourceIo},
@@ -240,6 +238,7 @@ impl std::error::Error for SoundBufferResourceLoadError {}
 /// Sound buffer is a data source for sound sources. See module documentation for more info.
 #[derive(Debug, Visit, Reflect)]
 #[reflect(non_cloneable)]
+#[reflect(type_uuid = "f6a077b7-c8ff-4473-a95b-0289441ea9d8")]
 pub enum SoundBuffer {
     /// General-purpose buffer, usually contains all the data and allows random
     /// access to samples. It is also used to make streaming buffer via composition.
@@ -296,12 +295,6 @@ impl SoundBufferResourceExtension for SoundBufferResource {
     }
 }
 
-impl TypeUuidProvider for SoundBuffer {
-    fn type_uuid() -> Uuid {
-        uuid!("f6a077b7-c8ff-4473-a95b-0289441ea9d8")
-    }
-}
-
 impl SoundBuffer {
     /// Tries to create new streaming sound buffer from a given data source. It returns raw sound
     /// buffer that has to be wrapped into Arc<Mutex<>> for use with sound sources.
@@ -347,10 +340,6 @@ impl DerefMut for SoundBuffer {
 }
 
 impl ResourceData for SoundBuffer {
-    fn type_uuid(&self) -> Uuid {
-        uuid!("f6a077b7-c8ff-4473-a95b-0289441ea9d8")
-    }
-
     fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
         Err("Saving is not supported!".to_string().into())
     }
diff --git a/fyrox-sound/src/buffer/streaming.rs b/fyrox-sound/src/buffer/streaming.rs
index 228df74cf..217e2ae52 100644
--- a/fyrox-sound/src/buffer/streaming.rs
+++ b/fyrox-sound/src/buffer/streaming.rs
@@ -62,6 +62,7 @@ use std::{
 /// Streaming buffer for long sounds. Does not support random access.
 #[derive(Debug, Default, Visit, Reflect)]
 #[reflect(non_cloneable)]
+#[reflect(type_uuid = "2e668c89-5998-4e66-a908-f5d96d700c9e")]
 pub struct StreamingBuffer {
     pub(crate) generic: GenericBuffer,
     /// Count of sources that share this buffer, it is important to keep only one
diff --git a/fyrox-sound/src/bus.rs b/fyrox-sound/src/bus.rs
index fa1127488..4eb27c4be 100644
--- a/fyrox-sound/src/bus.rs
+++ b/fyrox-sound/src/bus.rs
@@ -102,6 +102,7 @@ impl PingPongBuffer {
 /// to some other audio bus and be processed again, but with different sound effects (this can be done via
 /// [`AudioBusGraph`].
 #[derive(Debug, Reflect, Visit, Clone)]
+#[reflect(type_uuid = "de4c1709-c9ac-4823-8f77-22199bb53645")]
 pub struct AudioBus {
     pub(crate) name: String,
     effects: Vec<Effect>,
@@ -309,6 +310,7 @@ impl AudioBus {
 ///
 /// If you delete an audio bus to which a bunch of sound sources is bound, then they will simply stop playing.
 #[derive(Default, Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "417d2cff-e699-4396-bd90-a57b5564372a")]
 pub struct AudioBusGraph {
     buses: Pool<AudioBus>,
     root: Handle<AudioBus>,
diff --git a/fyrox-sound/src/context.rs b/fyrox-sound/src/context.rs
index 4e7c7f980..dfd524413 100644
--- a/fyrox-sound/src/context.rs
+++ b/fyrox-sound/src/context.rs
@@ -41,7 +41,6 @@ use fyrox_core::pool::PoolError;
 use fyrox_core::{
     pool::{Handle, Pool},
     reflect::prelude::*,
-    uuid_provider,
     visitor::prelude::*,
     SafeLock,
 };
@@ -52,9 +51,11 @@ use std::{
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Distance model defines how volume of sound will decay when distance to listener changes.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Reflect, Visit, AsRefStr, EnumString, VariantNames)]
+#[derive(
+    Copy, Clone, Debug, Eq, PartialEq, Reflect, Visit, Default, AsRefStr, EnumString, VariantNames,
+)]
 #[repr(u32)]
-#[derive(Default)]
+#[reflect(type_uuid = "957f3b00-3f89-438c-b1b7-e841e8d75ba9")]
 pub enum DistanceModel {
     /// No distance attenuation at all.
     None = 0,
@@ -98,8 +99,6 @@ pub enum DistanceModel {
     ExponentDistance = 3,
 }
 
-uuid_provider!(DistanceModel = "957f3b00-3f89-438c-b1b7-e841e8d75ba9");
-
 /// See module docs.
 #[derive(Clone, Default, Debug, Visit)]
 pub struct SoundContext {
@@ -124,6 +123,7 @@ pub struct SerializationOptions {
 
 /// Internal state of context.
 #[derive(Default, Debug, Clone, Reflect)]
+#[reflect(type_uuid = "10f5a7ce-efe4-4bcc-aabc-c399e8fd1a3c")]
 pub struct State {
     sources: Pool<SoundSource>,
     listener: Listener,
diff --git a/fyrox-sound/src/dsp/filters.rs b/fyrox-sound/src/dsp/filters.rs
index 7ff1d8a54..be1688965 100644
--- a/fyrox-sound/src/dsp/filters.rs
+++ b/fyrox-sound/src/dsp/filters.rs
@@ -29,7 +29,6 @@
 use crate::dsp::DelayLine;
 use fyrox_core::{
     reflect::prelude::*,
-    uuid_provider,
     visitor::{Visit, VisitResult, Visitor},
 };
 
@@ -218,6 +217,7 @@ pub enum BiquadKind {
 /// Generic second order digital filter.
 /// More info here: <https://ccrma.stanford.edu/~jos/filters/BiQuad_Section.html>
 #[derive(Clone, Debug, Reflect, Visit, PartialEq)]
+#[reflect(type_uuid = "4560a1b3-74fc-4b0e-802f-ff1f253bf565")]
 pub struct Biquad {
     /// B0 Coefficient of the equation.
     pub b0: f32,
@@ -235,8 +235,6 @@ pub struct Biquad {
     prev2: f32,
 }
 
-uuid_provider!(Biquad = "4560a1b3-74fc-4b0e-802f-ff1f253bf565");
-
 impl Biquad {
     /// Creates new filter of given kind with specified parameters, where:
     /// `fc` - normalized frequency
diff --git a/fyrox-sound/src/effects/filter.rs b/fyrox-sound/src/effects/filter.rs
index af014b169..8efa112e7 100644
--- a/fyrox-sound/src/effects/filter.rs
+++ b/fyrox-sound/src/effects/filter.rs
@@ -28,8 +28,8 @@ use fyrox_core::{reflect::prelude::*, visitor::prelude::*};
 
 macro_rules! define_filter_effect {
     ($(#[$attr:meta])* $name:ident, $kind:expr) => {
-        $(#[$attr])*
         #[derive(Clone, Reflect, Visit, Debug, PartialEq)]
+         $(#[$attr])*
         pub struct $name {
             /// Cutoff frequency in Hertz.
             #[reflect(setter = "set_cutoff_frequency_hz")]
@@ -140,31 +140,37 @@ macro_rules! define_filter_effect {
 
 define_filter_effect!(
     /// Lowpass filter defines a filter that passes through every frequency below the cutoff frequency.
+    #[reflect(type_uuid = "88d111d2-50a7-4dd5-bb66-73bede961885")]
     LowPassFilterEffect,
     BiquadKind::LowPass
 );
 define_filter_effect!(
     /// Highpass filter defines a filter that passes through every frequency upper the cutoff frequency.
+    #[reflect(type_uuid = "48362041-466b-494c-9cee-706368f5b924")]
     HighPassFilterEffect,
     BiquadKind::HighPass
 );
 define_filter_effect!(
     /// Bandpass filter defines a filter that passes a band of frequencies surrounding the cutoff frequency.
+    #[reflect(type_uuid = "7e07703c-3202-4a75-8268-9bf704eb59f1")]
     BandPassFilterEffect,
     BiquadKind::BandPass
 );
 define_filter_effect!(
     /// Equally passes through each frequency, but shifts the phase of the signal by 90 degrees at the cutoff frequency.
+    #[reflect(type_uuid = "47f0e07c-e030-4166-a2d0-de123d3b1bda")]
     AllPassFilterEffect,
     BiquadKind::AllPass
 );
 define_filter_effect!(
     /// Reduces amplitude of frequencies in a shape like this ̅ \_ at the cutoff frequency.
+    #[reflect(type_uuid = "79a4a2af-a544-4852-a360-d05d94474c5c")]
     LowShelfFilterEffect,
     BiquadKind::LowShelf
 );
 define_filter_effect!(
     /// Reduces amplitude of frequencies in a shape like this _/̅  at the cutoff frequency.
+    #[reflect(type_uuid = "a80fb390-5e3c-4dc4-8d97-22c7aebc5d2b")]
     HighShelfFilterEffect,
     BiquadKind::HighShelf
 );
diff --git a/fyrox-sound/src/effects/mod.rs b/fyrox-sound/src/effects/mod.rs
index 4857f3fb8..10c4e78d8 100644
--- a/fyrox-sound/src/effects/mod.rs
+++ b/fyrox-sound/src/effects/mod.rs
@@ -27,7 +27,7 @@ use crate::{
     },
     effects::reverb::Reverb,
 };
-use fyrox_core::{reflect::prelude::*, uuid_provider, visitor::prelude::*};
+use fyrox_core::{reflect::prelude::*, visitor::prelude::*};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 pub mod filter;
@@ -35,6 +35,7 @@ pub mod reverb;
 
 /// Attenuation effect.
 #[derive(Debug, Clone, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "91c3bef1-4754-4df9-8e02-6f5ebd8e7450")]
 pub struct Attenuate {
     gain: f32,
 }
@@ -69,6 +70,7 @@ impl EffectRenderTrait for Attenuate {
 /// For example, [`LowPassFilterEffect`] could be used to muffle audio sources; to create "underwater"
 /// effect.
 #[derive(Debug, Clone, PartialEq, Visit, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "fc52e441-d1ec-4881-937c-9e2e53a6d621")]
 pub enum Effect {
     /// See [`Attenuate`] docs for more info.
     Attenuate(Attenuate),
@@ -88,8 +90,6 @@ pub enum Effect {
     HighShelfFilter(HighShelfFilterEffect),
 }
 
-uuid_provider!(Effect = "fc52e441-d1ec-4881-937c-9e2e53a6d621");
-
 impl Default for Effect {
     fn default() -> Self {
         Effect::Attenuate(Default::default())
diff --git a/fyrox-sound/src/effects/reverb.rs b/fyrox-sound/src/effects/reverb.rs
index 4f096f241..f40fb8432 100644
--- a/fyrox-sound/src/effects/reverb.rs
+++ b/fyrox-sound/src/effects/reverb.rs
@@ -164,6 +164,7 @@ impl ChannelReverb {
 
 /// See module docs.
 #[derive(Debug, Clone, Reflect, PartialEq)]
+#[reflect(type_uuid = "679fafbe-7f8e-42a2-8469-f02265327039")]
 pub struct Reverb {
     dry: f32,
     wet: f32,
diff --git a/fyrox-sound/src/listener.rs b/fyrox-sound/src/listener.rs
index fde52f2f1..c153535f9 100644
--- a/fyrox-sound/src/listener.rs
+++ b/fyrox-sound/src/listener.rs
@@ -34,6 +34,7 @@ use fyrox_core::{
 
 /// See module docs.
 #[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "fc52e441-d1ec-4881-937c-9e2e53a6d621")]
 pub struct Listener {
     basis: Matrix3<f32>,
     position: Vector3<f32>,
diff --git a/fyrox-sound/src/renderer/hrtf.rs b/fyrox-sound/src/renderer/hrtf.rs
index 296024419..9a8605fa5 100644
--- a/fyrox-sound/src/renderer/hrtf.rs
+++ b/fyrox-sound/src/renderer/hrtf.rs
@@ -85,7 +85,6 @@ use fyrox_core::{
     reflect::prelude::*,
     uuid::{uuid, Uuid},
     visitor::{Visit, VisitResult, Visitor},
-    TypeUuidProvider,
 };
 use fyrox_resource::untyped::ResourceKind;
 use fyrox_resource::{
@@ -143,6 +142,7 @@ impl Display for HrtfError {
 
 /// See module docs.
 #[derive(Clone, Debug, Default, Reflect)]
+#[reflect(type_uuid = "c6149a3b-7992-44a8-9b9f-16651a5d2b15")]
 pub struct HrtfRenderer {
     hrir_resource: Option<HrirSphereResource>,
     #[reflect(hidden)]
@@ -252,6 +252,7 @@ impl Default for HrirSource {
 /// Wrapper for [`HrirSphere`] to be able to use it in the resource manager, that will handle async resource
 /// loading automatically.
 #[derive(Reflect, Default, Clone, Visit)]
+#[reflect(type_uuid = "c92a0fa3-0ed3-49a9-be44-8f06271c6be2")]
 pub struct HrirSphereResourceData {
     #[reflect(hidden)]
     #[visit(skip)]
@@ -280,17 +281,7 @@ impl Debug for HrirSphereResourceData {
     }
 }
 
-impl TypeUuidProvider for HrirSphereResourceData {
-    fn type_uuid() -> Uuid {
-        uuid!("c92a0fa3-0ed3-49a9-be44-8f06271c6be2")
-    }
-}
-
 impl ResourceData for HrirSphereResourceData {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
         Err("Saving is not supported!".to_string().into())
     }
@@ -313,7 +304,7 @@ impl ResourceLoader for HrirSphereLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        <HrirSphereResourceData as TypeUuidProvider>::type_uuid()
+        <HrirSphereResourceData as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-sound/src/renderer/mod.rs b/fyrox-sound/src/renderer/mod.rs
index 962dd9f04..9f29c33bb 100644
--- a/fyrox-sound/src/renderer/mod.rs
+++ b/fyrox-sound/src/renderer/mod.rs
@@ -34,7 +34,6 @@ use crate::{
 use fyrox_core::math::lerpf;
 use fyrox_core::{
     reflect::prelude::*,
-    uuid_provider,
     visitor::{Visit, VisitResult, Visitor},
 };
 use strum_macros::{AsRefStr, EnumString, VariantNames};
@@ -46,6 +45,7 @@ pub mod hrtf;
 // can be only one at a time on context.
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug, Clone, AsRefStr, EnumString, VariantNames, Visit, Reflect, Default)]
+#[reflect(type_uuid = "13bf8432-987a-4216-b6aa-f5c0e8914a31")]
 pub enum Renderer {
     /// Stateless default renderer.
     #[default]
@@ -56,8 +56,6 @@ pub enum Renderer {
     HrtfRenderer(HrtfRenderer),
 }
 
-uuid_provider!(Renderer = "13bf8432-987a-4216-b6aa-f5c0e8914a31");
-
 fn render_with_params(
     source: &mut SoundSource,
     left_gain: f32,
diff --git a/fyrox-sound/src/source.rs b/fyrox-sound/src/source.rs
index 85573057d..3923d324e 100644
--- a/fyrox-sound/src/source.rs
+++ b/fyrox-sound/src/source.rs
@@ -59,13 +59,13 @@ use fyrox_core::{
     algebra::Vector3,
     log::Log,
     reflect::prelude::*,
-    uuid_provider,
     visitor::{Visit, VisitResult, Visitor},
 };
 use std::time::Duration;
 
 /// Status (state) of sound source.
 #[derive(Eq, PartialEq, Copy, Clone, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "1980bded-86cd-4eff-a5db-bab729bdb3ad")]
 #[repr(u32)]
 pub enum Status {
     /// Sound is stopped - it won't produces any sample and won't load mixer. This is default
@@ -80,10 +80,9 @@ pub enum Status {
     Paused = 2,
 }
 
-uuid_provider!(Status = "1980bded-86cd-4eff-a5db-bab729bdb3ad");
-
 /// See module info.
 #[derive(Debug, Clone, Reflect, Visit)]
+#[reflect(type_uuid = "1beb0bbc-72fb-42a1-9e78-5d246c84fdfe")]
 pub struct SoundSource {
     name: String,
     #[reflect(hidden)]
diff --git a/fyrox-texture/src/lib.rs b/fyrox-texture/src/lib.rs
index 3df73fe20..a65564f3e 100644
--- a/fyrox-texture/src/lib.rs
+++ b/fyrox-texture/src/lib.rs
@@ -53,11 +53,8 @@ use fyrox_core::{
     num_traits::Bounded,
     reflect::prelude::*,
     sparse::AtomicIndex,
-    uuid,
     uuid::Uuid,
-    uuid_provider,
     visitor::{Visit, VisitResult, Visitor},
-    TypeUuidProvider,
 };
 use fyrox_resource::{
     embedded_data_source, io::ResourceIo, manager::BuiltInResource, options::ImportOptions,
@@ -79,8 +76,8 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 pub mod loader;
 
 /// Texture kind.
-#[derive(Copy, Clone, Debug, Reflect, AsRefStr, EnumString, VariantNames, TypeUuidProvider)]
-#[type_uuid(id = "542eb785-875b-43ce-b73a-a25024535f48")]
+#[derive(Copy, Clone, Debug, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "542eb785-875b-43ce-b73a-a25024535f48")]
 pub enum TextureKind {
     /// 1D texture.
     Line {
@@ -226,6 +223,7 @@ impl Visit for TextureKind {
 
 /// Data storage of a texture.
 #[derive(Default, Clone, Reflect)]
+#[reflect(type_uuid = "4b9c2b23-46cd-4f7f-bf13-07b0bebe5538")]
 pub struct TextureBytes(Vec<u8>);
 
 impl Debug for TextureBytes {
@@ -256,6 +254,7 @@ impl DerefMut for TextureBytes {
 
 /// Actual texture data.
 #[derive(Debug, Clone, Reflect)]
+#[reflect(type_uuid = "02c23a44-55fa-411a-bc39-eb7a5eadf15c")]
 pub struct Texture {
     kind: TextureKind,
     bytes: TextureBytes,
@@ -280,17 +279,7 @@ pub struct Texture {
     pub cache_index: Arc<AtomicIndex>,
 }
 
-impl TypeUuidProvider for Texture {
-    fn type_uuid() -> Uuid {
-        uuid!("02c23a44-55fa-411a-bc39-eb7a5eadf15c")
-    }
-}
-
 impl ResourceData for Texture {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn std::error::Error>> {
         let color_type = match self.pixel_kind {
             TexturePixelKind::R8 => ColorType::L8,
@@ -409,6 +398,7 @@ impl Default for Texture {
 #[derive(
     Default, Copy, Clone, Deserialize, Serialize, Debug, Reflect, AsRefStr, EnumString, VariantNames,
 )]
+#[reflect(type_uuid = "8fa17c0e-6889-4540-b396-97db4dc952aa")]
 pub enum MipFilter {
     /// Simple nearest filter, it is the fastest filter available, but it produces noisy mip levels and
     /// in most cases it is not advised to use it. Consider its performance as 1x.
@@ -427,8 +417,6 @@ pub enum MipFilter {
     Lanczos,
 }
 
-uuid_provider!(MipFilter = "8fa17c0e-6889-4540-b396-97db4dc952aa");
-
 impl MipFilter {
     fn into_filter_type(self) -> fr::FilterType {
         match self {
@@ -459,6 +447,7 @@ impl MipFilter {
 /// )
 /// ```
 #[derive(Clone, Deserialize, Serialize, Debug, Reflect)]
+#[reflect(type_uuid = "c70e89c9-2245-4736-99d9-f3fe9c1c5d3c")]
 pub struct TextureImportOptions {
     #[serde(default)]
     pub(crate) minification_filter: TextureMinificationFilter,
@@ -876,9 +865,10 @@ impl TextureResourceExtension for TextureResource {
     AsRefStr,
     Visit,
     Eq,
+    Default,
 )]
 #[repr(u32)]
-#[derive(Default)]
+#[reflect(type_uuid = "824f5b6c-8957-42db-9ebc-ef2a5dece5ab")]
 pub enum TextureMagnificationFilter {
     /// Returns the value of the texture element that is nearest to the center of the pixel
     /// being textured.
@@ -890,8 +880,6 @@ pub enum TextureMagnificationFilter {
     Linear = 1,
 }
 
-uuid_provider!(TextureMagnificationFilter = "824f5b6c-8957-42db-9ebc-ef2a5dece5ab");
-
 /// The texture minifying function is used whenever the pixel being textured maps to an area
 /// greater than one texture element.
 #[derive(
@@ -909,9 +897,10 @@ uuid_provider!(TextureMagnificationFilter = "824f5b6c-8957-42db-9ebc-ef2a5dece5a
     AsRefStr,
     Visit,
     Eq,
+    Default,
 )]
 #[repr(u32)]
-#[derive(Default)]
+#[reflect(type_uuid = "0ec9e072-6d0a-47b2-a9c2-498cac4de22b")]
 pub enum TextureMinificationFilter {
     /// Returns the value of the texture element that is nearest to the center of the pixel
     /// being textured.
@@ -945,8 +934,6 @@ pub enum TextureMinificationFilter {
     LinearMipMapLinear = 5,
 }
 
-uuid_provider!(TextureMinificationFilter = "0ec9e072-6d0a-47b2-a9c2-498cac4de22b");
-
 impl TextureMinificationFilter {
     /// Returns true if minification filter is using mip mapping, false - otherwise.
     pub fn is_using_mip_mapping(self) -> bool {
@@ -976,9 +963,10 @@ impl TextureMinificationFilter {
     AsRefStr,
     Visit,
     Eq,
+    Default,
 )]
 #[repr(u32)]
-#[derive(Default)]
+#[reflect(type_uuid = "e360d139-4374-4323-a66d-d192809d9d87")]
 pub enum TextureWrapMode {
     /// Causes the integer part of a coordinate to be ignored; GPU uses only the fractional part,
     /// thereby creating a repeating pattern.
@@ -1004,23 +992,9 @@ pub enum TextureWrapMode {
     MirrorClampToEdge = 4,
 }
 
-uuid_provider!(TextureWrapMode = "e360d139-4374-4323-a66d-d192809d9d87");
-
 /// Texture kind defines pixel format of texture.
-#[derive(
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    Debug,
-    Reflect,
-    Visit,
-    AsRefStr,
-    EnumString,
-    VariantNames,
-    TypeUuidProvider,
-)]
-#[type_uuid(id = "dcca9b9c-dd1e-412c-922f-074703d35781")]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Reflect, Visit, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "dcca9b9c-dd1e-412c-922f-074703d35781")]
 #[repr(u32)]
 pub enum TexturePixelKind {
     /// 1 byte red.
@@ -1266,9 +1240,10 @@ fn ceil_div_4(x: u32) -> u32 {
     VariantNames,
     EnumString,
     AsRefStr,
+    Default,
 )]
 #[repr(u32)]
-#[derive(Default)]
+#[reflect(type_uuid = "fbdcc081-d0b8-4b62-9925-2de6c013fbf5")]
 pub enum CompressionOptions {
     /// An image will be stored without compression if it is not already compressed.
     #[default]
@@ -1289,8 +1264,6 @@ pub enum CompressionOptions {
     Quality = 2,
 }
 
-uuid_provider!(CompressionOptions = "fbdcc081-d0b8-4b62-9925-2de6c013fbf5");
-
 fn transmute_slice<T>(bytes: &[u8]) -> &'_ [T] {
     // SAFETY: This is absolutely safe because `image` crate's Rgb8/Rgba8/etc. and `tbc`s Rgb8/Rgba8/etc.
     // have exactly the same memory layout.
diff --git a/fyrox-texture/src/loader.rs b/fyrox-texture/src/loader.rs
index 22e331a11..40b4fde6a 100644
--- a/fyrox-texture/src/loader.rs
+++ b/fyrox-texture/src/loader.rs
@@ -21,7 +21,8 @@
 //! Texture loader.
 
 use crate::{Texture, TextureImportOptions};
-use fyrox_core::{uuid::Uuid, TypeUuidProvider};
+use fyrox_core::reflect::Reflect;
+use fyrox_core::uuid::Uuid;
 use fyrox_resource::{
     io::ResourceIo, loader::BoxedImportOptionsLoaderFuture, loader::BoxedLoaderFuture,
     loader::LoaderPayload, loader::ResourceLoader, options::try_get_import_settings,
@@ -43,7 +44,7 @@ impl ResourceLoader for TextureLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        Texture::type_uuid()
+        <Texture as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-ui/src/absm.rs b/fyrox-ui/src/absm.rs
index f4fd3fd90..98a1496a8 100644
--- a/fyrox-ui/src/absm.rs
+++ b/fyrox-ui/src/absm.rs
@@ -23,10 +23,7 @@
 
 use crate::{
     animation::{AnimationPlayer, AnimationPoseExt},
-    core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, variable::InheritableVariable,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, variable::InheritableVariable, visitor::prelude::*},
     define_widget_deref,
     message::{KeyCode, MouseButton, UiMessage},
     widget::{Widget, WidgetBuilder, WidgetMessage},
@@ -121,8 +118,8 @@ pub mod prelude {
 ///
 /// The node does **not** contain any animations, instead it just takes animations from an animation
 /// player node and mixes them.
-#[derive(Visit, Reflect, Clone, Debug, Default, TypeUuidProvider)]
-#[type_uuid(id = "4b08c753-2a10-41e3-8fb2-4fd0517e86bc")]
+#[derive(Visit, Reflect, Clone, Debug, Default)]
+#[reflect(type_uuid = "4b08c753-2a10-41e3-8fb2-4fd0517e86bc")]
 #[reflect(derived_type = "UiNode")]
 pub struct AnimationBlendingStateMachine {
     widget: Widget,
@@ -249,19 +246,8 @@ impl AnimationBlendingStateMachineBuilder {
     }
 }
 
-#[derive(
-    Visit,
-    Reflect,
-    Clone,
-    Debug,
-    Default,
-    PartialEq,
-    TypeUuidProvider,
-    AsRefStr,
-    EnumString,
-    VariantNames,
-)]
-#[type_uuid(id = "291e8734-47df-408e-8b2c-57bfb941d8ec")]
+#[derive(Visit, Reflect, Clone, Debug, Default, PartialEq, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "291e8734-47df-408e-8b2c-57bfb941d8ec")]
 pub enum EventKind {
     #[default]
     MouseEnter,
@@ -281,8 +267,8 @@ pub enum EventKind {
     DoubleTap,
 }
 
-#[derive(Visit, Reflect, Clone, Debug, Default, PartialEq, TypeUuidProvider)]
-#[type_uuid(id = "15f306b8-3bb8-4b35-87bd-6e9e5d748454")]
+#[derive(Visit, Reflect, Clone, Debug, Default, PartialEq)]
+#[reflect(type_uuid = "15f306b8-3bb8-4b35-87bd-6e9e5d748454")]
 pub struct EventAction {
     kind: EventKind,
     parameter_name: String,
@@ -290,8 +276,8 @@ pub struct EventAction {
 }
 
 /// A widget that listens for particular events and sets parameters in an ABSM accordingly.
-#[derive(Visit, Reflect, Clone, Debug, Default, TypeUuidProvider)]
-#[type_uuid(id = "15f306b8-3bb8-4b35-87bd-6e9e5d748455")]
+#[derive(Visit, Reflect, Clone, Debug, Default)]
+#[reflect(type_uuid = "15f306b8-3bb8-4b35-87bd-6e9e5d748455")]
 #[reflect(derived_type = "UiNode")]
 pub struct AbsmEventProvider {
     widget: Widget,
diff --git a/fyrox-ui/src/alignment.rs b/fyrox-ui/src/alignment.rs
index 1a3ecfb7f..1845a5262 100644
--- a/fyrox-ui/src/alignment.rs
+++ b/fyrox-ui/src/alignment.rs
@@ -22,7 +22,6 @@
 //! [`HorizontalAlignment`] and [`VerticalAlignment`]. Check the docs for them for more info.
 
 use crate::core::{reflect::prelude::*, visitor::prelude::*};
-use fyrox_core::uuid_provider;
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Horizontal alignment defines relative location and size of the widget to its parent widget along the horizontal
@@ -30,6 +29,7 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
 #[derive(
     Copy, Clone, PartialEq, Debug, Eq, Default, Reflect, Visit, AsRefStr, EnumString, VariantNames,
 )]
+#[reflect(type_uuid = "ef571515-ec16-47ad-bfe3-ddc259e2c7d3")]
 pub enum HorizontalAlignment {
     /// Tells the widget to take all available space along the horizontal axis and stay the left side of the
     /// parent widget. This is the default horizontal alignment for all widgets.
@@ -46,13 +46,12 @@ pub enum HorizontalAlignment {
     Right,
 }
 
-uuid_provider!(HorizontalAlignment = "ef571515-ec16-47ad-bfe3-ddc259e2c7d3");
-
 /// Horizontal alignment defines relative location and size of the widget to its parent widget along the vertical
 /// (Y) axis.
 #[derive(
     Copy, Clone, PartialEq, Debug, Eq, Default, Reflect, Visit, AsRefStr, EnumString, VariantNames,
 )]
+#[reflect(type_uuid = "8555dc0d-c9b7-4c49-816a-a7f610a6886d")]
 pub enum VerticalAlignment {
     /// Tells the widget to take all available space along the vertical axis and stay at the top side of the
     /// parent widget. This is the default vertical alignment for all widgets.
@@ -68,5 +67,3 @@ pub enum VerticalAlignment {
     /// possible (shrink-to-fit).
     Bottom,
 }
-
-uuid_provider!(VerticalAlignment = "8555dc0d-c9b7-4c49-816a-a7f610a6886d");
diff --git a/fyrox-ui/src/animation.rs b/fyrox-ui/src/animation.rs
index 9722997b1..32effeb9f 100644
--- a/fyrox-ui/src/animation.rs
+++ b/fyrox-ui/src/animation.rs
@@ -27,7 +27,6 @@ use crate::{
         log::{Log, MessageKind},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         variable::InheritableVariable,
         visitor::prelude::*,
     },
@@ -144,7 +143,10 @@ impl BoundValueCollectionExt for BoundValueCollection {
 /// The node could be a source of animations for animation blending state machines. To learn more about
 /// animations, see [`Animation`] docs.
 #[derive(Visit, Reflect, Clone, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "44d1c94e-354f-4f9a-b918-9d31c28aa16a"
+)]
 pub struct AnimationPlayer {
     widget: Widget,
     pub(crate) animations: InheritableVariable<AnimationContainer>,
@@ -215,12 +217,6 @@ impl AnimationPlayer {
     }
 }
 
-impl TypeUuidProvider for AnimationPlayer {
-    fn type_uuid() -> Uuid {
-        uuid!("44d1c94e-354f-4f9a-b918-9d31c28aa16a")
-    }
-}
-
 define_widget_deref!(AnimationPlayer);
 
 impl Control for AnimationPlayer {
diff --git a/fyrox-ui/src/bit.rs b/fyrox-ui/src/bit.rs
index c913f1cc6..49c812d1c 100644
--- a/fyrox-ui/src/bit.rs
+++ b/fyrox-ui/src/bit.rs
@@ -29,7 +29,6 @@ use crate::{
         num_traits::{Euclid, NumCast, One, Zero},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         uuid::uuid,
         visitor::prelude::*,
     },
@@ -71,7 +70,6 @@ pub trait BitContainer:
     + Reflect
     + Visit
     + Send
-    + TypeUuidProvider
     + 'static
 {
 }
@@ -92,7 +90,6 @@ impl<T> BitContainer for T where
         + Reflect
         + Visit
         + Send
-        + TypeUuidProvider
         + 'static
 {
 }
@@ -117,7 +114,10 @@ impl<T: BitContainer> ConstructorProvider<UiNode, UserInterface> for BitField<T>
 }
 
 #[derive(Default, Clone, Reflect, Visit, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "6c19b266-18be-46d2-bfd3-f1dc9cb3f36c"
+)]
 pub struct BitField<T>
 where
     T: BitContainer,
@@ -208,18 +208,6 @@ fn position_to_bit(position: Vector2<f32>, size: usize, width: f32) -> Option<us
     (0..size).find(|&i| bit_to_rect(i, byte_width).contains(position))
 }
 
-impl<T> TypeUuidProvider for BitField<T>
-where
-    T: BitContainer,
-{
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("6c19b266-18be-46d2-bfd3-f1dc9cb3f36c"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T> Control for BitField<T>
 where
     T: BitContainer,
diff --git a/fyrox-ui/src/border.rs b/fyrox-ui/src/border.rs
index fef63f258..194be02e5 100644
--- a/fyrox-ui/src/border.rs
+++ b/fyrox-ui/src/border.rs
@@ -26,7 +26,7 @@
 use crate::message::MessageData;
 use crate::{
     core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
+        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*,
         variable::InheritableVariable, visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
@@ -99,8 +99,8 @@ use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 /// .with_stroke_thickness(Thickness {left: 2.0, right: 2.0, top: 2.0, bottom: 2.0}.into())
 /// .build(&mut ui.build_ctx());
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "6aba3dc5-831d-481a-bc83-ec10b2b2bf12")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "6aba3dc5-831d-481a-bc83-ec10b2b2bf12")]
 #[reflect(derived_type = "UiNode")]
 pub struct Border {
     /// Base widget of the border. See [`Widget`] docs for more info.
diff --git a/fyrox-ui/src/brush.rs b/fyrox-ui/src/brush.rs
index 23ac084e2..37b9e5006 100644
--- a/fyrox-ui/src/brush.rs
+++ b/fyrox-ui/src/brush.rs
@@ -23,11 +23,11 @@
 #![warn(missing_docs)]
 
 use crate::core::{algebra::Vector2, color::Color, reflect::prelude::*, visitor::prelude::*};
-use fyrox_core::uuid_provider;
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Gradient point defines a point on a surface with a color.
 #[derive(Clone, Debug, PartialEq, Reflect, Visit, Default)]
+#[reflect(type_uuid = "e8503ec6-a1d0-4a9b-ab91-0d3f126254dd")]
 pub struct GradientPoint {
     /// A distance from the origin of the gradient.
     pub stop: f32,
@@ -35,10 +35,9 @@ pub struct GradientPoint {
     pub color: Color,
 }
 
-uuid_provider!(GradientPoint = "e8503ec6-a1d0-4a9b-ab91-0d3f126254dd");
-
 /// Brush defines a way to fill an arbitrary surface.
 #[derive(Clone, Debug, PartialEq, Reflect, Visit, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "eceb3805-73b6-47e0-8582-38a01f7b70e1")]
 pub enum Brush {
     /// A brush, that fills a surface with a solid color.
     Solid(Color),
@@ -80,8 +79,6 @@ impl From<Color> for Brush {
     }
 }
 
-uuid_provider!(Brush = "eceb3805-73b6-47e0-8582-38a01f7b70e1");
-
 impl Default for Brush {
     fn default() -> Self {
         Self::Solid(Color::WHITE)
diff --git a/fyrox-ui/src/build.rs b/fyrox-ui/src/build.rs
index 1fb29f207..bffa00051 100644
--- a/fyrox-ui/src/build.rs
+++ b/fyrox-ui/src/build.rs
@@ -45,7 +45,7 @@ use std::{
 /// ```rust
 /// # use fyrox_ui::{
 /// #     core::pool::Handle,
-/// #     core::{visitor::prelude::*, reflect::prelude::*, type_traits::prelude::*,},
+/// #     core::{visitor::prelude::*, reflect::prelude::*, },
 /// #     define_widget_deref,
 /// #     message::UiMessage,
 /// #     widget::{Widget, WidgetBuilder},
@@ -55,18 +55,16 @@ use std::{
 /// #     any::{Any, TypeId},
 /// #     ops::{Deref, DerefMut},
 /// # };
-/// # use fyrox_core::uuid_provider;
+/// #
 /// #
 /// #[derive(Clone, Visit, Reflect, Debug)]
-/// #[reflect(derived_type = "UiNode")]
+/// #[reflect(derived_type = "UiNode", type_uuid = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd")]
 /// struct MyWidget {
 ///     widget: Widget,
 /// }
 /// #
 /// # define_widget_deref!(MyWidget);
 /// #
-/// # uuid_provider!(MyWidget = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd");
-/// #
 /// # impl Control for MyWidget {
 /// #     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
 /// #         todo!()
diff --git a/fyrox-ui/src/button.rs b/fyrox-ui/src/button.rs
index 59e17bc84..7e75ffe65 100644
--- a/fyrox-ui/src/button.rs
+++ b/fyrox-ui/src/button.rs
@@ -26,10 +26,7 @@ use crate::message::MessageData;
 use crate::style::StyledProperty;
 use crate::{
     border::BorderBuilder,
-    core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, variable::InheritableVariable,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, variable::InheritableVariable, visitor::prelude::*},
     decorator::DecoratorBuilder,
     font::FontResource,
     message::{KeyCode, UiMessage},
@@ -93,8 +90,8 @@ impl MessageData for ButtonMessage {}
 ///     }
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "2abcf12b-2f19-46da-b900-ae8890f7c9c6")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "2abcf12b-2f19-46da-b900-ae8890f7c9c6")]
 #[reflect(derived_type = "UiNode")]
 pub struct Button {
     /// Base widget of the button.
diff --git a/fyrox-ui/src/canvas.rs b/fyrox-ui/src/canvas.rs
index 208f99b3e..28276108c 100644
--- a/fyrox-ui/src/canvas.rs
+++ b/fyrox-ui/src/canvas.rs
@@ -25,10 +25,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     message::UiMessage,
     widget::{Widget, WidgetBuilder},
     BuildContext, Control, UiNode, UserInterface,
@@ -69,8 +66,8 @@ use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 ///     .build(ctx)
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "6b843a36-53da-467b-b85e-2380fe891ca1")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "6b843a36-53da-467b-b85e-2380fe891ca1")]
 #[reflect(derived_type = "UiNode")]
 pub struct Canvas {
     /// Base widget of the canvas.
diff --git a/fyrox-ui/src/check_box.rs b/fyrox-ui/src/check_box.rs
index f62d47475..d4f4395b8 100644
--- a/fyrox-ui/src/check_box.rs
+++ b/fyrox-ui/src/check_box.rs
@@ -31,7 +31,6 @@ use crate::{
         color::Color,
         pool::{Handle, ObjectOrVariant},
         reflect::prelude::*,
-        type_traits::prelude::*,
         variable::InheritableVariable,
         visitor::prelude::*,
     },
@@ -149,8 +148,8 @@ impl MessageData for CheckBoxMessage {}
 /// 2) [`CheckBoxBuilder::with_check_mark`] - sets the widget that will be used as checked icon.
 /// 3) [`CheckBoxBuilder::with_uncheck_mark`] - sets the widget that will be used as unchecked icon.
 /// 4) [`CheckBoxBuilder::with_undefined_mark`] - sets the widget that will be used as undefined icon.
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "3a866ba8-7682-4ce7-954a-46360f5837dc")]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "3a866ba8-7682-4ce7-954a-46360f5837dc")]
 #[reflect(derived_type = "UiNode")]
 pub struct CheckBox {
     /// Base widget of the checkbox.
diff --git a/fyrox-ui/src/color/gradient.rs b/fyrox-ui/src/color/gradient.rs
index f85ab4856..295ca2cc3 100644
--- a/fyrox-ui/src/color/gradient.rs
+++ b/fyrox-ui/src/color/gradient.rs
@@ -29,7 +29,6 @@ use crate::{
         math::Rect,
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     define_widget_deref,
@@ -57,8 +56,8 @@ pub enum ColorGradientEditorMessage {
 }
 impl MessageData for ColorGradientEditorMessage {}
 
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "50d00eb7-f30b-4973-8a36-03d6b8f007ec")]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "50d00eb7-f30b-4973-8a36-03d6b8f007ec")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorGradientField {
     widget: Widget,
@@ -183,8 +182,8 @@ impl ColorGradientFieldBuilder {
     }
 }
 
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "82843d8b-1972-46e6-897c-9619b74059cc")]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "82843d8b-1972-46e6-897c-9619b74059cc")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorGradientEditor {
     widget: Widget,
@@ -470,8 +469,8 @@ pub enum ColorPointMessage {
 }
 impl MessageData for ColorPointMessage {}
 
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "a493a603-3451-4005-8c80-559707729e70")]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "a493a603-3451-4005-8c80-559707729e70")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorPoint {
     pub widget: Widget,
@@ -603,8 +602,8 @@ impl ColorPointBuilder {
     }
 }
 
-#[derive(Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "2608955a-4095-4fd1-af71-99bcdf2600f0")]
+#[derive(Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "2608955a-4095-4fd1-af71-99bcdf2600f0")]
 #[reflect(derived_type = "UiNode")]
 pub struct ColorPointsCanvas {
     widget: Widget,
diff --git a/fyrox-ui/src/color/mod.rs b/fyrox-ui/src/color/mod.rs
index d8e6b7082..da38737d2 100644
--- a/fyrox-ui/src/color/mod.rs
+++ b/fyrox-ui/src/color/mod.rs
@@ -44,7 +44,6 @@ use crate::message::MessageData;
 use crate::numeric::NumericUpDown;
 use crate::popup::Popup;
 use crate::text::Text;
-use fyrox_core::uuid_provider;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_material::MaterialResource;
 use std::{ops::Deref, sync::mpsc::Sender};
@@ -105,7 +104,10 @@ pub enum ColorFieldMessage {
 impl MessageData for ColorFieldMessage {}
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "956d4cae-7953-486b-99da-a9b852c2e144"
+)]
 pub struct AlphaBar {
     pub widget: Widget,
     pub orientation: Orientation,
@@ -248,8 +250,6 @@ pub fn draw_checker_board(
     );
 }
 
-uuid_provider!(AlphaBar = "956d4cae-7953-486b-99da-a9b852c2e144");
-
 impl Control for AlphaBar {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         let bounds = self.bounding_rect();
@@ -385,7 +385,10 @@ impl AlphaBarBuilder {
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "af28f977-85e7-4c9e-9a61-7f208844acb5"
+)]
 pub struct HueBar {
     pub widget: Widget,
     pub orientation: Orientation,
@@ -419,8 +422,6 @@ impl HueBar {
     }
 }
 
-uuid_provider!(HueBar = "af28f977-85e7-4c9e-9a61-7f208844acb5");
-
 impl Control for HueBar {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         let bounds = self.bounding_rect();
@@ -547,7 +548,10 @@ impl HueBarBuilder {
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "ab6bfad5-0c4b-42a5-8da5-fc5687b1afc7"
+)]
 pub struct SaturationBrightnessField {
     pub widget: Widget,
     pub is_picking: bool,
@@ -586,8 +590,6 @@ impl SaturationBrightnessField {
     }
 }
 
-uuid_provider!(SaturationBrightnessField = "ab6bfad5-0c4b-42a5-8da5-fc5687b1afc7");
-
 impl Control for SaturationBrightnessField {
     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
         let size = self.deref().arrange_override(ui, final_size);
@@ -763,7 +765,10 @@ impl SaturationBrightnessFieldBuilder {
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "b7a5d650-5b77-4938-83c1-37f3fe107885"
+)]
 pub struct ColorPicker {
     pub widget: Widget,
     pub hue_bar: Handle<HueBar>,
@@ -812,8 +817,6 @@ impl ColorPicker {
     }
 }
 
-uuid_provider!(ColorPicker = "b7a5d650-5b77-4938-83c1-37f3fe107885");
-
 impl Control for ColorPicker {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
@@ -1152,7 +1155,10 @@ impl ColorPickerBuilder {
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "68dec1ac-23c6-41df-bc85-499f2a82e908"
+)]
 pub struct ColorField {
     pub widget: Widget,
     pub popup: Handle<Popup>,
@@ -1175,8 +1181,6 @@ impl ConstructorProvider<UiNode, UserInterface> for ColorField {
 
 crate::define_widget_deref!(ColorField);
 
-uuid_provider!(ColorField = "68dec1ac-23c6-41df-bc85-499f2a82e908");
-
 impl Control for ColorField {
     fn on_remove(&self, sender: &Sender<UiMessage>) {
         // Popup won't be deleted with the color field, because it is not the child of the field.
diff --git a/fyrox-ui/src/control.rs b/fyrox-ui/src/control.rs
index 35d1fe020..e3c2374b5 100644
--- a/fyrox-ui/src/control.rs
+++ b/fyrox-ui/src/control.rs
@@ -19,7 +19,6 @@
 // SOFTWARE.
 
 use crate::{
-    core::TypeUuidProvider,
     core::{algebra::Vector2, pool::Handle, reflect::Reflect, uuid::Uuid, visitor::Visit},
     draw::DrawingContext,
     message::{OsEvent, UiMessage},
@@ -58,7 +57,7 @@ pub trait BaseControl: Send + ControlAsAny {
 
 impl<T> BaseControl for T
 where
-    T: Any + Clone + 'static + Control + TypeUuidProvider,
+    T: Any + Clone + 'static + Control,
 {
     fn clone_boxed(&self) -> Box<dyn Control> {
         Box::new(self.clone())
@@ -68,8 +67,9 @@ where
         std::any::type_name::<T>()
     }
 
+    // TODO: Remove this method, use `self.type_info_ref().type_uuid` instead.
     fn id(&self) -> Uuid {
-        Self::type_uuid()
+        <Self as Reflect>::type_info().type_uuid
     }
 
     fn self_size(&self) -> usize {
@@ -185,24 +185,23 @@ pub trait Control: BaseControl + Deref<Target = Widget> + DerefMut + Reflect + V
     /// ```rust
     /// # use fyrox_ui::{
     /// #     core::algebra::Vector2, define_widget_deref, message::UiMessage, Control, UserInterface,
-    /// #     core::{visitor::prelude::*, reflect::prelude::*, type_traits::prelude::*,},
+    /// #     core::{visitor::prelude::*, reflect::prelude::*, },
     /// #     widget::Widget, UiNode
     /// # };
     /// # use std::{
     /// #     any::{Any, TypeId},
     /// #     ops::{Deref, DerefMut},
     /// # };
-    /// # use fyrox_core::uuid_provider;
+    /// #
     /// # use fyrox_graph::SceneGraph;
     /// #
     /// #[derive(Clone, Visit, Reflect, Debug)]
-    /// #[reflect(derived_type = "UiNode")]
+    /// #[reflect(derived_type = "UiNode", type_uuid = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd")]
     /// struct MyWidget {
     ///     widget: Widget,
     /// }
     /// #
     /// # define_widget_deref!(MyWidget);
-    /// # uuid_provider!(MyWidget = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd");
     /// impl Control for MyWidget {
     ///     fn measure_override(
     ///         &self,
@@ -255,7 +254,7 @@ pub trait Control: BaseControl + Deref<Target = Widget> + DerefMut + Reflect + V
     /// ```rust
     /// # use fyrox_ui::{
     /// #     core::{algebra::Vector2, math::Rect},
-    /// #     core::{visitor::prelude::*, reflect::prelude::*, type_traits::prelude::*,},
+    /// #     core::{visitor::prelude::*, reflect::prelude::*, },
     /// #     define_widget_deref,
     /// #     message::UiMessage,
     /// #     Control, UserInterface, widget::Widget, UiNode
@@ -264,16 +263,15 @@ pub trait Control: BaseControl + Deref<Target = Widget> + DerefMut + Reflect + V
     /// #     any::{Any, TypeId},
     /// #     ops::{Deref, DerefMut},
     /// # };
-    /// # use fyrox_core::uuid_provider;
+    /// #
     /// #
     /// #[derive(Clone, Visit, Reflect, Debug)]
-    /// #[reflect(derived_type = "UiNode")]
+    /// #[reflect(derived_type = "UiNode", type_uuid = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd")]
     /// struct MyWidget {
     ///     widget: Widget,
     /// }
     /// #
     /// # define_widget_deref!(MyWidget);
-    /// # uuid_provider!(MyWidget = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd");
     /// impl Control for MyWidget {
     ///     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
     ///         let final_rect = Rect::new(0.0, 0.0, final_size.x, final_size.y);
@@ -314,7 +312,7 @@ pub trait Control: BaseControl + Deref<Target = Widget> + DerefMut + Reflect + V
     /// # use fyrox_ui::{
     /// #     define_widget_deref,
     /// #     draw::{CommandTexture, Draw, DrawingContext},
-    /// #     core::{visitor::prelude::*, reflect::prelude::*, type_traits::prelude::*,},
+    /// #     core::{visitor::prelude::*, reflect::prelude::*, },
     /// #     message::UiMessage,
     /// #     Control, UserInterface, widget::Widget, UiNode
     /// # };
@@ -322,16 +320,15 @@ pub trait Control: BaseControl + Deref<Target = Widget> + DerefMut + Reflect + V
     /// #     any::{Any, TypeId},
     /// #     ops::{Deref, DerefMut},
     /// # };
-    /// # use fyrox_core::uuid_provider;
+    /// #
     /// #
     /// #[derive(Clone, Visit, Reflect, Debug)]
-    /// #[reflect(derived_type = "UiNode")]
+    /// #[reflect(derived_type = "UiNode", type_uuid = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd")]
     /// struct MyWidget {
     ///     widget: Widget,
     /// }
     /// #
     /// # define_widget_deref!(MyWidget);
-    /// # uuid_provider!(MyWidget = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd");
     /// impl Control for MyWidget {
     /// fn draw(&self, drawing_context: &mut DrawingContext) {
     ///     let bounds = self.widget.bounding_rect();
diff --git a/fyrox-ui/src/curve/key.rs b/fyrox-ui/src/curve/key.rs
index 98886880d..9a59148ec 100644
--- a/fyrox-ui/src/curve/key.rs
+++ b/fyrox-ui/src/curve/key.rs
@@ -31,6 +31,7 @@ use crate::{
 use std::cmp::Ordering;
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "ae6110cd-f1dd-45b5-98e1-d8ae8bf3d0cc")]
 pub struct CurveKeyView {
     pub position: Vector2<f32>,
     pub kind: CurveKeyKind,
@@ -48,6 +49,7 @@ impl From<&CurveKey> for CurveKeyView {
 }
 
 #[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "866c6360-2c6a-4218-aebc-530036b59a87")]
 pub struct CurveKeyViewContainer {
     id: Uuid,
     pub brush: Brush,
diff --git a/fyrox-ui/src/curve/mod.rs b/fyrox-ui/src/curve/mod.rs
index 085daee19..630aa567d 100644
--- a/fyrox-ui/src/curve/mod.rs
+++ b/fyrox-ui/src/curve/mod.rs
@@ -34,8 +34,6 @@ use crate::{
         parking_lot::{MappedMutexGuard, Mutex, MutexGuard},
         pool::Handle,
         reflect::prelude::*,
-        type_traits::prelude::*,
-        uuid_provider,
         visitor::prelude::*,
         SafeLock,
     },
@@ -63,6 +61,7 @@ use std::{
     cell::{Cell, RefCell},
     sync::mpsc::Sender,
 };
+use uuid::Uuid;
 
 pub mod key;
 
@@ -102,6 +101,7 @@ impl MessageData for CurveEditorMessage {
 
 /// Highlight zone in values space.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect, Default)]
+#[reflect(type_uuid = "88052cf5-4ea5-4a2e-b81a-4aca85e74c55")]
 pub struct HighlightZone {
     pub rect: Rect<f32>,
     pub brush: Brush,
@@ -359,6 +359,7 @@ impl Iterator for StepIterator {
 }
 
 #[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "4b640057-639e-4f47-9a08-c08d94eca68e")]
 pub struct CurvesContainer {
     curves: Vec<CurveKeyViewContainer>,
 }
@@ -412,7 +413,10 @@ impl CurvesContainer {
 }
 
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5c7b087e-871e-498d-b064-187b604a37d8"
+)]
 pub struct CurveEditor {
     widget: Widget,
     background_curves: CurvesContainer,
@@ -468,6 +472,7 @@ impl ConstructorProvider<UiNode, UserInterface> for CurveEditor {
 crate::define_widget_deref!(CurveEditor);
 
 #[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "c81d942c-394d-498d-b460-1dc508288ed3")]
 struct ContextMenu {
     widget: RcUiNodeHandle,
     add_key: Handle<MenuItem>,
@@ -544,8 +549,6 @@ impl Selection {
     }
 }
 
-uuid_provider!(CurveEditor = "5c7b087e-871e-498d-b064-187b604a37d8");
-
 impl Control for CurveEditor {
     fn draw(&self, ctx: &mut DrawingContext) {
         self.curve_transform.set_bounds(self.screen_bounds());
diff --git a/fyrox-ui/src/decorator.rs b/fyrox-ui/src/decorator.rs
index 1f4f1343b..f63a55cbf 100644
--- a/fyrox-ui/src/decorator.rs
+++ b/fyrox-ui/src/decorator.rs
@@ -27,8 +27,8 @@ use crate::{
     border::{Border, BorderBuilder},
     brush::Brush,
     core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider,
-        variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, variable::InheritableVariable,
+        visitor::prelude::*,
     },
     draw::DrawingContext,
     message::{MessageData, UiMessage},
@@ -87,7 +87,10 @@ impl MessageData for DecoratorMessage {}
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "bb4b60aa-c657-4ed6-8db6-d7f374397c73"
+)]
 pub struct Decorator {
     /// Base widget of the decorator.
     pub border: Border,
@@ -134,8 +137,6 @@ impl DerefMut for Decorator {
     }
 }
 
-uuid_provider!(Decorator = "bb4b60aa-c657-4ed6-8db6-d7f374397c73");
-
 impl Control for Decorator {
     fn measure_override(&self, ui: &UserInterface, available_size: Vector2<f32>) -> Vector2<f32> {
         self.border.measure_override(ui, available_size)
diff --git a/fyrox-ui/src/dock/mod.rs b/fyrox-ui/src/dock/mod.rs
index 879ed1544..e481124e1 100644
--- a/fyrox-ui/src/dock/mod.rs
+++ b/fyrox-ui/src/dock/mod.rs
@@ -26,7 +26,7 @@
 //! for windows.
 
 use crate::{
-    core::{log::Log, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
+    core::{log::Log, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     dock::config::{DockingManagerLayoutDescriptor, FloatingWindowDescriptor, TileDescriptor},
     message::UiMessage,
     widget::{Widget, WidgetBuilder, WidgetMessage},
@@ -161,7 +161,10 @@ impl MessageData for DockingManagerMessage {}
 /// save the layout and use the returned layout descriptor when you need to restore the layout
 /// to its defaults.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "b04299f7-3f6b-45f1-89a6-0dce4ad929e1"
+)]
 pub struct DockingManager {
     pub widget: Widget,
     pub floating_windows: RefCell<Vec<Handle<Window>>>,
@@ -182,8 +185,6 @@ impl ConstructorProvider<UiNode, UserInterface> for DockingManager {
 
 crate::define_widget_deref!(DockingManager);
 
-uuid_provider!(DockingManager = "b04299f7-3f6b-45f1-89a6-0dce4ad929e1");
-
 impl Control for DockingManager {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/dock/tile.rs b/fyrox-ui/src/dock/tile.rs
index b332a1393..06f9cdcfd 100644
--- a/fyrox-ui/src/dock/tile.rs
+++ b/fyrox-ui/src/dock/tile.rs
@@ -23,7 +23,7 @@ use crate::{
     brush::Brush,
     core::{
         algebra::Vector2, color::Color, math::Rect, pool::Handle, reflect::prelude::*,
-        type_traits::prelude::*, visitor::prelude::*,
+        visitor::prelude::*,
     },
     dock::DockingManager,
     grid::{Column, GridBuilder, Row},
@@ -39,7 +39,6 @@ use crate::border::Border;
 use crate::message::MessageData;
 use core::f32;
 use fyrox_core::pool::{HandlesVecExtension, ObjectOrVariant};
-use fyrox_core::uuid_provider;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_graph::SceneGraph;
 use std::cell::Cell;
@@ -57,6 +56,7 @@ pub enum TileMessage {
 impl MessageData for TileMessage {}
 
 #[derive(Default, Debug, PartialEq, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "bed21184-6bfd-4af4-ba54-43eb9645f499")]
 pub enum TileContent {
     #[default]
     Empty,
@@ -257,7 +257,10 @@ fn deminimize_other_window(
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "8ed17fa9-890e-4dd7-b4f9-a24660882234"
+)]
 pub struct Tile {
     pub widget: Widget,
     pub left_anchor: Handle<Border>,
@@ -287,8 +290,6 @@ impl ConstructorProvider<UiNode, UserInterface> for Tile {
 
 crate::define_widget_deref!(Tile);
 
-uuid_provider!(Tile = "8ed17fa9-890e-4dd7-b4f9-a24660882234");
-
 impl Control for Tile {
     fn measure_override(
         &self,
diff --git a/fyrox-ui/src/dropdown_list.rs b/fyrox-ui/src/dropdown_list.rs
index 6b02c527a..d204937c0 100644
--- a/fyrox-ui/src/dropdown_list.rs
+++ b/fyrox-ui/src/dropdown_list.rs
@@ -27,8 +27,8 @@
 use crate::{
     border::BorderBuilder,
     core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider,
-        variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, variable::InheritableVariable,
+        visitor::prelude::*,
     },
     grid::{Column, Grid, GridBuilder, Row},
     list_view::{ListView, ListViewBuilder, ListViewMessage},
@@ -168,7 +168,10 @@ impl MessageData for DropdownListMessage {}
 /// A dropdown list could be opened and closed manually using [`DropdownListMessage::Open`] and
 /// [`DropdownListMessage::Close`] messages.  
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "1da2f69a-c8b4-4ae2-a2ad-4afe61ee2a32"
+)]
 pub struct DropdownList {
     /// Base widget of the dropdown list.
     pub widget: Widget,
@@ -203,8 +206,6 @@ impl ConstructorProvider<UiNode, UserInterface> for DropdownList {
 
 crate::define_widget_deref!(DropdownList);
 
-uuid_provider!(DropdownList = "1da2f69a-c8b4-4ae2-a2ad-4afe61ee2a32");
-
 impl Control for DropdownList {
     fn on_remove(&self, sender: &Sender<UiMessage>) {
         // Popup won't be deleted with the dropdown list, because it is not the child of the list.
diff --git a/fyrox-ui/src/dropdown_menu.rs b/fyrox-ui/src/dropdown_menu.rs
index 64300d457..1292c01db 100644
--- a/fyrox-ui/src/dropdown_menu.rs
+++ b/fyrox-ui/src/dropdown_menu.rs
@@ -23,7 +23,7 @@
 
 use crate::popup::Popup;
 use crate::{
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     message::{MouseButton, UiMessage},
     popup::{Placement, PopupBuilder, PopupMessage},
     widget::{Widget, WidgetBuilder, WidgetMessage},
@@ -34,8 +34,8 @@ use std::sync::mpsc::Sender;
 
 /// A simple widget that opens a popup when clicked. It could be used to create dropdown menus that
 /// consolidates content of a group.
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "c0a4c51b-f041-453b-a89d-7ceb5394e321")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "c0a4c51b-f041-453b-a89d-7ceb5394e321")]
 #[reflect(derived_type = "UiNode")]
 pub struct DropdownMenu {
     /// Base widget of the dropdown menu.
diff --git a/fyrox-ui/src/expander.rs b/fyrox-ui/src/expander.rs
index 0e2b9e6e7..c28435fb7 100644
--- a/fyrox-ui/src/expander.rs
+++ b/fyrox-ui/src/expander.rs
@@ -36,7 +36,7 @@ use crate::{
     BuildContext, Control, UiNode, UserInterface, VerticalAlignment,
 };
 use fyrox_core::pool::ObjectOrVariant;
-use fyrox_core::uuid_provider;
+
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 
@@ -152,7 +152,10 @@ impl MessageData for ExpanderMessage {}
 /// To switch expander state at runtime, send [`ExpanderMessage::Expand`] to your Expander widget instance with
 /// [`crate::message::MessageDirection::ToWidget`].
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "24976179-b338-4c55-84c3-72d21663efd2"
+)]
 pub struct Expander {
     /// Base widget of the expander.
     pub widget: Widget,
@@ -179,8 +182,6 @@ impl ConstructorProvider<UiNode, UserInterface> for Expander {
 
 crate::define_widget_deref!(Expander);
 
-uuid_provider!(Expander = "24976179-b338-4c55-84c3-72d21663efd2");
-
 impl Control for Expander {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         if let Some(&ExpanderMessage::Expand(expand)) = message.data_for(self.handle()) {
diff --git a/fyrox-ui/src/file_browser/dialog.rs b/fyrox-ui/src/file_browser/dialog.rs
index 839a4c3cb..965ae95d6 100644
--- a/fyrox-ui/src/file_browser/dialog.rs
+++ b/fyrox-ui/src/file_browser/dialog.rs
@@ -23,7 +23,7 @@ use crate::text_box::TextBox;
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
     control_trait_proxy_impls,
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     define_widget_deref_proxy,
     grid::{Column, GridBuilder, Row},
     message::{MessageData, UiMessage},
@@ -41,8 +41,8 @@ pub enum FolderNameDialogMessage {
 }
 impl MessageData for FolderNameDialogMessage {}
 
-#[derive(Clone, Visit, Reflect, Default, Debug, TypeUuidProvider)]
-#[type_uuid(id = "832f63b8-1372-49b8-8ce5-7564920343a8")]
+#[derive(Clone, Visit, Reflect, Default, Debug)]
+#[reflect(type_uuid = "832f63b8-1372-49b8-8ce5-7564920343a8")]
 #[reflect(derived_type = "UiNode")]
 pub struct FolderNameDialog {
     pub window: Window,
diff --git a/fyrox-ui/src/file_browser/field.rs b/fyrox-ui/src/file_browser/field.rs
index 43c8fad46..2da1caf04 100644
--- a/fyrox-ui/src/file_browser/field.rs
+++ b/fyrox-ui/src/file_browser/field.rs
@@ -23,7 +23,7 @@ use crate::file_browser::FileSelector;
 use crate::text_box::TextBox;
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
-    core::{pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     define_widget_deref,
     file_browser::{FileSelectorBuilder, FileSelectorMessage, FileSelectorMode},
     grid::{Column, GridBuilder, Row},
@@ -46,10 +46,11 @@ impl MessageData for FileSelectorFieldMessage {}
 
 define_widget_deref!(FileSelectorField);
 
-uuid_provider!(FileSelectorField = "2dbda730-8a60-4f62-aee8-2ff0ccd15bf2");
-
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "2dbda730-8a60-4f62-aee8-2ff0ccd15bf2"
+)]
 pub struct FileSelectorField {
     widget: Widget,
     path: PathBuf,
diff --git a/fyrox-ui/src/file_browser/filter.rs b/fyrox-ui/src/file_browser/filter.rs
index dcac7337c..055ae103a 100644
--- a/fyrox-ui/src/file_browser/filter.rs
+++ b/fyrox-ui/src/file_browser/filter.rs
@@ -28,6 +28,7 @@ use std::{
 };
 
 #[derive(Default, Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "0cdc330c-56cf-4bcd-97d9-9ea3abd743ef")]
 pub struct FileType {
     pub description: String,
     pub extension: String,
@@ -74,6 +75,7 @@ impl Display for FileType {
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "f59f99a0-d0f2-4e2c-a04f-d64928750169")]
 pub struct PathFilter {
     pub folders_only: bool,
     pub types: Vec<FileType>,
diff --git a/fyrox-ui/src/file_browser/menu.rs b/fyrox-ui/src/file_browser/menu.rs
index 5a2f67dcb..44629377f 100644
--- a/fyrox-ui/src/file_browser/menu.rs
+++ b/fyrox-ui/src/file_browser/menu.rs
@@ -21,10 +21,7 @@
 use crate::menu::MenuItem;
 use crate::messagebox::MessageBox;
 use crate::{
-    core::{
-        algebra::Vector2, log::Log, pool::Handle, reflect::prelude::*, uuid_provider,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, log::Log, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     draw::DrawingContext,
     file_browser::{
         dialog::{FolderNameDialog, FolderNameDialogMessage},
@@ -47,7 +44,10 @@ use std::{
 };
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "6a9d597f-6a9f-4bad-b569-4cff1a6deff7"
+)]
 pub struct ItemContextMenu {
     pub base_menu: ContextMenu,
     pub delete: Handle<MenuItem>,
@@ -70,8 +70,6 @@ impl DerefMut for ItemContextMenu {
     }
 }
 
-uuid_provider!(ItemContextMenu = "6a9d597f-6a9f-4bad-b569-4cff1a6deff7");
-
 impl Control for ItemContextMenu {
     fn on_remove(&self, sender: &Sender<UiMessage>) {
         self.base_menu.on_remove(sender)
diff --git a/fyrox-ui/src/file_browser/mod.rs b/fyrox-ui/src/file_browser/mod.rs
index f0a293e09..9be1d9354 100644
--- a/fyrox-ui/src/file_browser/mod.rs
+++ b/fyrox-ui/src/file_browser/mod.rs
@@ -27,8 +27,7 @@ use crate::{
     button::{ButtonBuilder, ButtonMessage},
     core::{
         err, log::Log, ok_or_continue, ok_or_return, parking_lot::Mutex, pool::Handle,
-        reflect::prelude::*, some_or_return, type_traits::prelude::*, visitor::prelude::*,
-        SafeLock,
+        reflect::prelude::*, some_or_return, visitor::prelude::*, SafeLock,
     },
     file_browser::{
         fs_tree::{sanitize_path, TreeItemPath},
@@ -101,8 +100,8 @@ enum FsEventMessage {
 }
 impl MessageData for FsEventMessage {}
 
-#[derive(Default, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "b7f4610e-4b0c-4671-9b4a-60bb45268928")]
+#[derive(Default, Visit, Reflect)]
+#[reflect(type_uuid = "b7f4610e-4b0c-4671-9b4a-60bb45268928")]
 #[reflect(derived_type = "UiNode")]
 pub struct FileBrowser {
     pub widget: Widget,
diff --git a/fyrox-ui/src/file_browser/selector.rs b/fyrox-ui/src/file_browser/selector.rs
index b484eba74..afc208886 100644
--- a/fyrox-ui/src/file_browser/selector.rs
+++ b/fyrox-ui/src/file_browser/selector.rs
@@ -26,9 +26,7 @@ use crate::text_box::TextBox;
 use crate::{
     border::BorderBuilder,
     button::{ButtonBuilder, ButtonMessage},
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     draw::DrawingContext,
     dropdown_list::{DropdownListBuilder, DropdownListMessage},
     file_browser::{FileBrowserBuilder, FileBrowserMessage, PathFilter},
@@ -53,6 +51,7 @@ use std::{
 };
 
 #[derive(Default, Clone, PartialEq, Eq, Hash, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "d7286bb8-5602-4c01-b537-ee53f2f6b482")]
 pub enum FileSelectorMode {
     #[default]
     Open,
@@ -75,7 +74,10 @@ impl MessageData for FileSelectorMessage {}
 /// File selector is a modal window that allows you to select a file (or directory) and commit or
 /// cancel selection.
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "878b2220-03e6-4a50-a97d-3a8e5397b6cb"
+)]
 pub struct FileSelector {
     pub window: Window,
     pub browser: Handle<FileBrowser>,
@@ -120,8 +122,6 @@ impl DerefMut for FileSelector {
     }
 }
 
-uuid_provider!(FileSelector = "878b2220-03e6-4a50-a97d-3a8e5397b6cb");
-
 fn extract_folder_path(path: &Path) -> Option<&Path> {
     if path.is_file() {
         path.parent()
diff --git a/fyrox-ui/src/font/loader.rs b/fyrox-ui/src/font/loader.rs
index f76573d04..798038365 100644
--- a/fyrox-ui/src/font/loader.rs
+++ b/fyrox-ui/src/font/loader.rs
@@ -21,7 +21,7 @@
 //! Font loader.
 
 use crate::{
-    core::{reflect::prelude::*, uuid::Uuid, TypeUuidProvider},
+    core::{reflect::prelude::*, uuid::Uuid},
     font::{Font, FontResource},
 };
 use fyrox_resource::{
@@ -43,6 +43,7 @@ fn default_page_size() -> usize {
 /// Options to control how a font is imported, allowing data to be included beyond
 /// what is stored in the font file.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Reflect, Eq)]
+#[reflect(type_uuid = "6d281c95-d4ac-4bc6-a1b2-2ff0515f6a21")]
 pub struct FontImportOptions {
     /// The size of each page of the atlas where glyphs are copied before they are rendered.
     /// Each page is a square `page_size` x `page_size` large, and no glyph may be so large
@@ -97,7 +98,7 @@ impl ResourceLoader for FontLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        Font::type_uuid()
+        <Font as Reflect>::type_info().type_uuid
     }
 
     fn default_import_options(&self) -> Option<Box<dyn BaseImportOptions>> {
diff --git a/fyrox-ui/src/font/mod.rs b/fyrox-ui/src/font/mod.rs
index cab608595..f0f6d3c31 100644
--- a/fyrox-ui/src/font/mod.rs
+++ b/fyrox-ui/src/font/mod.rs
@@ -25,13 +25,12 @@
 #![allow(clippy::unnecessary_to_owned)] // false-positive
 
 use crate::core::{
-    algebra::Vector2, rectpack::RectPacker, reflect::prelude::*, uuid::Uuid, uuid_provider,
-    visitor::prelude::*, TypeUuidProvider,
+    algebra::Vector2, rectpack::RectPacker, reflect::prelude::*, visitor::prelude::*,
 };
 use crate::font::loader::FontImportOptions;
 use fxhash::FxHashMap;
+use fyrox_core::err;
 use fyrox_core::math::Rect;
-use fyrox_core::{err, uuid};
 use fyrox_resource::manager::ResourceManager;
 use fyrox_resource::state::LoadError;
 use fyrox_resource::untyped::ResourceKind;
@@ -332,6 +331,7 @@ impl Atlas {
 
 /// A font resource and the associated data required for rendering glyphs from the font.
 #[derive(Default, Clone, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "692fec79-103a-483c-bb0b-9fc3a349cb48")]
 pub struct Font {
     /// The source font data, such as might come from a ttf file.
     #[reflect(hidden)]
@@ -361,13 +361,7 @@ pub struct Font {
     pub fallbacks: Vec<Option<FontResource>>,
 }
 
-uuid_provider!(Font = "692fec79-103a-483c-bb0b-9fc3a349cb48");
-
 impl ResourceData for Font {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, _path: &Path) -> Result<(), Box<dyn Error>> {
         Ok(())
     }
diff --git a/fyrox-ui/src/formatted_text.rs b/fyrox-ui/src/formatted_text.rs
index 25d7b08b2..baecda4b9 100644
--- a/fyrox-ui/src/formatted_text.rs
+++ b/fyrox-ui/src/formatted_text.rs
@@ -21,7 +21,7 @@
 use crate::{
     brush::Brush,
     core::{
-        algebra::Vector2, color::Color, log::Log, math::Rect, reflect::prelude::*, uuid_provider,
+        algebra::Vector2, color::Color, log::Log, math::Rect, reflect::prelude::*,
         variable::InheritableVariable, visitor::prelude::*,
     },
     font::{Font, FontGlyph, FontHeight, FontResource, BUILT_IN_FONT},
@@ -46,6 +46,7 @@ const ELLIPSIS: char = '…';
 
 /// Defines a position in the text. It is just a coordinates of a character in text.
 #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Default, Visit, Reflect)]
+#[reflect(type_uuid = "dcc6b193-e4e3-49a8-af7e-052cac80c9b2")]
 pub struct Position {
     /// Line index.
     pub line: usize,
@@ -119,6 +120,7 @@ impl TextLine {
     EnumString,
     VariantNames,
 )]
+#[reflect(type_uuid = "f1290ceb-3fee-461f-a1e9-f9450bd06805")]
 pub enum WrapMode {
     /// No wrapping needed.
     #[default]
@@ -131,8 +133,6 @@ pub enum WrapMode {
     Word,
 }
 
-uuid_provider!(WrapMode = "f1290ceb-3fee-461f-a1e9-f9450bd06805");
-
 struct GlyphMetrics<'a> {
     font: &'a mut Font,
     size: f32,
@@ -257,6 +257,7 @@ impl LineSink for WrapSink<'_> {
 }
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "a48f1f1d-24ce-4a84-a45d-706ac541cf0a")]
 pub struct FormattedText {
     font: InheritableVariable<Option<FontResource>>,
     pub text: InheritableVariable<Vec<char>>,
diff --git a/fyrox-ui/src/formatted_text/run.rs b/fyrox-ui/src/formatted_text/run.rs
index 3f6b4cece..d64295cb1 100644
--- a/fyrox-ui/src/formatted_text/run.rs
+++ b/fyrox-ui/src/formatted_text/run.rs
@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-use crate::core::type_traits::prelude::*;
+use crate::core::reflect::prelude::*;
 use crate::font::FontHeight;
 use std::ops::{Deref, DerefMut};
 
@@ -28,6 +28,7 @@ use super::*;
 pub type RunBuilder = Run;
 
 #[derive(Clone, PartialEq, Debug, Default, Reflect)]
+#[reflect(type_uuid = "dcce83ff-8bd4-4157-8e44-987696103252")]
 pub struct RunSet(Vec<Run>);
 
 impl IntoIterator for RunSet {
@@ -151,8 +152,8 @@ impl RunSet {
 }
 
 /// The style of a portion of text within a range.
-#[derive(Clone, PartialEq, Debug, Default, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "f0e5cc5d-0b82-4d6f-a505-12f890ffe7ea")]
+#[derive(Clone, PartialEq, Debug, Default, Visit, Reflect)]
+#[reflect(type_uuid = "f0e5cc5d-0b82-4d6f-a505-12f890ffe7ea")]
 pub struct Run {
     /// The range of characters that this run applies to within the text.
     pub range: Range<u32>,
diff --git a/fyrox-ui/src/grid.rs b/fyrox-ui/src/grid.rs
index 6b0b047c9..7ed68b666 100644
--- a/fyrox-ui/src/grid.rs
+++ b/fyrox-ui/src/grid.rs
@@ -25,7 +25,7 @@
 
 use crate::{
     core::{
-        algebra::Vector2, log::Log, math::Rect, pool::Handle, reflect::prelude::*, uuid_provider,
+        algebra::Vector2, log::Log, math::Rect, pool::Handle, reflect::prelude::*,
         variable::InheritableVariable, visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
@@ -59,6 +59,7 @@ impl MessageData for GridMessage {}
 #[derive(
     Clone, Copy, PartialEq, Eq, Debug, Reflect, Visit, Default, AsRefStr, EnumString, VariantNames,
 )]
+#[reflect(type_uuid = "9c5dfbce-5df2-4a7f-8c57-c4473743a718")]
 pub enum SizeMode {
     /// The desired size of this dimension must be provided in advance,
     /// and it will always be rendered with exactly that size, regardless of what nodes it contains.
@@ -73,10 +74,9 @@ pub enum SizeMode {
     Stretch,
 }
 
-uuid_provider!(SizeMode = "9c5dfbce-5df2-4a7f-8c57-c4473743a718");
-
 /// Grid dimension defines sizing rules and constraints for [`Grid`]'s rows and columns.
 #[derive(Clone, Copy, PartialEq, Debug, Reflect, Visit, Default)]
+#[reflect(type_uuid = "5e894900-c14a-4eb6-acb9-1636efead4b4")]
 pub struct GridDimension {
     /// Current size mode of the dimension.
     pub size_mode: SizeMode,
@@ -100,8 +100,6 @@ pub struct GridDimension {
     unmeasured_node_count: usize,
 }
 
-uuid_provider!(GridDimension = "5e894900-c14a-4eb6-acb9-1636efead4b4");
-
 impl GridDimension {
     /// Generic constructor for [`GridDimension`].
     pub fn generic(size_mode: SizeMode, desired_size: f32) -> Self {
@@ -220,7 +218,10 @@ pub type Row = GridDimension;
 /// in it to be valid. For example, you can add a column and set it to a specific size via strict to provide spacing between
 /// two other columns.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "98ce15e2-bd62-497d-a37b-9b1cb4a1918c"
+)]
 pub struct Grid {
     /// Base widget of the grid.
     pub widget: Widget,
@@ -401,8 +402,6 @@ fn arrange_dims(dims: &mut [GridDimension], final_size: f32) {
     }
 }
 
-uuid_provider!(Grid = "98ce15e2-bd62-497d-a37b-9b1cb4a1918c");
-
 impl Grid {
     fn initialize_measure(&self, ui: &UserInterface) {
         self.calc_needed_measurements(ui);
diff --git a/fyrox-ui/src/image.rs b/fyrox-ui/src/image.rs
index 4197e371b..2c7539343 100644
--- a/fyrox-ui/src/image.rs
+++ b/fyrox-ui/src/image.rs
@@ -28,7 +28,7 @@ use crate::{
     color::draw_checker_board,
     core::{
         algebra::Vector2, color::Color, math::Rect, pool::Handle, reflect::prelude::*,
-        type_traits::prelude::*, variable::InheritableVariable, visitor::prelude::*,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
     message::UiMessage,
@@ -157,8 +157,8 @@ impl MessageData for ImageMessage {}
 /// It is useful if you have many custom UI elements packed in a single texture atlas. Drawing using atlases is much more
 /// efficient and faster. This could also be used for animations when you have multiple frames packed in a single atlas
 /// and changing texture coordinates over time.
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "18e18d0f-cb84-4ac1-8050-3480a2ec3de5")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "18e18d0f-cb84-4ac1-8050-3480a2ec3de5")]
 #[visit(optional)]
 #[reflect(derived_type = "UiNode")]
 pub struct Image {
diff --git a/fyrox-ui/src/input.rs b/fyrox-ui/src/input.rs
index d7f686c5d..2006053e6 100644
--- a/fyrox-ui/src/input.rs
+++ b/fyrox-ui/src/input.rs
@@ -26,8 +26,8 @@ use crate::{
     button::{Button, ButtonBuilder, ButtonMessage},
     control_trait_proxy_impls,
     core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, pool::Handle, reflect::prelude::*, variable::InheritableVariable,
+        visitor::prelude::*,
     },
     formatted_text::WrapMode,
     grid::{Column, GridBuilder, Row},
@@ -88,8 +88,8 @@ pub enum InputBoxResult {
 /// There's no way to change the style of the input box, nor add some widgets to it. If you need a
 /// custom input box, then you need to create your own widget. This input box is meant to be used as
 /// a standard dialog box for standard situations in the UI.
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "6b7b6b82-939b-4f98-9bb9-9bd19ce68b21")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "6b7b6b82-939b-4f98-9bb9-9bd19ce68b21")]
 #[reflect(derived_type = "UiNode")]
 pub struct InputBox {
     /// Base window of the input box.
diff --git a/fyrox-ui/src/inspector/editors/array.rs b/fyrox-ui/src/inspector/editors/array.rs
index 6d49239f9..bc929f166 100644
--- a/fyrox-ui/src/inspector/editors/array.rs
+++ b/fyrox-ui/src/inspector/editors/array.rs
@@ -19,9 +19,7 @@
 // SOFTWARE.
 
 use crate::{
-    core::{
-        pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*, PhantomDataSendSync,
-    },
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*, PhantomDataSendSync},
     inspector::{
         editors::{
             PropertyEditorBuildContext, PropertyEditorDefinition,
@@ -44,6 +42,7 @@ use std::sync::Arc;
 use std::{any::TypeId, fmt::Debug};
 
 #[derive(Clone, Debug, PartialEq, Visit, Reflect, Default)]
+#[reflect(type_uuid = "5c6e4785-8e2d-441f-8478-523900394b93")]
 pub struct Item {
     pub editor_instance: PropertyEditorInstance,
 }
@@ -55,7 +54,10 @@ pub enum ArrayEditorMessage {
 impl MessageData for ArrayEditorMessage {}
 
 #[derive(Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5c6e4785-8e2d-441f-8478-523900394b93"
+)]
 pub struct ArrayEditor {
     pub widget: Widget,
     pub items: Vec<Item>,
@@ -63,8 +65,6 @@ pub struct ArrayEditor {
 
 crate::define_widget_deref!(ArrayEditor);
 
-uuid_provider!(ArrayEditor = "5c6e4785-8e2d-441f-8478-523900394b93");
-
 impl Control for ArrayEditor {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/inspector/editors/collection.rs b/fyrox-ui/src/inspector/editors/collection.rs
index c54333b7d..c134a7785 100644
--- a/fyrox-ui/src/inspector/editors/collection.rs
+++ b/fyrox-ui/src/inspector/editors/collection.rs
@@ -21,8 +21,7 @@
 use crate::{
     button::{Button, ButtonMessage},
     core::{
-        color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*, PhantomDataSendSync,
+        color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*, PhantomDataSendSync,
     },
     grid::{Column, GridBuilder, Row},
     inspector::{
@@ -52,17 +51,21 @@ use std::{
 };
 
 #[derive(Clone, Debug, PartialEq, Default, Visit, Reflect)]
+#[reflect(type_uuid = "88d3a376-37db-4dbb-bdaf-794f82970690")]
 pub struct Item {
     editor_instance: PropertyEditorInstance,
     remove: Handle<Button>,
 }
 
-pub trait CollectionItem: Clone + Reflect + Default + TypeUuidProvider + Send + 'static {}
+pub trait CollectionItem: Clone + Reflect + Default + Send + 'static {}
 
-impl<T> CollectionItem for T where T: Clone + Reflect + Default + TypeUuidProvider + Send + 'static {}
+impl<T> CollectionItem for T where T: Clone + Reflect + Default + Send + 'static {}
 
 #[derive(Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "316b0319-f8ee-4b63-9ed9-3f59a857e2bc"
+)]
 pub struct CollectionEditor<T: CollectionItem> {
     pub widget: Widget,
     pub add: Handle<Button>,
@@ -110,15 +113,6 @@ pub enum CollectionEditorMessage {
 }
 impl MessageData for CollectionEditorMessage {}
 
-impl<T: CollectionItem> TypeUuidProvider for CollectionEditor<T> {
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("316b0319-f8ee-4b63-9ed9-3f59a857e2bc"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T: CollectionItem> Control for CollectionEditor<T> {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/inspector/editors/enumeration.rs b/fyrox-ui/src/inspector/editors/enumeration.rs
index add3afcdd..742d9e86f 100644
--- a/fyrox-ui/src/inspector/editors/enumeration.rs
+++ b/fyrox-ui/src/inspector/editors/enumeration.rs
@@ -19,14 +19,7 @@
 // SOFTWARE.
 
 use crate::{
-    core::{
-        combine_uuids,
-        pool::Handle,
-        reflect::{prelude::*, Reflect},
-        uuid::{uuid, Uuid},
-        visitor::prelude::*,
-        TypeUuidProvider,
-    },
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     dropdown_list::{DropdownList, DropdownListBuilder, DropdownListMessage},
     inspector::{
         editors::{
@@ -55,9 +48,9 @@ use strum::VariantNames;
 
 const LOCAL_SYNC_FLAG: u64 = 0xFF;
 
-pub trait InspectableEnum: Debug + Reflect + Clone + TypeUuidProvider + Send + 'static {}
+pub trait InspectableEnum: Debug + Reflect + Clone + Send + 'static {}
 
-impl<T: Debug + Reflect + Clone + TypeUuidProvider + Send + 'static> InspectableEnum for T {}
+impl<T: Debug + Reflect + Clone + Send + 'static> InspectableEnum for T {}
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum EnumPropertyEditorMessage {
@@ -67,7 +60,10 @@ pub enum EnumPropertyEditorMessage {
 impl MessageData for EnumPropertyEditorMessage {}
 
 #[derive(Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "0dbefddc-70fa-45a9-96f0-8fe25f6c1669"
+)]
 pub struct EnumPropertyEditor<T: InspectableEnum> {
     pub widget: Widget,
     pub variant_selector: Handle<UiNode>,
@@ -140,18 +136,6 @@ impl<T: InspectableEnum> DerefMut for EnumPropertyEditor<T> {
     }
 }
 
-impl<T> TypeUuidProvider for EnumPropertyEditor<T>
-where
-    T: InspectableEnum,
-{
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("0dbefddc-70fa-45a9-96f0-8fe25f6c1669"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T: InspectableEnum> Control for EnumPropertyEditor<T> {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/inspector/editors/inherit.rs b/fyrox-ui/src/inspector/editors/inherit.rs
index 04480ade2..8e51cc540 100644
--- a/fyrox-ui/src/inspector/editors/inherit.rs
+++ b/fyrox-ui/src/inspector/editors/inherit.rs
@@ -24,8 +24,8 @@
 use crate::{
     button::{Button, ButtonBuilder, ButtonMessage},
     core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, variable::InheritableVariable,
-        visitor::prelude::*, PhantomDataSendSync,
+        pool::Handle, reflect::prelude::*, variable::InheritableVariable, visitor::prelude::*,
+        PhantomDataSendSync,
     },
     define_widget_deref,
     grid::{Column, GridBuilder, Row},
@@ -60,8 +60,8 @@ pub enum InheritablePropertyEditorMessage {
 }
 impl MessageData for InheritablePropertyEditorMessage {}
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "d5dce72c-a54b-4754-96a3-2e923eaa802f")]
+#[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "d5dce72c-a54b-4754-96a3-2e923eaa802f")]
 #[reflect(derived_type = "UiNode")]
 pub struct InheritablePropertyEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/inspector/editors/mod.rs b/fyrox-ui/src/inspector/editors/mod.rs
index ce99df9a8..58d6e3e1c 100644
--- a/fyrox-ui/src/inspector/editors/mod.rs
+++ b/fyrox-ui/src/inspector/editors/mod.rs
@@ -265,6 +265,7 @@ pub struct PropertyEditorTranslationContext<'b, 'c> {
 /// A widget handle that is to act as an editor in an [Inspector](crate::inspector::Inspector), with or without
 /// a custom container widget to show the name of the property that is being edited.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "b5ab90da-6934-46e5-9fb2-5225c101c4fa")]
 pub enum PropertyEditorInstance {
     /// A property editor that is to be given a default container, which is just a label to the left
     /// of the editor to show the name of the property being edited.
diff --git a/fyrox-ui/src/inspector/editors/style.rs b/fyrox-ui/src/inspector/editors/style.rs
index 7484b3121..20b2b5a57 100644
--- a/fyrox-ui/src/inspector/editors/style.rs
+++ b/fyrox-ui/src/inspector/editors/style.rs
@@ -28,8 +28,8 @@ use crate::window::WindowAlignment;
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
     core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*,
-        ImmutableString, PhantomDataSendSync,
+        pool::Handle, reflect::prelude::*, visitor::prelude::*, ImmutableString,
+        PhantomDataSendSync,
     },
     define_widget_deref,
     draw::DrawingContext,
@@ -77,8 +77,8 @@ pub enum StyledPropertyEditorMessage {
 }
 impl MessageData for StyledPropertyEditorMessage {}
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "3a863a0f-7414-44f5-a7aa-7a6668a6d406")]
+#[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "3a863a0f-7414-44f5-a7aa-7a6668a6d406")]
 #[reflect(derived_type = "UiNode")]
 pub struct StyledPropertySelector {
     window: Window,
@@ -308,8 +308,8 @@ impl StyledPropertySelectorBuilder {
     }
 }
 
-#[derive(Debug, Clone, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "1b8fb74a-3911-4b44-bb71-1a0382ebb9a7")]
+#[derive(Debug, Clone, Visit, Reflect)]
+#[reflect(type_uuid = "1b8fb74a-3911-4b44-bb71-1a0382ebb9a7")]
 #[reflect(derived_type = "UiNode")]
 pub struct StyledPropertyEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/inspector/editors/texture_slice.rs b/fyrox-ui/src/inspector/editors/texture_slice.rs
index 106367563..2c8cc0b03 100644
--- a/fyrox-ui/src/inspector/editors/texture_slice.rs
+++ b/fyrox-ui/src/inspector/editors/texture_slice.rs
@@ -30,7 +30,6 @@ use crate::{
         pool::Handle,
         reflect::prelude::*,
         some_or_return,
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
@@ -85,8 +84,8 @@ struct DragContext {
     texture_region: Rect<u32>,
 }
 
-#[derive(Clone, Reflect, Visit, TypeUuidProvider, Debug)]
-#[type_uuid(id = "bd89b59f-13be-4804-bd9c-ed40cfd48b92")]
+#[derive(Clone, Reflect, Visit, Debug)]
+#[reflect(type_uuid = "bd89b59f-13be-4804-bd9c-ed40cfd48b92")]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureSliceEditor {
     widget: Widget,
@@ -471,8 +470,8 @@ impl TextureSliceEditorBuilder {
     }
 }
 
-#[derive(Clone, Reflect, Visit, TypeUuidProvider, Debug)]
-#[type_uuid(id = "0293081d-55fd-4aa2-a06e-d53fba1a2617")]
+#[derive(Clone, Reflect, Visit, Debug)]
+#[reflect(type_uuid = "0293081d-55fd-4aa2-a06e-d53fba1a2617")]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureSliceEditorWindow {
     window: Window,
@@ -695,8 +694,8 @@ impl TextureSliceEditorWindowBuilder {
     }
 }
 
-#[derive(Clone, Reflect, Visit, TypeUuidProvider, Debug)]
-#[type_uuid(id = "024f3a3a-6784-4675-bd99-a4c6c19a8d91")]
+#[derive(Clone, Reflect, Visit, Debug)]
+#[reflect(type_uuid = "024f3a3a-6784-4675-bd99-a4c6c19a8d91")]
 #[reflect(derived_type = "UiNode")]
 pub struct TextureSliceFieldEditor {
     widget: Widget,
diff --git a/fyrox-ui/src/inspector/mod.rs b/fyrox-ui/src/inspector/mod.rs
index e90bf1fc2..bb2daecc7 100644
--- a/fyrox-ui/src/inspector/mod.rs
+++ b/fyrox-ui/src/inspector/mod.rs
@@ -31,7 +31,6 @@ use crate::{
         log::Log,
         pool::{Handle, ObjectOrVariant},
         reflect::{prelude::*, CastError, Reflect},
-        uuid_provider,
         visitor::prelude::*,
     },
     expander::ExpanderBuilder,
@@ -456,28 +455,25 @@ pub trait InspectorEnvironment: Send + Sync + Reflect {
 /// # };
 /// # use std::sync::Arc;
 /// # use strum_macros::{AsRefStr, EnumString, VariantNames};
-/// # use fyrox_core::uuid_provider;
 /// # use fyrox_ui::inspector::{Inspector, InspectorContextArgs};
 ///
 /// #[derive(Reflect, Debug, Clone)]
+/// #[reflect(type_uuid = "391b9424-8fe2-4525-a98e-3c930487fcf1")]
 /// struct MyObject {
 ///     foo: String,
 ///     bar: u32,
 ///     stuff: MyEnum,
 /// }
 ///
-/// uuid_provider!(MyObject = "391b9424-8fe2-4525-a98e-3c930487fcf1");
-///
 /// // Enumeration requires a bit more traits to be implemented. It must provide a way to turn
 /// // enum into a string.
 /// #[derive(Reflect, Debug, Clone, AsRefStr, EnumString, VariantNames)]
+/// #[reflect(type_uuid = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd")]
 /// enum MyEnum {
 ///     SomeVariant,
 ///     YetAnotherVariant { baz: f32 },
 /// }
 ///
-/// uuid_provider!(MyEnum = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd");
-///
 /// fn create_inspector(ctx: &mut BuildContext) -> Handle<Inspector> {
 ///     // Initialize an object first.
 ///     let my_object = MyObject {
@@ -516,7 +512,10 @@ pub trait InspectorEnvironment: Send + Sync + Reflect {
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "c599c0f5-f749-4033-afed-1a9949c937a1"
+)]
 pub struct Inspector {
     pub widget: Widget,
     #[reflect(hidden)]
@@ -1390,8 +1389,6 @@ impl InspectorContext {
     }
 }
 
-uuid_provider!(Inspector = "c599c0f5-f749-4033-afed-1a9949c937a1");
-
 impl Control for Inspector {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/key.rs b/fyrox-ui/src/key.rs
index 8a07bc7bc..678ae8630 100644
--- a/fyrox-ui/src/key.rs
+++ b/fyrox-ui/src/key.rs
@@ -35,7 +35,6 @@ use crate::{
     widget::{Widget, WidgetBuilder, WidgetMessage},
     BuildContext, Control, UiNode, UserInterface,
 };
-use fyrox_core::uuid_provider;
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use serde::{Deserialize, Serialize};
@@ -43,6 +42,7 @@ use std::fmt::{Display, Formatter};
 
 /// Hot key is a combination of a key code with an arbitrary set of keyboard modifiers (such as Ctrl, Shift, Alt keys).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Reflect, Default, Visit)]
+#[reflect(type_uuid = "ce03ca6f-078a-42bb-98ac-232f5427da2a")]
 pub enum HotKey {
     /// Unset hot key. Does nothing. This is the default value.
     #[default]
@@ -188,7 +188,10 @@ impl MessageData for HotKeyEditorMessage {}
 ///
 /// Use [`HotKeyEditorMessage`] message to alternate the state of a hot key widget, or to listen to its changes.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "7bc49843-1302-4e36-b901-63af5cea6c60"
+)]
 pub struct HotKeyEditor {
     widget: Widget,
     text: InheritableVariable<Handle<Text>>,
@@ -223,8 +226,6 @@ impl HotKeyEditor {
     }
 }
 
-uuid_provider!(HotKeyEditor = "7bc49843-1302-4e36-b901-63af5cea6c60");
-
 impl Control for HotKeyEditor {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         // Make background clickable.
@@ -330,6 +331,7 @@ impl HotKeyEditorBuilder {
 /// Key binding is a simplified version of [`HotKey`] that consists of a single physical key code. It is usually
 /// used for "unconditional" (independent of modifier keys state) triggering of some action.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize, Reflect, Visit, Default)]
+#[reflect(type_uuid = "c27da844-b57f-4e29-93b8-2426c981f7e4")]
 pub enum KeyBinding {
     /// Unset key binding. Does nothing.
     #[default]
@@ -397,7 +399,10 @@ impl MessageData for KeyBindingEditorMessage {}
 ///
 /// Use [`KeyBindingEditorMessage`] message to alternate the state of a key binding widget, or to listen to its changes.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "150113ce-f95e-4c76-9ac9-4503e78b960f"
+)]
 pub struct KeyBindingEditor {
     widget: Widget,
     text: InheritableVariable<Handle<Text>>,
@@ -434,8 +439,6 @@ impl KeyBindingEditor {
     }
 }
 
-uuid_provider!(KeyBindingEditor = "150113ce-f95e-4c76-9ac9-4503e78b960f");
-
 impl Control for KeyBindingEditor {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         // Make background clickable.
diff --git a/fyrox-ui/src/lib.rs b/fyrox-ui/src/lib.rs
index c7e970a11..ac6c51748 100644
--- a/fyrox-ui/src/lib.rs
+++ b/fyrox-ui/src/lib.rs
@@ -309,9 +309,8 @@ use crate::{
         pool::{Handle, ObjectOrVariant, Pool, Ticket},
         reflect::prelude::*,
         uuid::{uuid, Uuid},
-        uuid_provider,
         visitor::prelude::*,
-        SafeLock, TypeUuidProvider,
+        SafeLock,
     },
     draw::{CommandTexture, Draw, DrawingContext},
     font::{FontResource, BUILT_IN_FONT},
@@ -366,6 +365,7 @@ pub use node::*;
 pub use thickness::*;
 
 #[derive(Default, Clone, Reflect, Debug)]
+#[reflect(type_uuid = "1eb64a98-295d-46ed-8fca-ba06e80eec6a")]
 pub(crate) struct RcUiNodeHandleInner {
     handle: Handle<UiNode>,
     #[reflect(hidden)]
@@ -407,8 +407,8 @@ impl Drop for RcUiNodeHandleInner {
 /// Reference counted handle to a widget. It is used to automatically destroy the widget it points
 /// to when the reference counter reaches zero. Its main usage in the library is to store handles
 /// to context menus that could be shared across multiple widgets.
-#[derive(Clone, Default, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "9111a53b-05dc-4c75-aab1-71d5b1c93311")]
+#[derive(Clone, Default, Visit, Reflect)]
+#[reflect(type_uuid = "9111a53b-05dc-4c75-aab1-71d5b1c93311")]
 pub struct RcUiNodeHandle(Arc<Mutex<RcUiNodeHandleInner>>);
 
 impl Debug for RcUiNodeHandle {
@@ -466,6 +466,7 @@ impl RcUiNodeHandle {
     EnumString,
     VariantNames,
 )]
+#[reflect(type_uuid = "1c6ad1b0-3f4c-48be-87dd-6929cb3577bf")]
 pub enum Orientation {
     /// Vertical orientation. This is default value.
     #[default]
@@ -474,8 +475,6 @@ pub enum Orientation {
     Horizontal,
 }
 
-uuid_provider!(Orientation = "1c6ad1b0-3f4c-48be-87dd-6929cb3577bf");
-
 #[derive(Default, Clone)]
 pub struct NodeStatistics(pub FxHashMap<&'static str, isize>);
 
@@ -531,6 +530,7 @@ impl NodeStatistics {
 }
 
 #[derive(Visit, Reflect, Debug, Clone)]
+#[reflect(type_uuid = "9f9d5633-1568-4611-8709-3eeb615b7c0f")]
 pub struct DragContext {
     pub is_dragging: bool,
     pub drag_node: Handle<UiNode>,
@@ -550,6 +550,7 @@ impl Default for DragContext {
 }
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Visit, Reflect)]
+#[reflect(type_uuid = "46ffe412-b7d9-41c9-b56a-3bcacdaf33b2")]
 pub struct MouseState {
     pub left: ButtonState,
     pub right: ButtonState,
@@ -568,6 +569,7 @@ impl Default for MouseState {
 }
 
 #[derive(Copy, Clone, Visit, Reflect, Debug, Default)]
+#[reflect(type_uuid = "2f1add9c-5019-4922-9045-0bd5ca2fd63a")]
 pub struct RestrictionEntry {
     /// Handle to UI node to which picking must be restricted to.
     pub handle: Handle<UiNode>,
@@ -619,6 +621,7 @@ pub enum LayoutEvent {
 }
 
 #[derive(Clone, Debug, Visit, Reflect, Default)]
+#[reflect(type_uuid = "30bc5bc5-6592-48d8-8647-9bdbbb977ffb")]
 struct DoubleClickEntry {
     timer: f32,
     click_count: u32,
@@ -679,6 +682,7 @@ pub struct UiUpdateSwitches {
 pub type WidgetPool = Pool<UiNode, WidgetContainer>;
 
 #[derive(Default, Debug, Clone, Reflect, Visit)]
+#[reflect(type_uuid = "b426e937-4050-4539-8041-ade4222539c8")]
 pub enum RenderMode {
     /// The UI will be re-rendered on every frame. This is the default behavior.
     #[default]
@@ -690,6 +694,7 @@ pub enum RenderMode {
 }
 
 #[derive(Reflect)]
+#[reflect(type_uuid = "0d065c93-ef9c-4dd2-9fe7-e2b33c1a21b6")]
 pub struct UserInterface {
     screen_size: Vector2<f32>,
     nodes: WidgetPool,
@@ -746,7 +751,7 @@ pub struct UserInterface {
 }
 
 impl Reflect for &'static mut UserInterface {
-    blank_reflect_ref!();
+    blank_reflect_ref!("7ce82d16-d0ed-4d1b-b61e-b389e3d84c8a");
 }
 
 impl Debug for UserInterface {
@@ -3912,13 +3917,7 @@ fn transform_size(transform_space_bounds: Vector2<f32>, matrix: &Matrix3<f32>) -
     Vector2::new(w, h)
 }
 
-uuid_provider!(UserInterface = "0d065c93-ef9c-4dd2-9fe7-e2b33c1a21b6");
-
 impl ResourceData for UserInterface {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         self.save(path)?;
         Ok(())
diff --git a/fyrox-ui/src/list_view.rs b/fyrox-ui/src/list_view.rs
index 26d4675e3..3e9d4b4ee 100644
--- a/fyrox-ui/src/list_view.rs
+++ b/fyrox-ui/src/list_view.rs
@@ -27,8 +27,8 @@ use crate::{
     border::BorderBuilder,
     brush::Brush,
     core::{
-        color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
-        variable::InheritableVariable, visitor::prelude::*,
+        color::Color, pool::Handle, reflect::prelude::*, variable::InheritableVariable,
+        visitor::prelude::*,
     },
     decorator::{Decorator, DecoratorMessage},
     draw::{CommandTexture, Draw, DrawingContext},
@@ -235,7 +235,10 @@ impl ListViewMessage {
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
 #[visit(optional)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5832a643-5bf9-4d84-8358-b4c45bb440e8"
+)]
 pub struct ListView {
     /// Base widget of the list view.
     pub widget: Widget,
@@ -323,7 +326,10 @@ impl ListView {
 
 /// A wrapper for list view items, that is used to add selection functionality to arbitrary items.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "02f21415-5843-42f5-a3e4-b4a21e7739ad"
+)]
 pub struct ListViewItem {
     /// Base widget of the list view item.
     pub widget: Widget,
@@ -346,8 +352,6 @@ impl ConstructorProvider<UiNode, UserInterface> for ListViewItem {
 
 crate::define_widget_deref!(ListViewItem);
 
-uuid_provider!(ListViewItem = "02f21415-5843-42f5-a3e4-b4a21e7739ad");
-
 impl Control for ListViewItem {
     fn draw(&self, drawing_context: &mut DrawingContext) {
         // Emit transparent geometry so item container can be picked by hit test.
@@ -397,8 +401,6 @@ impl Control for ListViewItem {
     }
 }
 
-uuid_provider!(ListView = "5832a643-5bf9-4d84-8358-b4c45bb440e8");
-
 impl Control for ListView {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/loader.rs b/fyrox-ui/src/loader.rs
index 4867837a8..44faf5f04 100644
--- a/fyrox-ui/src/loader.rs
+++ b/fyrox-ui/src/loader.rs
@@ -21,11 +21,9 @@
 //! User Interface loader.
 
 use crate::constructor::WidgetConstructorContainer;
-use crate::{
-    core::{uuid::Uuid, TypeUuidProvider},
-    UserInterface,
-};
+use crate::{core::uuid::Uuid, UserInterface};
 use fyrox_core::dyntype::DynTypeConstructorContainer;
+use fyrox_core::reflect::Reflect;
 use fyrox_resource::{
     io::ResourceIo,
     loader::{BoxedLoaderFuture, LoaderPayload, ResourceLoader},
@@ -51,7 +49,7 @@ impl ResourceLoader for UserInterfaceLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        UserInterface::type_uuid()
+        <UserInterface as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-ui/src/matrix.rs b/fyrox-ui/src/matrix.rs
index 9525ba282..ca171d594 100644
--- a/fyrox-ui/src/matrix.rs
+++ b/fyrox-ui/src/matrix.rs
@@ -19,9 +19,7 @@
 // SOFTWARE.
 
 use crate::{
-    core::{
-        num_traits, pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*,
-    },
+    core::{num_traits, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     grid::{Column, GridBuilder, Row},
     message::{MessageDirection, UiMessage},
     numeric::{NumericType, NumericUpDownBuilder, NumericUpDownMessage},
@@ -76,7 +74,10 @@ where
 impl<const R: usize, const C: usize, T: NumericType> MessageData for MatrixEditorMessage<R, C, T> {}
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "9f05427a-5862-4574-bb21-ebaf52aa8c72"
+)]
 pub struct MatrixEditor<const R: usize, const C: usize, T>
 where
     T: NumericType,
@@ -133,23 +134,6 @@ where
     }
 }
 
-impl<const R: usize, const C: usize, T: NumericType> TypeUuidProvider for MatrixEditor<R, C, T> {
-    fn type_uuid() -> Uuid {
-        let r_id = Uuid::from_u64_pair(R as u64, R as u64);
-        let c_id = Uuid::from_u64_pair(C as u64, C as u64);
-        combine_uuids(
-            c_id,
-            combine_uuids(
-                r_id,
-                combine_uuids(
-                    uuid!("9f05427a-5862-4574-bb21-ebaf52aa8c72"),
-                    T::type_uuid(),
-                ),
-            ),
-        )
-    }
-}
-
 impl<const R: usize, const C: usize, T> Control for MatrixEditor<R, C, T>
 where
     T: NumericType,
diff --git a/fyrox-ui/src/menu.rs b/fyrox-ui/src/menu.rs
index 1febe0221..465641e80 100644
--- a/fyrox-ui/src/menu.rs
+++ b/fyrox-ui/src/menu.rs
@@ -31,8 +31,8 @@ use crate::{
     brush::Brush,
     control_trait_proxy_impls,
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, variable::InheritableVariable, visitor::prelude::*,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*,
+        variable::InheritableVariable, visitor::prelude::*,
     },
     decorator::{DecoratorBuilder, DecoratorMessage},
     grid::{Column, GridBuilder, Row},
@@ -198,7 +198,10 @@ impl MessageData for MenuItemMessage {}
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "582a04f3-a7fd-4e70-bbd1-eb95e2275b75"
+)]
 pub struct Menu {
     widget: Widget,
     active: bool,
@@ -222,8 +225,6 @@ impl ConstructorProvider<UiNode, UserInterface> for Menu {
 
 crate::define_widget_deref!(Menu);
 
-uuid_provider!(Menu = "582a04f3-a7fd-4e70-bbd1-eb95e2275b75");
-
 impl Control for Menu {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
@@ -326,6 +327,7 @@ impl Control for Menu {
 
 /// A set of possible placements of a popup with items of a menu item.
 #[derive(Copy, Clone, PartialOrd, PartialEq, Eq, Hash, Visit, Reflect, Default, Debug)]
+#[reflect(type_uuid = "667bb0c3-9f55-4850-bb19-b9fdf3f8d27b")]
 pub enum MenuItemPlacement {
     /// Bottom placement.
     Bottom,
@@ -335,6 +337,7 @@ pub enum MenuItemPlacement {
 }
 
 #[derive(Copy, Clone, PartialOrd, PartialEq, Eq, Hash, Visit, Reflect, Default, Debug)]
+#[reflect(type_uuid = "667bb0c3-9f55-4850-bb19-b9fdf3f8d27b")]
 enum NavigationDirection {
     #[default]
     Horizontal,
@@ -343,6 +346,7 @@ enum NavigationDirection {
 
 #[derive(Default, Clone, Debug, Visit, Reflect)]
 #[doc(hidden)]
+#[reflect(type_uuid = "667bb0c3-9f55-4850-bb19-b9fdf3f8d27b")]
 pub struct ItemsContainer {
     #[doc(hidden)]
     pub items: InheritableVariable<Vec<Handle<MenuItem>>>,
@@ -408,7 +412,10 @@ impl ItemsContainer {
 /// Menu item is a widget with arbitrary content, that has a "floating" panel (popup) for sub-items if the menu item. This was menu items can form
 /// arbitrary hierarchies. See [`Menu`] docs for examples.
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "72e002c6-6060-4583-b5b7-0c5500244fef"
+)]
 pub struct MenuItem {
     /// Base widget of the menu item.
     pub widget: Widget,
@@ -524,8 +531,6 @@ fn is_any_menu_item_contains_point(ui: &UserInterface, pt: Vector2<f32>) -> bool
     false
 }
 
-uuid_provider!(MenuItem = "72e002c6-6060-4583-b5b7-0c5500244fef");
-
 impl Control for MenuItem {
     fn on_remove(&self, sender: &Sender<UiMessage>) {
         // Popup won't be deleted with the menu item, because it is not the child of the item.
@@ -846,6 +851,7 @@ impl MenuBuilder {
 /// Allows you to set a content of a menu item either from a pre-built "layout" with icon/text/shortcut/arrow or a custom
 /// widget.
 #[derive(Clone, Debug, Visit, Reflect, PartialEq)]
+#[reflect(type_uuid = "eb2b6aa9-a626-4410-af1a-18e71359cbfa")]
 pub enum MenuItemContent {
     /// Quick-n-dirty way of building elements. It can cover most use cases - it builds classic menu item:
     ///
@@ -1134,9 +1140,11 @@ impl MenuItemBuilder {
 
 /// A simple wrapper over [`Popup`] widget, that holds the sub-items of a menu item and provides
 /// an ability for keyboard navigation.
-#[derive(Default, Clone, Debug, Visit, Reflect, TypeUuidProvider)]
-#[type_uuid(id = "ad8e9e76-c213-4232-9bab-80ebcabd69fa")]
-#[reflect(derived_type = "UiNode")]
+#[derive(Default, Clone, Debug, Visit, Reflect)]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "ad8e9e76-c213-4232-9bab-80ebcabd69fa"
+)]
 pub struct ContextMenu {
     /// Inner popup widget of the context menu.
     pub popup: Popup,
diff --git a/fyrox-ui/src/message.rs b/fyrox-ui/src/message.rs
index f98a8051b..be09291c3 100644
--- a/fyrox-ui/src/message.rs
+++ b/fyrox-ui/src/message.rs
@@ -28,7 +28,6 @@ use crate::{
     UiNode, UserInterface,
 };
 use fyrox_core::pool::ObjectOrVariant;
-use fyrox_core::uuid_provider;
 use serde::{Deserialize, Serialize};
 use std::{any::Any, cell::Cell, fmt::Debug};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
@@ -523,6 +522,7 @@ impl UiMessage {
 
 /// Mouse button state.
 #[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy, Visit, Reflect)]
+#[reflect(type_uuid = "520d4eae-6772-4037-bff2-23a591a761ee")]
 pub enum ButtonState {
     /// Pressed state.
     Pressed,
@@ -532,6 +532,7 @@ pub enum ButtonState {
 
 /// A set of possible mouse buttons.
 #[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy, Default, Visit, Reflect)]
+#[reflect(type_uuid = "3e3097b4-5845-439f-8926-91850ee376da")]
 pub enum MouseButton {
     /// Left mouse button.
     #[default]
@@ -550,6 +551,7 @@ pub enum MouseButton {
 
 /// A set of possible touch phases
 #[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy, Visit, Reflect)]
+#[reflect(type_uuid = "cae97887-4afd-4259-a572-e79e56fe43db")]
 pub enum TouchPhase {
     /// Touch started
     Started,
@@ -563,6 +565,7 @@ pub enum TouchPhase {
 
 /// Describes the force of a touch event
 #[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy, Visit, Reflect)]
+#[reflect(type_uuid = "037e4017-1d9d-4f82-a545-7e13444c7f1f")]
 pub enum Force {
     /// On iOS, the force is calibrated so that the same number corresponds to
     /// roughly the same amount of pressure on the screen regardless of the
@@ -677,6 +680,7 @@ pub enum OsEvent {
     Reflect,
     Visit,
 )]
+#[reflect(type_uuid = "ccd546cc-aa63-4be7-b41c-476fa38cb1d3")]
 pub struct KeyboardModifiers {
     /// `Alt` key is pressed.
     pub alt: bool,
@@ -717,6 +721,7 @@ impl KeyboardModifiers {
 )]
 #[repr(u32)]
 #[allow(missing_docs)]
+#[reflect(type_uuid = "45face46-97f2-4f3c-88a0-3a96d8c06105")]
 pub enum KeyCode {
     /// This variant is used when the key cannot be translated to any other variant.
     #[default]
@@ -1318,6 +1323,7 @@ impl TryFrom<char> for KeyCode {
     EnumString,
     VariantNames,
 )]
+#[reflect(type_uuid = "da7f3a5f-9d26-460a-8e46-38da25f8a8db")]
 pub enum CursorIcon {
     /// The platform-dependent default cursor. Often rendered as arrow.
     #[default]
@@ -1446,5 +1452,3 @@ pub enum CursorIcon {
     /// magnifying glass with a "-" in the center of the glass.
     ZoomOut,
 }
-
-uuid_provider!(CursorIcon = "da7f3a5f-9d26-460a-8e46-38da25f8a8db");
diff --git a/fyrox-ui/src/messagebox.rs b/fyrox-ui/src/messagebox.rs
index d60cdbbf2..95523698f 100644
--- a/fyrox-ui/src/messagebox.rs
+++ b/fyrox-ui/src/messagebox.rs
@@ -43,7 +43,6 @@ use crate::button::Button;
 use crate::message::MessageData;
 use crate::text::Text;
 use crate::window::WindowAlignment;
-use fyrox_core::uuid_provider;
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use std::ops::{Deref, DerefMut};
@@ -81,6 +80,7 @@ pub enum MessageBoxResult {
 
 /// A fixed set of possible buttons in a message box.
 #[derive(Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Hash, Debug, Visit, Reflect, Default)]
+#[reflect(type_uuid = "2fb9021b-148a-45cd-9602-8197acbab47a")]
 pub enum MessageBoxButtons {
     /// Only `Ok` button. It is typically used to show a message with the results of some finished action.
     #[default]
@@ -164,7 +164,10 @@ pub enum MessageBoxButtons {
 /// There's no way to change the style of the message box, nor add some widgets to it. If you need a custom message box, then you
 /// need to create your own widget. This message box is meant to be used as a standard dialog box for standard situations in the UI.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "b14c0012-4383-45cf-b9a1-231415d95373"
+)]
 pub struct MessageBox {
     /// Base window of the message box.
     pub window: Window,
@@ -209,8 +212,6 @@ impl DerefMut for MessageBox {
     }
 }
 
-uuid_provider!(MessageBox = "b14c0012-4383-45cf-b9a1-231415d95373");
-
 // Message box extends Window widget so it delegates most of the calls
 //  to the inner window.
 impl Control for MessageBox {
diff --git a/fyrox-ui/src/navigation.rs b/fyrox-ui/src/navigation.rs
index 2222749f4..d1021af65 100644
--- a/fyrox-ui/src/navigation.rs
+++ b/fyrox-ui/src/navigation.rs
@@ -24,10 +24,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, variable::InheritableVariable,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, variable::InheritableVariable, visitor::prelude::*},
     message::{KeyCode, UiMessage},
     scroll_viewer::{ScrollViewer, ScrollViewerMessage},
     widget::{Widget, WidgetBuilder, WidgetMessage},
@@ -77,8 +74,8 @@ use fyrox_graph::SceneGraph;
 ///
 /// This example shows how to create a simple confirmation dialog, that allows a user to use Tab key
 /// to cycle from one button to another. A focused button then can be "clicked" using Enter key.
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "135d347b-5019-4743-906c-6df5c295a3be")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "135d347b-5019-4743-906c-6df5c295a3be")]
 #[reflect(derived_type = "UiNode")]
 pub struct NavigationLayer {
     /// Base widget of the navigation layer.
diff --git a/fyrox-ui/src/nine_patch.rs b/fyrox-ui/src/nine_patch.rs
index 569874252..8311968c3 100644
--- a/fyrox-ui/src/nine_patch.rs
+++ b/fyrox-ui/src/nine_patch.rs
@@ -22,8 +22,7 @@ use crate::{
     brush::Brush,
     core::{
         algebra::Vector2, color::Color, math::Rect, pool::Handle, reflect::prelude::*,
-        some_or_return, type_traits::prelude::*, variable::InheritableVariable,
-        visitor::prelude::*,
+        some_or_return, variable::InheritableVariable, visitor::prelude::*,
     },
     draw::{CommandTexture, Draw, DrawingContext},
     message::{compare_and_set, UiMessage},
@@ -55,9 +54,8 @@ use strum_macros::{AsRefStr, EnumString, VariantNames};
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
-#[type_uuid(id = "c5bb0a5c-6581-45f7-899c-78aa1da8b659")]
+#[reflect(type_uuid = "c5bb0a5c-6581-45f7-899c-78aa1da8b659")]
 pub enum StretchMode {
     /// Stretches middle sections of the widget. Could lead to distorted image.
     #[default]
@@ -82,6 +80,7 @@ impl MessageData for NinePatchMessage {}
 /// A texture slice that defines a region in a texture and margins that will be used to split the
 /// section in nine pieces.
 #[derive(Default, Clone, Visit, Reflect, Debug, PartialEq)]
+#[reflect(type_uuid = "e1ea4fee-f138-47d2-9770-c088b6c7d86e")]
 pub struct TextureSlice {
     /// Texture of the slice. This field is used only for editing purposes in the UI. Can be [`None`]
     /// if no editing is needed.
@@ -158,8 +157,8 @@ impl TextureSlice {
 ///         .build(&mut ui.build_ctx())
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
-#[type_uuid(id = "c345033e-8c10-4186-b101-43f73b85981d")]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "c345033e-8c10-4186-b101-43f73b85981d")]
 #[reflect(derived_type = "UiNode")]
 pub struct NinePatch {
     pub widget: Widget,
diff --git a/fyrox-ui/src/node/container.rs b/fyrox-ui/src/node/container.rs
index 40f3cd9ff..249a07d22 100644
--- a/fyrox-ui/src/node/container.rs
+++ b/fyrox-ui/src/node/container.rs
@@ -36,6 +36,7 @@ use fyrox_core::visitor::error::VisitError;
 /// A wrapper for widget pool record that allows to define custom visit method to have full
 /// control over instantiation process at deserialization.
 #[derive(Debug, Clone, Default, Reflect)]
+#[reflect(type_uuid = "8d572e59-9594-435d-844f-c78cd7696744")]
 pub struct WidgetContainer(Option<UiNode>);
 
 fn read_widget(name: &str, visitor: &mut Visitor) -> Result<UiNode, VisitError> {
diff --git a/fyrox-ui/src/node/mod.rs b/fyrox-ui/src/node/mod.rs
index d6dd9702d..5029b6a0d 100644
--- a/fyrox-ui/src/node/mod.rs
+++ b/fyrox-ui/src/node/mod.rs
@@ -21,10 +21,7 @@
 //! UI node is a type-agnostic wrapper for any widget type. See [`UiNode`] docs for more info.
 
 use crate::{
-    core::{
-        pool::Handle, reflect::prelude::*, uuid_provider, variable, visitor::prelude::*,
-        NameProvider,
-    },
+    core::{pool::Handle, reflect::prelude::*, variable, visitor::prelude::*, NameProvider},
     widget::Widget,
     Control, ControlAsAny, UserInterface,
 };
@@ -47,6 +44,7 @@ pub mod container;
 /// casting, field fetching, etc. You could also be interested in [`Control`] docs, since it
 /// contains all the interesting stuff and detailed description for each method.
 #[derive(Reflect)]
+#[reflect(type_uuid = "d9b45ecc-91b0-40ea-a92a-4a7dee4667c9")]
 pub struct UiNode(#[reflect(deref, display_name = "UiNode")] pub Box<dyn Control>);
 
 impl<T: Control> From<T> for UiNode {
@@ -55,8 +53,6 @@ impl<T: Control> From<T> for UiNode {
     }
 }
 
-uuid_provider!(UiNode = "d9b45ecc-91b0-40ea-a92a-4a7dee4667c9");
-
 impl Clone for UiNode {
     #[inline]
     fn clone(&self) -> Self {
@@ -156,7 +152,7 @@ impl UiNode {
     /// # use fyrox_ui::{
     /// #     core::pool::Handle,
     /// #     define_widget_deref,
-    /// #     core::{visitor::prelude::*, reflect::prelude::*, type_traits::prelude::*,},
+    /// #     core::{visitor::prelude::*, reflect::prelude::*, },
     /// #     message::UiMessage,
     /// #     widget::{Widget, WidgetBuilder},
     /// #     BuildContext, Control, UiNode, UserInterface,
@@ -165,18 +161,16 @@ impl UiNode {
     /// #     any::{Any, TypeId},
     /// #     ops::{Deref, DerefMut},
     /// # };
-    /// # use fyrox_core::uuid_provider;
+    /// #
     /// #
     /// #[derive(Clone, Visit, Reflect, Debug)]
-    /// #[reflect(derived_type = "UiNode")]
+    /// #[reflect(derived_type = "UiNode", type_uuid = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd")]
     /// struct MyWidget {
     ///     widget: Widget,
     /// }
     /// #
     /// # define_widget_deref!(MyWidget);
     /// #
-    /// # uuid_provider!(MyWidget = "a93ec1b5-e7c8-4919-ac19-687d8c99f6bd");
-    /// #
     /// # impl Control for MyWidget {
     /// #     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
     /// #         todo!()
diff --git a/fyrox-ui/src/numeric.rs b/fyrox-ui/src/numeric.rs
index 4d2fd2612..850473946 100644
--- a/fyrox-ui/src/numeric.rs
+++ b/fyrox-ui/src/numeric.rs
@@ -31,7 +31,6 @@ use crate::{
         num_traits::{clamp, Bounded, NumAssign, NumCast, NumOps},
         pool::Handle,
         reflect::{prelude::*, Reflect},
-        type_traits::prelude::*,
         visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
@@ -75,7 +74,6 @@ pub trait NumericType:
     + Default
     + Reflect
     + Visit
-    + TypeUuidProvider
     + 'static
 {
 }
@@ -96,7 +94,6 @@ impl<T> NumericType for T where
         + Default
         + Reflect
         + Visit
-        + TypeUuidProvider
         + 'static
 {
 }
@@ -237,7 +234,10 @@ pub enum DragContext<T: NumericType> {
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "f852eda4-18e5-4480-83ae-a607ce1c26f7"
+)]
 pub struct NumericUpDown<T: NumericType> {
     /// Base widget of the [`NumericUpDown`] widget.
     pub widget: Widget,
@@ -397,18 +397,6 @@ fn calculate_value_by_offset<T: NumericType>(
     new_value
 }
 
-impl<T> TypeUuidProvider for NumericUpDown<T>
-where
-    T: NumericType,
-{
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("f852eda4-18e5-4480-83ae-a607ce1c26f7"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T: NumericType> Control for NumericUpDown<T> {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/path.rs b/fyrox-ui/src/path.rs
index da28df6e9..59ab3bd83 100644
--- a/fyrox-ui/src/path.rs
+++ b/fyrox-ui/src/path.rs
@@ -28,10 +28,7 @@ use crate::file_browser::{FileSelector, PathFilter};
 use crate::text_box::TextBox;
 use crate::{
     button::{ButtonBuilder, ButtonMessage},
-    core::{
-        pool::Handle, reflect::prelude::*, uuid_provider, variable::InheritableVariable,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, variable::InheritableVariable, visitor::prelude::*},
     file_browser::{FileSelectorBuilder, FileSelectorMessage},
     grid::{Column, GridBuilder, Row},
     message::{MessageData, UiMessage},
@@ -75,7 +72,10 @@ impl MessageData for PathEditorMessage {}
 /// To receive the changes, listen to [`PathEditorMessage::Path`] and check for its direction, it should be [`crate::message::MessageDirection::FromWidget`].
 /// To set a new path value, send [`PathEditorMessage::Path`] message, but with [`crate::message::MessageDirection::ToWidget`].
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "51cfe7ec-ec31-4354-9578-047004b213a1"
+)]
 pub struct PathEditor {
     /// Base widget of the editor.
     pub widget: Widget,
@@ -106,8 +106,6 @@ impl ConstructorProvider<UiNode, UserInterface> for PathEditor {
 
 crate::define_widget_deref!(PathEditor);
 
-uuid_provider!(PathEditor = "51cfe7ec-ec31-4354-9578-047004b213a1");
-
 impl Control for PathEditor {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/popup.rs b/fyrox-ui/src/popup.rs
index 94d12af9f..9ab85d794 100644
--- a/fyrox-ui/src/popup.rs
+++ b/fyrox-ui/src/popup.rs
@@ -27,7 +27,7 @@ use crate::message::MessageData;
 use crate::{
     border::BorderBuilder,
     core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, uuid_provider,
+        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*,
         variable::InheritableVariable, visitor::prelude::*,
     },
     message::{ButtonState, KeyCode, OsEvent, UiMessage},
@@ -69,6 +69,7 @@ impl MessageData for PopupMessage {
 
 /// Defines a method of popup placement.
 #[derive(Copy, Clone, PartialEq, Debug, Visit, Reflect)]
+#[reflect(type_uuid = "1c641540-59eb-4ccd-a090-2173dab02245")]
 pub enum Placement {
     /// A popup should be placed relative to given widget at the left top corner of the widget screen bounds.
     /// Widget handle could be [`Handle::NONE`], in this case the popup will be placed at the left top corner of the screen.
@@ -288,6 +289,7 @@ impl Placement {
 /// etc. To enable this option, use [`PopupBuilder::with_smart_placement`] with `true` as the first argument.
 #[derive(Default, Clone, Visit, Debug, Reflect)]
 #[reflect(derived_type = "UiNode")]
+#[reflect(type_uuid = "5c4bf90d-cfe7-464f-bcf8-71deacb14dd8")]
 pub struct Popup {
     /// Base widget of the popup.
     pub widget: Widget,
@@ -380,8 +382,6 @@ impl Popup {
     }
 }
 
-uuid_provider!(Popup = "1c641540-59eb-4ccd-a090-2173dab02245");
-
 impl Control for Popup {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/progress_bar.rs b/fyrox-ui/src/progress_bar.rs
index 404e73141..5db15c28f 100644
--- a/fyrox-ui/src/progress_bar.rs
+++ b/fyrox-ui/src/progress_bar.rs
@@ -35,7 +35,6 @@ use crate::{
 };
 
 use crate::message::MessageData;
-use fyrox_core::uuid_provider;
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 
@@ -89,7 +88,10 @@ impl MessageData for ProgressBarMessage {}
 /// }
 /// ```
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "d6ebb853-d945-46bc-86db-4c8b5d5faf8e"
+)]
 pub struct ProgressBar {
     /// Base widget of the progress bar.
     pub widget: Widget,
@@ -116,8 +118,6 @@ impl ConstructorProvider<UiNode, UserInterface> for ProgressBar {
 
 crate::define_widget_deref!(ProgressBar);
 
-uuid_provider!(ProgressBar = "d6ebb853-d945-46bc-86db-4c8b5d5faf8e");
-
 impl Control for ProgressBar {
     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
         let size = self.widget.arrange_override(ui, final_size);
diff --git a/fyrox-ui/src/range.rs b/fyrox-ui/src/range.rs
index c740af51b..07a69fb44 100644
--- a/fyrox-ui/src/range.rs
+++ b/fyrox-ui/src/range.rs
@@ -24,7 +24,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     grid::{Column, GridBuilder, Row},
     message::{MessageDirection, UiMessage},
     numeric::{NumericType, NumericUpDownBuilder, NumericUpDownMessage},
@@ -107,7 +107,10 @@ impl<T: NumericType> MessageData for RangeEditorMessage<T> {}
 /// Be very careful about the type of the range when sending a message, you need to send a range of exact type, that match the type
 /// of your editor, otherwise the message have no effect. The same applied to fetching.
 #[derive(Default, Debug, Clone, Reflect, Visit)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "0eb2948e-8485-490e-8719-18a0bb6fe275"
+)]
 pub struct RangeEditor<T>
 where
     T: NumericType,
@@ -160,18 +163,6 @@ where
 
 const SYNC_FLAG: u64 = 1;
 
-impl<T> TypeUuidProvider for RangeEditor<T>
-where
-    T: NumericType,
-{
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("0eb2948e-8485-490e-8719-18a0bb6fe275"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T> Control for RangeEditor<T>
 where
     T: NumericType,
diff --git a/fyrox-ui/src/rect.rs b/fyrox-ui/src/rect.rs
index c5c14f30a..0aab90746 100644
--- a/fyrox-ui/src/rect.rs
+++ b/fyrox-ui/src/rect.rs
@@ -24,10 +24,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     grid::{Column, GridBuilder, Row},
     message::{MessageDirection, UiMessage},
     numeric::NumericType,
@@ -119,7 +116,10 @@ impl<T: NumericType> MessageData for RectEditorMessage<T> {}
 /// }
 /// ```
 #[derive(Default, Debug, Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "5a3daf9d-f33b-494b-b111-eb55721dc7ac"
+)]
 pub struct RectEditor<T>
 where
     T: NumericType,
@@ -170,18 +170,6 @@ where
     }
 }
 
-impl<T> TypeUuidProvider for RectEditor<T>
-where
-    T: NumericType,
-{
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            uuid!("5a3daf9d-f33b-494b-b111-eb55721dc7ac"),
-            T::type_uuid(),
-        )
-    }
-}
-
 impl<T> Control for RectEditor<T>
 where
     T: NumericType,
diff --git a/fyrox-ui/src/screen.rs b/fyrox-ui/src/screen.rs
index 05ee2d4b5..e3b81a6ce 100644
--- a/fyrox-ui/src/screen.rs
+++ b/fyrox-ui/src/screen.rs
@@ -24,10 +24,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
-        algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, uuid_provider,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, math::Rect, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     message::UiMessage,
     widget::{Widget, WidgetBuilder},
     BuildContext, Control, UiNode, UserInterface,
@@ -109,7 +106,10 @@ use std::cell::Cell;
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "3bc7649f-a1ba-49be-bc4e-e0624654e40c"
+)]
 pub struct Screen {
     /// Base widget of the screen.
     pub widget: Widget,
@@ -140,8 +140,6 @@ impl ConstructorProvider<UiNode, UserInterface> for Screen {
 
 crate::define_widget_deref!(Screen);
 
-uuid_provider!(Screen = "3bc7649f-a1ba-49be-bc4e-e0624654e40c");
-
 impl Control for Screen {
     fn measure_override(&self, ui: &UserInterface, _available_size: Vector2<f32>) -> Vector2<f32> {
         let logical_size = self
diff --git a/fyrox-ui/src/scroll_bar.rs b/fyrox-ui/src/scroll_bar.rs
index 23c270445..53e90c7a7 100644
--- a/fyrox-ui/src/scroll_bar.rs
+++ b/fyrox-ui/src/scroll_bar.rs
@@ -45,7 +45,7 @@ use crate::{
     BuildContext, Control, HorizontalAlignment, Orientation, Thickness, UiNode, UserInterface,
     VerticalAlignment,
 };
-use fyrox_core::uuid_provider;
+
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_graph::SceneGraph;
@@ -130,7 +130,10 @@ impl MessageData for ScrollBarMessage {}
 /// Scroll bar provides arrows to change the current value using a fixed step value. You can change it using
 /// [`ScrollBarBuilder::with_step`] method.
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "92accc96-b334-424d-97ea-332c4787acf6"
+)]
 pub struct ScrollBar {
     /// Base widget of the scroll bar.
     pub widget: Widget,
@@ -177,8 +180,6 @@ impl ConstructorProvider<UiNode, UserInterface> for ScrollBar {
 
 crate::define_widget_deref!(ScrollBar);
 
-uuid_provider!(ScrollBar = "92accc96-b334-424d-97ea-332c4787acf6");
-
 impl Control for ScrollBar {
     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
         let size = self.widget.arrange_override(ui, final_size);
diff --git a/fyrox-ui/src/scroll_panel.rs b/fyrox-ui/src/scroll_panel.rs
index 5d1481a72..3c6c8750d 100644
--- a/fyrox-ui/src/scroll_panel.rs
+++ b/fyrox-ui/src/scroll_panel.rs
@@ -35,7 +35,7 @@ use crate::{
 };
 
 use crate::message::MessageData;
-use fyrox_core::{ok_or_return, uuid_provider};
+use fyrox_core::ok_or_return;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_graph::SceneGraph;
 
@@ -144,7 +144,10 @@ impl MessageData for ScrollPanelMessage {
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "1ab4936d-58c8-4cf7-b33c-4b56092f4826"
+)]
 pub struct ScrollPanel {
     /// Base widget of the scroll panel.
     pub widget: Widget,
@@ -171,8 +174,6 @@ impl ConstructorProvider<UiNode, UserInterface> for ScrollPanel {
 
 crate::define_widget_deref!(ScrollPanel);
 
-uuid_provider!(ScrollPanel = "1ab4936d-58c8-4cf7-b33c-4b56092f4826");
-
 impl ScrollPanel {
     fn children_size(&self, ui: &UserInterface) -> Vector2<f32> {
         let mut children_size = Vector2::<f32>::default();
diff --git a/fyrox-ui/src/scroll_viewer.rs b/fyrox-ui/src/scroll_viewer.rs
index 30f4e218f..6b753b5c5 100644
--- a/fyrox-ui/src/scroll_viewer.rs
+++ b/fyrox-ui/src/scroll_viewer.rs
@@ -25,9 +25,7 @@
 #![warn(missing_docs)]
 
 use crate::{
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, uuid_provider, visitor::prelude::*,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     grid::{Column, GridBuilder, Row},
     message::{MessageDirection, UiMessage},
     scroll_bar::{ScrollBar, ScrollBarBuilder, ScrollBarMessage},
@@ -169,7 +167,10 @@ impl ScrollViewerMessage {
 /// }
 /// ```
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "173e869f-7da0-4ae2-915a-5d545d8150cc"
+)]
 pub struct ScrollViewer {
     /// Base widget of the scroll viewer.
     pub widget: Widget,
@@ -202,8 +203,6 @@ impl ConstructorProvider<UiNode, UserInterface> for ScrollViewer {
 
 crate::define_widget_deref!(ScrollViewer);
 
-uuid_provider!(ScrollViewer = "173e869f-7da0-4ae2-915a-5d545d8150cc");
-
 impl Control for ScrollViewer {
     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
         let size = self.widget.arrange_override(ui, final_size);
diff --git a/fyrox-ui/src/searchbar.rs b/fyrox-ui/src/searchbar.rs
index 5201989e0..05faecb68 100644
--- a/fyrox-ui/src/searchbar.rs
+++ b/fyrox-ui/src/searchbar.rs
@@ -32,7 +32,7 @@ use crate::{
     brush::Brush,
     button::{ButtonBuilder, ButtonMessage},
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*,
         variable::InheritableVariable, visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
@@ -98,7 +98,10 @@ impl MessageData for SearchBarMessage {}
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "23db1179-0e07-493d-98fd-2b3c0c795215"
+)]
 pub struct SearchBar {
     /// Base widget of the search bar.
     pub widget: Widget,
@@ -123,8 +126,6 @@ impl ConstructorProvider<UiNode, UserInterface> for SearchBar {
 
 define_widget_deref!(SearchBar);
 
-uuid_provider!(SearchBar = "23db1179-0e07-493d-98fd-2b3c0c795215");
-
 impl Control for SearchBar {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/selector.rs b/fyrox-ui/src/selector.rs
index 87b1aa766..875f0c811 100644
--- a/fyrox-ui/src/selector.rs
+++ b/fyrox-ui/src/selector.rs
@@ -26,10 +26,7 @@
 use crate::{
     border::BorderBuilder,
     button::{Button, ButtonBuilder, ButtonMessage},
-    core::{
-        pool::Handle, reflect::prelude::*, type_traits::prelude::*, variable::InheritableVariable,
-        visitor::prelude::*,
-    },
+    core::{pool::Handle, reflect::prelude::*, variable::InheritableVariable, visitor::prelude::*},
     define_widget_deref,
     grid::{Column, GridBuilder, Row},
     message::{MessageData, MessageDirection, UiMessage},
@@ -121,9 +118,9 @@ impl MessageData for SelectorMessage {}
 ///     }
 /// }
 /// ```
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
-#[type_uuid(id = "25118853-5c3c-4197-9e4b-2e3b9d92f4d2")]
+#[reflect(type_uuid = "25118853-5c3c-4197-9e4b-2e3b9d92f4d2")]
 pub struct Selector {
     widget: Widget,
     items: InheritableVariable<Vec<Handle<UiNode>>>,
diff --git a/fyrox-ui/src/stack_panel.rs b/fyrox-ui/src/stack_panel.rs
index ede1e75f1..efe6ebe11 100644
--- a/fyrox-ui/src/stack_panel.rs
+++ b/fyrox-ui/src/stack_panel.rs
@@ -29,7 +29,7 @@ use crate::{
     widget::{Widget, WidgetBuilder},
     BuildContext, Control, Orientation, UiNode, UserInterface,
 };
-use fyrox_core::uuid_provider;
+
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_graph::SceneGraph;
@@ -108,7 +108,10 @@ impl MessageData for StackPanelMessage {}
 /// # }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "d868f554-a2c5-4280-abfc-396d10a0e1ed"
+)]
 pub struct StackPanel {
     /// Base widget of the stack panel.
     pub widget: Widget,
@@ -131,8 +134,6 @@ impl ConstructorProvider<UiNode, UserInterface> for StackPanel {
 
 crate::define_widget_deref!(StackPanel);
 
-uuid_provider!(StackPanel = "d868f554-a2c5-4280-abfc-396d10a0e1ed");
-
 impl Control for StackPanel {
     fn measure_override(&self, ui: &UserInterface, available_size: Vector2<f32>) -> Vector2<f32> {
         let mut child_constraint = Vector2::new(f32::INFINITY, f32::INFINITY);
diff --git a/fyrox-ui/src/style/mod.rs b/fyrox-ui/src/style/mod.rs
index 58a913c21..1ecb75084 100644
--- a/fyrox-ui/src/style/mod.rs
+++ b/fyrox-ui/src/style/mod.rs
@@ -30,10 +30,7 @@ use crate::{
     brush::Brush,
     button::Button,
     check_box::CheckBox,
-    core::{
-        color::Color, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*,
-        ImmutableString, Uuid,
-    },
+    core::{color::Color, reflect::prelude::*, visitor::prelude::*, ImmutableString},
     dropdown_list::DropdownList,
     style::resource::{StyleResource, StyleResourceError, StyleResourceExt},
     toggle::ToggleButton,
@@ -57,8 +54,8 @@ use std::{
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// A set of potential values for styled properties.
-#[derive(Visit, Reflect, Debug, Clone, TypeUuidProvider, AsRefStr, EnumString, VariantNames)]
-#[type_uuid(id = "85b8c1e4-03a2-4a28-acb4-1850d1a29227")]
+#[derive(Visit, Reflect, Debug, Clone, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "85b8c1e4-03a2-4a28-acb4-1850d1a29227")]
 pub enum StyleProperty {
     /// A numeric property.
     Number(f32),
@@ -154,7 +151,10 @@ pub static LIGHT_STYLE: LazyLock<BuiltInResource<Style>> = LazyLock::new(|| {
 /// approach, style becomes not necessary and the value can be hardcoded. Also, the values of such
 /// properties can be updated individually.
 #[derive(Clone, Debug, Reflect, Default)]
-#[reflect(bounds = "T: Reflect + Clone")]
+#[reflect(
+    bounds = "T: Reflect + Clone",
+    type_uuid = "71e84137-2832-42a1-bcb5-f8ee95784997"
+)]
 pub struct StyledProperty<T> {
     /// Property value.
     pub property: T,
@@ -220,8 +220,8 @@ impl<T: Visit> Visit for StyledProperty<T> {
 }
 
 /// Named style property container.
-#[derive(Visit, Reflect, Clone, Default, Debug, TypeUuidProvider)]
-#[type_uuid(id = "6238f37c-c067-4dd1-be67-6a8bb8853a59")]
+#[derive(Visit, Reflect, Clone, Default, Debug)]
+#[reflect(type_uuid = "6238f37c-c067-4dd1-be67-6a8bb8853a59")]
 pub struct StylePropertyContainer {
     /// Name of the property.
     pub name: ImmutableString,
@@ -298,8 +298,8 @@ pub struct StylePropertyContainer {
 ///     ui.set_style(StyleResource::new_embedded(style));
 /// }
 /// ```
-#[derive(Visit, Reflect, Clone, Default, Debug, TypeUuidProvider)]
-#[type_uuid(id = "38a63b49-d765-4c01-8fb5-202cc43d607e")]
+#[derive(Visit, Reflect, Clone, Default, Debug)]
+#[reflect(type_uuid = "38a63b49-d765-4c01-8fb5-202cc43d607e")]
 pub struct Style {
     parent: Option<StyleResource>,
     properties: Vec<StylePropertyContainer>,
diff --git a/fyrox-ui/src/style/resource.rs b/fyrox-ui/src/style/resource.rs
index eba710986..ed664ee7e 100644
--- a/fyrox-ui/src/style/resource.rs
+++ b/fyrox-ui/src/style/resource.rs
@@ -25,9 +25,9 @@ use fyrox_core::visitor::error::VisitError;
 use fyrox_core::{
     io::FileError,
     log::Log,
-    type_traits::prelude::*,
+    reflect::prelude::*,
     visitor::{prelude::*, Visitor},
-    ImmutableString, Uuid,
+    ImmutableString,
 };
 use fyrox_resource::{
     io::ResourceIo,
@@ -82,10 +82,6 @@ impl From<VisitError> for StyleResourceError {
 }
 
 impl ResourceData for Style {
-    fn type_uuid(&self) -> Uuid {
-        <Self as TypeUuidProvider>::type_uuid()
-    }
-
     fn save(&mut self, path: &Path) -> Result<(), Box<dyn Error>> {
         let mut visitor = Visitor::new();
         self.visit("Style", &mut visitor)?;
@@ -118,7 +114,7 @@ impl ResourceLoader for StyleLoader {
     }
 
     fn data_type_uuid(&self) -> Uuid {
-        <Style as TypeUuidProvider>::type_uuid()
+        <Style as Reflect>::type_info().type_uuid
     }
 
     fn load(&self, path: PathBuf, io: Arc<dyn ResourceIo>) -> BoxedLoaderFuture {
diff --git a/fyrox-ui/src/tab_control.rs b/fyrox-ui/src/tab_control.rs
index d92fd4c92..a1a46830e 100644
--- a/fyrox-ui/src/tab_control.rs
+++ b/fyrox-ui/src/tab_control.rs
@@ -29,8 +29,7 @@ use crate::{
     brush::Brush,
     button::{Button, ButtonBuilder, ButtonMessage},
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*,
     },
     decorator::{Decorator, DecoratorBuilder, DecoratorMessage},
     grid::{Column, Grid, GridBuilder, Row},
@@ -51,6 +50,7 @@ use std::{
     fmt::{Debug, Formatter},
     sync::Arc,
 };
+use uuid::Uuid;
 
 /// A set of messages for [`TabControl`] widget.
 #[derive(Debug, Clone, PartialEq)]
@@ -99,6 +99,7 @@ impl Debug for TabUserData {
 
 /// Tab of the [`TabControl`] widget. It stores important tab data that is widely used at runtime.
 #[derive(Default, Clone, PartialEq, Visit, Reflect, Debug)]
+#[reflect(type_uuid = "974ab85e-8808-4f83-ac67-935a5cdb58d1")]
 pub struct Tab {
     /// Unique identifier of this tab.
     pub uuid: Uuid,
@@ -205,7 +206,10 @@ pub struct Tab {
 /// # }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "d54cfac3-0afc-464b-838a-158b3a2253f5"
+)]
 pub struct TabControl {
     /// Base widget of the tab control.
     pub widget: Widget,
@@ -238,8 +242,6 @@ impl ConstructorProvider<UiNode, UserInterface> for TabControl {
 
 crate::define_widget_deref!(TabControl);
 
-uuid_provider!(TabControl = "d54cfac3-0afc-464b-838a-158b3a2253f5");
-
 impl TabControl {
     fn do_drag(&mut self, position: Vector2<f32>, ui: &mut UserInterface) {
         let mut dragged_index = None;
diff --git a/fyrox-ui/src/text.rs b/fyrox-ui/src/text.rs
index 1d7b0c1bb..15a25f6cf 100644
--- a/fyrox-ui/src/text.rs
+++ b/fyrox-ui/src/text.rs
@@ -26,8 +26,7 @@
 use crate::{
     brush::Brush,
     core::{
-        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, uuid_provider,
-        visitor::prelude::*,
+        algebra::Vector2, color::Color, pool::Handle, reflect::prelude::*, visitor::prelude::*,
     },
     draw::DrawingContext,
     font::FontResource,
@@ -321,7 +320,10 @@ impl MessageData for TextMessage {}
 /// Please keep in mind, that like any other situation when you "changing" something via messages, you should remember
 /// that the change is **not** immediate.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "22f7f502-7622-4ecb-8c5f-ba436e7ee823"
+)]
 pub struct Text {
     /// Base widget of the Text widget.
     pub widget: Widget,
@@ -356,8 +358,6 @@ impl ConstructorProvider<UiNode, UserInterface> for Text {
 
 crate::define_widget_deref!(Text);
 
-uuid_provider!(Text = "22f7f502-7622-4ecb-8c5f-ba436e7ee823");
-
 impl Control for Text {
     fn measure_override(&self, _: &UserInterface, available_size: Vector2<f32>) -> Vector2<f32> {
         self.formatted_text
diff --git a/fyrox-ui/src/text_box.rs b/fyrox-ui/src/text_box.rs
index 52223eb62..aa2153ff8 100644
--- a/fyrox-ui/src/text_box.rs
+++ b/fyrox-ui/src/text_box.rs
@@ -33,8 +33,6 @@ use crate::{
         pool::Handle,
         reflect::prelude::*,
         some_or_return,
-        type_traits::prelude::*,
-        uuid_provider,
         variable::InheritableVariable,
         visitor::prelude::*,
         SafeLock,
@@ -119,10 +117,9 @@ pub use crate::formatted_text::Position;
     AsRefStr,
     EnumString,
     VariantNames,
-    TypeUuidProvider,
 )]
 #[repr(u32)]
-#[type_uuid(id = "5fb7d6f0-c151-4a30-8350-2060749d74c6")]
+#[reflect(type_uuid = "5fb7d6f0-c151-4a30-8350-2060749d74c6")]
 pub enum TextCommitMode {
     /// Text box will immediately send [`TextMessage::Text`] message after any change (after any pressed button).
     Immediate = 0,
@@ -149,8 +146,8 @@ pub enum TextCommitMode {
 }
 
 /// Defines a set of two positions in the text, that forms a specific range.
-#[derive(Copy, Clone, PartialEq, Eq, Debug, Visit, Reflect, Default, TypeUuidProvider)]
-#[type_uuid(id = "04c8101b-cb34-47a5-af34-ecfb9b2fc426")]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Visit, Reflect, Default)]
+#[reflect(type_uuid = "04c8101b-cb34-47a5-af34-ecfb9b2fc426")]
 pub struct SelectionRange {
     /// Position of the beginning.
     pub begin: Position,
@@ -397,7 +394,10 @@ pub type FilterCallback = dyn FnMut(char) -> bool + Send;
 /// You can change brush of caret by using [`TextBoxBuilder::with_caret_brush`] and also selection brush by using
 /// [`TextBoxBuilder::with_selection_brush`], it could be useful if you don't like default colors.
 #[derive(Default, Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "536276f2-a175-4c05-a376-5a7d8bf0d10b"
+)]
 pub struct TextBox {
     /// Base widget of the text box.
     pub widget: Widget,
@@ -926,8 +926,6 @@ impl TextBox {
     }
 }
 
-uuid_provider!(TextBox = "536276f2-a175-4c05-a376-5a7d8bf0d10b");
-
 impl Control for TextBox {
     fn measure_override(&self, ui: &UserInterface, available_size: Vector2<f32>) -> Vector2<f32> {
         let text_size = self
diff --git a/fyrox-ui/src/thickness.rs b/fyrox-ui/src/thickness.rs
index 079ffe810..adc9887ac 100644
--- a/fyrox-ui/src/thickness.rs
+++ b/fyrox-ui/src/thickness.rs
@@ -25,6 +25,7 @@ use crate::core::{algebra::Vector2, reflect::prelude::*, visitor::prelude::*};
 /// Describes the thickness of a frame around a rectangle (for all four sides). It is primarily used to
 /// define margins and to define stroke thickness for various widgets.
 #[derive(Copy, Clone, PartialEq, Debug, Reflect, Visit)]
+#[reflect(type_uuid = "78769bd5-7ee2-4fcb-8a94-ae3a3fec9b34")]
 pub struct Thickness {
     /// Thickness of the left side of a rectangle.
     pub left: f32,
diff --git a/fyrox-ui/src/thumb.rs b/fyrox-ui/src/thumb.rs
index 3327b531d..6a28aa5b8 100644
--- a/fyrox-ui/src/thumb.rs
+++ b/fyrox-ui/src/thumb.rs
@@ -19,10 +19,7 @@
 // SOFTWARE.
 
 use crate::{
-    core::{
-        algebra::Vector2, pool::Handle, reflect::prelude::*, type_traits::prelude::*,
-        visitor::prelude::*,
-    },
+    core::{algebra::Vector2, pool::Handle, reflect::prelude::*, visitor::prelude::*},
     message::{ButtonState, MouseButton, UiMessage},
     widget::{Widget, WidgetBuilder, WidgetMessage},
     BuildContext, Control, UiNode, UserInterface,
@@ -101,9 +98,9 @@ impl MessageData for ThumbMessage {}
 ///
 /// This example creates a new thumb widget 5px wide and shows how to use its messages to get
 /// information about the actual movement.
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
-#[type_uuid(id = "71ad2ff4-6e9e-461d-b7c2-867bd4039684")]
+#[reflect(type_uuid = "71ad2ff4-6e9e-461d-b7c2-867bd4039684")]
 pub struct Thumb {
     pub widget: Widget,
     pub click_pos: Vector2<f32>,
diff --git a/fyrox-ui/src/toggle.rs b/fyrox-ui/src/toggle.rs
index 69e7436b8..18af8e5db 100644
--- a/fyrox-ui/src/toggle.rs
+++ b/fyrox-ui/src/toggle.rs
@@ -20,7 +20,7 @@
 
 use crate::{
     border::BorderBuilder,
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     decorator::{DecoratorBuilder, DecoratorMessage},
     message::{MessageDirection, UiMessage},
     style::{resource::StyleResourceExt, Style},
@@ -32,9 +32,9 @@ use fyrox_core::pool::ObjectOrVariant;
 use crate::message::MessageData;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 
-#[derive(Default, Clone, Visit, Reflect, Debug, TypeUuidProvider)]
+#[derive(Default, Clone, Visit, Reflect, Debug)]
 #[reflect(derived_type = "UiNode")]
-#[type_uuid(id = "8d8f114d-7fc6-4d7e-8f57-cd4e39958c36")]
+#[reflect(type_uuid = "8d8f114d-7fc6-4d7e-8f57-cd4e39958c36")]
 pub struct ToggleButton {
     pub widget: Widget,
     pub decorator: Handle<UiNode>,
diff --git a/fyrox-ui/src/tree.rs b/fyrox-ui/src/tree.rs
index edb41c384..f7ec06982 100644
--- a/fyrox-ui/src/tree.rs
+++ b/fyrox-ui/src/tree.rs
@@ -46,7 +46,7 @@ use crate::check_box::CheckBox;
 use crate::message::MessageData;
 use crate::stack_panel::StackPanel;
 use fyrox_core::pool::{HandlesVecExtension, ObjectOrVariant};
-use fyrox_core::uuid_provider;
+
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_graph::SceneGraph;
 use std::collections::VecDeque;
@@ -293,7 +293,10 @@ impl MessageData for TreeRootMessage {}
 /// }
 /// ```
 #[derive(Default, Debug, Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "e090e913-393a-4192-a220-e1d87e272170"
+)]
 pub struct Tree {
     /// Base widget of the tree.
     pub widget: Widget,
@@ -331,8 +334,6 @@ impl ConstructorProvider<UiNode, UserInterface> for Tree {
 
 crate::define_widget_deref!(Tree);
 
-uuid_provider!(Tree = "e090e913-393a-4192-a220-e1d87e272170");
-
 impl Control for Tree {
     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
         let size = self.widget.arrange_override(ui, final_size);
@@ -809,7 +810,10 @@ fn build_expander(
 /// }
 /// ```
 #[derive(Default, Debug, Clone, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "cf7c0476-f779-4e4b-8b7e-01a23ff51a72"
+)]
 pub struct TreeRoot {
     /// Base widget of the tree root.
     pub widget: Widget,
@@ -836,8 +840,6 @@ impl ConstructorProvider<UiNode, UserInterface> for TreeRoot {
 
 crate::define_widget_deref!(TreeRoot);
 
-uuid_provider!(TreeRoot = "cf7c0476-f779-4e4b-8b7e-01a23ff51a72");
-
 impl Control for TreeRoot {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/utils.rs b/fyrox-ui/src/utils.rs
index 2801f3335..e387a871d 100644
--- a/fyrox-ui/src/utils.rs
+++ b/fyrox-ui/src/utils.rs
@@ -21,7 +21,7 @@
 use crate::{
     border::BorderBuilder,
     button::{Button, ButtonBuilder},
-    core::{algebra::Vector2, color::Color, parking_lot::Mutex, pool::Handle, Uuid},
+    core::{algebra::Vector2, color::Color, parking_lot::Mutex, pool::Handle},
     decorator::DecoratorBuilder,
     formatted_text::WrapMode,
     grid::{Column, GridBuilder, Row},
@@ -38,6 +38,7 @@ use fyrox_texture::{
     TextureResourceExtension,
 };
 use std::sync::Arc;
+use uuid::Uuid;
 
 pub enum ArrowDirection {
     Top,
diff --git a/fyrox-ui/src/uuid.rs b/fyrox-ui/src/uuid.rs
index 963463440..28c8ec620 100644
--- a/fyrox-ui/src/uuid.rs
+++ b/fyrox-ui/src/uuid.rs
@@ -25,7 +25,7 @@
 
 use crate::{
     button::{Button, ButtonMessage},
-    core::{pool::Handle, reflect::prelude::*, type_traits::prelude::*, visitor::prelude::*},
+    core::{pool::Handle, reflect::prelude::*, visitor::prelude::*},
     define_widget_deref,
     grid::{Column, GridBuilder, Row},
     message::{MessageData, UiMessage},
@@ -35,7 +35,7 @@ use crate::{
     widget::{Widget, WidgetBuilder},
     BuildContext, Control, Thickness, UiNode, UserInterface, VerticalAlignment,
 };
-use fyrox_core::uuid_provider;
+
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 
 /// A set of messages that is used to fetch or modify values of [`UuidEditor`] widgets.
@@ -67,7 +67,10 @@ impl MessageData for UuidEditorMessage {}
 /// }
 /// ```
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "667f7f48-2448-42da-91dd-cd743ca7117e"
+)]
 pub struct UuidEditor {
     widget: Widget,
     value: Uuid,
@@ -90,8 +93,6 @@ impl ConstructorProvider<UiNode, UserInterface> for UuidEditor {
 
 define_widget_deref!(UuidEditor);
 
-uuid_provider!(UuidEditor = "667f7f48-2448-42da-91dd-cd743ca7117e");
-
 impl Control for UuidEditor {
     fn handle_routed_message(&mut self, ui: &mut UserInterface, message: &mut UiMessage) {
         self.widget.handle_routed_message(ui, message);
diff --git a/fyrox-ui/src/vec.rs b/fyrox-ui/src/vec.rs
index 949c448a5..4d69da397 100644
--- a/fyrox-ui/src/vec.rs
+++ b/fyrox-ui/src/vec.rs
@@ -23,7 +23,7 @@ use crate::{
     brush::Brush,
     core::{
         algebra::SVector, color::Color, num_traits, pool::Handle, reflect::prelude::*,
-        type_traits::prelude::*, visitor::prelude::*,
+        visitor::prelude::*,
     },
     grid::{Column, GridBuilder, Row},
     message::{MessageDirection, UiMessage},
@@ -92,7 +92,10 @@ where
 impl<T: NumericType, const D: usize> MessageData for VecEditorMessage<T, D> {}
 
 #[derive(Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "0332144f-c70e-456a-812b-f9b89980d2ba"
+)]
 pub struct VecEditor<T, const D: usize>
 where
     T: NumericType,
@@ -167,38 +170,6 @@ where
     }
 }
 
-// TODO: Is 16 enough?
-const DIM_UUIDS: [Uuid; 16] = [
-    uuid!("11ec6ec2-9780-4dbe-827a-935cb9ec5bb0"),
-    uuid!("af532488-8833-443a-8ece-d8380e5ad148"),
-    uuid!("6738154a-9663-4628-bb9d-f61d453eafcd"),
-    uuid!("448dab8c-b4e6-478e-a704-ea0b0db628aa"),
-    uuid!("67246977-8802-4e72-a19f-6e4f60b6eced"),
-    uuid!("f711a9f8-288a-4a28-b30e-e7bcfdf26ab0"),
-    uuid!("c92ac3ad-5dc5-41dd-abbd-7fb9aacb9a5f"),
-    uuid!("88d9a035-4424-40d2-af62-f701025bd767"),
-    uuid!("dda09036-18d8-40bc-ae9d-1a69f45e2ba0"),
-    uuid!("b6fe9585-6ebc-4b4d-be66-484b4d7b3d5b"),
-    uuid!("03c41033-e8fe-420d-b246-e7c9dcd7c01b"),
-    uuid!("14ea7e95-0f94-4b15-a53c-97d7d2e58d4e"),
-    uuid!("0149f666-33cf-4e39-b4bd-58502994b162"),
-    uuid!("abb9f691-0958-464b-a37d-a3336b4d33f9"),
-    uuid!("6f37cfd5-9bec-40ec-9dbc-e532d43b81b7"),
-    uuid!("fa786077-95b9-4e7c-9268-7d0314c005ba"),
-];
-
-impl<T: NumericType, const D: usize> TypeUuidProvider for VecEditor<T, D> {
-    fn type_uuid() -> Uuid {
-        combine_uuids(
-            combine_uuids(
-                uuid!("0332144f-c70e-456a-812b-f9b89980d2ba"),
-                T::type_uuid(),
-            ),
-            DIM_UUIDS[D],
-        )
-    }
-}
-
 impl<T, const D: usize> Control for VecEditor<T, D>
 where
     T: NumericType,
diff --git a/fyrox-ui/src/vector_image.rs b/fyrox-ui/src/vector_image.rs
index aa663b4f0..cb07bfac2 100644
--- a/fyrox-ui/src/vector_image.rs
+++ b/fyrox-ui/src/vector_image.rs
@@ -35,13 +35,13 @@ use crate::{
     BuildContext, Control, UiNode, UserInterface,
 };
 
-use fyrox_core::uuid_provider;
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use strum_macros::{AsRefStr, EnumString, VariantNames};
 
 /// Primitive is the simplest shape, that consists of one or multiple lines of the same thickness.
 #[derive(Clone, Debug, PartialEq, Visit, Reflect, AsRefStr, EnumString, VariantNames)]
+#[reflect(type_uuid = "766be1b3-6d1c-4466-bcf3-7093017c9e31")]
 pub enum Primitive {
     /// Solid triangle primitive.
     Triangle {
@@ -93,8 +93,6 @@ pub enum Primitive {
     },
 }
 
-uuid_provider!(Primitive = "766be1b3-6d1c-4466-bcf3-7093017c9e31");
-
 impl Default for Primitive {
     fn default() -> Self {
         Self::Line {
@@ -200,7 +198,10 @@ impl Primitive {
 /// Keep in mind that all primitives located in local coordinates. The color of the vector image can be changed by
 /// setting a new foreground brush.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "7e535b65-0178-414e-b310-e208afc0eeb5"
+)]
 pub struct VectorImage {
     /// Base widget of the image.
     pub widget: Widget,
@@ -223,8 +224,6 @@ impl ConstructorProvider<UiNode, UserInterface> for VectorImage {
 
 crate::define_widget_deref!(VectorImage);
 
-uuid_provider!(VectorImage = "7e535b65-0178-414e-b310-e208afc0eeb5");
-
 impl Control for VectorImage {
     fn measure_override(&self, _ui: &UserInterface, _available_size: Vector2<f32>) -> Vector2<f32> {
         if self.primitives.is_empty() {
diff --git a/fyrox-ui/src/widget.rs b/fyrox-ui/src/widget.rs
index 790251773..e3e97471b 100644
--- a/fyrox-ui/src/widget.rs
+++ b/fyrox-ui/src/widget.rs
@@ -489,6 +489,7 @@ impl MessageData for WidgetMessage {
 
 #[doc(hidden)]
 #[derive(Clone, Debug, Reflect, PartialEq)]
+#[reflect(type_uuid = "30c8f89a-ba53-422e-84f6-9a4dbf20978b")]
 pub struct WidgetMaterial(pub MaterialResource);
 
 impl Visit for WidgetMaterial {
@@ -539,6 +540,7 @@ impl WidgetRenderDataSet {
 /// for layout information, basic visual appearance, visibility options, parent-child information. It does almost nothing
 /// on its own, instead, the user interface modifies its state accordingly.
 #[derive(Default, Debug, Clone, Reflect, Visit)]
+#[reflect(type_uuid = "77e1b0ed-0d0a-4fae-9956-19bbd7145401")]
 #[visit(optional)]
 pub struct Widget {
     /// Self handle of the widget. It is valid **only**, if the widget is added to the user interface, in other
diff --git a/fyrox-ui/src/window.rs b/fyrox-ui/src/window.rs
index eab8c4e92..f94aeb5df 100644
--- a/fyrox-ui/src/window.rs
+++ b/fyrox-ui/src/window.rs
@@ -31,7 +31,7 @@ use crate::{
     button::{ButtonBuilder, ButtonMessage},
     core::{
         algebra::Vector2, color::Color, log::Log, math::Rect, pool::Handle, reflect::prelude::*,
-        uuid_provider, visitor::prelude::*,
+        visitor::prelude::*,
     },
     decorator::DecoratorBuilder,
     font::FontResource,
@@ -130,6 +130,7 @@ impl MessageData for WindowMessage {}
 
 /// The state of a window's size, as controlled by the buttons in the top-right corner.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Visit, Reflect)]
+#[reflect(type_uuid = "6fe81569-a19a-4034-9ae3-392a2c3fb656")]
 pub enum WindowSizeState {
     /// The window is neither maximized nor minimized, showing its content and free to move around the screen.
     #[default]
@@ -217,7 +218,10 @@ pub enum WindowSizeState {
 ///
 /// Any window can be set and unset as a modal via the *modal* function.
 #[derive(Default, Clone, Visit, Reflect, Debug)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "9331bf32-8614-4005-874c-5239e56bb15e"
+)]
 pub struct Window {
     /// Base widget of the window.
     pub widget: Widget,
@@ -289,6 +293,7 @@ const CORNER_GRIP_SIZE: f32 = GRIP_SIZE * 2.0;
 
 /// Kind of a resizing grip.
 #[derive(Copy, Clone, Debug, Visit, Reflect, Default)]
+#[reflect(type_uuid = "fea2073e-f44e-45db-a373-c9fcee201c2d")]
 pub enum GripKind {
     /// Left-top corner grip.
     #[default]
@@ -311,6 +316,7 @@ pub enum GripKind {
 
 /// Resizing grip.
 #[derive(Clone, Visit, Default, Debug, Reflect)]
+#[reflect(type_uuid = "373815d8-77d2-4624-80de-2d851f7fd6e5")]
 pub struct Grip {
     /// Kind of the grip.
     pub kind: GripKind,
@@ -335,8 +341,6 @@ impl Grip {
 
 crate::define_widget_deref!(Window);
 
-uuid_provider!(Window = "9331bf32-8614-4005-874c-5239e56bb15e");
-
 impl Control for Window {
     fn arrange_override(&self, ui: &UserInterface, final_size: Vector2<f32>) -> Vector2<f32> {
         let size = self.widget.arrange_override(ui, final_size);
diff --git a/fyrox-ui/src/wrap_panel.rs b/fyrox-ui/src/wrap_panel.rs
index 0135ac17c..58e45f605 100644
--- a/fyrox-ui/src/wrap_panel.rs
+++ b/fyrox-ui/src/wrap_panel.rs
@@ -33,7 +33,7 @@ use crate::{
 
 use crate::message::MessageData;
 use core::f32;
-use fyrox_core::uuid_provider;
+
 use fyrox_core::variable::InheritableVariable;
 use fyrox_graph::constructor::{ConstructorProvider, GraphNodeConstructor};
 use fyrox_graph::SceneGraph;
@@ -77,7 +77,10 @@ impl MessageData for WrapPanelMessage {}
 /// Wrap panel can stack your widgets either in vertical or horizontal direction. Use `.with_orientation` while building
 /// the panel to switch orientation to desired.
 #[derive(Default, Clone, Debug, Visit, Reflect)]
-#[reflect(derived_type = "UiNode")]
+#[reflect(
+    derived_type = "UiNode",
+    type_uuid = "f488ab8e-8f8b-473c-a450-5ac33f1afb39"
+)]
 pub struct WrapPanel {
     /// Base widget of the wrap panel.
     pub widget: Widget,
@@ -122,8 +125,6 @@ impl Default for Line {
     }
 }
 
-uuid_provider!(WrapPanel = "f488ab8e-8f8b-473c-a450-5ac33f1afb39");
-
 impl Control for WrapPanel {
     fn measure_override(&self, ui: &UserInterface, available_size: Vector2<f32>) -> Vector2<f32> {
         let mut measured_size: Vector2<f32> = Vector2::default();
diff --git a/project-manager/src/main.rs b/project-manager/src/main.rs
index 087fa16a9..50ec8f1b0 100644
--- a/project-manager/src/main.rs
+++ b/project-manager/src/main.rs
@@ -32,13 +32,13 @@ static CURRENT_VERSION: &str = include_str!("../pm.version");
 
 use crate::{manager::ProjectManager, settings::DATA_DIR, utils::make_button};
 use fyrox::core::algebra::Vector2;
+use fyrox::core::uuid::Uuid;
 use fyrox::{
     asset::{io::FsResourceIo, manager::ResourceManager, untyped::ResourceKind},
     core::{
         algebra::Matrix3,
         log::{Log, MessageKind},
         task::TaskPool,
-        Uuid,
     },
     dpi::PhysicalSize,
     engine::{
diff --git a/project-manager/src/settings.rs b/project-manager/src/settings.rs
index 585f1c392..6a6990a99 100644
--- a/project-manager/src/settings.rs
+++ b/project-manager/src/settings.rs
@@ -97,6 +97,7 @@ fn default_run_cargo_update() -> bool {
 }
 
 #[derive(Default, Serialize, Deserialize, Reflect, Clone, Debug)]
+#[reflect(type_uuid = "fab68a7a-58ce-40f5-a354-a7789c43efd3")]
 pub struct SettingsData {
     /// Defines a command to run an IDE in a project folder. This command should use either
     /// %MANIFEST_PATH% or %MANIFEST_DIR% built-in variable to provide the selected project path to
diff --git a/template-core/src/lib.rs b/template-core/src/lib.rs
index 56137955a..88ff68982 100644
--- a/template-core/src/lib.rs
+++ b/template-core/src/lib.rs
@@ -714,13 +714,13 @@ pub fn init_script(root_path: &Path, raw_name: &str) -> Result<(), String> {
 #[allow(unused_imports)]
 use fyrox::graph::prelude::*;
 use fyrox::{{
-    core::{{visitor::prelude::*, reflect::prelude::*, type_traits::prelude::*}},
+    core::{{visitor::prelude::*, reflect::prelude::*}},
     event::Event, script::{{ScriptContext, ScriptDeinitContext, ScriptTrait}},
     plugin::error::GameResult
 }};
 
-#[derive(Visit, Reflect, Default, Debug, Clone, TypeUuidProvider)]
-#[type_uuid(id = "{script_uuid}")]
+#[derive(Visit, Reflect, Default, Debug, Clone)]
+#[reflect(type_uuid = "{script_uuid}")]
 #[visit(optional)]
 pub struct {script_name} {{
     // Add fields here.